[Scummvm-git-logs] scummvm master -> 084b2071a209b3ee07055b75125add7666be514e
sev-
sev at scummvm.org
Tue Mar 27 18:47:44 CEST 2018
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a8efe852a8 BLADERUNNER: Added skeleton for EndCredits
084b2071a2 BLADERUNNER: Initialize Scores variable
Commit: a8efe852a81711c72b23d2f8da56eaec88abc45c
https://github.com/scummvm/scummvm/commit/a8efe852a81711c72b23d2f8da56eaec88abc45c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-27T18:43:27+02:00
Commit Message:
BLADERUNNER: Added skeleton for EndCredits
Changed paths:
A engines/bladerunner/ui/end_credits.cpp
A engines/bladerunner/ui/end_credits.h
engines/bladerunner/bladerunner.cpp
engines/bladerunner/bladerunner.h
engines/bladerunner/module.mk
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index e34d2d6..145fdce 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -64,6 +64,7 @@
#include "bladerunner/text_resource.h"
#include "bladerunner/time.h"
#include "bladerunner/ui/elevator.h"
+#include "bladerunner/ui/end_credits.h"
#include "bladerunner/ui/esper.h"
#include "bladerunner/ui/kia.h"
#include "bladerunner/ui/scores.h"
@@ -170,6 +171,7 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst, const ADGameDescription *des
_dialogueMenu = nullptr;
_suspectsDatabase = nullptr;
_kia = nullptr;
+ _endCredits = nullptr;
_spinner = nullptr;
_elevator = nullptr;
_mainFont = nullptr;
@@ -217,6 +219,13 @@ Common::Error BladeRunnerEngine::run() {
/* TODO: Check for save games and enter KIA */
gameLoop();
+
+ _mouse->disable();
+
+ if (_gameOver) {
+ // autoSaveGame(4, 1); // TODO
+ _endCredits->show();
+ }
}
shutdown();
@@ -229,8 +238,7 @@ bool BladeRunnerEngine::startup(bool hasSavegames) {
_screenEffects = new ScreenEffects(this, 0x8000);
-
- // TODO: end credits
+ _endCredits = new EndCredits(this);
_actorDialogueQueue = new ActorDialogueQueue(this);
@@ -600,6 +608,9 @@ void BladeRunnerEngine::shutdown() {
delete _scores;
_scores = nullptr;
+ delete _endCredits;
+ _endCredits = nullptr;
+
delete _elevator;
_elevator = nullptr;
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index 4dad66e..5561890 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -63,6 +63,7 @@ class Combat;
class Debugger;
class DialogueMenu;
class Elevator;
+class EndCredits;
class ESPER;
class Font;
class GameFlags;
@@ -122,6 +123,7 @@ public:
Combat *_combat;
DialogueMenu *_dialogueMenu;
Elevator *_elevator;
+ EndCredits *_endCredits;
ESPER *_esper;
GameFlags *_gameFlags;
GameInfo *_gameInfo;
diff --git a/engines/bladerunner/module.mk b/engines/bladerunner/module.mk
index 672e652..b0bae4f 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -248,6 +248,7 @@ MODULE_OBJS = \
text_resource.o \
time.o \
ui/elevator.o \
+ ui/end_credits.o \
ui/esper.o \
ui/kia.o \
ui/kia_log.o \
diff --git a/engines/bladerunner/ui/end_credits.cpp b/engines/bladerunner/ui/end_credits.cpp
new file mode 100644
index 0000000..0051fad
--- /dev/null
+++ b/engines/bladerunner/ui/end_credits.cpp
@@ -0,0 +1,37 @@
+/* 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 "bladerunner/ui/end_credits.h"
+
+namespace BladeRunner {
+
+EndCredits::EndCredits(BladeRunnerEngine *vm) {
+ _vm = vm;
+}
+
+EndCredits::~EndCredits() {
+}
+
+void EndCredits::show() {
+}
+
+} // End of namespace BladeRunner
diff --git a/engines/bladerunner/ui/end_credits.h b/engines/bladerunner/ui/end_credits.h
new file mode 100644
index 0000000..39086cd
--- /dev/null
+++ b/engines/bladerunner/ui/end_credits.h
@@ -0,0 +1,42 @@
+/* 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 BLADERUNNER_UI_END_CREDITS_H
+#define BLADERUNNER_UI_END_CREDITS_H
+
+namespace BladeRunner {
+
+class BladeRunnerEngine;
+
+class EndCredits {
+ BladeRunnerEngine *_vm;
+
+public:
+ EndCredits(BladeRunnerEngine *vm);
+ ~EndCredits();
+
+ void show();
+};
+
+} // End of namespace BladeRunner
+
+#endif
Commit: 084b2071a209b3ee07055b75125add7666be514e
https://github.com/scummvm/scummvm/commit/084b2071a209b3ee07055b75125add7666be514e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-27T18:47:22+02:00
Commit Message:
BLADERUNNER: Initialize Scores variable
Changed paths:
engines/bladerunner/bladerunner.cpp
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 145fdce..1a3c114 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -173,6 +173,7 @@ BladeRunnerEngine::BladeRunnerEngine(OSystem *syst, const ADGameDescription *des
_kia = nullptr;
_endCredits = nullptr;
_spinner = nullptr;
+ _scores = nullptr;
_elevator = nullptr;
_mainFont = nullptr;
_esper = nullptr;
More information about the Scummvm-git-logs
mailing list