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.

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

[hellfire] ProcessMonsters bin exact #1681

Merged
merged 3 commits into from
Sep 18, 2019

Conversation

qndel
Copy link
Member

@qndel qndel commented Sep 18, 2019

swap to Monst->mLevel if should be merged with master

Source/monster.cpp Outdated Show resolved Hide resolved
@qndel
Copy link
Member Author

qndel commented Sep 18, 2019

changed ifdef

}
if (Monst->MType->mtype == 137) { //TODO: apply enums
if (UseCowFarmer) {
PlaySFX(997);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
PlaySFX(997);
PlaySFX(USFX_NAKRUL6);

Copy link
Member

Choose a reason for hiding this comment

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

Feel free to verify the values

if (UseCowFarmer) {
PlaySFX(997);
} else {
int sound = 995;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
int sound = 995;
int sound = USFX_NAKRUL4;

} else {
int sound = 995;
if (!IsUberRoomOpened)
sound = 996;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
sound = 996;
sound = USFX_NAKRUL5;

}
}
if (Monst->MType->mtype == 124)
PlaySFX(989);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
PlaySFX(989);
PlaySFX(USFX_DEFILER8);

Copy link
Member Author

Choose a reason for hiding this comment

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

off to sleep :)

if (Monst->MType->mtype == MT_CLEAVER) {
PlaySFX(USFX_CLEAVER);
}
if (Monst->MType->mtype == 137) { //TODO: apply enums
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if (Monst->MType->mtype == 137) { //TODO: apply enums
if (Monst->MType->mtype == MT_NAKRUL) {

enums.h line 1685
MT_NAKRUL = 0x89,

PlaySFX(sound);
}
}
if (Monst->MType->mtype == 124)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if (Monst->MType->mtype == 124)
if (Monst->MType->mtype == MT_DEFILER)

enums.h line 1685
MT_DEFILER = 0x7C,

if (UseCowFarmer) {
PlaySFX(997);
} else {
int sound = 995;
Copy link
Member

Choose a reason for hiding this comment

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

Probably this was two calls to PlaySFX

@AJenbo AJenbo merged commit 742634e into diasurgical:hellfire Sep 18, 2019
@AJenbo AJenbo deleted the ProcessMonsters branch September 18, 2019 02:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants