From ebc3763d64c5192b04c35d27b876adeb88b5ef47 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 1 Nov 2011 21:59:43 +1100 Subject: TSAGE: Removed game stubs for Geekwad --- engines/tsage/core.cpp | 2 +- engines/tsage/detection.cpp | 1 - engines/tsage/detection_tables.h | 15 - engines/tsage/geekwad/geekwad_logic.cpp | 80 ----- engines/tsage/geekwad/geekwad_logic.h | 79 ----- engines/tsage/geekwad/geekwad_scenes0.cpp | 498 ------------------------------ engines/tsage/geekwad/geekwad_scenes0.h | 85 ----- engines/tsage/globals.cpp | 15 - engines/tsage/globals.h | 10 - engines/tsage/module.mk | 2 - engines/tsage/tsage.cpp | 6 - engines/tsage/tsage.h | 3 +- 12 files changed, 2 insertions(+), 794 deletions(-) delete mode 100644 engines/tsage/geekwad/geekwad_logic.cpp delete mode 100644 engines/tsage/geekwad/geekwad_logic.h delete mode 100644 engines/tsage/geekwad/geekwad_scenes0.cpp delete mode 100644 engines/tsage/geekwad/geekwad_scenes0.h diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 4061705707..dbea7e8d98 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -1447,7 +1447,7 @@ void ScenePalette::changeBackground(const Rect &bounds, FadeMode fadeMode) { } Rect tempRect = bounds; - if ((g_vm->getGameID() != GType_Ringworld) && (g_vm->getGameID() != GType_Geekwad)) + if (g_vm->getGameID() != GType_Ringworld) tempRect.setHeight(T2_GLOBALS._interfaceY); g_globals->_screenSurface.copyFrom(g_globals->_sceneManager._scene->_backSurface, diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index ab179cbac8..12add10c58 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -62,7 +62,6 @@ static const PlainGameDescriptor tSageGameTitles[] = { { "ringworld", "Ringworld: Revenge of the Patriarch" }, { "blueforce", "Blue Force" }, { "ringworld2", "Return to Ringworld" }, - { "geekwad", "The Geekwad: Games Of The Galaxy" }, { 0, 0 } }; diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h index e9796426cd..360dbac0ae 100644 --- a/engines/tsage/detection_tables.h +++ b/engines/tsage/detection_tables.h @@ -156,21 +156,6 @@ static const tSageGameDescription gameDescriptions[] = { GF_CD | GF_ALT_REGIONS }, - // Geekwad - { - { - "geekwad", - "CD", - AD_ENTRY1s("geekwad.rlb", "0a441f7c4c7ce20fd3ac7707a5d64ee5", 5570365), - Common::EN_ANY, - Common::kPlatformPC, - ADGF_CD | ADGF_UNSTABLE, - GUIO2(GUIO_NOSPEECH, GUIO_NOSFX) - }, - GType_Geekwad, - GF_CD | GF_ALT_REGIONS - }, - { AD_TABLE_END_MARKER, 0, 0 } }; diff --git a/engines/tsage/geekwad/geekwad_logic.cpp b/engines/tsage/geekwad/geekwad_logic.cpp deleted file mode 100644 index a2d4fcb0f4..0000000000 --- a/engines/tsage/geekwad/geekwad_logic.cpp +++ /dev/null @@ -1,80 +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. - * - */ - -#include "common/config-manager.h" -#include "tsage/scenes.h" -#include "tsage/tsage.h" -#include "tsage/geekwad/geekwad_logic.h" -#include "tsage/geekwad/geekwad_scenes0.h" - -namespace TsAGE { - -namespace Geekwad { - -void GeekwadGame::start() { - // Start the game - g_globals->_sceneManager.changeScene(150); -} - -Scene *GeekwadGame::createScene(int sceneNumber) { - switch (sceneNumber) { - /* Scene group #0 */ - // Tsunami title screen - case 150: return new Scene150(); - - // Geekwad credits screen - case 200: return new Scene200(); - - default: - error("Unknown scene number - %d", sceneNumber); - break; - } -} - -void GeekwadGame::rightClick() { -} - -/** - * Returns true if it is currently okay to restore a game - */ -bool GeekwadGame::canLoadGameStateCurrently() { - return true; -} - -/** - * Returns true if it is currently okay to save the game - */ -bool GeekwadGame::canSaveGameStateCurrently() { - return true; -} - -void GeekwadGame::processEvent(Event &event) { -} - -/*--------------------------------------------------------------------------*/ - -SceneExt::SceneExt(): Scene() { -} - -} // End of namespace Geekwad - -} // End of namespace TsAGE diff --git a/engines/tsage/geekwad/geekwad_logic.h b/engines/tsage/geekwad/geekwad_logic.h deleted file mode 100644 index fbccaeee00..0000000000 --- a/engines/tsage/geekwad/geekwad_logic.h +++ /dev/null @@ -1,79 +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. - * - */ - -#ifndef TSAGE_GEEKWAD_LOGIC_H -#define TSAGE_GEEKWAD_LOGIC_H - -#include "common/scummsys.h" -#include "tsage/events.h" -#include "tsage/core.h" -#include "tsage/scenes.h" -#include "tsage/globals.h" - -namespace TsAGE { - -namespace Geekwad { - -using namespace TsAGE; - -class SceneFactory { -public: - static Scene *createScene(int sceneNumber); -}; - -class SceneExt: public Scene { -public: -public: - SceneExt(); - - virtual Common::String getClassName() { return "SceneExt"; } -}; - -class GeekwadGame: public Game { -public: - virtual void start(); - - virtual Scene *createScene(int sceneNumber); - virtual void processEvent(Event &event); - virtual void rightClick(); - virtual bool canSaveGameStateCurrently(); - virtual bool canLoadGameStateCurrently(); -}; - -class SceneObject2: public SceneObject { -public: - int _v1, _v2; - - SceneObject2() { _v1 = _v2 = 0; } - virtual Common::String getClassName() { return "SceneObject2"; } - virtual void synchronize(Serializer &s) { - SceneObject::synchronize(s); - s.syncAsSint16LE(_v1); - s.syncAsSint16LE(_v2); - } -}; - -} // End of namespace Geekwad - -} // End of namespace TsAGE - -#endif diff --git a/engines/tsage/geekwad/geekwad_scenes0.cpp b/engines/tsage/geekwad/geekwad_scenes0.cpp deleted file mode 100644 index 9241b1dace..0000000000 --- a/engines/tsage/geekwad/geekwad_scenes0.cpp +++ /dev/null @@ -1,498 +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. - * - */ - -#include "tsage/scenes.h" -#include "tsage/tsage.h" -#include "tsage/staticres.h" -#include "tsage/geekwad/geekwad_scenes0.h" - -namespace TsAGE { - -namespace Geekwad { - -/*-------------------------------------------------------------------------- - * Scene 150 - Tsunami Title Screen - * - *--------------------------------------------------------------------------*/ - -void Scene150::Action1::signal() { - Scene150 *scene = (Scene150 *)GW_GLOBALS._sceneManager._scene; - static byte black[3] = { 0, 0, 0 }; - - switch (_actionIndex++) { - case 0: - setDelay(2); - break; - case 1: - GW_GLOBALS._sound1.play(1); - GW_GLOBALS._scenePalette.addRotation(64, 127, -1, 1, this); - break; - case 2: - scene->_object1.setVisage(822); - scene->_object1._strip = 1; - scene->_object1._frame = 1; - scene->_object1.changeZoom(100); - - scene->_object2.setVisage(822); - scene->_object2._strip = 2; - scene->_object2._frame = 1; - scene->_object2.changeZoom(100); - - scene->_object3.setVisage(822); - scene->_object3._strip = 3; - scene->_object3._frame = 1; - scene->_object3.changeZoom(100); - - scene->_object4.setVisage(822); - scene->_object4._strip = 4; - scene->_object4._frame = 1; - scene->_object4.changeZoom(100); - - scene->_object5.setVisage(822); - scene->_object5._strip = 5; - scene->_object5._frame = 1; - scene->_object5.changeZoom(100); - - scene->_object6.setVisage(822); - scene->_object6._strip = 6; - scene->_object6._frame = 1; - scene->_object6.changeZoom(100); - - scene->_object7.setVisage(822); - scene->_object7._strip = 7; - scene->_object7._frame = 1; - scene->_object7.changeZoom(100); - - scene->_object8.setVisage(822); - scene->_object8._strip = 8; - scene->_object8._frame = 1; - scene->_object8.changeZoom(100); - - setDelay(1); - break; - case 3: - GW_GLOBALS._scenePalette.addFader(scene->_scenePalette._palette, 256, 8, this); - break; - case 4: - setDelay(60); - break; - case 5: - scene->_object2.animate(ANIM_MODE_5, NULL); - scene->_object3.animate(ANIM_MODE_5, NULL); - scene->_object4.animate(ANIM_MODE_5, NULL); - scene->_object5.animate(ANIM_MODE_5, NULL); - scene->_object6.animate(ANIM_MODE_5, NULL); - scene->_object7.animate(ANIM_MODE_5, this); - break; - case 6: - setDelay(120); - break; - case 7: - GW_GLOBALS._scenePalette.addFader(black, 1, 5, this); - break; - case 8: - GW_GLOBALS._sceneManager.changeScene(200); - remove(); - break; - } -} - -/*--------------------------------------------------------------------------*/ - -void Scene150::postInit(SceneObjectList *OwnerList) { - loadScene(820); - Scene::postInit(); - setZoomPercents(60, 85, 200, 100); - - _scenePalette.loadPalette(822); - - _object1.postInit(); - _object1.setVisage(821); - _object1._strip = 1; - _object1._frame = 1; - _object1.animate(ANIM_MODE_NONE, NULL); - _object1.setPosition(Common::Point(62, 85)); - - _object2.postInit(); - _object2.setVisage(821); - _object2._strip = 2; - _object2._frame = 1; - _object2.animate(ANIM_MODE_NONE, NULL); - _object2.setPosition(Common::Point(27, 94)); - - _object3.postInit(); - _object3.setVisage(821); - _object3._strip = 2; - _object3._frame = 2; - _object3.animate(ANIM_MODE_NONE, NULL); - _object3.setPosition(Common::Point(68, 94)); - - _object4.postInit(); - _object4.setVisage(821); - _object4._strip = 2; - _object4._frame = 3; - _object4.animate(ANIM_MODE_NONE, NULL); - _object4.setPosition(Common::Point(110, 94)); - - _object5.postInit(); - _object5.setVisage(821); - _object5._strip = 2; - _object5._frame = 4; - _object5.animate(ANIM_MODE_NONE, NULL); - _object5.setPosition(Common::Point(154, 94)); - - _object6.postInit(); - _object6.setVisage(821); - _object6._strip = 2; - _object6._frame = 5; - _object6.animate(ANIM_MODE_NONE, NULL); - _object6.setPosition(Common::Point(199, 94)); - - _object7.postInit(); - _object7.setVisage(821); - _object7._strip = 2; - _object7._frame = 6; - _object7.animate(ANIM_MODE_NONE, NULL); - _object7.setPosition(Common::Point(244, 94)); - - _object8.postInit(); - _object8.setVisage(821); - _object8._strip = 2; - _object8._frame = 7; - _object8.animate(ANIM_MODE_NONE, NULL); - _object8.setPosition(Common::Point(286, 94)); - - setAction(&_action1); -} - -/*-------------------------------------------------------------------------- - * Scene 200 - Geekwad credits screen - * - *--------------------------------------------------------------------------*/ - -struct CreditEntry { - int visage; - int strip; - int frame; -}; - -const CreditEntry credits[] = { - {5500, 1, 1}, {5500, 1, 2}, {5500, 2, 1}, {5500, 2, 2}, {5500, 8, 2}, {5500, 3, 1}, - {5500, 3, 2}, {5500, 4, 1}, {5500, 4, 2}, {5500, 5, 1}, {5500, 5, 2}, {5500, 8, 2}, - {5500, 6, 1}, {5500, 6, 2}, {5500, 7, 1}, {5500, 7, 2}, {5500, 8, 1} -}; -#define TOTAL_CREDITS 17 - -void Scene200::Action1::signal() { - Scene200 *scene = (Scene200 *)GW_GLOBALS._sceneManager._scene; - - switch (_actionIndex) { - case 0: { - ++scene->_fieldAB2; - - if ((scene->_creditIndex < TOTAL_CREDITS) && (!scene->_creditIndex || (*scene->_list2.begin())->_position.y < 192)) { - SceneObject2 *obj = new SceneObject2(); - obj->postInit(); - obj->setVisage(credits[scene->_creditIndex].visage); - obj->setStrip(credits[scene->_creditIndex].strip); - obj->setFrame(credits[scene->_creditIndex].frame); - obj->changeZoom(106); - obj->fixPriority(100); - obj->setPosition(Common::Point(160, 210)); - obj->_flags |= OBJFLAG_CLONED; - obj->_v1 = obj->_v2 = 0; - - scene->_list2.push_back(obj); - ++scene->_creditIndex; - } - - SceneObject2 *item; - SynchronizedList::iterator i; - for (i = scene->_list2.begin(); i != scene->_list2.end(); ++i) { - item = *i; - item->setPosition(Common::Point(item->_position.x, item->_position.y - 1)); - item->changeZoom(item->_percent - ((210 - item->_position.y + 100) / 100)); - } - - item = *scene->_list2.begin(); - if (item->_percent < 20) { - item->remove(); - scene->_list2.remove(item); - - if (scene->_list2.empty()) { - ++_actionIndex; - scene->_sound1.fadeOut(this); - } - } - - setDelay(6); - break; - } - case 1: - setDelay(1); - ++_actionIndex; - break; - case 2: - scene->_sound1.play(3); - scene->_sound1.setVol(127); - - scene->_object1.postInit(); - scene->_object1.setVisage(5510); - scene->_object1.setStrip(1); - scene->_object1.setFrame(1); - scene->_object1.changeZoom(10); - scene->_object1.fixPriority(100); - scene->_object1.setPosition(Common::Point(160, 190)); - - setDelay(3); - ++_actionIndex; - break; - case 3: - scene->_object1.changeZoom(scene->_object1._percent + 5); - if (scene->_object1._percent >= 100) - ++_actionIndex; - - setDelay(3); - break; - case 4: - scene->_object2.postInit(); - scene->_object2.setVisage(5000); - scene->_object2.setStrip(1); - scene->_object2.setFrame(1); - scene->_object2.fixPriority(110); - scene->_object2.setPosition(Common::Point(-30, 100)); - scene->_object2.animate(ANIM_MODE_2); - - scene->_object3.postInit(); - scene->_object3.setVisage(5505); - scene->_object3.setStrip(1); - scene->_object3.setFrame(1); - scene->_object3.fixPriority(100); - scene->_object3.setPosition(Common::Point(412, 117)); - - scene->_object4.postInit(); - scene->_object4.setVisage(5505); - scene->_object4.setStrip(2); - scene->_object4.setFrame(1); - scene->_object4.fixPriority(101); - scene->_object4.setPosition(Common::Point(scene->_object3._position.x + 35, - scene->_object3._position.y - 19)); - - ++_actionIndex; - setDelay(6); - break; - case 5: - scene->_creditIndex = 0; - scene->_object2.setPosition(Common::Point(scene->_object2._position.x +12, scene->_object2._position.y)); - - if (scene->_object2._position.x > 240) - ++_actionIndex; - break; - case 6: - ++scene->_creditIndex; - if ((scene->_creditIndex % 2) != 0) { - scene->_object2.setPosition(Common::Point(scene->_object2._position.x - 12, scene->_object2._position.y)); - scene->_sound2.play(611); - } else { - scene->_object2.setPosition(Common::Point(scene->_object2._position.x + 12, scene->_object2._position.y)); - } - - if (scene->_creditIndex >= 6) - ++_actionIndex; - break; - case 7: - scene->loadBackground(8, 0); - scene->_object2.setPosition(Common::Point(scene->_object2._position.x, scene->_object2._position.y + 2)); - scene->_object1.setPosition(Common::Point(scene->_object1._position.x - 12, scene->_object1._position.y)); - - if (scene->_sceneBounds.left >= 160) { - scene->_object1.remove(); - ++_actionIndex; - } - break; - case 8: - scene->_object2.setPosition(Common::Point(scene->_object2._position.x + 12, scene->_object2._position.y)); - - if (scene->_object2._position.x > 321) - ++_actionIndex; - break; - case 9: - scene->_sound2.play(611); - scene->_object2.setPosition(Common::Point(scene->_object2._position.x - 12, scene->_object2._position.y)); - scene->_object3.setPosition(Common::Point(scene->_object3._position.x + 12, scene->_object3._position.y)); - scene->_object4.setPosition(Common::Point(scene->_object4._position.x + 12, scene->_object2._position.y)); - scene->_object4.setFrame(scene->_object4.getFrameCount()); - - setDelay(6); - ++_actionIndex; - break; - case 10: - scene->_object3.setPosition(Common::Point(scene->_object3._position.x - 12, scene->_object3._position.y)); - scene->_object4.setPosition(Common::Point(scene->_object4._position.x - 12, scene->_object2._position.y)); - scene->_object4.setAction(&scene->_action2); - scene->_object2.setPosition(Common::Point(scene->_object2._position.x - 12, scene->_object2._position.y)); - scene->_object2.fixPriority(80); - - setDelay(6); - ++_actionIndex; - break; - case 11: - scene->_object2.changeZoom(scene->_object2._percent - 5); - if (scene->_object2._percent < 20) - ++_actionIndex; - break; - case 12: - scene->_object2.setPosition(Common::Point(scene->_object2._position.x + 2, - scene->_object2._position.y - ((scene->_object2._position.y <= 80) ? 0 : 2))); - if (scene->_object2._position.x > 390) - ++_actionIndex; - break; - case 13: - scene->_field846 = GW_GLOBALS._events.getFrameNumber() - scene->_field846; - scene->_field848 = (scene->_field846 > 3600) ? 2 : 1; - scene->_creditIndex = 0; - ++_actionIndex; - // Deliberate fall-through - case 14: { - setDelay(2); - - if ((scene->_creditIndex != 0) && ((scene->_creditIndex == -1) || ((*scene->_list1.begin())->_position.y >= 142))) { - Common::String msg = g_resourceManager->getMessage(200, scene->_creditIndex); - - if (msg.hasPrefix("~")) { - scene->_creditIndex = -1; - } else { - if (msg.empty()) - msg = " "; - - SceneText *sceneText = new SceneText(); - sceneText->_fontNumber = 71; - - if (msg.hasPrefix("@")) { - sceneText->_color1 = 43; - sceneText->_color2 = 46; - sceneText->_color3 = 80; - msg.deleteChar(0); - } else { - sceneText->_color1 = 100; - sceneText->_color2 = 103; - sceneText->_color3 = 16; - } - - sceneText->_width = 400; - sceneText->setup(msg); - sceneText->_flags |= OBJFLAG_CLONED; - sceneText->fixPriority(199); - - int fontNumber = GW_GLOBALS.gfxManager()._font._fontNumber; - GW_GLOBALS.gfxManager()._font.setFontNumber(sceneText->_fontNumber); - int strWidth = GW_GLOBALS.gfxManager().getStringWidth(msg.c_str()); - - sceneText->setPosition(Common::Point(270 - (strWidth / 2), 150)); - GW_GLOBALS.gfxManager()._font.setFontNumber(fontNumber); - - scene->_list1.push_back(sceneText); - } - } - - SynchronizedList::iterator i; - for (i = scene->_list1.begin(); i != scene->_list1.end(); ++i) { - SceneText *item = *i; - item->setPosition(Common::Point(item->_position.x, item->_position.y - scene->_field848)); - } - - SceneText *topItem = *scene->_list1.begin(); - if (topItem->_position.y < 50) { - topItem->remove(); - scene->_list1.remove(topItem); - - if (scene->_list1.empty()) { - setDelay(10); - ++_actionIndex; - } - } - break; - } - case 15: - ++_actionIndex; - scene->_sound1.fade(0, 5, 4, true, this); - break; - case 16: - GW_GLOBALS._sceneManager.changeScene(500); - remove(); - break; - } -} - -void Scene200::Action2::signal() { - switch (_actionIndex++) { - case 0: - ++_actionIndex; - setDelay(GW_GLOBALS._randomSource.getRandomNumber(50) + 50); - break; - case 1: - ++_actionIndex; - static_cast(_owner)->animate(ANIM_MODE_8, 1, this); - break; - case 2: - _actionIndex = 0; - static_cast(_owner)->setFrame(1); - setDelay(1); - break; - } -} - -/*--------------------------------------------------------------------------*/ - -Scene200::Scene200(): Scene() { - _creditIndex = _fieldAB2 = 0; - _field846 = GW_GLOBALS._events.getFrameNumber(); -} - -void Scene200::postInit(SceneObjectList *OwnerList) { - Scene::postInit(); - loadScene(5500); - _sound1.play(2); - - setAction(&_action1); -} - -void Scene200::process(Event &event) { - switch (event.eventType) { - case EVENT_BUTTON_DOWN: - GW_GLOBALS._sceneManager.changeScene(500); - break; - case EVENT_KEYPRESS: - if ((event.kbd.keycode == Common::KEYCODE_ESCAPE) || (event.kbd.keycode == Common::KEYCODE_RETURN)) - GW_GLOBALS._sceneManager.changeScene(500); - break; - default: - break; - } - - if (!event.handled) - Scene::process(event); -} - -} // End of namespace Geekwad - -} // End of namespace TsAGE diff --git a/engines/tsage/geekwad/geekwad_scenes0.h b/engines/tsage/geekwad/geekwad_scenes0.h deleted file mode 100644 index 8c04f12486..0000000000 --- a/engines/tsage/geekwad/geekwad_scenes0.h +++ /dev/null @@ -1,85 +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. - * - */ - -#ifndef TSAGE_GEEKWAD_SCENES0_H -#define TSAGE_GEEKWAD_SCENES0_H - -#include "common/scummsys.h" -#include "tsage/converse.h" -#include "tsage/events.h" -#include "tsage/core.h" -#include "tsage/scenes.h" -#include "tsage/globals.h" -#include "tsage/sound.h" -#include "tsage/geekwad/geekwad_logic.h" - -namespace TsAGE { - -namespace Geekwad { - -using namespace TsAGE; - -class Scene150: public Scene { - /* Actions */ - class Action1 : public Action { - public: - virtual void signal(); - }; -public: - Action1 _action1; - ScenePalette _scenePalette; - SceneObject _object1, _object2, _object3, _object4; - SceneObject _object5, _object6, _object7, _object8; - - virtual void postInit(SceneObjectList *OwnerList = NULL); -}; - -class Scene200: public Scene { - /* Actions */ - class Action1: public Action { - public: - virtual void signal(); - }; - class Action2: public Action { - public: - virtual void signal(); - }; -public: - Action1 _action1; - Action2 _action2; - ASound _sound1, _sound2; - SceneObject _object1, _object2, _object3, _object4; - int _field846, _field848; - int _fieldAB2, _fieldAB4, _creditIndex; - SynchronizedList _list1; - SynchronizedList _list2; - - Scene200(); - virtual void postInit(SceneObjectList *OwnerList = NULL); - virtual void process(Event &event); -}; - -} // End of namespace Geekwad - -} // End of namespace TsAGE - -#endif diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index b667924aef..623332e864 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -23,7 +23,6 @@ #include "tsage/globals.h" #include "tsage/tsage.h" #include "tsage/blue_force/blueforce_logic.h" -#include "tsage/geekwad/geekwad_logic.h" #include "tsage/ringworld/ringworld_demo.h" #include "tsage/ringworld/ringworld_logic.h" #include "tsage/ringworld2/ringworld2_logic.h" @@ -88,14 +87,6 @@ Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface _color2 = 15; _color3 = 4; _dialogCenter.y = 100; - } else if (g_vm->getGameID() == GType_Geekwad) { - // Blue Force - _gfxFontNumber = 0; - _gfxColors.background = 89; - _gfxColors.foreground = 83; - _fontColors.background = 88; - _fontColors.foreground = 92; - _dialogCenter.y = 140; } else if ((g_vm->getGameID() == GType_Ringworld) && (g_vm->getFeatures() & GF_CD)) { _gfxFontNumber = 50; _gfxColors.background = 53; @@ -152,12 +143,6 @@ Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface _game = new Ringworld2::Ringworld2Game(); _sceneHandler = new Ringworld2::SceneHandlerExt(); break; - - case GType_Geekwad: - _game = new Geekwad::GeekwadGame(); - _inventory = NULL; - _sceneHandler = new SceneHandler(); - break; } } diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 37918b1938..1dc8e28606 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -121,7 +121,6 @@ extern Globals *g_globals; #define T2_GLOBALS (*((::TsAGE::TsAGE2Globals *)g_globals)) #define BF_GLOBALS (*((::TsAGE::BlueForce::BlueForceGlobals *)g_globals)) #define R2_GLOBALS (*((::TsAGE::Ringworld2::Ringworld2Globals *)g_globals)) -#define GW_GLOBALS (*((::TsAGE::Geekwad::GeekwadGlobals *)g_globals)) // Note: Currently this can't be part of the g_globals structure, since it needs to be constructed // prior to many of the fields in Globals execute their constructors @@ -255,15 +254,6 @@ public: } // End of namespace Ringworld2 -namespace Geekwad { - -class GeekwadGlobals: public Globals { -public: - ASoundExt _sound1; -}; - -} // End of namespace Geekwad - } // End of namespace TsAGE #endif diff --git a/engines/tsage/module.mk b/engines/tsage/module.mk index 60f1823da7..0ea8916647 100644 --- a/engines/tsage/module.mk +++ b/engines/tsage/module.mk @@ -20,8 +20,6 @@ MODULE_OBJS := \ detection.o \ dialogs.o \ events.o \ - geekwad/geekwad_logic.o \ - geekwad/geekwad_scenes0.o \ globals.o \ graphics.o \ resources.o \ diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp index 7dbfdd1f62..f2775e083d 100644 --- a/engines/tsage/tsage.cpp +++ b/engines/tsage/tsage.cpp @@ -100,12 +100,6 @@ void TSageEngine::initialize() { // Reset all global variables R2_GLOBALS.reset(); - } else if (g_vm->getGameID() == GType_Geekwad) { - g_resourceManager->addLib("GEEKWAD.RLB"); - g_globals = new Geekwad::GeekwadGlobals(); - - // Reset all global variables - GW_GLOBALS.reset(); } g_globals->gfxManager().setDefaults(); diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h index e57823ecbc..eb36cf0790 100644 --- a/engines/tsage/tsage.h +++ b/engines/tsage/tsage.h @@ -41,8 +41,7 @@ namespace TsAGE { enum { GType_Ringworld = 0, GType_BlueForce = 1, - GType_Ringworld2 = 2, - GType_Geekwad = 3 + GType_Ringworld2 = 2 }; enum { -- cgit v1.2.3