From 3f05ee5452b6f5a5d876bf38fbf806616a90ff50 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 10 Jan 2012 20:10:46 +0100 Subject: TSAGE: R2R - Add some global variables, fix some default values --- engines/tsage/globals.cpp | 36 ++++++++++++++++++++++++++++++------ engines/tsage/globals.h | 5 +++++ 2 files changed, 35 insertions(+), 6 deletions(-) (limited to 'engines/tsage') diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index ad7d0d1e0c..4c9c6de956 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -381,23 +381,42 @@ void Ringworld2Globals::reset() { _v5657C = 0; _v565F5 = 0; _v565AE = 0; - for (int i = 0; i < 14; i++) - _v56605[i] = 0; + + _v56605[0] = 0; + _v56605[1] = 3; + _v56605[2] = 5; + _v56605[3] = 1; + _v56605[4] = 2; + _v56605[5] = 5; + _v56605[6] = 9; + _v56605[7] = 14; + _v56605[8] = 15; + _v56605[9] = 18; + _v56605[10] = 20; + _v56605[11] = 25; + _v56605[12] = 27; + _v56605[13] = 31; + _v566A6 = 3800; - _v566A8 = 0; + _v566A8 = 5; _v566A9 = 0; _v566AA = 0; for (int i = 0; i < 1000; i++) _v566AB[i] = 0; - _v56A93 = 0; - _v56A99 = 0; + _v56A93 = -1; + _v56A99 = 5; _v56A9E = 0; _v56AA0 = 0; _v56AA1 = 0; + _v56AA2 = 60; + _v56AA4 = 660; + _v56AA6 = 1; + _v56AA7 = 1; + _v56AA8 = 1; _v56AAB = 0; _v57C2C = 0; _v58CE2 = 0; - Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 0); + Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 1); _speechSubtitles = SPEECH_VOICE | SPEECH_TEXT; _insetUp = 0; @@ -434,6 +453,8 @@ void Ringworld2Globals::synchronize(Serializer &s) { s.syncAsSint16LE(_v566A6); s.syncAsSint16LE(_v56A93); s.syncAsSint16LE(_v56A9E); + s.syncAsSint16LE(_v56AA2); + s.syncAsSint16LE(_v56AA4); s.syncAsSint16LE(_v56AAB); s.syncAsSint16LE(_v57C2C); s.syncAsSint16LE(_v58CE2); @@ -448,6 +469,9 @@ void Ringworld2Globals::synchronize(Serializer &s) { s.syncAsByte(_v566AA); s.syncAsByte(_v56AA0); s.syncAsByte(_v56AA1); + s.syncAsByte(_v56AA6); + s.syncAsByte(_v56AA7); + s.syncAsByte(_v56AA8); for (i = 0; i < 14; ++i) s.syncAsByte(_v56605[i]); diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 227058f1d6..07f5b85e9b 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -265,6 +265,11 @@ public: int _v56A9E; byte _v56AA0; byte _v56AA1; + int _v56AA2; + int _v56AA4; + byte _v56AA6; + byte _v56AA7; + byte _v56AA8; int _v56AAB; int _v57C2C; int _v58CE2; -- cgit v1.2.3