aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus
diff options
context:
space:
mode:
authorEugene Sandulenko2017-07-10 21:17:41 +0200
committerEugene Sandulenko2017-07-10 21:17:41 +0200
commit940b2a20f1cd490afb6e541a3cd26f0d3bdd1687 (patch)
treeed080d2edfcc191e2edd4ad61cb8e778e660d422 /engines/pegasus
parentc61c0cb0ff6edb53d2ff32efa559e76dd4d086ec (diff)
downloadscummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.tar.gz
scummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.tar.bz2
scummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.zip
Revert "COMMON: Change way the Singleton instances are instantiated"
This reverts commit eefa72afa1978a9dea10f5b1833fcc8f58a3468e. With this patch ConfigManager is broken.
Diffstat (limited to 'engines/pegasus')
-rw-r--r--engines/pegasus/gamestate.cpp4
-rw-r--r--engines/pegasus/input.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/engines/pegasus/gamestate.cpp b/engines/pegasus/gamestate.cpp
index 877aeffa1b..dfb4f1cd5b 100644
--- a/engines/pegasus/gamestate.cpp
+++ b/engines/pegasus/gamestate.cpp
@@ -30,6 +30,10 @@
#include "pegasus/gamestate.h"
#include "pegasus/scoring.h"
+namespace Common {
+DECLARE_SINGLETON(Pegasus::GameStateManager);
+}
+
namespace Pegasus {
Common::Error GameStateManager::writeGameState(Common::WriteStream *stream) {
diff --git a/engines/pegasus/input.cpp b/engines/pegasus/input.cpp
index 0a29a43008..f4834037d9 100644
--- a/engines/pegasus/input.cpp
+++ b/engines/pegasus/input.cpp
@@ -30,6 +30,10 @@
#include "pegasus/input.h"
#include "pegasus/pegasus.h"
+namespace Common {
+DECLARE_SINGLETON(Pegasus::InputDeviceManager);
+}
+
namespace Pegasus {
InputDeviceManager::InputDeviceManager() {