empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

player.h rev. 1.9 changed struct player member argp to char *. The

Browse source 
changeset failed to adapt some s_char * operands.  Fix.
This commit is contained in:
Markus Armbruster 2005-12-28 22:21:42 +00:00
parent 6fdbf215d0
commit 24a07cd249
9 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/commands/echo.c
View file

@ -40,7 +40,7 @@
int int
echo(void) echo(void)
{ {
pr("%s\n", player->argp[1] ? player->argp[1] : (s_char *)""); pr("%s\n", player->argp[1] ? player->argp[1] : "");
return RET_OK; return RET_OK;
} }

2
src/lib/commands/map.c
View file

@ -82,7 +82,7 @@ map(void)
} }
} }
if (player->argp[1] == (s_char *)0) { if (player->argp[1] == NULL) {
if ((str = getstring("(sects)? ", buf)) == 0) if ((str = getstring("(sects)? ", buf)) == 0)
return RET_SYN; return RET_SYN;
} else { } else {

2
src/lib/commands/miss.c
View file

@ -178,7 +178,7 @@ mission(void)
y = 0; y = 0;
} }
if (player->argp[5] != (s_char *)0) { if (player->argp[5] != NULL) {
desired_radius = atoi(player->argp[5]); desired_radius = atoi(player->argp[5]);
if (desired_radius < 0) { if (desired_radius < 0) {
pr("Radius must be greater than zero!\n"); pr("Radius must be greater than zero!\n");

8
src/lib/commands/retr.c
View file

@ -61,10 +61,10 @@ retr(void)
if (!snxtitem(&ni, EF_SHIP, player->argp[1])) if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
return RET_SYN; return RET_SYN;
nships = 0; nships = 0;
if (player->argp[1] != (s_char *)0) if (player->argp[1] != NULL)
if (isalpha(player->argp[1][0])) if (isalpha(player->argp[1][0]))
isfleet = RET_GROUP; isfleet = RET_GROUP;
if (player->argp[2] != (s_char *)0) if (player->argp[2] != NULL)
pq = getstarg(player->argp[2], "Retreat path? ", buf1); pq = getstarg(player->argp[2], "Retreat path? ", buf1);
else else
pq = (s_char *)0; pq = (s_char *)0;
@ -209,10 +209,10 @@ lretr(void)
if (!snxtitem(&ni, EF_LAND, player->argp[1])) if (!snxtitem(&ni, EF_LAND, player->argp[1]))
return RET_SYN; return RET_SYN;
nunits = 0; nunits = 0;
if (player->argp[1] != (s_char *)0) if (player->argp[1] != NULL)
if (isalpha(player->argp[1][0])) if (isalpha(player->argp[1][0]))
isarmy = RET_GROUP; isarmy = RET_GROUP;
if (player->argp[2] != (s_char *)0) if (player->argp[2] != NULL)
pq = getstarg(player->argp[2], "Retreat path? ", buf1); pq = getstarg(player->argp[2], "Retreat path? ", buf1);
else else
pq = (s_char *)0; pq = (s_char *)0;

2
src/lib/commands/rout.c
View file

@ -75,7 +75,7 @@ rout(void)
if ((ip = whatitem(player->argp[1], "What item? ")) == 0) if ((ip = whatitem(player->argp[1], "What item? ")) == 0)
return RET_SYN; return RET_SYN;
i_del = ip->i_vtype;; i_del = ip->i_vtype;;
if (player->argp[2] == (s_char *)0) { if (player->argp[2] == NULL) {
if ((str = getstring("(sects)? ", buf1)) == 0) if ((str = getstring("(sects)? ", buf1)) == 0)
return RET_SYN; return RET_SYN;
} else { } else {

2
src/lib/commands/sect.c
View file

@ -66,7 +66,7 @@ sct(void)
static s_char **map = (s_char **)0; static s_char **map = (s_char **)0;
nsect = 0; nsect = 0;
if (player->argp[1] == (s_char *)0) { if (player->argp[1] == NULL) {
if ((str = getstring("(sects)? ", buf)) == 0) if ((str = getstring("(sects)? ", buf)) == 0)
return RET_SYN; return RET_SYN;
} else { } else {

2
src/lib/commands/surv.c
View file

@ -86,7 +86,7 @@ surv(void)
for (; isspace(*ptr); ++ptr) ; for (; isspace(*ptr); ++ptr) ;
if (*ptr) if (*ptr)
return RET_SYN; return RET_SYN;
if (player->argp[2] == (s_char *)0) { if (player->argp[2] == NULL) {
if ((str = getstring("(sects)? ", buf)) == 0) if ((str = getstring("(sects)? ", buf)) == 0)
return RET_SYN; return RET_SYN;
} else { } else {

2
src/lib/commands/tele.c
View file

@ -73,7 +73,7 @@ tele(void)
int kk; int kk;
kk = 1; kk = 1;
while (player->argp[kk] != (s_char *)0) { while (player->argp[kk] != NULL) {
if ((n = natarg(player->argp[kk], "for which country? ")) < 0) { if ((n = natarg(player->argp[kk], "for which country? ")) < 0) {
if (opt_HIDDEN) { if (opt_HIDDEN) {
if (n < -1) { if (n < -1) {

8
src/lib/subs/attsub.c
View file

@ -706,10 +706,10 @@ att_ask_support(int offset, int *fortp, int *shipp, int *landp,
s_char *p; s_char *p;
*fortp = *shipp = *landp = *planep = 1; *fortp = *shipp = *landp = *planep = 1;
if (player->argp[offset] != (s_char *)0) { if (player->argp[offset] != NULL) {
if ((player->argp[offset + 1] == (s_char *)0) || if ((player->argp[offset + 1] == NULL) ||
(player->argp[offset + 2] == (s_char *)0) || (player->argp[offset + 2] == NULL) ||
(player->argp[offset + 3] == (s_char *)0)) { (player->argp[offset + 3] == NULL)) {
pr("If any support arguments are used, all must be!\n"); pr("If any support arguments are used, all must be!\n");
return RET_SYN; return RET_SYN;
} }