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
+7 -2
View File
@@ -157,7 +157,8 @@ void EntryInitEditorItemsInfo()
for( i=0; i < MAXITEMS; i++ )
{
if ( Item[i].usItemClass == 0 )
break;
//break;
continue;
item = &Item[i];
//if( Item[i].fFlags & ITEM_NOT_EDITOR )
// continue;
@@ -419,7 +420,11 @@ void InitEditorItemsInfo(UINT32 uiItemType)
while( usCounter<MAXITEMS && !fTypeMatch )
{
if ( Item[usCounter].usItemClass == 0 )
break;
{
//break;
usCounter++;
continue;
}
item = &Item[usCounter];
//if( Item[usCounter].fFlags & ITEM_NOT_EDITOR )
if(item->notineditor)