diff options
author | uruk | 2013-07-24 18:25:07 +0200 |
---|---|---|
committer | uruk | 2013-07-24 18:25:07 +0200 |
commit | 10ec7e0e0f2d4cc246db0c3792c5af05e413976b (patch) | |
tree | 13516a3765905781cd17a1bb5c4c747436b9370a /engines/avalanche/gyro2.cpp | |
parent | f035622b14966e3af0a1fe53b63619ee29591e3a (diff) | |
download | scummvm-rg350-10ec7e0e0f2d4cc246db0c3792c5af05e413976b.tar.gz scummvm-rg350-10ec7e0e0f2d4cc246db0c3792c5af05e413976b.tar.bz2 scummvm-rg350-10ec7e0e0f2d4cc246db0c3792c5af05e413976b.zip |
AVALANCHE: Change _gyro into pointer, update everything accordingly.
Diffstat (limited to 'engines/avalanche/gyro2.cpp')
-rw-r--r-- | engines/avalanche/gyro2.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp index aba169c6b8..dd1157b628 100644 --- a/engines/avalanche/gyro2.cpp +++ b/engines/avalanche/gyro2.cpp @@ -246,7 +246,9 @@ const char Gyro::betterchar[] = "WMBParCLguKeSnIohn"; -Gyro::Gyro() : interrogation(0), oncandopageswap(true) { +Gyro::Gyro(AvalancheEngine *vm) : interrogation(0), oncandopageswap(true) { + _vm = vm; + /* Needed becouse of Lucerna::load_also() */ for (int fv = 0; fv < 31; fv++) for (int ff = 0; ff < 2; ff++) @@ -265,10 +267,6 @@ Gyro::~Gyro() { } -void Gyro::setParent(AvalancheEngine *vm) { - _vm = vm; -} - void Gyro::newpointer(byte m) { if (m == cmp) return; cmp = m; @@ -359,7 +357,7 @@ void Gyro::newgame() { /* This sets up the DNA for a completely new game. */ alive = true; score = 0; /*for gd:=0 to 5 do which[gd]:=1;*/ - memset(&_vm->_gyro.dna, 0, sizeof(dnatype)); + memset(&_vm->_gyro->dna, 0, sizeof(dnatype)); _vm->_scrolls.natural(); _vm->_basher.normal_edit(); _vm->_lucerna.mousepage(0); |