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
This commit is contained in:
Wanne
2014-07-26 13:07:32 +00:00
parent caa8f58c0e
commit 05fdcb5d2e
12 changed files with 39 additions and 15 deletions
+12 -2
View File
@@ -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;