libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed return value from adjustXYToBeInBox

Browse Source 
svn-id: r3417
This commit is contained in:
Ludvig Strigeus 2001-10-10 11:24:21 +00:00
parent 061f9c1289
commit 00c68ab8e2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actor.cpp
View File

@ -17,6 +17,9 @@
* *
* Change Log: * Change Log:
* $Log$ * $Log$
* Revision 1.3 2001/10/10 11:24:21 strigeus
* fixed return value from adjustXYToBeInBox
*
* Revision 1.2 2001/10/09 18:35:02 strigeus * Revision 1.2 2001/10/09 18:35:02 strigeus
* fixed object parent bug * fixed object parent bug
* fixed some signed/unsigned comparisons * fixed some signed/unsigned comparisons
@ -453,6 +456,10 @@ AdjustBoxResult Scumm::adjustXYToBeInBox(Actor *a, int x, int y) {
uint best; uint best;
int box; int box;
byte flags, b; byte flags, b;
abr.x = x;
abr.y = y;
abr.dist = 0;
if (a && a->ignoreBoxes==0) { if (a && a->ignoreBoxes==0) {
threshold = 30; threshold = 30;
@ -499,10 +506,6 @@ AdjustBoxResult Scumm::adjustXYToBeInBox(Actor *a, int x, int y) {
} }
threshold = (threshold==30) ? 80 : 0; threshold = (threshold==30) ? 80 : 0;
} }
} else {
abr.x = x;
abr.y = y;
abr.dist = 0;
} }
return abr; return abr;
} }