diff options
Diffstat (limited to 'apps/plugins/doom')
-rw-r--r-- | apps/plugins/doom/d_deh.h | 2 | ||||
-rw-r--r-- | apps/plugins/doom/g_game.c | 4 | ||||
-rw-r--r-- | apps/plugins/doom/hu_stuff.c | 12 | ||||
-rw-r--r-- | apps/plugins/doom/hu_stuff.h | 8 |
4 files changed, 7 insertions, 19 deletions
diff --git a/apps/plugins/doom/d_deh.h b/apps/plugins/doom/d_deh.h index 0844c38be1..0d65260b18 100644 --- a/apps/plugins/doom/d_deh.h +++ b/apps/plugins/doom/d_deh.h | |||
@@ -86,7 +86,7 @@ extern const char *s_QLPROMPT; // = QLPROMPT; | |||
86 | "you can't start a new game\n"\ | 86 | "you can't start a new game\n"\ |
87 | "while in a network game.\n\n"PRESSKEY | 87 | "while in a network game.\n\n"PRESSKEY |
88 | */ | 88 | */ |
89 | extern char *s_NEWGAME; // = NEWGAME; | 89 | extern const char *s_NEWGAME; // = NEWGAME; |
90 | 90 | ||
91 | // CPhipps - message given when asked if to restart the level | 91 | // CPhipps - message given when asked if to restart the level |
92 | extern char *s_RESTARTLEVEL; | 92 | extern char *s_RESTARTLEVEL; |
diff --git a/apps/plugins/doom/g_game.c b/apps/plugins/doom/g_game.c index d4445254f0..f970b66b5a 100644 --- a/apps/plugins/doom/g_game.c +++ b/apps/plugins/doom/g_game.c | |||
@@ -844,7 +844,7 @@ void G_Ticker (void) | |||
844 | if ((netgame || demoplayback) && cmd->forwardmove > TURBOTHRESHOLD && | 844 | if ((netgame || demoplayback) && cmd->forwardmove > TURBOTHRESHOLD && |
845 | !(gametic&31) && ((gametic>>5)&3) == i ) | 845 | !(gametic&31) && ((gametic>>5)&3) == i ) |
846 | { | 846 | { |
847 | extern char *player_names[]; | 847 | extern const char *player_names[]; |
848 | /* cph - don't use sprintf, use doom_printf */ | 848 | /* cph - don't use sprintf, use doom_printf */ |
849 | doom_printf ("%s is turbo!", player_names[i]); | 849 | doom_printf ("%s is turbo!", player_names[i]); |
850 | } | 850 | } |
@@ -2241,7 +2241,7 @@ void G_RecordDemo (const char* name) | |||
2241 | // byte(s) should still be skipped over or padded with 0's. | 2241 | // byte(s) should still be skipped over or padded with 0's. |
2242 | // Lee Killough 3/1/98 | 2242 | // Lee Killough 3/1/98 |
2243 | 2243 | ||
2244 | extern int forceOldBsp; | 2244 | extern boolean forceOldBsp; |
2245 | 2245 | ||
2246 | byte *G_WriteOptions(byte *demo_p) | 2246 | byte *G_WriteOptions(byte *demo_p) |
2247 | { | 2247 | { |
diff --git a/apps/plugins/doom/hu_stuff.c b/apps/plugins/doom/hu_stuff.c index 5361435fd5..639c963f72 100644 --- a/apps/plugins/doom/hu_stuff.c +++ b/apps/plugins/doom/hu_stuff.c | |||
@@ -227,18 +227,6 @@ extern int armor_red; | |||
227 | extern int armor_yellow; | 227 | extern int armor_yellow; |
228 | extern int armor_green; | 228 | extern int armor_green; |
229 | 229 | ||
230 | // | ||
231 | // Builtin map names. | ||
232 | // The actual names can be found in DStrings.h. | ||
233 | // | ||
234 | // Ty 03/27/98 - externalized map name arrays - now in d_deh.c | ||
235 | // and converted to arrays of pointers to char * | ||
236 | // See modified HUTITLEx macros | ||
237 | extern char **mapnames[]; | ||
238 | extern char **mapnames2[]; | ||
239 | extern char **mapnamesp[]; | ||
240 | extern char **mapnamest[]; | ||
241 | |||
242 | // key tables | 230 | // key tables |
243 | // jff 5/10/98 french support removed, | 231 | // jff 5/10/98 french support removed, |
244 | // as it was not being used and couldn't be easily tested | 232 | // as it was not being used and couldn't be easily tested |
diff --git a/apps/plugins/doom/hu_stuff.h b/apps/plugins/doom/hu_stuff.h index c0e927d4bb..8946e06220 100644 --- a/apps/plugins/doom/hu_stuff.h +++ b/apps/plugins/doom/hu_stuff.h | |||
@@ -84,9 +84,9 @@ extern int hud_displayed; /* hud is displayed */ | |||
84 | extern int hud_active; /* hud mode 0=off, 1=small, 2=full */ | 84 | extern int hud_active; /* hud mode 0=off, 1=small, 2=full */ |
85 | extern int hud_nosecrets; /* status does not list secrets/items/kills */ | 85 | extern int hud_nosecrets; /* status does not list secrets/items/kills */ |
86 | 86 | ||
87 | extern char **mapnames[]; | 87 | extern const char ** const mapnames[]; |
88 | extern char **mapnames2[]; | 88 | extern const char ** const mapnames2[]; |
89 | extern char **mapnamesp[]; | 89 | extern const char ** const mapnamesp[]; |
90 | extern char **mapnamest[]; | 90 | extern const char ** const mapnamest[]; |
91 | 91 | ||
92 | #endif | 92 | #endif |