From 62f4bb6ac1c8910381ef5579f718b692e93b9770 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 20 Dec 2011 23:56:26 +0100 Subject: TSAGE: R2R - Implement scene 3150 --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 9048899953..7e40276fcf 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -252,6 +252,7 @@ public: int _v5657C; byte _v565AE; byte _v56605[14]; + byte _v56AA0; int _v57C2C; int _v58CE2; int _speechSubtitles; -- cgit v1.2.3 From cdd9ab3b70da5abe287cc5ef4baa0c5b40e3bfd4 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 22 Dec 2011 17:12:08 +0100 Subject: TSAGE: R2R - Implement scene 3245 --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 7e40276fcf..89ad418baa 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -253,6 +253,7 @@ public: byte _v565AE; byte _v56605[14]; byte _v56AA0; + byte _v56AA1; int _v57C2C; int _v58CE2; int _speechSubtitles; -- cgit v1.2.3 From 014536cf3f8d619c257698ebd50b94c950cfca13 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 22 Dec 2011 20:23:48 +0100 Subject: TSAGE: R2R - Fix a couple of bugs in scene 2000, Fix calls to disableControl() with parameters Also remove several obsolete warnings --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 89ad418baa..fb892c6cf7 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -254,6 +254,7 @@ public: byte _v56605[14]; byte _v56AA0; byte _v56AA1; + int _v56AAB; int _v57C2C; int _v58CE2; int _speechSubtitles; -- cgit v1.2.3 From 9ba55105fccf0489659d91cee38a899f13628168 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 25 Dec 2011 23:41:03 +0100 Subject: TSAGE: R2R - Implement scene 3400 --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index fb892c6cf7..498659d3ae 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -248,6 +248,7 @@ public: PlayStream _playStream; StripProxy _stripProxy; int _insetUp; + Rect _v558B6; int _v565F5; int _v5657C; byte _v565AE; -- cgit v1.2.3 From 3539c5e981b2a07eba18c5c58a9a9b8215b0c4c3 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 28 Dec 2011 19:36:15 +0100 Subject: TSAGE: R2R - Partial implementation of scene 3375. --- engines/tsage/globals.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 498659d3ae..f50cb70773 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -253,6 +253,8 @@ public: int _v5657C; byte _v565AE; byte _v56605[14]; + byte _v56A99; + int _v56A9E; byte _v56AA0; byte _v56AA1; int _v56AAB; -- cgit v1.2.3 From 79328a393f9f42b006ab46b7da4a2919e710b539 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 3 Jan 2012 13:34:10 +0100 Subject: TSAGE: R2R - Preliminar implementation of scene 3600 --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index f50cb70773..8c84a4ecfd 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -249,6 +249,7 @@ public: StripProxy _stripProxy; int _insetUp; Rect _v558B6; + int _v558C2; int _v565F5; int _v5657C; byte _v565AE; -- cgit v1.2.3 From a9fa9e14cdf27c38352923235ae114004ea650dc Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 4 Jan 2012 15:04:55 +0100 Subject: TSAGE: R2R - Implement scene 3800. sub1B007() is still stubbed as _field312 usage is conflicting with IDB structure --- engines/tsage/globals.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 8c84a4ecfd..23bb79b50f 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -254,6 +254,12 @@ public: int _v5657C; byte _v565AE; byte _v56605[14]; + int _v566A6; + byte _v566A8; + byte _v566A9; + byte _v566AA; + byte _v566AB[1000]; + int _v56A93; byte _v56A99; int _v56A9E; byte _v56AA0; -- cgit v1.2.3 From 8327189f8c24d47ca4e746ea0f6b230028b3ed4c Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sat, 7 Jan 2012 20:33:00 +0100 Subject: TSAGE: R2R - Implement scene 1100 --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 23bb79b50f..227058f1d6 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -248,6 +248,7 @@ public: PlayStream _playStream; StripProxy _stripProxy; int _insetUp; + Rect _v5589E; Rect _v558B6; int _v558C2; int _v565F5; -- cgit v1.2.3 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.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/tsage/globals.h') 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 From 9e2f1b6a42622756d1027e3522c5223329ad66ad Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 13 Jan 2012 16:04:09 +0100 Subject: TSAGE: R2R - Preliminar implementation of scene 1550 Also implement a couple of functions used by scene 1200 --- engines/tsage/globals.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 07f5b85e9b..9d00e618a4 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -274,7 +274,8 @@ public: int _v57C2C; int _v58CE2; int _speechSubtitles; - int _v565F1[4]; + byte _v565EC[5]; + byte _v565F1[4]; byte _stripManager_lookupList[12]; virtual void reset(); -- cgit v1.2.3 From 3d4f4ce799ecd71a8bc67cd25d50a1cd4d8805ad Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 15 Jan 2012 23:04:09 +0100 Subject: TSAGE: R2R - Scene 1550: Implement subA2B2F() --- engines/tsage/globals.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 9d00e618a4..5b1d6b4eb0 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -242,6 +242,11 @@ namespace Ringworld2 { #define SPEECH_TEXT 1 #define SPEECH_VOICE 2 +#define k5A78C 15 +#define k5A78D 16 +#define k5A790 18 +#define k5A791 17 + class Ringworld2Globals: public TsAGE2Globals { public: ASoundExt _sound1, _sound2, _sound3, _sound4; -- cgit v1.2.3 From 00a9d394a502598afcc3502d0bdd7cee88a065cc Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 18 Jan 2012 23:21:50 +0100 Subject: TSAGE: R2R - Implement scene 1700 --- engines/tsage/globals.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 5b1d6b4eb0..e734ef3196 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -257,6 +257,8 @@ public: Rect _v558B6; int _v558C2; int _v565F5; + int _v565F6; + int _v565FA; int _v5657C; byte _v565AE; byte _v56605[14]; -- cgit v1.2.3 From 1c84ef47381fff19c45fb2f9f9a186d16b21b4ab Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 20 Jan 2012 23:39:37 +0100 Subject: TSAGE: R2R - Implement scene 1900 --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index e734ef3196..285e48e611 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -269,6 +269,7 @@ public: byte _v566AB[1000]; int _v56A93; byte _v56A99; + int _v56A9C; int _v56A9E; byte _v56AA0; byte _v56AA1; -- cgit v1.2.3 From 4e118ccf98e3cc442636da3dddaf965e587ccf15 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 22 Jan 2012 13:16:09 +1100 Subject: TSAGE: Implemented R2R Scene 500 --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 285e48e611..b9babde131 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -263,6 +263,7 @@ public: byte _v565AE; byte _v56605[14]; int _v566A6; + byte _v566A3; byte _v566A8; byte _v566A9; byte _v566AA; -- cgit v1.2.3 From 888c341c7a5738ef8cfd838ab711d864f4ebd0c3 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 22 Jan 2012 11:50:15 +0100 Subject: TSAGE: R2R - Implement scene 1925 --- engines/tsage/globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index b9babde131..c4ab3e695c 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -270,7 +270,7 @@ public: byte _v566AB[1000]; int _v56A93; byte _v56A99; - int _v56A9C; + int _scene1925CurrLevel; //_v56A9C int _v56A9E; byte _v56AA0; byte _v56AA1; -- cgit v1.2.3 From db26984ed4ee7672c23ed9d45381958a64e07e78 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 25 Jan 2012 22:08:40 +0100 Subject: TSAGE: R2R- Implement scene 1950 --- engines/tsage/globals.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index c4ab3e695c..eeeddb4540 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -262,6 +262,9 @@ public: int _v5657C; byte _v565AE; byte _v56605[14]; + int _v56613[76]; + byte _v566A4; + byte _v566A5; int _v566A6; byte _v566A3; byte _v566A8; -- cgit v1.2.3 From 81bc7226050f00010c57c159ea3a85af580b2ffb Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 31 Jan 2012 23:36:19 +0100 Subject: TSAGE: R2R - Implement scene 900 --- engines/tsage/globals.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index eeeddb4540..f185b8235c 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -256,6 +256,12 @@ public: Rect _v5589E; Rect _v558B6; int _v558C2; + int _v565E1; + int _v565E3; + int _v565E5; + int _v565E7; + int _v565E9; + int _v565EB; int _v565F5; int _v565F6; int _v565FA; -- cgit v1.2.3 From 27360d20717ae3302f68dc7a171f29624e4c9e11 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 5 Feb 2012 13:20:18 +1100 Subject: TSAGE: Initial implementation of R2R Scene 180 --- engines/tsage/globals.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index f185b8235c..a0b9f0b555 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -253,6 +253,7 @@ public: PlayStream _playStream; StripProxy _stripProxy; int _insetUp; + int _frameEdgeColour; // _v421e Rect _v5589E; Rect _v558B6; int _v558C2; @@ -289,6 +290,7 @@ public: byte _v56AA7; byte _v56AA8; int _v56AAB; + int _scene180Mode; // _v575f7 int _v57C2C; int _v58CE2; int _speechSubtitles; -- cgit v1.2.3 From 4b2938c9d0691afb3d718998b185a7669050b267 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 9 Feb 2012 22:59:33 +0100 Subject: TSAGE: R2R - Very preliminary implementation of scene 1337 --- engines/tsage/globals.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index a0b9f0b555..6e3a2eb19d 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -291,6 +291,10 @@ public: byte _v56AA8; int _v56AAB; int _scene180Mode; // _v575f7 + int _v57709; + int _v5780C; + int _v5780E; + int _v57810; int _v57C2C; int _v58CE2; int _speechSubtitles; -- cgit v1.2.3 From fc1d93ee1b8281e7af308ebc17707b3c6cb2e6d7 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 14 Feb 2012 21:07:12 +1100 Subject: TSAGE: Implemented missing R2R method SceneHandler::setupPaletteMaps --- engines/tsage/globals.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 6e3a2eb19d..88b0a8146a 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -252,6 +252,9 @@ public: ASoundExt _sound1, _sound2, _sound3, _sound4; PlayStream _playStream; StripProxy _stripProxy; + bool _v1000Flag; + byte _v1000[0x1000]; + byte _palIndexList[10][256]; int _insetUp; int _frameEdgeColour; // _v421e Rect _v5589E; -- cgit v1.2.3 From b6a0d8052ba46b06631c260c7aa0745bd833058e Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 14 Feb 2012 22:43:46 +1100 Subject: TSAGE: Replace previously unknown value _v58ec2 with _uiElements._active --- engines/tsage/globals.h | 1 - 1 file changed, 1 deletion(-) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 88b0a8146a..d80e4d9859 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -299,7 +299,6 @@ public: int _v5780E; int _v57810; int _v57C2C; - int _v58CE2; int _speechSubtitles; byte _v565EC[5]; byte _v565F1[4]; -- cgit v1.2.3 From d5127d49ee50e9b3cfb8bcc6643dfb81b49ca96b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 26 Feb 2012 17:29:45 +1100 Subject: TSAGE: Implemented the initial loading logic for R2R animation player --- engines/tsage/globals.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/tsage/globals.h') diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index d80e4d9859..45226c921b 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -260,6 +260,7 @@ public: Rect _v5589E; Rect _v558B6; int _v558C2; + int _animationCtr; int _v565E1; int _v565E3; int _v565E5; -- cgit v1.2.3