From 69def3b335f4bfd4f3a804215f96d95cdb4db760 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Wed, 23 Dec 2009 11:37:38 +0100 Subject: [PATCH 1/2] * Delete now unused "reload npc_option" chat command. --HG-- branch : trunk --- sql/updates/6747_world_command.sql | 1 + sql/world.sql | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 sql/updates/6747_world_command.sql diff --git a/sql/updates/6747_world_command.sql b/sql/updates/6747_world_command.sql new file mode 100644 index 0000000000..507e469f80 --- /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 39f3f6c644..be4a4f49f7 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.'), From 0503fbd2b6d41c916b0d403a3f5a8c391a28609e Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Wed, 23 Dec 2009 11:46:23 +0100 Subject: [PATCH 2/2] * Fixed compile. --HG-- branch : trunk --- src/game/Group.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/Group.h b/src/game/Group.h index 104b38c858..aa5beac740 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; } }