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

🎨 Apply direction enum to monsters and relations

Browse source 
Missiles _mimfnum is being used for a lot more then just directions and
can also be a 16 degree direction so can't apply enum verbs and
restricitons to it in most cases. This in turns also affects SetMissDir
and some other functions that have to stay int.
This commit is contained in:
Anders Jenbo 2021-04-18 04:50:12 +02:00
commit 61d15e23db
14 changed files with 202 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/objects.cpp
View file

@ -2067,7 +2067,7 @@ void Obj_FlameTrap(int i)
void Obj_Trap(int i)
{
int oti, dir;
int oti;
bool otrig;
int sx, sy, dx, dy, x, y;
@ -2111,7 +2111,7 @@ void Obj_Trap(int i)
}
}
if (!deltaload) {
dir = GetDirection(sx, sy, dx, dy);
direction dir = GetDirection(sx, sy, dx, dy);
AddMissile(sx, sy, dx, dy, dir, object[i]._oVar3, TARGET_PLAYERS, -1, 0, 0);
PlaySfxLoc(IS_TRAP, object[oti]._ox, object[oti]._oy);
}
@ -3089,7 +3089,7 @@ void OperateSChambBk(int pnum, int i)
void OperateChest(int pnum, int i, bool sendmsg)
{
int j, mdir, mtype;
int j, mtype;
if (object[i]._oSelFlag != 0) {
if (!deltaload)
@ -3111,7 +3111,7 @@ void OperateChest(int pnum, int i, bool sendmsg)
}
}
if (object[i]._oTrapFlag && object[i]._otype >= OBJ_TCHEST1 && object[i]._otype <= OBJ_TCHEST3) {
mdir = GetDirection(object[i]._ox, object[i]._oy, plr[pnum]._px, plr[pnum]._py);
direction mdir = GetDirection(object[i]._ox, object[i]._oy, plr[pnum]._px, plr[pnum]._py);
switch (object[i]._oVar4) {
case 0:
mtype = MIS_ARROW;