From a66b968f91d159b149ef5b7357d8a92572cb0b3c Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Sun, 24 Jan 2021 16:04:47 +0100 Subject: Core/Misc: Fix static analysis issues (#25924) * Core/Misc: Fix static analysis issues * Fix infinite loop in ".debug send opcode" Fix using uninitialized memory in ".debug send opcode" (cherry picked from commit 661f554b9e08a3721227f1e4a4fe6fd74e43a1f4) --- .../ScarletMonastery/instance_scarlet_monastery.cpp | 5 +++++ .../scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/server/scripts/EasternKingdoms') diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 9ddd6aff7a6..256a914b6da 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -25,6 +25,11 @@ #include "ScriptMgr.h" #include "TemporarySummon.h" +Position const BunnySpawnPosition = { 1776.27f, 1348.74f, 19.20f }; +Position const EarthBunnySpawnPosition = { 1765.28f, 1347.46f, 18.55f, 6.17f }; +Position const HeadlessHorsemanSpawnPosition = { 1765.00f, 1347.00f, 15.00f }; +Position const HeadlessHorsemanHeadSpawnPosition = { 1788.54f, 1348.05f, 18.88f }; // Guessed + ObjectData const creatureData[] = { { NPC_HEADLESS_HORSEMAN_HEAD, DATA_HORSEMAN_HEAD }, diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h index f25cb46b6b6..27e3fb9b51a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h @@ -26,10 +26,10 @@ uint32 const EncounterCount = 9; -Position const BunnySpawnPosition = { 1776.27f, 1348.74f, 19.20f }; -Position const EarthBunnySpawnPosition = { 1765.28f, 1347.46f, 18.55f, 6.17f }; -Position const HeadlessHorsemanSpawnPosition = { 1765.00f, 1347.00f, 15.00f }; -Position const HeadlessHorsemanHeadSpawnPosition = { 1788.54f, 1348.05f, 18.88f }; // Guessed +extern Position const BunnySpawnPosition; +extern Position const EarthBunnySpawnPosition; +extern Position const HeadlessHorsemanSpawnPosition; +extern Position const HeadlessHorsemanHeadSpawnPosition; enum SMDataTypes { -- cgit v1.2.3