diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp
index 2c780b55..5e0ca59f 100644
--- a/Laptop/laptop.cpp
+++ b/Laptop/laptop.cpp
@@ -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;
}
}
diff --git a/Laptop/laptop.h b/Laptop/laptop.h
index 9934297d..09094fab 100644
--- a/Laptop/laptop.h
+++ b/Laptop/laptop.h
@@ -168,6 +168,8 @@ enum
LAPTOP_MODE_BRIEFING_ROOM_ENTER,
LAPTOP_MODE_AIM_MEMBERS_ARCHIVES_NEW,
+
+ LAPTOP_MODE_MAX,
};
// bookamrks for WWW bookmark list
diff --git a/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj b/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj
index 819fa554..eb333d96 100644
--- a/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj
+++ b/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj
@@ -17,6 +17,10 @@
Release
Win32
+
+ Relese_WithDebugInfo
+ Win32
+
{FF0A809E-A370-4640-A301-17B76D7A5B4E}
@@ -41,6 +45,11 @@
StaticLibrary
NotSet
+
+
+ StaticLibrary
+ false
+ NotSet
@@ -61,6 +70,10 @@
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
@@ -128,6 +141,17 @@
ProgramDatabase
+
+
+ MaxSpeed
+ true
+ ..\.;.\.;.\ext\VFS\include;..\ext\VFS\include;..\Utils;.\Utils;..\TileEngine;.\TileEngine;..\TacticalAI;.\TacticalAI;..\ModularizedTacticalAI;.\ModularizedTacticalAI;..\Tactical;.\Tactical;..\Strategic;.\Strategic;..\Standard Gaming Platform;.\Standard Gaming Platform;..\Res;.\Res;..\lua;.\lua;..\Laptop;.\Laptop;..\Multiplayer;.\Multiplayer;..\Multiplayer\raknet;.\Multiplayer\raknet;..\Editor;.\Editor;..\Console;.\Console;.\ext\libpng;..\ext\libpng;.\ext\zlib;..\ext\zlib;;$(NOINHERIT)
+ MultiThreaded
+ true
+ Level3
+ ProgramDatabase
+
+
diff --git a/Tactical/Disease.cpp b/Tactical/Disease.cpp
index ee3f81f2..2e18d8d1 100644
--- a/Tactical/Disease.cpp
+++ b/Tactical/Disease.cpp
@@ -573,7 +573,7 @@ void PopulationMove( INT16 sXA, INT16 sYA, INT16 sXB, INT16 sYB, UINT16 usAmount
FLOAT infectedpercentage = 0;
if ( populationB )
- (FLOAT)pSectorInfoB->usInfected / (FLOAT)(populationB);
+ infectedpercentage = (FLOAT)pSectorInfoB->usInfected / (FLOAT)(populationB);
if ( infectedpercentage >= GetSectorDiseaseOverFlowThreshold() || pSectorInfoB->fInfectionSeverity > ((FLOAT)Disease[0].sInfectionPtsOutbreak / (FLOAT)Disease[0].sInfectionPtsFull) )
pSectorInfoB->usInfectionFlag |= (SECTORDISEASE_OUTBREAK | SECTORDISEASE_DIAGNOSED_WHO);