diff --git a/.gitignore b/.gitignore index baf7dcb..3f10287 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ CMakeFiles CMakeCache.txt CMakeLists.txt.user +CMakeSettings.json Makefile *.dump *.int @@ -13,4 +14,5 @@ int2ssl nbproject/ Release/ Debug/ -.idea/ \ No newline at end of file +.idea/ +.vs/ \ No newline at end of file diff --git a/FalloutScript.cpp b/FalloutScript.cpp index 0c016e8..e081273 100644 --- a/FalloutScript.cpp +++ b/FalloutScript.cpp @@ -30,7 +30,7 @@ CFalloutScript::~CFalloutScript() void CFalloutScript::Serialize() { - std::cout << " Read strtup code" << std::endl; + std::cout << " Read startup code" << std::endl; m_StartupCode.Serialize(); std::cout << " Read procedures table" << std::endl; diff --git a/FalloutScriptStore.cpp b/FalloutScriptStore.cpp index 55dbcf1..99da5d1 100644 --- a/FalloutScriptStore.cpp +++ b/FalloutScriptStore.cpp @@ -94,7 +94,7 @@ void CFalloutScript::StoreDefinitions() for(uint32_t i = 0; i < m_GlobalVar.size(); i++) { ulVarValue = m_GlobalVar[i].GetArgument(); - strDefinition += "variable "; + strDefinition = "variable "; strDefinition += m_GlobalVarsNames[i]; switch(m_GlobalVar[i].GetOperator()) diff --git a/Namespace.cpp b/Namespace.cpp index 984f189..787f62a 100644 --- a/Namespace.cpp +++ b/Namespace.cpp @@ -97,7 +97,7 @@ void CNamespace::Serialize() for(uint32_t i = 0; i < strNonGraph.length(); i++) { - strNewString = replace(strNewString, "" + strNonGraph[i], "\\" + strEscape[i]); + strNewString = replace(strNewString, std::string() + strNonGraph[i], std::string("\\") + strEscape[i]); } m_Map.SetAt(ulTotalRead + 6, strNewString); diff --git a/main.cpp b/main.cpp index aebb88a..7c65f3f 100644 --- a/main.cpp +++ b/main.cpp @@ -40,10 +40,10 @@ bool ProcessCommandLine(int argc, char* argv[]); int main(int argc, char* argv[]) { - std::cout << "Fallout script decompiler, version 8.4.0 (sfall edition)" << std::endl + std::cout << "Fallout script decompiler, version 8.4.1 (sfall edition)" << std::endl << "Copyright (C) Anchorite (TeamX), 2005-2009" << std::endl << "anchorite2001@yandex.ru" << std::endl - << "Continued by Nirran, phobos2077 (2014-2016)" << std::endl + << "Continued by Nirran, phobos2077 (2014-2017)" << std::endl << "Crossplatformed by alexeevdv (2015)" << std::endl; if (argc < 2 || !ProcessCommandLine(argc, argv))