Skip to content

Commit 6aa27ed

Browse files
committed
Fix bad merge resolution
1 parent a42af5b commit 6aa27ed

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/Game/Structs.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7687,8 +7687,6 @@ namespace Game
76877687
char pad218[92];
76887688
};
76897689

7690-
static_assert(sizeof(gentity_s) == 0x274);
7691-
76927690
enum
76937691
{
76947692
ENTFIELD_ENTITY = 0x0,
@@ -12169,11 +12167,13 @@ namespace Game
1216912167
WEAP_ANIM_ADS_LASTSHOT = 0x21,
1217012168
WEAP_ANIM_ADS_RECHAMBER = 0x22,
1217112169
WEAP_ANIM_ADS_UP = 0x23,
12172-
WEAP_ANIM_ADS_DOWN = 0x24,
12170+
WEAP_ANIM_ADS_DOWN = 0x24,
1217312171

12174-
NUM_WEAP_ANIMS,
12172+
NUM_WEAP_ANIMS,
1217512173
};
1217612174

12177-
#pragma endregion#ifndef IDA
12175+
#pragma endregion
12176+
12177+
#ifndef IDA
1217812178
}
1217912179
#endif

0 commit comments

Comments
 (0)