Skip to content

Commit e724a28

Browse files
committed
update(CTakeDamageInfo): Remove damage absorbed
1 parent cb9abab commit e724a28

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

src/sdk/components/CTakeDamageInfo.h

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,49 @@ typedef void (*CTakeDamageInfo_Constructor)(void*, void*, void*, void*, Vector*,
77

88
enum DDamageTypes_t : uint32_t
99
{
10-
DMG_GENERIC = 0x0,
11-
DMG_CRUSH = 0x1,
12-
DMG_BULLET = 0x2,
13-
DMG_SLASH = 0x4,
14-
DMG_BURN = 0x8,
15-
DMG_VEHICLE = 0x10,
16-
DMG_FALL = 0x20,
17-
DMG_BLAST = 0x40,
18-
DMG_CLUB = 0x80,
19-
DMG_SHOCK = 0x100,
20-
DMG_SONIC = 0x200,
21-
DMG_ENERGYBEAM = 0x400,
22-
DMG_DROWN = 0x4000,
23-
DMG_POISON = 0x8000,
24-
DMG_RADIATION = 0x10000,
25-
DMG_DROWNRECOVER = 0x20000,
26-
DMG_ACID = 0x40000,
27-
DMG_PHYSGUN = 0x100000,
28-
DMG_DISSOLVE = 0x200000,
29-
DMG_BLAST_SURFACE = 0x400000,
30-
DMG_BUCKSHOT = 0x1000000,
31-
DMG_LASTGENERICFLAG = 0x1000000,
32-
DMG_HEADSHOT = 0x2000000,
33-
DMG_DANGERZONE = 0x4000000,
10+
DMG_GENERIC = 0,
11+
DMG_CRUSH = 1 << 0,
12+
DMG_BULLET = 1 << 1,
13+
DMG_SLASH = 1 << 2,
14+
DMG_BURN = 1 << 3,
15+
DMG_VEHICLE = 1 << 4,
16+
DMG_FALL = 1 << 5,
17+
DMG_BLAST = 1 << 6,
18+
DMG_CLUB = 1 << 7,
19+
DMG_SHOCK = 1 << 8,
20+
DMG_SONIC = 1 << 9,
21+
DMG_ENERGYBEAM = 1 << 10,
22+
DMG_BUCKSHOT = 1 << 11,
23+
DMG_DROWN = 1 << 14,
24+
DMG_POISON = 1 << 15,
25+
DMG_RADIATION = 1 << 16,
26+
DMG_DROWNRECOVER = 1 << 17,
27+
DMG_ACID = 1 << 18,
28+
DMG_PHYSGUN = 1 << 20,
29+
DMG_DISSOLVE = 1 << 21,
30+
DMG_BLAST_SURFACE = 1 << 22,
31+
DMG_HEADSHOT = 1 << 23,
3432
};
3533

3634
enum TTakeDamageFlags_t : uint32_t
3735
{
38-
DFLAG_NONE = 0x0,
39-
DFLAG_SUPPRESS_HEALTH_CHANGES = 0x1,
40-
DFLAG_SUPPRESS_PHYSICS_FORCE = 0x2,
41-
DFLAG_SUPPRESS_EFFECTS = 0x4,
42-
DFLAG_PREVENT_DEATH = 0x8,
43-
DFLAG_FORCE_DEATH = 0x10,
44-
DFLAG_ALWAYS_GIB = 0x20,
45-
DFLAG_NEVER_GIB = 0x40,
46-
DFLAG_REMOVE_NO_RAGDOLL = 0x80,
47-
DFLAG_SUPPRESS_DAMAGE_MODIFICATION = 0x100,
48-
DFLAG_ALWAYS_FIRE_DAMAGE_EVENTS = 0x200,
49-
DFLAG_RADIUS_DMG = 0x400,
50-
DMG_LASTDFLAG = 0x400,
51-
DFLAG_IGNORE_ARMOR = 0x800,
36+
DFLAG_NONE = 0,
37+
DFLAG_SUPPRESS_HEALTH_CHANGES = 1 << 0,
38+
DFLAG_SUPPRESS_PHYSICS_FORCE = 1 << 1,
39+
DFLAG_SUPPRESS_EFFECTS = 1 << 2,
40+
DFLAG_PREVENT_DEATH = 1 << 3,
41+
DFLAG_FORCE_DEATH = 1 << 4,
42+
DFLAG_ALWAYS_GIB = 1 << 5,
43+
DFLAG_NEVER_GIB = 1 << 6,
44+
DFLAG_REMOVE_NO_RAGDOLL = 1 << 7,
45+
DFLAG_SUPPRESS_DAMAGE_MODIFICATION = 1 << 8,
46+
DFLAG_ALWAYS_FIRE_DAMAGE_EVENTS = 1 << 9,
47+
DFLAG_RADIUS_DMG = 1 << 10,
48+
DFLAG_FORCEREDUCEARMOR_DMG = 1 << 11,
49+
DFLAG_SUPPRESS_INTERRUPT_FLINCH = 1 << 12,
50+
DFLAG_IGNORE_DESTRUCTIBLE_PARTS = 1 << 13,
51+
DFLAG_IGNORE_ARMOR = 1 << 14,
52+
DFLAG_SUPPRESS_UTILREMOVE = 1 << 15,
5253
};
5354

5455
struct AttackerInfo_t
@@ -57,7 +58,7 @@ struct AttackerInfo_t
5758
bool m_bIsPawn;
5859
bool m_bIsWorld;
5960
CHandle<CEntityInstance> m_hAttackerPawn;
60-
uint16_t m_nAttackerPlayerSlot;
61+
int32_t m_nAttackerPlayerSlot;
6162
int m_iTeamChecked;
6263
int m_nTeam;
6364
};
@@ -105,7 +106,6 @@ class CTakeDamageInfo
105106
[[maybe_unused]] uint8_t _x6e[0x2];
106107

107108
public:
108-
float m_flDamageAbsorbed;
109109
CGameTrace* m_pTrace;
110110
TTakeDamageFlags_t m_nDamageFlags;
111111
int32_t m_nNumObjectsPenetrated;

0 commit comments

Comments
 (0)