Revert "Tweak previous commit"

This reverts commit 2abcd08.
spring · Dec 29, 2010 · 72ca7b0 · 72ca7b0
1 parent c03f3b8
commit 72ca7b0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/rts/Sim/Units/COB/UnitScript.cpp b/rts/Sim/Units/COB/UnitScript.cpp
@@ -1404,8 +1404,6 @@ void CUnitScript::SetUnitVal(int val, int param)
 		case INBUILDSTANCE: {
 			//logOutput.Print("buildstance %d", param);
 			unit->inBuildStance = (param != 0);
-			if(unit->inBuildStance)
-				unit->commandAI->SlowUpdate(); // start building immediately once build stance reached
 			break;
 		}
 		case BUSY: {

diff --git a/rts/Sim/Units/CommandAI/BuilderCAI.cpp b/rts/Sim/Units/CommandAI/BuilderCAI.cpp
@@ -430,8 +430,7 @@ void CBuilderCAI::SlowUpdate()
 							buildRetries++;
 							owner->moveType->KeepPointingTo(build.pos, builder->buildDistance * 0.7f + radius, false);
 
-							bool waitstance = false;
-							if (builder->StartBuild(build, f, waitstance) || (buildRetries > 20)) {
+							if (builder->StartBuild(build, f) || (buildRetries > 20)) {
 								building = true;
 							}
 							else if (f) {

diff --git a/rts/Sim/Units/UnitTypes/Builder.cpp b/rts/Sim/Units/UnitTypes/Builder.cpp
@@ -532,7 +532,7 @@ void CBuilder::StopBuild(bool callScript)
 }
 
 
-bool CBuilder::StartBuild(BuildInfo& buildInfo, CFeature*& feature, bool& waitstance)
+bool CBuilder::StartBuild(BuildInfo& buildInfo, CFeature*& feature)
 {
 	StopBuild(false);
 
@@ -577,10 +577,8 @@ bool CBuilder::StartBuild(BuildInfo& buildInfo, CFeature*& feature, bool& waitst
 	const UnitDef* unitDef = buildInfo.def;
 	SetBuildStanceToward(buildInfo.pos);
 
-	if (!inBuildStance) {
-		waitstance = true;
+	if (!inBuildStance)
 		return false;
-	}
 
 	CUnit* b = unitLoader.LoadUnit(buildInfo.def, buildInfo.pos, team,
 	                               true, buildInfo.buildFacing, this);

diff --git a/rts/Sim/Units/UnitTypes/Builder.h b/rts/Sim/Units/UnitTypes/Builder.h
@@ -40,7 +40,7 @@ class CBuilder : public CUnit
 	void DependentDied(CObject* o);
 	virtual void DeleteDeathDependence(CObject* o, DependenceType dep);
 
-	bool StartBuild(BuildInfo& buildInfo, CFeature*& feature, bool& waitstance);
+	bool StartBuild(BuildInfo& buildInfo, CFeature*& feature);
 	float CalculateBuildTerraformCost(BuildInfo& buildInfo);
 	void StopBuild(bool callScript=true);
 	void SetRepairTarget(CUnit* target);