Skip to content

Corporal Keeshan #3125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Udolfoo wants to merge 4 commits into
base: development
Choose a base branch
from
Open

Corporal Keeshan #3125

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80ac0e6
Update redridge_mountains.cpp
Udolfoo Sep 17, 2025
0de05e1
Update redridge_mountains.cpp
Udolfoo Sep 17, 2025
0519481
Update redridge_mountains.cpp
Udolfoo Sep 17, 2025
15811d3
Remove unnecessary Home Set
Udolfoo Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/scripts/eastern_kingdoms/redridge_mountains/redridge_mountains.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,29 @@ struct npc_corporal_keeshan_escortAI : npc_escortAI
m_uiShieldBashTimer = 8000;
}

void JustRespawned() override
{
// Reset EscortAI
npc_escortAI::JustRespawned();
Reset();
float m_homeX, m_homeY, m_homeZ, m_homeO;

//Reset Faction and Quest Giver Flag
m_creature->SetFactionTemplateId(FACTION_STORMWIND);
m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);

// SetSpawn
if (m_homeX || m_homeY || m_homeZ)
Copy link
Contributor

@Gamemechanicwow Gamemechanicwow Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m_homeX etc are never set - this if statement is unpredictable.

In debug the variables will be initialized to 0. But on release build the values will be uninitialized.

the m_ prefix should be used for member variables only.

Copy link
Author

@Udolfoo Udolfoo Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, thanks!

{
m_creature->NearTeleportTo(m_homeX, m_homeY, m_homeZ, m_homeO);
m_creature->SetHomePosition(m_homeX, m_homeY, m_homeZ, m_homeO);
}

// Clear Movement
m_creature->GetMotionMaster()->Clear();
m_creature->GetMotionMaster()->MoveTargetedHome();
}

void WaypointStart(uint32 uiWP) override
{
switch (uiWP)
Expand Down