mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
Fixed regression causing endgame videos to be played in endless loop.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+1
-1
@@ -57,7 +57,6 @@ Screens GameScreens[MAX_SCREENS] =
|
|||||||
{ AutoResolveScreenInit, AutoResolveScreenHandle, AutoResolveScreenShutdown },
|
{ AutoResolveScreenInit, AutoResolveScreenHandle, AutoResolveScreenShutdown },
|
||||||
{ SaveLoadScreenInit, SaveLoadScreenHandle, SaveLoadScreenShutdown },
|
{ SaveLoadScreenInit, SaveLoadScreenHandle, SaveLoadScreenShutdown },
|
||||||
{ OptionsScreenInit, OptionsScreenHandle, OptionsScreenShutdown },
|
{ OptionsScreenInit, OptionsScreenHandle, OptionsScreenShutdown },
|
||||||
{ FeaturesScreen::Init, FeaturesScreen::Handle, FeaturesScreen::Shutdown },
|
|
||||||
{ ShopKeeperScreenInit, ShopKeeperScreenHandle, ShopKeeperScreenShutdown },
|
{ ShopKeeperScreenInit, ShopKeeperScreenHandle, ShopKeeperScreenShutdown },
|
||||||
{ SexScreenInit, SexScreenHandle, SexScreenShutdown },
|
{ SexScreenInit, SexScreenHandle, SexScreenShutdown },
|
||||||
{ GameInitOptionsScreenInit, GameInitOptionsScreenHandle, GameInitOptionsScreenShutdown },
|
{ GameInitOptionsScreenInit, GameInitOptionsScreenHandle, GameInitOptionsScreenShutdown },
|
||||||
@@ -71,6 +70,7 @@ Screens GameScreens[MAX_SCREENS] =
|
|||||||
{ MPConnectScreenInit, MPConnectScreenHandle, MPConnectScreenShutdown }, // OJW - 20090422
|
{ MPConnectScreenInit, MPConnectScreenHandle, MPConnectScreenShutdown }, // OJW - 20090422
|
||||||
|
|
||||||
{ MiniGameScreenInit, MiniGameScreenHandle, MiniGameScreenShutdown }, // added by Flugente
|
{ MiniGameScreenInit, MiniGameScreenHandle, MiniGameScreenShutdown }, // added by Flugente
|
||||||
|
{ FeaturesScreen::Init, FeaturesScreen::Handle, FeaturesScreen::Shutdown }, //rftr
|
||||||
|
|
||||||
#ifdef JA2BETAVERSION
|
#ifdef JA2BETAVERSION
|
||||||
{ AIViewerScreenInit, AIViewerScreenHandle, AIViewerScreenShutdown },
|
{ AIViewerScreenInit, AIViewerScreenHandle, AIViewerScreenShutdown },
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,6 @@ enum ScreenTypes
|
|||||||
AUTORESOLVE_SCREEN,
|
AUTORESOLVE_SCREEN,
|
||||||
SAVE_LOAD_SCREEN,
|
SAVE_LOAD_SCREEN,
|
||||||
OPTIONS_SCREEN,
|
OPTIONS_SCREEN,
|
||||||
FEATURES_SCREEN,
|
|
||||||
SHOPKEEPER_SCREEN,
|
SHOPKEEPER_SCREEN,
|
||||||
SEX_SCREEN,
|
SEX_SCREEN,
|
||||||
GAME_INIT_OPTIONS_SCREEN,
|
GAME_INIT_OPTIONS_SCREEN,
|
||||||
@@ -35,6 +34,7 @@ enum ScreenTypes
|
|||||||
MP_CHAT_SCREEN, // OJW - 20090315
|
MP_CHAT_SCREEN, // OJW - 20090315
|
||||||
MP_CONNECT_SCREEN, //OJW - 20090422
|
MP_CONNECT_SCREEN, //OJW - 20090422
|
||||||
MINIGAME_SCREEN, // Flugente
|
MINIGAME_SCREEN, // Flugente
|
||||||
|
FEATURES_SCREEN, //rftr
|
||||||
|
|
||||||
#ifdef JA2BETAVERSION
|
#ifdef JA2BETAVERSION
|
||||||
AIVIEWER_SCREEN,
|
AIVIEWER_SCREEN,
|
||||||
|
|||||||
Reference in New Issue
Block a user