From 3d995ad22eb34028101dc52d34144cb159d8b057 Mon Sep 17 00:00:00 2001 From: Ben Lankamp Date: Fri, 12 Jun 2020 17:35:39 +0200 Subject: [PATCH] * Re-enable scrolling * Re-enable ending of game --- REDALERT/SCENARIO.CPP | 3 +-- REDALERT/SCROLL.CPP | 3 +-- TIBERIANDAWN/SCROLL.CPP | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/REDALERT/SCENARIO.CPP b/REDALERT/SCENARIO.CPP index 2737a1c..489fc7e 100644 --- a/REDALERT/SCENARIO.CPP +++ b/REDALERT/SCENARIO.CPP @@ -1002,7 +1002,6 @@ void Do_Win(void) /* ** If this scenario is flagged as ending the game then print the credits and exit. */ -#if (0)//PG if (Scen.IsEndOfGame) { if (PlayerPtr->ActLike == HOUSE_USSR) { Play_Movie(VQ_SOVFINAL); @@ -1017,7 +1016,7 @@ void Do_Win(void) #endif return; } -#endif + /* ** Hack section. If it's allied scenario 10, variation A, then skip the ** score and map selection, don't increment scenario, and set it to diff --git a/REDALERT/SCROLL.CPP b/REDALERT/SCROLL.CPP index 977b08f..0ad225f 100644 --- a/REDALERT/SCROLL.CPP +++ b/REDALERT/SCROLL.CPP @@ -89,7 +89,6 @@ ScrollClass::ScrollClass(void) : #define EVA_WIDTH 80 void ScrollClass::AI(KeyNumType &input, int x, int y) { -#if 0 bool player_scrolled=false; static DirType direction; int rate; @@ -224,7 +223,7 @@ void ScrollClass::AI(KeyNumType &input, int x, int y) } } -#endif + HelpClass::AI(input, x, y); } diff --git a/TIBERIANDAWN/SCROLL.CPP b/TIBERIANDAWN/SCROLL.CPP index 0ea9f48..bb83262 100644 --- a/TIBERIANDAWN/SCROLL.CPP +++ b/TIBERIANDAWN/SCROLL.CPP @@ -87,7 +87,7 @@ ScrollClass::ScrollClass(void) #define EVA_WIDTH 80 void ScrollClass::AI(KeyNumType &input, int x, int y) { -#if 0 + static DirType direction; bool player_scrolled=false; @@ -201,6 +201,7 @@ void ScrollClass::AI(KeyNumType &input, int x, int y) } } } + if (!player_scrolled){ if (Counter.Time()==0) { Inertia--; @@ -211,7 +212,7 @@ void ScrollClass::AI(KeyNumType &input, int x, int y) } } -#endif + HelpClass::AI(input, x, y); }