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

(retr, lretr): Readability fixes.

Browse source
This commit is contained in:
Markus Armbruster 2006-04-30 12:52:30 +00:00
parent 901499908c
commit f59fd6e8eb
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ retr(void)
int isfleet = 0; int isfleet = 0;
int rflags = -2; int rflags = -2;
int zero; int zero;
unsigned x; unsigned i;
char buf1[1024]; char buf1[1024];
char buf2[1024]; char buf2[1024];
@ -76,8 +76,8 @@ retr(void)
return RET_SYN; return RET_SYN;
rflags = 0 | isfleet; rflags = 0 | isfleet;
for (x = 0; x < strlen(fl); x++) for (i = 0; i < strlen(fl); i++) {
switch (*(fl + x)) { switch (fl[i]) {
case 'I': case 'I':
case 'i': case 'i':
rflags |= RET_INJURED; rflags |= RET_INJURED;
@ -122,6 +122,7 @@ retr(void)
pr("d\tretreat when depth-charged\n"); pr("d\tretreat when depth-charged\n");
pr("u\tretreat when boarded\n"); pr("u\tretreat when boarded\n");
} }
}
if (rflags == isfleet) { if (rflags == isfleet) {
pr("Must give retreat conditions!\n"); pr("Must give retreat conditions!\n");
return RET_FAIL; return RET_FAIL;
@ -204,7 +205,7 @@ lretr(void)
int zero; int zero;
char buf1[1024]; char buf1[1024];
char buf2[1024]; char buf2[1024];
unsigned x; unsigned i;
if (!snxtitem(&ni, EF_LAND, player->argp[1])) if (!snxtitem(&ni, EF_LAND, player->argp[1]))
return RET_SYN; return RET_SYN;
@ -223,8 +224,8 @@ lretr(void)
return RET_SYN; return RET_SYN;
rflags = 0 | isarmy; rflags = 0 | isarmy;
for (x = 0; x < strlen(fl); x++) for (i = 0; i < strlen(fl); i++) {
switch (*(fl + x)) { switch (fl[i]) {
case 'I': case 'I':
case 'i': case 'i':
rflags |= RET_INJURED; rflags |= RET_INJURED;
@ -249,6 +250,7 @@ lretr(void)
pr("h\tretreat when helpless\n"); pr("h\tretreat when helpless\n");
pr("b\tretreat when bombed\n"); pr("b\tretreat when bombed\n");
} }
}
if (rflags == isarmy) { if (rflags == isarmy) {
pr("Must give retreat conditions!\n"); pr("Must give retreat conditions!\n");
return RET_FAIL; return RET_FAIL;