thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix various warnings; whatTarget()'s paramters shadowed member vars, but it can just b e turned into a pure function (sidenote: the chaotic mix of spaces and tabs in router.cpp doesn't help readability :-)

Browse source 
svn-id: r11693
This commit is contained in:
Max Horn 2003-12-17 01:18:03 +00:00
parent b4f33afb85
commit d1c9caa127
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sword1/logic.cpp
View file

@ -1414,13 +1414,13 @@ int SwordLogic::fnFace(BsObject *cpt, int32 id, int32 targetId, int32 b, int32 c
x = (target->o_mouse_x1 + target->o_mouse_x2) / 2;
y = (target->o_mouse_y1 + target->o_mouse_y2) / 2;
}
int32 megaTarDir = _router->whatTarget(cpt->o_xcoord, cpt->o_ycoord, x, y);
int32 megaTarDir = whatTarget(cpt->o_xcoord, cpt->o_ycoord, x, y);
fnTurn(cpt, id, megaTarDir, 0, 0, 0, 0, 0);
return SCRIPT_STOP;
}
int SwordLogic::fnFaceXy(BsObject *cpt, int32 id, int32 x, int32 y, int32 c, int32 d, int32 a, int32 b) {
int megaTarDir = _router->whatTarget(cpt->o_xcoord, cpt->o_ycoord, x, y);
int megaTarDir = whatTarget(cpt->o_xcoord, cpt->o_ycoord, x, y);
fnTurn(cpt, id, megaTarDir, 0, 0, 0, 0, 0);
return SCRIPT_STOP;
}
@ -1435,7 +1435,7 @@ int SwordLogic::fnIsFacing(BsObject *cpt, int32 id, int32 targetId, int32 b, int
} else
error("fnIsFacing:: Target isn't a mega!");
int32 lookDir = _router->whatTarget(x, y, cpt->o_xcoord, cpt->o_ycoord);
int32 lookDir = whatTarget(x, y, cpt->o_xcoord, cpt->o_ycoord);
lookDir -= dir;
lookDir = abs(lookDir);