josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-12-23 12:48:45 +01:00
parent f604193fd2 0503fbd2b6
commit 8fc116674c
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/6747_world_command.sql
+1
View File
@@ -0,0 +1 @@
DELETE FROM `command` WHERE `name`='reload npc_option';
sql/world.sql
-1
View File
@@ -586,7 +586,6 @@ INSERT INTO `command` VALUES
('reload locales_quest','3','Syntax: .reload locales_quest\nReload locales_quest table.'), ('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 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_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_trainer','3','Syntax: .reload npc_trainer\nReload npc_trainer table.'),
('reload npc_vendor','3','Syntax: .reload npc_vendor\nReload npc_vendor 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.'), ('reload page_text','3','Syntax: .reload page_text\nReload page_text table.'),
src/game/Group.h
+1 -1
View File
@@ -413,7 +413,7 @@ class TRINITY_DLL_SPEC Group
for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
{ {
if (itr->flags & flag) if (itr->flags & flag)
itr->flags = &= ~flag; itr->flags &= ~flag;
} }
} }