Browse Source

gamemenu: rename sgFooMenu to FooMenu

Rationale described in sanctuary/notes@c316cef7b71958e424ebfb81e9ffcd67c4e4be43
as included below:

Note, the names of SingleMenu, MultiMenu and OptionsMenu
are inferred from the PSX debug names:

	struct OMENUITEM GameMenu[8]
	struct OMENUITEM GameOverMenu[3]
	struct OMENUITEM GameSpeedMenu[4]
	struct OMENUITEM InfoMenu[2]
	struct OMENUITEM MainMenu[9]
	struct OMENUITEM MemcardGameMenu[6]
	struct OMENUITEM MemcardLoadGameMenu[4]
	struct OMENUITEM MemcardLoadGameOverMenu[4]
	struct OMENUITEM MemcardLoadOptionsMenu[4]
	struct OMENUITEM MemcardSaveGameMenu[4]
	struct OMENUITEM MemcardSaveOptionsMenu[4]
	struct OMENUITEM MonstViewMenu[3]
	struct OMENUITEM QuitMenu[4]
	struct OMENUITEM SoundMenu[6]
pull/202/head^2^2
Robin Eklind 7 years ago committed by Anders Jenbo
parent
commit
5e7abe4239
  1. 36
      Source/gamemenu.cpp

36
Source/gamemenu.cpp

@ -1,6 +1,6 @@
#include "diablo.h"
TMenuItem sgSingleMenu[6] = {
TMenuItem SingleMenu[6] = {
// clang-format off
// dwFlags, pszStr, fnMenu
{ GMENU_ENABLED, "Save Game", &gamemenu_save_game },
@ -11,7 +11,7 @@ TMenuItem sgSingleMenu[6] = {
{ GMENU_ENABLED, NULL, NULL }
// clang-format on
};
TMenuItem sgMultiMenu[5] = {
TMenuItem MultiMenu[5] = {
// clang-format off
// dwFlags, pszStr, fnMenu
{ GMENU_ENABLED, "Options", &gamemenu_options },
@ -21,7 +21,7 @@ TMenuItem sgMultiMenu[5] = {
{ GMENU_ENABLED, NULL, NULL }
// clang-format on
};
TMenuItem sgOptionMenu[6] = {
TMenuItem OptionMenu[6] = {
// clang-format off
// dwFlags, pszStr, fnMenu
{ GMENU_ENABLED | GMENU_SLIDER, NULL, &gamemenu_music_volume },
@ -43,10 +43,10 @@ void gamemenu_previous()
if (gbMaxPlayers == 1) {
proc = gamemenu_enable_single;
item = sgSingleMenu;
item = SingleMenu;
} else {
proc = gamemenu_enable_multi;
item = sgMultiMenu;
item = MultiMenu;
}
gmenu_call_proc(item, proc);
PressEscKey();
@ -56,18 +56,18 @@ void gamemenu_enable_single(TMenuItem *pMenuItems)
{
BOOL enable;
gmenu_enable(&sgSingleMenu[3], gbValidSaveFile);
gmenu_enable(&SingleMenu[3], gbValidSaveFile);
enable = FALSE;
if (plr[myplr]._pmode != PM_DEATH && !deathflag)
enable = TRUE;
gmenu_enable(sgSingleMenu, enable);
gmenu_enable(SingleMenu, enable);
}
void gamemenu_enable_multi(TMenuItem *pMenuItems)
{
gmenu_enable(&sgMultiMenu[2], deathflag);
gmenu_enable(&MultiMenu[2], deathflag);
}
void gamemenu_off()
@ -166,12 +166,12 @@ void gamemenu_options(BOOL bActivate)
gamemenu_get_sound();
gamemenu_get_gamma();
gamemenu_get_color_cycling();
gmenu_call_proc(sgOptionMenu, NULL);
gmenu_call_proc(OptionMenu, NULL);
}
void gamemenu_get_music()
{
gamemenu_sound_music_toggle(music_toggle_names, sgOptionMenu, sound_get_or_set_music_volume(1));
gamemenu_sound_music_toggle(music_toggle_names, OptionMenu, sound_get_or_set_music_volume(1));
}
void gamemenu_sound_music_toggle(char **names, TMenuItem *menu_item, int volume)
@ -190,18 +190,18 @@ void gamemenu_sound_music_toggle(char **names, TMenuItem *menu_item, int volume)
void gamemenu_get_sound()
{
gamemenu_sound_music_toggle(sound_toggle_names, &sgOptionMenu[1], sound_get_or_set_sound_volume(1));
gamemenu_sound_music_toggle(sound_toggle_names, &OptionMenu[1], sound_get_or_set_sound_volume(1));
}
void gamemenu_get_color_cycling()
{
sgOptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling() & 1];
OptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling() & 1];
}
void gamemenu_get_gamma()
{
gmenu_slider_steps(&sgOptionMenu[2], 15);
gmenu_slider_set(&sgOptionMenu[2], 30, 100, UpdateGamma(0));
gmenu_slider_steps(&OptionMenu[2], 15);
gmenu_slider_set(&OptionMenu[2], 30, 100, UpdateGamma(0));
}
void gamemenu_music_volume(BOOL bActivate)
@ -222,7 +222,7 @@ void gamemenu_music_volume(BOOL bActivate)
return;
}
volume = gamemenu_slider_music_sound(sgOptionMenu);
volume = gamemenu_slider_music_sound(OptionMenu);
sound_get_or_set_music_volume(volume);
if (volume == VOLUME_MIN) {
@ -264,7 +264,7 @@ void gamemenu_sound_volume(BOOL bActivate)
sound_get_or_set_sound_volume(VOLUME_MAX);
}
} else {
volume = gamemenu_slider_music_sound(&sgOptionMenu[1]);
volume = gamemenu_slider_music_sound(&OptionMenu[1]);
sound_get_or_set_sound_volume(volume);
if (volume == VOLUME_MIN) {
if (gbSoundOn) {
@ -297,7 +297,7 @@ void gamemenu_gamma(BOOL bActivate)
int gamemenu_slider_gamma()
{
return gmenu_slider_get(&sgOptionMenu[2], 30, 100);
return gmenu_slider_get(&OptionMenu[2], 30, 100);
}
void gamemenu_color_cycling(BOOL bActivate)
@ -305,5 +305,5 @@ void gamemenu_color_cycling(BOOL bActivate)
BOOL color_cycling;
color_cycling = palette_set_color_cycling(palette_get_colour_cycling() == 0);
sgOptionMenu[3].pszStr = color_cycling_toggle_names[color_cycling & 1];
OptionMenu[3].pszStr = color_cycling_toggle_names[color_cycling & 1];
}

Loading…
Cancel
Save