Merged from revision: 7363

- Map Editor now properly handles all available items without empty placeholders in between (by anv)
- Added item compare popup help text (by Buggler)
- Enemy icons will not be shown as 10x icons in 640x480 due to visibility issues (the rest remains as it is) (by Buggler)

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

Strategic/Map Screen Interface Map Inventory.cpp

@@ -748,7 +748,7 @@ BOOLEAN RenderItemInPoolSlot( INT32 iCurrentSlot, INT32 iFirstSlotOnPage )
 
 void UpdateHelpTextForInvnentoryStashSlots( void )
 {
-	CHAR16 pStr[ 512 ];
+	CHAR16 pTemp[ 512 ], pStr[ 512 ];
 	INT32 iCounter = 0;
 	INT32 iFirstSlotOnPage = ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT );
 
@@ -758,7 +758,8 @@ void UpdateHelpTextForInvnentoryStashSlots( void )
 	{
 		if( pInventoryPoolList[ iCounter + iFirstSlotOnPage ].object.exists() == true )
 		{
-			GetHelpTextForItem( pStr , &( pInventoryPoolList[ iCounter + iFirstSlotOnPage ].object ), NULL );
+			GetHelpTextForItem( pTemp , &( pInventoryPoolList[ iCounter + iFirstSlotOnPage ].object ), NULL );
+			swprintf( pStr, L"%s\n \n%s", pTemp, gzMiscItemStatsFasthelp[ 34 ] );
 			SetRegionFastHelpText( &(MapInventoryPoolSlots[ iCounter ] ), pStr );
 
 			/*

Strategic/Map Screen Interface Map.cpp

@@ -1330,8 +1330,18 @@ void ShowEnemiesInSector( INT16 sSectorX, INT16 sSectorY, INT16 sNumberOfEnemies
 	GetVideoObject(&hIconHandle, guiCHARICONS);
 	
 	sEnemyLessTank = sNumberOfEnemies - usNumTanks;
-	ub10xEnemy = sEnemyLessTank / 10;
-	ubEnemy = sEnemyLessTank % 10;
+	
+	// no 10x icon for easy enemy quantity gauge in low resolution
+	if (iResolution >= _640x480 && iResolution < _800x600)
+	{
+		ub10xEnemy = 0;
+		ubEnemy = sNumberOfEnemies;
+	}
+	else
+	{
+		ub10xEnemy = sNumberOfEnemies / 10;
+		ubEnemy = sNumberOfEnemies % 10;
+	}
 
 	// Flugente: if we display tanks, we need to know that for several rows
 	INT16 secondtankrowstart = -1;