[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/85.0+dfsg1-3-10-g30380f5

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 30380f583a23a7569de9fa9da593c5e72bca9f4e
Author: Jan Dittberner <jandd at debian.org>
Date:   Sun Mar 25 21:28:36 2012 +0200

    merge changes missing from upstream branch merge

diff --git a/rts/Rendering/FarTextureHandler.cpp b/rts/Rendering/FarTextureHandler.cpp
index 2f06752..a211ed3 100755
--- a/rts/Rendering/FarTextureHandler.cpp
+++ b/rts/Rendering/FarTextureHandler.cpp
@@ -211,6 +211,8 @@ void CFarTextureHandler::CreateFarTexture(const CSolidObject* obj)
 		glRotatef(-360.0f / numOrientations, 0.0f, 1.0f, 0.0f);
 	}
 
+	unitDrawer->GetOpaqueModelRenderer(model->type)->PopRenderState();
+	unitDrawer->CleanUpUnitDrawing();
 
 	// glViewport(globalRendering->viewPosX, 0, globalRendering->viewSizeX, globalRendering->viewSizeY);
 	glPopAttrib();
@@ -279,8 +281,6 @@ void CFarTextureHandler::Draw()
 		if (!HaveFarIcon(obj)) {
 			CreateFarTexture(obj);
 		}
-
-		unitDrawer->CleanUpUnitDrawing();
 	}
 
 	// render current queued far icons on the screen
diff --git a/rts/Sim/MoveTypes/GroundMoveType.cpp b/rts/Sim/MoveTypes/GroundMoveType.cpp
index 4501a05..e23db5e 100755
--- a/rts/Sim/MoveTypes/GroundMoveType.cpp
+++ b/rts/Sim/MoveTypes/GroundMoveType.cpp
@@ -1565,8 +1565,6 @@ void CGroundMoveType::HandleUnitCollisions(
 
 			if ((posBits & CMoveMath::BLOCK_STRUCTURE) == 0)
 				continue;
-			if (colliderNxtPos == colliderCurPos)
-				continue;
 
 			posBits = colliderMM->IsBlocked(*colliderMD, collider->pos + collider->speed);
 
@@ -1706,8 +1704,6 @@ void CGroundMoveType::HandleFeatureCollisions(
 
 			if ((posBits & CMoveMath::BLOCK_STRUCTURE) == 0)
 				continue;
-			if (colliderNxtPos == colliderCurPos)
-				continue;
 
 			posBits = colliderMM->IsBlocked(*colliderMD, collider->pos + collider->speed);
 

-- 
advanced 3D real time strategy game engine