Browse Source

gameui: fix disconnect in video settings for multiplayer games

pull/260/merge
nillerusr 9 months ago
parent
commit
047f8b1185
  1. 2
      gameui/OptionsSubVideo.cpp
  2. 6
      wscript

2
gameui/OptionsSubVideo.cpp

@ -508,7 +508,7 @@ public: @@ -508,7 +508,7 @@ public:
if ( panel == m_pDXLevel && RequiresRestart() )
{
// notify the user that this will require a disconnect
QueryBox *box = new QueryBox("#GameUI_SettingRequiresDisconnect_Title", "#GameUI_SettingRequiresDisconnect_Info");
QueryBox *box = new QueryBox("#GameUI_SettingRequiresDisconnect_Title", "#GameUI_SettingRequiresDisconnect_Info", this);
box->AddActionSignalTarget( this );
box->SetCancelCommand(new KeyValues("ResetDXLevelCombo"));
box->DoModal();

6
wscript

@ -239,9 +239,9 @@ def define_platform(conf): @@ -239,9 +239,9 @@ def define_platform(conf):
'_DLL_EXT=.so'
])
if conf.env.DEST_OS != 'win32':
conf.define('NO_MALLOC_OVERRIDE', 1)
conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1)
# if conf.env.DEST_OS != 'win32':
# conf.define('NO_MALLOC_OVERRIDE', 1)
# conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1)
if conf.options.DEBUG_ENGINE:
conf.env.append_unique('DEFINES', [

Loading…
Cancel
Save