git.shiar.nl
/
netris.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
non-exclusive instadrop and soft drop
[netris.git]
/
client.c
diff --git
a/client.c
b/client.c
index 9c228d857d4a756c4944689ca7b7fd420be88a51..788684cf0282be3be353b3c9dc90adc0d025907c 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-21,6
+21,7
@@
#include "netris.h"
#include <stdlib.h>
#include "netris.h"
#include <stdlib.h>
+#include <stdbool.h>
#include <ctype.h>
#include <string.h>
#include <sys/types.h>
#include <ctype.h>
#include <string.h>
#include <sys/types.h>
@@
-51,12
+52,12
@@
static struct option options[] = {
};
enum {
};
enum {
- KT_left, KT_right, KT_rotright, KT_rotleft, KT_drop, KT_down,
+ KT_left, KT_right, KT_rotright, KT_rotleft, KT_drop, KT_d
ropsoft, KT_d
own,
KT_faster, KT_pause, KT_redraw, KT_say, KT_quit, KT_numKeys
};
static char *keyNames[KT_numKeys+1] = {
KT_faster, KT_pause, KT_redraw, KT_say, KT_quit, KT_numKeys
};
static char *keyNames[KT_numKeys+1] = {
- "Left", "Right", "RotRight", "RotLeft", "Drop", "Down",
+ "Left", "Right", "RotRight", "RotLeft", "Drop", "D
ropSoft", "D
own",
"Faster", "Pause", "Redraw", "Say", "Quit", NULL
};
"Faster", "Pause", "Redraw", "Say", "Quit", NULL
};
@@
-332,7
+333,6
@@
void OneGame(void)
{
int changed = 0;
short gameStatus = 2; //2=loop; 1=new piece; 0=quit
{
int changed = 0;
short gameStatus = 2; //2=loop; 1=new piece; 0=quit
- int dropMode = 0;
int chatMode = 0;
char chatText[MSG_WIDTH] = "\0";
int chatMode = 0;
char chatText[MSG_WIDTH] = "\0";
@@
-345,6
+345,7
@@
void OneGame(void)
gameStatus = 0;
return;
case CT_pause:
gameStatus = 0;
return;
case CT_pause:
+ if (Players[me].alive <= 0) return;
Players[me].flags ^= SCF_paused;
if (Game.started > 1)
Message(Players[me].flags & SCF_paused
Players[me].flags ^= SCF_paused;
if (Game.started > 1)
Message(Players[me].flags & SCF_paused
@@
-425,30
+426,33
@@
void OneGame(void)
if (!(p = strchr(keyTable, tolower(key)))) return;
key = p - keyTable;
if (!(p = strchr(keyTable, tolower(key)))) return;
key = p - keyTable;
- // global actions (always possible, even if not playing)
+ bool handle_key(char key)
+ {
switch (key) {
case KT_redraw:
clear();
InitFields();
// ScheduleFullRedraw();
refresh();
switch (key) {
case KT_redraw:
clear();
InitFields();
// ScheduleFullRedraw();
refresh();
- return;
+ return
1
;
case KT_say:
chatMode = 1;
Messagetype(key, strlen(chatText) - 1, chatText);
case KT_say:
chatMode = 1;
Messagetype(key, strlen(chatText) - 1, chatText);
- return;
+ return
1
;
case KT_quit:
case KT_quit:
- return handle_cmd(CT_quit, NULL);
- }
-
- if (Players[me].alive <= 0) return;
- // actions available while in game
- switch (key) {
+ handle_cmd(CT_quit, NULL);
+ return 1;
case KT_pause:
case KT_pause:
- return handle_cmd(CT_pause, NULL);
+ handle_cmd(CT_pause, NULL);
+ return 1;
+ default:
+ return 0;
}
}
+ }
+ // global actions (always possible, even if not playing)
+ if (handle_key(key)) return;
- if (paused) return;
+ if (
Players[me].alive <= 0 ||
paused) return;
// actions only available while actually playing
switch (key) {
case KT_left:
// actions only available while actually playing
switch (key) {
case KT_left:
@@
-471,14
+475,19
@@
void OneGame(void)
else
gameStatus = 1; //completely dropped
break;
else
gameStatus = 1; //completely dropped
break;
- case KT_drop:
+ case KT_drop
soft
:
SetITimer(Game.speed, Game.speed);
if (DropPiece(me)) {
if (spied) SendPacket(me, NP_drop, 0, NULL);
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
}
else gameStatus = 1; //dropped
- dropMode = Sets.dropmode > 1;
+ break;
+ case KT_drop:
+ SetITimer(Game.speed, Game.speed);
+ if (DropPiece(me)) {
+ if (spied) SendPacket(me, NP_drop, 0, NULL);
+ }
+ gameStatus = 1; // drop
break;
case KT_faster:
if (game != GT_onePlayer) break;
break;
case KT_faster:
if (game != GT_onePlayer) break;
@@
-490,11
+499,6
@@
void OneGame(void)
changed = 1;
break;
}
changed = 1;
break;
}
-
- if (dropMode && DropPiece(me) > 0) {
- SetITimer(Game.speed, Game.speed);
- if (spied) SendPacket(me, NP_drop, 0, NULL);
- }
return;
} //GameKey
return;
} //GameKey
@@
-765,7
+769,6
@@
GameLoop:
oldPaused = paused;
} //(un)pause
} //game loop
oldPaused = paused;
} //(un)pause
} //game loop
- dropMode = 0;
Players[me].score.score++;
CheckClears(me);
} //new piece loop
Players[me].score.score++;
CheckClears(me);
} //new piece loop