Data and Source v1.13 Mod High Resolution version from 2006-03-01

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

Utils/PopUpBox.cpp

@@ -1,3 +1,4 @@
+// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Utils All.h"
 #else
@@ -1314,8 +1315,8 @@ BOOLEAN DrawBox(UINT32 uiCounter)
 	}
 
 	// make sure it will fit on screen!
-	Assert( usTopX + usWidth  <= 639 );
-	Assert( usTopY + usHeight <= 479 );
+	Assert( usTopX + usWidth  <= SCREEN_WIDTH );
+	Assert( usTopY + usHeight <= SCREEN_HEIGHT );
 
 	// subtract 4 because the 2 2-pixel corners are handled separately
 	uiNumTilesWide=((usWidth-4)/BORDER_WIDTH);

Utils/_EnglishText.cpp

@@ -1,3 +1,4 @@
+// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Utils All.h"
 #else
@@ -1904,7 +1905,7 @@ STR16 pMapErrorString[] =
 	L"needs an escort to move. Place her on a squad with one.", // for a female
 	L"Merc hasn't yet arrived in Arulco!",
 	L"Looks like there's some contract negotiations to settle first.",
-	L"",
+	L"Cannot give a movement order. Air raid is going on.",		// WANNE 2
 //11-15
 	L"Movement orders? There's a battle going on!",
 	L"You have been ambushed by bloodcats in sector %s!",
@@ -3300,6 +3301,8 @@ STR16		zMarksMapScreenText[] =
 	L"%s is full of militia.",
 	L"Merc has a finite contract.", 
   L"Merc's contract is not insured",
+	// WANNE 2
+	L"Map Overview",		// 24
 };
 
 

Utils/_GermanText.cpp

@@ -1,3 +1,4 @@
+// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Utils All.h"
 #else
@@ -1830,7 +1831,7 @@ STR16 pMapErrorString[] =
 	L"braucht eine Eskorte. Plazieren Sie sie in einem Trupp mit Eskorte.", // for a female
 	L"Söldner ist noch nicht in Arulco!",
 	L"Erst mal Vertrag aushandeln!",
-	L"",
+	L"Marschbefehl ist nicht möglich. Luftangriffe finden statt.",		// WANNE 2
 //11-15
 	L"Marschbefehl? Hier tobt ein Kampf!",
 	L"Sie sind von Bloodcats umstellt in Sektor %s!",
@@ -3108,6 +3109,8 @@ STR16 zMarksMapScreenText[] =
 	L"%s ist voller Milizen.",
 	L"Söldner hat begrenzten Vertrag.", 
 	L"Vertrag des Söldners ist nicht versichert",
+	// WANNE 2
+	L"Kartenübersicht",		// 24
 };
 
 STR16 pLandMarkInSectorString[] =

Utils/message.cpp

@@ -1,4 +1,4 @@
-// WANNE <08.12.2005>
+// WANNE 2 <changed some lines>
 #ifdef PRECOMPILEDHEADERS
 	#include "Utils All.h"
 	#include "Game Clock.h"
@@ -1086,8 +1086,10 @@ void DisplayStringsInMapScreenMessageList( void )
 	UINT16 usSpacing;
 
 
-	// WANNE <change this???>
-	SetFontDestBuffer( FRAME_BUFFER, 17, 360 + 6, 407, 360 + 101, FALSE );
+	// WANNE 2
+	//SetFontDestBuffer( FRAME_BUFFER, 17, 360 + 6, 407, 360 + 101, FALSE );
+
+	SetFontDestBuffer( FRAME_BUFFER, 17, (SCREEN_HEIGHT - 114), 407, (SCREEN_HEIGHT - 114) + 101, FALSE );
 
 	SetFont( MAP_SCREEN_MESSAGE_FONT );		// no longer supports variable fonts
 	SetFontBackground( FONT_BLACK );
@@ -1095,7 +1097,10 @@ void DisplayStringsInMapScreenMessageList( void )
 
 	ubCurrentStringIndex = gubCurrentMapMessageString;
 
-	sY = 377;
+	// WANNE 2
+	//sY = 377;
+	sY = (SCREEN_HEIGHT - 103);
+
 	usSpacing = GetFontHeight( MAP_SCREEN_MESSAGE_FONT );
 
 	for ( ubLinesPrinted = 0; ubLinesPrinted < MAX_MESSAGES_ON_MAP_BOTTOM; ubLinesPrinted++ )