diff options
author | Strangerke | 2013-09-04 11:43:02 +0200 |
---|---|---|
committer | Strangerke | 2013-09-04 11:43:02 +0200 |
commit | cd808484aff158ccc8ec78a3898c4d5aff2d8e03 (patch) | |
tree | c02dba7a9a7003d42ebfd940f097e004e60447cc /engines/avalanche | |
parent | d418b2c50c47cb363035885b2b28fcb372c94253 (diff) | |
download | scummvm-rg350-cd808484aff158ccc8ec78a3898c4d5aff2d8e03.tar.gz scummvm-rg350-cd808484aff158ccc8ec78a3898c4d5aff2d8e03.tar.bz2 scummvm-rg350-cd808484aff158ccc8ec78a3898c4d5aff2d8e03.zip |
AVALANCHE: Fix some more MSVC warnings
Diffstat (limited to 'engines/avalanche')
-rw-r--r-- | engines/avalanche/enid2.cpp | 4 | ||||
-rw-r--r-- | engines/avalanche/pingo2.cpp | 5 | ||||
-rw-r--r-- | engines/avalanche/scrolls2.cpp | 29 |
3 files changed, 17 insertions, 21 deletions
diff --git a/engines/avalanche/enid2.cpp b/engines/avalanche/enid2.cpp index 9841fa02e7..1e7c816947 100644 --- a/engines/avalanche/enid2.cpp +++ b/engines/avalanche/enid2.cpp @@ -263,8 +263,8 @@ void Enid::from_sundry(sundry sund) { } void Enid::restore_dna() { - uint16 here, fv; - sundry sund; +// uint16 here, fv; +// sundry sund; warning("STUB: Enid::restore_dna()"); } diff --git a/engines/avalanche/pingo2.cpp b/engines/avalanche/pingo2.cpp index 4f3d17192b..096a8be084 100644 --- a/engines/avalanche/pingo2.cpp +++ b/engines/avalanche/pingo2.cpp @@ -109,8 +109,6 @@ void Pingo::zonk() { void Pingo::winning_pic() { Common::File f; - char r; - _vm->_lucerna->dusk(); if (!f.open("finale.avd")) { @@ -137,7 +135,8 @@ void Pingo::winning_pic() { /*do { _vm->_gyro->check(); } while (!(keypressed() || (mrelease > 0))); - while (keypressed()) r = readkey(); + while (keypressed()) + char r = readkey(); major_redraw();*/ warning("STUB: Pingo::winning_pic()"); } diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index 523c37bd8d..fe345d8575 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -55,8 +55,6 @@ void Scrolls::init() { } void Scrolls::state(byte x) { /* Sets "Ready" light to whatever */ - byte page_; - if (_vm->_gyro->ledstatus == x) return; /* Already like that! */ @@ -136,8 +134,6 @@ void Scrolls::say(int16 x, int16 y, Common::String z) { /* Fancy FAST screenwrit void Scrolls::normscroll() { Common::String egg = Common::String(kControlParagraph) + kControlLeftJustified + kControlNegative + kControlBell + kControlBackspace + "***"; Common::String e = "(c) 1994"; - char r; - bool oktoexit; state(3); _vm->_gyro->seescroll = true; @@ -165,6 +161,8 @@ void Scrolls::normscroll() { +// char r; +// bool oktoexit; // do { // do { // _vm->_gyro->check(); /* was "checkclick;" */ @@ -308,8 +306,6 @@ void Scrolls::geticon(int16 x, int16 y, byte which) { void Scrolls::block_drop(Common::String fn, int16 xl, int16 yl, int16 y) { Common::File f; - byte bit; - int16 fv; uint16 st; st = (y - 1) * 80 + (40 - xl / 2) + ((1 - _vm->_gyro->cp) * _vm->_gyro->pagetop); @@ -321,14 +317,15 @@ void Scrolls::block_drop(Common::String fn, int16 xl, int16 yl, int16 y) { return; } - /*for (fv = 1; fv <= yl; fv ++) - for (bit = 0; bit <= 3; bit ++) { - port[0x3c4] = 2; - port[0x3ce] = 4; - port[0x3c5] = 1 << bit; - port[0x3cf] = bit; - blockread(f, mem[0xa000 * st + (fv * 80)], xl); - } + /*byte bit; + for (uint16 fv = 1; fv <= yl; fv ++) + for (bit = 0; bit <= 3; bit ++) { + port[0x3c4] = 2; + port[0x3ce] = 4; + port[0x3c5] = 1 << bit; + port[0x3cf] = bit; + blockread(f, mem[0xa000 * st + (fv * 80)], xl); + } bit = getpixel(0, 0);*/ warning("STUB: Scrolls::block_drop()"); @@ -484,7 +481,7 @@ void Scrolls::bubble(func2 gotoit) { int16 xl, yl, my, xw, yw; byte fv; Common::Point p[3]; - byte *rp1, *rp2; /* replace: 1=bubble, 2=pointer */ +// byte *rp1, *rp2; /* replace: 1=bubble, 2=pointer */ int16 xc; /* x correction */ /*setvisualpage(cp); @@ -638,7 +635,7 @@ void Scrolls::calldrivers() { 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? +// bool was_virtual; // Was the mouse cursor virtual on entry to this proc? //nosound(); |