Merge [SD2]

r1296 Fix typo and check for IN_PROGRESS instead of NOT_STARTED and also return after force EnterEvadeMode in UpdateAI - skip
r1297 Set sysconfdir path in different way for linux compile, to avoid possible DOTCONF++ error at start. Patch by Saeldur - skip
r1298 Fix typo in MC instance script.
r1299 Clean up one MC boss script and remove old workarounds. Patch by Reve
r1300 Add gossip to npc_naladu. Patch by hoshie
r1301 Some minor cleanup and move one folder+source file

--HG--
branch : trunk

This commit is contained in:

Kudlaty

2009-08-16 02:46:55 +02:00

parent 93709273ec

commit 61ed8f90df

11 changed files with 151 additions and 132 deletions

									
										sql/updates/5071_world_scripts.sql
									
		+3
		
												View File
												
				@@ -0,0 +1,3 @@

				UPDATE script_texts SET comment='core rager EMOTE_LOWHP' WHERE entry=-1409002;

				UPDATE creature_template SET ScriptName='npc_naladu' WHERE entry=19361;