diff options
| author | Strangerke | 2013-09-05 08:07:59 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-05 08:07:59 +0200 |
| commit | 8011d24ee20f6942a8b153849413002740f3ff78 (patch) | |
| tree | 479b5667eb03f5f3909145b61837ec97fbd69a28 /engines | |
| parent | 31bd1369d977e626713baa095359e43b2f1518f7 (diff) | |
| download | scummvm-rg350-8011d24ee20f6942a8b153849413002740f3ff78.tar.gz scummvm-rg350-8011d24ee20f6942a8b153849413002740f3ff78.tar.bz2 scummvm-rg350-8011d24ee20f6942a8b153849413002740f3ff78.zip | |
AVALANCHE: Fix warnings reported by GCC
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/avalanche/scrolls2.cpp | 3 | ||||
| -rw-r--r-- | engines/avalanche/trip6.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index 0d578c727e..ba0a6c4972 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -620,7 +620,6 @@ void Scrolls::solidify(byte n) { void Scrolls::calldrivers() { uint16 fv; byte nn; - char nnn; bool mouthnext; bool call_spriterun; // Only call sprite_run the FIRST time. // bool was_virtual; // Was the mouse cursor virtual on entry to this proc? @@ -760,7 +759,7 @@ void Scrolls::calldrivers() { break; case 11: nn = 1; - for (nnn = 0; nnn < numobjs; nnn++) { + for (byte nnn = 0; nnn < numobjs; nnn++) { if (_vm->_gyro->dna.obj[nnn]) { nn++; display(_vm->_gyro->get_better(nnn) + ", " + kControlToBuffer); diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp index 0c320dd186..790619e72a 100644 --- a/engines/avalanche/trip6.cpp +++ b/engines/avalanche/trip6.cpp @@ -1119,11 +1119,9 @@ void Trip::apped(byte trn, byte np) { rwsp(trn, _vm->_gyro->peds[np].dir); } - - #if 0 function overlap(x1,y1,x2,y2,x3,y3,x4,y4:uint16):bool; - begin { By De Morgan's law: } + begin // By De Morgan's law: overlap:=(x2>=x3) and (x4>=x1) and (y2>=y3) and (y4>=y1); end; #endif |