1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Added ini property to control how long (in seconds) the load screen should be visible before disposal: Default: 2 seconds

Browse Source 
o This is needed, so we can read the new loadscreen hints text
o Property name: ADDITIONAL_DELAY_UNTIL_LOADSCREEN_DISPOSAL

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6055 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-05-02 21:05:31 +00:00
parent 3083ac66b3
commit a0a0490771
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+10 -1
View File
@@ -904,7 +904,16 @@ void LoadGameExternalOptions()
gGameExternalOptions.giCivilianTurnSpeedUpFactor = iniReader.ReadFloat("Graphics Settings","CIVILIAN_TURN_SPEED_UP_FACTOR",1.0, 0, 1.0); gGameExternalOptions.giCivilianTurnSpeedUpFactor = iniReader.ReadFloat("Graphics Settings","CIVILIAN_TURN_SPEED_UP_FACTOR",1.0, 0, 1.0);
gGameExternalOptions.gfUseExternalLoadscreens = iniReader.ReadBoolean("Graphics Settings","USE_EXTERNALIZED_LOADSCREENS", FALSE); gGameExternalOptions.gfUseExternalLoadscreens = iniReader.ReadBoolean("Graphics Settings","USE_EXTERNALIZED_LOADSCREENS", FALSE);
gGameExternalOptions.gfUseLoadScreenHints = iniReader.ReadBoolean("Graphics Settings","USE_LOADSCREENHINTS", TRUE);
if (!is_networked)
gGameExternalOptions.gfUseLoadScreenHints = iniReader.ReadBoolean("Graphics Settings","USE_LOADSCREENHINTS", TRUE);
else
gGameExternalOptions.gfUseLoadScreenHints = FALSE;
if (!is_networked)
gGameExternalOptions.ubAdditionalDelayUntilLoadScreenDisposal = iniReader.ReadInteger("Graphics Settings","ADDITIONAL_DELAY_UNTIL_LOADSCREEN_DISPOSAL", 2, 0, 10);
else
gGameExternalOptions.ubAdditionalDelayUntilLoadScreenDisposal = 0;
//tais: enable/disable New Starting Gear Interface (0 = disabled, classic style; 1 = enabled, new 21 item view and up to 5 gearkit selection) //tais: enable/disable New Starting Gear Interface (0 = disabled, classic style; 1 = enabled, new 21 item view and up to 5 gearkit selection)
gGameExternalOptions.gfUseNewStartingGearInterface = iniReader.ReadBoolean("Graphics Settings","USE_NEW_STARTING_GEAR_INTERFACE", FALSE); gGameExternalOptions.gfUseNewStartingGearInterface = iniReader.ReadBoolean("Graphics Settings","USE_NEW_STARTING_GEAR_INTERFACE", FALSE);
GameSettings.h
+1
View File
@@ -627,6 +627,7 @@ typedef struct
BOOLEAN gfUseExternalLoadscreens; BOOLEAN gfUseExternalLoadscreens;
BOOLEAN gfUseLoadScreenHints; // added by Flugente BOOLEAN gfUseLoadScreenHints; // added by Flugente
UINT32 ubAdditionalDelayUntilLoadScreenDisposal; // added by WANNE to have time to read the load screen hints
//tais: nsgi //tais: nsgi
BOOLEAN gfUseNewStartingGearInterface; BOOLEAN gfUseNewStartingGearInterface;
Utils/Animated ProgressBar.cpp
+10 -4
View File
@@ -30,6 +30,10 @@ UINT16 gusLeftmostShaded = 0;
extern BOOLEAN bShowSmallImage; extern BOOLEAN bShowSmallImage;
// Flugente: stuff needed for loadscreen hints
extern UINT16 num_found_loadscreenhints;
static UINT16 usCurrentLoadScreenHint = 0;
void CreateLoadingScreenProgressBar() void CreateLoadingScreenProgressBar()
{ {
ResetLoadScreenHint(); ResetLoadScreenHint();
@@ -69,6 +73,12 @@ void CreateLoadingScreenProgressBar()
void RemoveLoadingScreenProgressBar() void RemoveLoadingScreenProgressBar()
{ {
// WANNE: Sleep for a while, so we have time to read the load screen hint
if (gGameExternalOptions.gfUseLoadScreenHints && gGameExternalOptions.ubAdditionalDelayUntilLoadScreenDisposal > 0 && usCurrentLoadScreenHint )
{
Sleep(gGameExternalOptions.ubAdditionalDelayUntilLoadScreenDisposal * 1000);
}
RemoveProgressBar( 0 ); RemoveProgressBar( 0 );
SetFontShadow(DEFAULT_SHADOW); SetFontShadow(DEFAULT_SHADOW);
} }
@@ -222,10 +232,6 @@ void RemoveProgressBar( UINT8 ubID )
} }
} }
// Flugente: stuff needed for loadscreen hints
extern UINT16 num_found_loadscreenhints;
static UINT16 usCurrentLoadScreenHint = 0;
void ResetLoadScreenHint() void ResetLoadScreenHint()
{ {
usCurrentLoadScreenHint = 0; usCurrentLoadScreenHint = 0;