From c7eeb8f0c70c3d6538b7199f0e2094967413d35d Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Tue, 27 Feb 2007 17:47:00 +0100 Subject: [PATCH] switch() reindent --- curses.c | 101 +++++++++++---------- game.c | 262 +++++++++++++++++++++++++++---------------------------- 2 files changed, 180 insertions(+), 183 deletions(-) diff --git a/curses.c b/curses.c index f9f23db..a2c5234 100644 --- a/curses.c +++ b/curses.c @@ -413,59 +413,56 @@ void PlotBlock1(int y, int x, unsigned char type) } #endif switch (Sets.drawstyle) { - case 2: - switch (type & 192) { - case 64: //right neighbour - addstr("[["); - break; - case 128: //left - addstr("]]"); - break; - default: //both/none - addstr("[]"); - break; - } //horizontal stickiness - break; //ascii horizontally grouped - case 3: - switch (type & 240) { - case 48: - addstr("||"); break; //middle - case 64: case 80: case 96: - addstr("[="); break; //left end - case 112: - addstr("|="); break; - case 128: case 144: case 160: - addstr("=]"); break; //right end - case 176: - addstr("=|"); break; - case 192: case 208: case 224: - addstr("=="); break; - default: - addstr("[]"); break; //top/bottom/mid - } //neighbours - break; //ascii semi-grouped - case 7: - switch (type & 240) { - case 16: addch(ACS_ULCORNER); addch(ACS_URCORNER); break;//top end - case 32: addch(ACS_LLCORNER); addch(ACS_LRCORNER); break;//bottom end - case 48: addch(ACS_VLINE); addch(ACS_VLINE); break; //vertical middle - case 64: addch(' '); addch(ACS_HLINE); break; //left end - case 80: addch(ACS_ULCORNER); addch(ACS_TTEE); break; //top left corner - case 96: addch(ACS_LLCORNER); addch(ACS_BTEE); break; //bottom left corner - case 112: addch(ACS_LTEE); addch(ACS_PLUS); break; //vertical+right - case 128: addch(ACS_HLINE); addch(' '); break; //right end - case 144: addch(ACS_TTEE); addch(ACS_URCORNER); break; //top right corner - case 160: addch(ACS_BTEE); addch(ACS_LRCORNER); break; //bottom right corner - case 176: addch(ACS_PLUS); addch(ACS_RTEE); break; //vertical+left - case 192: addch(ACS_HLINE); addch(ACS_HLINE); break; //horizontal middle - case 208: addch(ACS_TTEE); addch(ACS_TTEE); break; //horizontal+down - case 224: addch(ACS_BTEE); addch(ACS_BTEE); break; //horizontal+up - default: addstr("[]"); break; - } //neighbours - break; //curses grouped + case 2: + switch (type & 192) { + case 64: //right neighbour + addstr("[["); break; + case 128: //left + addstr("]]"); break; + default: //both/none + addstr("[]"); break; + } //horizontal stickiness + break; //ascii horizontally grouped + case 3: + switch (type & 240) { + case 48: + addstr("||"); break; //middle + case 64: case 80: case 96: + addstr("[="); break; //left end + case 112: + addstr("|="); break; + case 128: case 144: case 160: + addstr("=]"); break; //right end + case 176: + addstr("=|"); break; + case 192: case 208: case 224: + addstr("=="); break; default: - addstr("[]"); - break; //ascii non-grouped + addstr("[]"); break; //top/bottom/mid + } //neighbours + break; //ascii semi-grouped + case 7: + switch (type & 240) { + case 16: addch(ACS_ULCORNER); addch(ACS_URCORNER); break;//top end + case 32: addch(ACS_LLCORNER); addch(ACS_LRCORNER); break;//bottom end + case 48: addch(ACS_VLINE); addch(ACS_VLINE); break; //vertical middle + case 64: addch(' '); addch(ACS_HLINE); break; //left end + case 80: addch(ACS_ULCORNER); addch(ACS_TTEE); break; //top left corner + case 96: addch(ACS_LLCORNER); addch(ACS_BTEE); break; //bottom left corner + case 112: addch(ACS_LTEE); addch(ACS_PLUS); break; //vertical+right + case 128: addch(ACS_HLINE); addch(' '); break; //right end + case 144: addch(ACS_TTEE); addch(ACS_URCORNER); break; //top right corner + case 160: addch(ACS_BTEE); addch(ACS_LRCORNER); break; //bottom right corner + case 176: addch(ACS_PLUS); addch(ACS_RTEE); break; //vertical+left + case 192: addch(ACS_HLINE); addch(ACS_HLINE); break; //horizontal middle + case 208: addch(ACS_TTEE); addch(ACS_TTEE); break; //horizontal+down + case 224: addch(ACS_BTEE); addch(ACS_BTEE); break; //horizontal+up + default: addstr("[]"); break; + } //neighbours + break; //curses grouped + default: + addstr("[]"); + break; //ascii non-grouped } //draw block #ifdef HAVE_NCURSES if (Sets.standout) standend(); diff --git a/game.c b/game.c index 21e70b7..7537fc4 100644 --- a/game.c +++ b/game.c @@ -122,59 +122,59 @@ void WriteConf(void) void HandleOption(char tag, char *value) { switch (tag) { - case 'a': //ascii - if (value && !strcasecmp(value, "0")) Sets.ascii = 0; - else Sets.ascii = 1; - break; - case 'c': //connect - game = GT_classicTwo; - hostStr = value; - break; - case 'p': //port - port = atoi(value); - break; - case 'i': //speed (of level 1) - 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; - break; - case 'n': //nick - memcpy(Players[0].name, value, strlen(value) + 1); - break; - case 't': //team - Players[0].team = atoi(value); - break; - case 'd': //dropmode - Sets.dropmode = atoi(value); - break; - case 'C': //color - if (value && !strcasecmp(value, "1")) Sets.color = 1; - else Sets.color = 0; - break; - case 'S': //slowterm - if (value && !strcasecmp(value, "1")) Sets.standout = 1; - else Sets.standout = 0; - break; - case 'k': //keys - MapKeys(value); - break; - case 'H': //info - Header(); - DistInfo(); - exit(0); - case 'R': //rules - Rules(); - exit(0); - case 'h': //help - Usage(); - exit(0); - default: - Usage(); - exit(1); + case 'a': //ascii + if (value && !strcasecmp(value, "0")) Sets.ascii = 0; + else Sets.ascii = 1; + break; + case 'c': //connect + game = GT_classicTwo; + hostStr = value; + break; + case 'p': //port + port = atoi(value); + break; + case 'i': //speed (of level 1) + 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; + break; + case 'n': //nick + memcpy(Players[0].name, value, strlen(value) + 1); + break; + case 't': //team + Players[0].team = atoi(value); + break; + case 'd': //dropmode + Sets.dropmode = atoi(value); + break; + case 'C': //color + if (value && !strcasecmp(value, "1")) Sets.color = 1; + else Sets.color = 0; + break; + case 'S': //slowterm + if (value && !strcasecmp(value, "1")) Sets.standout = 1; + else Sets.standout = 0; + break; + case 'k': //keys + MapKeys(value); + break; + case 'H': //info + Header(); + DistInfo(); + exit(0); + case 'R': //rules + Rules(); + exit(0); + case 'h': //help + Usage(); + exit(0); + default: + Usage(); + exit(1); } } @@ -351,69 +351,69 @@ void OneGame(void) if (Players[me].alive <= 0 && key != KT_quit) return; if (paused && key < KT_pause) return; switch (key) { - case KT_left: - if (MovePiece(me, 0, -1) && spied) SendPacket(me, NP_left, 0, NULL); - break; - case KT_right: - if (MovePiece(me, 0, 1) && spied) SendPacket(me, NP_right, 0, NULL); - break; - case KT_rotleft: - if (RotatePiece(me, -1) && spied) SendPacket(me, NP_rotleft, 0, NULL); - break; - case KT_rotright: - if (RotatePiece(me, 1) && spied) SendPacket(me, NP_rotright, 0, NULL); - break; - case KT_down: - SetITimer(Game.speed, Game.speed); - if (MovePiece(me, -1, 0)) { - if (spied) SendPacket(me, NP_down, 0, NULL); - } //move one down - else - gameStatus = 1; //completely dropped - break; - case KT_drop: - SetITimer(Game.speed, Game.speed); - if (DropPiece(me)) { - if (spied) SendPacket(me, NP_drop, 0, NULL); - if (!Sets.dropmode) gameStatus = 1; //instadrop - } - else gameStatus = 1; //dropped - dropMode = Sets.dropmode > 1; - break; - case KT_faster: - if (game != GT_onePlayer) break; - if ((Game.speed /= SPEEDINC) < SPEEDMINIMUM) - Game.speed = SPEEDMINIMUM; - SetITimer(Game.speed, SetITimer(0, 0)); - Players[me].score.level++; - ShowScore(me, Players[me].score); - changed = 1; - break; - case KT_pause: - Players[me].flags ^= SCF_paused; - if (Game.started > 1) - Message(Players[me].flags & SCF_paused - ? "You paused the game" : "You unpaused the game"); - else - Message(Players[me].flags & SCF_paused - ? "You are not ready" : "You are ready"); - checkPaused(); - if (game == GT_classicTwo) - SendPacket(me, NP_pause, 0, NULL); - ShowPause(me); - changed = 1; - break; - case KT_redraw: - clear(); - InitFields(); -// ScheduleFullRedraw(); - refresh(); - break; - case KT_quit: - ShowPause(me); - refresh(); - gameStatus = 0; - break; + case KT_left: + if (MovePiece(me, 0, -1) && spied) SendPacket(me, NP_left, 0, NULL); + break; + case KT_right: + if (MovePiece(me, 0, 1) && spied) SendPacket(me, NP_right, 0, NULL); + break; + case KT_rotleft: + if (RotatePiece(me, -1) && spied) SendPacket(me, NP_rotleft, 0, NULL); + break; + case KT_rotright: + if (RotatePiece(me, 1) && spied) SendPacket(me, NP_rotright, 0, NULL); + break; + case KT_down: + SetITimer(Game.speed, Game.speed); + if (MovePiece(me, -1, 0)) { + if (spied) SendPacket(me, NP_down, 0, NULL); + } //move one down + else + gameStatus = 1; //completely dropped + break; + case KT_drop: + SetITimer(Game.speed, Game.speed); + if (DropPiece(me)) { + if (spied) SendPacket(me, NP_drop, 0, NULL); + if (!Sets.dropmode) gameStatus = 1; //instadrop + } + else gameStatus = 1; //dropped + dropMode = Sets.dropmode > 1; + break; + case KT_faster: + if (game != GT_onePlayer) break; + if ((Game.speed /= SPEEDINC) < SPEEDMINIMUM) + Game.speed = SPEEDMINIMUM; + SetITimer(Game.speed, SetITimer(0, 0)); + Players[me].score.level++; + ShowScore(me, Players[me].score); + changed = 1; + break; + case KT_pause: + Players[me].flags ^= SCF_paused; + if (Game.started > 1) + Message(Players[me].flags & SCF_paused + ? "You paused the game" : "You unpaused the game"); + else + Message(Players[me].flags & SCF_paused + ? "You are not ready" : "You are ready"); + checkPaused(); + if (game == GT_classicTwo) + SendPacket(me, NP_pause, 0, NULL); + ShowPause(me); + changed = 1; + break; + case KT_redraw: + clear(); + InitFields(); +// ScheduleFullRedraw(); + refresh(); + break; + case KT_quit: + ShowPause(me); + refresh(); + gameStatus = 0; + break; } //E_key if (dropMode && DropPiece(me) > 0) { SetITimer(Game.speed, Game.speed); @@ -662,21 +662,21 @@ GameLoop: if (playercount < 1) gameStatus = 0; } switch (WaitMyEvent(&event, EM_any)) { - case E_alarm: - if (!paused && Players[me].alive > 0) - if (!MovePiece(me, -1, 0)) //move down - gameStatus = 1; //new piece - else - if (spied) SendPacket(me, NP_down, 0, NULL); - break; - case E_key: - GameKey(event.u.key); - break; - case E_net: - GameNet(event.u.net); - break; - case E_lostConn: - goto gameOver; + case E_alarm: + if (!paused && Players[me].alive > 0) + if (!MovePiece(me, -1, 0)) //move down + gameStatus = 1; //new piece + else + if (spied) SendPacket(me, NP_down, 0, NULL); + break; + case E_key: + GameKey(event.u.key); + break; + case E_net: + GameNet(event.u.net); + break; + case E_lostConn: + goto gameOver; } //handle event if (paused != oldPaused) { if (paused) { -- 2.30.0