diff options
author | Filippos Karapetis | 2019-12-27 01:33:02 +0200 |
---|---|---|
committer | Filippos Karapetis | 2019-12-27 01:33:28 +0200 |
commit | f7a5c21d4de443f861544db17b18c958cea2811f (patch) | |
tree | fab74f9d0e1008b626f466d5b17c1fbf9fc32b32 /engines/startrek/actors.cpp | |
parent | 26fcce1e4174d528829d42196a27667c0996108d (diff) | |
download | scummvm-rg350-f7a5c21d4de443f861544db17b18c958cea2811f.tar.gz scummvm-rg350-f7a5c21d4de443f861544db17b18c958cea2811f.tar.bz2 scummvm-rg350-f7a5c21d4de443f861544db17b18c958cea2811f.zip |
STARTREK: Move isPointInPolygon() inside the Room class
This accesses the room data, so it's better to move it inside the Room
class, to reduce direct visibility of the room vertex data
Diffstat (limited to 'engines/startrek/actors.cpp')
-rw-r--r-- | engines/startrek/actors.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/startrek/actors.cpp b/engines/startrek/actors.cpp index 24434eb995..b8d185e0fb 100644 --- a/engines/startrek/actors.cpp +++ b/engines/startrek/actors.cpp @@ -670,7 +670,7 @@ int StarTrekEngine::findObjectAt(int x, int y) { while (offset != _room->getHotspotEnd()) { uint16 word = _room->readRdfWord(offset); if (word & 0x8000) { - if ((word & actionBit) && isPointInPolygon((int16 *)(_room->_rdfData + offset + 6), x, y)) { + if ((word & actionBit) && _room->isPointInPolygon(offset + 6, x, y)) { int actorIndex = _room->readRdfWord(offset + 6); _objectHasWalkPosition = true; _objectWalkPosition.x = _room->readRdfWord(offset + 2); @@ -681,7 +681,7 @@ int StarTrekEngine::findObjectAt(int x, int y) { int numVertices = _room->readRdfWord(offset + 8); offset = offset + 10 + numVertices * 4; } else { - if (isPointInPolygon((int16 *)(_room->_rdfData + offset), x, y)) { + if (_room->isPointInPolygon(offset, x, y)) { int actorIndex = _room->readRdfWord(offset); return actorIndex; } |