diff options
| author | Machiavelli <none@none> | 2009-12-23 12:48:45 +0100 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-12-23 12:48:45 +0100 |
| commit | 8fc116674c66ec13183e2820538b406127162692 (patch) | |
| tree | 1aba0be3813ca0ed61bc97c28000918508b4b9fa | |
| parent | f604193fd2844d86380e05c4ff131d0faf26a66d (diff) | |
| parent | 0503fbd2b6d41c916b0d403a3f5a8c391a28609e (diff) | |
Merge
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/6747_world_command.sql | 1 | ||||
| -rw-r--r-- | sql/world.sql | 1 | ||||
| -rw-r--r-- | src/game/Group.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/sql/updates/6747_world_command.sql b/sql/updates/6747_world_command.sql new file mode 100644 index 00000000000..507e469f806 --- /dev/null +++ b/sql/updates/6747_world_command.sql @@ -0,0 +1 @@ +DELETE FROM `command` WHERE `name`='reload npc_option'; diff --git a/sql/world.sql b/sql/world.sql index 39f3f6c644b..be4a4f49f76 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -586,7 +586,6 @@ INSERT INTO `command` VALUES ('reload locales_quest','3','Syntax: .reload locales_quest\nReload locales_quest table.'), ('reload milling_loot_template','3','Syntax: .reload milling_loot_template\nReload milling_loot_template table.'), ('reload npc_gossip','3','Syntax: .reload npc_gossip\nReload npc_gossip table.'), -('reload npc_option','3','Syntax: .reload npc_option\nReload npc_option table.'), ('reload npc_trainer','3','Syntax: .reload npc_trainer\nReload npc_trainer table.'), ('reload npc_vendor','3','Syntax: .reload npc_vendor\nReload npc_vendor table.'), ('reload page_text','3','Syntax: .reload page_text\nReload page_text table.'), diff --git a/src/game/Group.h b/src/game/Group.h index 104b38c8588..aa5beac740e 100644 --- a/src/game/Group.h +++ b/src/game/Group.h @@ -413,7 +413,7 @@ class TRINITY_DLL_SPEC Group for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) { if (itr->flags & flag) - itr->flags = &= ~flag; + itr->flags &= ~flag; } } |