Removed redundant check in IsPickupModel, TestModelIndices added

This commit is contained in:
Sergeanur 2019-10-26 21:25:45 +03:00
parent 998adfab90
commit af8ffaeeae
2 changed files with 7 additions and 1 deletions

View File

@ -26,6 +26,12 @@ MatchModelString(const char *modelname, int16 id)
#undef X #undef X
} }
void
TestModelIndices(void)
{
;
}
STARTPATCHES STARTPATCHES
InjectHook(0x48EB60, InitModelIndices, PATCH_JUMP); InjectHook(0x48EB60, InitModelIndices, PATCH_JUMP);
InjectHook(0x48F030, MatchModelString, PATCH_JUMP); InjectHook(0x48F030, MatchModelString, PATCH_JUMP);

View File

@ -365,6 +365,7 @@ enum{
void InitModelIndices(void); void InitModelIndices(void);
void MatchModelString(const char *name, int16 id); void MatchModelString(const char *name, int16 id);
void TestModelIndices(void);
inline bool inline bool
IsGlass(int16 id) IsGlass(int16 id)
@ -462,7 +463,6 @@ IsPickupModel(int16 id)
id == MI_UZI || id == MI_UZI ||
id == MI_M16 || id == MI_M16 ||
id == MI_FLAMETHROWER || id == MI_FLAMETHROWER ||
id >= MI_M16 && id <= MI_FLAMETHROWER ||
id == MI_PICKUP_ADRENALINE || id == MI_PICKUP_ADRENALINE ||
id == MI_PICKUP_BODYARMOUR || id == MI_PICKUP_BODYARMOUR ||
id == MI_PICKUP_INFO || id == MI_PICKUP_INFO ||