From 7f5f9c9f91eb8cd52ebcffe208d0e778f8ff6448 Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Sat, 3 Sep 2011 17:24:34 +0200 Subject: GOB: Stub classes for Geisha's Diving and Penetration minigames --- engines/gob/inter.h | 11 +- engines/gob/inter_geisha.cpp | 42 ++++---- engines/gob/minigames/geisha/diving.cpp | 155 +++++++++++++++++++++++++++ engines/gob/minigames/geisha/diving.h | 68 ++++++++++++ engines/gob/minigames/geisha/penetration.cpp | 106 ++++++++++++++++++ engines/gob/minigames/geisha/penetration.h | 61 +++++++++++ engines/gob/module.mk | 2 + 7 files changed, 426 insertions(+), 19 deletions(-) create mode 100644 engines/gob/minigames/geisha/diving.cpp create mode 100644 engines/gob/minigames/geisha/diving.h create mode 100644 engines/gob/minigames/geisha/penetration.cpp create mode 100644 engines/gob/minigames/geisha/penetration.h (limited to 'engines/gob') diff --git a/engines/gob/inter.h b/engines/gob/inter.h index d1c28fcb2f..6fd4dc2187 100644 --- a/engines/gob/inter.h +++ b/engines/gob/inter.h @@ -33,6 +33,11 @@ namespace Gob { +namespace Geisha { + class Diving; + class Penetration; +} + // This is to help devices with small memory (PDA, smartphones, ...) // to save a bit of memory used by opcode names in the Gob engine. #ifndef REDUCE_MEMORY_USAGE @@ -337,7 +342,7 @@ protected: class Inter_Geisha : public Inter_v1 { public: Inter_Geisha(GobEngine *vm); - virtual ~Inter_Geisha() {} + virtual ~Inter_Geisha(); protected: virtual void setupOpcodesDraw(); @@ -362,6 +367,10 @@ protected: void oGeisha_caress2(OpGobParams ¶ms); int16 loadSound(int16 slot); + +private: + Geisha::Diving *_diving; + Geisha::Penetration *_penetration; }; class Inter_v2 : public Inter_v1 { diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp index d72dd798a4..c5b91a484b 100644 --- a/engines/gob/inter_geisha.cpp +++ b/engines/gob/inter_geisha.cpp @@ -38,6 +38,9 @@ #include "gob/sound/sound.h" #include "gob/sound/sounddesc.h" +#include "gob/minigames/geisha/diving.h" +#include "gob/minigames/geisha/penetration.h" + namespace Gob { #define OPCODEVER Inter_Geisha @@ -45,7 +48,16 @@ namespace Gob { #define OPCODEFUNC(i, x) _opcodesFunc[i]._OPCODEFUNC(OPCODEVER, x) #define OPCODEGOB(i, x) _opcodesGob[i]._OPCODEGOB(OPCODEVER, x) -Inter_Geisha::Inter_Geisha(GobEngine *vm) : Inter_v1(vm) { +Inter_Geisha::Inter_Geisha(GobEngine *vm) : Inter_v1(vm), + _diving(0), _penetration(0) { + + _diving = new Geisha::Diving(vm); + _penetration = new Geisha::Penetration(vm); +} + +Inter_Geisha::~Inter_Geisha() { + delete _penetration; + delete _diving; } void Inter_Geisha::setupOpcodesDraw() { @@ -251,30 +263,24 @@ void Inter_Geisha::oGeisha_writeData(OpFuncParams ¶ms) { } void Inter_Geisha::oGeisha_gamePenetration(OpGobParams ¶ms) { - uint16 var1 = _vm->_game->_script->readUint16(); - uint16 var2 = _vm->_game->_script->readUint16(); - uint16 var3 = _vm->_game->_script->readUint16(); - uint16 var4 = _vm->_game->_script->readUint16(); - - WRITE_VAR_UINT32(var4, 0); + uint16 var1 = _vm->_game->_script->readUint16(); + uint16 var2 = _vm->_game->_script->readUint16(); + uint16 var3 = _vm->_game->_script->readUint16(); + uint16 resultVar = _vm->_game->_script->readUint16(); - warning("Geisha Stub: Minigame \"Penetration\": %d, %d, %d, %d", var1, var2, var3, var4); + bool result = _penetration->play(var1, var2, var3); - // Fudge a win for now - WRITE_VAR_UINT32(var4, 1); + WRITE_VAR_UINT32(resultVar, result ? 1 : 0); } void Inter_Geisha::oGeisha_gameDiving(OpGobParams ¶ms) { - uint16 var1 = _vm->_game->_script->readUint16(); - uint16 var2 = _vm->_game->_script->readUint16(); - uint16 var3 = _vm->_game->_script->readUint16(); - - WRITE_VAR_UINT32(var3, 1); + uint16 playerCount = _vm->_game->_script->readUint16(); + uint16 hasPearlLocation = _vm->_game->_script->readUint16(); + uint16 resultVar = _vm->_game->_script->readUint16(); - warning("Geisha Stub: Minigame \"Diving\": %d, %d, %d", var1, var2, var3); + bool result = _diving->play(playerCount, hasPearlLocation); - // Fudge a win for now - WRITE_VAR_UINT32(var3, 0); + WRITE_VAR_UINT32(resultVar, result ? 1 : 0); } void Inter_Geisha::oGeisha_loadTitleMusic(OpGobParams ¶ms) { diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp new file mode 100644 index 0000000000..0d216abf43 --- /dev/null +++ b/engines/gob/minigames/geisha/diving.cpp @@ -0,0 +1,155 @@ +/* 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/list.h" + +#include "gob/global.h" +#include "gob/util.h" +#include "gob/draw.h" +#include "gob/video.h" +#include "gob/decfile.h" +#include "gob/anifile.h" + +#include "gob/minigames/geisha/evilfish.h" +#include "gob/minigames/geisha/diving.h" + +namespace Gob { + +namespace Geisha { + +Diving::Diving(GobEngine *vm) : _vm(vm), _background(0), + _objects(0), _gui(0), _oko(0), _lungs(0), _heart(0) { + +} + +Diving::~Diving() { + deinit(); +} + +bool Diving::play(uint16 playerCount, bool hasPearlLocation) { + init(); + initScreen(); + + _vm->_draw->blitInvalidated(); + _vm->_video->retrace(); + + EvilFish shark(*_objects, 320, 0, 14, 8, 9, 3); + + Common::List objects; + + objects.push_back(_water); + objects.push_back(&shark); + + shark.enter(EvilFish::kDirectionLeft, 90); + + while (!_vm->_util->keyPressed() && !_vm->shouldQuit()) { + int16 left, top, right, bottom; + + // Clear the previous animation frames + for (Common::List::iterator o = objects.reverse_begin(); + o != objects.end(); --o) { + + (*o)->clear(*_vm->_draw->_backSurface, left, top, right, bottom); + _vm->_draw->dirtiedRect(_vm->_draw->_backSurface, left, top, right, bottom); + } + + // Draw the current animation frames + for (Common::List::iterator o = objects.begin(); + o != objects.end(); ++o) { + + (*o)->draw(*_vm->_draw->_backSurface, left, top, right, bottom); + _vm->_draw->dirtiedRect(_vm->_draw->_backSurface, left, top, right, bottom); + + (*o)->advance(); + } + + _vm->_draw->blitInvalidated(); + + _vm->_util->waitEndFrame(); + _vm->_util->processInput(); + } + + deinit(); + return true; +} + +void Diving::init() { + _background = new DECFile(_vm, "tperle.dec" , 320, 200); + _objects = new ANIFile(_vm, "tperle.ani" , 320); + _gui = new ANIFile(_vm, "tperlcpt.ani", 320); + _oko = new ANIFile(_vm, "tplonge.ani" , 320); + + _water = new ANIObject(*_objects); + _lungs = new ANIObject(*_gui); + _heart = new ANIObject(*_gui); + + _water->setAnimation(7); + _water->setPosition(); + _water->setVisible(true); + + _lungs->setAnimation(0); + _lungs->setPosition(); + _lungs->setVisible(true); + + _heart->setAnimation(1); + _heart->setPosition(); + _heart->setVisible(true); +} + +void Diving::deinit() { + delete _heart; + delete _lungs; + delete _water; + + delete _oko; + delete _gui; + delete _objects; + delete _background; + + _water = 0; + _heart = 0; + _lungs = 0; + + _oko = 0; + _gui = 0; + _objects = 0; + _background = 0; +} + +void Diving::initScreen() { + _vm->_util->setFrameRate(15); + + _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc); + + _vm->_draw->_backSurface->clear(); + _background->draw(*_vm->_draw->_backSurface); + + int16 left, top, right, bottom; + _lungs->draw(*_vm->_draw->_backSurface, left, top, right, bottom); + _heart->draw(*_vm->_draw->_backSurface, left, top, right, bottom); + + _vm->_draw->dirtiedRect(_vm->_draw->_backSurface, 0, 0, 319, 199); +} + +} // End of namespace Geisha + +} // End of namespace Gob diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h new file mode 100644 index 0000000000..238a1ad75b --- /dev/null +++ b/engines/gob/minigames/geisha/diving.h @@ -0,0 +1,68 @@ +/* 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 GOB_MINIGAMES_GEISHA_DIVING_H +#define GOB_MINIGAMES_GEISHA_DIVING_H + +#include "common/system.h" + +namespace Gob { + +class GobEngine; +class DECFile; +class ANIFile; +class ANIObject; + +namespace Geisha { + +/** Geisha's "Diving" minigame. */ +class Diving { +public: + Diving(GobEngine *vm); + ~Diving(); + + bool play(uint16 playerCount, bool hasPearlLocation); + +private: + GobEngine *_vm; + + DECFile *_background; + ANIFile *_objects; + ANIFile *_gui; + ANIFile *_oko; + + ANIObject *_water; + ANIObject *_lungs; + ANIObject *_heart; + + + void init(); + void deinit(); + + void initScreen(); +}; + +} // End of namespace Geisha + +} // End of namespace Gob + +#endif // GOB_MINIGAMES_GEISHA_DIVING_H diff --git a/engines/gob/minigames/geisha/penetration.cpp b/engines/gob/minigames/geisha/penetration.cpp new file mode 100644 index 0000000000..4334cae21a --- /dev/null +++ b/engines/gob/minigames/geisha/penetration.cpp @@ -0,0 +1,106 @@ +/* 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 "gob/global.h" +#include "gob/util.h" +#include "gob/draw.h" +#include "gob/video.h" +#include "gob/decfile.h" +#include "gob/anifile.h" + +#include "gob/minigames/geisha/penetration.h" + +namespace Gob { + +namespace Geisha { + +static byte kPalette[48] = { + 0x16, 0x16, 0x16, + 0x12, 0x14, 0x16, + 0x34, 0x00, 0x25, + 0x1D, 0x1F, 0x22, + 0x24, 0x27, 0x2A, + 0x2C, 0x0D, 0x22, + 0x2B, 0x2E, 0x32, + 0x12, 0x09, 0x20, + 0x3D, 0x3F, 0x00, + 0x3F, 0x3F, 0x3F, + 0x00, 0x00, 0x00, + 0x15, 0x15, 0x3F, + 0x25, 0x22, 0x2F, + 0x1A, 0x14, 0x28, + 0x3F, 0x00, 0x00, + 0x15, 0x3F, 0x15 +}; + +Penetration::Penetration(GobEngine *vm) : _vm(vm), _background(0), _objects(0) { + _background = new Surface(320, 200, 1); +} + +Penetration::~Penetration() { + deinit(); + + delete _background; +} + +bool Penetration::play(uint16 var1, uint16 var2, uint16 var3) { + init(); + initScreen(); + + _vm->_draw->blitInvalidated(); + _vm->_video->retrace(); + while (!_vm->_util->keyPressed() && !_vm->shouldQuit()) + _vm->_util->longDelay(1); + + deinit(); + return true; +} + +void Penetration::init() { + _background->clear(); + + _vm->_video->drawPackedSprite("hyprmef2.cmp", *_background); + + _objects = new ANIFile(_vm, "tcite.ani", 320); +} + +void Penetration::deinit() { + delete _objects; + + _objects = 0; +} + +void Penetration::initScreen() { + _vm->_util->setFrameRate(15); + + memcpy(_vm->_draw->_vgaPalette , kPalette, 48); + memcpy(_vm->_draw->_vgaSmallPalette, kPalette, 48); + + _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc); + + _vm->_draw->_backSurface->blit(*_background); + _vm->_draw->dirtiedRect(_vm->_draw->_backSurface, 0, 0, 319, 199); +} + +} // End of namespace Geisha + +} // End of namespace Gob diff --git a/engines/gob/minigames/geisha/penetration.h b/engines/gob/minigames/geisha/penetration.h new file mode 100644 index 0000000000..c346a7bf5a --- /dev/null +++ b/engines/gob/minigames/geisha/penetration.h @@ -0,0 +1,61 @@ +/* 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 GOB_MINIGAMES_GEISHA_PENETRATION_H +#define GOB_MINIGAMES_GEISHA_PENETRATION_H + +#include "common/system.h" + +namespace Gob { + +class GobEngine; +class Surface; +class ANIFile; + +namespace Geisha { + +/** Geisha's "Penetration" minigame. */ +class Penetration { +public: + Penetration(GobEngine *vm); + ~Penetration(); + + bool play(uint16 var1, uint16 var2, uint16 var3); + +private: + GobEngine *_vm; + + Surface *_background; + ANIFile *_objects; + + + void init(); + void deinit(); + + void initScreen(); +}; + +} // End of namespace Geisha + +} // End of namespace Gob + +#endif // GOB_MINIGAMES_GEISHA_PENETRATION_H diff --git a/engines/gob/module.mk b/engines/gob/module.mk index 0ea4f2617d..bf040c5428 100644 --- a/engines/gob/module.mk +++ b/engines/gob/module.mk @@ -74,6 +74,8 @@ MODULE_OBJS := \ demos/scnplayer.o \ demos/batplayer.o \ minigames/geisha/evilfish.o \ + minigames/geisha/diving.o \ + minigames/geisha/penetration.o \ save/savefile.o \ save/savehandler.o \ save/saveload.o \ -- cgit v1.2.3