git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code cleanup: use terniaries
[netris.git]
/
game.c
diff --git
a/game.c
b/game.c
index 20008f29f6d4338af35714712eeb227543dccf74..64acecc6928b6afae51fd8bdd642570a6d013216 100644
(file)
--- a/
game.c
+++ b/
game.c
@@
-123,8
+123,7
@@
void HandleOption(char tag, char *value)
{
switch (tag) {
case 'a': //ascii
{
switch (tag) {
case 'a': //ascii
- if (value && !strcasecmp(value, "0")) Sets.ascii = 0;
- else Sets.ascii = 1;
+ Sets.ascii = value && !strcasecmp(value, "0") ? 0 : 1;
Sets.drawstyle &= ~Sets.ascii;
break;
case 'c': //connect
Sets.drawstyle &= ~Sets.ascii;
break;
case 'c': //connect
@@
-147,15
+146,13
@@
void HandleOption(char tag, char *value)
Players[0].team = atoi(value);
break;
case 'd': //dropmode
Players[0].team = atoi(value);
break;
case 'd': //dropmode
- Sets.dropmode =
atoi(value)
;
+ Sets.dropmode =
value ? atoi(value) : 1
;
break;
case 'C': //color
break;
case 'C': //color
- if (value && !strcasecmp(value, "1")) Sets.color = 1;
- else Sets.color = 0;
+ Sets.color = value && strcasecmp(value, "0") ? 1 : 0;
break;
case 'S': //slowterm
break;
case 'S': //slowterm
- if (value && !strcasecmp(value, "1")) Sets.standout = 1;
- else Sets.standout = 0;
+ Sets.standout = value && !strcasecmp(value, "0") ? 1 : 0;
break;
case 'k': //keys
MapKeys(value);
break;
case 'k': //keys
MapKeys(value);
@@
-354,16
+351,16
@@
void OneGame(void)
InitFields();
// ScheduleFullRedraw();
refresh();
InitFields();
// ScheduleFullRedraw();
refresh();
-
break
;
+
return
;
case KT_say:
chatMode = 1;
Messagetype(key, strlen(chatText) - 1, chatText);
case KT_say:
chatMode = 1;
Messagetype(key, strlen(chatText) - 1, chatText);
-
break
;
+
return
;
case KT_quit:
ShowPause(me);
refresh();
gameStatus = 0;
case KT_quit:
ShowPause(me);
refresh();
gameStatus = 0;
-
break
;
+
return
;
}
if (Players[me].alive <= 0) return;
}
if (Players[me].alive <= 0) return;
@@
-382,7
+379,7
@@
void OneGame(void)
SendPacket(me, NP_pause, 0, NULL);
ShowPause(me);
changed = 1;
SendPacket(me, NP_pause, 0, NULL);
ShowPause(me);
changed = 1;
-
break
;
+
return
;
}
if (paused) return;
}
if (paused) return;