[Scummvm-git-logs] scummvm master -> b191cbf90967b59f075dbf5f51a5c6fb5587bfc7

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b191cbf909 XEEN: Stop re-rolling new character stats when some areas of screen clicked


Commit: b191cbf90967b59f075dbf5f51a5c6fb5587bfc7
    https://github.com/scummvm/scummvm/commit/b191cbf90967b59f075dbf5f51a5c6fb5587bfc7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-05-30T18:15:50-04:00

Commit Message:
XEEN: Stop re-rolling new character stats when some areas of screen clicked

Changed paths:
    engines/xeen/dialogs/dialogs.cpp
    engines/xeen/dialogs/dialogs.h
    engines/xeen/interface.cpp


diff --git a/engines/xeen/dialogs/dialogs.cpp b/engines/xeen/dialogs/dialogs.cpp
index 1b99ec6..d5c732e 100644
--- a/engines/xeen/dialogs/dialogs.cpp
+++ b/engines/xeen/dialogs/dialogs.cpp
@@ -67,7 +67,6 @@ bool ButtonContainer::checkEvents(XeenEngine *vm) {
 	Party &party = *vm->_party;
 	Windows &windows = *_vm->_windows;
 	PendingEvent event;
-	const Common::Rect WAIT_BOUNDS(8, 8, 224, 140);
 	_buttonValue = 0;
 
 	if (events.getEvent(event)) {
@@ -94,7 +93,7 @@ bool ButtonContainer::checkEvents(XeenEngine *vm) {
 				}
 			}
 
-			if (!_buttonValue && WAIT_BOUNDS.contains(pt)) {
+			if (!_buttonValue && _waitBounds.contains(pt)) {
 				_buttonValue = Common::KEYCODE_SPACE;
 				return true;
 			}
diff --git a/engines/xeen/dialogs/dialogs.h b/engines/xeen/dialogs/dialogs.h
index 9e79b1e..e97e46c 100644
--- a/engines/xeen/dialogs/dialogs.h
+++ b/engines/xeen/dialogs/dialogs.h
@@ -77,6 +77,7 @@ private:
 protected:
 	Common::Array<UIButton> _buttons;
 	Common::StringArray _textStrings;
+	Common::Rect _waitBounds;
 	int _buttonValue;
 
 	bool checkEvents(XeenEngine *vm);
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 6d8de93..5221a9e 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -163,6 +163,7 @@ Interface::Interface(XeenEngine *vm) : ButtonContainer(vm), InterfaceScene(vm),
 	_upDoorText = false;
 	_tillMove = 0;
 	Common::fill(&_charFX[0], &_charFX[MAX_ACTIVE_PARTY], 0);
+	_waitBounds = Common::Rect(8, 8, 224, 140);
 }
 
 void Interface::setup() {