aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authoruruk2014-07-09 11:17:30 +0200
committeruruk2014-07-09 11:17:30 +0200
commit45da1e7c741a1906b60ad3d55a9e0087fd9a4a3e (patch)
treec1f5e5fb1ee1d1a3f8f9aa630821945edcacb977 /engines
parentd0a6fa4ce2594bf84cb1e6c12108fb96055beb1e (diff)
downloadscummvm-rg350-45da1e7c741a1906b60ad3d55a9e0087fd9a4a3e.tar.gz
scummvm-rg350-45da1e7c741a1906b60ad3d55a9e0087fd9a4a3e.tar.bz2
scummvm-rg350-45da1e7c741a1906b60ad3d55a9e0087fd9a4a3e.zip
CGE2: Implement switchVox() and switchCap().
Diffstat (limited to 'engines')
-rw-r--r--engines/cge2/cge2.cpp2
-rw-r--r--engines/cge2/cge2.h2
-rw-r--r--engines/cge2/cge2_main.cpp16
3 files changed, 18 insertions, 2 deletions
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp
index aa87f99a3b..16deafba48 100644
--- a/engines/cge2/cge2.cpp
+++ b/engines/cge2/cge2.cpp
@@ -97,6 +97,8 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription)
_req = 1;
_midiNotify = nullptr;
_spriteNotify = nullptr;
+ _enaCap = true;
+ _enaVox = true;
}
void CGE2Engine::init() {
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index a2cd13107e..252fad07bd 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -285,6 +285,8 @@ public:
NotifyFunctionType _midiNotify;
NotifyFunctionType _spriteNotify;
int _startGameSlot;
+ bool _enaCap;
+ bool _enaVox;
ResourceManager *_resman;
Vga *_vga;
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index 76829b00aa..b7dcf65b33 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -1137,11 +1137,23 @@ void CGE2Engine::setVolume(int idx, int cnt) {
}
void CGE2Engine::switchCap() {
- warning("STUB: CGE2Engine::switchCap()");
+ if (_enaCap) {
+ _sayCap = !_sayCap;
+ if (!_sayCap)
+ _sayVox = true;
+ keyClick();
+ checkSaySwitch();
+ }
}
void CGE2Engine::switchVox() {
- warning("STUB: CGE2Engine::switchVox()");
+ if (_enaVox) {
+ _sayVox = !_sayVox;
+ if (!_sayVox)
+ _sayCap = true;
+ keyClick();
+ checkSaySwitch();
+ }
}
void CGE2Engine::offUse() {