Reset wall first point on disallowed wall placement

infclass · Oct 6, 2024 · 4548f76 · 4548f76
1 parent c059911
commit 4548f76
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/game/server/infclass/classes/humans/human.cpp b/src/game/server/infclass/classes/humans/human.cpp
@@ -1741,7 +1741,6 @@ void CInfClassHuman::PlaceEngineerWall(WeaponFireContext *pFireContext)
 			if(!GameController()->HumanWallAllowedInPos(TestPos))
 			{
 				pFireContext->FireAccepted = false;
-				pFireContext->NoAmmo = true;
 				break;
 			}
 		}
@@ -1751,6 +1750,10 @@ void CInfClassHuman::PlaceEngineerWall(WeaponFireContext *pFireContext)
 			pExistingWall->SetEndPosition(GetPos());
 			GameServer()->CreateSound(GetPos(), SOUND_LASER_FIRE);
 		}
+		else
+		{
+			GameWorld()->DestroyEntity(pExistingWall);
+		}
 	}
 }
 
@@ -1786,7 +1789,6 @@ void CInfClassHuman::PlaceLooperWall(WeaponFireContext *pFireContext)
 			if(!GameController()->HumanWallAllowedInPos(TestPos))
 			{
 				pFireContext->FireAccepted = false;
-				pFireContext->NoAmmo = true;
 				break;
 			}
 		}
@@ -1796,6 +1798,10 @@ void CInfClassHuman::PlaceLooperWall(WeaponFireContext *pFireContext)
 			pExistingWall->SetEndPosition(GetPos());
 			GameServer()->CreateSound(GetPos(), SOUND_LASER_FIRE);
 		}
+		else
+		{
+			GameWorld()->DestroyEntity(pExistingWall);
+		}
 	}
 }