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

cpp check warnings cleanup

This commit is contained in:
Mark Vejvoda 2013-11-14 13:22:55 +00:00
parent 3671bd0617
commit cc21dbbc5c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3528,7 +3528,7 @@ int handleCreateDataArchivesCommand(int argc, char** argv) {
vector<string> results2;
findDirs(techPath + name + "/factions", results2, false,true);
if(results2.empty() == false) {
string downloadArchive = techPath + name + ".7z";
string downloadArchive = techPath + name + fileArchiveExtension;
//printf("Test downloadArchive [%s]\n",downloadArchive.c_str());
@ -3577,7 +3577,7 @@ int handleCreateDataArchivesCommand(int argc, char** argv) {
endPathWithSlash(tilesetPath);
}
if(fileExists(tilesetPath + name + "/" + name + ".xml") == true) {
string downloadArchive = tilesetPath + name + ".7z";
string downloadArchive = tilesetPath + name + fileArchiveExtension;
//printf("Test downloadArchive [%s]\n",downloadArchive.c_str());

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

@ -318,7 +318,6 @@ void FactionThread::execute() {
break;
}
codeLocation = "4";
static string mutexOwnerId = string(__FILE__) + string("_") + intToStr(__LINE__);
MutexSafeWrapper safeMutex(triggerIdMutex,mutexOwnerId);
bool executeTask = (this->frameIndex.first >= 0);
@ -400,7 +399,7 @@ void FactionThread::execute() {
if(world->getUnitUpdater() == NULL) {
throw megaglest_runtime_error("world->getUnitUpdater() == NULL");
}
codeLocation = "14";
world->getUnitUpdater()->updateUnitCommand(unit,currentTriggeredFrameIndex);
codeLocation = "15";