aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_rooms_glyphs.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-22 19:20:05 -0400
committerPaul Gilbert2016-07-22 21:54:48 -0400
commit4f08292c8c082361af7212e3951af4b1b6c45199 (patch)
tree21237f9eefa89b153eab0cb64a0bc2f93a410f15 /engines/titanic/pet_control/pet_rooms_glyphs.cpp
parent03b45f44dfdb86a9607aaa09a02e5c57968e275f (diff)
downloadscummvm-rg350-4f08292c8c082361af7212e3951af4b1b6c45199.tar.gz
scummvm-rg350-4f08292c8c082361af7212e3951af4b1b6c45199.tar.bz2
scummvm-rg350-4f08292c8c082361af7212e3951af4b1b6c45199.zip
TITANIC: Add support for arbitrary window event targets
Also moved all standard game event methods to CMainGameWindow. This will allow for the Continue Save dialog to be added in and get events instead of the game window
Diffstat (limited to 'engines/titanic/pet_control/pet_rooms_glyphs.cpp')
-rw-r--r--engines/titanic/pet_control/pet_rooms_glyphs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
index 5de814af24..810342a23e 100644
--- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
@@ -103,7 +103,7 @@ void CPetRoomsGlyph::drawAt(CScreenManager *screenManager, const Point &pt, bool
void CPetRoomsGlyph::selectGlyph(const Point &topLeft, const Point &pt) {
if (isAssigned()) {
- bool isShiftPressed = g_vm->_events->getSpecialButtons() & MK_SHIFT;
+ bool isShiftPressed = g_vm->_window->getSpecialButtons() & MK_SHIFT;
if (isShiftPressed) {
int selection = getSelection(topLeft, pt);
@@ -116,7 +116,7 @@ void CPetRoomsGlyph::selectGlyph(const Point &topLeft, const Point &pt) {
}
bool CPetRoomsGlyph::dragGlyph(const Point &topLeft, CMouseDragStartMsg *msg) {
- bool isShiftPressed = g_vm->_events->getSpecialButtons() & MK_SHIFT;
+ bool isShiftPressed = g_vm->_window->getSpecialButtons() & MK_SHIFT;
CPetControl *petControl = getPetControl();
if (!isShiftPressed && petControl) {