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:
eb820d6
)
remove dropmode setting
author
Mischa POSLAWSKY
<netris@shiar.org>
Mon, 5 Mar 2007 07:59:32 +0000
(08:59 +0100)
committer
Mischa POSLAWSKY
<netris@shiar.org>
Mon, 5 Mar 2007 07:59:32 +0000
(08:59 +0100)
client.c
patch
|
blob
|
history
netris.h
patch
|
blob
|
history
diff --git
a/client.c
b/client.c
index 788684cf0282be3be353b3c9dc90adc0d025907c..6c45fc3af617b77146c3ebd5e1c3fa896e68ff88 100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-41,7
+41,6
@@
static struct option options[] = {
{ "level", 1, 0, 'l' },
{ "nick", 1, 0, 'n' },
{ "team", 1, 0, 't' },
{ "level", 1, 0, 'l' },
{ "nick", 1, 0, 'n' },
{ "team", 1, 0, 't' },
- { "dropmode", 2, 0, 'd' },
{ "color", 2, 0, 'C' },
{ "slowterm", 2, 0, 'S' },
{ "keys", 1, 0, 'k' },
{ "color", 2, 0, 'C' },
{ "slowterm", 2, 0, 'S' },
{ "keys", 1, 0, 'k' },
@@
-134,8
+133,6
@@
void Usage(void)
" -t, --team <team>\tJoin a team (don't receive lines from your teammates)\n"
" -l, --level <lvl>\tBegin at a higher level (can be used as handicap)\n"
" -k, --keys <keys>\tRemap keys (default is \"%s\" for cursors)\n"
" -t, --team <team>\tJoin a team (don't receive lines from your teammates)\n"
" -l, --level <lvl>\tBegin at a higher level (can be used as handicap)\n"
" -k, --keys <keys>\tRemap keys (default is \"%s\" for cursors)\n"
- " -d, --dropmode\tDrops go into drop mode\n"
- " -D, --instadrop\tInstant drop\n"
"\n"
" -r, --robot <cmd>\tExecute program to control the game instead of keyboard\n"
" -F, --fair-robot\tUse fair robot interface\n"
"\n"
" -r, --robot <cmd>\tExecute program to control the game instead of keyboard\n"
" -F, --fair-robot\tUse fair robot interface\n"
@@
-170,9
+167,6
@@
void HandleOption(char tag, char *value)
case 't': //team
Players[0].team = atoi(value);
break;
case 't': //team
Players[0].team = atoi(value);
break;
- case 'd': //dropmode
- Sets.dropmode = value ? atoi(value) : 1;
- break;
case 'C': //color
Sets.color = value && strcasecmp(value, "0") ? 1 : 0;
break;
case 'C': //color
Sets.color = value && strcasecmp(value, "0") ? 1 : 0;
break;
@@
-805,7
+799,6
@@
int main(int argc, char **argv)
strncpy(Players[0].name, userName, 16); //sizeof(Player.name)
Players[0].name[16] = 0;
Players[0].alive = 1;
strncpy(Players[0].name, userName, 16); //sizeof(Player.name)
Players[0].name[16] = 0;
Players[0].alive = 1;
- Players[0].dropmode = 0;
} //set defaults
// if (getopt(argc, argv, "f:") == 'f')
} //set defaults
// if (getopt(argc, argv, "f:") == 'f')
@@
-813,7
+806,7
@@
int main(int argc, char **argv)
// else
ReadConf(CONFIG_FILE);
while ((ch = getopt_long(
// else
ReadConf(CONFIG_FILE);
while ((ch = getopt_long(
- argc, argv, "hHRk:c:n:o
dD
SCap:i:l:t:", options, NULL
+ argc, argv, "hHRk:c:n:oSCap:i:l:t:", options, NULL
)) != -1)
HandleOption(ch, optarg);
if (optind < argc) {
)) != -1)
HandleOption(ch, optarg);
if (optind < argc) {
diff --git
a/netris.h
b/netris.h
index 489dfaccdb4aa2a03a049f96c016de579f737cd8..af6841424fc00dcd1a9e9cbc6b5a2eeab98c7e4c 100644
(file)
--- a/
netris.h
+++ b/
netris.h
@@
-161,7
+161,6
@@
typedef struct {
char name[16];
int flags;
int team;
char name[16];
int flags;
int team;
- int dropmode;
int boardHeight, boardWidth, boardVisible;
int curX, curY;
char curShape, nextShape;
int boardHeight, boardWidth, boardVisible;
int curX, curY;
char curShape, nextShape;