Skip to content
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

Jump to bottom

Bugfix: DLVL 16 speech after Diablo death #7008

Merged
merged 2 commits into from
Mar 15, 2024
Merged

Bugfix: DLVL 16 speech after Diablo death #7008

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
424d45e
Bugfix: DLVL 16 message after Diablo death
kphoenix137 Mar 7, 2024
9e4be45
Update Source/player.cpp
AJenbo Mar 15, 2024
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
12 changes: 9 additions & 3 deletions Source/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3464,9 +3464,15 @@ void PlayDungMsgs()
myPlayer.Say(HeroSpeech::IMustBeGettingClose, 40);
myPlayer.pDungMsgs |= DungMsgHell;
} else if (!setlevel && currlevel == 16 && !myPlayer._pLvlVisited[16] && (myPlayer.pDungMsgs & DungMsgDiablo) == 0) {
sfxdelay = 40;
sfxdnum = SfxID::DiabloGreeting;
myPlayer.pDungMsgs |= DungMsgDiablo;
for (auto &monster : Monsters) {
Copy link
Member

@AJenbo AJenbo Mar 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Technically we prefer not having auto here since the type isn't immediately obvious. But heck I don't remember what the monster struct name is atm.

if (monster.type().type != MT_DIABLO) continue;
if (monster.hitPoints > 0) {
sfxdelay = 40;
sfxdnum = SfxID::DiabloGreeting;
myPlayer.pDungMsgs |= DungMsgDiablo;
}
break;
}
} else if (!setlevel && currlevel == 17 && !myPlayer._pLvlVisited[17] && (myPlayer.pDungMsgs2 & 1) == 0) {
sfxdelay = 10;
sfxdnum = SfxID::Defiler1;
Expand Down
Loading