MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diasurgical/devilution

Browse source
This commit is contained in:
Anders Jenbo 2019-05-18 16:49:44 +02:00
commit 73a29f0e68
38 changed files with 2884 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/sync.cpp
View file

@ -263,7 +263,7 @@ void sync_monster(int pnum, const TSyncMonster *p)
M_ClearSquares(ndx);
dMonster[monster[ndx]._mx][monster[ndx]._my] = ndx + 1;
M_WalkDir(ndx, md);
monster[ndx]._msquelch = -1;
monster[ndx]._msquelch = UCHAR_MAX;
}
}
} else if (dMonster[p->_mx][p->_my] == 0) {
@ -274,7 +274,7 @@ void sync_monster(int pnum, const TSyncMonster *p)
decode_enemy(ndx, p->_menemy);
md = GetDirection(p->_mx, p->_my, monster[ndx]._menemyx, monster[ndx]._menemyy);
M_StartStand(ndx, md);
monster[ndx]._msquelch = -1;
monster[ndx]._msquelch = UCHAR_MAX;
}
decode_enemy(ndx, p->_menemy);