diff options
| author | Strangerke | 2015-01-02 22:34:45 +0100 |
|---|---|---|
| committer | Strangerke | 2015-01-02 22:34:45 +0100 |
| commit | 56754c2a9d98ba41f97e0596fd0015f3edb07366 (patch) | |
| tree | f91a6dad9385e11d26fc896a6a01545b333042a0 /engines/access/amazon | |
| parent | f11032eb4e5591536b6565dcf7d7190777c868d8 (diff) | |
| download | scummvm-rg350-56754c2a9d98ba41f97e0596fd0015f3edb07366.tar.gz scummvm-rg350-56754c2a9d98ba41f97e0596fd0015f3edb07366.tar.bz2 scummvm-rg350-56754c2a9d98ba41f97e0596fd0015f3edb07366.zip | |
ACCESS: MM - Make RMOUSE game-specific
Diffstat (limited to 'engines/access/amazon')
| -rw-r--r-- | engines/access/amazon/amazon_logic.cpp | 2 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_resources.cpp | 7 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_resources.h | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp index 436a875688..d24629a467 100644 --- a/engines/access/amazon/amazon_logic.cpp +++ b/engines/access/amazon/amazon_logic.cpp @@ -1591,7 +1591,7 @@ void River::moveCanoe() { moveCanoe2(); } else { if (events._leftButton && pt.y >= 140) { - if (pt.x < RMOUSE[8][0]) { + if (pt.x < _vm->_room->_rMouse[8][0]) { // Disk icon wasn't clicked _vm->_scripts->printString(BAR_MESSAGE); } else { diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp index 2010c7d842..2b36ca943a 100644 --- a/engines/access/amazon/amazon_resources.cpp +++ b/engines/access/amazon/amazon_resources.cpp @@ -2406,6 +2406,11 @@ const int CAST_END_OBJ1[4][4] = { { 3, 103, 1300, 10 } }; -} // End of namespace Amazon +const int RMOUSE[10][2] = { + { 0, 35 }, { 0, 0 }, { 36, 70 }, { 71, 106 }, { 107, 141 }, + { 142, 177 }, { 178, 212 }, { 213, 248 }, { 249, 283 }, { 284, 318 } +}; + +} // End of namespace Amazon } // End of namespace Access diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h index a952860bc2..190424b841 100644 --- a/engines/access/amazon/amazon_resources.h +++ b/engines/access/amazon/amazon_resources.h @@ -138,11 +138,11 @@ extern const int HELP1COORDS[2][4]; extern const int RIVER1OBJ[23][4]; extern const int CAST_END_OBJ[26][4]; - extern const int CAST_END_OBJ1[4][4]; -} // End of namespace Amazon +extern const int RMOUSE[10][2]; +} // End of namespace Amazon } // End of namespace Access #endif /* ACCESS_AMAZON_RESOURCES_H */ |