From a1d8c59d01c27acaecddb710608520b7fa529d13 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Fri, 11 Feb 2022 11:00:57 +0300 Subject: [PATCH] Fix external .lmp loading --- engine/modelloader.cpp | 4 ++-- gameui/BasePanel.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/engine/modelloader.cpp b/engine/modelloader.cpp index 72a479d4..a8fc1f19 100644 --- a/engine/modelloader.cpp +++ b/engine/modelloader.cpp @@ -483,7 +483,8 @@ void CMapLoadHelper::Init( model_t *pMapModel, const char *loadname ) 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 // 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. @@ -530,7 +531,6 @@ void CMapLoadHelper::Init( model_t *pMapModel, const char *loadname ) } } } -#endif } //----------------------------------------------------------------------------- diff --git a/gameui/BasePanel.cpp b/gameui/BasePanel.cpp index fdb5be43..5391c5f7 100644 --- a/gameui/BasePanel.cpp +++ b/gameui/BasePanel.cpp @@ -292,6 +292,7 @@ public: MenuItem *item = new CGameMenuItem(this, itemName); item->AddActionSignalTarget(target); item->SetCommand(command); + item->SetProportional(true); item->SetText(itemText); item->SetUserData(userData); return BaseClass::AddMenuItem(item); @@ -302,6 +303,7 @@ public: MenuItem *item = new CGameMenuItem(this, itemName); item->AddActionSignalTarget(target); item->SetCommand(command); + item->SetProportional(true); item->SetText(itemText); item->SetUserData(userData); return BaseClass::AddMenuItem(item);