aboutsummaryrefslogtreecommitdiff
path: root/engines/macventure/macventure.cpp
diff options
context:
space:
mode:
authorBorja Lorente2016-06-25 22:21:26 +0200
committerBorja Lorente2016-08-14 18:40:24 +0200
commit45a2aa94b9e79bfe1e384d1240018abdc8df8f84 (patch)
tree1e70b95449cd2585213a99db138b6ef7e3b32f5a /engines/macventure/macventure.cpp
parent4837b7750a5494f7002f8f7c5d47ba44621dd425 (diff)
downloadscummvm-rg350-45a2aa94b9e79bfe1e384d1240018abdc8df8f84.tar.gz
scummvm-rg350-45a2aa94b9e79bfe1e384d1240018abdc8df8f84.tar.bz2
scummvm-rg350-45a2aa94b9e79bfe1e384d1240018abdc8df8f84.zip
MACVENTURE: Fix rect collission
Diffstat (limited to 'engines/macventure/macventure.cpp')
-rw-r--r--engines/macventure/macventure.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp
index 3187b39709..012c9a7341 100644
--- a/engines/macventure/macventure.cpp
+++ b/engines/macventure/macventure.cpp
@@ -96,7 +96,7 @@ Common::Error MacVentureEngine::run() {
_filenames = new StringTable(this, _resourceManager, kFilenamesStringTableID);
_decodingDirectArticles = new StringTable(this, _resourceManager, kCommonArticlesStringTableID);
_decodingNamingArticles = new StringTable(this, _resourceManager, kNamingArticlesStringTableID);
- _decodingDirectArticles = new StringTable(this, _resourceManager, kIndirectArticlesStringTableID);
+ _decodingIndirectArticles = new StringTable(this, _resourceManager, kIndirectArticlesStringTableID);
// Big class instantiation
_gui = new Gui(this, _resourceManager);
@@ -783,6 +783,16 @@ bool MacVentureEngine::isObjSelected(ObjID objID) {
return idx != -1;
}
+bool MacVentureEngine::isObjExit(ObjID objID) {
+ return _world->getObjAttr(objID, kAttrIsExit);
+}
+
+Common::Point MacVentureEngine::getObjExitPosition(ObjID objID) {
+ uint x = _world->getObjAttr(objID, kAttrExitX);
+ uint y = _world->getObjAttr(objID, kAttrExitY);
+ return Common::Point(x, y);
+}
+
Common::Rect MacVentureEngine::getObjBounds(ObjID objID) {
Common::Point pos = getObjPosition(objID);
uint w = _gui->getObjWidth(objID); // This shouldn't go here