mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Fixed compilation errors in all NON-ENGLISH versions
- The problem were the new NATIONALITY enum values which conflicted with the language build defines - I added a "_NAT" postfix to the nationality enum values (e.g: CHINESE_NAT) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -229,52 +229,52 @@ typedef enum
|
|||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
// old Sirtech values
|
// old Sirtech values
|
||||||
AMERICAN = 0, // take that, Murica! Sirtech knew you have no value :-)
|
AMERICAN_NAT = 0, // take that, Murica! Sirtech knew you have no value :-)
|
||||||
ARAB = 1,
|
ARAB_NAT = 1,
|
||||||
AUSTRALIAN = 2,
|
AUSTRALIAN_NAT = 2,
|
||||||
BRITISH = 3,
|
BRITISH_NAT = 3,
|
||||||
CANADIAN = 4,
|
CANADIAN_NAT = 4,
|
||||||
CUBAN = 5,
|
CUBAN_NAT = 5,
|
||||||
DANISH = 6,
|
DANISH_NAT = 6,
|
||||||
FRENCH = 7,
|
FRENCH_NAT = 7,
|
||||||
RUSSIAN = 8,
|
RUSSIAN_NAT = 8,
|
||||||
NIGERIAN = 9, // this was simply not defined in original data (I did not find any country), but we can't have any holes in here, so just invented soemthing
|
NIGERIAN_NAT = 9, // this was simply not defined in original data (I did not find any country), but we can't have any holes in here, so just invented soemthing
|
||||||
SWISS = 10,
|
SWISS_NAT = 10,
|
||||||
JAMAICAN = 11,
|
JAMAICAN_NAT = 11,
|
||||||
POLISH = 12,
|
POLISH_NAT = 12,
|
||||||
CHINESE = 13,
|
CHINESE_NAT = 13,
|
||||||
IRISH = 14,
|
IRISH_NAT = 14,
|
||||||
SOUTH_AFRICAN = 15,
|
SOUTH_AFRICAN_NAT = 15,
|
||||||
HUNGARIAN = 16,
|
HUNGARIAN_NAT = 16,
|
||||||
SCOTTISH = 17,
|
SCOTTISH_NAT = 17,
|
||||||
ARULCAN = 18,
|
ARULCAN_NAT = 18,
|
||||||
GERMAN = 19,
|
GERMAN_NAT = 19,
|
||||||
AFRICAN = 20,
|
AFRICAN_NAT = 20,
|
||||||
ITALIAN = 21,
|
ITALIAN_NAT = 21,
|
||||||
DUTCH = 22,
|
DUTCH_NAT = 22,
|
||||||
ROMANIAN = 23,
|
ROMANIAN_NAT = 23,
|
||||||
METAVIRAN = 24,
|
METAVIRAN_NAT = 24,
|
||||||
|
|
||||||
// new values, because why not
|
// new values, because why not
|
||||||
GREEK, // 25
|
GREEK_NAT, // 25
|
||||||
ESTONIAN,
|
ESTONIAN_NAT,
|
||||||
VENEZUELAN ,
|
VENEZUELAN_NAT ,
|
||||||
JAPANESE,
|
JAPANESE_NAT,
|
||||||
TURKISH,
|
TURKISH_NAT,
|
||||||
INDIAN, // 30
|
INDIAN_NAT, // 30
|
||||||
MEXICAN,
|
MEXICAN_NAT,
|
||||||
NORWEGIAN,
|
NORWEGIAN_NAT,
|
||||||
SPANISH,
|
SPANISH_NAT,
|
||||||
BRASILIAN,
|
BRASILIAN_NAT,
|
||||||
FINNISH, // 35
|
FINNISH_NAT, // 35
|
||||||
IRANIAN,
|
IRANIAN_NAT,
|
||||||
ISRAELI,
|
ISRAELI_NAT,
|
||||||
BULGARIAN,
|
BULGARIAN_NAT,
|
||||||
SWEDISH,
|
SWEDISH_NAT,
|
||||||
IRAQI, // 40
|
IRAQI_NAT, // 40
|
||||||
SYRIAN,
|
SYRIAN_NAT,
|
||||||
BELGIAN,
|
BELGIAN_NAT,
|
||||||
PORTOGUESE,
|
PORTOGUESE_NAT,
|
||||||
|
|
||||||
NUM_NATIONALITIES
|
NUM_NATIONALITIES
|
||||||
} Nationalities;
|
} Nationalities;
|
||||||
|
|||||||
Reference in New Issue
Block a user