1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged Multiplayer UI patch from Zathras:

Browse Source 
New Features
- Added hits, misses, accuracy to scoreboard
- Added in-game chat with history
- Added more options from the ini to the host screen, Use NIV and Enable
civillians
bugfixes
- Clients connecting at the same time controlling the wrong client
- Team Deathmatch working again
- Refreshing the player list after a player changes team / edge
- AI is always on for Co-op now
- There is now always a scoreboard in Co-op even when you lose.
- scores on the Co-op scoreboard have been fixed for all deaths including
bleeding
- Start Game button now only appears for server
- Fixed cleaning up game resources on disconnection
- Disabled the 1,2,3,4 keys for connecting / disconnecting
- Fixed victory conditions for all game modes
- Fixed players names getting copied into TeamTurnString each game resulting
in multiple names
- Fixed Assertion bug caused by the game sometimes calling
SetCurrentWorldSector more than once before placement of mercs
- Fixed a bug that was possible when merging items such as M14 and EBR stock
on mapscreen.
- Fixed bug with game starting while a player was in chat, closes chat
window when game is starting
- Fixed bug with game starting while a player was in the options screen, if
the player leaves the mapscreen while ready, they are set to unready
- Team and Spawn direction popups changed to use buttons to open/close them
- Disabled players joining after the laptop has been unlocked, as they would
be out of state with any hires


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-03-19 15:31:55 +00:00
parent d28c42b353
commit 8fa1c2a4e6
55 changed files with 8514 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Debug Control.cpp
+10
View File
@@ -67,3 +67,13 @@ void LiveMessage( CHAR8 *strMessage)
fclose(OutFile);
}
}
void MPDebugMsg( CHAR8 *strMessage)
{
FILE *OutFile;
if ((OutFile = fopen("MPDebug.txt", "a+t")) != NULL)
{
fprintf(OutFile, "%s\n", strMessage);
fclose(OutFile);
}
}
Utils/Debug Control.h
+1
View File
@@ -14,6 +14,7 @@
void LiveMessage( CHAR8 *strMessage);
void MPDebugMsg( CHAR8 *strMessage);
#ifdef _ANIMSUBSYSTEM_DEBUG
Utils/Text.h
+99
View File
@@ -1436,7 +1436,104 @@ enum
};
extern STR16 gzGIOScreenText[];
// OJW - 20081129
// Multiplayer Join Screen
enum
{
MPJ_TITLE_TEXT,
MPJ_JOIN_TEXT,
MPJ_HOST_TEXT,
MPJ_CANCEL_TEXT,
MPJ_REFRESH_TEXT,
MPJ_HANDLE_TEXT,
MPJ_SERVERIP_TEXT,
MPJ_SERVERPORT_TEXT,
MPJ_SERVERNAME_TEXT,
MPJ_NUMPLAYERS_TEXT,
MPJ_SERVERVER_TEXT,
MPJ_GAMETYPE_TEXT,
MPJ_PING_TEXT,
MPJ_HANDLE_INVALID,
MPJ_SERVERIP_INVALID,
MPJ_SERVERPORT_INVALID
};
extern STR16 gzMPJScreenText[];
//Multiplayer Host Screen
enum
{
MPH_TITLE_TEXT,
MPH_START_TEXT,
MPH_CANCEL_TEXT,
MPH_SERVERNAME_TEXT,
MPH_GAMETYPE_TEXT,
MPH_DEATHMATCH_TEXT,
MPH_TEAMDM_TEXT,
MPH_COOP_TEXT,
MPH_NUMPLAYERS_TEXT,
MPH_SQUADSIZE_TEXT,
MPH_MERCSELECT_TEXT,
MPH_RANDOMMERCS_TEXT,
MPH_PLAYERMERCS_TEXT,
MPH_BALANCE_TEXT,
MPH_SAMEMERC_TEXT,
MPH_RPTMERC_TEXT,
MPH_BOBBYRAY_TEXT,
MPH_RNDMSTART_TEXT,
MPH_SERVERNAME_INVALID,
MPH_MAXPLAYERS_INVALID,
MPH_SQUADSIZE_INVALID,
MPH_TIME_TEXT,
MPH_TIME_INVALID,
MPH_CASH_INVALID,
MPH_DMG_TEXT,
MPH_DMG_INVALID,
MPH_TIMER_TEXT,
MPH_TIMER_INVALID,
MPH_ENABLECIV_TEXT,
MPH_USENIV_TEXT,
};
extern STR16 gzMPHScreenText[];
enum
{
MPS_TITLE_TEXT,
MPS_CONTINUE_TEXT,
MPS_CANCEL_TEXT,
MPS_PLAYER_TEXT,
MPS_KILLS_TEXT,
MPS_DEATHS_TEXT,
MPS_AITEAM_TEXT,
MPS_HITS_TEXT,
MPS_MISSES_TEXT,
MPS_ACCURACY_TEXT,
MPS_DMGDONE_TEXT,
MPS_DMGTAKEN_TEXT,
};
extern STR16 gzMPSScreenText[];
// Multiplayer Starting Edges
enum
{
MP_EDGE_NORTH,
MP_EDGE_SOUTH,
MP_EDGE_EAST,
MP_EDGE_WEST,
MAX_EDGES,
};
extern STR16 gszMPEdgesText[];
// MP TEAM NAMES
enum
{
MP_TEAM_1,
MP_TEAM_2,
MP_TEAM_3,
MP_TEAM_4,
MAX_MP_TEAMS,
};
extern STR16 gszMPTeamNames[];
extern STR16 gzMPChatToggleText[];
extern STR16 gzMPChatboxText[];
enum
{
@@ -1608,4 +1705,6 @@ enum
NIV_NO_CLIMB,
};
// OJW - MP
extern STR16 gszMPMapscreenText[];
#endif
Utils/Timer Control.h
+1
View File
@@ -82,6 +82,7 @@ void CheckCustomizableTimer( void );
//Don't modify this value
extern UINT32 guiBaseJA2Clock;
extern UINT32 guiBaseJA2NoPauseClock;
extern CUSTOMIZABLE_TIMER_CALLBACK gpCustomizableTimerCallback;
// MACROS
Utils/Utilities.cpp
+1
View File
@@ -371,6 +371,7 @@ UINT32 gCheckFileMinSizes[] =
187000000,
236000000
};
#define NOCDCHECK
#if defined( JA2TESTVERSION ) || defined( _DEBUG )
#define NOCDCHECK
Utils/_ChineseText.cpp
+126
View File
@@ -4572,6 +4572,60 @@ STR16 gzGIOScreenText[] =
L"游戏初始设置（仅在服务器设置时有效）",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"奥斯汀", //"Austin", //Austin, Texas, USA
@@ -5477,6 +5531,22 @@ STR16 MPClientMessage[] =
L"你已被击败！",
L"对不起, 在多人游戏中无法攀登。",
L"你雇佣了 '%s'",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -5504,6 +5574,62 @@ STR16 MPHelp[] =
L"'F1' - 显示基本帮助",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
// WANNE: Some Chinese specific strings that needs to be in unicode!
STR16 ChineseSpecString1 = L"%％"; //defined in _ChineseText.cpp as this file is already unicode
STR16 ChineseSpecString2 = L"*%3d%％%%"; //defined in _ChineseText.cpp as this file is already unicode
Utils/_DutchText.cpp
+126
View File
@@ -3797,6 +3797,60 @@ STR16 gzGIOScreenText[] =
L"INITIAL GAME SETTINGS (Only the server settings take effect)",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"Austin", //Austin, Texas, USA
@@ -4530,6 +4584,22 @@ STR16 MPClientMessage[] =
L"You have been defeated!",
L"Sorry, climbing is disable in MP",
L"You Hired '%s'",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -4557,4 +4627,60 @@ STR16 MPHelp[] =
L"'F1' - Display primary help",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
#endif //DUTCH
Utils/_EnglishText.cpp
+125
View File
@@ -3810,6 +3810,60 @@ STR16 gzGIOScreenText[] =
L"INITIAL GAME SETTINGS (Only the server settings take effect)",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"Austin", //Austin, Texas, USA
@@ -4543,6 +4597,22 @@ STR16 MPClientMessage[] =
L"You have been defeated!",
L"Sorry, climbing is disable in MP",
L"You Hired '%s'",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -4570,4 +4640,59 @@ STR16 MPHelp[] =
L"'F1' - Display primary help",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
#endif //ENGLISH
Utils/_FrenchText.cpp
+126
View File
@@ -3811,6 +3811,60 @@ STR16 gzGIOScreenText[] =
L"CONFIGURATION DU JEU (Les paramètres serveur seulement prennent effet)",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"Austin", //Austin, Texas, USA
@@ -4544,6 +4598,22 @@ STR16 MPClientMessage[] =
L"You have been defeated!",
L"Sorry, climbing is disable in MP",
L"You Hired '%s'",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -4571,4 +4641,60 @@ STR16 MPHelp[] =
L"'F1' - Display primary help",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
#endif //FRENCH
Utils/_GermanText.cpp
+126
View File
@@ -3615,6 +3615,60 @@ STR16 gzGIOScreenText[] =
L"GRUNDEINSTELLUNGEN (Nur Servereinstellungen werden verwendet)",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"Austin", //Austin, Texas, USA
@@ -4343,6 +4397,22 @@ STR16 MPClientMessage[] =
L"Sie wurden besiegt!",
L"Auf Dächer klettern ist nicht erlaubt in einem Mehrspieler Spiel",
L"Sie haben '%s' angeheuert.",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -4370,4 +4440,60 @@ STR16 MPHelp[] =
L"'F1' - Anzeige der primären Hilfe",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
#endif //GERMAN
Utils/_ItalianText.cpp
+126
View File
@@ -3790,6 +3790,60 @@ STR16 gzGIOScreenText[] =
L"INITIAL GAME SETTINGS (Only the server settings take effect)",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"Austin", //Austin, Texas, USA
@@ -4528,6 +4582,22 @@ STR16 MPClientMessage[] =
L"You have been defeated!",
L"Sorry, climbing is disable in MP",
L"You Hired '%s'",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -4555,4 +4625,60 @@ STR16 MPHelp[] =
L"'F1' - Display primary help",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
#endif //ITALIAN
Utils/_PolishText.cpp
+126
View File
@@ -3803,6 +3803,60 @@ STR16 gzGIOScreenText[] =
L"POCZĄTKOWE USTAWIENIA GRY (Only the server settings take effect)",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"Austin", //Austin, Texas, USA
@@ -4535,6 +4589,22 @@ STR16 MPClientMessage[] =
L"Zostałeś pokonany!",
L"Wspinanie wyłączone w MP",
L"Wynajęto '%s'",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -4562,4 +4632,60 @@ STR16 MPHelp[] =
L"'F1' - Wyświetl 1. pomoc",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
#endif //POLISH
Utils/_RussianText.cpp
+126
View File
@@ -3805,6 +3805,60 @@ STR16 gzGIOScreenText[] =
L"УСТАНОВКИ ИГРЫ (будут заменены настройками сервера)",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"Остин", //Austin, Texas, USA
@@ -4539,6 +4593,22 @@ STR16 MPClientMessage[] =
L"Вы потерпели поражение!",
L"Извините, залезать на крышу в сетевой игре запрещено.",
L"Вы наняли %s.",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -4566,4 +4636,60 @@ STR16 MPHelp[] =
L"'F1' - Показать основную помощь.",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
#endif //RUSSIAN
Utils/_TaiwaneseText.cpp
+126
View File
@@ -3810,6 +3810,60 @@ STR16 gzGIOScreenText[] =
L"INITIAL GAME SETTINGS (Only the server settings take effect)",
};
STR16 gzMPJScreenText[] =
{
L"MULTIPLAYER",
L"Join",
L"Host",
L"Cancel",
L"Refresh",
L"Player Name",
L"Server IP",
L"Port",
L"Server Name",
L"# Plrs",
L"Version",
L"Game Type",
L"Ping",
L"You must enter a player name",
L"You must enter a valid server IP address.\n (eg 192.168.0.1)",
L"You must enter a valid Server Port between 1 and 65535"
};
STR16 gzMPHScreenText[] =
{
L"HOST GAME",
L"Start",
L"Cancel",
L"Server Name",
L"Game Type",
L"Deathmatch",
L"Team Deathmatch",
L"Co-operative",
L"Max Players",
L"Squad Size",
L"Merc Selection",
L"Random Mercs",
L"Hired by Player",
L"Starting Balance",
L"Can Hire Same Merc",
L"Report Hired Mercs",
L"Allow Bobby Rays",
L"Randomise Starting Edge",
L"You must enter a server name",
L"Max Players must be between 2 and 4",
L"Squad size must be between 1 and 6",
L"Time of Day",
L"Time of Day must be a 24 hr time (HH:MM)\n\n eg. 13:30 = 1.30pm",
L"Starting Cash must be a valid dollar amount ( no cents )\n\n eg. 150000" ,
L"Damage Multiplier",
L"Damage Multiplier must be a number between 0 and 5",
L"Turn Timer Multiplier",
L"Turn Timer multiplier must be a number between 1 and 200",
L"Enable Civilians in CO-OP",
L"Use New Inventory (NIV)",
};
STR16 pDeliveryLocationStrings[] =
{
L"Austin", //Austin, Texas, USA
@@ -4542,6 +4596,22 @@ STR16 MPClientMessage[] =
L"You have been defeated!",
L"Sorry, climbing is disable in MP",
L"You Hired '%s'",
// 45
L"You cant change the map once purchasing has commenced",
L"Map changed to '%s'",
L"Client '%s' disconnected, removing from game",
L"You were disconnected from the game, returning to the Main Menu",
L"Connection failed, Retrying in 5 seconds, %i retries left...",
//50
L"Connection failed, giving up...",
L"You cannot start the game until another player has connected",
L"%s : %s",
L"Send to All",
L"Allies only",
// 55
L"Cannot join game. This game has already started.",
L"%s (team): %s",
L"Client #%i - '%s'",
};
STR16 MPHelp[] =
@@ -4569,4 +4639,60 @@ STR16 MPHelp[] =
L"'F1' - Display primary help",
};
STR16 gszMPEdgesText[] =
{
L"N",
L"S",
L"E",
L"W"
};
STR16 gszMPTeamNames[] =
{
L"Foxtrot",
L"Bravo",
L"Delta",
L"Charlie"
};
STR16 gszMPMapscreenText[] =
{
L"Game Type: ",
L"Players: ",
L"Mercs each: ",
L"You cannot change starting edge once Laptop is unlocked",
L"You cannot change teams once the Laptop is unlocked",
L"Random Mercs: ",
L"Y",
L"Difficulty:"
};
STR16 gzMPSScreenText[] =
{
L"Scoreboard",
L"Continue",
L"Cancel",
L"Player",
L"Kills",
L"Deaths",
L"Queen's Army",
L"Hits",
L"Misses",
L"Accuracy",
L"Damage Dealt",
L"Damage Taken"
};
STR16 gzMPChatToggleText[] =
{
L"Send to All",
L"Send to Allies only",
};
STR16 gzMPChatboxText[] =
{
L"Multiplayer Chat",
L"Chat: press ENTER to send of ESC to cancel",
};
#endif //TAIWANESE
Utils/message.h
+9
View File
@@ -69,6 +69,15 @@ UINT8 GetRangeOfMapScreenMessages( void );
void EnableDisableScrollStringVideoOverlay( BOOLEAN fEnable );
// OJW - 20090315 - Allow access to these functions outside of message
// adding chat log
ScrollStringStPtr GetNextString(ScrollStringStPtr pStringSt);
ScrollStringStPtr GetPrevString(ScrollStringStPtr pStringSt);
void SetStringPosition(ScrollStringStPtr pStringSt, UINT16 x, UINT16 y);
void SetStringColor(ScrollStringStPtr pStringSt, UINT16 color);
ScrollStringStPtr SetStringNext(ScrollStringStPtr pStringSt, ScrollStringStPtr pNext);
ScrollStringStPtr SetStringPrev(ScrollStringStPtr pStringSt, ScrollStringStPtr pPrev);
void SetString(ScrollStringStPtr pStringSt, STR16 String);
// will go and clear all displayed strings off the screen
void ClearDisplayedListOfTacticalStrings( void );