diff options
| author | Torbjörn Andersson | 2011-10-09 11:30:59 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2011-10-09 11:30:59 +0200 |
| commit | 031628767652a7227b527dc06316d5f7e113b4ba (patch) | |
| tree | 165aedd9773fa35851d81a1354959de9d5ecfcda | |
| parent | 85d22158b88cf0c690a18ede95cd0501df61a13f (diff) | |
| parent | 7cd8184237a2dea9bb7a54ed88c69fe611b92c4e (diff) | |
| download | scummvm-rg350-031628767652a7227b527dc06316d5f7e113b4ba.tar.gz scummvm-rg350-031628767652a7227b527dc06316d5f7e113b4ba.tar.bz2 scummvm-rg350-031628767652a7227b527dc06316d5f7e113b4ba.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
| -rw-r--r-- | engines/tsage/globals.cpp | 34 | ||||
| -rw-r--r-- | engines/tsage/globals.h | 8 |
2 files changed, 42 insertions, 0 deletions
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index 715bf552f0..dba65c16e9 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -198,6 +198,15 @@ void BlueForceGlobals::synchronize(Serializer &s) { s.syncAsSint16LE(_v4CEC2); s.syncAsSint16LE(_v4CEC4); s.syncAsSint16LE(_v4CEC8); + s.syncAsSint16LE(_v4CECA); + s.syncAsSint16LE(_v4CECC); + for (int i = 0; i < 18; i++) + s.syncAsByte(_v4CECE[i]); + s.syncAsSint16LE(_v4CEE0); + s.syncAsSint16LE(_v4CEE2); + s.syncAsSint16LE(_v4CEE4); + s.syncAsSint16LE(_v4CEE6); + s.syncAsSint16LE(_v4CEE8); s.syncAsSint16LE(_deziTopic); s.syncAsSint16LE(_deathReason); s.syncAsSint16LE(_driveFromScene); @@ -246,6 +255,31 @@ void BlueForceGlobals::reset() { _v4CEC2 = 0; _v4CEC4 = 0; _v4CEC8 = 1; + _v4CECA = 0; + _v4CECC = 0; + _v4CECE[0] = 2; + _v4CECE[1] = 2; + _v4CECE[2] = 2; + _v4CECE[3] = 1; + _v4CECE[4] = 2; + _v4CECE[5] = 2; + _v4CECE[6] = 2; + _v4CECE[7] = 2; + _v4CECE[8] = 2; + _v4CECE[9] = 2; + _v4CECE[10] = 2; + _v4CECE[11] = 2; + _v4CECE[12] = 1; + _v4CECE[13] = 1; + _v4CECE[14] = 2; + _v4CECE[15] = 2; + _v4CECE[16] = 3; + _v4CECE[17] = 0; + _v4CEE0 = 0; + _v4CEE2 = 0; + _v4CEE4 = 0; + _v4CEE6 = 0; + _v4CEE8 = 0; _deziTopic = 0; _deathReason = 0; _v501FC = 0; diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index fa99e36ab9..a509366919 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -176,6 +176,14 @@ public: int _v4CEC2; int _v4CEC4; int _v4CEC8; + int _v4CECA; + int _v4CECC; + int8 _v4CECE[18]; + int _v4CEE0; + int _v4CEE2; + int _v4CEE4; + int _v4CEE6; + int _v4CEE8; int _deziTopic; int _deathReason; int _driveFromScene; |