OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- scriptified the entire OptionMenu class and all still existing native subclasses.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-13 00:08:20 +01:00
commit 46c0d27fe7
8 changed files with 471 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/menu/joystickmenu.cpp
View file

@ -124,13 +124,6 @@ DEFINE_ACTION_FUNCTION(IJoystickConfig, SetAxisMap)
DOptionMenuDescriptor *UpdateJoystickConfigMenu(IJoystickConfig *joy);
class DJoystickConfigMenu : public DOptionMenu
{
DECLARE_CLASS(DJoystickConfigMenu, DOptionMenu)
};
IMPLEMENT_CLASS(DJoystickConfigMenu, false, false)
/*=======================================
*
* Joystick Menu
@ -295,7 +288,7 @@ void UpdateJoystickMenu(IJoystickConfig *selected)
if (i == (int)Joysticks.Size())
{
SELECTED_JOYSTICK = NULL;
if (DMenu::CurrentMenu != NULL && DMenu::CurrentMenu->IsKindOf(RUNTIME_CLASS(DJoystickConfigMenu)))
if (DMenu::CurrentMenu != NULL && DMenu::CurrentMenu->IsKindOf("JoystickConfigMenu"))
{
DMenu::CurrentMenu->Close();
}