pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-04 00:02:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Change level to bot_level in Bot::DoClassAttacks() to not overlap member variable (#3239)

Browse Source 
# Notes
- Member variable is named `level`, change variable to `bot_level` so we don't cause issues.
This commit is contained in:
Alex King 2023-04-03 16:47:31 -04:00 committed by GitHub
parent 0297045cc5
commit 3d20c0d6aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/bot.cpp
View File

@ -5145,12 +5145,12 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) {
float HasteModifier = (GetHaste() * 0.01f); float HasteModifier = (GetHaste() * 0.01f);
uint16 skill_to_use = -1; uint16 skill_to_use = -1;
int level = GetLevel(); int bot_level = GetLevel();
int reuse = (TauntReuseTime * 1000); int reuse = (TauntReuseTime * 1000);
bool did_attack = false; bool did_attack = false;
switch (GetClass()) { switch (GetClass()) {
case WARRIOR: case WARRIOR:
if (level >= RuleI(Combat, NPCBashKickLevel)) { if (bot_level >= RuleI(Combat, NPCBashKickLevel)) {
bool canBash = false; bool canBash = false;
if ((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) || (m_inv.GetItem(EQ::invslot::slotSecondary) && m_inv.GetItem(EQ::invslot::slotSecondary)->GetItem()->ItemType == EQ::item::ItemTypeShield) || (m_inv.GetItem(EQ::invslot::slotPrimary) && m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->IsType2HWeapon() && GetAA(aa2HandBash) >= 1)) if ((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) || (m_inv.GetItem(EQ::invslot::slotSecondary) && m_inv.GetItem(EQ::invslot::slotSecondary)->GetItem()->ItemType == EQ::item::ItemTypeShield) || (m_inv.GetItem(EQ::invslot::slotPrimary) && m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->IsType2HWeapon() && GetAA(aa2HandBash) >= 1))
canBash = true; canBash = true;
@ -5170,7 +5170,7 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) {
case CLERIC: case CLERIC:
case SHADOWKNIGHT: case SHADOWKNIGHT:
case PALADIN: case PALADIN:
if (level >= RuleI(Combat, NPCBashKickLevel)) { if (bot_level >= RuleI(Combat, NPCBashKickLevel)) {
if ((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) || (m_inv.GetItem(EQ::invslot::slotSecondary) && m_inv.GetItem(EQ::invslot::slotSecondary)->GetItem()->ItemType == EQ::item::ItemTypeShield) || (m_inv.GetItem(EQ::invslot::slotPrimary) && m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->IsType2HWeapon() && GetAA(aa2HandBash) >= 1)) if ((GetRace() == OGRE || GetRace() == TROLL || GetRace() == BARBARIAN) || (m_inv.GetItem(EQ::invslot::slotSecondary) && m_inv.GetItem(EQ::invslot::slotSecondary)->GetItem()->ItemType == EQ::item::ItemTypeShield) || (m_inv.GetItem(EQ::invslot::slotPrimary) && m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->IsType2HWeapon() && GetAA(aa2HandBash) >= 1))
skill_to_use = EQ::skills::SkillBash; skill_to_use = EQ::skills::SkillBash;
} }