mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
Little Alien
- Moved new game settings from ja2.ini to Ja2_Options.ini - Moved all settings from NewGameSettings.cpp to GameSettings.cpp - New feature: Militia movement on strategic map v1.3 - New feature: Automatic reload Press Shift+R in tactical to reload all weapons of your team with magazines from sector inventory git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@60 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -159,7 +159,7 @@ UINT8 gubDesertTemperature = 0;
|
||||
UINT8 gubGlobalTemperature = 0;
|
||||
|
||||
//rain
|
||||
extern BOOLEAN gfAllowRain;
|
||||
//extern BOOLEAN gfAllowRain;
|
||||
//end rain
|
||||
|
||||
// local prototypes
|
||||
@@ -370,7 +370,7 @@ void BuildDayAmbientSounds( )
|
||||
//end rain
|
||||
}
|
||||
|
||||
extern UINT16 gusRainChancePerDay, gusRainMinLength, gusRainMaxLength; //rain
|
||||
//extern UINT16 gusRainChancePerDay, gusRainMinLength, gusRainMaxLength; //rain
|
||||
|
||||
|
||||
void ForecastDayEvents( )
|
||||
@@ -398,13 +398,13 @@ void ForecastDayEvents( )
|
||||
if ( guiEnvDay > 1 )
|
||||
{
|
||||
//rain
|
||||
if ( Random( 100 ) < gusRainChancePerDay )
|
||||
if ( Random( 100 ) < gGameExternalOptions.gusRainChancePerDay )
|
||||
{
|
||||
// Add rain!
|
||||
// Between 6:00 and 10:00
|
||||
uiStartTime = (UINT32)( Random( 1440 - 1 -gusRainMaxLength ) );
|
||||
uiStartTime = (UINT32)( Random( 1440 - 1 - gGameExternalOptions.gusRainMaxLength ) );
|
||||
// Between 5 - 15 miniutes
|
||||
uiEndTime = uiStartTime + ( gusRainMinLength + Random( gusRainMaxLength - gusRainMinLength ) );
|
||||
uiEndTime = uiStartTime + ( gGameExternalOptions.gusRainMinLength + Random( gGameExternalOptions.gusRainMaxLength - gGameExternalOptions.gusRainMinLength ) );
|
||||
|
||||
ubStormIntensity = 0;
|
||||
|
||||
@@ -414,7 +414,7 @@ void ForecastDayEvents( )
|
||||
ubStormIntensity = 1;
|
||||
}
|
||||
|
||||
if( gfAllowRain ) AddSameDayRangedStrategicEvent( EVENT_RAINSTORM, uiStartTime, uiEndTime - uiStartTime, ubStormIntensity );
|
||||
if( gGameExternalOptions.gfAllowRain ) AddSameDayRangedStrategicEvent( EVENT_RAINSTORM, uiStartTime, uiEndTime - uiStartTime, ubStormIntensity );
|
||||
|
||||
//AddSameDayStrategicEvent( EVENT_BEGINRAINSTORM, uiStartTime, ubStormIntensity );
|
||||
//AddSameDayStrategicEvent( EVENT_ENDRAINSTORM, uiEndTime, 0 );
|
||||
|
||||
Reference in New Issue
Block a user