zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-07 15:31:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed initialization of joystick menu with bogus MENUDEFS

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-16 18:55:36 +01:00
parent cfeb1724fe
commit ccb083ed25
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/menu/joystickmenu.cpp
View file

@ -138,9 +138,13 @@ DEFINE_ACTION_FUNCTION(IJoystickConfig, GetNumAxes)
void UpdateJoystickMenu(IJoystickConfig *selected) void UpdateJoystickMenu(IJoystickConfig *selected)
{ {
DMenuDescriptor **desc = MenuDescriptors.CheckKey(NAME_JoystickOptions); DMenuDescriptor **desc = MenuDescriptors.CheckKey(NAME_JoystickOptions);
DMenuDescriptor **ddesc = MenuDescriptors.CheckKey("JoystickOptionsDefaults");
if (ddesc == nullptr) return; // without any data the menu cannot be set up and must remain empty.
if (desc != NULL && (*desc)->IsKindOf(RUNTIME_CLASS(DOptionMenuDescriptor))) if (desc != NULL && (*desc)->IsKindOf(RUNTIME_CLASS(DOptionMenuDescriptor)))
{ {
DOptionMenuDescriptor *opt = (DOptionMenuDescriptor *)*desc; DOptionMenuDescriptor *opt = (DOptionMenuDescriptor *)*desc;
DOptionMenuDescriptor *dopt = (DOptionMenuDescriptor *)*ddesc;
if (dopt == nullptr) return;
DMenuItemBase *it; DMenuItemBase *it;
int i; int i;
@ -162,11 +166,7 @@ void UpdateJoystickMenu(IJoystickConfig *selected)
} }
} }
} }
#ifdef _WIN32 opt->mItems = dopt->mItems;
opt->mItems.Resize(8);
#else
opt->mItems.Resize(5);
#endif
it = opt->GetItem("ConfigureMessage"); it = opt->GetItem("ConfigureMessage");
if (it != nullptr) it->SetValue(0, !!Joysticks.Size()); if (it != nullptr) it->SetValue(0, !!Joysticks.Size());

2
src/menu/menu.h
View file

@ -112,7 +112,7 @@ class DMenuDescriptor : public DObject
public: public:
FName mMenuName; FName mMenuName;
FString mNetgameMessage; FString mNetgameMessage;
PClass *mClass; PClass *mClass = nullptr;
virtual size_t PropagateMark() { return 0; } virtual size_t PropagateMark() { return 0; }
}; };

4
src/menu/menudef.cpp
View file

@ -950,9 +950,9 @@ void M_ParseMenuDefs()
} }
} }
} }
DefaultListMenuClass = DefaultListMenuSettings->GetClass(); DefaultListMenuClass = DefaultListMenuSettings->mClass;
DefaultListMenuSettings = nullptr; DefaultListMenuSettings = nullptr;
DefaultOptionMenuClass = DefaultOptionMenuSettings->GetClass(); DefaultOptionMenuClass = DefaultOptionMenuSettings->mClass;
DefaultOptionMenuSettings = nullptr; DefaultOptionMenuSettings = nullptr;
} }

7
wadsrc/static/menudef.txt
View file

@ -558,7 +558,7 @@ OptionMenu "MouseOptions"
// //
//------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------
OptionMenu "JoystickOptions" OptionMenu "JoystickOptionsDefaults"
{ {
Title "$JOYMNU_OPTIONS" Title "$JOYMNU_OPTIONS"
Option "$JOYMNU_ENABLE", "use_joystick", "YesNo" Option "$JOYMNU_ENABLE", "use_joystick", "YesNo"
@ -576,6 +576,11 @@ OptionMenu "JoystickOptions"
// The rest will be filled in by joystick code if devices get connected or disconnected // The rest will be filled in by joystick code if devices get connected or disconnected
} }
OptionMenu "JoystickOptions"
{
Title "$JOYMNU_OPTIONS"
}
OptionValue "JoyAxisMapNames" OptionValue "JoyAxisMapNames"
{ {
-1, "$OPTVAL_NONE" -1, "$OPTVAL_NONE"