aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins/globals.cpp
diff options
context:
space:
mode:
authorStrangerke2013-03-20 07:27:42 +0100
committerStrangerke2013-03-20 07:27:42 +0100
commit852e65bd02bc1278386d79ca68f81e3d15e9fa43 (patch)
treee2588a3503ce1d3cadb690fefe8cfdefe30f85d9 /engines/hopkins/globals.cpp
parentd9b596ad183e4784e9692ac439683dbf5f904dc2 (diff)
downloadscummvm-rg350-852e65bd02bc1278386d79ca68f81e3d15e9fa43.tar.gz
scummvm-rg350-852e65bd02bc1278386d79ca68f81e3d15e9fa43.tar.bz2
scummvm-rg350-852e65bd02bc1278386d79ca68f81e3d15e9fa43.zip
HOPKINS: Remove setParent() from Globals
Diffstat (limited to 'engines/hopkins/globals.cpp')
-rw-r--r--engines/hopkins/globals.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 6c10807d8e..fb0dbf36c4 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -62,7 +62,9 @@ const int HOPKINS_PERSO_2[] = {
0, 2, 0, 2, 0, 2, 0, 1, 0, 2, 0, 2
};
-Globals::Globals() {
+Globals::Globals(HopkinsEngine *vm) {
+ _vm = vm;
+
// Set up the special g_PTRNUL variable
g_PTRNUL = (byte *)malloc(16);
strcpy((char *)g_PTRNUL, "POINTERNULL");
@@ -187,10 +189,6 @@ Globals::~Globals() {
free(g_PTRNUL);
}
-void Globals::setParent(HopkinsEngine *vm) {
- _vm = vm;
-}
-
void Globals::setConfig() {
// CHECKME: Should be in Globals() but it doesn't work
// The Polish version is a translation of the English version. The filenames are the same.