Skip to content

debug: profile ProcessDeath/raw_kill internals (#3106) #3141

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

Merged
bylins merged 1 commit into from
Apr 11, 2026
Merged

debug: profile ProcessDeath/raw_kill internals (#3106) #3141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/gameplay/fight/fight_stuff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,10 +532,13 @@ void real_kill(CharData *ch, CharData *killer) {
}

void raw_kill(CharData *ch, CharData *killer) {
utils::CSteppedProfiler rk_profiler("raw_kill", 0.001);
rk_profiler.next_step("SpellCapable");
check_spell_capable(ch, killer);
if (ch->GetEnemy()) {
stop_fighting(ch, true);
}
rk_profiler.next_step("CombatList");
for (auto &hitter : combat_list) {
if (hitter.deleted)
continue;
Expand Down Expand Up @@ -565,10 +568,12 @@ void raw_kill(CharData *ch, CharData *killer) {

if (!ROOM_FLAGGED(ch->in_room, ERoomFlag::kDominationArena)) {
if (!ch->IsNpc()) {
rk_profiler.next_step("ResetAffects");
reset_affects_no_recalc(ch);
}
}
// для начала проверяем, активны ли евенты
rk_profiler.next_step("DeathTrigger");
if ((!killer || death_mtrigger(ch, killer)) && ch->in_room != kNowhere) {
death_cry(ch, killer);
}
Expand All @@ -595,6 +600,7 @@ void raw_kill(CharData *ch, CharData *killer) {
}
if (ch->in_room != kNowhere) {
if (killer && (!killer->IsNpc() || IS_CHARMICE(killer)) && !ch->IsNpc())
rk_profiler.next_step("RealKill");
kill_pc_wtrigger(killer, ch);
if (!ch->IsNpc() && (!NORENTABLE(ch) && ROOM_FLAGGED(ch->in_room, ERoomFlag::kArena))) {
//Если убили на арене
Expand Down
4 changes: 4 additions & 0 deletions src/gameplay/mechanics/damage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,8 @@ void Damage::ProcessBlink(CharData *ch, CharData *victim) {

void Damage::ProcessDeath(CharData *ch, CharData *victim) const {
CharData *killer = nullptr;
utils::CSteppedProfiler death_profiler("ProcessDeath", 0.001);
death_profiler.next_step("FindKiller");

if (victim->IsNpc() || victim->desc) {
if (victim == ch && victim->in_room != kNowhere) {
Expand All @@ -470,6 +472,7 @@ void Damage::ProcessDeath(CharData *ch, CharData *victim) const {
killer = ch;
}
}
death_profiler.next_step("GroupGain");
if (killer) {
if (AFF_FLAGGED(killer, EAffect::kGroup)) {
// т.к. помечен флагом AFF_GROUP - точно PC
Expand Down Expand Up @@ -523,6 +526,7 @@ void Damage::ProcessDeath(CharData *ch, CharData *victim) const {
if (killer) {
ch = killer;
}
death_profiler.next_step("die");
die(victim, ch);
}

Expand Down
Loading