zone/zonetool
zone/zonetool
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix rect expressions; Fix missing execkey keywords

Browse Source
This commit is contained in:
aerosoul 2021-02-05 14:44:06 -06:00
parent 6d09fd7e2d
commit aa4475b185
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/IW4/Assets/MenuDef.cpp
View File

@ -372,8 +372,8 @@ namespace ZoneTool
emit_statement("visible when", asset->visibleExp); emit_statement("visible when", asset->visibleExp);
emit_statement("exp rect x", asset->rectXExp); emit_statement("exp rect x", asset->rectXExp);
emit_statement("exp rect y", asset->rectYExp); emit_statement("exp rect y", asset->rectYExp);
emit_statement("exp rect h", asset->rectHExp);
emit_statement("exp rect w", asset->rectWExp); emit_statement("exp rect w", asset->rectWExp);
emit_statement("exp rect h", asset->rectHExp);
emit_statement("exp openSound", asset->openSoundExp); emit_statement("exp openSound", asset->openSoundExp);
emit_statement("exp closeSound", asset->closeSoundExp); emit_statement("exp closeSound", asset->closeSoundExp);
emit_item_key_handler("execKeyInt", asset->onKey); emit_item_key_handler("execKeyInt", asset->onKey);
@ -672,7 +672,8 @@ namespace ZoneTool
{ {
if (handler) if (handler)
{ {
emit_menu_event_handler_set("", handler->action); std::string keyName = std::string(name) + " "s + std::to_string(handler->key);
emit_menu_event_handler_set(keyName.c_str(), handler->action);
emit_item_key_handler("execKeyInt", handler->next); emit_item_key_handler("execKeyInt", handler->next);
} }
} }
@ -969,6 +970,7 @@ namespace ZoneTool
// clean indentation and semi colons // clean indentation and semi colons
out += "\n"; out += "\n";
replace_all(out, "\"", ""); // Remove all quotes
replace_all(out, "\t;", "\t"); replace_all(out, "\t;", "\t");
replace_all(out, tabs + "\n", ""); replace_all(out, tabs + "\n", "");
replace_all(out, " ; \n", ";\n"); replace_all(out, " ; \n", ";\n");

2
src/IW4/Structs.hpp
View File

@ -2771,8 +2771,8 @@ namespace ZoneTool
float focusColor[4]; float focusColor[4];
Statement_s* rectXExp; Statement_s* rectXExp;
Statement_s* rectYExp; Statement_s* rectYExp;
Statement_s* rectHExp;
Statement_s* rectWExp; Statement_s* rectWExp;
Statement_s* rectHExp;
Statement_s* openSoundExp; Statement_s* openSoundExp;
Statement_s* closeSoundExp; Statement_s* closeSoundExp;
itemDef_t** items; itemDef_t** items;