Merged from revision: 7318

- Added support for multilanguage INTERFACE/ITEMINFOADVANCEDICONS.sti (e.g: GERMAN\ITEMINFOADVANCEDICONS_GERMAN.sti, FRENCH\ITEMINFOADVANCEDICONS_FRENCH.sti, ...)
- Fixed compilation errors in GERMAN version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-07-08 20:32:42 +00:00
parent 2b63a5b568
commit 8ddeff6988
5 changed files with 29 additions and 9 deletions
+6 -2
View File
@@ -84,6 +84,8 @@
#include "Encyclopedia_new.h" //Moa: enc. item visibility
#endif
#include "Multi Language Graphic Utils.h"
#ifdef JA2UB
#include "Ja25_Tactical.h"
#endif
@@ -1456,7 +1458,8 @@ BOOLEAN InitInvSlotInterface( INV_REGION_DESC *pRegionDesc , INV_REGION_DESC *pC
if ( gGameExternalOptions.fScopeModes && gGameExternalOptions.fDisplayScopeModes )
{
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
strcpy( VObjectDesc.ImageFile, "INTERFACE\\ItemInfoAdvancedIcons.STI" );
GetMLGFilename( VObjectDesc.ImageFile, MLG_ITEMINFOADVANCEDICONS ); // WANNE: Now the icons are for multi-language
//strcpy( VObjectDesc.ImageFile, "INTERFACE\\ItemInfoAdvancedIcons.STI" );
CHECKF( AddVideoObject( &VObjectDesc, &guiItemInfoAdvancedIcon) );
}
@@ -4030,7 +4033,8 @@ void INVRenderItem( UINT32 uiBuffer, SOLDIERTYPE * pSoldier, OBJECTTYPE *pObjec
// HEADROCK HAM 4: Advanced Icons
VOBJECT_DESC VObjectDesc;
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
strcpy( VObjectDesc.ImageFile, "INTERFACE\\ItemInfoAdvancedIcons.STI" );
//strcpy( VObjectDesc.ImageFile, "INTERFACE\\ItemInfoAdvancedIcons.STI" );
GetMLGFilename( VObjectDesc.ImageFile, MLG_ITEMINFOADVANCEDICONS ); // WANNE: Now the icons are for multi-language
AddVideoObject( &VObjectDesc, &guiItemInfoAdvancedIcon);
}