Merge [SD2]
r1291 Move one misplaced script in yesterday commits. r1292 Make own folder for tool, not needed for general work of SD2. - skip r1293 Add script loader to simplify maintenance of scripts. The scripts must now be added to system/ScriptLoader.cpp instead of old way directly in ScriptMgr. --HG-- branch : trunk
This commit is contained in:
@@ -8,7 +8,6 @@ SET(trinityscript_LIB_SRCS
|
||||
base/escortAI.h
|
||||
base/guard_ai.cpp
|
||||
base/guard_ai.h
|
||||
base/guards.cpp
|
||||
base/simple_ai.cpp
|
||||
base/simple_ai.h
|
||||
include/precompiled.cpp
|
||||
@@ -502,12 +501,15 @@ SET(trinityscript_LIB_SRCS
|
||||
scripts/world/boss_taerar.cpp
|
||||
scripts/world/boss_ysondre.cpp
|
||||
scripts/world/go_scripts.cpp
|
||||
scripts/world/guards.cpp
|
||||
scripts/world/item_scripts.cpp
|
||||
scripts/world/mob_generic_creature.cpp
|
||||
scripts/world/npc_innkeeper.cpp
|
||||
scripts/world/npc_professions.cpp
|
||||
scripts/world/npcs_special.cpp
|
||||
scripts/world/npc_taxi.cpp
|
||||
system/ScriptLoader.cpp
|
||||
system/ScriptLoader.h
|
||||
system.cpp
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user