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

MAI_Lazurus, MAI_SnotSpil and MAI_Zhar #595

Merged
merged 2 commits into from Mar 2, 2019
Merged

MAI_Lazurus, MAI_SnotSpil and MAI_Zhar #595

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c5b40
Clean up MAI_Lazurus, MAI_SnotSpil and MAI_Zhar
AJenbo Mar 2, 2019
ba443fb
Fix MAI_Lazurus
AJenbo Mar 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions Source/monster.cpp
View file
Open in desktop
Expand Up @@ -5453,7 +5453,7 @@ void __fastcall MAI_Zhar(int i)

Monst->_mdir = md;

if (Monst->_mmode == MM_STAND)
if (monster[i]._mmode == MM_STAND)
Monst->_mAnimData = Monst->MType->Anims[MA_STAND].Data[md];
}

Expand All @@ -5462,7 +5462,6 @@ void __fastcall MAI_SnotSpil(int i)
int mx, my, md;
MonsterStruct *Monst;


if ((DWORD)i >= MAXMONSTERS)
TermMsg("MAI_SnotSpil: Invalid monster %d", i);

Expand Down Expand Up @@ -5504,7 +5503,7 @@ void __fastcall MAI_SnotSpil(int i)

Monst->_mdir = md;

if (Monst->_mmode == MM_STAND)
if (monster[i]._mmode == MM_STAND)
Monst->_mAnimData = Monst->MType->Anims[MA_STAND].Data[md];
}
// 5CF330: using guessed type int setpc_h;
Expand All @@ -5523,8 +5522,8 @@ void __fastcall MAI_Lazurus(int i)
return;
}

mx = Monst->_my;
my = Monst->_mx;
mx = Monst->_mx;
my = Monst->_my;
md = M_GetDir(i);
if (dFlags[mx][my] & DFLAG_VISIBLE) {
if (gbMaxPlayers == 1) {
Expand Down Expand Up @@ -5556,7 +5555,7 @@ void __fastcall MAI_Lazurus(int i)

Monst->_mdir = md;

if (Monst->_mmode == MM_STAND || Monst->_mmode == MM_TALK)
if (monster[i]._mmode == MM_STAND || monster[i]._mmode == MM_TALK)
Monst->_mAnimData = Monst->MType->Anims[MA_STAND].Data[md];
}
// 679660: using guessed type char gbMaxPlayers;
Expand Down