bug fixes from Overhaul:

- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
+18 -18
View File
@@ -110,13 +110,13 @@ STR16 pCreditsJA2113[] =
L"@};(All other community members who contributed input and feedback!)",
};
wchar_t ItemNames[MAXITEMS][80] =
CHAR16 ItemNames[MAXITEMS][80] =
{
L""
};
wchar_t ShortItemNames[MAXITEMS][80] =
CHAR16 ShortItemNames[MAXITEMS][80] =
{
L""
};
@@ -126,7 +126,7 @@ wchar_t ShortItemNames[MAXITEMS][80] =
// NATO is the North Atlantic Treaty Organization
// WP is Warsaw Pact
// cal is an abbreviation for calibre
wchar_t AmmoCaliber[MAXITEMS][20];// =
CHAR16 AmmoCaliber[MAXITEMS][20];// =
//{
// L"0",
// L",38 êàë",
@@ -156,7 +156,7 @@ wchar_t AmmoCaliber[MAXITEMS][20];// =
// NATO is the North Atlantic Treaty Organization
// WP is Warsaw Pact
// cal is an abbreviation for calibre
wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
CHAR16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
//{
// L"0",
// L",38 êàë",
@@ -180,7 +180,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
//};
wchar_t WeaponType[][30] =
CHAR16 WeaponType[][30] =
{
L"Äðóãîå",
L"Ïèñòîëåò",
@@ -193,7 +193,7 @@ wchar_t WeaponType[][30] =
L"Ðåâîëüâåð"
};
wchar_t TeamTurnString[][STRING_LENGTH] =
CHAR16 TeamTurnString[][STRING_LENGTH] =
{
L"Õîä Èãðîêà", // player's turn
L"Õîä Îïïîíåíòà",
@@ -203,7 +203,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] =
// planning turn
};
wchar_t Message[][STRING_LENGTH] =
CHAR16 Message[][STRING_LENGTH] =
{
L"",
@@ -1072,7 +1072,7 @@ STR16 sKeyDescriptionStrings[2] =
//The headers used to describe various weapon statistics.
wchar_t gWeaponStatsDesc[][ 14 ] =
CHAR16 gWeaponStatsDesc[][ 14 ] =
{
L"Âåñ (%s):",
L"Ñòàòóñ:",
@@ -1093,7 +1093,7 @@ wchar_t gWeaponStatsDesc[][ 14 ] =
//The headers used for the merc's money.
wchar_t gMoneyStatsDesc[][ 13 ] =
CHAR16 gMoneyStatsDesc[][ 13 ] =
{
L"Êîë-âî",
L"Îñòàëîñü:", //this is the overall balance
@@ -1109,7 +1109,7 @@ wchar_t 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.
wchar_t zHealthStr[][13] =
CHAR16 zHealthStr[][13] =
{
L"ÓÌÈÐÀÅÒ", // >= 0
L"ÊÐÈÒÈ×ÅÍ", // >= 15
@@ -1131,18 +1131,18 @@ STR16 gzMoneyAmounts[6] =
};
// short words meaning "Advantages" for "Pros" and "Disadvantages" for "Cons."
wchar_t gzProsLabel[10] =
CHAR16 gzProsLabel[10] =
{
L"Çà:",
};
wchar_t gzConsLabel[10] =
CHAR16 gzConsLabel[10] =
{
L"Ïðîò:",
};
//Conversation options a player has when encountering an NPC
wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
{
L"Åùå ðàç?", //meaning "Repeat yourself"
L"Äðóæåñêè", //approach in a friendly
@@ -1153,7 +1153,7 @@ wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
};
//Some NPCs buy, sell or repair items. These different options are available for those NPCs as well.
wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]=
CHAR16 zDealerStrings[4][ SMALL_STRING_LENGTH ]=
{
L"Êóï/Ïðîä",
L"Êóï.",
@@ -1161,7 +1161,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]=
L"Ðåìîíò",
};
wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] =
CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] =
{
L"Ãîòîâî",
};
@@ -1202,7 +1202,7 @@ STR16 zVehicleName[] =
//These are messages Used in the Tactical Screen
wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
{
L"Âîçäóøíûé Ðåéä",
L"Îêàçûâàòü ïåðâ.ïîìîùü ñðàçó?",
@@ -2542,7 +2542,7 @@ STR16 pUpdatePanelButtons[] =
// Text which appears when everyone on your team is incapacitated and incapable of battle
wchar_t LargeTacticalStr[][ LARGE_STRING_LENGTH ] =
CHAR16 LargeTacticalStr[][ LARGE_STRING_LENGTH ] =
{
L"Â ýòîì ñåêòîðå âàì íàíåñëè ïîðàæåíèå!",
L"Âðàã, íå èñïûòûâàÿ óãðûçåíèé ñîâåñòè, ïîæðåò âñåõ äî åäèíîãî!",
@@ -3783,7 +3783,7 @@ STR16 pMessageStrings[] =
};
wchar_t ItemPickupHelpPopup[][40] =
CHAR16 ItemPickupHelpPopup[][40] =
{
L"OK",
L"Ëèñòàòü ââåðõ",