diff options
| author | Ludvig Strigeus | 2001-10-10 11:24:21 +0000 | 
|---|---|---|
| committer | Ludvig Strigeus | 2001-10-10 11:24:21 +0000 | 
| commit | 00c68ab8e25645c30c5646e2804c2978424971aa (patch) | |
| tree | 861b5c203ac87ea1e24de6e86b34e04934dc1c3f /actor.cpp | |
| parent | 061f9c1289fac34d45887a8cd6ffd627446dcd7f (diff) | |
| download | scummvm-rg350-00c68ab8e25645c30c5646e2804c2978424971aa.tar.gz scummvm-rg350-00c68ab8e25645c30c5646e2804c2978424971aa.tar.bz2 scummvm-rg350-00c68ab8e25645c30c5646e2804c2978424971aa.zip  | |
fixed return value from adjustXYToBeInBox
svn-id: r3417
Diffstat (limited to 'actor.cpp')
| -rw-r--r-- | actor.cpp | 11 | 
1 files changed, 7 insertions, 4 deletions
@@ -17,6 +17,9 @@   *   * Change 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   * fixed object parent bug   * fixed some signed/unsigned comparisons @@ -453,6 +456,10 @@ AdjustBoxResult Scumm::adjustXYToBeInBox(Actor *a, int x, int y) {  	uint best;  	int box;  	byte flags, b; +	 +	abr.x = x; +	abr.y = y; +	abr.dist = 0;  	if (a && a->ignoreBoxes==0) {  		threshold = 30; @@ -499,10 +506,6 @@ AdjustBoxResult Scumm::adjustXYToBeInBox(Actor *a, int x, int y) {  			}  			threshold = (threshold==30) ? 80 : 0;  		} -	} else { -		abr.x = x; -		abr.y = y; -		abr.dist = 0;  	}  	return abr;  }  | 
