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

- cleanup from last checkin (corrections)

This commit is contained in:
Mark Vejvoda 2012-10-26 03:08:40 +00:00
parent 3419127632
commit 28d65e8d55
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/glest_game/ai/ai_rule.cpp
View File

@ -921,8 +921,8 @@ void AiRuleProduce::produceSpecific(const ProduceTask *pt){
int currentProducerIndex = producers[i];
if(currentProducerIndex >= aiInterface->getMyUnitCount()) {
char szBuf[8096]="";
printf("In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %d, i = %u,producers.size() = %zu\n",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,(unsigned long)producers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %u, i = %u,producers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,(unsigned long)producers.size());
printf("In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %d, i = %u,producers.size() = %zu\n",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,producers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %u, i = %u,producers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,producers.size());
throw megaglest_runtime_error(szBuf);
}
@ -953,14 +953,14 @@ void AiRuleProduce::produceSpecific(const ProduceTask *pt){
if(currentProducerIndex >= aiInterface->getMyUnitCount()) {
char szBuf[8096]="";
printf("In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %d, i = %u,producers.size() = %zu\n",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,(unsigned long)producers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %u, i = %u,producers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,(unsigned long)producers.size());
printf("In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %d, i = %u,producers.size() = %zu\n",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,producers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %u, i = %u,producers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,producers.size());
throw megaglest_runtime_error(szBuf);
}
if(prIndex >= producers.size()) {
char szBuf[8096]="";
printf("In [%s::%s Line: %d] prIndex >= producers.size(), currentProducerIndex = %d, i = %u,producers.size() = %zu \n",__FILE__,__FUNCTION__,__LINE__,prIndex,i,(unsigned long)producers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= producers.size(), currentProducerIndex = %d, i = %u,producers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,i,(unsigned long)producers.size());
printf("In [%s::%s Line: %d] prIndex >= producers.size(), currentProducerIndex = %d, i = %u,producers.size() = %zu \n",__FILE__,__FUNCTION__,__LINE__,prIndex,i,producers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= producers.size(), currentProducerIndex = %d, i = %u,producers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,i,producers.size());
throw megaglest_runtime_error(szBuf);
}
@ -1019,14 +1019,14 @@ void AiRuleProduce::produceSpecific(const ProduceTask *pt){
if(currentProducerIndex >= aiInterface->getMyUnitCount()) {
char szBuf[8096]="";
printf("In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %d, i = %u,backupProducers.size() = %zu\n",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,(unsigned long)backupProducers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %d, i = %u,backupProducers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,(unsigned long)backupProducers.size());
printf("In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %d, i = %u,backupProducers.size() = %zu\n",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,backupProducers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= aiInterface->getMyUnitCount(), currentProducerIndex = %d, aiInterface->getMyUnitCount() = %d, i = %u,backupProducers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,aiInterface->getMyUnitCount(),i,backupProducers.size());
throw megaglest_runtime_error(szBuf);
}
if(prIndex >= backupProducers.size()) {
char szBuf[8096]="";
printf("In [%s::%s Line: %d] prIndex >= backupProducers.size(), currentProducerIndex = %d, i = %u,backupProducers.size() = %zu \n",__FILE__,__FUNCTION__,__LINE__,prIndex,i,(unsigned long)backupProducers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= backupProducers.size(), currentProducerIndex = %d, i = %u,backupProducers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,i,(unsigned long)backupProducers.size());
printf("In [%s::%s Line: %d] prIndex >= backupProducers.size(), currentProducerIndex = %d, i = %u,backupProducers.size() = %zu \n",__FILE__,__FUNCTION__,__LINE__,prIndex,i,backupProducers.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] currentProducerIndex >= backupProducers.size(), currentProducerIndex = %d, i = %u,backupProducers.size() = %zu",__FILE__,__FUNCTION__,__LINE__,currentProducerIndex,i,backupProducers.size());
throw megaglest_runtime_error(szBuf);
}

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

@ -1356,7 +1356,7 @@ void runTilesetValidationForPath(string tilesetPath, string tilesetName,
}
}
printf("Found tileset filecount = %zu, used = %zu\n",(unsigned long)foundFileList.size(),(unsigned long)loadedFileList.size());
printf("Found tileset filecount = %zu, used = %zu\n",foundFileList.size(),loadedFileList.size());
int purgeCount = 0;
bool foundUnusedFile = false;
@ -1787,7 +1787,7 @@ void runTechValidationForPath(string techPath, string techName,
}
}
printf("Found techtree filecount = %zu, used = %zu\n",(unsigned long)foundFileList.size(),(unsigned long)loadedFileList.size());
printf("Found techtree filecount = %zu, used = %zu\n",foundFileList.size(),loadedFileList.size());
// for( std::map<string,vector<string> >::iterator iterMap = loadedFileList.begin();
// iterMap != loadedFileList.end(); ++iterMap) {
@ -4544,7 +4544,7 @@ int glestMain(int argc, char** argv) {
renderer.clearBuffers();
renderer.clearZBuffer();
renderer.reset2d();
snprintf(szTextBuf,8096,"Please wait, converting models [%u of %zu] ...",i,(long int)models.size());
snprintf(szTextBuf,8096,"Please wait, converting models [%u of %zu] ...",i,models.size());
if(CoreData::getInstance().getMenuFontBig3D() != NULL) {
renderer.renderText3D(
@ -4568,7 +4568,7 @@ int glestMain(int argc, char** argv) {
Model *model = renderer.newModel(rsGlobal);
try {
printf("About to load model [%s] [%u of %zu]\n",file.c_str(),i,(long int)models.size());
printf("About to load model [%s] [%u of %zu]\n",file.c_str(),i,models.size());
model->load(file);
modelLoadedOk = true;
}

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

@ -1180,7 +1180,7 @@ void Faction::addResourceTargetToCache(const Vec2i &pos,bool incrementUseCounter
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
char szBuf[8096]="";
snprintf(szBuf,8096,"[addResourceTargetToCache] pos [%s]cacheResourceTargetList.size() [%ld]",
snprintf(szBuf,8096,"[addResourceTargetToCache] pos [%s]cacheResourceTargetList.size() [%zu]",
pos.getString().c_str(),cacheResourceTargetList.size());
//unit->logSynchData(szBuf);
@ -1203,7 +1203,7 @@ void Faction::removeResourceTargetFromCache(const Vec2i &pos) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
char szBuf[8096]="";
snprintf(szBuf,8096,"[removeResourceTargetFromCache] pos [%s]cacheResourceTargetList.size() [%ld]",
snprintf(szBuf,8096,"[removeResourceTargetFromCache] pos [%s]cacheResourceTargetList.size() [%zu]",
pos.getString().c_str(),cacheResourceTargetList.size());
//unit->logSynchData(szBuf);
@ -1347,7 +1347,7 @@ Vec2i Faction::getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceT
if(deleteList.empty() == false) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
char szBuf[8096]="";
snprintf(szBuf,8096,"[cleaning old resource targets] deleteList.size() [%ld] cacheResourceTargetList.size() [%ld] result [%s]",
snprintf(szBuf,8096,"[cleaning old resource targets] deleteList.size() [%zu] cacheResourceTargetList.size() [%zu] result [%s]",
deleteList.size(),cacheResourceTargetList.size(),result.getString().c_str());
unit->logSynchData(__FILE__,__LINE__,szBuf);
@ -1494,7 +1494,7 @@ void Faction::cleanupResourceTypeTargetCache(std::vector<Vec2i> *deleteListPtr)
if(deleteList.empty() == false) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
char szBuf[8096]="";
snprintf(szBuf,8096,"[cleaning old resource targets] deleteList.size() [%ld] cacheResourceTargetList.size() [%ld], needToCleanup [%d]",
snprintf(szBuf,8096,"[cleaning old resource targets] deleteList.size() [%zu] cacheResourceTargetList.size() [%zu], needToCleanup [%d]",
deleteList.size(),cacheResourceTargetList.size(),needToCleanup);
//unit->logSynchData(szBuf);
SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"----------------------------------- START [%d] ------------------------------------------------\n",getFrameCount());

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

@ -3325,7 +3325,7 @@ void Unit::cleanupOldBadHarvestPos() {
if(purgeList.empty() == false) {
char szBuf[8096]="";
snprintf(szBuf,8096,"[cleaning old bad harvest targets] purgeList.size() [%ld]",purgeList.size());
snprintf(szBuf,8096,"[cleaning old bad harvest targets] purgeList.size() [%zu]",purgeList.size());
logSynchData(__FILE__,__LINE__,szBuf);
for(int i = 0; i < purgeList.size(); ++i) {

2
source/glest_game/types/unit_type.cpp
View File

@ -979,7 +979,7 @@ const CommandType* UnitType::findCommandTypeById(int id) const{
const CommandType *UnitType::getCommandType(int i) const {
if(i >= commandTypes.size()) {
char szBuf[8096]="";
snprintf(szBuf,8096,"In [%s::%s Line: %d] i >= commandTypes.size(), i = %d, commandTypes.size() = %zu",__FILE__,__FUNCTION__,__LINE__,i,(unsigned long)commandTypes.size());
snprintf(szBuf,8096,"In [%s::%s Line: %d] i >= commandTypes.size(), i = %d, commandTypes.size() = %zu",__FILE__,__FUNCTION__,__LINE__,i,commandTypes.size());
throw megaglest_runtime_error(szBuf);
}
return commandTypes[i];

2
source/glest_game/world/world.cpp
View File

@ -2313,7 +2313,7 @@ string World::getAllFactionsCacheStats() {
}
char szBuf[8096]="";
snprintf(szBuf,8096,"totalCache1Size [%zu] totalCache1Size [%zu] total KB: %s",totalCache1Size,totalCache2Size,formatNumber(totalBytes).c_str());
snprintf(szBuf,8096,"totalCache1Size [%lu] totalCache1Size [%lu] total KB: %s",totalCache1Size,totalCache2Size,formatNumber(totalBytes).c_str());
result = szBuf;
return result;
}

2
source/shared_lib/sources/platform/posix/ircclient.cpp
View File

@ -315,7 +315,7 @@ void irc_event_dcc_chat(irc_session_t * session, const char * nick, const char *
void irc_event_dcc_send(irc_session_t * session, const char * nick, const char * addr, const char * filename, unsigned long size, irc_dcc_t dccid) {
FILE * fp;
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("DCC send [%d] requested from '%s' (%s): %s (%zu bytes)\n", dccid, nick, addr, filename, size);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("DCC send [%d] requested from '%s' (%s): %s (%lu bytes)\n", dccid, nick, addr, filename, size);
if ( (fp = fopen ("file", "wb")) == 0 ) {
abort();