From 787c085b47a916cb3a13aec50734281f77ebdbe8 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 9 Mar 2013 00:18:17 +0000 Subject: [PATCH] Fix: check for a room before punishing a team for damaging a room git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5909 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TileEngine/Explosion Control.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index 40c7464c..e4a5160a 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -358,7 +358,8 @@ void InternalIgniteExplosion( UINT8 ubOwner, INT16 sX, INT16 sY, INT16 sZ, INT32 GenerateExplosion( &ExpParams ); // Flugente: if the explosion occured in a building, this might lower loyalty in town - if ( Item[ usItem ].usItemClass & IC_EXPLOSV && ubOwner != NOBODY && ubOwner < 255 ) + UINT16 tmp; + if ( Item[ usItem ].usItemClass & IC_EXPLOSV && ubOwner != NOBODY && ubOwner < 255 && InARoom( sGridNo, &tmp ) ) { HandleLoyaltyForDemolitionOfBuilding( MercPtrs[ubOwner], Explosive[ Item[ usItem ].ubClassIndex ].ubDamage ); }