aboutsummaryrefslogtreecommitdiff
path: root/src/game/MiscHandler.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-04-28 22:35:55 +0200
committerMachiavelli <none@none>2010-04-28 22:35:55 +0200
commit453e3e89761abf3632b731d454281323f8b2788b (patch)
tree9774f92ee948b7084715c7bd0671ad650eb36004 /src/game/MiscHandler.cpp
parenta82d3d88c9e15361f459edf80e66781b02a010c5 (diff)
Partial revert of 6ab9e720f3d2fca8bfe14b2ba857008cf018e0cd, thanks click and Liberate for talking sense into me. Only load 1 spec in memory at a time. Also fixes totem bar loading due to a typo.
--HG-- branch : trunk
Diffstat (limited to 'src/game/MiscHandler.cpp')
-rw-r--r--src/game/MiscHandler.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index 5979a7aa464..46c822fcbf0 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -1020,13 +1020,12 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
uint32 action = ACTION_BUTTON_ACTION(packetData);
uint8 type = ACTION_BUTTON_TYPE(packetData);
- uint8 spec = GetPlayer()->GetActiveSpec();
sLog.outDetail("BUTTON: %u ACTION: %u TYPE: %u", button, action, type);
if (!packetData)
{
sLog.outDetail("MISC: Remove action from button %u", button);
- GetPlayer()->removeActionButton(spec, button);
+ GetPlayer()->removeActionButton(button);
}
else
{
@@ -1049,7 +1048,7 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
sLog.outError("MISC: Unknown action button type %u for action %u into button %u", type, action, button);
return;
}
- GetPlayer()->addActionButton(spec, button, action, type);
+ GetPlayer()->addActionButton(button, action, type);
}
}