From 3df5f2ad418d886ea77848c9916e2b97c6ce627b Mon Sep 17 00:00:00 2001 From: uruk Date: Sun, 9 Feb 2014 15:25:10 +0100 Subject: AVALANCHE: Remove Pingo. --- engines/avalanche/avalanche.cpp | 3 -- engines/avalanche/avalanche.h | 2 - engines/avalanche/pingo.cpp | 94 ----------------------------------------- engines/avalanche/pingo.h | 56 ------------------------ engines/avalanche/timer.cpp | 8 +--- 5 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 engines/avalanche/pingo.cpp delete mode 100644 engines/avalanche/pingo.h (limited to 'engines/avalanche') diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index 25986f28ba..d04f2f8458 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -46,7 +46,6 @@ AvalancheEngine::AvalancheEngine(OSystem *syst, const AvalancheGameDescription * _clock = nullptr; _graphics = nullptr; _parser = nullptr; - _pingo = nullptr; _dialogs = nullptr; _background = nullptr; _sequence = nullptr; @@ -71,7 +70,6 @@ AvalancheEngine::~AvalancheEngine() { delete _parser; delete _clock; - delete _pingo; delete _dialogs; delete _background; delete _sequence; @@ -156,7 +154,6 @@ Common::ErrorCode AvalancheEngine::initialize() { _parser = new Parser(this); _clock = new Clock(this); - _pingo = new Pingo(this); _dialogs = new Dialogs(this); _background = new Background(this); _sequence = new Sequence(this); diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h index dfe48b890f..5e5bc34464 100644 --- a/engines/avalanche/avalanche.h +++ b/engines/avalanche/avalanche.h @@ -32,7 +32,6 @@ #include "avalanche/graphics.h" #include "avalanche/parser.h" #include "avalanche/avalot.h" -#include "avalanche/pingo.h" #include "avalanche/dialogs.h" #include "avalanche/background.h" #include "avalanche/sequence.h" @@ -79,7 +78,6 @@ public: Clock *_clock; GraphicManager *_graphics; Parser *_parser; - Pingo *_pingo; Dialogs *_dialogs; Background *_background; Sequence *_sequence; diff --git a/engines/avalanche/pingo.cpp b/engines/avalanche/pingo.cpp deleted file mode 100644 index 40467ab839..0000000000 --- a/engines/avalanche/pingo.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -/* - * This code is based on the original source code of Lord Avalot d'Argent version 1.3. - * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman. - */ - -/* PINGO Full-screen sub-parts of the game. */ - -#include "avalanche/avalanche.h" -#include "avalanche/pingo.h" - -namespace Avalanche { - -Pingo::Pingo(AvalancheEngine *vm) { - _vm = vm; -} - -void Pingo::dPlot(int16 x, int16 y, Common::String z) { - warning("STUB: Pingo::dPlot()"); -} - -void Pingo::bossKey() { - warning("STUB: Pingo::bossKey()"); -} - -void Pingo::copy02() { // taken from Wobble (below) - warning("STUB: Pingo::copy02()"); -} - -void Pingo::copy03() { // taken from Wobble (below) - warning("STUB: Pingo::copy03()"); -} - -void Pingo::copyPage(byte frp, byte top) { // taken from Copy02 (above) - warning("STUB: Pingo::copyPage()"); -} - -void Pingo::winningPic() { - Common::File f; - _vm->fadeOut(); - - if (!f.open("finale.avd")) - error("AVALANCHE: File not found: finale.avd"); - -#if 0 - for (int bit = 0; bit <= 3; bit++) { - port[0x3c4] = 2; - port[0x3ce] = 4; - port[0x3c5] = 1 << bit; - port[0x3cf] = bit; - blockread(f, mem[0xa000 * 0], 16000); - } -#endif - - f.close(); - - warning("STUB: Pingo::winningPic()"); - - _vm->fadeIn(); - -#if 0 - do { - _vm->check(); - } while (!(keypressed() || (mrelease > 0))); - while (keypressed()) - char r = readkey(); - major_redraw(); -#endif - - warning("STUB: Pingo::winningPic()"); -} - -} // End of namespace Avalanche. diff --git a/engines/avalanche/pingo.h b/engines/avalanche/pingo.h deleted file mode 100644 index 6eecaf6453..0000000000 --- a/engines/avalanche/pingo.h +++ /dev/null @@ -1,56 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -/* - * This code is based on the original source code of Lord Avalot d'Argent version 1.3. - * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman. - */ - -/* PINGO Full-screen sub-parts of the game. */ - -#ifndef AVALANCHE_PINGO_H -#define AVALANCHE_PINGO_H - -#include "common/str.h" - -namespace Avalanche { -class AvalancheEngine; - -class Pingo { -public: - Pingo(AvalancheEngine *vm); - - void bossKey(); - void copy02(); - void copy03(); - void copyPage(byte frp, byte top); - void winningPic(); - -private: - AvalancheEngine *_vm; - - void dPlot(int16 x, int16 y, Common::String z); -}; - -} // End of namespace Avalanche. - -#endif // AVALANCHE_PINGO_H diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp index c8ea820c0e..091045f4e4 100644 --- a/engines/avalanche/timer.cpp +++ b/engines/avalanche/timer.cpp @@ -634,15 +634,9 @@ void Timer::arkataShouts() { void Timer::winning() { _vm->_dialogs->displayScrollChain('Q', 79); - _vm->_pingo->winningPic(); + //_vm->_pingo->winningPic(); warning("STUB: Timer::winning()"); -#if 0 - do { - _vm->checkclick(); - } while (!(_vm->mrelease == 0)); -#endif - // TODO: To be implemented with Pingo::winningPic(). _vm->callVerb(kVerbCodeScore); _vm->_dialogs->displayText(" T H E E N D "); -- cgit v1.2.3