diff options
| -rw-r--r-- | src/bindings/scripts/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/bindings/scripts/VC80/80ScriptDev2.vcproj | 124 | ||||
| -rw-r--r-- | src/bindings/scripts/VC90/90ScriptDev2.vcproj | 124 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/item/item_test.cpp | 43 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/areatrigger_scripts.cpp (renamed from src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/boss_emeriss.cpp (renamed from src/bindings/scripts/scripts/boss/boss_emeriss.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/boss_lethon.cpp (renamed from src/bindings/scripts/scripts/boss/boss_lethon.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/boss_taerar.cpp (renamed from src/bindings/scripts/scripts/boss/boss_taerar.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/boss_ysondre.cpp (renamed from src/bindings/scripts/scripts/boss/boss_ysondre.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/go_scripts.cpp (renamed from src/bindings/scripts/scripts/go/go_scripts.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/item_scripts.cpp (renamed from src/bindings/scripts/scripts/item/item_scripts.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/mob_generic_creature.cpp (renamed from src/bindings/scripts/scripts/creature/mob_generic_creature.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/npc_innkeeper.cpp (renamed from src/bindings/scripts/scripts/npc/npc_innkeeper.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/npc_professions.cpp (renamed from src/bindings/scripts/scripts/npc/npc_professions.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/npc_taxi.cpp (renamed from src/bindings/scripts/scripts/npc/npc_taxi.cpp) | 0 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/npcs_special.cpp (renamed from src/bindings/scripts/scripts/npc/npcs_special.cpp) | 0 |
16 files changed, 116 insertions, 199 deletions
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index bdb9291e4fd..88b134108e9 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -10,12 +10,6 @@ SET(trinityscript_LIB_SRCS include/sc_creature.h include/sc_gossip.h include/sc_instance.h - scripts/areatrigger/areatrigger_scripts.cpp - scripts/boss/boss_emeriss.cpp - scripts/boss/boss_lethon.cpp - scripts/boss/boss_taerar.cpp - scripts/boss/boss_ysondre.cpp - scripts/creature/mob_generic_creature.cpp scripts/creature/simple_ai.cpp scripts/creature/simple_ai.h scripts/eastern_kingdoms/alterac_mountains.cpp @@ -44,11 +38,9 @@ SET(trinityscript_LIB_SRCS scripts/examples/example_escort.cpp scripts/examples/example_gossip_codebox.cpp scripts/examples/example_misc.cpp - scripts/go/go_scripts.cpp scripts/guard/guard_ai.cpp scripts/guard/guard_ai.h scripts/guard/guards.cpp - scripts/item/item_scripts.cpp scripts/kalimdor/ashenvale.cpp scripts/kalimdor/azshara.cpp scripts/kalimdor/azuremyst_isle.cpp @@ -78,10 +70,6 @@ SET(trinityscript_LIB_SRCS scripts/northrend/zuldrak.cpp scripts/npc/npc_escortAI.cpp scripts/npc/npc_escortAI.h - scripts/npc/npc_innkeeper.cpp - scripts/npc/npc_professions.cpp - scripts/npc/npcs_special.cpp - scripts/npc/npc_taxi.cpp scripts/outland/blades_edge_mountains.cpp scripts/outland/boss_doomlord_kazzak.cpp scripts/outland/boss_doomwalker.cpp @@ -508,6 +496,18 @@ SET(trinityscript_LIB_SRCS scripts/zone/ulduar/ulduar/boss_yoggsaron.cpp scripts/zone/ulduar/ulduar/def_ulduar.h scripts/zone/ulduar/ulduar/instance_ulduar.cpp + scripts/world/areatrigger_scripts.cpp + scripts/world/boss_emeriss.cpp + scripts/world/boss_lethon.cpp + scripts/world/boss_taerar.cpp + scripts/world/boss_ysondre.cpp + scripts/world/go_scripts.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.cpp ) diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj index e4a32705566..5518d35f66f 100644 --- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj +++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj @@ -364,41 +364,9 @@ Name="scripts" > <Filter - Name="areatrigger" - > - <File - RelativePath="..\scripts\areatrigger\areatrigger_scripts.cpp" - > - </File> - </Filter> - <Filter - Name="boss" - > - <File - RelativePath="..\scripts\boss\boss_emeriss.cpp" - > - </File> - <File - RelativePath="..\scripts\boss\boss_lethon.cpp" - > - </File> - <File - RelativePath="..\scripts\boss\boss_taerar.cpp" - > - </File> - <File - RelativePath="..\scripts\boss\boss_ysondre.cpp" - > - </File> - </Filter> - <Filter Name="creature" > <File - RelativePath="..\scripts\creature\mob_generic_creature.cpp" - > - </File> - <File RelativePath="..\scripts\creature\simple_ai.cpp" > </File> @@ -520,14 +488,6 @@ </File> </Filter> <Filter - Name="go" - > - <File - RelativePath="..\scripts\go\go_scripts.cpp" - > - </File> - </Filter> - <Filter Name="guard" > <File @@ -544,14 +504,6 @@ </File> </Filter> <Filter - Name="item" - > - <File - RelativePath="..\scripts\item\item_scripts.cpp" - > - </File> - </Filter> - <Filter Name="kalimdor" > <File @@ -677,22 +629,6 @@ RelativePath="..\scripts\npc\npc_escortAI.h" > </File> - <File - RelativePath="..\scripts\npc\npc_innkeeper.cpp" - > - </File> - <File - RelativePath="..\scripts\npc\npc_professions.cpp" - > - </File> - <File - RelativePath="..\scripts\npc\npc_taxi.cpp" - > - </File> - <File - RelativePath="..\scripts\npc\npcs_special.cpp" - > - </File> </Filter> <Filter Name="outland" @@ -2776,14 +2712,6 @@ </Filter> </Filter> <Filter - Name="honor" - > - </Filter> - <Filter - Name="servers" - > - </Filter> - <Filter Name="custom" > <File @@ -2796,6 +2724,58 @@ </File> </Filter> </Filter> + <Filter + Name="world" + > + <File + RelativePath="..\scripts\world\areatrigger_scripts.cpp" + > + </File> + <File + RelativePath="..\scripts\world\boss_emeriss.cpp" + > + </File> + <File + RelativePath="..\scripts\world\boss_lethon.cpp" + > + </File> + <File + RelativePath="..\scripts\world\boss_taerar.cpp" + > + </File> + <File + RelativePath="..\scripts\world\boss_ysondre.cpp" + > + </File> + <File + RelativePath="..\scripts\world\go_scripts.cpp" + > + </File> + <File + RelativePath="..\scripts\world\item_scripts.cpp" + > + </File> + <File + RelativePath="..\scripts\world\mob_generic_creature.cpp" + > + </File> + <File + RelativePath="..\scripts\world\npc_innkeeper.cpp" + > + </File> + <File + RelativePath="..\scripts\world\npc_professions.cpp" + > + </File> + <File + RelativePath="..\scripts\world\npc_taxi.cpp" + > + </File> + <File + RelativePath="..\scripts\world\npcs_special.cpp" + > + </File> + </Filter> <Filter Name="Include" > diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj index 8aa552725ed..5bdbd099d7f 100644 --- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj +++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj @@ -361,41 +361,9 @@ Name="scripts" > <Filter - Name="areatrigger" - > - <File - RelativePath="..\scripts\areatrigger\areatrigger_scripts.cpp" - > - </File> - </Filter> - <Filter - Name="boss" - > - <File - RelativePath="..\scripts\boss\boss_emeriss.cpp" - > - </File> - <File - RelativePath="..\scripts\boss\boss_lethon.cpp" - > - </File> - <File - RelativePath="..\scripts\boss\boss_taerar.cpp" - > - </File> - <File - RelativePath="..\scripts\boss\boss_ysondre.cpp" - > - </File> - </Filter> - <Filter Name="creature" > <File - RelativePath="..\scripts\creature\mob_generic_creature.cpp" - > - </File> - <File RelativePath="..\scripts\creature\simple_ai.cpp" > </File> @@ -517,14 +485,6 @@ </File> </Filter> <Filter - Name="go" - > - <File - RelativePath="..\scripts\go\go_scripts.cpp" - > - </File> - </Filter> - <Filter Name="guard" > <File @@ -541,14 +501,6 @@ </File> </Filter> <Filter - Name="item" - > - <File - RelativePath="..\scripts\item\item_scripts.cpp" - > - </File> - </Filter> - <Filter Name="kalimdor" > <File @@ -674,22 +626,6 @@ RelativePath="..\scripts\npc\npc_escortAI.h" > </File> - <File - RelativePath="..\scripts\npc\npc_innkeeper.cpp" - > - </File> - <File - RelativePath="..\scripts\npc\npc_professions.cpp" - > - </File> - <File - RelativePath="..\scripts\npc\npc_taxi.cpp" - > - </File> - <File - RelativePath="..\scripts\npc\npcs_special.cpp" - > - </File> </Filter> <Filter Name="outland" @@ -2773,14 +2709,6 @@ </Filter> </Filter> <Filter - Name="honor" - > - </Filter> - <Filter - Name="servers" - > - </Filter> - <Filter Name="custom" > <File @@ -2793,6 +2721,58 @@ </File> </Filter> </Filter> + <Filter + Name="world" + > + <File + RelativePath="..\scripts\world\areatrigger_scripts.cpp" + > + </File> + <File + RelativePath="..\scripts\world\boss_emeriss.cpp" + > + </File> + <File + RelativePath="..\scripts\world\boss_lethon.cpp" + > + </File> + <File + RelativePath="..\scripts\world\boss_taerar.cpp" + > + </File> + <File + RelativePath="..\scripts\world\boss_ysondre.cpp" + > + </File> + <File + RelativePath="..\scripts\world\go_scripts.cpp" + > + </File> + <File + RelativePath="..\scripts\world\item_scripts.cpp" + > + </File> + <File + RelativePath="..\scripts\world\mob_generic_creature.cpp" + > + </File> + <File + RelativePath="..\scripts\world\npc_innkeeper.cpp" + > + </File> + <File + RelativePath="..\scripts\world\npc_professions.cpp" + > + </File> + <File + RelativePath="..\scripts\world\npc_taxi.cpp" + > + </File> + <File + RelativePath="..\scripts\world\npcs_special.cpp" + > + </File> + </Filter> <Filter Name="Include" > diff --git a/src/bindings/scripts/scripts/item/item_test.cpp b/src/bindings/scripts/scripts/item/item_test.cpp deleted file mode 100644 index 0c2d9ac2793..00000000000 --- a/src/bindings/scripts/scripts/item/item_test.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* ScriptData -SDName: Item_Test -SD%Complete: 100 -SDComment: Used for Testing Item Scripts -SDCategory: Items -EndScriptData */ - -#include "precompiled.h" - -extern void LoadDatabase(); - -bool ItemUse_item_test(Player* pPlayer, Item* _Item, SpellCastTargets const& targets) -{ - LoadDatabase(); - return true; -} - -void AddSC_item_test() -{ - Script *newscript; - - newscript = new Script; - newscript->Name="item_test"; - newscript->pItemUse = &ItemUse_item_test; - newscript->RegisterSelf(); -} - diff --git a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp b/src/bindings/scripts/scripts/world/areatrigger_scripts.cpp index 9ed608ce97b..9ed608ce97b 100644 --- a/src/bindings/scripts/scripts/areatrigger/areatrigger_scripts.cpp +++ b/src/bindings/scripts/scripts/world/areatrigger_scripts.cpp diff --git a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp b/src/bindings/scripts/scripts/world/boss_emeriss.cpp index 9881525e3ad..9881525e3ad 100644 --- a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/world/boss_emeriss.cpp diff --git a/src/bindings/scripts/scripts/boss/boss_lethon.cpp b/src/bindings/scripts/scripts/world/boss_lethon.cpp index e387891efed..e387891efed 100644 --- a/src/bindings/scripts/scripts/boss/boss_lethon.cpp +++ b/src/bindings/scripts/scripts/world/boss_lethon.cpp diff --git a/src/bindings/scripts/scripts/boss/boss_taerar.cpp b/src/bindings/scripts/scripts/world/boss_taerar.cpp index 3f45ab26331..3f45ab26331 100644 --- a/src/bindings/scripts/scripts/boss/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/world/boss_taerar.cpp diff --git a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp b/src/bindings/scripts/scripts/world/boss_ysondre.cpp index 1b93f54c047..1b93f54c047 100644 --- a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/world/boss_ysondre.cpp diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/world/go_scripts.cpp index d0818fe8dc0..d0818fe8dc0 100644 --- a/src/bindings/scripts/scripts/go/go_scripts.cpp +++ b/src/bindings/scripts/scripts/world/go_scripts.cpp diff --git a/src/bindings/scripts/scripts/item/item_scripts.cpp b/src/bindings/scripts/scripts/world/item_scripts.cpp index f103dc86cdc..f103dc86cdc 100644 --- a/src/bindings/scripts/scripts/item/item_scripts.cpp +++ b/src/bindings/scripts/scripts/world/item_scripts.cpp diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/world/mob_generic_creature.cpp index 30a57e56dd5..30a57e56dd5 100644 --- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/world/mob_generic_creature.cpp diff --git a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp b/src/bindings/scripts/scripts/world/npc_innkeeper.cpp index 8a99ea7fc7a..8a99ea7fc7a 100644 --- a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp +++ b/src/bindings/scripts/scripts/world/npc_innkeeper.cpp diff --git a/src/bindings/scripts/scripts/npc/npc_professions.cpp b/src/bindings/scripts/scripts/world/npc_professions.cpp index 07b40555fd5..07b40555fd5 100644 --- a/src/bindings/scripts/scripts/npc/npc_professions.cpp +++ b/src/bindings/scripts/scripts/world/npc_professions.cpp diff --git a/src/bindings/scripts/scripts/npc/npc_taxi.cpp b/src/bindings/scripts/scripts/world/npc_taxi.cpp index 161b663fbb1..161b663fbb1 100644 --- a/src/bindings/scripts/scripts/npc/npc_taxi.cpp +++ b/src/bindings/scripts/scripts/world/npc_taxi.cpp diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp index 64f89628528..64f89628528 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/world/npcs_special.cpp |