aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2013-08-16 13:56:29 +0200
committeruruk2013-08-16 13:56:29 +0200
commit5e2627542af823c4faad7350a56fab097d10b5b8 (patch)
tree123f96ec8535da090eafde0196c0dcb52182f83f
parentd860bc592545e6ebf387e95afb5068c8a5d8d123 (diff)
downloadscummvm-rg350-5e2627542af823c4faad7350a56fab097d10b5b8.tar.gz
scummvm-rg350-5e2627542af823c4faad7350a56fab097d10b5b8.tar.bz2
scummvm-rg350-5e2627542af823c4faad7350a56fab097d10b5b8.zip
AVALANCHE: Remove functions connected to mouse handling from Gyro, remove Lucerna::flip_page().
-rw-r--r--engines/avalanche/avalot.cpp7
-rw-r--r--engines/avalanche/gyro2.cpp32
-rw-r--r--engines/avalanche/gyro2.h13
-rw-r--r--engines/avalanche/lucerna2.cpp7
-rw-r--r--engines/avalanche/lucerna2.h2
5 files changed, 0 insertions, 61 deletions
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index ced7150265..fff969bc34 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -236,14 +236,7 @@ void Avalot::run(Common::String arg) {
_vm->_trip->trippancy_link();
_vm->_celer->pics_link();
_vm->_lucerna->checkclick();
-
- if (_vm->_gyro->visible == _vm->_gyro->m_virtual)
- _vm->_gyro->plot_vmc(_vm->_gyro->mx, _vm->_gyro->my, _vm->_gyro->cp);
- _vm->_lucerna->flip_page(); /* <<<! */
- if (_vm->_gyro->visible == _vm->_gyro->m_virtual)
- _vm->_gyro->wipe_vmc(_vm->_gyro->cp);
-
_vm->_timeout->one_tick();
diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp
index 8d42e1bd92..96b45b44e5 100644
--- a/engines/avalanche/gyro2.cpp
+++ b/engines/avalanche/gyro2.cpp
@@ -508,30 +508,6 @@ Common::String Gyro::f5_does() {
return "STUB: Gyro::f5_does()";
}
-void Gyro::plot_vmc(int16 xx, int16 yy, byte page_) {
- warning("STUB: Gyro::plot_vmc()");
-}
-
-void Gyro::wipe_vmc(byte page_) {
- warning("STUB: Gyro::wipe_vmc()");
-}
-
-void Gyro::setup_vmc() {
- warning("STUB: Gyro::setup_vmc()");
-}
-
-void Gyro::clear_vmc() {
- warning("STUB: Gyro::clear_vmc()");
-}
-
-void Gyro::setminmaxhorzcurspos(uint16 min, uint16 max) { /* phew */
- warning("STUB: Gyro::setminmaxhorzcurspos()");
-}
-
-void Gyro::setminmaxvertcurspos(uint16 min, uint16 max) {
- warning("STUB: Gyro::setminmaxvertcurspos()");
-}
-
void Gyro::load_a_mouse(byte which) {
Common::File f;
@@ -580,14 +556,6 @@ void Gyro::load_a_mouse(byte which) {
CursorMan.replaceCursor(cursor.pixels, 16, 32, mps[which].horzhotspot, mps[which].verthotspot, 255, false);
cursor.free();
-
-
-
- vmc.ofsx = -mps[which].horzhotspot;
- vmc.ofsy = -mps[which].verthotspot;
-
- setminmaxhorzcurspos(mps[which].horzhotspot + 3, 624 + mps[which].horzhotspot);
- setminmaxvertcurspos(mps[which].verthotspot, 199);
}
void Gyro::background(byte x) {
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index 5f268dc80c..f5dc209040 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -655,14 +655,6 @@ public:
Common::String f5_does(); // This procedure determines what f5 does.
- void plot_vmc(int16 xx, int16 yy, byte page_);
-
- void wipe_vmc(byte page_);
-
- void setup_vmc();
-
- void clear_vmc();
-
void load_a_mouse(byte which);
void background(byte x);
@@ -683,11 +675,6 @@ private:
static const char betterchar[];
void shadow(int16 x1, int16 y1, int16 x2, int16 y2, byte hc, byte sc);
-
- void setminmaxhorzcurspos(uint16 min, uint16 max);
-
- void setminmaxvertcurspos(uint16 min, uint16 max);
-
};
} // End of namespace Avalanche
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index afbbc1b053..340116b8b3 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -217,8 +217,6 @@ void Lucerna::load(byte n) { /* Load2, actually */
Common::String xx;
CursorMan.showMouse(false);
-
- _vm->_gyro->clear_vmc();
_vm->_graphics->flesh_colours();
@@ -1130,11 +1128,6 @@ void Lucerna::clock_lucerna() {
-
-void Lucerna::flip_page() {
- warning("STUB: Lucerna::flip_page()");
-}
-
void Lucerna::delavvy() {
byte page_;
diff --git a/engines/avalanche/lucerna2.h b/engines/avalanche/lucerna2.h
index f0ecf2bad7..4cee781fd6 100644
--- a/engines/avalanche/lucerna2.h
+++ b/engines/avalanche/lucerna2.h
@@ -88,8 +88,6 @@ public:
void clock_lucerna();
- void flip_page();
-
void delavvy();
void gameover();