git.shiar.nl
/
netris.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50f9d78
)
configurable chat (say) key
author
Mischa POSLAWSKY
<netris@shiar.org>
Sun, 4 Mar 2007 06:20:40 +0000
(07:20 +0100)
committer
Mischa POSLAWSKY
<netris@shiar.org>
Sun, 4 Mar 2007 06:20:40 +0000
(07:20 +0100)
game.c
patch
|
blob
|
history
netris.h
patch
|
blob
|
history
diff --git
a/game.c
b/game.c
index 5779d84c2ca89f71e7d9f72a04c91ac5a59ff218..32c85db48ab9fe912b4baf283fec8ae974d3de70 100644
(file)
--- a/
game.c
+++ b/
game.c
@@
-52,12
+52,12
@@
static struct option options[] = {
enum {
KT_left, KT_right, KT_rotright, KT_rotleft, KT_drop, KT_down,
enum {
KT_left, KT_right, KT_rotright, KT_rotleft, KT_drop, KT_down,
- KT_faster, KT_pause, KT_redraw, KT_quit, KT_numKeys
+ KT_faster, KT_pause, KT_redraw, KT_
say, KT_
quit, KT_numKeys
};
static char *keyNames[KT_numKeys+1] = {
"Left", "Right", "RotRight", "RotLeft", "Drop", "Down",
};
static char *keyNames[KT_numKeys+1] = {
"Left", "Right", "RotRight", "RotLeft", "Drop", "Down",
- "Faster", "Pause", "Redraw", "Quit", NULL
+ "Faster", "Pause", "Redraw", "
Say", "
Quit", NULL
};
_Sets Sets = {7, 0, 1, 1, 1};
};
_Sets Sets = {7, 0, 1, 1, 1};
@@
-344,13
+344,17
@@
void OneGame(void)
return;
} //key in chat mode
return;
} //key in chat mode
- if (key == 13) {
+ if (!(p = strchr(keyTable, tolower(key)))) return;
+ key = p - keyTable;
+
+ // global actions (always possible, even if not playing)
+ switch (key) {
+ case KT_say:
chatMode = 1;
Messagetype(key, strlen(chatText) - 1, chatText);
chatMode = 1;
Messagetype(key, strlen(chatText) - 1, chatText);
+ break;
}
}
- if (!(p = strchr(keyTable, tolower(key)))) return;
- key = p - keyTable;
if (Players[me].alive <= 0 && key != KT_quit) return;
if (paused && key < KT_pause) return;
switch (key) {
if (Players[me].alive <= 0 && key != KT_quit) return;
if (paused && key < KT_pause) return;
switch (key) {
diff --git
a/netris.h
b/netris.h
index e51486f87f225d40cb4c9ff2204cd29e369a4251..df459eb141478e2c58509ca49c04908bc1468c87 100644
(file)
--- a/
netris.h
+++ b/
netris.h
@@
-63,9
+63,9
@@
typedef long netint4;
#define CONFIG_FILE "netris.conf"
#define CONFIG_FILE "netris.conf"
-//#define DEFAULT_KEYS "hlkj mfp^lq"
-//#define DEFAULT_KEYS "4685 2fp^lq"
-#define DEFAULT_KEYS "dcaf b^fp^lq"
+//#define DEFAULT_KEYS "hlkj mfp^l
t
q"
+//#define DEFAULT_KEYS "4685 2fp^l
^m
q"
+#define DEFAULT_KEYS "dcaf b^fp^l
^m
q"
#define MAX_BOARD_WIDTH 32
#define MAX_BOARD_HEIGHT 64
#define MAX_BOARD_WIDTH 32
#define MAX_BOARD_HEIGHT 64