diff options
| author | Travis Howell | 2005-03-28 10:02:22 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-03-28 10:02:22 +0000 |
| commit | 11e1e246cc4022f088a9e68bcd4d44f7d6574932 (patch) | |
| tree | c3cd310936a0d650401849c5230fd9190fa0d83d /scumm/object.cpp | |
| parent | 26f41248737a056b5cf9efbaf7aae1873bb24166 (diff) | |
| download | scummvm-rg350-11e1e246cc4022f088a9e68bcd4d44f7d6574932.tar.gz scummvm-rg350-11e1e246cc4022f088a9e68bcd4d44f7d6574932.tar.bz2 scummvm-rg350-11e1e246cc4022f088a9e68bcd4d44f7d6574932.zip | |
findObject in HE72+ only checks object bounds
findObject in He70/71 only needs additional polygon check
svn-id: r17270
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index c360e9de4e..991d175e13 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -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; |