[2864] Fix NPC Flag for Reginald Windsor

xfurry · xfurry · commit b8f99c2fcdbe · 2013-04-10T20:46:34.000+03:00
The flag is controlled by script, but if we remove it from DB errors will show up.
diff --git a/scripts/eastern_kingdoms/stormwind_city.cpp b/scripts/eastern_kingdoms/stormwind_city.cpp
@@ -568,6 +568,8 @@ struct MANGOS_DLL_DECL npc_reginald_windsorAI : public npc_escortAI, private Dia
         DialogueHelper(aMasqueradeDialogue)
     {
         m_pScriptedMap = (ScriptedMap*)m_creature->GetInstanceData();
+        // Npc flag is controlled by script
+        m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
         InitializeDialogueHelper(m_pScriptedMap);
         Reset();
     }
diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "2863"
+ #define SD2_REVISION_NR "2864"
 #endif // __SD2_REVISION_NR_H__

Original file line number	Diff line number	Diff line change
`@@ -568,6 +568,8 @@ struct MANGOS_DLL_DECL npc_reginald_windsorAI : public npc_escortAI, private Dia`
`568`	`568`	`DialogueHelper(aMasqueradeDialogue)`
`569`	`569`	`{`
`570`	`570`	`m_pScriptedMap = (ScriptedMap*)m_creature->GetInstanceData();`
	`571`	`+ // Npc flag is controlled by script`
	`572`	`+ m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);`
`571`	`573`	`InitializeDialogueHelper(m_pScriptedMap);`
`572`	`574`	`Reset();`
`573`	`575`	`}`