Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for saving / loading booleans in a lua table

This commit is contained in:
SoftCoder 2013-12-30 09:28:25 -08:00
parent 97d11a9cfd
commit 5c90b9148c
7 changed files with 166 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/game/game.cpp
View File

@ -1683,12 +1683,12 @@ void Game::setupPopupMenus(bool checkClientAdminOverrideOnly) {
menuItems.push_back(lang.getString("PauseResumeGame"));
pauseGamePopupMenuIndex= (int)menuItems.size() - 1;
if(gameSettings.isNetworkGame() == false){
if(gameSettings.isNetworkGame() == false || gameSettings.getScenario() != "") {
menuItems.push_back(lang.getString("SaveGame"));
saveGamePopupMenuIndex= (int)menuItems.size() - 1;
}
if(gameSettings.isNetworkGame() == true){
if(gameSettings.isNetworkGame() == true) {
menuItems.push_back(lang.getString("DisconnectNetorkPlayer"));
disconnectPlayerPopupMenuIndex= (int)menuItems.size() - 1;
}

2
source/glest_game/game/game_settings.h
View File

@ -328,7 +328,7 @@ public:
bool result = false;
for(int idx = 0; idx < GameConstants::maxPlayers; ++idx) {
if(factionControls[idx] == ctNetwork || factionControls[idx] == ctNetworkUnassigned ||
networkPlayerStatuses[idx] == npst_Disconnected) {
networkPlayerStatuses[idx] == npst_Disconnected) {
result = true;
break;
}

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

File diff suppressed because it is too large Load Diff

1
source/glest_game/main/main.cpp
View File

@ -3925,6 +3925,7 @@ int glestMain(int argc, char** argv) {
if(hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VERBOSE_MODE]) == true) {
SystemFlags::VERBOSE_MODE_ENABLED = true;
Thread::setEnableVerboseMode(true);
LuaScript::setDebugModeEnabled(true);
}
// DEbug testing threads
//Thread::setEnableVerboseMode(true);

16
source/glest_game/menu/menu_state_scenario.cpp
View File

@ -313,15 +313,17 @@ void MenuStateScenario::update() {
if(this->autoloadScenarioName != "") {
string scenarioPath = Scenario::getScenarioPath(dirList, this->autoloadScenarioName);
//printf("[%s:%s] Line: %d this->autoloadScenarioName [%s] scenarioPath [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,this->autoloadScenarioName.c_str(),scenarioPath.c_str());
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("[%s:%s] Line: %d this->autoloadScenarioName [%s] scenarioPath [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,this->autoloadScenarioName.c_str(),scenarioPath.c_str());
loadScenarioInfo(scenarioPath, &scenarioInfo );
if(scenarioInfo.namei18n != "") {
this->autoloadScenarioName = scenarioInfo.namei18n;
}
else {
this->autoloadScenarioName = formatString(this->autoloadScenarioName);
}
//if(scenarioInfo.namei18n != "") {
// this->autoloadScenarioName = scenarioInfo.namei18n;
//}
//else {
this->autoloadScenarioName = formatString(this->autoloadScenarioName);
//}
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("[%s:%s] Line: %d this->autoloadScenarioName [%s] scenarioPath [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,this->autoloadScenarioName.c_str(),scenarioPath.c_str());
listBoxScenario.setSelectedItem(this->autoloadScenarioName,false);

2
source/shared_lib/include/lua/lua_script.h
View File

@ -47,6 +47,7 @@ private:
string sandboxCode;
static bool disableSandbox;
static bool debugModeEnabled;
void DumpGlobals();
@ -54,6 +55,7 @@ public:
LuaScript();
~LuaScript();
static void setDebugModeEnabled(bool value) { debugModeEnabled = value; }
static void setDisableSandbox(bool value) { disableSandbox = value; }
void loadCode(string code, string name);

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

@ -46,6 +46,7 @@ public:
// =====================================================
bool LuaScript::disableSandbox = false;
bool LuaScript::debugModeEnabled = false;
LuaScript::LuaScript() {
Lua_STREFLOP_Wrapper streflopWrapper;
@ -211,7 +212,7 @@ void LuaScript::DumpGlobals()
void LuaScript::saveGame(XmlNode *rootNode) {
std::map<string,string> mapTagReplacements;
const bool debugLuaDump = false;
bool debugLuaDump = LuaScript::debugModeEnabled;
//try{
LuaHandle *L = luaState;
// push the first key (nil = beginning of table)
@ -257,6 +258,7 @@ void LuaScript::saveGame(XmlNode *rootNode) {
// get the key as a string
string key_string = lua_tostring(L, -2); // no copy required - we already know this is a string
if(debugLuaDump == true) printf("key_string [%s]\n",key_string.c_str());
// do not support variables that start with '_'
// lua has some predefined values like _VERSION. They all start with underscore
@ -300,7 +302,7 @@ void LuaScript::saveGame(XmlNode *rootNode) {
int tableKeyType = lua_type(L, -2);
int tableValueType = lua_type(L, -1);
if(debugLuaDump == true) printf("LUA TABLE loop item type [%s]\n",lua_typename(L, tableValueType));
if(debugLuaDump == true) printf("LUA TABLE loop item type [%s] key: %d value type: %d\n",lua_typename(L, tableValueType),tableKeyType,tableValueType);
switch (tableValueType) {
case LUA_TSTRING:
@ -321,7 +323,12 @@ void LuaScript::saveGame(XmlNode *rootNode) {
if(debugLuaDump == true) printf("LUA TABLE loop C\n");
value = lua_tostring (L, -1);
if(tableValueType == LUA_TBOOLEAN ) {
value = lua_toboolean(L, -1) == 0 ? "false" : "true";
}
else {
value = lua_tostring (L, -1);
}
if(debugLuaDump == true) printf("LUA TABLE loop D\n");
@ -409,13 +416,21 @@ void LuaScript::saveGame(XmlNode *rootNode) {
}
void LuaScript::loadGame(const XmlNode *rootNode) {
bool debugLuaDump = LuaScript::debugModeEnabled;
if(debugLuaDump) printf("START [%s::%s] Line: %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
vector<XmlNode *> luaScriptNodeList = rootNode->getChildList("LuaScript");
if(debugLuaDump) printf("luaScriptNodeList.size(): %d\n",(int)luaScriptNodeList.size());
for(unsigned int i = 0; i < luaScriptNodeList.size(); ++i) {
XmlNode *node = luaScriptNodeList[i];
string variable = node->getAttribute("variable")->getValue();
int value_type = node->getAttribute("value_type")->getIntValue();
if(debugLuaDump) printf("i: %d [%s] [%d]\n",i,variable.c_str(),value_type);
switch (value_type) {
case LUA_TSTRING:
lua_pushstring( luaState, node->getAttribute("value")->getValue().c_str() );
@ -430,6 +445,9 @@ void LuaScript::loadGame(const XmlNode *rootNode) {
{
lua_newtable(luaState); /* We will pass a table */
vector<XmlNode *> luaScriptTableNode = node->getChildList("Table");
if(debugLuaDump) printf("luaScriptTableNode.size(): %d\n",(int)luaScriptTableNode.size());
for(unsigned int j = 0; j < luaScriptTableNode.size(); ++j) {
XmlNode *nodeTable = luaScriptTableNode[j];
@ -442,7 +460,7 @@ void LuaScript::loadGame(const XmlNode *rootNode) {
lua_pushnumber( luaState, nodeTable->getAttribute("key")->getFloatValue() );
break;
case LUA_TBOOLEAN:
lua_pushboolean( luaState, nodeTable->getAttribute("key")->getIntValue() );
lua_pushboolean( luaState, nodeTable->getAttribute("key")->getBoolValue() );
break;
}
int value_type = nodeTable->getAttribute("value_type")->getIntValue();
@ -454,7 +472,7 @@ void LuaScript::loadGame(const XmlNode *rootNode) {
lua_pushnumber( luaState, nodeTable->getAttribute("value")->getFloatValue() );
break;
case LUA_TBOOLEAN:
lua_pushboolean( luaState, nodeTable->getAttribute("value")->getIntValue() );
lua_pushboolean( luaState, nodeTable->getAttribute("value")->getBoolValue() );
break;
}