diff --git a/FalloutScriptDecompile.cpp b/FalloutScriptDecompile.cpp index 0e6c7fd..34d2e33 100644 --- a/FalloutScriptDecompile.cpp +++ b/FalloutScriptDecompile.cpp @@ -855,7 +855,7 @@ void CFalloutScript::SetBordersOfBlocks(CNodeArray& NodeArray) } } -void CFalloutScript::ReduceConditionalExpressions(CNodeArray& NodeArray) +void CFalloutScript::ReduceConditionalExpressions(CNodeArray& /*NodeArray*/) { /* if (NodeArray.IsEmpty()) diff --git a/FalloutScriptStore.cpp b/FalloutScriptStore.cpp index fe87e16..039d014 100644 --- a/FalloutScriptStore.cpp +++ b/FalloutScriptStore.cpp @@ -989,7 +989,7 @@ std::string CFalloutScript::GetSource(CNode& node, bool bLabel, uint32_t ulNumAr return strResult; } -std::string CFalloutScript::GetSource( CNode& node, bool bLabel, uint32_t ulNumArgs, uint32_t aulProcArg[], uint32_t ulProcArgCount) +std::string CFalloutScript::GetSource( CNode& node, bool /*bLabel*/, uint32_t ulNumArgs, uint32_t aulProcArg[], uint32_t ulProcArgCount) { COpcode::COpcodeAttributes attributes = node.m_Opcode.GetAttributes(); std::string strResult = attributes.m_strName + "("; diff --git a/Hacks/CMap.h b/Hacks/CMap.h index 69b911a..f3fd52a 100644 --- a/Hacks/CMap.h +++ b/Hacks/CMap.h @@ -57,11 +57,6 @@ class CMap } return false; } - - void InitHashTable(uint32_t n) - { - - } }; #endif // CMAP_H diff --git a/Namespace.cpp b/Namespace.cpp index 787f62a..4a297cc 100644 --- a/Namespace.cpp +++ b/Namespace.cpp @@ -23,7 +23,6 @@ extern std::ofstream g_ofstream; CNamespace::CNamespace() { - m_Map.InitHashTable(128); } CNamespace::~CNamespace() diff --git a/OpcodeAttributes.cpp b/OpcodeAttributes.cpp index c8a7820..5615c32 100644 --- a/OpcodeAttributes.cpp +++ b/OpcodeAttributes.cpp @@ -64,8 +64,6 @@ COpcode::CF1OpcodeAttributesMap::CF1OpcodeAttributesMap() COpcode::COpcodeAttributes::Type expression = COpcode::COpcodeAttributes::TYPE_EXPRESSION; //COpcode::COpcodeAttributes::Category infix = COpcode::COpcodeAttributes::CATEGORY_INFIX; - InitHashTable(32); - SetAt(O_REACTION, COpcodeAttributes("O_REACTION", "reaction", 3, expression)); SetAt(O_ANIMATE_JUMP, COpcodeAttributes("O_ANIMATE_JUMP", "animate_jump", 0)); SetAt(O_TURN_OFF_OBJS_IN_AREA, COpcodeAttributes("O_TURN_OFF_OBJS_IN_AREA", "turn_off_objs_in_area", 4)); @@ -83,8 +81,6 @@ COpcode::CF2OpcodeAttributesMap::CF2OpcodeAttributesMap() COpcode::COpcodeAttributes::Type expression = COpcode::COpcodeAttributes::TYPE_EXPRESSION; COpcode::COpcodeAttributes::Category infix = COpcode::COpcodeAttributes::CATEGORY_INFIX; - InitHashTable(512); - SetAt(O_NOOP, COpcodeAttributes("O_NOOP", "/* O_NOOP */", 0)); SetAt(O_CONST, COpcodeAttributes("O_CONST", "/* O_CONST */", 0)); SetAt(O_CRITICAL_START, COpcodeAttributes("O_CRITICAL_START", "/* O_CRITICAL_START */", 0)); diff --git a/XGetopt.cpp b/XGetopt.cpp index 54158a1..aa76370 100644 --- a/XGetopt.cpp +++ b/XGetopt.cpp @@ -198,7 +198,8 @@ int getopt(int argc, char *argv[], const char *optstring) if (cp == NULL || c == ':') return '?'; - cp++; + cp++; + if (*cp == ':') { if (*next != '\0')