1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

New feature: localized weather adds more weather types, different weather can happen in different sectors at the same time.

Browse Source 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23094&#msg_345949

Requires GameDir >= r2325

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-06-18 20:57:03 +00:00
parent facadda6e8
commit 503523a9fa
40 changed files with 1059 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/laptop.cpp
+6 -44
View File
@@ -657,11 +657,6 @@ void CreateFileAndNewEmailIconFastHelpText( UINT32 uiHelpTextID, BOOLEAN fClearH
void CreateLaptopButtonHelpText( INT32 iButtonIndex, UINT32 uiButtonHelpTextID );
//ppp
//Used to determine delay if its raining
BOOLEAN IsItRaining();
INT32 WWaitDelayIncreasedIfRaining( INT32 iLoadTime );
void InternetRainDelayMessageBoxCallBack( UINT8 bExitValue );
extern void ClearHistoryList( void );
@@ -4172,23 +4167,9 @@ void BookmarkCallBack(MOUSE_REGION * pRegion, INT32 iReason )
void GoToWebPage(INT32 iPageId )
{
// WANNE: disabled rain sound when laptop is displayed
////if it is raining, popup a warning first saying connection time may be slow
//if( IsItRaining() )
//{
// if( giRainDelayInternetSite == -1 )
// {
// DoLapTopMessageBox( MSG_BOX_LAPTOP_DEFAULT, pErrorStrings[4], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, InternetRainDelayMessageBoxCallBack );
// giRainDelayInternetSite = iPageId;
// return;
// }
//}
//else
// giRainDelayInternetSite = -1;
#ifdef JA2UB
//if the laptop is broken
if( (gubQuest[ QUEST_FIX_LAPTOP ] != QUESTINPROGRESS) || (gGameUBOptions.LaptopQuestEnabled != TRUE) )
if( (gubQuest[ QUEST_FIX_LAPTOP ] != QUESTINPROGRESS) || (gGameUBOptions.LaptopQuestEnabled != TRUE) )
{
#endif
switch(iPageId)
@@ -4585,9 +4566,7 @@ BOOLEAN DisplayLoadPending( void )
{
iUnitTime=UNIT_TIME;
}
iUnitTime += WWaitDelayIncreasedIfRaining( iUnitTime );
iLoadTime = iUnitTime * 30;
#ifdef JA2UB
//if the site we are going to is the web poage not found page
@@ -7143,31 +7122,14 @@ void LaptopSaveVariablesInit()
{
}
INT32 WWaitDelayIncreasedIfRaining( INT32 iUnitTime )
/*BOOLEAN IsItRaining()
{
INT32 iRetVal = 0;
if( guiEnvWeather & WEATHER_FORECAST_THUNDERSHOWERS )
{
iRetVal = (INT32)( iUnitTime * (FLOAT) 0.80 );
}
else if( guiEnvWeather & WEATHER_FORECAST_SHOWERS )
{
iRetVal = (INT32)( iUnitTime * (FLOAT) 0.6 );
}
return( iRetVal );
}
BOOLEAN IsItRaining()
{
if( guiEnvWeather & WEATHER_FORECAST_SHOWERS || guiEnvWeather & WEATHER_FORECAST_THUNDERSHOWERS )
if ( (SectorInfo[SECTOR( gWorldSectorX, gWorldSectorY )].usWeather == WEATHER_FORECAST_RAIN || SectorInfo[SECTOR( gWorldSectorX, gWorldSectorY )].usWeather == WEATHER_FORECAST_THUNDERSHOWERS
|| SectorInfo[SECTOR( gWorldSectorX, gWorldSectorY )].usWeather == WEATHER_FORECAST_SANDSTORM || SectorInfo[SECTOR( gWorldSectorX, gWorldSectorY )].usWeather == WEATHER_FORECAST_SNOW) )
return( TRUE );
return( FALSE );
}
}*/
void InternetRainDelayMessageBoxCallBack( UINT8 bExitValue )