aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2013-09-21 14:36:23 +0200
committeruruk2013-09-21 14:36:23 +0200
commit897a0d0a61cc393a80a276b94d37c2d0d7c8dfbc (patch)
treee20b5f6ed0ad512ee7e823f37d23ad9efe4eec89
parent3b57efaf992b3dccbf60b0f94004c587b93fec32 (diff)
downloadscummvm-rg350-897a0d0a61cc393a80a276b94d37c2d0d7c8dfbc.tar.gz
scummvm-rg350-897a0d0a61cc393a80a276b94d37c2d0d7c8dfbc.tar.bz2
scummvm-rg350-897a0d0a61cc393a80a276b94d37c2d0d7c8dfbc.zip
AVALANCHE: Silence more GCC warnings.
-rw-r--r--engines/avalanche/parser.cpp6
-rw-r--r--engines/avalanche/scrolls.cpp4
2 files changed, 2 insertions, 8 deletions
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index 5f9e5d8965..d341e76626 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -144,12 +144,6 @@ void Parser::drawCursor() {
// Draw the '_' character.
for (int bit = 0; bit < 8; bit++)
*(byte *)_vm->_graphics->_surface.getBasePtr(24 + _inputTextPos * 8 + 7 - bit, 168) = kColorWhite;
-
- ByteField bf;
- bf._x1 = _inputTextPos + 1;
- bf._x2 = _inputTextPos + 2;
- bf._y1 = 168;
- bf._y2 = 168;
}
void Parser::wipeText() {
diff --git a/engines/avalanche/scrolls.cpp b/engines/avalanche/scrolls.cpp
index ca5b515780..0b1b4a4870 100644
--- a/engines/avalanche/scrolls.cpp
+++ b/engines/avalanche/scrolls.cpp
@@ -193,7 +193,7 @@ void Scrolls::store(byte what, TuneType &played) {
bool Scrolls::theyMatch(TuneType &played) {
byte mistakes = 0;
- for (int i = 0; i < sizeof(played); i++) {
+ for (byte i = 0; i < sizeof(played); i++) {
if (played[i] != _vm->_gyro->kTune[i])
mistakes += 1;
}
@@ -208,7 +208,7 @@ void Scrolls::scrollModeMusic() {
_vm->_gyro->newMouse(3);
TuneType played;
- for (int i = 0; i < sizeof(played); i++)
+ for (byte i = 0; i < sizeof(played); i++)
played[i] = Gyro::kPitchInvalid;
int8 lastOne = -1, thisOne = -1; // Invalid values.