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

Fixed LUA script duplication issue

Browse Source
This commit is contained in:
mathusummut
2019-02-04 13:24:57 +01:00
parent a124a4a75a
commit 0a23658659
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/game/game/script_manager.cpp
View File

@@ -24,6 +24,8 @@
#include "game_camera.h" #include "game_camera.h"
#include "game.h" #include "game.h"
#include "config.h" #include "config.h"
#include <unordered_set>
#include <algorithm>
#include "leak_dumper.h" #include "leak_dumper.h"
@@ -552,34 +554,39 @@ namespace Game {
luaScript.registerFunction(getFactionPlayerType, luaScript.registerFunction(getFactionPlayerType,
"getFactionPlayerType"); "getFactionPlayerType");
map<string, Script> scripts; map<string, pair<Script, vector<string>>> scripts;
map<string, Script>::iterator iter; map<string, pair<Script, vector<string>>>::iterator iter;
const Script* script;
//load faction code //load faction code
for (int i = 0; i < world->getFactionCount(); ++i) { for (int i = 0; i < world->getFactionCount(); ++i) {
FactionType const* type = world->getFaction(i)->getType(); FactionType const* type = world->getFaction(i)->getType();
for (int j = 0; j < type->getScriptCount(); j++) { for (int j = 0; j < type->getScriptCount(); j++) {
const Script* script = type->getScript(j); script = type->getScript(j);
iter = scripts.find(script->getName()); iter = scripts.find(script->getName());
if (iter == scripts.end()) if (iter == scripts.end())
scripts[script->getName()] = *script; scripts[script->getName()] = pair<Script, vector<string>>(*script, { script->getCode() });
else else if (find(iter->second.second.begin(), iter->second.second.end(), script->getCode()) == iter->second.second.end()) {
iter->second.appendCode(script->getCode()); iter->second.second.push_back(script->getCode());
iter->second.first.appendCode(script->getCode());
}
} }
} }
//load scenario code //load scenario code
for (int i = 0; i < scenario->getScriptCount(); ++i) { for (int i = 0; i < scenario->getScriptCount(); ++i) {
const Script* script = scenario->getScript(i); script = scenario->getScript(i);
iter = scripts.find(script->getName()); iter = scripts.find(script->getName());
if (iter == scripts.end()) if (iter == scripts.end())
scripts[script->getName()] = *script; scripts[script->getName()] = pair<Script, vector<string>>(*script, { script->getCode() });
else else if (find(iter->second.second.begin(), iter->second.second.end(), script->getCode()) == iter->second.second.end()) {
iter->second.appendCode(script->getCode()); iter->second.second.push_back(script->getCode());
iter->second.first.appendCode(script->getCode());
}
} }
for (iter = scripts.begin(); iter != scripts.end(); ++iter) { for (iter = scripts.begin(); iter != scripts.end(); ++iter) {
luaScript.loadCode("function " + iter->second.getName() + "()" + luaScript.loadCode("function " + iter->second.first.getName() + "()" +
iter->second.getCode() + "end\n", iter->second.getName()); iter->second.first.getCode() + "end\n", iter->second.first.getName());
} }
//setup message box //setup message box