phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-03 20:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: extract markPlayerDead to deduplicate death/corpse caching

Browse source 
Both the health==0 and dynFlags UNIT_DYNFLAG_DEAD paths duplicated the
same corpse-position caching and death-state logic with a subtle
asymmetry (only health path called stopAutoAttack). Extracted into
markPlayerDead() so coordinate swapping and state changes happen in one
place. stopAutoAttack remains at the health==0 call site since the
dynFlags path doesn't need it.
This commit is contained in:
Kelsi 2026-03-29 17:59:44 -07:00
parent dc500fede9
commit 298974ebc2
2 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/game/entity_controller.hpp
View file

@ -169,6 +169,9 @@ private:
void detectPlayerMountChange(uint32_t newMountDisplayId, void detectPlayerMountChange(uint32_t newMountDisplayId,
const std::map<uint16_t, uint32_t>& blockFields); const std::map<uint16_t, uint32_t>& blockFields);
// Shared player-death handler: caches corpse position, sets death state.
void markPlayerDead(const char* source);
// --- Phase 4: Field index cache structs --- // --- Phase 4: Field index cache structs ---
// Cached field indices resolved once per handler call to avoid repeated lookups. // Cached field indices resolved once per handler call to avoid repeated lookups.
struct UnitFieldIndices { struct UnitFieldIndices {

41
src/game/entity_controller.cpp
View file

@ -720,6 +720,24 @@ bool EntityController::applyUnitFieldsOnCreate(const UpdateBlock& block,
return unitInitiallyDead; return unitInitiallyDead;
} }
// Consolidates player-death state into one place so both the health==0 and
// dynFlags UNIT_DYNFLAG_DEAD paths share the same corpse-caching logic.
// Classic WoW does not send SMSG_DEATH_RELEASE_LOC, so this cached position
// is the primary source for canReclaimCorpse().
void EntityController::markPlayerDead(const char* source) {
owner_.playerDead_ = true;
owner_.releasedSpirit_ = false;
// owner_.movementInfo is canonical (x=north, y=west); corpseX_/Y_ are
// raw server coords (x=west, y=north) — swap axes.
owner_.corpseX_ = owner_.movementInfo.y;
owner_.corpseY_ = owner_.movementInfo.x;
owner_.corpseZ_ = owner_.movementInfo.z;
owner_.corpseMapId_ = owner_.currentMapId_;
LOG_INFO("Player died (", source, "). Corpse cached at server=(",
owner_.corpseX_, ",", owner_.corpseY_, ",", owner_.corpseZ_,
") map=", owner_.corpseMapId_);
}
// 3c: Apply unit fields during VALUES update — tracks health/power/display changes // 3c: Apply unit fields during VALUES update — tracks health/power/display changes
// and fires events for transitions (death, resurrect, level up, etc.). // and fires events for transitions (death, resurrect, level up, etc.).
EntityController::UnitFieldUpdateResult EntityController::applyUnitFieldsOnUpdate( EntityController::UnitFieldUpdateResult EntityController::applyUnitFieldsOnUpdate(
@ -740,21 +758,8 @@ EntityController::UnitFieldUpdateResult EntityController::applyUnitFieldsOnUpdat
} }
if (owner_.combatHandler_) owner_.combatHandler_->removeHostileAttacker(block.guid); if (owner_.combatHandler_) owner_.combatHandler_->removeHostileAttacker(block.guid);
if (block.guid == owner_.playerGuid) { if (block.guid == owner_.playerGuid) {
owner_.playerDead_ = true; markPlayerDead("health=0");
owner_.releasedSpirit_ = false;
owner_.stopAutoAttack(); owner_.stopAutoAttack();
// Cache death position as corpse location.
// Classic WoW does not send SMSG_DEATH_RELEASE_LOC, so
// this is the primary source for canReclaimCorpse().
// owner_.movementInfo is canonical (x=north, y=west); owner_.corpseX_/Y_
// are raw server coords (x=west, y=north) — swap axes.
owner_.corpseX_ = owner_.movementInfo.y; // canonical west = server X
owner_.corpseY_ = owner_.movementInfo.x; // canonical north = server Y
owner_.corpseZ_ = owner_.movementInfo.z;
owner_.corpseMapId_ = owner_.currentMapId_;
LOG_INFO("Player died! Corpse position cached at server=(",
owner_.corpseX_, ",", owner_.corpseY_, ",", owner_.corpseZ_,
") map=", owner_.corpseMapId_);
pendingEvents_.emit("PLAYER_DEAD", {}); pendingEvents_.emit("PLAYER_DEAD", {});
} }
if ((entity->getType() == ObjectType::UNIT || entity->getType() == ObjectType::PLAYER) && owner_.npcDeathCallback_) { if ((entity->getType() == ObjectType::UNIT || entity->getType() == ObjectType::PLAYER) && owner_.npcDeathCallback_) {
@ -807,13 +812,7 @@ EntityController::UnitFieldUpdateResult EntityController::applyUnitFieldsOnUpdat
bool wasDead = (oldDyn & UNIT_DYNFLAG_DEAD) != 0; bool wasDead = (oldDyn & UNIT_DYNFLAG_DEAD) != 0;
bool nowDead = (val & UNIT_DYNFLAG_DEAD) != 0; bool nowDead = (val & UNIT_DYNFLAG_DEAD) != 0;
if (!wasDead && nowDead) { if (!wasDead && nowDead) {
owner_.playerDead_ = true; markPlayerDead("dynFlags");
owner_.releasedSpirit_ = false;
owner_.corpseX_ = owner_.movementInfo.y;
owner_.corpseY_ = owner_.movementInfo.x;
owner_.corpseZ_ = owner_.movementInfo.z;
owner_.corpseMapId_ = owner_.currentMapId_;
LOG_INFO("Player died (dynamic flags). Corpse cached map=", owner_.corpseMapId_);
} else if (wasDead && !nowDead) { } else if (wasDead && !nowDead) {
owner_.playerDead_ = false; owner_.playerDead_ = false;
owner_.releasedSpirit_ = false; owner_.releasedSpirit_ = false;