mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Merged Multiplayer UI patch from Zathras:
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user