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

- 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

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;
 	}
 }
 

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

ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj

@@ -17,6 +17,10 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Relese_WithDebugInfo|Win32">
+      <Configuration>Relese_WithDebugInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FF0A809E-A370-4640-A301-17B76D7A5B4E}</ProjectGuid>
@@ -41,6 +45,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Relese_WithDebugInfo|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -61,6 +70,10 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\ja2.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Relese_WithDebugInfo|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\ja2.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -128,6 +141,17 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Relese_WithDebugInfo|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\.;.\.;.\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)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\AbstractPlanFactory.cpp" />
     <ClCompile Include="src\CrowPlan.cpp" />

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);