OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- instead of discarding protected menu replacements, try to merge them with the original version.

Browse source 
Testing with Adventures of Square this mostly works, but it is clear that a list of old and deleted CVARs still needs to be added so that any items referring to those can be eliminated as well. Some stuff is still slipping through that refers to features which no longer exist.
This commit is contained in:
Christoph Oelckers 2017-06-11 22:30:40 +02:00
commit f1ad42c4e5
4 changed files with 89 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/menu/menu.h
View file

@ -109,6 +109,7 @@ extern FSavegameManager savegameManager;
class DMenu;
extern DMenu *CurrentMenu;
extern int MenuTime;
class DMenuItemBase;
//=============================================================================
//
@ -125,18 +126,17 @@ public:
FString mNetgameMessage;
PClass *mClass = nullptr;
bool mProtected = false;
TArray<DMenuItemBase *> mItems;
virtual size_t PropagateMark() { return 0; }
};
class DMenuItemBase;
class DListMenuDescriptor : public DMenuDescriptor
{
DECLARE_CLASS(DListMenuDescriptor, DMenuDescriptor)
public:
TArray<DMenuItemBase *> mItems;
int mSelectedItem;
double mSelectOfsX;
double mSelectOfsY;
@ -187,7 +187,6 @@ class DOptionMenuDescriptor : public DMenuDescriptor
DECLARE_CLASS(DOptionMenuDescriptor, DMenuDescriptor)
public:
TArray<DMenuItemBase *> mItems;
FString mTitle;
int mSelectedItem;
int mDrawTop;
@ -350,7 +349,7 @@ void M_MarkMenus();
struct IJoystickConfig;
DMenuItemBase * CreateOptionMenuItemStaticText(const char *name, bool v);
DMenuItemBase * CreateOptionMenuItemStaticText(const char *name, int v = -1);
DMenuItemBase * CreateOptionMenuItemSubmenu(const char *label, FName cmd, int center);
DMenuItemBase * CreateOptionMenuItemControl(const char *label, FName cmd, FKeyBindings *bindings);
DMenuItemBase * CreateOptionMenuItemJoyConfigMenu(const char *label, IJoystickConfig *joy);