From 1c631cb85f2b66567af10cf48811b61209c2ee46 Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Fri, 15 Nov 2024 01:32:25 +0200 Subject: [PATCH] REAL_OBJECT.ubLastTargetTakenDamage -> SoldierID --- TileEngine/physics.cpp | 4 ++-- TileEngine/physics.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TileEngine/physics.cpp b/TileEngine/physics.cpp index b5847a62..ac3761b5 100644 --- a/TileEngine/physics.cpp +++ b/TileEngine/physics.cpp @@ -2471,7 +2471,7 @@ void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID ) // Is it a guy? if ( usStructureID < INVALID_STRUCTURE_ID ) { - if ( pObject->ubLastTargetTakenDamage != (UINT8)usStructureID ) + if ( pObject->ubLastTargetTakenDamage != usStructureID ) { // Flugente: if this fails, something is very wrong indeed Assert(usStructureIDEVENT_SoldierGotHit( NOTHING, sDamage, sBreath, pSoldier->ubDirection, 0, pObject->ubOwner, FIRE_WEAPON_TOSSED_OBJECT_SPECIAL, 0, 0, NOWHERE ); - pObject->ubLastTargetTakenDamage = (UINT8)( usStructureID ); + pObject->ubLastTargetTakenDamage = usStructureID; } } } diff --git a/TileEngine/physics.h b/TileEngine/physics.h index 81effb21..249334c8 100644 --- a/TileEngine/physics.h +++ b/TileEngine/physics.h @@ -133,7 +133,7 @@ public: BOOLEAN fPotentialForDebug; INT32 sLevelNodeGridNo; INT32 iSoundID; - UINT8 ubLastTargetTakenDamage; + SoldierID ubLastTargetTakenDamage; // OJW - 20091002 - mp explosives UINT8 mpTeam; // the intiating clients team INT32 mpRealObjectID; // ID from the initiating client @@ -183,4 +183,4 @@ INT32 RandomGridFromRadius( INT32 sSweetGridNo, INT8 ubMinRadius, INT8 ubMaxRad UINT32 GetArtilleryTargetGridNo( UINT32 sTargetGridNo, INT8 bRadius ); BOOLEAN GetArtilleryLaunchParams(UINT32 sStartingGridNo, UINT32 sTargetGridNo, UINT8 ubTargetLevel, INT16 sStartZ, INT16 sEndZ, UINT16 usLauncher, OBJECTTYPE* pObj, FLOAT* pdForce, FLOAT* pdDegrees); -#endif \ No newline at end of file +#endif