diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.h | 2 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.h | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 424a996a21d..7305d41ec2d 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -710,9 +710,9 @@ void SmartAI::SetFly(bool fly) me->SetFlying(fly); } -void SmartAI::SetSwimm(bool swimm) +void SmartAI::SetSwim(bool swim) { - if (swimm) + if (swim) me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING); else me->RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index b33fd41d98a..a4926226a91 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -173,7 +173,7 @@ class SmartAI : public CreatureAI void SetFly(bool fly = true); - void SetSwimm(bool swimm = true); + void SetSwim(bool swim = true); void sGossipHello(Player* player); void sGossipSelect(Player* player, uint32 sender, uint32 action); diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index e543a62ae41..cbcbc1e2290 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1212,12 +1212,12 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u CAST_AI(SmartAI, me->AI())->SetRun(e.action.setRun.run ? true : false); break; } - case SMART_ACTION_SET_SWIMM: + case SMART_ACTION_SET_SWIM: { if (!IsSmart()) return; - CAST_AI(SmartAI, me->AI())->SetSwimm(e.action.setSwimm.swimm ? true : false); + CAST_AI(SmartAI, me->AI())->SetSwim(e.action.setSwim.swim ? true : false); break; } case SMART_ACTION_WP_START: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 84a2fe29643..ce40d42a74e 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -739,7 +739,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) case SMART_ACTION_WP_PAUSE: case SMART_ACTION_SET_FLY: case SMART_ACTION_SET_RUN: - case SMART_ACTION_SET_SWIMM: + case SMART_ACTION_SET_SWIM: case SMART_ACTION_FORCE_DESPAWN: case SMART_ACTION_SET_INGAME_PHASE_MASK: case SMART_ACTION_SET_UNIT_FLAG: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 2292a343c21..30024c42932 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -420,7 +420,7 @@ enum SMART_ACTION SMART_ACTION_INSTALL_AI_TEMPLATE = 58, // AITemplateID SMART_ACTION_SET_RUN = 59, // 0/1 SMART_ACTION_SET_FLY = 60, // 0/1 - SMART_ACTION_SET_SWIMM = 61, // 0/1 + SMART_ACTION_SET_SWIM = 61, // 0/1 SMART_ACTION_TELEPORT = 62, // mapID, SMART_ACTION_STORE_VARIABLE_DECIMAL = 63, // varID, number SMART_ACTION_STORE_TARGET_LIST = 64, // varID, @@ -754,8 +754,8 @@ struct SmartAction struct { - uint32 swimm; - } setSwimm; + uint32 swim; + } setSwim; struct { |