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,12 +118,12 @@ STR16 pCreditsJA2113[] =
L"@};(Alle weiteren Community Mitglieder die Ideen und Feedback eingebracht haben!)",
};
wchar_t ItemNames[MAXITEMS][80] =
CHAR16 ItemNames[MAXITEMS][80] =
{
L"",
};
wchar_t ShortItemNames[MAXITEMS][80] =
CHAR16 ShortItemNames[MAXITEMS][80] =
{
L"",
};
@@ -133,7 +133,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 Kal",
@@ -161,7 +161,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 Kal",
@@ -181,7 +181,7 @@ wchar_t BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
// L"", // dart
//};
wchar_t WeaponType[][30] =
CHAR16 WeaponType[][30] =
{
L"Andere",
L"Pistole",
@@ -194,7 +194,7 @@ wchar_t WeaponType[][30] =
L"Schrotflinte",
};
wchar_t TeamTurnString[][STRING_LENGTH] =
CHAR16 TeamTurnString[][STRING_LENGTH] =
{
L"Spielzug Spieler",
L"Spielzug Gegner",
@@ -204,7 +204,7 @@ wchar_t TeamTurnString[][STRING_LENGTH] =
// planning turn
};
wchar_t Message[][STRING_LENGTH] =
CHAR16 Message[][STRING_LENGTH] =
{
L"",
@@ -1048,7 +1048,7 @@ STR16 sKeyDescriptionStrings[2]=
};
//The headers used to describe various weapon statistics.
wchar_t gWeaponStatsDesc[][ 14 ] = //USED TO BE 13
CHAR16 gWeaponStatsDesc[][ 14 ] = //USED TO BE 13
{
L"Gew. (%s):", //weight
L"Status:",
@@ -1068,7 +1068,7 @@ wchar_t gWeaponStatsDesc[][ 14 ] = //USED TO BE 13
};
//The headers used for the merc's money.
wchar_t gMoneyStatsDesc[][ 13 ] =
CHAR16 gMoneyStatsDesc[][ 13 ] =
{
L"Betrag",
L"Verbleibend:", //this is the overall balance
@@ -1082,7 +1082,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] = //used to be 10
CHAR16 zHealthStr[][13] = //used to be 10
{
L"STIRBT", // >= 0
L"KRITISCH", // >= 15
@@ -1104,18 +1104,18 @@ STR16 gzMoneyAmounts[6] =
};
// short words meaning "Advantages" for "Pros" and "Disadvantages" for "Cons."
wchar_t gzProsLabel[10] =
CHAR16 gzProsLabel[10] =
{
L"Pro:",
};
wchar_t gzConsLabel[10] =
CHAR16 gzConsLabel[10] =
{
L"Kontra:",
};
//Conversation options a player has when encountering an NPC
wchar_t zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
CHAR16 zTalkMenuStrings[6][ SMALL_STRING_LENGTH ] =
{
L"Wie bitte?", //meaning "Repeat yourself"
L"Freundlich", //approach in a friendly
@@ -1126,7 +1126,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"Handeln",
L"Kaufen",
@@ -1134,7 +1134,7 @@ wchar_t zDealerStrings[4][ SMALL_STRING_LENGTH ]=
L"Reparieren",
};
wchar_t zDialogActions[1][ SMALL_STRING_LENGTH ] =
CHAR16 zDialogActions[1][ SMALL_STRING_LENGTH ] =
{
L"Fertig",
};
@@ -1170,7 +1170,7 @@ STR16 zVehicleName[] =
};
//These are messages Used in the Tactical Screen
wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
CHAR16 TacticalStr[][ MED_STRING_LENGTH ] =
{
L"Luftangriff",
L"Automatisch Erste Hilfe leisten?",
@@ -2447,7 +2447,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"Sie sind in diesem Sektor geschlagen worden!",
L"Der Feind hat kein Erbarmen mit den Seelen Ihrer Teammitglieder und verschlingt jeden einzelnen.",
@@ -3595,7 +3595,7 @@ STR16 pMessageStrings[] =
#endif
};
wchar_t ItemPickupHelpPopup[][40] =
CHAR16 ItemPickupHelpPopup[][40] =
{
L"OK",
L"Hochscrollen",