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

Always set parenthesis for operations inside operations because the game is unable to calculate operations behind each other without parenthesis and does also not know what precedence is

Browse Source
This commit is contained in:
Jan 2021-12-29 18:50:34 +01:00
parent 8e4b2bb057
commit 7283cc5640
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,11 @@ namespace IW4
OP_SUBTRACT OP_SUBTRACT
}; };
static bool IsOperation(const ISimpleExpression* expression)
{
return dynamic_cast<const SimpleExpressionBinaryOperation*>(expression) || dynamic_cast<const SimpleExpressionUnaryOperation*>(expression);
}
void ConvertExpressionEntryUnaryOperation(Statement_s* gameStatement, std::vector<expressionEntry>& entries, const SimpleExpressionUnaryOperation* unaryOperation, const CommonMenuDef* menu, void ConvertExpressionEntryUnaryOperation(Statement_s* gameStatement, std::vector<expressionEntry>& entries, const SimpleExpressionUnaryOperation* unaryOperation, const CommonMenuDef* menu,
const CommonItemDef* item) const const CommonItemDef* item) const
{ {
@ -232,7 +237,7 @@ namespace IW4
operation.data.op = UNARY_OPERATION_MAPPING[static_cast<unsigned>(unaryOperation->m_operation_type->m_id)]; operation.data.op = UNARY_OPERATION_MAPPING[static_cast<unsigned>(unaryOperation->m_operation_type->m_id)];
entries.emplace_back(operation); entries.emplace_back(operation);
if (unaryOperation->OperandNeedsParenthesis()) if (IsOperation(unaryOperation->m_operand.get()))
{ {
expressionEntry parenLeft{}; expressionEntry parenLeft{};
parenLeft.type = EET_OPERATOR; parenLeft.type = EET_OPERATOR;
@ -274,7 +279,8 @@ namespace IW4
void ConvertExpressionEntryBinaryOperation(Statement_s* gameStatement, std::vector<expressionEntry>& entries, const SimpleExpressionBinaryOperation* binaryOperation, const CommonMenuDef* menu, void ConvertExpressionEntryBinaryOperation(Statement_s* gameStatement, std::vector<expressionEntry>& entries, const SimpleExpressionBinaryOperation* binaryOperation, const CommonMenuDef* menu,
const CommonItemDef* item) const const CommonItemDef* item) const
{ {
if (binaryOperation->Operand1NeedsParenthesis()) // Game needs all nested operations to have parenthesis
if (IsOperation(binaryOperation->m_operand1.get()))
{ {
expressionEntry parenLeft{}; expressionEntry parenLeft{};
parenLeft.type = EET_OPERATOR; parenLeft.type = EET_OPERATOR;
@ -297,7 +303,8 @@ namespace IW4
operation.data.op = BINARY_OPERATION_MAPPING[static_cast<unsigned>(binaryOperation->m_operation_type->m_id)]; operation.data.op = BINARY_OPERATION_MAPPING[static_cast<unsigned>(binaryOperation->m_operation_type->m_id)];
entries.emplace_back(operation); entries.emplace_back(operation);
if (binaryOperation->Operand2NeedsParenthesis()) // Game needs all nested operations to have parenthesis
if (IsOperation(binaryOperation->m_operand2.get()))
{ {
expressionEntry parenLeft{}; expressionEntry parenLeft{};
parenLeft.type = EET_OPERATOR; parenLeft.type = EET_OPERATOR;