Cosmetics.

This commit is contained in:
Markus Armbruster 2003-12-17 21:26:26 +00:00
parent aa377df359
commit d8cb7c48f0
11 changed files with 15 additions and 21 deletions

View file

@ -41,4 +41,4 @@ struct fn {
int value; int value;
}; };
#endif /* _FNLIST_H_ */ #endif /* _FNLIST_H_ */

View file

@ -62,7 +62,7 @@ typedef u_char natid; /* also change NSC_NATID in nsc.h */
#if !defined(aix) && !defined(sgi) #if !defined(aix) && !defined(sgi)
#ifndef ultrix /* already defined in ultrix */ #ifndef ultrix /* already defined in ultrix */
typedef char s_char; /* change to signed char for aix */ typedef char s_char; /* change to signed char for aix */
#endif /* ultrix */ #endif /* ultrix */
#else #else
typedef signed char s_char; typedef signed char s_char;
#endif /* !aix && !sgi */ #endif /* !aix && !sgi */

View file

@ -41,4 +41,4 @@ struct qelem {
struct qelem *q_back; struct qelem *q_back;
}; };
#endif /* _QUEUE */ #endif /* _QUEUE */

View file

@ -743,9 +743,7 @@ build_bridge(register struct sctstr *sp, register int *vec)
xyas(sp->sct_x, sp->sct_y, player->cnum)); xyas(sp->sct_x, sp->sct_y, player->cnum));
nav_map(sp->sct_x, sp->sct_y, 1); nav_map(sp->sct_x, sp->sct_y, 1);
} }
if (! if (!(p = getstarg(player->argp[3], "build span in what direction? ", buf))
(p =
getstarg(player->argp[3], "build span in what direction? ", buf))
|| !*p) { || !*p) {
return 0; return 0;
} }
@ -1071,9 +1069,7 @@ build_tower(register struct sctstr *sp, register int *vec)
pr("Building from %s\n", xyas(sp->sct_x, sp->sct_y, player->cnum)); pr("Building from %s\n", xyas(sp->sct_x, sp->sct_y, player->cnum));
nav_map(sp->sct_x, sp->sct_y, 1); nav_map(sp->sct_x, sp->sct_y, 1);
} }
if (! if (!(p = getstarg(player->argp[3], "build tower in what direction? ", buf))
(p =
getstarg(player->argp[3], "build tower in what direction? ", buf))
|| !*p) { || !*p) {
return 0; return 0;
} }

View file

@ -171,7 +171,7 @@ sail(void)
cp = player->argp[2]; cp = player->argp[2];
if ((*player->argp[0] == 'q') /*qsail command */ ||(cp && *cp == 'q')) { if ((*player->argp[0] == 'q') /*qsail command */ ||(cp && *cp == 'q')) {
return (show_sail(&nstr)); return (show_sail(&nstr));
} else if (*player->argp[0] == 'u' /*unsail command */ } else if (*player->argp[0] == 'u' /*unsail command */
|| (cp && *cp == '-')) { || (cp && *cp == '-')) {
return (cmd_unsail_ship(&nstr)); return (cmd_unsail_ship(&nstr));
} else } else

View file

@ -52,7 +52,7 @@ s_char dirch[] = {
/* must agree with dirch[] and DIR_ defines */ /* must agree with dirch[] and DIR_ defines */
int diroff[][2] = { int diroff[][2] = {
{0, 0}, {1, -1}, {2, 0}, {1, 1}, {-1, 1}, {-2, 0}, {-1, -1}, {0, 0}, {0, 0}, {1, -1}, {2, 0}, {1, 1}, {-1, 1}, {-2, 0}, {-1, -1}, {0, 0},
{0, 0} {0, 0}
}; };
/* this maps a character from a to z into the diroff mappings. It /* this maps a character from a to z into the diroff mappings. It

View file

@ -40,7 +40,7 @@ s_char *effadv_list[] = {
/* must follow nation relation defines in nat.h */ /* must follow nation relation defines in nat.h */
s_char *relates[] = { s_char *relates[] = {
"At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly", "At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly",
"Allied" "Allied"
}; };
/* must follow reject flags defined in nat.h */ /* must follow reject flags defined in nat.h */

View file

@ -148,8 +148,8 @@ extern int grin();
extern int shar(); extern int shar();
extern int sail(); /* Forsman's hacks */ extern int sail(); /* Forsman's hacks */
extern int foll(); extern int foll();
/**/ extern int mobq(); extern int mobq();
/**/ extern int name(); extern int name();
extern int range(); extern int range();
extern int zdon(); extern int zdon();
extern int fuel(); extern int fuel();
@ -287,7 +287,8 @@ struct cmndstr player_coms[] = {
{"drop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COMM>", 1, drop, C_MOD, NORM + MONEY + CAP}, {"drop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COMM>", 1, drop, C_MOD, NORM + MONEY + CAP},
{"dump <SECTS> [<fields>]", 0, dump, 0, NORM}, {"dump <SECTS> [<fields>]", 0, dump, 0, NORM},
{"echo [<string>]", 0, echo, 0, NORM}, {"echo [<string>]", 0, echo, 0, NORM},
{"edit <country|land|unit|ship|plane|nuke> [<KEY> <VALUE>]...", 0, edit, C_MOD, GOD}, {"edit <country|land|unit|ship|plane|nuke> [<KEY> <VALUE>]...", 0,
edit, C_MOD, GOD},
{"enable", 0, enab, C_MOD, GOD}, {"enable", 0, enab, C_MOD, GOD},
{"enlist <SECTS> <NUM>", 2, enli, C_MOD, NORM + MONEY + CAP}, {"enlist <SECTS> <NUM>", 2, enli, C_MOD, NORM + MONEY + CAP},
{"execute <INPUT FILE>", 0, execute, 0, VIS}, {"execute <INPUT FILE>", 0, execute, 0, VIS},

View file

@ -76,8 +76,8 @@ getele(s_char *nation, s_char *buf)
pr("%s", buf); pr("%s", buf);
continue; continue;
} }
if (buffer[0] == '.' && ((buffer[1] == 0) || if (buffer[0] == '.' && ((buffer[1] == 0)
(buffer[1] == '\n') || (buffer[1] == '\n')
|| (buffer[1] == '\r'))) || (buffer[1] == '\r')))
break; break;
len = strlen(buffer); len = strlen(buffer);

View file

@ -430,9 +430,6 @@ perform_mission(coord x, coord y, natid victim, struct emp_qelem *list,
{ {
extern int land_max_interdiction_range; extern int land_max_interdiction_range;
extern int ship_max_interdiction_range; extern int ship_max_interdiction_range;
s_char *mission_name(short int mission), *nameofitem(s_char *buf,
struct genitem
*gp, int type);
struct emp_qelem *qp, missiles, bombers, escorts, airp, b, e; struct emp_qelem *qp, missiles, bombers, escorts, airp, b, e;
struct emp_qelem *newqp; struct emp_qelem *newqp;
struct genlist *glp; struct genlist *glp;

View file

@ -144,7 +144,7 @@ void *argv;
dp = player_new(0, 0); dp = player_new(0, 0);
stacksize = 100000 + stacksize = 100000 +
/* finish_sects */ WORLD_X * WORLD_Y * (2 * sizeof(double) + /* finish_sects */ WORLD_X * WORLD_Y * (2 * sizeof(double) +
sizeof(s_char *)); sizeof(s_char *));
empth_create(PP_UPDATE, update_main, stacksize, 0, empth_create(PP_UPDATE, update_main, stacksize, 0,
"UpdateRun", "Updates the world", dp); "UpdateRun", "Updates the world", dp);