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

findObject in HE72+ only checks object bounds

Browse source 
findObject in He70/71 only needs additional polygon check

svn-id: r17270
This commit is contained in:
Travis Howell 2005-03-28 10:02:22 +00:00
parent 26f4124873
commit 11e1e246cc
7 changed files with 57 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scumm/object.cpp
View file

@ -24,6 +24,7 @@
#include "scumm/scumm.h"
#include "scumm/actor.h"
#include "scumm/bomp.h"
#include "scumm/intern.h"
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/usage_bits.h"
@ -358,6 +359,10 @@ int ScummEngine::findObject(int x, int y) {
a = _objs[b].parentstate;
b = _objs[b].parent;
if (b == 0) {
if (_heversion >= 70) {
if (((ScummEngine_v70he *)this)->_wiz.polygonHit(_objs[i].obj_nr, x, y))
return _objs[i].obj_nr;
}
if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
_objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
return _objs[i].obj_nr;