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

- added more crc logging to detect oos location

Browse Source
This commit is contained in:
Mark Vejvoda
2013-10-17 02:49:25 +00:00
parent 37a53c114a
commit fb276d1dd7
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/glest_game/type_instances/faction.cpp
View File

@@ -2320,6 +2320,7 @@ void Faction::addCRC_DetailsForWorldFrame(int worldFrameCount,bool isNetworkServ
for(unsigned int i = 0; i < units.size(); ++i) { for(unsigned int i = 0; i < units.size(); ++i) {
Unit *unit = units[i]; Unit *unit = units[i];
unit->getRandom()->clearLastCaller(); unit->getRandom()->clearLastCaller();
unit->clearNetworkCRCDecHpList(); unit->clearNetworkCRCDecHpList();
} }

4
source/glest_game/type_instances/unit.cpp
View File

@@ -4242,7 +4242,9 @@ std::string Unit::toString(bool crcMode) const {
result += "inBailOutAttempt = " + intToStr(inBailOutAttempt) + "\n"; result += "inBailOutAttempt = " + intToStr(inBailOutAttempt) + "\n";
result += "random = " + intToStr(random.getLastNumber()) + "\n"; result += "random = " + intToStr(random.getLastNumber()) + "\n";
result += "randomlastCaller = " + random.getLastCaller() + "\n"; if(this->random.getLastCaller() != "") {
result += "randomlastCaller = " + random.getLastCaller() + "\n";
}
result += "pathFindRefreshCellCount = " + intToStr(pathFindRefreshCellCount) + "\n"; result += "pathFindRefreshCellCount = " + intToStr(pathFindRefreshCellCount) + "\n";
result += "lastStuckFrame = " + uIntToStr(lastStuckFrame) + "\n"; result += "lastStuckFrame = " + uIntToStr(lastStuckFrame) + "\n";

1
source/shared_lib/include/util/randomgen.h
View File

@@ -48,6 +48,7 @@ public:
std::string getLastCaller() const; std::string getLastCaller() const;
void clearLastCaller() { lastCaller.clear(); } void clearLastCaller() { lastCaller.clear(); }
//void clearLastCaller() { } //void clearLastCaller() { }
void addLastCaller(std::string text) { lastCaller.push_back(text); }
}; };
}}//end namespace }}//end namespace

6
source/shared_lib/sources/util/randomgen.cpp
View File

@@ -40,7 +40,9 @@ void RandomGen::init(int seed){
} }
int RandomGen::rand(string lastCaller) { int RandomGen::rand(string lastCaller) {
this->lastCaller.push_back(lastCaller); if(lastCaller != "") {
this->lastCaller.push_back(lastCaller);
}
this->lastNumber = (a*lastNumber + b) % m; this->lastNumber = (a*lastNumber + b) % m;
return lastNumber; return lastNumber;
} }
@@ -49,7 +51,7 @@ std::string RandomGen::getLastCaller() const {
std::string result = ""; std::string result = "";
if(lastCaller.empty() == false) { if(lastCaller.empty() == false) {
for(unsigned int index = 0; index < lastCaller.size(); ++index) { for(unsigned int index = 0; index < lastCaller.size(); ++index) {
result += lastCaller[index] + " "; result += lastCaller[index] + "|";
} }
} }
return result; return result;