Browse Source

Fix external .lmp loading

pull/51/head
nillerusr 3 years ago
parent
commit
a1d8c59d01
  1. 4
      engine/modelloader.cpp
  2. 2
      gameui/BasePanel.cpp

4
engine/modelloader.cpp

@ -483,7 +483,8 @@ void CMapLoadHelper::Init( model_t *pMapModel, const char *loadname )
s_pMap = &g_ModelLoader.m_worldBrushData; s_pMap = &g_ModelLoader.m_worldBrushData;
#if 0 // nillerusr: Fuck you johns
// XXX(johns): There are security issues with this system currently. sv_pure doesn't handle unexpected/mismatched // XXX(johns): There are security issues with this system currently. sv_pure doesn't handle unexpected/mismatched
// lumps, so players can create lumps for maps not using them to wallhack/etc.. Currently unused, // lumps, so players can create lumps for maps not using them to wallhack/etc.. Currently unused,
// disabling until we have time to make a proper security pass. // disabling until we have time to make a proper security pass.
@ -530,7 +531,6 @@ void CMapLoadHelper::Init( model_t *pMapModel, const char *loadname )
} }
} }
} }
#endif
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
gameui/BasePanel.cpp

@ -292,6 +292,7 @@ public:
MenuItem *item = new CGameMenuItem(this, itemName); MenuItem *item = new CGameMenuItem(this, itemName);
item->AddActionSignalTarget(target); item->AddActionSignalTarget(target);
item->SetCommand(command); item->SetCommand(command);
item->SetProportional(true);
item->SetText(itemText); item->SetText(itemText);
item->SetUserData(userData); item->SetUserData(userData);
return BaseClass::AddMenuItem(item); return BaseClass::AddMenuItem(item);
@ -302,6 +303,7 @@ public:
MenuItem *item = new CGameMenuItem(this, itemName); MenuItem *item = new CGameMenuItem(this, itemName);
item->AddActionSignalTarget(target); item->AddActionSignalTarget(target);
item->SetCommand(command); item->SetCommand(command);
item->SetProportional(true);
item->SetText(itemText); item->SetText(itemText);
item->SetUserData(userData); item->SetUserData(userData);
return BaseClass::AddMenuItem(item); return BaseClass::AddMenuItem(item);

Loading…
Cancel
Save