Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
doom: fix types mismatch spotted by gcc 4.5.1
- some variables were defined as const but declared without const
- remove double declaration of mapnames* (already in .h)
- forceOldBsp is boolean, not int
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27660 a1c6a512-1295-4272-9138-f99709370657
+7
-19
+1
-1
apps/plugins/doom/d_deh.h
+1
-1
apps/plugins/doom/d_deh.h
+2
-2
apps/plugins/doom/g_game.c
+2
-2
apps/plugins/doom/g_game.c
···
844
844
if ((netgame || demoplayback) && cmd->forwardmove > TURBOTHRESHOLD &&
845
845
!(gametic&31) && ((gametic>>5)&3) == i )
846
846
{
847
-
extern char *player_names[];
847
+
extern const char *player_names[];
848
848
/* cph - don't use sprintf, use doom_printf */
849
849
doom_printf ("%s is turbo!", player_names[i]);
850
850
}
···
2241
2241
// byte(s) should still be skipped over or padded with 0's.
2242
2242
// Lee Killough 3/1/98
2243
2243
2244
-
extern int forceOldBsp;
2244
+
extern boolean forceOldBsp;
2245
2245
2246
2246
byte *G_WriteOptions(byte *demo_p)
2247
2247
{
-12
apps/plugins/doom/hu_stuff.c
-12
apps/plugins/doom/hu_stuff.c
···
227
227
extern int armor_yellow;
228
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
230
// key tables
243
231
// jff 5/10/98 french support removed,
244
232
// as it was not being used and couldn't be easily tested
+4
-4
apps/plugins/doom/hu_stuff.h
+4
-4
apps/plugins/doom/hu_stuff.h
···
84
84
extern int hud_active; /* hud mode 0=off, 1=small, 2=full */
85
85
extern int hud_nosecrets; /* status does not list secrets/items/kills */
86
86
87
-
extern char **mapnames[];
88
-
extern char **mapnames2[];
89
-
extern char **mapnamesp[];
90
-
extern char **mapnamest[];
87
+
extern const char ** const mapnames[];
88
+
extern const char ** const mapnames2[];
89
+
extern const char ** const mapnamesp[];
90
+
extern const char ** const mapnamest[];
91
91
92
92
#endif