misc stuff

Author: Reamer

CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2005-2011 MaNGOS <http://getmangos.com/>
+# Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
 #
 # 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

README

@@ -30,7 +30,7 @@ In this repository you will find these scripts and more:
 - Violet hold (by Przemratajczak Repo, big rewrite by rsa)
 - Ahn'kahet (renewed, by Tassadar with my corrects)
 - Draktaron (by Tassadar)
-- Culling of Stratholme (by MaxXx2021 AKA Mioka)
+- Culling of Stratholme (by MaxXx2021 && FallenAngelX)
 - Obsidian Sanctum (by michalpolko)
 - Azjol-Nerub (by MaxXx2021)
 - Forge of souls (by Maxxx2021 and rsa)
@@ -42,7 +42,7 @@ In this repository you will find these scripts and more:
 - npc_arena_honor (by tempura)
 - NPC special (partially by rsa, thanks for all)
 - Nexus (rewrite by Janu , instance rewite by fallenangelX)
-- Oculus (originally from TC with MaxXx2021 and rsa modifications)
+- Oculus (originally from TC with MaxXx2021, rsa, FallenangelX and traponinet Rewrites)
 - Eye of Eternity(originally from Tassadar with PSZ and rsa modifications)
 - All DK Starting Area Quest (by fallenangelX,ancient,rsa,cklegg, traponinet and klimbo)
 - Sunwell_Plateau (by FallenangelX , Xfurry and Official SD2)  -- Currently in progress
@@ -72,7 +72,7 @@ And please do not send me a compilation error. So what lies in my repository, ab
 
 == ScriptDev2 README ==
 
-  Copyright (C) 2006 - 2011 ScriptDev2 <https://github.com/scriptdev2>
+  Copyright (C) 2006 - 2012 ScriptDev2 <https://github.com/scriptdev2>
   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

ScriptMgr.cpp

@@ -63,7 +63,7 @@ void LoadDatabase()
     // Initialize connection to DB
     if (SD2Database.Initialize(strSD2DBinfo.c_str()))
     {
-        outstring_log("SD2: ScriptDev2 database at %s initialized.", strSD2DBinfo.c_str());
+        outstring_log("SD2: ScriptDev2 database initialized.");
         outstring_log("");
 
         pSystemMgr.LoadVersion();

ScriptMgr.h

@@ -8,6 +8,7 @@
 #include "Common.h"
 #include "DBCStructure.h"
 #include "Database/DatabaseEnv.h"
+#include "LockedVector.h"
 
 class Player;
 class Creature;
@@ -31,10 +32,9 @@ class ObjectGuid;
 #define VISIBLE_RANGE       (166.0f)                        // MAX visible range (size of grid)
 #define DEFAULT_TEXT        "<ScriptDev2 Text Entry Missing!>"
 
-// Some typedefs for storing Guids
-typedef std::list<ObjectGuid> GUIDList;
+typedef ACE_Based::LockedVector<ObjectGuid> GUIDList;
 typedef std::set<ObjectGuid> GUIDSet;
-typedef std::vector<ObjectGuid> GUIDVector;
+typedef ACE_Based::LockedVector<ObjectGuid> GUIDVector;
 typedef std::map<uint32, ObjectGuid> EntryGuidMap;
 
 /* Escort Factions

VC100/100ScriptDev2.vcxproj

@@ -120,10 +120,6 @@
       <ImportLibrary>$(OutDir)mangosscriptR2.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-    </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -432,6 +428,7 @@
     <ClCompile Include="..\scripts\kalimdor\caverns_of_time\old_hillsbrad\old_hillsbrad.cpp" />
     <ClCompile Include="..\scripts\kalimdor\darkshore.cpp" />
     <ClCompile Include="..\scripts\kalimdor\desolace.cpp" />
+    <ClCompile Include="..\scripts\kalimdor\durotar.cpp" />
     <ClCompile Include="..\scripts\kalimdor\dire_maul\dire_maul.cpp" />
     <ClCompile Include="..\scripts\kalimdor\dire_maul\instance_dire_maul.cpp" />
     <ClCompile Include="..\scripts\kalimdor\dustwallow_marsh.cpp" />
@@ -450,7 +447,7 @@
     <ClCompile Include="..\scripts\kalimdor\razorfen_downs\boss_tuten_kash.cpp" />
     <ClCompile Include="..\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp" />
     <ClCompile Include="..\scripts\kalimdor\razorfen_kraul\instance_razorfen_kraul.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp" />
+	<ClCompile Include="..\scripts\kalimdor\razorfen_kraul\razorfen_kraul.cpp" />
     <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_ayamiss.cpp" />
     <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_buru.cpp" />
     <ClCompile Include="..\scripts\kalimdor\ruins_of_ahnqiraj\boss_kurinnaxx.cpp" />
@@ -710,7 +707,7 @@
     <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_high_botanist_freywinn.cpp" />
     <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_laj.cpp" />
     <ClCompile Include="..\scripts\outland\tempest_keep\botanica\boss_warp_splinter.cpp" />
-    <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_alar.cpp" />
+	<ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_alar.cpp" />
     <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_astromancer.cpp" />
     <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_kaelthas.cpp" />
     <ClCompile Include="..\scripts\outland\tempest_keep\the_eye\boss_void_reaver.cpp" />
@@ -723,14 +720,14 @@
     <ClCompile Include="..\scripts\outland\terokkar_forest.cpp" />
     <ClCompile Include="..\scripts\outland\zangarmarsh.cpp" />
     <ClCompile Include="..\scripts\world\areatrigger_scripts.cpp" />
-    <ClCompile Include="..\scripts\world\bosses_emerald_dragons.cpp" />
+	<ClCompile Include="..\scripts\world\bosses_emerald_dragons.cpp" />
     <ClCompile Include="..\scripts\world\go_scripts.cpp" />
     <ClCompile Include="..\scripts\world\guards.cpp" />
     <ClCompile Include="..\scripts\world\item_scripts.cpp" />
     <ClCompile Include="..\scripts\world\mob_generic_creature.cpp" />
     <ClCompile Include="..\scripts\world\npcs_special.cpp" />
     <ClCompile Include="..\scripts\world\npc_professions.cpp" />
-    <ClCompile Include="..\scripts\world\pet_scripts.cpp" />
+	<ClCompile Include="..\scripts\world\pet_scripts.cpp" />
     <ClCompile Include="..\scripts\world\spell_scripts.cpp" />
     <ClCompile Include="..\scripts\world\world_map_scripts.cpp" />
     <ClCompile Include="..\include\precompiled.cpp">

VC100/100ScriptDev2.vcxproj.filters

@@ -468,6 +468,9 @@
     <ClCompile Include="..\scripts\eastern_kingdoms\burning_steppes.cpp">
       <Filter>scripts\eastern_kingdoms</Filter>
     </ClCompile>
+    <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\boss_mr_smite.cpp">
+      <Filter>scripts\eastern_kingdoms\deadmines</Filter>
+    </ClCompile>
     <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\deadmines.cpp">
       <Filter>scripts\eastern_kingdoms\deadmines</Filter>
     </ClCompile>
@@ -948,6 +951,9 @@
     <ClCompile Include="..\scripts\kalimdor\desolace.cpp">
       <Filter>scripts\kalimdor</Filter>
     </ClCompile>
+    <ClCompile Include="..\scripts\kalimdor\durotar.cpp">
+      <Filter>scripts\kalimdor</Filter>
+    </ClCompile>
     <ClCompile Include="..\scripts\kalimdor\dire_maul\dire_maul.cpp">
       <Filter>scripts\kalimdor\dire_maul</Filter>
     </ClCompile>
@@ -993,6 +999,9 @@
     <ClCompile Include="..\scripts\kalimdor\razorfen_downs\boss_amnennar_the_coldbringer.cpp">
       <Filter>scripts\kalimdor\razorfen_downs</Filter>
     </ClCompile>
+    <ClCompile Include="..\scripts\kalimdor\razorfen_downs\boss_tuten_kash.cpp">
+      <Filter>scripts\kalimdor\razorfen_downs</Filter>
+    </ClCompile>
     <ClCompile Include="..\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp">
       <Filter>scripts\kalimdor\razorfen_downs</Filter>
     </ClCompile>
@@ -1854,11 +1863,11 @@
     <ClCompile Include="..\system\system.cpp">
       <Filter>system</Filter>
     </ClCompile>
-    <ClCompile Include="..\ScriptMgr.cpp" />
-    <ClCompile Include="..\scripts\eastern_kingdoms\deadmines\boss_mr_smite.cpp" />
-    <ClCompile Include="..\scripts\world\pet_scripts.cpp" />
-    <ClCompile Include="..\scripts\kalimdor\razorfen_downs\boss_tuten_kash.cpp">
-      <Filter>scripts\kalimdor\razorfen_downs</Filter>
+    <ClCompile Include="..\ScriptMgr.cpp">
+      <Filter>system</Filter>
+    </ClCompile>
+    <ClCompile Include="..\scripts\world\pet_scripts.cpp">
+      <Filter>scripts\world</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -2111,7 +2120,9 @@
     <ClInclude Include="..\config.h" />
     <ClInclude Include="..\sd2_revision_nr.h" />
     <ClInclude Include="..\sd2_revision_sql.h" />
-    <ClInclude Include="..\ScriptMgr.h" />
+    <ClInclude Include="..\ScriptMgr.h">
+      <Filter>system</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\revision.h" />

VC90/90ScriptDev2.vcproj

@@ -211,6 +211,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalOptions="-Zm120"
 				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers\"
 				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
 				MinimalRebuild="true"
@@ -1304,6 +1305,10 @@
 					RelativePath="..\scripts\kalimdor\desolace.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\scripts\kalimdor\durotar.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\scripts\kalimdor\dustwallow_marsh.cpp"
 					>
@@ -1571,6 +1576,10 @@
 						RelativePath="..\scripts\kalimdor\razorfen_downs\boss_amnennar_the_coldbringer.cpp"
 						>
 					</File>
+					<File
+						RelativePath="..\scripts\kalimdor\razorfen_downs\boss_tuten_kash.cpp"
+						>
+					</File>
 					<File
 						RelativePath="..\scripts\kalimdor\razorfen_downs\razorfen_downs.cpp"
 						>

include/sc_grid_searchers.cpp

@@ -29,11 +29,11 @@ GameObject* GetClosestGameObjectWithEntry(WorldObject* pSource, uint32 uiEntry,
 }
 
 //return closest creature alive in grid, with range from pSource
-Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange)
+Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange, bool bOnlyAlive/*=true*/, bool bOnlyDead/*=false*/)
 {
     Creature* pCreature = NULL;
 
-    MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck creature_check(*pSource, uiEntry, true, fMaxSearchRange);
+    MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck creature_check(*pSource, uiEntry, bOnlyAlive, bOnlyDead, fMaxSearchRange);
     MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(pCreature, creature_check);
 
     Cell::VisitGridObjects(pSource, searcher, fMaxSearchRange);

include/sc_grid_searchers.h

@@ -39,7 +39,7 @@ struct ObjectDistanceOrderReversed : public std::binary_function<const WorldObje
 
 Unit* GetClosestAttackableUnit(Unit* pSource, float fMaxSearchRange);
 GameObject* GetClosestGameObjectWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);
-Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);
+Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange, bool bOnlyAlive = true, bool bOnlyDead = false);
 
 void GetGameObjectListWithEntryInGrid(std::list<GameObject*>& lList , WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);
 void GetCreatureListWithEntryInGrid(std::list<Creature*>& lList, WorldObject* pSource, uint32 uiEntry, float fMaxSearchRange);