*** Merged Code from Multiplayer Branch Revision 2960 ***

- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-04 21:01:45 +00:00
parent 17f44f63e8
commit 47db604b50
301 changed files with 76701 additions and 1843 deletions
+22 -1
View File
@@ -6,6 +6,10 @@ extern char CLIENT_NAME[30];
extern char SERVER_NAME[30];
extern bool Sawarded;
//extern char *fileToSend;
extern unsigned int setID;
//extern char *fileToSendCopy;
typedef struct
{
@@ -13,6 +17,7 @@ typedef struct
char client_name[30];
int team;
int cl_edge;
char client_version[30];
}client_info;
typedef struct
@@ -61,9 +66,18 @@ typedef struct
int RANDOM_SPAWN;
int RANDOM_MERCS;
int random_mercs[7];
char server_version[30];
} settings_struct;
// WANNE: FILE TRANSFER
typedef struct
{
STRING512 fileTransferDirectory;
//char fileTransferDirectory[600]; // The file transfer directory path from the server
int syncClientsDirectory; // Does the server want to sync files to the clients
char serverName[30]; // The name of the server. This is used on the client side as a folder inside the client transfer directory
long totalTransferBytes;
} filetransfersettings_struct;
// added 080101 by OJW
typedef struct
@@ -85,6 +99,13 @@ typedef struct
UINT8 newteam;
} teamchange_struct;
typedef struct
{
UINT8 client_num;
UINT8 progress;
UINT8 downloading;
} progress_struct;
//typedef struct
//{
// int clnum;