aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche
diff options
context:
space:
mode:
authorStrangerke2013-09-04 17:15:33 +0200
committerStrangerke2013-09-04 17:15:33 +0200
commit6818dd2eb4749d4b96d8bf6f4b6b2d0b4d2d8753 (patch)
tree673ec5e1ad29f5353d2157ac8e0fd5d3584e328d /engines/avalanche
parent70aa840f0ba482271b8379685a40e59fb115fd8c (diff)
downloadscummvm-rg350-6818dd2eb4749d4b96d8bf6f4b6b2d0b4d2d8753.tar.gz
scummvm-rg350-6818dd2eb4749d4b96d8bf6f4b6b2d0b4d2d8753.tar.bz2
scummvm-rg350-6818dd2eb4749d4b96d8bf6f4b6b2d0b4d2d8753.zip
AVALANCHE: Fix some more GCC warnings
Diffstat (limited to 'engines/avalanche')
-rw-r--r--engines/avalanche/acci2.cpp6
-rw-r--r--engines/avalanche/trip6.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index 167faf1188..9ce3180a41 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -1556,7 +1556,8 @@ void Acci::doThat() {
if (holding()) { // Wear something.
switch (_thing) {
case Gyro::chastity:
- _vm->_scrolls->display("Hey, kWhat kind of a weirdo are you??!");
+ // \? are used to avoid that ??! is parsed as a trigraph
+ _vm->_scrolls->display("Hey, kWhat kind of a weirdo are you\?\?!");
break;
case Gyro::clothes:
case Gyro::habit: { /* Change this! */
@@ -1667,7 +1668,8 @@ void Acci::doThat() {
if (_thing == _vm->_gyro->bell) {
_vm->_scrolls->display("Ding, dong, ding, dong, ding, dong, ding, dong...");
if ((_vm->_gyro->dna.ringing_bells) & (_vm->_gyro->flagset('B')))
- _vm->_scrolls->display("(Are you trying to join in, Avvy??!)");
+ // \? are used to avoid that ??! is parsed as a trigraph
+ _vm->_scrolls->display("(Are you trying to join in, Avvy\?\?!)");
} else
_vm->_scrolls->display(kWhat);
}
diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp
index 417a92056e..e07607a4d5 100644
--- a/engines/avalanche/trip6.cpp
+++ b/engines/avalanche/trip6.cpp
@@ -1646,6 +1646,8 @@ void Trip::handleMoveKey(const Common::Event &event) {
case Common::KEYCODE_KP5:
stopwalking();
break;
+ default:
+ break;
}
}