diff options
author | uruk | 2013-09-03 17:51:30 +0200 |
---|---|---|
committer | uruk | 2013-09-03 17:51:30 +0200 |
commit | 09ee31e4cea0b2eedaee993d54a947e6c6394bc2 (patch) | |
tree | c32efd38498523c803ef034153784a550b50d273 /engines/avalanche | |
parent | 84ae6db8938cde4d24a764917972eaef9936472e (diff) | |
download | scummvm-rg350-09ee31e4cea0b2eedaee993d54a947e6c6394bc2.tar.gz scummvm-rg350-09ee31e4cea0b2eedaee993d54a947e6c6394bc2.tar.bz2 scummvm-rg350-09ee31e4cea0b2eedaee993d54a947e6c6394bc2.zip |
AVALANCHE: Get rid of the rest of Basher.
Diffstat (limited to 'engines/avalanche')
-rw-r--r-- | engines/avalanche/avalanche.cpp | 3 | ||||
-rw-r--r-- | engines/avalanche/avalanche.h | 2 | ||||
-rw-r--r-- | engines/avalanche/avalot.cpp | 5 | ||||
-rw-r--r-- | engines/avalanche/dropdown2.cpp | 3 | ||||
-rw-r--r-- | engines/avalanche/gyro2.cpp | 1 | ||||
-rw-r--r-- | engines/avalanche/module.mk | 1 | ||||
-rw-r--r-- | engines/avalanche/scrolls2.cpp | 4 |
7 files changed, 1 insertions, 18 deletions
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index b977aeb3b0..70d79425db 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -76,7 +76,6 @@ AvalancheEngine::~AvalancheEngine() { delete _timeout; delete _trip; delete _acci; - delete _basher; delete _dropdown; delete _closing; } @@ -99,7 +98,6 @@ Common::ErrorCode AvalancheEngine::initialize() { _timeout = new Timeout(this); _trip = new Trip(this); _acci = new Acci(this); - _basher = new Basher(this); _dropdown = new Dropdown(this); _closing = new Closing(this); @@ -108,7 +106,6 @@ Common::ErrorCode AvalancheEngine::initialize() { _scrolls->init(); _lucerna->init(); _acci->init(); - _basher->init(); _parser->init(); return Common::kNoError; diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h index c243aeaa8a..393bb4d157 100644 --- a/engines/avalanche/avalanche.h +++ b/engines/avalanche/avalanche.h @@ -47,7 +47,6 @@ #include "avalanche/timeout2.h" #include "avalanche/trip6.h" #include "avalanche/acci2.h" -#include "avalanche/basher2.h" #include "avalanche/dropdown2.h" #include "avalanche/closing2.h" @@ -88,7 +87,6 @@ public: Timeout *_timeout; Trip *_trip; Acci *_acci; - Basher *_basher; Dropdown *_dropdown; Closing *_closing; diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp index 54c4656886..2678123d8e 100644 --- a/engines/avalanche/avalot.cpp +++ b/engines/avalanche/avalot.cpp @@ -36,7 +36,6 @@ #include "avalanche/gyro2.h" #include "avalanche/lucerna2.h" #include "avalanche/scrolls2.h" -#include "avalanche/basher2.h" #include "avalanche/dropdown2.h" #include "avalanche/pingo2.h" #include "avalanche/logger2.h" @@ -114,8 +113,6 @@ void Avalot::handleKeyDown(Common::Event &event) { if (_vm->_gyro->alive && _vm->_gyro->dna.avvy_is_awake) { _vm->_trip->handleMoveKey(event); // Fallthroughs are intended. _vm->_lucerna->showrw(); - if (_vm->_gyro->demo) - _vm->_basher->get_demorec(); return; } case Common::KEYCODE_BACKSPACE: @@ -127,8 +124,6 @@ void Avalot::handleKeyDown(Common::Event &event) { } _vm->_lucerna->showrw(); - if (_vm->_gyro->demo) - _vm->_basher->get_demorec(); } diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp index a29cbcc9df..95a6724f7e 100644 --- a/engines/avalanche/dropdown2.cpp +++ b/engines/avalanche/dropdown2.cpp @@ -36,7 +36,6 @@ #include "avalanche/acci2.h" #include "avalanche/trip6.h" #include "avalanche/enid2.h" -#include "avalanche/basher2.h" #include "common/textconsole.h" @@ -676,7 +675,7 @@ void Dropdown::do__file() { } break; case 3: - _vm->_basher->filename_edit(); + //_vm->_basher->filename_edit(); break; case 4: _vm->_enid->back_to_bootstrap(2); diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp index 229f387148..4166ecfe32 100644 --- a/engines/avalanche/gyro2.cpp +++ b/engines/avalanche/gyro2.cpp @@ -325,7 +325,6 @@ void Gyro::newgame() { /*for gd:=0 to 5 do which[gd]:=1;*/ memset(&_vm->_gyro->dna, 0, sizeof(dnatype)); _vm->_scrolls->natural(); - _vm->_basher->normal_edit(); _vm->_lucerna->mousepage(0); dna.spare_evening = "answer a questionnaire"; dna.like2drink = "beer"; diff --git a/engines/avalanche/module.mk b/engines/avalanche/module.mk index e2dd67d6ba..7f2e40c945 100644 --- a/engines/avalanche/module.mk +++ b/engines/avalanche/module.mk @@ -20,7 +20,6 @@ MODULE_OBJS = \ timeout2.o \ trip6.o \ acci2.o \ - basher2.o \ dropdown2.o \ closing2.o diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index 8f4c6dd4a0..f21645d0e2 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -38,7 +38,6 @@ #include "avalanche/acci2.h" #include "avalanche/visa2.h" #include "avalanche/timeout2.h" -#include "avalanche/basher2.h" #include "common/textconsole.h" #include "common/file.h" @@ -153,9 +152,6 @@ void Scrolls::normscroll() { _vm->_gyro->newpointer(4); _vm->_lucerna->mousepage(1 - _vm->_gyro->cp); - if (_vm->_gyro->demo) - _vm->_basher->get_demorec(); - ::Graphics::Surface temp; |