Skip to content

[hellfire] AddMisexp bin exact #1465

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

Closed
qndel wants to merge 1 commit into from
Closed

[hellfire] AddMisexp bin exact #1465

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
17 changes: 17 additions & 0 deletions Source/missiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,6 +1513,7 @@ void AddMisexp(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy,

if (mienemy && id > 0) {
mon = monster[id].MType;
#ifndef HELLFIRE
if (mon->mtype == MT_SUCCUBUS)
SetMissAnim(mi, MFILE_FLAREEXP);
if (mon->mtype == MT_SNOWWICH)
Expand All @@ -1521,6 +1522,22 @@ void AddMisexp(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy,
SetMissAnim(mi, MFILE_SCBSEXPD);
if (mon->mtype == MT_SOLBRNR)
SetMissAnim(mi, MFILE_SCBSEXPC);
#else
switch (mon->mtype) {
case MT_SUCCUBUS:
SetMissAnim(mi, MFILE_FLAREEXP);
break;
case MT_SNOWWICH:
SetMissAnim(mi, MFILE_SCBSEXPB);
break;
case MT_HLSPWN:
SetMissAnim(mi, MFILE_SCBSEXPD);
break;
case MT_SOLBRNR:
SetMissAnim(mi, MFILE_SCBSEXPC);
break;
}
#endif
}

missile[mi]._mix = missile[dx]._mix;
Expand Down
4 changes: 4 additions & 0 deletions structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,11 @@ typedef struct MonsterData {
} MonsterData;

typedef struct CMonster {
#ifdef HELLFIRE
int mtype;
#else
unsigned char mtype;
#endif
// TODO: Add enum for place flags
unsigned char mPlaceFlags;
AnimStruct Anims[6];
Expand Down