mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 19:29:47 +02:00
Code Issues Projects Releases Wiki Activity

Improve error messages for lua scenarios

Browse Source
This commit is contained in:
titiger
2016-11-26 15:46:32 +01:00
parent 32c7208a18
commit 18af2b7113
4 changed files with 173 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1336
source/glest_game/game/script_manager.cpp
View File

File diff suppressed because it is too large Load Diff

4
source/glest_game/game/script_manager.h
View File

@@ -26,6 +26,7 @@
#include "xml_parser.h" #include "xml_parser.h"
#include "randomgen.h" #include "randomgen.h"
#include "leak_dumper.h" #include "leak_dumper.h"
#include "platform_util.h"
using std::string; using std::string;
using std::list; using std::list;
@@ -35,6 +36,7 @@ using Shared::Lua::LuaHandle;
using Shared::Xml::XmlNode; using Shared::Xml::XmlNode;
using Shared::Util::RandomGen; using Shared::Util::RandomGen;
namespace Glest{ namespace Game{ namespace Glest{ namespace Game{
class World; class World;
@@ -429,6 +431,8 @@ private:
ControlType getFactionPlayerType(int factionIndex); ControlType getFactionPlayerType(int factionIndex);
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
static void error(LuaHandle* luaHandle, const megaglest_runtime_error *mgErr, const char* file, const char* function, int line);
//callbacks, commands //callbacks, commands
static int networkShowMessageForFaction(LuaHandle* luaHandle); static int networkShowMessageForFaction(LuaHandle* luaHandle);
static int networkShowMessageForTeam(LuaHandle* luaHandle); static int networkShowMessageForTeam(LuaHandle* luaHandle);

8
source/glest_game/types/faction_type.cpp
View File

@@ -310,7 +310,7 @@ void FactionType::load(const string &factionName, const TechTree *techTree, Chec
} else if(current=="off") { } else if(current=="off") {
healthbarVisible=healthbarVisible|hbvOff; healthbarVisible=healthbarVisible|hbvOff;
} else { } else {
throw megaglest_runtime_error("Unknown Healthbar Visible Option: " + current, validationMode); throw megaglest_runtime_error("Unknown Healthbar Visible Option: " + current, true);
} }
} }
} }
@@ -912,7 +912,7 @@ const UnitType *FactionType::getUnitType(const string &name) const{
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] scanning [%s] idx = %d [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,name.c_str(),i,unitTypes[i].getName(false).c_str()); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] scanning [%s] idx = %d [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,name.c_str(),i,unitTypes[i].getName(false).c_str());
} }
throw megaglest_runtime_error("Unit type not found: [" + name + "] in faction type [" + this->name + "]"); throw megaglest_runtime_error("Unit type not found: [" + name + "] in faction type [" + this->name + "]",true);
} }
const UnitType *FactionType::getUnitTypeById(int id) const{ const UnitType *FactionType::getUnitTypeById(int id) const{
@@ -932,7 +932,7 @@ const UnitType *FactionType::getUnitTypeById(int id) const{
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] scanning [%s] idx = %d [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,name.c_str(),i,unitTypes[i].getName(false).c_str()); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] scanning [%s] idx = %d [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,name.c_str(),i,unitTypes[i].getName(false).c_str());
} }
throw megaglest_runtime_error("Unit type not found: [" + intToStr(id) + "] in faction type [" + this->name + "]"); throw megaglest_runtime_error("Unit type not found: [" + intToStr(id) + "] in faction type [" + this->name + "]",true);
} }
const UpgradeType *FactionType::getUpgradeType(const string &name) const{ const UpgradeType *FactionType::getUpgradeType(const string &name) const{
@@ -952,7 +952,7 @@ const UpgradeType *FactionType::getUpgradeType(const string &name) const{
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] scanning [%s] idx = %d [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,name.c_str(),i,upgradeTypes[i].getName().c_str()); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] scanning [%s] idx = %d [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,name.c_str(),i,upgradeTypes[i].getName().c_str());
} }
throw megaglest_runtime_error("Upgrade type not found: [" + name + "] in faction type [" + this->name + "]"); throw megaglest_runtime_error("Upgrade type not found: [" + name + "] in faction type [" + this->name + "]",true);
} }
int FactionType::getStartingResourceAmount(const ResourceType *resourceType) const{ int FactionType::getStartingResourceAmount(const ResourceType *resourceType) const{

10
source/shared_lib/sources/lua/lua_script.cpp
View File

@@ -547,7 +547,7 @@ void LuaScript::loadCode(string code, string name){
printf("Function name [%s]\ncode:\n%s\n",name.c_str(),code.c_str()); printf("Function name [%s]\ncode:\n%s\n",name.c_str(),code.c_str());
printf("=========================================================\n"); printf("=========================================================\n");
throw megaglest_runtime_error("Error loading lua code: " + errorToString(errorCode)); throw megaglest_runtime_error("Error loading lua code: " + errorToString(errorCode),true);
} }
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d] name [%s], errorCode = %d\n",__FILE__,__FUNCTION__,__LINE__,name.c_str(),errorCode); if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d] name [%s], errorCode = %d\n",__FILE__,__FUNCTION__,__LINE__,name.c_str(),errorCode);
@@ -559,7 +559,7 @@ void LuaScript::loadCode(string code, string name){
printf("Error calling lua pcall: %s\n",errorToString(errorCode).c_str()); printf("Error calling lua pcall: %s\n",errorToString(errorCode).c_str());
printf("=========================================================\n"); printf("=========================================================\n");
throw megaglest_runtime_error("Error initializing lua: " + errorToString(errorCode)); throw megaglest_runtime_error("Error initializing lua: " + errorToString(errorCode),true);
} }
//const char *errMsg = lua_tostring(luaState, -1); //const char *errMsg = lua_tostring(luaState, -1);
@@ -622,7 +622,7 @@ void LuaScript::endCall() {
printf("Trying to execute [%s]\n",safeWrapper.c_str()); printf("Trying to execute [%s]\n",safeWrapper.c_str());
int errorCode= runCode(safeWrapper); int errorCode= runCode(safeWrapper);
if(errorCode !=0 ) { if(errorCode !=0 ) {
throw megaglest_runtime_error("Error calling lua function [" + currentLuaFunction + "] error: " + errorToString(errorCode)); throw megaglest_runtime_error("Error calling lua function [" + currentLuaFunction + "] error: " + errorToString(errorCode),true);
} }
//printf("Trying to execute [%s]\n",currentLuaFunction.c_str()); //printf("Trying to execute [%s]\n",currentLuaFunction.c_str());
@@ -638,7 +638,7 @@ void LuaScript::endCall() {
else { else {
int errorCode= lua_pcall(luaState, argumentCount, 0, 0); int errorCode= lua_pcall(luaState, argumentCount, 0, 0);
if(errorCode !=0 ) { if(errorCode !=0 ) {
throw megaglest_runtime_error("Error calling lua function [" + currentLuaFunction + "] error: " + errorToString(errorCode)); throw megaglest_runtime_error("Error calling lua function [" + currentLuaFunction + "] error: " + errorToString(errorCode),true);
} }
} }
} }
@@ -1139,7 +1139,7 @@ void LuaArguments::throwLuaError(const string &message) const{
Lua_STREFLOP_Wrapper streflopWrapper; Lua_STREFLOP_Wrapper streflopWrapper;
string stackString = getStackText(); string stackString = getStackText();
throw megaglest_runtime_error("Lua error: " + message + "\n\nLua Stack:\n" + stackString); throw megaglest_runtime_error("Lua error: " + message + "\n\nLua Stack:\n" + stackString,true);
} }
}}//end namespace }}//end namespace