libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 10:26:40 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

VOYEUR: Renaming of mouse click fields

Browse Source
This commit is contained in:
Paul Gilbert 2013-12-18 20:13:34 -05:00
parent 6cd2d01397
commit 13b4c9ca68
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/voyeur/events.cpp
View File

@ -237,14 +237,15 @@ void EventsManager::pollEvents() {
return;
case Common::EVENT_LBUTTONDOWN:
_mouseButton = 1;
_vm->_voy._incriminate = true;
_vm->_voy._newMouseClicked = true;
return;
case Common::EVENT_RBUTTONDOWN:
_mouseButton = 2;
_vm->_voy._newMouseClicked = true;
return;
case Common::EVENT_LBUTTONUP:
case Common::EVENT_RBUTTONUP:
_vm->_voy._incriminate = false;
_vm->_voy._newMouseClicked = false;
_mouseButton = 0;
return;
case Common::EVENT_MOUSEMOVE:
@ -437,7 +438,7 @@ void EventsManager::getMouseInfo() {
}
_vm->_voy._incriminate = _vm->_voy._newIncriminate;
_vm->_voy._lastInplay = _vm->_voy._newLastInplay;
_vm->_voy._mouseClicked = _vm->_voy._newMouseClicked;
_vm->_voy._fadeFunc = _vm->_voy._newFadeFunc;
_vm->_voy._fadeICF1 = _vm->_voy._newFadeICF1;
}

4
engines/voyeur/events.h
View File

@ -124,13 +124,13 @@ public:
int _fadeICF0;
int _fadeICF1;
void (*_fadeFunc)();
int _lastInplay;
bool _mouseClicked;
int _incriminate;
int _policeEvent;
// Fields not originally in _voy, but I'm putting in for convenience
int _newIncriminate;
int _newLastInplay;
bool _newMouseClicked;
int _newFadeICF1;
void (*_newFadeFunc)();
};

6
engines/voyeur/files_threads.cpp
View File

@ -1135,7 +1135,7 @@ int ThreadResource::doApt() {
_vm->_graphicsManager.flipPage();
_vm->_eventsManager.sWaitFlip();
} while (!_vm->shouldQuit() && (!_vm->_voy._lastInplay || hotspotId == -1));
} while (!_vm->shouldQuit() && (!_vm->_voy._mouseClicked || hotspotId == -1));
pt = _vm->_eventsManager.getMousePos();
_doAptPosX = pt.x;
@ -1331,7 +1331,7 @@ int ThreadResource::doInterface() {
_vm->_voy._field474 = 17;
_vm->_soundManager.stopVOCPlay();
_vm->checkTransition();
_vm->_voy._lastInplay = true;
_vm->_voy._mouseClicked = true;
} else {
_vm->_voy._field478 = 1;
_currentMouseX = pt.x;
@ -1355,7 +1355,7 @@ int ThreadResource::doInterface() {
}
}
} while (!_vm->_voy._fadeFunc && !_vm->shouldQuit() &&
(!_vm->_voy._lastInplay || var8 == -1));
(!_vm->_voy._mouseClicked || var8 == -1));
_vm->_voy._field478 |= 1;
_vm->_bVoy->freeBoltGroup(_vm->_playStamp1);