libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACCESS: MM - Fix mouse cursor when y between 177 and 184, add a call to takePicture (not yet implemented)

Browse Source
This commit is contained in:
Strangerke 2015-01-02 11:05:21 +01:00
parent 900dc7ffc0
commit b2a4999f3c
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/access/martian/martian_room.cpp
View File

@ -91,6 +91,12 @@ void MartianRoom::roomSet() {
_vm->_scripts->_sequence = 1000;
_vm->_scripts->searchForSequence();
_vm->_scripts->executeScript();
for (int i = 0; i < 30; i++)
_byte26CD2[i] = 0;
for (int i = 0; i < 10; i++)
_byte26CBC[i] = 0;
}
void MartianRoom::roomMenu() {

3
engines/access/martian/martian_room.h
View File

@ -39,6 +39,9 @@ private:
MartianEngine *_game;
void roomSet();
int _byte26CD2[30];
int _byte26CBC[10];
protected:
virtual void loadRoom(int roomNumber);

17
engines/access/room.cpp
View File

@ -55,6 +55,10 @@ void Room::freeTileData() {
_tile = nullptr;
}
void Room::takePicture() {
warning("TODO: takePicture");
}
void Room::doRoom() {
bool reloadFlag = false;
@ -84,9 +88,13 @@ void Room::doRoom() {
_vm->_events->pollEventsAndWait();
_vm->_canSaveLoad = false;
_vm->_player->walk();
_vm->_midi->midiRepeat();
_vm->_player->checkScroll();
if ((_vm->getGameID() == GType_MartianMemorandum) && (_vm->_player->_roomNumber == 47)) {
takePicture();
} else {
_vm->_player->walk();
_vm->_midi->midiRepeat();
_vm->_player->checkScroll();
}
doCommands();
if (_vm->shouldQuitOrRestart())
@ -136,7 +144,8 @@ void Room::doRoom() {
} else {
_vm->plotList();
if (_vm->_events->_mousePos.y < 177)
if (((_vm->getGameID() == GType_MartianMemorandum) && (_vm->_events->_mousePos.y < 184)) ||
((_vm->getGameID() == GType_Amazon) && (_vm->_events->_mousePos.y < 177)))
_vm->_events->setCursor(_vm->_events->_normalMouse);
else
_vm->_events->setCursor(CURSOR_ARROW);

2
engines/access/room.h
View File

@ -72,6 +72,8 @@ private:
int calcLR(int yp);
int calcUD(int xp);
void takePicture();
/**
* Cycles forwards or backwards through the list of commands
*/