jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make TXT_NewDropdownList values parameter const

Browse source
This commit is contained in:
Turo Lamminen 2018-03-27 19:28:43 +03:00
parent 0c4fe5bbe5
commit fccdde81b5
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/setup/multiplayer.c
View file

@ -59,7 +59,7 @@ static const iwad_t fallback_iwads[] = {
// Array of IWADs found to be installed // Array of IWADs found to be installed
static const iwad_t **found_iwads; static const iwad_t **found_iwads;
static char **iwad_labels; static const char **iwad_labels;
// Index of the currently selected IWAD // Index of the currently selected IWAD
@ -71,49 +71,49 @@ static char *iwadfile;
static const char *wad_extensions[] = { "wad", "lmp", "deh", NULL }; static const char *wad_extensions[] = { "wad", "lmp", "deh", NULL };
static char *doom_skills[] = static const char *doom_skills[] =
{ {
"I'm too young to die.", "Hey, not too rough.", "Hurt me plenty.", "I'm too young to die.", "Hey, not too rough.", "Hurt me plenty.",
"Ultra-Violence.", "NIGHTMARE!", "Ultra-Violence.", "NIGHTMARE!",
}; };
static char *chex_skills[] = static const char *chex_skills[] =
{ {
"Easy does it", "Not so sticky", "Gobs of goo", "Extreme ooze", "Easy does it", "Not so sticky", "Gobs of goo", "Extreme ooze",
"SUPER SLIMEY!" "SUPER SLIMEY!"
}; };
static char *heretic_skills[] = static const char *heretic_skills[] =
{ {
"Thou needeth a wet-nurse", "Yellowbellies-R-us", "Bringest them oneth", "Thou needeth a wet-nurse", "Yellowbellies-R-us", "Bringest them oneth",
"Thou art a smite-meister", "Black plague possesses thee" "Thou art a smite-meister", "Black plague possesses thee"
}; };
static char *hexen_fighter_skills[] = static const char *hexen_fighter_skills[] =
{ {
"Squire", "Knight", "Warrior", "Berserker", "Titan" "Squire", "Knight", "Warrior", "Berserker", "Titan"
}; };
static char *hexen_cleric_skills[] = static const char *hexen_cleric_skills[] =
{ {
"Altar boy", "Acolyte", "Priest", "Cardinal", "Pope" "Altar boy", "Acolyte", "Priest", "Cardinal", "Pope"
}; };
static char *hexen_mage_skills[] = static const char *hexen_mage_skills[] =
{ {
"Apprentice", "Enchanter", "Sorceror", "Warlock", "Archimage" "Apprentice", "Enchanter", "Sorceror", "Warlock", "Archimage"
}; };
static char *strife_skills[] = static const char *strife_skills[] =
{ {
"Training", "Rookie", "Veteran", "Elite", "Bloodbath" "Training", "Rookie", "Veteran", "Elite", "Bloodbath"
}; };
static char *character_classes[] = { "Fighter", "Cleric", "Mage" }; static const char *character_classes[] = { "Fighter", "Cleric", "Mage" };
static char *gamemodes[] = { "Co-operative", "Deathmatch", "Deathmatch 2.0" }; static const char *gamemodes[] = { "Co-operative", "Deathmatch", "Deathmatch 2.0" };
static char *strife_gamemodes[] = static const char *strife_gamemodes[] =
{ {
"Normal deathmatch", "Normal deathmatch",
"Items respawn", // (altdeath) "Items respawn", // (altdeath)

2
src/setup/sound.c
View file

@ -34,7 +34,7 @@ typedef enum
NUM_OPLMODES, NUM_OPLMODES,
} oplmode_t; } oplmode_t;
static char *opltype_strings[] = static const char *opltype_strings[] =
{ {
"OPL2", "OPL2",
"OPL3" "OPL3"

2
textscreen/examples/guitest.c
View file

@ -88,7 +88,7 @@ void CloseWindow(TXT_UNCAST_ARG(button), void *user_data)
void UnicodeWindow(TXT_UNCAST_ARG(widget), void *user_data) void UnicodeWindow(TXT_UNCAST_ARG(widget), void *user_data)
{ {
static char *strings[] = { static const char *strings[] = {
"lunedì", "martedì", "mercoledì", "giovedì", "lunedì", "martedì", "mercoledì", "giovedì",
"venerdì", "sabato", "domenica", "venerdì", "sabato", "domenica",
}; };

2
textscreen/txt_dropdown.c
View file

@ -288,7 +288,7 @@ txt_widget_class_t txt_dropdown_list_class =
NULL, NULL,
}; };
txt_dropdown_list_t *TXT_NewDropdownList(int *variable, char **values, txt_dropdown_list_t *TXT_NewDropdownList(int *variable, const char **values,
int num_values) int num_values)
{ {
txt_dropdown_list_t *list; txt_dropdown_list_t *list;

4
textscreen/txt_dropdown.h
View file

@ -43,7 +43,7 @@ struct txt_dropdown_list_s
{ {
txt_widget_t widget; txt_widget_t widget;
int *variable; int *variable;
char **values; const char **values;
int num_values; int num_values;
}; };
@ -62,7 +62,7 @@ struct txt_dropdown_list_s
*/ */
txt_dropdown_list_t *TXT_NewDropdownList(int *variable, txt_dropdown_list_t *TXT_NewDropdownList(int *variable,
char **values, int num_values); const char **values, int num_values);
#endif /* #ifndef TXT_DROPDOWN_H */ #endif /* #ifndef TXT_DROPDOWN_H */