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

Merged revision(s) 7438-7439 from trunk/GameSource/ja2_v1.13:

Browse Source 
- Fix: missing buildfile entries for ModularizedTacticalAI when building a Release exe with debugInfo in VS2010
- Fix: incorrect size of an array led to variable corruption

Fix: error in Disease calculation


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-08-28 00:31:45 +00:00
parent 5e8ba14f42
commit f3edcd3d92
4 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/laptop.cpp
+13 -21
View File
@@ -504,11 +504,8 @@ BOOLEAN fFlickerHD = FALSE;
// the screens limiting rect
SGPRect LaptopScreenRect={ LAPTOP_UL_X,LAPTOP_UL_Y - 5,LAPTOP_SCREEN_LR_X + 2,LAPTOP_SCREEN_LR_Y + 5 + 19};
// the sub pages vistsed or not status within the web browser
BOOLEAN gfWWWaitSubSitesVisitedFlags[LAPTOP_MODE_SIRTECH - LAPTOP_MODE_WWW ];
//INT32 iBookMarkList[MAX_BOOKMARKS];
// the sub pages visited or not status within the web browser
BOOLEAN gfWWWaitSubSitesVisitedFlags[LAPTOP_MODE_MAX];
// mouse regions
MOUSE_REGION gEmailRegion;
@@ -5487,27 +5484,24 @@ void ShowLights( void )
{
// will show lights depending on state
HVOBJECT hHandle;
GetVideoObject( &hHandle, guiLIGHTS);
if( fPowerLightOn == TRUE )
{
GetVideoObject( &hHandle, guiLIGHTS);
BltVideoObject(FRAME_BUFFER, hHandle, 0,iScreenWidthOffset + 44, iScreenHeightOffset + 466, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hHandle, 0, iScreenWidthOffset + 44, iScreenHeightOffset + 466, VO_BLT_SRCTRANSPARENCY,NULL);
}
else
{
GetVideoObject( &hHandle, guiLIGHTS);
BltVideoObject(FRAME_BUFFER, hHandle, 1,iScreenWidthOffset + 44, iScreenHeightOffset + 466, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hHandle, 1, iScreenWidthOffset + 44, iScreenHeightOffset + 466, VO_BLT_SRCTRANSPARENCY,NULL);
}
if( fHardDriveLightOn == TRUE )
{
GetVideoObject( &hHandle, guiLIGHTS);
BltVideoObject(FRAME_BUFFER, hHandle, 0, iScreenWidthOffset + 88, iScreenHeightOffset + 466, VO_BLT_SRCTRANSPARENCY,NULL);
}
else
{
GetVideoObject( &hHandle, guiLIGHTS);
BltVideoObject(FRAME_BUFFER, hHandle, 1, iScreenWidthOffset + 88, iScreenHeightOffset + 466, VO_BLT_SRCTRANSPARENCY,NULL);
BltVideoObject(FRAME_BUFFER, hHandle, 1, iScreenWidthOffset + 88, iScreenHeightOffset + 466, VO_BLT_SRCTRANSPARENCY,NULL);
}
}
@@ -6601,13 +6595,13 @@ void HandleWWWSubSites( void )
fConnectingToSubPage = TRUE;
// fast or slow load?
if( gfWWWaitSubSitesVisitedFlags[ guiCurrentLaptopMode - ( LAPTOP_MODE_WWW + 1 ) ] == TRUE )
if( gfWWWaitSubSitesVisitedFlags[ guiCurrentLaptopMode ] == TRUE )
{
fFastLoadFlag = TRUE;
}
// set fact we were here
gfWWWaitSubSitesVisitedFlags[ guiCurrentLaptopMode - ( LAPTOP_MODE_WWW + 1 ) ] = TRUE;
gfWWWaitSubSitesVisitedFlags[ guiCurrentLaptopMode ] = TRUE;
//Dont show the dlownload screen when switching between these pages
if( ( guiCurrentLaptopMode == LAPTOP_MODE_AIM_MEMBERS ) && ( guiPreviousLaptopMode == LAPTOP_MODE_AIM_MEMBERS_FACIAL_INDEX ) ||
@@ -6617,8 +6611,8 @@ void HandleWWWSubSites( void )
fLoadPendingFlag = FALSE;
// set fact we were here
gfWWWaitSubSitesVisitedFlags[ LAPTOP_MODE_AIM_MEMBERS_FACIAL_INDEX - ( LAPTOP_MODE_WWW + 1 ) ] = TRUE;
gfWWWaitSubSitesVisitedFlags[ LAPTOP_MODE_AIM_MEMBERS - ( LAPTOP_MODE_WWW + 1 ) ] = TRUE;
gfWWWaitSubSitesVisitedFlags[ LAPTOP_MODE_AIM_MEMBERS_FACIAL_INDEX ] = TRUE;
gfWWWaitSubSitesVisitedFlags[ LAPTOP_MODE_AIM_MEMBERS ] = TRUE;
}
}
@@ -6635,12 +6629,10 @@ void UpdateStatusOfDisplayingBookMarks( void )
void InitalizeSubSitesList( void )
{
INT32 iCounter = 0;
// init all subsites list to not visited
for( iCounter = LAPTOP_MODE_WWW + 1 ; iCounter <= LAPTOP_MODE_SIRTECH; ++iCounter )
for( INT32 iCounter = LAPTOP_MODE_WWW + 1 ; iCounter <= LAPTOP_MODE_MAX; ++iCounter )
{
gfWWWaitSubSitesVisitedFlags[ iCounter - ( LAPTOP_MODE_WWW + 1 ) ] = FALSE;
gfWWWaitSubSitesVisitedFlags[ iCounter ] = FALSE;
}
}
@@ -6654,7 +6646,7 @@ void SetSubSiteAsVisted( void )
}
else
{
gfWWWaitSubSitesVisitedFlags[ guiCurrentLaptopMode - ( LAPTOP_MODE_WWW + 1 ) ] = TRUE;
gfWWWaitSubSitesVisitedFlags[ guiCurrentLaptopMode ] = TRUE;
}
}