logical function names

diff --git a/client.c b/client.c
index 98b9542719c67ccc89796eec14e62935ffc7fac3..b8b7eed3b47c735656f06f88d6fa65d4961e950c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -77,7 +77,7 @@ static int paused = 0;
 static char lastadd;
 
 
-void MapKeys(char *newKeys)
+void handle_setkeys(char *newKeys)
 {
        int i, k, ch;
        char used[256];
@@ -141,7 +141,7 @@ void Usage(void)
        );
 }
 
-void HandleOption(char tag, char *value)
+void handle_arg(char tag, char *value)
 {
        switch (tag) {
        case 'a':       //ascii
@@ -174,7 +174,7 @@ void HandleOption(char tag, char *value)
                Sets.standout = value && !strcasecmp(value, "0") ? 1 : 0;
                break;
        case 'k':       //keys
-               MapKeys(value);
+               handle_setkeys(value);
                break;
        case 'H':       //info
                Header();
@@ -192,7 +192,7 @@ void HandleOption(char tag, char *value)
        }
 }
 
-void ReadConf(char *filename)
+void handle_conffile(char *filename)
 {
        FILE *file_in;
        char buf[513];
@@ -213,7 +213,7 @@ void ReadConf(char *filename)
                        sscanf(buf, "%80[^= \t] = %80[^\n]", tag, value);
                        for (i = 0; options[i].name; i++){
                                if (!strcasecmp(options[i].name, tag)) {
-                                       HandleOption(options[i].val, value);
+                                       handle_arg(options[i].val, value);
                                        break;
                                }
                        }
@@ -223,10 +223,9 @@ void ReadConf(char *filename)
        else {
                fprintf(stderr, "Unable to open config file %s.\n", filename);
        } //defaults
-
 }
 
-int StartNewPiece(int scr, char shape)
+int game_piece(int scr, char shape)
 {
        Players[scr].score.pieces++;
        {
@@ -246,7 +245,7 @@ int StartNewPiece(int scr, char shape)
        return 1;
 }
 
-void checkPaused(void)
+void game_setpaused(void)
 { //check whether anyone paused the game
        int i;
 
@@ -256,7 +255,7 @@ void checkPaused(void)
        if (paused) paused = 1;
 }
 
-void StartGame(void)
+void game_reset(void)
 { //init new game
        int i;
 
@@ -279,7 +278,7 @@ void StartGame(void)
        InitFields();
 }
 
-void CheckClears(int scr)
+void game_clear(int scr)
 { //check for full lines
        int linesCleared;
        int linevalues[] = { 40, 100, 400, 1200, }; //= 50*lines! - 10*(lines==1)
@@ -323,7 +322,7 @@ void CheckClears(int scr)
        } //lines cleared
 }
 
-void OneGame(void)
+void game_loop(void)
 {
        bool changed = 0;
        short gameStatus = 2; //2=loop; 1=new piece; 0=quit
@@ -347,7 +346,7 @@ void OneGame(void)
                        else
                                Message(Players[me].flags & SCF_paused
                                        ? "You are not ready" : "You are ready");
-                       checkPaused();
+                       game_setpaused();
                        if (game == GT_classicTwo)
                                SendPacket(me, NP_pause, 0, NULL);
                        ShowPause(me);
@@ -392,7 +391,7 @@ void OneGame(void)
                        SendPacket(me, NP_msg, strlen(chatText) + 1, chatText);
        }
 
-       void GameKey(char key)
+       void handle_key(char key)
        {
                char *p;
 
@@ -490,18 +489,18 @@ void OneGame(void)
                }
        }
                handle_keycmd(key);
-       } //GameKey
+       }
 
        int oldPaused = 0;
 
-       void GameNet(_netEvent net)
+       void handle_net(_netEvent net)
        {
                switch(net.type) {
                case NP_newPiece:
                {
                        memcpy(&Players[net.uid].nextShape, net.data,
                                sizeof(Players[0].nextShape));
-                       StartNewPiece(net.uid, Players[net.uid].curShape);
+                       game_piece(net.uid, Players[net.uid].curShape);
                        break;
                }
                case NP_down:
@@ -523,7 +522,7 @@ void OneGame(void)
                        DropPiece(net.uid);
                        break;
                case NP_clear:
-                       CheckClears(net.uid);
+                       game_clear(net.uid);
                        break;
                case NP_insertJunk:
                {
@@ -604,9 +603,9 @@ void OneGame(void)
                                        Players[i].flags |= SCF_paused;
                                } //reset players
                        }
-                       StartGame();   //reset everything
+                       game_reset();  //reset everything
                        ShowTime();    //redraw timer while unpaused
-                       checkPaused(); //pause
+                       game_setpaused(); //pause
                        oldPaused = 0; //reset pause
                        changed = 1;
                        gameStatus = 1;
@@ -627,7 +626,7 @@ void OneGame(void)
                                Message("%s joined %s team", Players[net.uid].name,
                                        teams[Players[net.uid].team]);
                        if (Players[net.uid].flags & SCF_paused) {
-                               checkPaused();
+                               game_setpaused();
                        } //player has paused
 //                     DrawField(net.uid);
 //                             ShowPause(net.uid);
@@ -646,18 +645,18 @@ void OneGame(void)
                                strcpy(s, Players[net.uid].flags&SCF_paused
                                        ? "is not ready" : "is ready");
                        Message("%s %s", Players[net.uid].name, s);
-                       checkPaused();
+                       game_setpaused();
                        ShowPause(net.uid);
                        changed = 1;
                        break;
                } //(un)pause
                case NP_part:
                        // player left
-                       checkPaused();
+                       game_setpaused();
                        oldPaused = 0;
                        Players[net.uid].alive = -1;
                        Message("%s left", Players[net.uid].name);
-                       checkPaused();
+                       game_setpaused();
                        ShowPause(net.uid);
                        changed = 1;
                        break;
@@ -676,27 +675,27 @@ void OneGame(void)
                                Message("\\%d%s fragged %s",
                                        Players[i].team > 7 ? 7 : Players[i].team, Players[i].name,
                                        Players[net.uid].name);
-                       checkPaused();
+                       game_setpaused();
                        ShowPause(net.uid);
                        changed = 1;
                        break;
                } //G/O
                default:
                        break;
-               } //E_net
-       } //GameNet
+               }
+       }
 
        MyEvent event;
        long pauseTimeLeft;
        int i;
 
-       StartGame();
+       game_reset();
        while (gameStatus) {
-GameLoop:
                gameStatus = 2;
                if (Players[me].alive > 0) {
-                       if (!StartNewPiece(me, ChooseOption(stdOptions))) {
-                                       netint4 data[4];
+                       if (!game_piece(me, ChooseOption(stdOptions))) {
+                               netint4 data[4];
+
                                Players[me].alive = 0;
                                if (lastadd == me) Message("\\%dYou died",
                                        Players[me].team > 7 ? 7 : Players[me].team);
@@ -739,10 +738,10 @@ GameLoop:
                                                if (spied) SendPacket(me, NP_down, 0, NULL);
                                break;
                        case E_key:
-                               GameKey(event.u.key);
+                               handle_key(event.u.key);
                                break;
                        case E_net:
-                               GameNet(event.u.net);
+                               handle_net(event.u.net);
                                break;
                        case E_lostConn:
                                goto gameOver;
@@ -760,7 +759,7 @@ GameLoop:
                        } //(un)pause
                } //game loop
                Players[me].score.score++;
-               CheckClears(me);
+               game_clear(me);
        } //new piece loop
 gameOver:
        SetITimer(0, 0);
@@ -775,7 +774,7 @@ int main(int argc, char **argv)
        maxPlayer = 1;
        Game.initspeed = DEFAULT_INTERVAL;
        Game.gravity = 0;
-       MapKeys(DEFAULT_KEYS);
+       handle_setkeys(DEFAULT_KEYS);
        {
                int i;
                char *userName;
@@ -798,13 +797,13 @@ int main(int argc, char **argv)
        } //set defaults
 
 //     if (getopt(argc, argv, "f:") == 'f')
-//             ReadConf(optarg);
+//             handle_conffile(optarg);
 //     else
-       ReadConf(CONFIG_FILE);
+       handle_conffile(CONFIG_FILE);
        while ((ch = getopt_long(
                argc, argv, "hHRk:c:n:oSCap:i:l:t:", options, NULL
        )) != -1)
-               HandleOption(ch, optarg);
+               handle_arg(ch, optarg);
        if (optind < argc) {
                Usage();
                exit(1);
@@ -818,8 +817,8 @@ int main(int argc, char **argv)
                InitiateConnection(hostStr, port);
                HandShake();
                maxPlayer = me;
-               checkPaused();
-               OneGame();
+               game_setpaused();
+               game_loop();
        } //client
        else {
                Game.seed = time(0);
@@ -827,7 +826,7 @@ int main(int argc, char **argv)
                me = 1;
                memcpy(&Players[me], &Players[0], sizeof(_Player));
                Players[me].team = 7;
-               OneGame();
+               game_loop();
        } //singleplay
        return 0;
 }