ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Scripts): Fix scripts where LoadObjectData can leave arrays boundaries. (#17070)

Browse source 
* fix(Core/Scripts): Fix scripts where LoadObjectData can leave arrays boundaries.

* Fix build
This commit is contained in:
Anton Popovichenko 2023-08-25 14:15:07 +02:00 • committed by GitHub
parent 6b583089f3
commit f4658a1df2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
View file

@ -47,6 +47,7 @@ ObjectData const creatureData[] =
{ NPC_NEFARIAN_TROOPS, DATA_NEFARIAN_TROOPS },
{ NPC_VICTOR_NEFARIUS, DATA_LORD_VICTOR_NEFARIUS },
{ NPC_CHROMAGGUS, DATA_CHROMAGGUS },
{ 0, 0 }
};
ObjectData const objectData[] =

1
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
View file

@ -43,6 +43,7 @@ ObjectData const creatureData[] =
{ NPC_TINHEAD, DATA_TINHEAD },
{ NPC_ROMULO, DATA_ROMULO },
{ NPC_JULIANNE, DATA_JULIANNE },
{ 0, 0 }
};
class instance_karazhan : public InstanceMapScript

3
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
View file

@ -38,7 +38,8 @@ ObjectData const creatureData[] =
{ NPC_HIGH_PRIEST_THEKAL, DATA_THEKAL },
{ NPC_ZEALOT_LORKHAN, DATA_LORKHAN },
{ NPC_ZEALOT_ZATH, DATA_ZATH },
{ NPC_PRIESTESS_MARLI, DATA_MARLI }
{ NPC_PRIESTESS_MARLI, DATA_MARLI },
{ 0, 0 }
};
class instance_zulgurub : public InstanceMapScript

5
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
View file

@ -31,9 +31,10 @@ const Position PortalLocation[4] =
{ -1930.9106f, 7183.5970f, 23.007639f, 3.59537f }
};
ObjectData const creatureData[1] =
ObjectData const creatureData[] =
{
{ NPC_MEDIVH, DATA_MEDIVH }
{ NPC_MEDIVH, DATA_MEDIVH },
{ 0, 0 }
};
class instance_the_black_morass : public InstanceMapScript

3
src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
View file

@ -21,7 +21,8 @@
ObjectData const creatureData[] =
{
{ NPC_ONYXIA, DATA_ONYXIA }
{ NPC_ONYXIA, DATA_ONYXIA },
{ 0, 0 }
};
class instance_onyxias_lair : public InstanceMapScript

1
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
View file

@ -36,6 +36,7 @@ ObjectData const creatureData[] =
{ NPC_YEGGETH, DATA_YEGGETH },
{ NPC_PAKKON, DATA_PAKKON },
{ NPC_ZERRAN, DATA_ZERRAN },
{ 0, 0 }
};
enum RajaxxWaveEvent

3
src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
View file

@ -35,7 +35,8 @@ ObjectData const creatureData[] =
{ NPC_MASTERS_EYE, DATA_MASTERS_EYE },
{ NPC_VEKLOR, DATA_VEKLOR },
{ NPC_VEKNILASH, DATA_VEKNILASH },
{ NPC_VISCIDUS, DATA_VISCIDUS }
{ NPC_VISCIDUS, DATA_VISCIDUS },
{ 0, 0 }
};
DoorData const doorData[] =

3
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
View file

@ -32,7 +32,8 @@ DoorData const doorData[] =
ObjectData const creatureData[] =
{
{ NPC_KRIKTHIR_THE_GATEWATCHER, DATA_KRIKTHIR_THE_GATEWATCHER_EVENT },
{ NPC_HADRONOX, DATA_HADRONOX_EVENT }
{ NPC_HADRONOX, DATA_HADRONOX_EVENT },
{ 0, 0 }
};
BossBoundaryData const boundaries =

3
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View file

@ -118,7 +118,8 @@ DoorData const doorData[] =
ObjectData const creatureData[] =
{
{ NPC_SINDRAGOSA, DATA_SINDRAGOSA }
{ NPC_SINDRAGOSA, DATA_SINDRAGOSA },
{ 0, 0 }
};
// this doesnt have to only store questgivers, also can be used for related quest spawns

3
src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
View file

@ -27,7 +27,8 @@ DoorData const doorData[] =
ObjectData const gameObjectData[] =
{
{ GO_THE_TALON_KINGS_COFFER, DATA_GO_TALON_KING_COFFER }
{ GO_THE_TALON_KINGS_COFFER, DATA_GO_TALON_KING_COFFER },
{ 0, 0 }
};
class instance_sethekk_halls : public InstanceMapScript

3
src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
View file

@ -30,7 +30,8 @@
ObjectData const creatureData[] =
{
{ NPC_QUAGMIRRAN, DATA_QUAGMIRRAN }
{ NPC_QUAGMIRRAN, DATA_QUAGMIRRAN },
{ 0, 0 }
};
class instance_the_slave_pens : public InstanceMapScript

3
src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp
View file

@ -23,7 +23,8 @@
ObjectData const creatureData[] =
{
{ NPC_HUNGARFEN, DATA_HUNGARFEN },
{ NPC_GHAZAN, DATA_GHAZAN }
{ NPC_GHAZAN, DATA_GHAZAN },
{ 0, 0 }
};
class instance_the_underbog : public InstanceMapScript

3
src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
View file

@ -30,7 +30,8 @@ ObjectData const creatureData[] =
{
{ NPC_DALLIAH, DATA_DALLIAH },
{ NPC_SOCCOTHRATES, DATA_SOCCOTHRATES },
{ NPC_MELLICHAR, DATA_WARDEN_MELLICHAR }
{ NPC_MELLICHAR, DATA_WARDEN_MELLICHAR },
{ 0, 0 }
};
class instance_arcatraz : public InstanceMapScript