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

- bugfix for multi-build discovered during testing (left a break statement when shouldn't have)

This commit is contained in:
Mark Vejvoda 2011-01-11 05:18:53 +00:00
parent d9e7dcc69a
commit b778098d13
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/world/unit_updater.cpp
View File

@ -1093,7 +1093,6 @@ Unit * UnitUpdater::findPeerUnitBuilder(Unit *unit) {
if(bct != NULL) { if(bct != NULL) {
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__);
//if(command->getPos() == peerCommand->getPos()) {
if(command->getStateValue() == peerUnit->getId()) { if(command->getStateValue() == peerUnit->getId()) {
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__);
@ -1109,11 +1108,10 @@ Unit * UnitUpdater::findPeerUnitBuilder(Unit *unit) {
if(prct != NULL) { if(prct != NULL) {
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__);
if(unit != peerUnit && command->getStateValue() == peerUnit->getId()) { if(unit->getId() != peerUnit->getId() && command->getStateValue() == peerUnit->getId()) {
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__);
firstLinkedPeerRepairer = peerUnit; firstLinkedPeerRepairer = peerUnit;
break;
} }
} }
} }
@ -1122,7 +1120,7 @@ Unit * UnitUpdater::findPeerUnitBuilder(Unit *unit) {
} }
} }
if(foundUnitBuilder == NULL) { if(foundUnitBuilder == NULL && firstLinkedPeerRepairer != NULL) {
foundUnitBuilder = firstLinkedPeerRepairer; foundUnitBuilder = firstLinkedPeerRepairer;
} }
} }