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

- turned off staggered faction updates (can toggle via ini setting: StaggeredFactionUpdates)

Browse Source 
- added more debug info for resource depletion
This commit is contained in:
Mark Vejvoda
2010-09-17 04:00:48 +00:00
parent a259e0d8e4
commit b836bf0039
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,8 +375,12 @@ void Faction::applyCostsOnInterval(){
if(unit->isOperative()){ if(unit->isOperative()){
for(int k=0; k<unit->getType()->getCostCount(); ++k){ for(int k=0; k<unit->getType()->getCostCount(); ++k){
const Resource *resource= unit->getType()->getCost(k); const Resource *resource= unit->getType()->getCost(k);
if(resource->getType()->getClass()==rcConsumable && resource->getAmount()<0){ if(resource->getType()->getClass() == rcConsumable && resource->getAmount() < 0) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] getResource(resource->getType())->getAmount() = %d\n",__FILE__,__FUNCTION__,__LINE__,getResource(resource->getType())->getAmount());
incResourceAmount(resource->getType(), -resource->getAmount()); incResourceAmount(resource->getType(), -resource->getAmount());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] getResource(resource->getType())->getAmount() = %d\n",__FILE__,__FUNCTION__,__LINE__,getResource(resource->getType())->getAmount());
} }
} }
} }
@@ -386,20 +390,30 @@ void Faction::applyCostsOnInterval(){
for(int j=0; j<getUnitCount(); ++j){ for(int j=0; j<getUnitCount(); ++j){
Unit *unit= getUnit(j); Unit *unit= getUnit(j);
assert(unit != NULL); assert(unit != NULL);
if(unit->isOperative()){ if(unit->isOperative()) {
for(int k=0; k<unit->getType()->getCostCount(); ++k){ for(int k = 0; k < unit->getType()->getCostCount(); ++k) {
const Resource *resource= unit->getType()->getCost(k); const Resource *resource= unit->getType()->getCost(k);
if(resource->getType()->getClass()==rcConsumable && resource->getAmount()>0){ if(resource->getType()->getClass() == rcConsumable && resource->getAmount() > 0){
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] getResource(resource->getType())->getAmount() = %d\n",__FILE__,__FUNCTION__,__LINE__,getResource(resource->getType())->getAmount());
incResourceAmount(resource->getType(), -resource->getAmount()); incResourceAmount(resource->getType(), -resource->getAmount());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] consume setting for faction index = %d, consume = %d, getResource(resource->getType())->getAmount() = %d\n",__FILE__,__FUNCTION__,__LINE__,this->index,scriptManager->getPlayerModifiers(this->index)->getConsumeEnabled(),getResource(resource->getType())->getAmount()); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] getResource(resource->getType())->getAmount() = %d\n",__FILE__,__FUNCTION__,__LINE__,getResource(resource->getType())->getAmount());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] consume setting for faction index = %d, consume = %d, getResource(resource->getType())->getAmount() = %d, Unit = [%s] - [%d]\n",__FILE__,__FUNCTION__,__LINE__,this->index,scriptManager->getPlayerModifiers(this->index)->getConsumeEnabled(),getResource(resource->getType())->getAmount(),unit->getFullName().c_str(),unit->getId());
//decrease unit hp //decrease unit hp
if(scriptManager->getPlayerModifiers(this->index)->getConsumeEnabled() == true && if(scriptManager->getPlayerModifiers(this->index)->getConsumeEnabled() == true &&
getResource(resource->getType())->getAmount() < 0) { getResource(resource->getType())->getAmount() < 0) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
resetResourceAmount(resource->getType()); resetResourceAmount(resource->getType());
bool decHpResult=unit->decHp(unit->getType()->getMaxHp()/3); bool decHpResult=unit->decHp(unit->getType()->getMaxHp()/3);
if(decHpResult){
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] decHpResult = %d, unit->getType()->getMaxHp() = %d, hp = %d\n",__FILE__,__FUNCTION__,__LINE__,decHpResult,unit->getType()->getMaxHp(),unit->getHp());
if(decHpResult) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
world->getStats()->die(unit->getFactionIndex()); world->getStats()->die(unit->getFactionIndex());
scriptManager->onUnitDied(unit); scriptManager->onUnitDied(unit);
} }

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

@@ -48,7 +48,8 @@ World::World(){
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
Config &config= Config::getInstance(); Config &config= Config::getInstance();
staggeredFactionUpdates = true; staggeredFactionUpdates = config.getBool("StaggeredFactionUpdates","false");
ExploredCellsLookupItemCache.clear(); ExploredCellsLookupItemCache.clear();
ExploredCellsLookupItemCacheTimer.clear(); ExploredCellsLookupItemCacheTimer.clear();
ExploredCellsLookupItemCacheTimerCount = 0; ExploredCellsLookupItemCacheTimerCount = 0;