Items can no longer be destroyed with splash damage when laying on th…

…e ground
Andrettin · Dec 25, 2015 · 7ef68f7 · 7ef68f7
1 parent 6f68085
commit 7ef68f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/ai/ai_resource.cpp b/src/ai/ai_resource.cpp
@@ -1600,7 +1600,10 @@ void AiResourceManager()
 	AiCheckingWork();
 
 	// Look if we can build a farm in advance.
-	if (!AiPlayer->NeedSupply && AiPlayer->Player->Supply == AiPlayer->Player->Demand) {
+	//Wyrmgus start
+//	if (!AiPlayer->NeedSupply && AiPlayer->Player->Supply == AiPlayer->Player->Demand) {
+	if (!AiPlayer->NeedSupply && AiPlayer->Player->Supply <= AiPlayer->Player->Demand) {
+	//Wyrmgus end
 		AiRequestSupply();
 	}
 

diff --git a/src/missile/missile.cpp b/src/missile/missile.cpp
@@ -1151,6 +1151,10 @@ static void MissileHitsGoal(const Missile &missile, CUnit &goal, int splash)
 	}
 
 	//Wyrmgus start
+	if (goal.Type->BoolFlag[ITEM_INDEX].value && splash != 1) { //don't damage items with splash damage
+		return;
+	}
+
 	if (!missile.Type->AlwaysHits && CalculateHit(*missile.SourceUnit, *goal.Stats, &goal) == false) {
 		if (splash == 1 && missile.Type->Range <= 1) {
 			return;