Rename stuff

This commit is contained in:
Grinch_ 2022-05-23 17:45:31 +06:00
parent d73836ce81
commit be87cd4162
4 changed files with 9 additions and 5 deletions

View File

@ -150,7 +150,7 @@ bool Animation::_LoadAnimationBlock(const char* szBlockName)
void Animation::_PlayAnimation(RpClump* pClump, int animGroup, int animID, float blend)
{
CAnimBlendAssociation* pAnimStaticAssoc = CAnimManager::GetAnimAssociation((AssocGroupId)animGroup, (AnimationId)animID);
CAnimBlendAssociation* pAnimStaticAssoc = CAnimManager::GetAnimAssociation(animGroup, animID);
CAnimBlendAssociation* pAnimAssoc = RpAnimBlendClumpGetFirstAssociation(pClump);
while (pAnimAssoc)
{
@ -162,7 +162,7 @@ void Animation::_PlayAnimation(RpClump* pClump, int animGroup, int animID, float
}
pAnimAssoc = RpAnimBlendGetNextAssociation(pAnimAssoc);
}
pAnimAssoc = CAnimManager::BlendAnimation(pClump, (AssocGroupId)animGroup, (AnimationId)animID, blend);
pAnimAssoc = CAnimManager::BlendAnimation(pClump, animGroup, animID, blend);
pAnimAssoc->m_nFlags = 0x1 | 0x20;
if (m_Loop)

View File

@ -2,5 +2,5 @@
#define MENU_NAME "Cheat Menu"
#define MENU_VERSION_NUMBER "3.3"
#define MENU_VERSION MENU_VERSION_NUMBER"-beta"
#define BUILD_NUMBER "20220501"
#define BUILD_NUMBER "20220523"
#define MENU_TITLE MENU_NAME " v" MENU_VERSION

View File

@ -28,7 +28,7 @@ void Weapon::Init()
#endif
uchar slot = player->m_nActiveWeaponSlot;
uchar slot = BY_GAME(player->m_nActiveWeaponSlot, player->m_nSelectedWepSlot, player->m_nSelectedWepSlot);
if (m_nCurrentWeaponSlot != slot)
{
eWeaponType weaponType = player->m_aWeapons[slot].m_eWeaponType;
@ -229,7 +229,7 @@ void Weapon::ShowPage()
float x, y, z;
Command<Commands::GET_OFFSET_FROM_CHAR_IN_WORLD_COORDS>(hplayer, 0.0, 3.0, 0.0, &x, &y, &z);
eWeaponType weaponType = pPlayer->m_aWeapons[pPlayer->m_nActiveWeaponSlot].m_eWeaponType;
eWeaponType weaponType = pPlayer->m_aWeapons[BY_GAME(pPlayer->m_nActiveWeaponSlot, pPlayer->m_nSelectedWepSlot, pPlayer->m_nSelectedWepSlot)].m_eWeaponType;
if (weaponType)
{
int model = 0, pickup = 0;

View File

@ -128,6 +128,10 @@ project "CheatMenuIII"
"PLUGIN_SGV_10US"
}
linkoptions {
"/FORCE:MULTIPLE"
}
pchheader "pch.h"
pchsource "../src/pch.cpp"