mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00: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:
@@ -3,6 +3,7 @@
|
||||
//this one just for structs, variables and functions used between the client and server scripts...
|
||||
|
||||
extern char CLIENT_NAME[30];
|
||||
extern char SERVER_NAME[30];
|
||||
extern bool Sawarded;
|
||||
|
||||
|
||||
@@ -41,6 +42,10 @@ typedef struct
|
||||
UINT8 client_num;
|
||||
char client_name[30];
|
||||
char client_names[4][30];
|
||||
// OJW - added 20081204
|
||||
int client_edges[4];
|
||||
int client_teams[4];
|
||||
char server_name[30];
|
||||
//int cl_ops[4];
|
||||
int team;
|
||||
int TESTING;
|
||||
@@ -52,8 +57,34 @@ typedef struct
|
||||
int WEAPON_READIED_BONUS;
|
||||
int ALLOW_CUSTOM_NIV;
|
||||
int DISABLE_SPEC_MODE;
|
||||
// OJW - added 20081220
|
||||
int RANDOM_SPAWN;
|
||||
int RANDOM_MERCS;
|
||||
int random_mercs[7];
|
||||
} settings_struct;
|
||||
|
||||
|
||||
|
||||
// added 080101 by OJW
|
||||
typedef struct
|
||||
{
|
||||
INT16 gsMercArriveSectorX;
|
||||
INT16 gsMercArriveSectorY;
|
||||
float TIME;
|
||||
} mapchange_struct;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT8 client_num;
|
||||
UINT8 newedge;
|
||||
} edgechange_struct;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT8 client_num;
|
||||
UINT8 newteam;
|
||||
} teamchange_struct;
|
||||
|
||||
//typedef struct
|
||||
//{
|
||||
// int clnum;
|
||||
|
||||
Reference in New Issue
Block a user