[Scummvm-cvs-logs] scummvm master -> 87338af76bae49b439e0a5891a48b44f7f8f71b9
urukgit
urukgit at users.noreply.github.com
Thu Jan 30 12:19:52 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
87338af76b AVALANCHE: Add Ghostroom's skeleton.
Commit: 87338af76bae49b439e0a5891a48b44f7f8f71b9
https://github.com/scummvm/scummvm/commit/87338af76bae49b439e0a5891a48b44f7f8f71b9
Author: uruk (koppirnyo at gmail.com)
Date: 2014-01-30T03:19:23-08:00
Commit Message:
AVALANCHE: Add Ghostroom's skeleton.
Changed paths:
A engines/avalanche/ghostroom.cpp
A engines/avalanche/ghostroom.h
engines/avalanche/animation.cpp
engines/avalanche/avalanche.cpp
engines/avalanche/avalanche.h
engines/avalanche/module.mk
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 639abe9..375d393 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -818,7 +818,7 @@ void Animation::callSpecial(uint16 which) {
_vm->fadeOut();
_sprites[0]->turn(kDirRight); // you'll see this after we get back from bootstrap
_vm->_timer->addTimer(1, Timer::kProcGhostRoomPhew, Timer::kReasonGhostRoomPhew);
- //_vm->_enid->backToBootstrap(3); TODO: Replace it with proper ScummVM-friendly function(s)! Do not remove until then!
+ _vm->_ghostroom->run();
break;
case 5:
if (_vm->_friarWillTieYouUp) {
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index a7e7be0..902f057 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -56,6 +56,7 @@ AvalancheEngine::AvalancheEngine(OSystem *syst, const AvalancheGameDescription *
_closing = nullptr;
_sound = nullptr;
_nim = nullptr;
+ _ghostroom = nullptr;
_platform = gd->desc.platform;
initVariables();
@@ -79,6 +80,7 @@ AvalancheEngine::~AvalancheEngine() {
delete _closing;
delete _sound;
delete _nim;
+ delete _ghostroom;
for (int i = 0; i < 31; i++) {
for (int j = 0; j < 2; j++) {
@@ -162,6 +164,7 @@ Common::ErrorCode AvalancheEngine::initialize() {
_closing = new Closing(this);
_sound = new SoundHandler(this);
_nim = new Nim(this);
+ _ghostroom = new GhostRoom(this);
_graphics->init();
_dialogs->init();
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index fe13fa8..0e19d7c 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -43,6 +43,7 @@
#include "avalanche/sound.h"
#include "avalanche/nim.h"
#include "avalanche/clock.h"
+#include "avalanche/ghostroom.h"
#include "common/serializer.h"
@@ -87,6 +88,7 @@ public:
Closing *_closing;
SoundHandler *_sound;
Nim *_nim;
+ GhostRoom *_ghostroom;
OSystem *_system;
diff --git a/engines/avalanche/ghostroom.cpp b/engines/avalanche/ghostroom.cpp
new file mode 100644
index 0000000..ae37118
--- /dev/null
+++ b/engines/avalanche/ghostroom.cpp
@@ -0,0 +1,75 @@
+/* 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.
+*/
+
+#include "avalanche/avalanche.h"
+#include "avalanche/ghostroom.h"
+
+namespace Avalanche {
+
+const int8 GhostRoom::kAdjustment[5] = { 7, 0, 7, 7, 7 };
+
+const byte GhostRoom::kPlaneToUse[4] = { 2, 2, 2, 3 };
+
+const byte GhostRoom::kWaveOrder[5] = { 5, 1, 2, 3, 4 };
+
+const byte GhostRoom::kGlerkFade[26] = { 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 3, 3, 3, 2, 2, 1 };
+
+const byte GhostRoom::kGreldetFade[18] = { 1, 2, 3, 4, 5, 6, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1 };
+
+GhostRoom::GhostRoom(AvalancheEngine *vm) {
+ _vm = vm;
+}
+
+void GhostRoom::plainGrab() {
+ warning("STUB: plainGrab()");
+}
+
+void GhostRoom::getMe(void *p) {
+ warning("STUB: getMe()");
+}
+
+void GhostRoom::getMeAargh(byte which) {
+ warning("STUB: getMeAargh()");
+}
+
+void GhostRoom::wait(uint16 howLong) {
+ warning("STUB: wait()");
+}
+
+void GhostRoom::doBat() {
+ warning("STUB: doBat()");
+}
+
+void GhostRoom::bigGreenEyes(byte how) {
+ warning("STUB: bigGreenEyes()");
+}
+
+void GhostRoom::run() {
+ warning("STUB: run()");
+}
+
+} // End of namespace Avalanche
diff --git a/engines/avalanche/ghostroom.h b/engines/avalanche/ghostroom.h
new file mode 100644
index 0000000..e6dbfe4
--- /dev/null
+++ b/engines/avalanche/ghostroom.h
@@ -0,0 +1,95 @@
+/* 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.
+*/
+
+#ifndef AVALANCHE_GHOSTROOM_H
+#define AVALANCHE_GHOSTROOM_H
+
+#include "common/scummsys.h"
+
+namespace Avalanche {
+class AvalancheEngine;
+
+class GhostRoom {
+public:
+ GhostRoom(AvalancheEngine *vm);
+
+ void run();
+
+private:
+ AvalancheEngine *_vm;
+
+ static const int8 kAdjustment[5];
+ static const byte kPlaneToUse[4];
+ static const byte kWaveOrder[5];
+ static const byte kGlerkFade[26];
+ static const byte kGreldetFade[18];
+
+ enum FlavourType { ch_EGA, ch_BGI, ch_Natural, ch_Two, ch_One };
+
+ struct ChunkBlockType {
+ FlavourType _flavour;
+ int8 _x, _y;
+ int8 _xl, _yl;
+ int32 _size;
+ };
+
+ typedef byte GlerkType[6][4][35][9];
+
+ Common::File _f;
+ ChunkBlockType _cb;
+ byte _ghost[5][2][66][26];
+ void *_memLevel;
+ byte _y, _yy, _bit, _xofs;
+ void *_eyes[2];
+ void *_exclamation;
+ void *_aargh[6];
+ void *_bat[3];
+ GlerkType *_glerk;
+ void *_greenEyes[5];
+ void *_greldet[6][2];
+ Common::Point _aarghWhere[6];
+ int16 _gd, _gm;
+ bool _gb;
+ byte _glerkStage;
+ int16 _batX, _batY;
+ uint16 _batCount;
+ int8 _aarghCount;
+ int16 _greldetX, _greldetY;
+ byte _greldetCount;
+ bool _redGreldet;
+
+ void plainGrab();
+ void getMe(void *p);
+ void getMeAargh(byte which);
+ void wait(uint16 howLong);
+ void doBat();
+ void bigGreenEyes(byte how);
+};
+
+} // End of namespace Avalanche
+
+#endif // AVALANCHE_GHOSTROOM_H
diff --git a/engines/avalanche/module.mk b/engines/avalanche/module.mk
index 39ca94e..6cc5b66 100644
--- a/engines/avalanche/module.mk
+++ b/engines/avalanche/module.mk
@@ -17,7 +17,8 @@ MODULE_OBJS = \
sound.o \
timer.o \
nim.o \
- clock.o
+ clock.o \
+ ghostroom.o
# This module can be built as a plugin
ifeq ($(ENABLE_AVALANCHE), DYNAMIC_PLUGIN)
More information about the Scummvm-git-logs
mailing list