Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Menu fixes.

Browse Source
This commit is contained in:
momo5502 2015-12-31 13:45:29 +01:00
parent fb8aa17ab1
commit f3fef92c46
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Modules/Menus.cpp
View File

@ -160,7 +160,7 @@ namespace Components
continue; continue;
} }
if (!key->func((Game::itemDef_t*)menu, handle)) if (!key->func(menu, handle))
{ {
Game::PC_SourceError(handle, "couldn't parse menu keyword %s", token.string); Game::PC_SourceError(handle, "couldn't parse menu keyword %s", token.string);
break; // Fail break; // Fail
@ -266,7 +266,7 @@ namespace Components
} }
// Load custom menus // Load custom menus
if (std::string(menuList->name) == "ui_mp/code.txt") if (std::string(menuList->name) == "ui_mp/menus.txt")
{ {
for (auto menu : Menus::CustomMenus) for (auto menu : Menus::CustomMenus)
{ {

2
src/Game/Structs.hpp
View File

@ -808,7 +808,7 @@ namespace Game
typedef struct keywordHash_s typedef struct keywordHash_s
{ {
char *keyword; char *keyword;
bool(*func)(itemDef_t *item, int handle); bool(*func)(menuDef_t *item, int handle);
//struct keywordHash_s *next; //struct keywordHash_s *next;
} keywordHash_t; } keywordHash_t;