Merge commit 'f1ad42c'

This commit is contained in:
Rachael Alexanderson 2017-06-12 00:22:59 -04:00
commit a148212215
13 changed files with 222 additions and 69 deletions

View file

@ -1124,7 +1124,7 @@ DEFINE_FIELD(FOptionMenuSettings, mLinespacing)
struct IJoystickConfig;
// These functions are used by dynamic menu creation.
DMenuItemBase * CreateOptionMenuItemStaticText(const char *name, bool v)
DMenuItemBase * CreateOptionMenuItemStaticText(const char *name, int v)
{
auto c = PClass::FindClass("OptionMenuItemStaticText");
auto p = c->CreateNew();