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

- fixed conflicting loop index variable names in map

Browse Source
This commit is contained in:
Mark Vejvoda
2012-03-13 22:27:34 +00:00
parent 9a1b4cf680
commit a67a3776af
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/glest_game/world/map.cpp
View File

@@ -1957,13 +1957,13 @@ void Map::loadGame(const XmlNode *rootNode, World *world) {
vector<string> tokensExplored; vector<string> tokensExplored;
Tokenize(exploredList,tokensExplored,","); Tokenize(exploredList,tokensExplored,",");
for(unsigned int i = 0; i < tokensExplored.size(); ++i) { for(unsigned int j = 0; j < tokensExplored.size(); ++j) {
string valueList = tokensExplored[i]; string valueList = tokensExplored[j];
vector<string> tokensExploredValue; vector<string> tokensExploredValue;
Tokenize(valueList,tokensExploredValue,"|"); Tokenize(valueList,tokensExploredValue,"|");
for(unsigned int j = 0; j < tokensExploredValue.size(); ++j) { for(unsigned int k = 0; k < tokensExploredValue.size(); ++k) {
string value = tokensExploredValue[j]; string value = tokensExploredValue[k];
SurfaceCell &surfaceCell = surfaceCells[i]; SurfaceCell &surfaceCell = surfaceCells[i];
surfaceCell.setExplored(j,strToInt(value)); surfaceCell.setExplored(j,strToInt(value));
@@ -1972,13 +1972,13 @@ void Map::loadGame(const XmlNode *rootNode, World *world) {
vector<string> tokensVisible; vector<string> tokensVisible;
Tokenize(visibleList,tokensVisible,","); Tokenize(visibleList,tokensVisible,",");
for(unsigned int i = 0; i < tokensVisible.size(); ++i) { for(unsigned int j = 0; j < tokensVisible.size(); ++j) {
string valueList = tokensVisible[i]; string valueList = tokensVisible[j];
vector<string> tokensVisibleValue; vector<string> tokensVisibleValue;
Tokenize(valueList,tokensVisibleValue,"|"); Tokenize(valueList,tokensVisibleValue,"|");
for(unsigned int j = 0; j < tokensVisibleValue.size(); ++j) { for(unsigned int k = 0; k < tokensVisibleValue.size(); ++k) {
string value = tokensVisibleValue[j]; string value = tokensVisibleValue[k];
SurfaceCell &surfaceCell = surfaceCells[i]; SurfaceCell &surfaceCell = surfaceCells[i];
surfaceCell.setVisible(j,strToInt(value)); surfaceCell.setVisible(j,strToInt(value));