various code cleanups

[netris.git] / game.c

diff --git a/game.c b/game.c
index fcc2379a68ac35e810a70df5651e919faea8278d..9bd9f23bb7446a734473899f702e392c974dfd85 100644 (file)
--- a/game.c
+++ b/game.c
@@ -138,10 +138,7 @@ void HandleOption(char tag, char *value)
                Game.initspeed = atof(value) * 1e6;
                break;
        case 'l':       //level
-               if ((Players[0].score.level = atof(value)) < 1)
-                       Players[0].score.level = 1;
-               if (Players[0].score.level > 15)
-                       Players[0].score.level = 15;
+               Players[0].score.level = MIN(MAX(atof(value), 1), 15);
                break;
        case 'n':       //nick
                memcpy(Players[0].name, value, strlen(value) + 1);
@@ -295,8 +292,7 @@ void CheckClears(int scr)
                                        short junkLines;
                                        netint4 data[1];
 
-                                       if (Game.gravity) junkLines = linesCleared - 1;
-                                       else junkLines = linesCleared - (linesCleared < 4);
+                                       junkLines = linesCleared - (Game.gravity ? 1 : linesCleared < 4);
                                        data[0] = junkLines;
                                        SendPacket(me, NP_giveJunk, sizeof(data), data);
                                        Message("\\%dYou send %d lines",
@@ -329,7 +325,7 @@ void OneGame(void)
                                        Message("<\\%d%s\\7> %s",
                                                Players[me].team > 7 ? 7 : Players[me].team,
                                                Players[me].name, chatText);
-                                       if (game==GT_classicTwo)
+                                       if (game == GT_classicTwo)
                                                SendPacket(me, NP_msg, strlen(chatText) + 1, chatText);
                                        memset(chatText, 0, sizeof(chatText));
                                } //say it
@@ -337,6 +333,7 @@ void OneGame(void)
                                return;
                        } //leave chat mode
                } //enter pressed (start/stop chat mode)
+
                if (chatMode) {
                        if (key == 27) //escape
                                chatMode = 0;
@@ -347,6 +344,7 @@ void OneGame(void)
                        Messagetype(key, strlen(chatText) - 1, chatText);
                        return;
                } //key in chat mode
+
                if (!(p = strchr(keyTable, tolower(key)))) return;
                key = p - keyTable;
                if (Players[me].alive <= 0 && key != KT_quit) return;
@@ -584,24 +582,24 @@ void OneGame(void)
                        break;
                } //(un)pause
                case NP_part:
+                       // player left
                        checkPaused();
                        oldPaused = 0;
-               {
                        Players[net.uid].alive = -1;
                        Message("%s left", Players[net.uid].name);
                        checkPaused();
                        ShowPause(net.uid);
                        changed = 1;
                        break;
-               } //player left
                case NP_argghhh:
                {
                        char i;
                        memcpy(&i, net.data, sizeof(i));
                        Players[net.uid].alive = 0;
-                       if (i == me) Message("\\%dYou fragged %s",
+                       if (i == me)
+                               Message("\\%dYou fragged %s",
                                        Players[me].team > 7 ? 7 : Players[me].team, Players[net.uid].name);
-                       else if (i==net.uid)
+                       else if (i == net.uid)
                                Message("\\%d%s died",
                                        Players[i].team > 7 ? 7 : Players[i].team, Players[i].name);
                        else