From c2528cab4fca78adc41125b88d69c59745b9cc5b Mon Sep 17 00:00:00 2001 From: lalien Date: Tue, 13 Mar 2007 20:01:02 +0000 Subject: [PATCH] - changed UINT16 to wchar_t for VS 2005 compliance git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@781 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 4 ++-- JA2.vcproj | 2 +- Utils/_DutchText.cpp | 28 ++++++++++++++-------------- Utils/_FrenchText.cpp | 28 ++++++++++++++-------------- Utils/_GermanText.cpp | 28 ++++++++++++++-------------- Utils/_ItalianText.cpp | 28 ++++++++++++++-------------- Utils/_PolishText.cpp | 28 ++++++++++++++-------------- Utils/_RussianText.cpp | 28 ++++++++++++++-------------- 8 files changed, 87 insertions(+), 87 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 1cc891835..9a13800d5 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - wchar_t zVersionLabel[256] = { L"Release v1.13.766" }; + wchar_t zVersionLabel[256] = { L"Release v1.13.781" }; #endif -INT8 czVersionNumber[16] = { "Build 07.03.04" }; //YY.MM.DD +INT8 czVersionNumber[16] = { "Build 07.03.13" }; //YY.MM.DD wchar_t zTrackingNumber[16] = { L"Z" }; diff --git a/JA2.vcproj b/JA2.vcproj index 1d98d6b8b..bd1ce6773 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -546,7 +546,7 @@ = 0 L"KRITIEK", // >= 15 @@ -1150,7 +1150,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Wat?", //meaning "Repeat yourself" L"Aardig", //approach in a friendly @@ -1161,7 +1161,7 @@ UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= +wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Koop/Verkoop", //Buy/Sell L"Koop", //Buy @@ -1169,7 +1169,7 @@ UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Repareer", //Repair }; -UINT16 zDialogActions[1][ SMALL_STRING_LENGTH ] = +wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"OK", }; @@ -1210,7 +1210,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -UINT16 TacticalStr[][ MED_STRING_LENGTH ] = +wchar_t TacticalStr[][ MED_STRING_LENGTH ] = { L"Luchtaanval", L"Automatisch EHBO toepassen?", @@ -2549,7 +2549,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -UINT16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Je bent verslagen in deze sector!", L"De vijand, geen genade kennende, slacht ieder teamlid af!", @@ -3789,7 +3789,7 @@ STR16 pMessageStrings[] = }; -UINT16 ItemPickupHelpPopup[][40] = +wchar_t ItemPickupHelpPopup[][40] = { L"OK", L"Scroll Omhoog", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index d3399db38..46ca860c2 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -117,13 +117,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -UINT16 ItemNames[MAXITEMS][80] = +wchar_t ItemNames[MAXITEMS][80] = { L"", }; -UINT16 ShortItemNames[MAXITEMS][80] = +wchar_t ShortItemNames[MAXITEMS][80] = { L"", }; @@ -133,7 +133,7 @@ UINT16 ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 AmmoCaliber[MAXITEMS][20];// = +wchar_t AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L"cal .38", @@ -161,7 +161,7 @@ UINT16 AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L"cal .38", @@ -182,7 +182,7 @@ UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -UINT16 WeaponType[][30] = +wchar_t WeaponType[][30] = { L"Divers", L"Pistolet", @@ -195,7 +195,7 @@ UINT16 WeaponType[][30] = L"Fusil à pompe", }; -UINT16 TeamTurnString[][STRING_LENGTH] = +wchar_t TeamTurnString[][STRING_LENGTH] = { L"Tour du joueur", // player's turn L"Tour de l'adversaire", @@ -205,7 +205,7 @@ UINT16 TeamTurnString[][STRING_LENGTH] = // planning turn }; -UINT16 Message[][STRING_LENGTH] = +wchar_t Message[][STRING_LENGTH] = { L"", @@ -1107,7 +1107,7 @@ INT16 gMoneyStatsDesc[][ 13 ] = //The health of various creatures, enemies, characters in the game. The numbers following each are for comment //only, but represent the precentage of points remaining. -UINT16 zHealthStr[][13] = +wchar_t zHealthStr[][13] = { L"MOURANT", // >= 0 L"CRITIQUE", // >= 15 @@ -1140,7 +1140,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Pardon ?", //meaning "Repeat yourself" L"Amical", //approach in a friendly @@ -1151,7 +1151,7 @@ UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= +wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Acheter/Vendre", L"Acheter", @@ -1159,7 +1159,7 @@ UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Réparer", }; -UINT16 zDialogActions[1][ SMALL_STRING_LENGTH ] = +wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"OK", }; @@ -1200,7 +1200,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -UINT16 TacticalStr[][ MED_STRING_LENGTH ] = +wchar_t TacticalStr[][ MED_STRING_LENGTH ] = { L"Raid aérien", L"Appliquer les premiers soins ?", @@ -2538,7 +2538,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -UINT16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Vous avez été vaincu dans ce secteur !", L"L'ennemi, sans aucune compassion, ne fait pas de quartier !", @@ -3779,7 +3779,7 @@ STR16 pMessageStrings[] = }; -UINT16 ItemPickupHelpPopup[][40] = +wchar_t ItemPickupHelpPopup[][40] = { L"OK", L"Défilement haut", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index d013c9966..54923fb33 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -118,12 +118,12 @@ STR16 pCreditsJA2113[] = L"@};(Alle weiteren Community Mitglieder die Ideen und Feedback eingebracht haben!)", }; -UINT16 ItemNames[MAXITEMS][80] = +wchar_t ItemNames[MAXITEMS][80] = { L"", }; -UINT16 ShortItemNames[MAXITEMS][80] = +wchar_t ShortItemNames[MAXITEMS][80] = { L"", }; @@ -133,7 +133,7 @@ UINT16 ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 AmmoCaliber[MAXITEMS][20];// = +wchar_t AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L".38 Kal", @@ -161,7 +161,7 @@ UINT16 AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L".38 Kal", @@ -181,7 +181,7 @@ UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= // L"", // dart //}; -UINT16 WeaponType[][30] = +wchar_t WeaponType[][30] = { L"Andere", L"Pistole", @@ -194,7 +194,7 @@ UINT16 WeaponType[][30] = L"Schrotflinte", }; -UINT16 TeamTurnString[][STRING_LENGTH] = +wchar_t TeamTurnString[][STRING_LENGTH] = { L"Spielzug Spieler", L"Spielzug Gegner", @@ -204,7 +204,7 @@ UINT16 TeamTurnString[][STRING_LENGTH] = // planning turn }; -UINT16 Message[][STRING_LENGTH] = +wchar_t Message[][STRING_LENGTH] = { L"", @@ -1082,7 +1082,7 @@ INT16 gMoneyStatsDesc[][ 13 ] = //The health of various creatures, enemies, characters in the game. The numbers following each are for comment //only, but represent the precentage of points remaining. -UINT16 zHealthStr[][13] = //used to be 10 +wchar_t zHealthStr[][13] = //used to be 10 { L"STIRBT", // >= 0 L"KRITISCH", // >= 15 @@ -1115,7 +1115,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Wie bitte?", //meaning "Repeat yourself" L"Freundlich", //approach in a friendly @@ -1126,7 +1126,7 @@ UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= +wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Handeln", L"Kaufen", @@ -1134,7 +1134,7 @@ UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Reparieren", }; -UINT16 zDialogActions[1][ SMALL_STRING_LENGTH ] = +wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"Fertig", }; @@ -1170,7 +1170,7 @@ STR16 zVehicleName[] = }; //These are messages Used in the Tactical Screen -UINT16 TacticalStr[][ MED_STRING_LENGTH ] = +wchar_t TacticalStr[][ MED_STRING_LENGTH ] = { L"Luftangriff", L"Automatisch Erste Hilfe leisten?", @@ -2446,7 +2446,7 @@ STR16 pUpdatePanelButtons[] = }; // Text which appears when everyone on your team is incapacitated and incapable of battle -UINT16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Sie sind in diesem Sektor geschlagen worden!", L"Der Feind hat kein Erbarmen mit den Seelen Ihrer Teammitglieder und verschlingt jeden einzelnen.", @@ -3594,7 +3594,7 @@ STR16 pMessageStrings[] = #endif }; -UINT16 ItemPickupHelpPopup[][40] = +wchar_t ItemPickupHelpPopup[][40] = { L"OK", L"Hochscrollen", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index e8c41c2ed..8b3859daa 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -110,13 +110,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -UINT16 ItemNames[MAXITEMS][80] = +wchar_t ItemNames[MAXITEMS][80] = { L"", }; -UINT16 ShortItemNames[MAXITEMS][80] = +wchar_t ShortItemNames[MAXITEMS][80] = { L"", }; @@ -126,7 +126,7 @@ UINT16 ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 AmmoCaliber[MAXITEMS][20];// = +wchar_t AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L"cal .38", @@ -154,7 +154,7 @@ UINT16 AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L"cal .38", @@ -175,7 +175,7 @@ UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -UINT16 WeaponType[][30] = +wchar_t WeaponType[][30] = { L"Altro", L"Arma", @@ -188,7 +188,7 @@ UINT16 WeaponType[][30] = L"Fucile a canne mozze", }; -UINT16 TeamTurnString[][STRING_LENGTH] = +wchar_t TeamTurnString[][STRING_LENGTH] = { L"Turno del giocatore", // player's turn L"Turno degli avversari", @@ -198,7 +198,7 @@ UINT16 TeamTurnString[][STRING_LENGTH] = // planning turn }; -UINT16 Message[][STRING_LENGTH] = +wchar_t Message[][STRING_LENGTH] = { L"", @@ -1100,7 +1100,7 @@ INT16 gMoneyStatsDesc[][ 13 ] = //The health of various creatures, enemies, characters in the game. The numbers following each are for comment //only, but represent the precentage of points remaining. -UINT16 zHealthStr[][13] = +wchar_t zHealthStr[][13] = { L"MORENTE", // >= 0 L"CRITICO", // >= 15 @@ -1133,7 +1133,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Vuoi ripetere?", //meaning "Repeat yourself" L"Amichevole", //approach in a friendly @@ -1144,7 +1144,7 @@ UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= +wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Compra/Vendi", L"Compra", @@ -1152,7 +1152,7 @@ UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Ripara", }; -UINT16 zDialogActions[1][ SMALL_STRING_LENGTH ] = +wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"Fine", }; @@ -1193,7 +1193,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -UINT16 TacticalStr[][ MED_STRING_LENGTH ] = +wchar_t TacticalStr[][ MED_STRING_LENGTH ] = { L"Attacco aereo", L"Ricorrete al pronto soccorso automaticamente?", @@ -2532,7 +2532,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -UINT16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Siete stati sconfitti in questo settore!", L"Il nemico, non avendo alcuna pietà delle anime della squadra, divorerà ognuno di voi!", @@ -3771,7 +3771,7 @@ STR16 pMessageStrings[] = }; -UINT16 ItemPickupHelpPopup[][40] = +wchar_t ItemPickupHelpPopup[][40] = { L"OK", L"Scorrimento su", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index b1beb615a..1f0338948 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -111,13 +111,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -UINT16 ItemNames[MAXITEMS][80] = +wchar_t ItemNames[MAXITEMS][80] = { L"", }; -UINT16 ShortItemNames[MAXITEMS][80] = +wchar_t ShortItemNames[MAXITEMS][80] = { L"", }; @@ -127,7 +127,7 @@ UINT16 ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 AmmoCaliber[MAXITEMS][20];// = +wchar_t AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L".38 cal", @@ -155,7 +155,7 @@ UINT16 AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L".38 cal", @@ -176,7 +176,7 @@ UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -UINT16 WeaponType[][30] = +wchar_t WeaponType[][30] = { L"Inny", L"Pistolet", @@ -189,7 +189,7 @@ UINT16 WeaponType[][30] = L"Strzelba" }; -UINT16 TeamTurnString[][STRING_LENGTH] = +wchar_t TeamTurnString[][STRING_LENGTH] = { L"Tura gracza", // player's turn L"Tura przeciwnika", @@ -199,7 +199,7 @@ UINT16 TeamTurnString[][STRING_LENGTH] = // planning turn }; -UINT16 Message[][STRING_LENGTH] = +wchar_t Message[][STRING_LENGTH] = { L"", @@ -1101,7 +1101,7 @@ INT16 gMoneyStatsDesc[][ 13 ] = //The health of various creatures, enemies, characters in the game. The numbers following each are for comment //only, but represent the precentage of points remaining. -UINT16 zHealthStr[][13] = +wchar_t zHealthStr[][13] = { L"UMIERAJ¥CY", // >= 0 L"KRYTYCZNY", // >= 15 @@ -1134,7 +1134,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Powtórz", //meaning "Repeat yourself" L"PrzyjaŸnie", //approach in a friendly @@ -1145,7 +1145,7 @@ UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= +wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Kup/Sprzedaj", L"Kup", @@ -1153,7 +1153,7 @@ UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Napraw", }; -UINT16 zDialogActions[1][ SMALL_STRING_LENGTH ] = +wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"OK", }; @@ -1194,7 +1194,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -UINT16 TacticalStr[][ MED_STRING_LENGTH ] = +wchar_t TacticalStr[][ MED_STRING_LENGTH ] = { L"Nalot", L"Udzieliæ automatycznie pierwszej pomocy?", @@ -2532,7 +2532,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -UINT16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L"Pokonano ciê w tym sektorze!", L"Wróg nie zna litoœci i po¿era was wszystkich!", @@ -3771,7 +3771,7 @@ STR16 pMessageStrings[] = }; -UINT16 ItemPickupHelpPopup[][40] = +wchar_t ItemPickupHelpPopup[][40] = { L"OK", L"W górê", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 25850d07d..e12b7e55f 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -110,13 +110,13 @@ STR16 pCreditsJA2113[] = L"@};(All other community members who contributed input and feedback!)", }; -UINT16 ItemNames[MAXITEMS][80] = +wchar_t ItemNames[MAXITEMS][80] = { L"" }; -UINT16 ShortItemNames[MAXITEMS][80] = +wchar_t ShortItemNames[MAXITEMS][80] = { L"" }; @@ -126,7 +126,7 @@ UINT16 ShortItemNames[MAXITEMS][80] = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 AmmoCaliber[MAXITEMS][20];// = +wchar_t AmmoCaliber[MAXITEMS][20];// = //{ // L"0", // L",38 êàë", @@ -156,7 +156,7 @@ UINT16 AmmoCaliber[MAXITEMS][20];// = // NATO is the North Atlantic Treaty Organization // WP is Warsaw Pact // cal is an abbreviation for calibre -UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= +wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //{ // L"0", // L",38 êàë", @@ -180,7 +180,7 @@ UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//= //}; -UINT16 WeaponType[][30] = +wchar_t WeaponType[][30] = { L"Äðóãîå", L"Ïèñòîëåò", @@ -193,7 +193,7 @@ UINT16 WeaponType[][30] = L"Ðåâîëüâåð" }; -UINT16 TeamTurnString[][STRING_LENGTH] = +wchar_t TeamTurnString[][STRING_LENGTH] = { L"Õîä Èãðîêà", // player's turn L"Õîä Îïïîíåíòà", @@ -203,7 +203,7 @@ UINT16 TeamTurnString[][STRING_LENGTH] = // planning turn }; -UINT16 Message[][STRING_LENGTH] = +wchar_t Message[][STRING_LENGTH] = { L"", @@ -1109,7 +1109,7 @@ INT16 gMoneyStatsDesc[][ 13 ] = //The health of various creatures, enemies, characters in the game. The numbers following each are for comment //only, but represent the precentage of points remaining. -UINT16 zHealthStr[][13] = +wchar_t zHealthStr[][13] = { L"ÓÌÈÐÀÅÒ", // >= 0 L"ÊÐÈÒÈ×ÅÍ", // >= 15 @@ -1142,7 +1142,7 @@ INT16 gzConsLabel[10] = }; //Conversation options a player has when encountering an NPC -UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = +wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = { L"Åùå ðàç?", //meaning "Repeat yourself" L"Äðóæåñêè", //approach in a friendly @@ -1153,7 +1153,7 @@ UINT16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] = }; //Some NPCs buy, sell or repair items. These different options are available for those NPCs as well. -UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= +wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]= { L"Êóï/Ïðîä", L"Êóï.", @@ -1161,7 +1161,7 @@ UINT16 zDealerStrings[4][ SMALL_STRING_LENGTH ]= L"Ðåìîíò", }; -UINT16 zDialogActions[1][ SMALL_STRING_LENGTH ] = +wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] = { L"Ãîòîâî", }; @@ -1202,7 +1202,7 @@ STR16 zVehicleName[] = //These are messages Used in the Tactical Screen -UINT16 TacticalStr[][ MED_STRING_LENGTH ] = +wchar_t TacticalStr[][ MED_STRING_LENGTH ] = { L"Âîçäóøíûé Ðåéä", L"Îêàçûâàòü ïåðâ.ïîìîùü ñðàçó?", @@ -2541,7 +2541,7 @@ STR16 pUpdatePanelButtons[] = // Text which appears when everyone on your team is incapacitated and incapable of battle -UINT16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] = +wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] = { L" ýòîì ñåêòîðå âàì íàíåñëè ïîðàæåíèå!", L"Âðàã, íå èñïûòûâàÿ óãðûçåíèé ñîâåñòè, ïîæðåò âñåõ äî åäèíîãî!", @@ -3782,7 +3782,7 @@ STR16 pMessageStrings[] = }; -UINT16 ItemPickupHelpPopup[][40] = +wchar_t ItemPickupHelpPopup[][40] = { L"OK", L"Ëèñòàòü ââåðõ",