- added a new option in ja2.ini (PLAY_INTRO) + source code where the user can enable or disable the intro.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2008-02-10 07:36:22 +00:00
parent c55b927f8b
commit e41a905c51
4 changed files with 15 additions and 3 deletions
+10 -3
View File
@@ -184,13 +184,20 @@ BOOLEAN EnterIntroScreen()
// Don't play music.... // Don't play music....
SetMusicMode( MUSIC_NONE ); SetMusicMode( MUSIC_NONE );
#ifdef JA2BETAVERSION // WANNE: No we have an INI option for the choise if the intro should be played
if( FileExists( "..\\NoIntro.txt" ) ) if (!iPlayIntro)
{ {
PrepareToExitIntroScreen(); PrepareToExitIntroScreen();
return( TRUE ); return( TRUE );
} }
#endif
//#ifdef JA2BETAVERSION
// if( FileExists( "..\\NoIntro.txt" ) )
// {
// PrepareToExitIntroScreen();
// return( TRUE );
// }
//#endif
//if the library doesnt exist, exit //if the library doesnt exist, exit
if( !IsLibraryOpened( LIBRARY_INTRO ) ) if( !IsLibraryOpened( LIBRARY_INTRO ) )
+1
View File
@@ -5,6 +5,7 @@
#endif #endif
int iResolution; // INI file int iResolution; // INI file
int iPlayIntro;
/* WANNE, Sgt.Kolja /* WANNE, Sgt.Kolja
* INI file (Windowed or Fullscreen) * INI file (Windowed or Fullscreen)
* REPLACE all defines WINDOWED_MODE with this variable * REPLACE all defines WINDOWED_MODE with this variable
+3
View File
@@ -1036,6 +1036,9 @@ void GetRuntimeSettings( )
/* 1 for Windowed, 0 for Fullscreen */ /* 1 for Windowed, 0 for Fullscreen */
if( !bScreenModeCmdLine ) if( !bScreenModeCmdLine )
iScreenMode = (int) GetPrivateProfileInt( "Ja2 Settings","SCREEN_MODE_WINDOWED", iScreenMode, INIFile ); iScreenMode = (int) GetPrivateProfileInt( "Ja2 Settings","SCREEN_MODE_WINDOWED", iScreenMode, INIFile );
// WANNE: Should we play the intro?
iPlayIntro = (int) GetPrivateProfileInt( "Ja2 Settings","PLAY_INTRO", iPlayIntro, INIFile );
} }
void ShutdownWithErrorBox(CHAR8 *pcMessage) void ShutdownWithErrorBox(CHAR8 *pcMessage)
+1
View File
@@ -29,6 +29,7 @@ extern UINT16 SCREEN_WIDTH;
extern UINT16 SCREEN_HEIGHT; extern UINT16 SCREEN_HEIGHT;
extern int iResolution; // Resolution id from the ini file extern int iResolution; // Resolution id from the ini file
extern int iPlayIntro;
extern INT16 iScreenWidthOffset; extern INT16 iScreenWidthOffset;
extern INT16 iScreenHeightOffset; extern INT16 iScreenHeightOffset;