aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur
diff options
context:
space:
mode:
authorPaul Gilbert2013-12-04 22:25:34 -0500
committerPaul Gilbert2013-12-04 22:25:34 -0500
commit958654fe94af389cced91c3e3955efbbb7288dab (patch)
tree2c976f06bdc9fb28d732ceaee79c824b669045e0 /engines/voyeur
parent39a86aed6a7add9aaf90095af757a2876e93374a (diff)
downloadscummvm-rg350-958654fe94af389cced91c3e3955efbbb7288dab.tar.gz
scummvm-rg350-958654fe94af389cced91c3e3955efbbb7288dab.tar.bz2
scummvm-rg350-958654fe94af389cced91c3e3955efbbb7288dab.zip
VOYEUR: Added staticres.cpp file
Diffstat (limited to 'engines/voyeur')
-rw-r--r--engines/voyeur/game.cpp5
-rw-r--r--engines/voyeur/game.h2
-rw-r--r--engines/voyeur/module.mk1
-rw-r--r--engines/voyeur/staticres.cpp36
-rw-r--r--engines/voyeur/staticres.h34
-rw-r--r--engines/voyeur/voyeur.cpp17
6 files changed, 92 insertions, 3 deletions
diff --git a/engines/voyeur/game.cpp b/engines/voyeur/game.cpp
index a653a842ae..85ea5df50a 100644
--- a/engines/voyeur/game.cpp
+++ b/engines/voyeur/game.cpp
@@ -51,6 +51,7 @@ void IntData::audioInit() {
/*------------------------------------------------------------------------*/
Game::Game() {
+ _iForceDeath = -1;
}
void Game::doTransitionCard(const Common::String &time, const Common::String &location) {
@@ -98,4 +99,8 @@ void Game::addVideoEventStart() {
}
+void Game::playStamp() {
+
+}
+
} // End of namespace Voyeur
diff --git a/engines/voyeur/game.h b/engines/voyeur/game.h
index eb7d5f5e59..cb7f62db57 100644
--- a/engines/voyeur/game.h
+++ b/engines/voyeur/game.h
@@ -129,12 +129,14 @@ public:
int _v2A0A6;
int _v2A0A4;
int _v2A09A;
+ int _iForceDeath;
public:
Game();
void setVm(VoyeurEngine *vm) { _vm = vm; }
void doTransitionCard(const Common::String &time, const Common::String &location);
void addVideoEventStart();
+ void playStamp();
};
} // End of namespace Voyeur
diff --git a/engines/voyeur/module.mk b/engines/voyeur/module.mk
index 645b62ff49..40efce40ee 100644
--- a/engines/voyeur/module.mk
+++ b/engines/voyeur/module.mk
@@ -9,6 +9,7 @@ MODULE_OBJS := \
files.o \
graphics.o \
sound.o \
+ staticres.o \
utils.o \
voyeur.o
diff --git a/engines/voyeur/staticres.cpp b/engines/voyeur/staticres.cpp
new file mode 100644
index 0000000000..23fa3602eb
--- /dev/null
+++ b/engines/voyeur/staticres.cpp
@@ -0,0 +1,36 @@
+/* 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 "voyeur/staticres.h"
+
+namespace Voyeur {
+
+const int COMPUTER_DEFAULTS[] = {
+ 18, 1, 0, 1, 33, 0, 998, -1, 18, 2, 0, 1, 41, 0,
+ 998, -1, 18, 3, 0, 1, 47, 0, 998, -1, 18, 4, 0,
+ 1, 53, 0, 998, -1, 18, 5, 0, 1, 46, 0, 998, -1,
+ 18, 6, 0, 1, 50, 0, 998, -1, 18, 7, 0, 1, 40, 0,
+ 998, -1, 18, 8, 0, 1, 43, 0, 998, -1, 19, 1, 0,
+ 2, 28, 0, 998, -1
+};
+
+} // End of namespace Voyeur
diff --git a/engines/voyeur/staticres.h b/engines/voyeur/staticres.h
new file mode 100644
index 0000000000..cd92ae467a
--- /dev/null
+++ b/engines/voyeur/staticres.h
@@ -0,0 +1,34 @@
+/* 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 VOYEUR_STATICRES_H
+#define VOYEUR_STATICRES_H
+
+#include "common/scummsys.h"
+
+namespace Voyeur {
+
+extern const int COMPUTER_DEFAULTS[];
+
+} // End of namespace Voyeur
+
+#endif
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 4c1d47d9fb..4df5ebef28 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -23,6 +23,7 @@
#include "voyeur/voyeur.h"
#include "voyeur/animation.h"
#include "voyeur/graphics.h"
+#include "voyeur/staticres.h"
#include "voyeur/utils.h"
#include "common/scummsys.h"
#include "common/config-manager.h"
@@ -84,7 +85,12 @@ Common::Error VoyeurEngine::run() {
globalInitBolt();
_eventsManager.resetMouse();
- doHeadTitle();
+ if (doHeadTitle()) {
+ if (_game._iForceDeath >= 1 && _game._iForceDeath <= 4)
+ _voy._eCursorOff[58] |= 0x80;
+
+ _game.playStamp();
+ }
//doHeadTitle();
@@ -176,11 +182,16 @@ bool VoyeurEngine::doHeadTitle() {
}
if (_voy._eCursorOff[58] & 0x80) {
+ // TODO: Check when these are called, and the two different loops.
+ // Also, comptuerNu isn't an array in IDB?
+ /*
if (_voy._evidence[19] == 0) {
- // TODO
+ Common::copy(&COMPUTER_DEFAULTS[0], &COMPUTER_DEFAULTS[9 * 8], &_voy._computerNum[0]);
+ _voy._evidence[19] = 9;
} else {
- // TODO
+ error("_computerNum loaded with uninitialized list here");
}
+ */
}
_voy._eCursorOff[55] = 140;