1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 7318

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Enhanced.cpp
+4 -1
View File
@@ -59,6 +59,8 @@
#include "Food.h" // added by Flugente
#endif
#include "Multi Language Graphic Utils.h"
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
class SOLDIERTYPE;
@@ -1363,7 +1365,8 @@ BOOLEAN InternalInitEnhancedDescBox()
// HEADROCK HAM 4: Advanced Icons
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 ) );
// Flugente: added icons for WH40K
Tactical/Interface Items.cpp
+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);
}
Utils/Multi Language Graphic Utils.cpp
+12
View File
@@ -132,6 +132,9 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID )
case MLG_MP_GOLDPIECEBUTTONS:
sprintf( filename, "INTERFACE\\MPGOLDPIECEBUTTONS.sti" );
return TRUE;
case MLG_ITEMINFOADVANCEDICONS:
sprintf( filename, "INTERFACE\\ITEMINFOADVANCEDICONS.sti" );
return TRUE;
}
#elif defined( GERMAN )
@@ -258,6 +261,9 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID )
case MLG_MP_GOLDPIECEBUTTONS:
sprintf( filename, "GERMAN\\MPGOLDPIECEBUTTONS_german.sti" );
return TRUE;
case MLG_ITEMINFOADVANCEDICONS:
sprintf( filename, "GERMAN\\ITEMINFOADVANCEDICONS_german.sti" );
return TRUE;
}
#else
@@ -415,6 +421,9 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID )
case MLG_MP_GOLDPIECEBUTTONS:
sprintf( filename, "%s\\MPGOLDPIECEBUTTONS_%s.sti", zLanguage, zLanguage );
break;
case MLG_ITEMINFOADVANCEDICONS:
sprintf( filename, "%s\\ITEMINFOADVANCEDICONS_%s.sti", zLanguage, zLanguage );
break;
default:
return FALSE;
}
@@ -539,6 +548,9 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID )
case MLG_MP_GOLDPIECEBUTTONS:
sprintf( filename, "INTERFACE\\MPGOLDPIECEBUTTONS.sti" );
return TRUE;
case MLG_ITEMINFOADVANCEDICONS:
sprintf( filename, "INTERFACE\\ITEMINFOADVANCEDICONS.sti" );
return TRUE;
}
#endif
Utils/Multi Language Graphic Utils.h
+2 -1
View File
@@ -38,10 +38,11 @@ enum
MLG_TOSTATS,
MLG_WARNING,
MLG_YOURAD13,
MLG_TITLETEXT_MP, // ROMAN: Additional multiplayer text
MLG_TITLETEXT_MP, // WANNE: Additional multiplayer text
MLG_BOBBYRAYTITLE, //inshy: translation needed for russian version
MLG_BR,
MLG_MP_GOLDPIECEBUTTONS,
MLG_ITEMINFOADVANCEDICONS, // WANNE: Language specific Icons
};
BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID );
Utils/_Ja25GermanText.cpp
+5 -5
View File
@@ -453,11 +453,11 @@ STR16 gzIMPNewCharacterTraitsHelpTexts[]=
STR16 gzIMPDisabilitiesHelpTexts[]=
{
L"Keine besonderen Einschränkungen.",
L"Leidet an Atemproblemen und zeigt allgemein schlechtere Leistung in tropischen und Wüstensektoren",
L"Erleidet allein in schwierigen Situationen Panikattacken",
L"Zeigt schlechtere Leistung unter Tage",
L"Kann bei Schwimmversuchen leicht ertrinken",
L"Erträgt den Anblick großer Insekten nicht und\nzeigt etwas schlechtere Leistung in Wüsten- oder tropischen oder Sektoren",
L"Leidet an Atemproblemen und zeigt allgemein schlechtere Leistung in tropischen und Wüstensektoren.",
L"Erleidet allein in schwierigen Situationen Panikattacken.",
L"Zeigt schlechtere Leistung unter Tage.",
L"Kann bei Schwimmversuchen leicht ertrinken.",
L"Erträgt den Anblick großer Insekten nicht und\nzeigt etwas schlechtere Leistung in Wüsten- oder tropischen oder Sektoren.",
L"Vergisst manchmal seine Befehle und verliert dadurch im Kampf einen Teil seiner APs.",
L"Dreht manchmal durch und schießt dabei hin und wieder wild um sich.\nVerliert Moral, wenn das mit der ausgerüsteten Waffe nicht möglich ist.",
L"Deutlich geringere Hörweite.",