zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix considering string static value to not be true for visible expressions

Browse Source
This commit is contained in:
Jan 2023-09-24 14:18:15 +02:00
parent b8b4b7ce21
commit 5ee5056c5d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
View File

@ -502,7 +502,7 @@ namespace IW4
{ {
const auto* staticValue = dynamic_cast<const SimpleExpressionValue*>(expression); const auto* staticValue = dynamic_cast<const SimpleExpressionValue*>(expression);
isStatic = staticValue != nullptr; isStatic = staticValue != nullptr;
isTruthy = isStatic && staticValue->IsTruthy(); isTruthy = isStatic && (staticValue->m_type == SimpleExpressionValue::Type::INT || staticValue->m_type == SimpleExpressionValue::Type::DOUBLE) && staticValue->IsTruthy();
} }
else else
{ {

5
src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp
View File

@ -504,7 +504,7 @@ namespace IW5
{ {
const auto* staticValue = dynamic_cast<const SimpleExpressionValue*>(expression); const auto* staticValue = dynamic_cast<const SimpleExpressionValue*>(expression);
isStatic = staticValue != nullptr; isStatic = staticValue != nullptr;
isTruthy = isStatic && staticValue->IsTruthy(); isTruthy = isStatic && (staticValue->m_type == SimpleExpressionValue::Type::INT || staticValue->m_type == SimpleExpressionValue::Type::DOUBLE) && staticValue->IsTruthy();
} }
else else
{ {
@ -663,7 +663,8 @@ namespace IW5
return outputSet; return outputSet;
} }
_NODISCARD ItemKeyHandler* ConvertKeyHandler(const std::multimap<int, std::unique_ptr<CommonEventHandlerSet>>& keyHandlers, const CommonMenuDef* menu, const CommonItemDef* item = nullptr) const _NODISCARD ItemKeyHandler* ConvertKeyHandler(const std::multimap<int, std::unique_ptr<CommonEventHandlerSet>>& keyHandlers, const CommonMenuDef* menu,
const CommonItemDef* item = nullptr) const
{ {
if (keyHandlers.empty()) if (keyHandlers.empty())
return nullptr; return nullptr;