Removed most of my thousands "WANNE" comments which goes back 2 years when I changed to higher resolutions. These were only internal comments for me, so they didn't include any useful meaning for others.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1172 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Strategic/Assignments.cpp

@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 	#include "GameSettings.h"
@@ -8651,7 +8650,7 @@ BOOLEAN CreateDestroyAssignmentPopUpBoxes( void )
 
 		// these boxes are always created while in mapscreen...
 		CreateEPCBox( );
-		// WANNE 2 <ab>
+		
 		CreateAssignmentsBox( );
 		CreateTrainingBox( );
 		CreateAttributeBox();
@@ -8807,8 +8806,6 @@ void SetTacticalPopUpAssignmentBoxXY( void )
 	
 	gsAssignmentBoxesY = sY;
 
-
-	// WANNE 2
 	// ATE: Check if we are past tactical viewport....
 	// Use estimate width's/heights
 	if ( ( gsAssignmentBoxesX + 100 ) > SCREEN_WIDTH )
@@ -8817,7 +8814,6 @@ void SetTacticalPopUpAssignmentBoxXY( void )
 		gsAssignmentBoxesX = SCREEN_WIDTH - 100;
 	}
 
-	// WANNE 2
 	if ( ( gsAssignmentBoxesY + 130 ) > (SCREEN_HEIGHT - 160) )
 	{
 		gsAssignmentBoxesY = SCREEN_HEIGHT - 290;
@@ -8889,7 +8885,6 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
 	{
 		GetBoxSize( ghRepairBox, &pDimensions );
 
-		// WANNE 2
 		if( gsAssignmentBoxesX + pDimensions2.iRight + pDimensions.iRight >= SCREEN_WIDTH )
 		{
 			gsAssignmentBoxesX = ( INT16 ) ( (SCREEN_WIDTH - 1) - ( pDimensions2.iRight + pDimensions.iRight ) );
@@ -8905,7 +8900,6 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
 			sLongest  = ( INT16 )pDimensions.iBottom + (  ( GetFontHeight( MAP_SCREEN_FONT ) + 2 ) * ASSIGN_MENU_REPAIR );
 		}
 
-		// WANNE 2
 		if( gsAssignmentBoxesY + sLongest >= (SCREEN_HEIGHT - 120) )
 		{
 			gsAssignmentBoxesY = ( INT16 )( (SCREEN_HEIGHT - 121) - ( sLongest ) );
@@ -8937,7 +8931,6 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
 			sLongest  = ( INT16 )pDimensions.iBottom;
 		}
 
-		// WANNE 2
 		if( gsAssignmentBoxesY + sLongest >= (SCREEN_HEIGHT - 120) )
 		{
 			gsAssignmentBoxesY = ( INT16 )( (SCREEN_HEIGHT - 121) - ( sLongest ) );
@@ -8954,14 +8947,12 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
 		GetBoxSize( ghTrainingBox, &pDimensions );
 		GetBoxSize( ghAttributeBox, &pDimensions3 );
 
-		// WANNE 2
 		if( gsAssignmentBoxesX + pDimensions2.iRight + pDimensions.iRight + pDimensions3.iRight >= SCREEN_WIDTH )
 		{
 			gsAssignmentBoxesX = ( INT16 ) ( (SCREEN_WIDTH - 1) - ( pDimensions2.iRight + pDimensions.iRight + pDimensions3.iRight ) );
 			SetRenderFlags( RENDER_FLAG_FULL );
 		}
 
-		// WANNE 2
 		if( gsAssignmentBoxesY + pDimensions3.iBottom + ( GetFontHeight( MAP_SCREEN_FONT ) * ASSIGN_MENU_TRAIN ) >= (SCREEN_HEIGHT - 120) )
 		{
 			gsAssignmentBoxesY = ( INT16 )( (SCREEN_HEIGHT - 121) - ( pDimensions3.iBottom ) );
@@ -8987,14 +8978,12 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
 	{
 		GetBoxSize( ghTrainingBox, &pDimensions );
 
-		// WANNE 2
 		if( gsAssignmentBoxesX + pDimensions2.iRight + pDimensions.iRight  >= SCREEN_WIDTH )
 		{
 			gsAssignmentBoxesX = ( INT16 ) ( (SCREEN_WIDTH - 1) - ( pDimensions2.iRight + pDimensions.iRight  ) );
 			SetRenderFlags( RENDER_FLAG_FULL );
 		}
 
-		// WANNE 2
 		if( gsAssignmentBoxesY + pDimensions2.iBottom +  ( ( GetFontHeight( MAP_SCREEN_FONT ) + 2 ) * ASSIGN_MENU_TRAIN ) >= (SCREEN_HEIGHT - 120) )
 		{
 			gsAssignmentBoxesY = ( INT16 )( (SCREEN_HEIGHT - 121) - ( pDimensions2.iBottom ) - (  ( GetFontHeight( MAP_SCREEN_FONT ) + 2 ) * ASSIGN_MENU_TRAIN ) );
@@ -9011,7 +9000,6 @@ void CheckAndUpdateTacticalAssignmentPopUpPositions( void )
 	}
 	else
 	{
-		// WANNE 2
 		// just the assignment box
 		if( gsAssignmentBoxesX + pDimensions2.iRight  >= SCREEN_WIDTH )
 		{
@@ -9058,7 +9046,6 @@ void PositionCursorForTacticalAssignmentBox( void )
 
 	iFontHeight = GetLineSpace( ghAssignmentBox ) + GetFontHeight( GetBoxFont( ghAssignmentBox ) ); 
 
-	// WANNE 2
 	if( gGameSettings.fOptions[ TOPTION_DONT_MOVE_MOUSE ] == FALSE )
 	{
 		//SimulateMouseMovement( pPosition.iX + pDimensions.iRight - 6, pPosition.iY + ( iFontHeight / 2 ) + 2 );
@@ -10632,7 +10619,6 @@ void RebuildAssignmentsBox( void )
 		ghAssignmentBox = -1;
 	}
 
-	// WANNE 2 <ab>
 	CreateAssignmentsBox( );
 }
 

Strategic/Auto Resolve.cpp

@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 // MAXIMUM NUMBER OF ENEMIES: 32
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
@@ -965,7 +964,6 @@ void CalculateSoldierCells( BOOLEAN fReset )
 	}
 	gpAR->uiTimeSlice = gpAR->uiTimeSlice * gpAR->ubTimeModifierPercentage / 100;
 	
-	// WANNE 2
 	iTop = iScreenHeightOffset + (240 - gpAR->sHeight/2);
 	if( iTop > (iScreenHeightOffset + 120) )
 		iTop -= 40;
@@ -1228,7 +1226,6 @@ void BuildInterfaceBuffer()
 	INT32						x,y;
 
 	//Setup the blitting clip regions, so we don't draw outside of the region (for excess panelling)
-	// WANNE 2
 	gpAR->Rect.iLeft		= iScreenWidthOffset + (320 - gpAR->sWidth/2);
 	gpAR->Rect.iRight		= gpAR->Rect.iLeft + gpAR->sWidth;
 	gpAR->Rect.iTop			= iScreenHeightOffset + (240 - gpAR->sHeight/2);
@@ -1811,7 +1808,6 @@ void RenderAutoResolve()
 
 	if( gpAR->fPendingSurrender )
 	{
-		// WANNE 2
 		DisplayWrappedString( (UINT16)(gpAR->sCenterStartX+16), (UINT16)(iScreenHeightOffset + 230+gpAR->bVerticalOffset), 108, 2,
 			(UINT8)FONT10ARIAL, FONT_YELLOW, gpStrategicString[ STR_ENEMY_SURRENDER_OFFER ], FONT_BLACK, FALSE, LEFT_JUSTIFIED );
 	}
@@ -1932,7 +1928,6 @@ void RenderAutoResolve()
 					break;
 			}
 			//Render the results of the battle.
-			// WANNE 2
 			SetFont( BLOCKFONT2 );
 			xp = gpAR->sCenterStartX + 12;
 			yp = iScreenHeightOffset + 218 + gpAR->bVerticalOffset;
@@ -1948,7 +1943,6 @@ void RenderAutoResolve()
 				gpAR->uiTotalElapsedBattleTimeInMilliseconds/60000,
 				(gpAR->uiTotalElapsedBattleTimeInMilliseconds%60000)/1000 );
 			xp = gpAR->sCenterStartX + 70 - StringPixLength( str, FONT10ARIAL )/2;
-			// WANNE 2
 			yp = iScreenHeightOffset + 290 + gpAR->bVerticalOffset;
 			SetFontForeground( FONT_YELLOW );
 			mprintf( xp, yp, str );
@@ -2275,7 +2269,6 @@ void CreateAutoResolveInterface()
 
 	gpAR->bVerticalOffset = (240 - gpAR->sHeight/2) > 120 ? -40 : 0;
 	
-	// WANNE 2
 	//Create the buttons -- subject to relocation
 	gpAR->iButton[ PLAY_BUTTON ] = 
 		QuickCreateButton( gpAR->iButtonImage[ PLAY_BUTTON ] , (INT16)(gpAR->sCenterStartX+11), (INT16)(iScreenHeightOffset + 240+gpAR->bVerticalOffset), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
@@ -3106,7 +3099,6 @@ void CalculateRowsAndColumns()
 	else
 		gpAR->sWidth = 146 + 55 * (max( max( gpAR->ubMercCols, gpAR->ubCivCols ), 2 ) + max( gpAR->ubEnemyCols, 2 ));
 
-	// WANNE 2
 	//gpAR->sCenterStartX = 323 - gpAR->sWidth/2 + max( max( gpAR->ubMercCols, 2), max( gpAR->ubCivCols, 2 ) ) *55;
 	gpAR->sCenterStartX = iScreenWidthOffset + (323 - gpAR->sWidth/2 + max( max( gpAR->ubMercCols, 2), max( gpAR->ubCivCols, 2 ) ) *55);
 	

Strategic/Map Screen Interface Border.cpp

@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
@@ -109,7 +108,6 @@ void LevelMarkerBtnCallback(MOUSE_REGION * pRegion, INT32 iReason );
 
 void CommonBtnCallbackBtnDownChecks( void );
 
-// WANNE 2
 void DrawTextOnMapBorder( void );
 
 
@@ -122,7 +120,6 @@ void BtnLowerLevelBtnCallback(GUI_BUTTON *btn,INT32 reason);
 void BtnRaiseLevelBtnCallback(GUI_BUTTON *btn,INT32 reason);
 */
 
-// WANNE 2
 void DrawTextOnMapBorder( void )
 {
 	INT16 sX = 0, sY = 0;
@@ -220,13 +217,11 @@ void RenderMapBorder( void )
 	GetVideoObject(&hHandle, guiMapBorder ); 
 	BltVideoObject( guiSAVEBUFFER , hHandle, 0, MAP_BORDER_X, MAP_BORDER_Y, VO_BLT_SRCTRANSPARENCY,NULL );
 
-	// WANNE 2
 	if (iResolution == 1 || iResolution == 2)
 	{
 		DrawTextOnMapBorder();
 	}
 
-	// WANNE Invalidate!!
 	RestoreExternBackgroundRect( MAP_BORDER_X, MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X, SCREEN_HEIGHT );
 		
 	// show the level marker
@@ -291,7 +286,6 @@ void RenderMapBorderEtaPopUp( void )
 	// get and blt ETA box
 	GetVideoObject(&hHandle, guiMapBorderEtaPopUp ); 
 
-	// WANNE 2 <change ETA position>
 	/*BltVideoObject( FRAME_BUFFER , hHandle, 0, MAP_BORDER_X + 215, 291, VO_BLT_SRCTRANSPARENCY,NULL );
 		
 	InvalidateRegion( MAP_BORDER_X + 215, 291, MAP_BORDER_X + 215 + 100 , 310);*/
@@ -339,8 +333,6 @@ BOOLEAN CreateButtonsForMapBorder( void )
 	SetButtonFastHelpText( guiMapBorderScrollButtons[ 3 ], pMapScreenBorderButtonHelpText[ 9 ] );
 */
 
-
-	// WANNE 2
 	// towns
 	giMapBorderButtonsImage[ MAP_BORDER_TOWN_BTN ] = LoadButtonImage( "INTERFACE\\map_border_buttons.sti" ,-1,5,-1,14,-1 );
   giMapBorderButtons[ MAP_BORDER_TOWN_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_TOWN_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 152), (SCREEN_HEIGHT - 160),
@@ -1182,7 +1174,6 @@ void DisplayCurrentLevelMarker( void )
 	GetVideoObject(&hHandle, guiLEVELMARKER ); 
 	BltVideoObject( guiSAVEBUFFER , hHandle, 0,	MAP_LEVEL_MARKER_X + 1, MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * ( INT16 )iCurrentMapSectorZ ), VO_BLT_SRCTRANSPARENCY,NULL );
 
-	// WANNE 2
 	RestoreExternBackgroundRect(MAP_LEVEL_MARKER_X + 1, MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * ( INT16 )iCurrentMapSectorZ ), 55, 9);
 
 

Strategic/Map Screen Interface Bottom.cpp

@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
@@ -52,8 +51,6 @@
 	#include "SaveLoadScreen.h"
 #endif
 
-
-// WANNE 2
 #define MAP_BOTTOM_X							0
 #define MAP_BOTTOM_Y							(SCREEN_HEIGHT - 121)	//359
 
@@ -282,11 +279,8 @@ void RenderMapScreenInterfaceBottom( void )
 	HVOBJECT hHandle;
 	CHAR8 bFilename[ 32 ];
 	
-	// WANNE 2
 	fDisplayOverheadMap = FALSE;
 
-
-	// WANNE 2 <redraw>
 	// render whole panel
 	if( fMapScreenBottomDirty == TRUE )
 	{
@@ -312,7 +306,6 @@ void RenderMapScreenInterfaceBottom( void )
 		// dirty buttons
 		MarkButtonsDirty( );
 
-		// WANNE 2
 		// invalidate region
 		RestoreExternBackgroundRect( MAP_BOTTOM_X, MAP_BOTTOM_Y, SCREEN_WIDTH, SCREEN_HEIGHT - MAP_BOTTOM_Y );
 
@@ -593,7 +586,6 @@ void DrawNameOfLoadedSector( void )
 	GetSectorIDString( sSelMapX, sSelMapY, ( INT8 )( iCurrentMapSectorZ ),sString, TRUE );
 	ReduceStringLength( sString, 80, COMPFONT );
 
-	// WANNE 2
 	//VarFindFontCenterCoordinates( 548, 426, 80, 16, COMPFONT, &sFontX, &sFontY, sString );
 	VarFindFontCenterCoordinates( (SCREEN_WIDTH - 92), (SCREEN_HEIGHT - 55), 80, 16, COMPFONT, &sFontX, &sFontY, sString );
 	mprintf( sFontX, sFontY, L"%s", sString );
@@ -939,7 +931,6 @@ void DisplayCompressMode( void )
 	}
 
 	//RestoreExternBackgroundRect( 489, 456, 522 - 489, 467 - 454 );
-	// WANNE 2
 	RestoreExternBackgroundRect( (SCREEN_WIDTH - 151), (SCREEN_HEIGHT - 24), 63, 13 );
 
 	SetFontDestBuffer( FRAME_BUFFER, 0,0,SCREEN_WIDTH,SCREEN_HEIGHT, FALSE );
@@ -967,7 +958,6 @@ void DisplayCompressMode( void )
 	SetFontForeground( usColor );
 	SetFontBackground( FONT_BLACK );
   
-	// WANNE 2
 	//FindFontCenterCoordinates( 489, 456, 522 - 489, 467 - 454, sString, COMPFONT, &sX, &sY );
 	FindFontCenterCoordinates( (SCREEN_WIDTH - 151), (SCREEN_HEIGHT - 24), 33, 13, sString, COMPFONT, &sX, &sY );
 	mprintf( sX, sY, sString );
@@ -982,7 +972,6 @@ void CreateCompressModePause( void )
 	/*MSYS_DefineRegion( &gMapPauseRegion, 487, 456, 522, 467, MSYS_PRIORITY_HIGH,
 							MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressModeClickCallback );*/
 
-	// WANNE 2
 	MSYS_DefineRegion( &gMapPauseRegion, (SCREEN_WIDTH - 153), (SCREEN_HEIGHT - 24), (SCREEN_WIDTH - 118), (SCREEN_HEIGHT - 13), MSYS_PRIORITY_HIGH,
 							MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressModeClickCallback );
 
@@ -1399,7 +1388,6 @@ void DisplayCurrentBalanceTitleForMapBottom( void )
 
 	swprintf( sString, L"%s", pMapScreenBottomText[ 0 ] );
 
-	// WANNE 2
 	// center it
 	VarFindFontCenterCoordinates( 359, (SCREEN_HEIGHT - 107),  78, 10,  COMPFONT, &sFontX, &sFontY, sString );
 	//VarFindFontCenterCoordinates( 359, 387 - 14,  437 - 359, 10,  COMPFONT, &sFontX, &sFontY, sString );
@@ -1409,7 +1397,6 @@ void DisplayCurrentBalanceTitleForMapBottom( void )
 
 	swprintf( sString, L"%s", zMarksMapScreenText[ 2 ] );
 
-	// WANNE 2
 	// center it
 	//VarFindFontCenterCoordinates( 359, 433 - 14,  437 - 359, 10,  COMPFONT, &sFontX, &sFontY, sString );
 	VarFindFontCenterCoordinates( 359, (SCREEN_HEIGHT - 61),  78, 10,  COMPFONT, &sFontX, &sFontY, sString );
@@ -1443,7 +1430,6 @@ void DisplayCurrentBalanceForMapBottom( void )
 	InsertCommasForDollarFigure( sString );
 	InsertDollarSignInToString( sString );
 
-	// WANNE 2
 	// center it
 	VarFindFontCenterCoordinates( 359, (SCREEN_HEIGHT - 91),  78, 10,  COMPFONT, &sFontX, &sFontY, sString );
 	
@@ -1486,7 +1472,6 @@ void CreateDestroyMouseRegionMasksForTimeCompressionButtons( void )
 		//MSYS_DefineRegion( &gTimeCompressionMask[ 2 ], 487, 456, 522, 467, MSYS_PRIORITY_HIGHEST - 1,
 		//					MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressMaskClickCallback );
 
-		// WANNE 2
 		// mask over compress more button
 		MSYS_DefineRegion( &gTimeCompressionMask[ 0 ], (SCREEN_WIDTH - 112), (SCREEN_HEIGHT - 24), (SCREEN_WIDTH - 112) + 13, (SCREEN_HEIGHT - 24) + 14, MSYS_PRIORITY_HIGHEST - 1,
 							MSYS_NO_CURSOR, MSYS_NO_CALLBACK, CompressMaskClickCallback );
@@ -1557,7 +1542,6 @@ void DisplayProjectedDailyMineIncome( void )
 	InsertDollarSignInToString( sString );
 
 	// center it
-	// WANNE 2
 	VarFindFontCenterCoordinates( 359, (SCREEN_HEIGHT - 45),  78, 10,  COMPFONT, &sFontX, &sFontY, sString );
 	
 	// print it
@@ -1768,7 +1752,6 @@ void HandleExitsFromMapScreen( void )
 					if( gfExtraBuffer )
 					{ //Then initiate the transition animation from the mapscreen to laptop...
 						
-						// WANNE 2
 						BlitBufferToBuffer( FRAME_BUFFER, guiEXTRABUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
 						gfStartMapScreenToLaptopTransition = TRUE;
 					}

Strategic/Map Screen Interface Map Inventory.cpp

@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 	#include "GameSettings.h"
@@ -40,7 +39,6 @@
 
 extern BOOLEAN SaveWorldItemsToTempItemFile( INT16 sMapX, INT16 sMapY, INT8 bMapZ, UINT32 uiNumberOfItems, WORLDITEM *pData );
 
-// WANNE 2
 #define MAP_INV_X_OFFSET							(((SCREEN_WIDTH - 261) - 380) / 2)
 //#define MAP_INV_Y_OFFSET					(((SCREEN_HEIGHT - 121) - 
 
@@ -92,7 +90,6 @@ extern BOOLEAN SaveWorldItemsToTempItemFile( INT16 sMapX, INT16 sMapY, INT8 bMap
 #define MAP_INVEN_SLOT_HEIGHT 32 
 #define MAP_INVEN_SLOT_IMAGE_HEIGHT 24 
 
-// WANNE 2
 // Number of inventory slots in 1024x768
 #define MAP_INVENTORY_POOL_MAX_SLOTS 170
 
@@ -129,7 +126,6 @@ UINT32 uiNumberOfUnSeenItems = 0;
 
 
 // the inventory slots
-// WANNE 2 <new>
 //MOUSE_REGION MapInventoryPoolSlots[ MAP_INVENTORY_POOL_SLOT_COUNT ];
 MOUSE_REGION MapInventoryPoolSlots[ MAP_INVENTORY_POOL_MAX_SLOTS ];
 
@@ -230,7 +226,6 @@ BOOLEAN LoadInventoryPoolGraphic( void )
 	// load the file
 	VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
 
-	// WANNE 2
 	if (iResolution == 0)
 	{
 		MAP_INV_SLOT_COLS = 8;
@@ -313,7 +308,6 @@ void BlitInventoryPoolGraphic( void )
 	// which buttons will be active and which ones not
 	HandleButtonStatesWhileMapInventoryActive( );
 
-	// WANNE 2
 	// Invalidate
 	RestoreExternBackgroundRect(MAP_BORDER_X, MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X, SCREEN_HEIGHT - 121);
 
@@ -731,11 +725,6 @@ void CreateMapInventoryPoolSlots( void )
 	INT16 sULX = 0, sULY = 0;
 	INT16 sBRX = 0, sBRY = 0;
 
-	// WANNE 2
-	//MSYS_DefineRegion( &MapInventoryPoolMask, 
-	//		MAP_INVENTORY_POOL_SLOT_START_X, 0, 640, 360,
-	//		MSYS_PRIORITY_HIGH, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MapInvenPoolScreenMaskCallback);
-
 	MSYS_DefineRegion( &MapInventoryPoolMask, 
 			MAP_INVENTORY_POOL_SLOT_START_X, 0, SCREEN_WIDTH - MAP_INVENTORY_POOL_SLOT_START_X, SCREEN_HEIGHT - 120,
 			MSYS_PRIORITY_HIGH, MSYS_NO_CURSOR, MSYS_NO_CALLBACK, MapInvenPoolScreenMaskCallback);
@@ -1835,7 +1824,6 @@ void DrawNumberOfIventoryPoolItems( void )
 
 void CreateMapInventoryPoolDoneButton( void )
 {
-	// WANNE 2
 	// create done button
 	guiMapInvenButtonImage[ 2 ]=  LoadButtonImage( "INTERFACE\\done_button.sti" , -1, 0, -1, 1, -1 );
 	guiMapInvenButton[ 2 ] = QuickCreateButton( guiMapInvenButtonImage[ 2 ], MAP_INV_X_OFFSET + 587 , (SCREEN_HEIGHT - 147),
@@ -1923,7 +1911,6 @@ void DrawTextOnMapInventoryBackground( void )
 	//usStringHeight = DisplayWrappedString( 369, 342, 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 1 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT );
 	//DisplayWrappedString( 369, (UINT16)(342 - (usStringHeight / 2) ), 65, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 1 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED );
 
-	// WANNE 2
 	//Calculate the height of the string, as it needs to be vertically centered.
 	usStringHeight = DisplayWrappedString( MAP_INV_X_OFFSET + 268, (SCREEN_HEIGHT - 138), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 0 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED | DONT_DISPLAY_TEXT );
 	DisplayWrappedString( MAP_INV_X_OFFSET + 268, (UINT16)((SCREEN_HEIGHT - 138) - (usStringHeight / 2) ), 53, 1, MAP_IVEN_FONT, FONT_BEIGE, pMapInventoryStrings[ 0 ], FONT_BLACK, FALSE, RIGHT_JUSTIFIED );

Strategic/Map Screen Interface Map.cpp

@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 	#include "GameSettings.h"
@@ -83,7 +82,6 @@ INT32 iZoomY = 0;
 #define MAP_HELICOPTER_ETA_POPUP_WIDTH			120
 #define MAP_HELICOPTER_ETA_POPUP_HEIGHT			68
 
-// WANNE 2
 #define MAP_LEVEL_STRING_X						(SCREEN_WIDTH - 208)		//432
 #define MAP_LEVEL_STRING_Y						(SCREEN_HEIGHT - 175)		//305
 
@@ -99,9 +97,8 @@ INT32 iZoomY = 0;
 
 //Map Location index regions
 
-// WANNE 2 <change THIS>
 
-// WANNE 2 (The numbers above the map)
+// WANNE: The numbers above the map
 // x start of hort index
 #define MAP_HORT_INDEX_X						(MAP_BORDER_X + MAP_BORDER_X_OFFSET + 31)//(SCREEN_WIDTH - 348)	//292	
 // y position of hort index
@@ -110,7 +107,7 @@ INT32 iZoomY = 0;
 #define MAP_HORT_HEIGHT							GetFontHeight(MAP_FONT)
 
 
-// WANNE 2 (the letters on the left side of the map)
+// WANNE: The letters on the left side of the map)
 // vert index start x
 #define MAP_VERT_INDEX_X						(MAP_BORDER_X + MAP_BORDER_X_OFFSET + 13)		//(SCREEN_WIDTH - 367) // 273
 // vert index start y
@@ -422,7 +419,6 @@ INT16 gpSamSectorY[ MAX_NUMBER_OF_SAMS ];
 
 extern BOOLEAN fSamSiteFoundOrig[ MAX_NUMBER_OF_SAMS ];
 
-// WANNE 2 (reinitialization in "DrawMap()")
 // map region
 SGPRect MapScreenRect={	(MAP_VIEW_START_X+MAP_GRID_X - 2),	( MAP_VIEW_START_Y+MAP_GRID_Y - 1), MAP_VIEW_START_X + MAP_VIEW_WIDTH - 1 + MAP_GRID_X , MAP_VIEW_START_Y+MAP_VIEW_HEIGHT-10+MAP_GRID_Y};
 
@@ -689,7 +685,6 @@ UINT32 DrawMap( void )
   INT16 cnt, cnt2;
 	INT32 iCounter = 0;
 
-	// WANNE 2 <initialization>
 	//MAP_VIEW_START_X = (SCREEN_WIDTH - 370);
 	//MAP_VIEW_START_Y = 10;
 
@@ -899,7 +894,6 @@ UINT32 DrawMap( void )
 
 	DisplayLevelString( );
 
-	// WANNE 2 <incommented>
 	RestoreClipRegionToFullScreen( );
 
 	return( TRUE );
@@ -3984,7 +3978,6 @@ void RestoreClipRegionToFullScreenForRectangle( UINT32 uiDestPitchBYTES )
 	// clip blits to map view region
 	//SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, 640, 480 );
 
-	// WANNE 2
 	SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
 
 	return;
@@ -4495,7 +4488,6 @@ void DisplayPositionOfHelicopter( void )
 			}
 */
 
-			// WANNE 2
 			AssertMsg( ( minX >= 0 ) && ( minX < SCREEN_WIDTH ), String( "DisplayPositionOfHelicopter: Invalid minX = %d", minX ) );
 			AssertMsg( ( maxX >= 0 ) && ( maxX < SCREEN_WIDTH ), String( "DisplayPositionOfHelicopter: Invalid maxX = %d", maxX ) );
 			AssertMsg( ( minY >= 0 ) && ( minY < SCREEN_WIDTH ), String( "DisplayPositionOfHelicopter: Invalid minY = %d", minY ) );
@@ -4518,8 +4510,6 @@ void DisplayPositionOfHelicopter( void )
 				y += 3;
 			}
 
-
-			// WANNE 2
 			AssertMsg( ( x >= 0 ) && ( x < (UINT32)SCREEN_WIDTH ), String( "DisplayPositionOfHelicopter: Invalid x = %d.  At %d,%d.  Next %d,%d.  Min/Max X = %d/%d",
 							x, pGroup->ubSectorX, pGroup->ubSectorY, pGroup->ubNextX, pGroup->ubNextY, minX, maxX ) );
 
@@ -4565,8 +4555,6 @@ void DisplayDestinationOfHelicopter( void )
 	UINT32 x,y;
 	HVOBJECT hHandle;
 
-
-	// WANNE 2
 	AssertMsg( ( sOldMapX >= 0 ) && ( sOldMapX < SCREEN_WIDTH ), String( "DisplayDestinationOfHelicopter: Invalid sOldMapX = %d", sOldMapX ) );
 	AssertMsg( ( sOldMapY >= 0 ) && ( sOldMapY < SCREEN_HEIGHT ), String( "DisplayDestinationOfHelicopter: Invalid sOldMapY = %d", sOldMapY ) );
 
@@ -4588,7 +4576,6 @@ void DisplayDestinationOfHelicopter( void )
 		x = MAP_VIEW_START_X + ( MAP_GRID_X * sMapX ) + 1;
 		y = MAP_VIEW_START_Y + ( MAP_GRID_Y * sMapY ) + 3;
 
-		// WANNE 2
 		AssertMsg( ( x >= 0 ) && ( x < (UINT32)SCREEN_WIDTH ), String( "DisplayDestinationOfHelicopter: Invalid x = %d.  Dest %d,%d", x, sMapX, sMapY ) );
 		AssertMsg( ( y >= 0 ) && ( y < (UINT32)SCREEN_HEIGHT ), String( "DisplayDestinationOfHelicopter: Invalid y = %d.  Dest %d,%d", y, sMapX, sMapY ) );
 
@@ -5034,7 +5021,6 @@ void DisplayLevelString( void )
 	SetFontBackground( FONT_BLACK );
 	swprintf( sString, L"%s %d", sMapLevelString[ 0 ], iCurrentMapSectorZ );
 	
-	// WANNE 2
 	mprintf(  MAP_LEVEL_STRING_X, MAP_LEVEL_STRING_Y, sString  );
 
 	SetFontDestBuffer( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );

Strategic/Map Screen Interface.cpp

@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 #else
@@ -66,7 +65,6 @@
 // number of LINKED LISTS for sets of leave items (each slot holds an unlimited # of items)
 #define NUM_LEAVE_LIST_SLOTS 20
 
-// WANNE 2 <change 2>
 #define SELECTED_CHAR_ARROW_X			1	//8
 
 #define SIZE_OF_UPDATE_BOX 20
@@ -107,7 +105,6 @@ enum{
 	OTHER_REGION,
 };
 
-// WANNE 2
 UINT16 usVehicleY = 0;
 
 // waiting list for update box
@@ -1174,7 +1171,6 @@ INT32 DoMapMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExit
 
 INT32 DoMapMessageBox( UINT8 ubStyle,  STR16 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback )
 {
-	// WANNE 2
   SGPRect CenteringRect= {0, 0, SCREEN_WIDTH, INV_INTERFACE_START_Y };
 
 	// reset the highlighted line
@@ -1330,7 +1326,6 @@ void HandleDisplayOfSelectedMercArrows( void )
 	
 	if( bSelectedInfoChar >= FIRST_VEHICLE )
 	{
-		// WANNE 2 <fixed>
 		usVehicleCount = bSelectedInfoChar - FIRST_VEHICLE;
 		sYPosition = usVehicleY+( usVehicleCount * ( Y_SIZE + 2) ) - 1;;
 	}
@@ -1352,7 +1347,6 @@ void HandleDisplayOfSelectedMercArrows( void )
 				
 				if( ubCount >= FIRST_VEHICLE )
 				{
-					// WANNE 2 <fixed>
 					usVehicleCount = ubCount - FIRST_VEHICLE;
 					sYPosition = usVehicleY+( usVehicleCount * ( Y_SIZE + 2) ) - 1;;
 				}
@@ -4939,7 +4933,6 @@ void DisplaySoldierUpdateBox( )
 
 	iUpdatePanelHeight = ( iNumberHigh + 1 ) * TACT_HEIGHT_OF_UPDATE_PANEL_BLOCKS;
 
-	// WANNE 2
 	iX = (MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2)) - (iUpdatePanelWidth / 2);
 	iY = (MAP_BORDER_Y + ((SCREEN_HEIGHT - 121) / 2)) - (iUpdatePanelHeight / 2);
 
@@ -5040,7 +5033,6 @@ void DisplaySoldierUpdateBox( )
 	}
 
 
-	// WANNE 2
 	//Display the reason for the update box
 	if( fFourWideMode ) 
 	{
@@ -5064,7 +5056,6 @@ void DisplaySoldierUpdateBox( )
 }
 
 
-// WANNE 2
 void CreateDestroyUpdatePanelButtons(INT32 iX, INT32 iY, BOOLEAN fFourWideMode )
 {
 	static BOOLEAN fCreated = FALSE;

Strategic/Quest Debug System.cpp

@@ -1241,7 +1241,6 @@ void		RenderQuestDebugSystem()
 	
   MarkButtonsDirty( );
 
-	// WANNE NEW:
 	//InvalidateRegion( 0, 0, 640, 480 );
   InvalidateRegion( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
 }

Strategic/Strategic AI.cpp

@@ -1,4 +1,3 @@
-// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 	#include "GameSettings.h"
@@ -780,7 +779,6 @@ void ValidateGroup( GROUP *pGroup )
 	INT32 iMaxEnemyGroupSize = gGameExternalOptions.iMaxEnemyGroupSize;
 DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic2");
 
-  // WANNE 2
   if (pGroup == NULL)
 	{
 		return;

Strategic/mapscreen.cpp

@@ -1,4 +1,4 @@
-// WANNE 2 <changed some lines> SCROLL BUTTONS CODE IS OUTCOMMENTED (search for // WANNE 2 <scroll>)
+// WANNE: SCROLL BUTTONS CODE IS OUTCOMMENTED (search for // WANNE: <scroll>)
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 	#include "HelpScreen.h"
@@ -201,7 +201,6 @@
 #define     INV_BODY_X 71
 #define     INV_BODY_Y 116
 
-// WANNE 2 <change 2>
 #define     NAME_X						4	
 #define     NAME_WIDTH					55 - NAME_X
 
@@ -216,13 +215,11 @@
 #define     TIME_REMAINING_X			215
 #define     TIME_REMAINING_WIDTH		243 - TIME_REMAINING_X
 
-// WANNE 2
 #define     CLOCK_Y_START			(MAP_BORDER_Y_OFFSET + 298) // 298
 
 #define     DEST_PLOT_X				(MAP_BORDER_X_OFFSET + 463)		//463
 #define     DEST_PLOT_Y				(MAP_BORDER_Y_OFFSET + 345)		//345
 
-// WANNE 2
 #define     CLOCK_ETA_X				(MAP_BORDER_X_OFFSET + 484)		//463 - 15 + 6 + 30
 #define     CLOCK_HOUR_X_START		(MAP_BORDER_X_OFFSET + 518)		//463 + 25 + 30
 #define     CLOCK_MIN_X_START		(MAP_BORDER_X_OFFSET + 538)		//463 + 45 + 30
@@ -334,7 +331,7 @@
 //#define	TM_INV_WIDTH								58
 //#define	TM_INV_HEIGHT								23
 
-// WANNE 2 (the position of the clock in the strategy screen)
+// WANNE: The position of the clock in the strategy screen
 //#define CLOCK_X		(SCREEN_WIDTH - 86)					//554
 //#define CLOCK_Y		(SCREEN_HEIGHT - 21)				//459
 
@@ -456,7 +453,6 @@ RGBCOLOR GlowColorsC[]={
 //	{223,125},
 //};
 
-// WANNE 2 <change 2>
 SGPPoint gMapSortButtons[ MAX_SORT_METHODS ]={
 	{5,113},
 	{61,113},
@@ -497,7 +493,7 @@ INV_REGION_DESC gSCamoXY =
 };
 
 
-// WANNE 2 <scroll>
+// WANNE: <scroll>
 // buttons images
 //UINT32 guiMapMercsScrollButtonsImage[ 2 ];
 //UINT32 guiMapMercsScrollButtons[ 2 ];
@@ -509,7 +505,7 @@ INV_REGION_DESC gSCamoXY =
 
 extern UINT16 usVehicleY;
 
-// WANNE 2 <scroll>
+// WANNE: <scroll>
 // button enums
 //enum{
 //	MAP_SCROLL_MERCS_UP =0,
@@ -524,7 +520,7 @@ extern UINT16 usVehicleY;
 
 // GLOBAL VARIABLES (OURS)
 
-// WANNE 2 <scroll>
+// WANNE: <scroll>
 //void CreateButtonsForScrolling(void);
 //void DeleteButtonsForScrolling(void);
 
@@ -1227,7 +1223,6 @@ void ContractListRegionBoxGlow( UINT16 usCount )
 		iColorNum--;
 
 
-	// WANNE 2
 	if( usCount >= FIRST_VEHICLE )
 	{
 		usVehicleCount = usCount - FIRST_VEHICLE;
@@ -1243,7 +1238,6 @@ void ContractListRegionBoxGlow( UINT16 usCount )
 	// y start position of box
 	//usY=(Y_OFFSET*usCount-1)+(Y_START+(usCount*Y_SIZE) + sYAdd );	
 
-	// WANNE 2 <this is not correct!!>
 	//usY=(Y_OFFSET*usCount-1)+(sYStart+(usCount*Y_SIZE));	
 
 	// glow contract box
@@ -2525,7 +2519,6 @@ void DisplayGroundEta( void )
 	SetFontForeground( FONT_LTGREEN );
 	SetFontBackground( FONT_BLACK );
 
-	// WANNE 2 <change ETA position>
 	mprintf( CLOCK_ETA_X, CLOCK_Y_START, pEtaString[ 0 ] ); 
 
 	// if less than one day
@@ -2601,7 +2594,6 @@ void HighLightAssignLine()
 			//usY=Y_START+(giHighLine*GetFontHeight((MAP_SCREEN_FONT)));
 			usY=(Y_OFFSET*usCount-1)+(Y_START+(usCount*Y_SIZE));
 			
-			// WANNE 2
 			if( usCount >= FIRST_VEHICLE )
 			{
 				usVehicleCount = usCount - FIRST_VEHICLE;
@@ -2685,7 +2677,6 @@ void HighLightDestLine()
 			usX=DEST_ETA_X-4;
 			usY=(Y_OFFSET*usCount-1)+(Y_START+(usCount*Y_SIZE));
 			
-			// WANNE 2
 			if( usCount >= FIRST_VEHICLE )
 			{
 				usVehicleCont = usCount - FIRST_VEHICLE;
@@ -2775,7 +2766,6 @@ void HighLightSleepLine()
 
 			usY=(Y_OFFSET*usCount-1)+(Y_START+(usCount*Y_SIZE));
 			
-			// WANNE 2
 			if( usCount >= FIRST_VEHICLE )
 			{
 				usVehicleCount = usCount - FIRST_VEHICLE;
@@ -3121,7 +3111,7 @@ UINT32 MapScreenHandle(void)
 		return( MAP_SCREEN );
 	}
 
-	// WANNE 2 <scroll>
+	// WANNE: <scroll>
 	/*if (fShowInventoryFlag == TRUE)
 	{
 		DeleteButtonsForScrolling();
@@ -3250,7 +3240,6 @@ UINT32 MapScreenHandle(void)
 		 /*strcpy(vs_desc.ImageFile, "INTERFACE\\playlist3.pcx");
 		 CHECKF(AddVideoSurface( &vs_desc, &guiCHARLIST ));*/
 		
-		 // WANNE 2
 		 VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
 		 if (iResolution == 0)
 		 {
@@ -3480,8 +3469,6 @@ UINT32 MapScreenHandle(void)
 		// create mouse region for pause clock
 		CreateMouseRegionForPauseOfClock( CLOCK_REGION_START_X, CLOCK_REGION_START_Y );
 
-		// WANNE 2
-
 		if (iResolution == 0)
 		{
 			usVehicleY = 319;
@@ -3924,7 +3911,7 @@ UINT32 MapScreenHandle(void)
 	RenderItemDescriptionBox( );
 
 	// render clock
-	// WANNE 2 <renders the clock in the strategy screen>
+	// WANNE: Renders the clock in the strategy screen
 	RenderClock(CLOCK_X, CLOCK_Y);
 
 	#ifdef JA2TESTVERSION
@@ -4308,8 +4295,6 @@ void SetClockMin(STR16 pStringA, ...)
 	mprintf( CLOCK_MIN_X_START-5, CLOCK_Y_START, String );
 }
 
-
-// WANNE 2 <change 2>
 void DrawName(STR16 pName, INT16 sRowIndex, INT32 iFont)
 {
 	INT16 usX=0;
@@ -4348,7 +4333,6 @@ void DrawAssignment(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont)
 	}
 	else
 	{
-		// WANNE 2
 		sRowIndex = sRowIndex - FIRST_VEHICLE;
 		//FindFontCenterCoordinates((short)ASSIGN_X + 1, (short)(Y_START+(sRowIndex*Y_SIZE) + 6), (short)ASSIGN_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
 		FindFontCenterCoordinates((short)ASSIGN_X + 1, (short)(usVehicleY+(sRowIndex*Y_SIZE)), (short)ASSIGN_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
@@ -4382,7 +4366,6 @@ void DrawLocation(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont)
 	}
 	else
 	{
-		// WANNE 2
 		//FindFontCenterCoordinates((short)LOC_X + 1, (short)(Y_START+(sRowIndex*Y_SIZE) + 6), (short)LOC_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
 		sRowIndex = sRowIndex - FIRST_VEHICLE;
 		FindFontCenterCoordinates((short)LOC_X + 1, (short)(usVehicleY+(sRowIndex*Y_SIZE)), (short)LOC_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
@@ -4414,7 +4397,6 @@ void DrawDestination(INT16 sCharNumber, INT16 sRowIndex, INT32 iFont)
 	}
 	else
 	{
-		// WANNE 2
 		sRowIndex = sRowIndex - FIRST_VEHICLE;
 		//FindFontCenterCoordinates((short)DEST_ETA_X + 1, (short)(Y_START+(sRowIndex*Y_SIZE) + 6 ), (short)DEST_ETA_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
 		FindFontCenterCoordinates((short)DEST_ETA_X + 1, (short)(usVehicleY+(sRowIndex*Y_SIZE)), (short)DEST_ETA_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
@@ -4450,7 +4432,6 @@ void DrawTimeRemaining( INT16 sCharNumber, INT32 iFont, UINT8 ubFontColor )
 	}
 	else
 	{
-		// WANNE 2
 		sCharNumber = sCharNumber - FIRST_VEHICLE;
 		//FindFontCenterCoordinates((short)TIME_REMAINING_X + 1, (short)(Y_START+(sCharNumber*Y_SIZE) + 6 ), (short)TIME_REMAINING_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
 		FindFontCenterCoordinates((short)TIME_REMAINING_X + 1, (short)(usVehicleY+(sCharNumber*Y_SIZE)), (short)TIME_REMAINING_WIDTH, (short)Y_SIZE, sString, (long)iFont, &usX, &usY);
@@ -6096,7 +6077,7 @@ void EndMapScreen( BOOLEAN fDuringFade )
 
 	DeleteMouseRegionsForLevelMarkers( );
 
-	// WANNE 2 <scroll>
+	// WANNE: <scroll>
 	//DeleteButtonsForScrolling();
 
 	if( fShowMapInventoryPool == FALSE )
@@ -7566,7 +7547,7 @@ void BlitBackgroundToSaveBuffer( void )
 	}
 	else if( gfPreBattleInterfaceActive )
 	{
-		// WANNE 2 <scroll>
+		// WANNE: <scroll>
 		//DeleteButtonsForScrolling();
 
 		ForceButtonUnDirty( giMapContractButton );
@@ -7579,7 +7560,6 @@ void BlitBackgroundToSaveBuffer( void )
 	RenderMapScreenInterfaceBottom( );
 }
 
-// WANNE 2
 void CreateMouseRegionsForTeamList( void )
 {
 	// will create mouse regions for assignments, path plotting, character info selection
@@ -7606,7 +7586,6 @@ void CreateMouseRegionsForTeamList( void )
 			//sYAdd = 0;
 		}
 
-		// WANNE 2
 		// name region
 		MSYS_DefineRegion( &gTeamListNameRegion[ sCounter ] , NAME_X, ( INT16 )( sYStart + ( sOffsetCounter ) * ( Y_SIZE + 2 )), NAME_X + NAME_WIDTH, ( INT16 )( (sYStart + 10) + ( sOffsetCounter + 1 ) * ( Y_SIZE + 2 )), MSYS_PRIORITY_NORMAL,
 							 MSYS_NO_CURSOR, TeamListInfoRegionMvtCallBack, TeamListInfoRegionBtnCallBack ); 
@@ -8683,7 +8662,6 @@ void RenderMapRegionBackground( void )
 
 	MapscreenMarkButtonsDirty();
 
-	// WANNE 2
 	//RestoreExternBackgroundRect( 261, 0, 379, 359 );
 
 	RestoreExternBackgroundRect( 261, 0, SCREEN_WIDTH - 261, SCREEN_HEIGHT - 121 );
@@ -8757,7 +8735,6 @@ void RenderTeamRegionBackground( void )
 	
 	// restore background for area
 	
-	// WANNE 2
 	RestoreExternBackgroundRect( 0, 107, 261, SCREEN_HEIGHT - 106 - 121 );
 
 	MapscreenMarkButtonsDirty();
@@ -10379,7 +10356,6 @@ BOOLEAN HandlePreloadOfMapGraphics( void )
 	/*strcpy(vs_desc.ImageFile, "INTERFACE\\playlist3.pcx");
 	CHECKF(AddVideoSurface( &vs_desc, &guiCHARLIST ));*/
 
-	// WANNE 2
 	VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
 	if (iResolution == 0)
 	{
@@ -10702,32 +10678,32 @@ void NextInventoryMapBtnCallback( GUI_BUTTON *btn, INT32 reason )
 	}	
 }
 
-// WANNE 2 <scroll>
+// WANNE: <scroll>
 //void BtnMercsUpMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
 //{
-//	// WANNE 2 -> see Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
+//	// WANNE: See Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
 //	int i = 10;
 //}
 //
 //void BtnMercsDownMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
 //{
-//	// WANNE 2 -> see Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
+//	// WANNE: See Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
 //	int i = 10;
 //}
 //
 //void BtnVehicleUpMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
 //{
-//	// WANNE 2 -> see Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
+//	// WANNE: See Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
 //	int i = 10;
 //}
 //
 //void BtnVehicleDownMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
 //{
-//	// WANNE 2 -> see Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
+//	// WANNE: See Map Screen Interface Bottom Line 766 (BtnMessageUpMapScreenCallback)
 //	int i = 10;
 //}
 
-// WANNE 2 <scroll>
+// WANNE: <scroll>
 //void DeleteButtonsForScrolling(void)
 //{
 //	if (fScrollButtonsInitialized == TRUE)
@@ -10747,7 +10723,7 @@ void NextInventoryMapBtnCallback( GUI_BUTTON *btn, INT32 reason )
 //	}
 //}
 
-// WANNE 2 <scroll>
+// WANNE: <scroll>
 // Create the scrolling arrows
 //void CreateButtonsForScrolling( void )
 //{
@@ -11380,7 +11356,6 @@ void DisplayIconsForMercsAsleep( void )
 			pSoldier = MercPtrs[ gCharactersList[ iCounter ].usSolID ];
 			if( pSoldier->bActive && pSoldier->fMercAsleep && CanChangeSleepStatusForSoldier( pSoldier ) )
 			{
-				// WANNE 2
 				//BltVideoObject( guiSAVEBUFFER , hHandle, 0, 125, ( INT16 )( Y_START+(iCounter * ( Y_SIZE + 2 ) ) ) , VO_BLT_SRCTRANSPARENCY,NULL );
 				BltVideoObject( guiSAVEBUFFER , hHandle, 0, SLEEP_X + 2, ( INT16 )( Y_START+(iCounter * ( Y_SIZE + 2 ) ) ) , VO_BLT_SRCTRANSPARENCY,NULL );
 			}
@@ -11398,7 +11373,6 @@ void CheckForAndRenderNewMailOverlay()
 	{
 		if( GetJA2Clock() % 1000 < 667 )
 		{
-			// WANNE 2
 			if( ButtonList[ guiMapBottomExitButtons[ MAP_EXIT_TO_LAPTOP ] ]->uiFlags & BUTTON_CLICKED_ON )
 			{ //button is down, so offset the icon
 				//BltVideoObjectFromIndex( FRAME_BUFFER, guiNewMailIcons, 1, 465, 418, VO_BLT_SRCTRANSPARENCY, NULL );
@@ -11406,7 +11380,6 @@ void CheckForAndRenderNewMailOverlay()
 				//InvalidateRegion( 465, 418, 480, 428 );
 				InvalidateRegion( (SCREEN_WIDTH - 175), (SCREEN_HEIGHT - 62), (SCREEN_WIDTH - 160), (SCREEN_HEIGHT - 52 ));
 			}
-			// WANNE 2
 			else
 			{	//button is up, so draw the icon normally
 				//BltVideoObjectFromIndex( FRAME_BUFFER, guiNewMailIcons, 0, 464, 417, VO_BLT_SRCTRANSPARENCY, NULL );

Strategic/strategicmap.cpp

@@ -1,6 +1,5 @@
 #include "builddefines.h"
 
-// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Strategic All.h"
 	#include "Loading Screen.h"
@@ -1232,7 +1231,7 @@ UINT32 UndergroundTacticalTraversalTime( INT8 bExitDirection )
 	return 0xffffffff;
 }
 
-// WANNE 2 <zooming>
+// WANNE: Zooming Animation of the laptop in strategic screen
 void BeginLoadScreen( void )
 {
 	SGPRect SrcRect, DstRect;