diff options
author | Peter Kohaut | 2017-08-24 23:43:47 +0200 |
---|---|---|
committer | Peter Kohaut | 2017-08-24 23:43:47 +0200 |
commit | 0da18320af79b6ca8a47248442d106674b5ab860 (patch) | |
tree | 504d769edcf92fc4cbceddfbcdda038ecc040ced /engines/bladerunner/spinner.h | |
parent | c9b4089ccb0b60389446e07f7f9421e3a7180129 (diff) | |
download | scummvm-rg350-0da18320af79b6ca8a47248442d106674b5ab860.tar.gz scummvm-rg350-0da18320af79b6ca8a47248442d106674b5ab860.tar.bz2 scummvm-rg350-0da18320af79b6ca8a47248442d106674b5ab860.zip |
BLADERUNNER: Added audio mixer & various fixes
Audio mixer is supporting fading and pan animation
Added support for skipping speech by pressing Return
Added proper support for ambient sounds
Added more code to the dialogue menu
Added tooltips to the Spinner
Fixed calculation of volume and pan of walk steps
Code cleanup & formatting
Diffstat (limited to 'engines/bladerunner/spinner.h')
-rw-r--r-- | engines/bladerunner/spinner.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/engines/bladerunner/spinner.h b/engines/bladerunner/spinner.h index 19021fac1a..cfa593b1fb 100644 --- a/engines/bladerunner/spinner.h +++ b/engines/bladerunner/spinner.h @@ -24,6 +24,7 @@ #define BLADERUNNER_SPINNER_H #include "common/array.h" +#include "common/rect.h" namespace BladeRunner { @@ -32,19 +33,16 @@ class Shape; class VQAPlayer; class UIImagePicker; -#define SPINNER_DESTINATIONS 10 - struct SpinnerDestination { - int id; - int left; - int top; - int right; - int bottom; + int id; + Common::Rect rect; }; class Spinner { + static const int kSpinnerDestinations = 10; + BladeRunnerEngine *_vm; - bool _isDestinationSelectable[SPINNER_DESTINATIONS]; + bool _isDestinationSelectable[kSpinnerDestinations]; bool _isOpen; VQAPlayer *_vqaPlayer; SpinnerDestination *_destinations; @@ -59,9 +57,9 @@ public: void setSelectableDestinationFlag(int destination, bool selectable); bool querySelectableDestinationFlag(int destination) const; - int interfaceChooseDest(int vqaLoopId, int loopFlag); + int chooseDestination(int vqaLoopId, bool immediately); - void setIsOpen(); + void open(); bool isOpen() const; int handleMouseUp(int x, int y); |