1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

REAL_OBJECT.ubLastTargetTakenDamage -> SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-15 01:32:25 +02:00
parent b9deb3cc19
commit 1c631cb85f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/physics.cpp
+2 -2
View File
@@ -2471,7 +2471,7 @@ void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID )
// Is it a guy? // Is it a guy?
if ( usStructureID < INVALID_STRUCTURE_ID ) if ( usStructureID < INVALID_STRUCTURE_ID )
{ {
if ( pObject->ubLastTargetTakenDamage != (UINT8)usStructureID ) if ( pObject->ubLastTargetTakenDamage != usStructureID )
{ {
// Flugente: if this fails, something is very wrong indeed // Flugente: if this fails, something is very wrong indeed
Assert(usStructureID<TOTAL_SOLDIERS); Assert(usStructureID<TOTAL_SOLDIERS);
@@ -2488,7 +2488,7 @@ void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID )
pSoldier->EVENT_SoldierGotHit( NOTHING, sDamage, sBreath, pSoldier->ubDirection, 0, pObject->ubOwner, FIRE_WEAPON_TOSSED_OBJECT_SPECIAL, 0, 0, NOWHERE ); pSoldier->EVENT_SoldierGotHit( NOTHING, sDamage, sBreath, pSoldier->ubDirection, 0, pObject->ubOwner, FIRE_WEAPON_TOSSED_OBJECT_SPECIAL, 0, 0, NOWHERE );
pObject->ubLastTargetTakenDamage = (UINT8)( usStructureID ); pObject->ubLastTargetTakenDamage = usStructureID;
} }
} }
} }
TileEngine/physics.h
+2 -2
View File
@@ -133,7 +133,7 @@ public:
BOOLEAN fPotentialForDebug; BOOLEAN fPotentialForDebug;
INT32 sLevelNodeGridNo; INT32 sLevelNodeGridNo;
INT32 iSoundID; INT32 iSoundID;
UINT8 ubLastTargetTakenDamage; SoldierID ubLastTargetTakenDamage;
// OJW - 20091002 - mp explosives // OJW - 20091002 - mp explosives
UINT8 mpTeam; // the intiating clients team UINT8 mpTeam; // the intiating clients team
INT32 mpRealObjectID; // ID from the initiating client 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 ); 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); BOOLEAN GetArtilleryLaunchParams(UINT32 sStartingGridNo, UINT32 sTargetGridNo, UINT8 ubTargetLevel, INT16 sStartZ, INT16 sEndZ, UINT16 usLauncher, OBJECTTYPE* pObj, FLOAT* pdForce, FLOAT* pdDegrees);
#endif #endif