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
@@ -118,13 +118,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"",
};
@@ -134,7 +134,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 cal",
@@ -164,7 +164,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 cal",
@@ -188,7 +188,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
//};
wchar_t WeaponType[MAXITEMS][30] =
CHAR16 WeaponType[MAXITEMS][30] =
{
L"Other",
L"Pistol",
@@ -201,7 +201,7 @@ wchar_t WeaponType[MAXITEMS][30] =
L"Shotgun",
};
wchar_t TeamTurnString[][STRING_LENGTH] =
CHAR16 TeamTurnString[][STRING_LENGTH] =
{
L"Player's Turn", // player's turn
L"Opponents' Turn",
@@ -211,7 +211,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] =
// planning turn
};
wchar_t Message[][STRING_LENGTH] =
CHAR16 Message[][STRING_LENGTH] =
{
L"",
@@ -1079,7 +1079,7 @@ STR16 sKeyDescriptionStrings[2] =
//The headers used to describe various weapon statistics.
wchar_t gWeaponStatsDesc[][ 14 ] =
CHAR16 gWeaponStatsDesc[][ 14 ] =
{
L"Weight (%s):",
L"Status:",
@@ -1102,7 +1102,7 @@ wchar_t gWeaponStatsDesc[][ 14 ] =
//The headers used for the merc's money.
wchar_t gMoneyStatsDesc[][ 13 ] =
CHAR16 gMoneyStatsDesc[][ 13 ] =
{
L"Amount",
L"Remaining:", //this is the overall balance
@@ -1118,7 +1118,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"DYING", // >= 0
L"CRITICAL", // >= 15
@@ -1140,18 +1140,18 @@ STR16 gzMoneyAmounts[6] =
};
// short words meaning "Advantages" for "Pros" and "Disadvantages" for "Cons."
wchar_t gzProsLabel[10] =
CHAR16 gzProsLabel[10] =
{
L"Pros:",
};
wchar_t gzConsLabel[10] =
CHAR16 gzConsLabel[10] =
{
L"Cons:",
};
//Conversation options a player has when encountering an NPC
wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
{
L"Come Again?", //meaning "Repeat yourself"
L"Friendly", //approach in a friendly
@@ -1162,7 +1162,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"Buy/Sell",
L"Buy",
@@ -1170,7 +1170,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]=
L"Repair",
};
wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] =
CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] =
{
L"Done",
};
@@ -1211,7 +1211,7 @@ STR16 zVehicleName[] =
//These are messages Used in the Tactical Screen
wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
{
L"Air Raid",
L"Apply first aid automatically?",
@@ -2553,7 +2553,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"You have been defeated in this sector!",
L"The enemy, having no mercy for the team's soul, devours each and every one of you!",
@@ -3795,7 +3795,7 @@ STR16 pMessageStrings[] =
};
wchar_t ItemPickupHelpPopup[][40] =
CHAR16 ItemPickupHelpPopup[][40] =
{
L"OK",
L"Scroll Up",