From 4251045f4c2f36e3f9ae673fa16daefde7c968f2 Mon Sep 17 00:00:00 2001 From: CrosRoad95 Date: Sat, 25 Nov 2017 16:33:59 +0100 Subject: [PATCH 1/2] error argument in `xmlLoadFile` function --- Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp index e08ea10fc78..fc1a71ddf5b 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp @@ -138,6 +138,7 @@ int CLuaXMLDefs::xmlLoadFile ( lua_State* luaVM ) // Grab our resource CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM ); + SString strError = ""; if ( pLuaMain ) { SString strFileInput; @@ -184,6 +185,7 @@ int CLuaXMLDefs::xmlLoadFile ( lua_State* luaVM ) } } + xmlFile->GetLastError ( strError ); // Destroy it if we failed pLuaMain->DestroyXML ( xmlFile ); } @@ -196,7 +198,8 @@ int CLuaXMLDefs::xmlLoadFile ( lua_State* luaVM ) } lua_pushboolean ( luaVM, false ); - return 1; + lua_pushstring ( luaVM, strError ); + return 2; } int CLuaXMLDefs::xmlCopyFile ( lua_State* luaVM ) From 332843a9e17912599fd1b2d67adac5d9a1551139 Mon Sep 17 00:00:00 2001 From: CrosRoad95 Date: Sun, 26 Nov 2017 09:37:58 +0100 Subject: [PATCH 2/2] now print in debug insted of return argument --- Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp index fc1a71ddf5b..6e808799a30 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp @@ -186,6 +186,7 @@ int CLuaXMLDefs::xmlLoadFile ( lua_State* luaVM ) } xmlFile->GetLastError ( strError ); + argStream.SetCustomError(strError, SString("Unable to read XML file %s", strFileInput.c_str())); // Destroy it if we failed pLuaMain->DestroyXML ( xmlFile ); } @@ -198,8 +199,7 @@ int CLuaXMLDefs::xmlLoadFile ( lua_State* luaVM ) } lua_pushboolean ( luaVM, false ); - lua_pushstring ( luaVM, strError ); - return 2; + return 1; } int CLuaXMLDefs::xmlCopyFile ( lua_State* luaVM )