Skip to content

Commit 653dbce

Browse files
killerwifekillerwife
committed
Scripts: Fix linux compilation of previous commit
1 parent 729a2bb commit 653dbce

File tree

6 files changed

+58
-28
lines changed

6 files changed

+58
-28
lines changed

‎src/game/DBScripts/ScriptMgr.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ void ScriptMgr::LoadScriptMap(ScriptMapType scriptType, bool reload)
952952
{
953953
auto questEndScripts = GetScriptMap(scriptType);
954954
// check ids
955-
for (ScriptMapMap::const_iterator itr = questEndScripts->second.begin(); itr != questEndScripts->second.end(); ++itr)
955+
for (auto itr = questEndScripts->second.begin(); itr != questEndScripts->second.end(); ++itr)
956956
{
957957
if (!sObjectMgr.GetQuestTemplate(itr->first))
958958
sLog.outErrorDb("Table `dbscripts_on_quest_end` has not existing quest (Id: %u) as script id", itr->first);
@@ -963,7 +963,7 @@ void ScriptMgr::LoadScriptMap(ScriptMapType scriptType, bool reload)
963963
{
964964
auto questStartScripts = GetScriptMap(scriptType);
965965
// check ids
966-
for (ScriptMapMap::const_iterator itr = questStartScripts->second.begin(); itr != questStartScripts->second.end(); ++itr)
966+
for (auto itr = questStartScripts->second.begin(); itr != questStartScripts->second.end(); ++itr)
967967
{
968968
if (!sObjectMgr.GetQuestTemplate(itr->first))
969969
sLog.outErrorDb("Table `dbscripts_on_quest_start` has not existing quest (Id: %u) as script id", itr->first);
@@ -974,7 +974,7 @@ void ScriptMgr::LoadScriptMap(ScriptMapType scriptType, bool reload)
974974
{
975975
auto spellScripts = GetScriptMap(scriptType);
976976
// check ids
977-
for (ScriptMapMap::const_iterator itr = spellScripts->second.begin(); itr != spellScripts->second.end(); ++itr)
977+
for (auto itr = spellScripts->second.begin(); itr != spellScripts->second.end(); ++itr)
978978
{
979979
SpellEntry const* spellInfo = sSpellTemplate.LookupEntry<SpellEntry>(itr->first);
980980
if (!spellInfo)
@@ -1003,7 +1003,7 @@ void ScriptMgr::LoadScriptMap(ScriptMapType scriptType, bool reload)
10031003
{
10041004
auto goScripts = GetScriptMap(scriptType);
10051005
// check ids
1006-
for (ScriptMapMap::const_iterator itr = goScripts->second.begin(); itr != goScripts->second.end(); ++itr)
1006+
for (auto itr = goScripts->second.begin(); itr != goScripts->second.end(); ++itr)
10071007
{
10081008
if (!sObjectMgr.GetGOData(itr->first))
10091009
sLog.outErrorDb("Table `dbscripts_on_go_use` has not existing gameobject (GUID: %u) as script id", itr->first);
@@ -1014,7 +1014,7 @@ void ScriptMgr::LoadScriptMap(ScriptMapType scriptType, bool reload)
10141014
{
10151015
auto goTemplateScripts = GetScriptMap(scriptType);
10161016
// check ids
1017-
for (ScriptMapMap::const_iterator itr = goTemplateScripts->second.begin(); itr != goTemplateScripts->second.end(); ++itr)
1017+
for (auto itr = goTemplateScripts->second.begin(); itr != goTemplateScripts->second.end(); ++itr)
10181018
{
10191019
if (!sObjectMgr.GetGameObjectInfo(itr->first))
10201020
sLog.outErrorDb("Table `dbscripts_on_go_template_use` has not existing gameobject (Entry: %u) as script id", itr->first);
@@ -1029,7 +1029,7 @@ void ScriptMgr::LoadScriptMap(ScriptMapType scriptType, bool reload)
10291029
auto eventScripts = GetScriptMap(scriptType);
10301030

10311031
// Then check if all scripts are in above list of possible script entries
1032-
for (ScriptMapMap::const_iterator itr = eventScripts->second.begin(); itr != eventScripts->second.end(); ++itr)
1032+
for (auto itr = eventScripts->second.begin(); itr != eventScripts->second.end(); ++itr)
10331033
{
10341034
std::set<uint32>::const_iterator itr2 = eventIds.find(itr->first);
10351035
if (itr2 == eventIds.end())
@@ -1046,7 +1046,7 @@ void ScriptMgr::LoadScriptMap(ScriptMapType scriptType, bool reload)
10461046
{
10471047
// check ids
10481048
auto deathScripts = GetScriptMap(scriptType);
1049-
for (ScriptMapMap::const_iterator itr = deathScripts->second.begin(); itr != deathScripts->second.end(); ++itr)
1049+
for (auto itr = deathScripts->second.begin(); itr != deathScripts->second.end(); ++itr)
10501050
{
10511051
if (!sObjectMgr.GetCreatureTemplate(itr->first))
10521052
sLog.outErrorDb("Table `dbscripts_on_creature_death` has not existing creature (Entry: %u) as script id", itr->first);
@@ -1061,7 +1061,7 @@ void ScriptMgr::LoadScriptMap(ScriptMapType scriptType, bool reload)
10611061
{
10621062
// check ids
10631063
auto relayScripts = GetScriptMap(scriptType);
1064-
for (ScriptMapMap::const_iterator itr = relayScripts->second.begin(); itr != relayScripts->second.end(); ++itr)
1064+
for (auto itr = relayScripts->second.begin(); itr != relayScripts->second.end(); ++itr)
10651065
{
10661066
for (auto& data : itr->second) // need to check after load is complete, because of nesting
10671067
{
@@ -1167,7 +1167,7 @@ void ScriptMgr::CheckRandomRelayTemplates()
11671167
void ScriptMgr::CheckScriptTexts(ScriptMapType scriptType)
11681168
{
11691169
ScriptMapMapName const& scripts = *GetScriptMap(scriptType).get();
1170-
for (ScriptMapMap::const_iterator itrMM = scripts.second.begin(); itrMM != scripts.second.end(); ++itrMM)
1170+
for (auto itrMM = scripts.second.begin(); itrMM != scripts.second.end(); ++itrMM)
11711171
{
11721172
for (ScriptMap::const_iterator itrM = itrMM->second.begin(); itrM != itrMM->second.end(); ++itrM)
11731173
{

‎src/game/DBScripts/ScriptMgr.h

+2-17
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
#include "Common.h"
2323
#include "Entities/ObjectGuid.h"
2424
#include "Server/DBCEnums.h"
25+
#include "DBScripts/ScriptMgrDefines.h"
2526

26-
#include <atomic>
27+
#include <memory>
2728

2829
class Map;
2930
class Object;
@@ -584,22 +585,6 @@ struct ScriptInfo
584585
}
585586
};
586587

587-
enum ScriptMapType
588-
{
589-
SCRIPT_TYPE_QUEST_END = 0,
590-
SCRIPT_TYPE_QUEST_START = 1,
591-
SCRIPT_TYPE_SPELL = 2,
592-
SCRIPT_TYPE_GAMEOBJECT = 3,
593-
SCRIPT_TYPE_GAMEOBJECT_TEMPLATE = 4,
594-
SCRIPT_TYPE_EVENT = 5,
595-
SCRIPT_TYPE_GOSSIP = 6,
596-
SCRIPT_TYPE_CREATURE_DEATH = 7,
597-
SCRIPT_TYPE_CREATURE_MOVEMENT = 8,
598-
SCRIPT_TYPE_RELAY = 9,
599-
SCRIPT_TYPE_INTERNAL = 10, // must be last
600-
SCRIPT_TYPE_MAX
601-
};
602-
603588
class ScriptAction
604589
{
605590
public:

‎src/game/DBScripts/ScriptMgrDefines.h

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the CMaNGOS Project. See AUTHORS file for Copyright information
3+
*
4+
* This program is free software; you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation; either version 2 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program; if not, write to the Free Software
16+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17+
*/
18+
19+
#ifndef _SCRIPTMGRDEF_H
20+
#define _SCRIPTMGRDEF_H
21+
22+
enum ScriptMapType
23+
{
24+
SCRIPT_TYPE_QUEST_END = 0,
25+
SCRIPT_TYPE_QUEST_START = 1,
26+
SCRIPT_TYPE_SPELL = 2,
27+
SCRIPT_TYPE_GAMEOBJECT = 3,
28+
SCRIPT_TYPE_GAMEOBJECT_TEMPLATE = 4,
29+
SCRIPT_TYPE_EVENT = 5,
30+
SCRIPT_TYPE_GOSSIP = 6,
31+
SCRIPT_TYPE_CREATURE_DEATH = 7,
32+
SCRIPT_TYPE_CREATURE_MOVEMENT = 8,
33+
SCRIPT_TYPE_RELAY = 9,
34+
SCRIPT_TYPE_INTERNAL = 10, // must be last
35+
SCRIPT_TYPE_MAX
36+
};
37+
38+
#endif

‎src/game/Globals/ObjectMgr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9725,7 +9725,7 @@ void ObjectMgr::LoadGossipMenus()
97259725
auto gossipScripts = sScriptMgr.GetScriptMap(SCRIPT_TYPE_GOSSIP);
97269726
// Check which script-ids in dbscripts_on_gossip are not used
97279727
std::set<uint32> gossipScriptSet;
9728-
for (ScriptMapMap::const_iterator itr = gossipScripts->second.begin(); itr != gossipScripts->second.end(); ++itr)
9728+
for (auto itr = gossipScripts->second.begin(); itr != gossipScripts->second.end(); ++itr)
97299729
gossipScriptSet.insert(itr->first);
97309730

97319731
// Load gossip_menu and gossip_menu_option data

‎src/game/Maps/MapDataContainer.h

+7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#define MAP_DATA_CONTAINER_H
2121

2222
#include "Platform/Define.h"
23+
#include "DBScripts/ScriptMgrDefines.h"
2324
#include <memory>
2425
#include <vector>
2526
#include <unordered_map>
@@ -30,12 +31,18 @@ struct SpawnGroupEntry;
3031
struct SpawnGroupEntryContainer;
3132
struct CreatureEventAI_Event;
3233
struct CreatureEventAI_EventComputedData;
34+
struct ScriptInfo;
3335

3436
// Event_Map
3537
typedef std::vector<CreatureEventAI_Event> CreatureEventAI_Event_Vec;
3638
typedef std::unordered_map<uint32, CreatureEventAI_Event_Vec> CreatureEventAI_Event_Map;
3739
typedef std::unordered_map<uint32, CreatureEventAI_EventComputedData> CreatureEventAI_EventComputedData_Map;
3840

41+
// Scripts
42+
typedef std::multimap < uint32 /*delay*/, std::shared_ptr<ScriptInfo>> ScriptMap;
43+
typedef std::map < uint32 /*id*/, ScriptMap > ScriptMapMap;
44+
typedef std::pair<const char*, ScriptMapMap> ScriptMapMapName;
45+
3946
class MapDataContainer
4047
{
4148
public:

‎src/game/MotionGenerators/WaypointManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void WaypointManager::Load()
157157
std::set<uint32> movementScriptSet;
158158

159159
auto creatureMovementScripts = sScriptMgr.GetScriptMap(SCRIPT_TYPE_CREATURE_MOVEMENT);
160-
for (ScriptMapMap::const_iterator itr = creatureMovementScripts->second.begin(); itr != creatureMovementScripts->second.end(); ++itr)
160+
for (auto itr = creatureMovementScripts->second.begin(); itr != creatureMovementScripts->second.end(); ++itr)
161161
movementScriptSet.insert(itr->first);
162162

163163
// /////////////////////////////////////////////////////

0 commit comments

Comments
 (0)