mirror of
https://github.com/jmarshall23/CnC_Remastered_Collection.git
synced 2026-08-17 17:00:29 +02:00
* Re-enable scrolling
* Re-enable ending of game
This commit is contained in:
@@ -1002,7 +1002,6 @@ void Do_Win(void)
|
|||||||
/*
|
/*
|
||||||
** If this scenario is flagged as ending the game then print the credits and exit.
|
** If this scenario is flagged as ending the game then print the credits and exit.
|
||||||
*/
|
*/
|
||||||
#if (0)//PG
|
|
||||||
if (Scen.IsEndOfGame) {
|
if (Scen.IsEndOfGame) {
|
||||||
if (PlayerPtr->ActLike == HOUSE_USSR) {
|
if (PlayerPtr->ActLike == HOUSE_USSR) {
|
||||||
Play_Movie(VQ_SOVFINAL);
|
Play_Movie(VQ_SOVFINAL);
|
||||||
@@ -1017,7 +1016,7 @@ void Do_Win(void)
|
|||||||
#endif
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
/*
|
/*
|
||||||
** Hack section. If it's allied scenario 10, variation A, then skip the
|
** 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
|
** score and map selection, don't increment scenario, and set it to
|
||||||
|
|||||||
+1
-2
@@ -89,7 +89,6 @@ ScrollClass::ScrollClass(void) :
|
|||||||
#define EVA_WIDTH 80
|
#define EVA_WIDTH 80
|
||||||
void ScrollClass::AI(KeyNumType &input, int x, int y)
|
void ScrollClass::AI(KeyNumType &input, int x, int y)
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
bool player_scrolled=false;
|
bool player_scrolled=false;
|
||||||
static DirType direction;
|
static DirType direction;
|
||||||
int rate;
|
int rate;
|
||||||
@@ -224,7 +223,7 @@ void ScrollClass::AI(KeyNumType &input, int x, int y)
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
HelpClass::AI(input, x, y);
|
HelpClass::AI(input, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ ScrollClass::ScrollClass(void)
|
|||||||
#define EVA_WIDTH 80
|
#define EVA_WIDTH 80
|
||||||
void ScrollClass::AI(KeyNumType &input, int x, int y)
|
void ScrollClass::AI(KeyNumType &input, int x, int y)
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
static DirType direction;
|
static DirType direction;
|
||||||
bool player_scrolled=false;
|
bool player_scrolled=false;
|
||||||
|
|
||||||
@@ -201,6 +201,7 @@ void ScrollClass::AI(KeyNumType &input, int x, int y)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!player_scrolled){
|
if (!player_scrolled){
|
||||||
if (Counter.Time()==0) {
|
if (Counter.Time()==0) {
|
||||||
Inertia--;
|
Inertia--;
|
||||||
@@ -211,7 +212,7 @@ void ScrollClass::AI(KeyNumType &input, int x, int y)
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
HelpClass::AI(input, x, y);
|
HelpClass::AI(input, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user