1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix for JaggZilla Bug #587

Browse Source 
Objects thrown at civilians don't hurt them anymore. Anybody else will still suffer -1 health.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6593 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2013-11-13 11:09:39 +00:00
parent f60a8b2120
commit d41ea7f6c2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/physics.cpp
+6 -1
View File
@@ -2415,7 +2415,12 @@ void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID )
pSoldier = MercPtrs[ usStructureID ];
sDamage = 1;
// silversurfer: Don't hurt civilians. Throwing objects at civilians to kill them is a lame exploit.
if ( pSoldier->aiData.bNeutral )
sDamage = 0;
else
sDamage = 1;
sBreath = 0;
pSoldier->EVENT_SoldierGotHit( NOTHING, sDamage, sBreath, pSoldier->ubDirection, 0, pObject->ubOwner, FIRE_WEAPON_TOSSED_OBJECT_SPECIAL, 0, 0, NOWHERE );