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

************************************************************

Browse Source 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/network.h
+78 -61
View File
@@ -3,17 +3,43 @@
#include "random.h"
//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 char cClientName[30];
extern char cServerName[30];
extern bool Sawarded;
//extern char *fileToSend;
extern unsigned int setID;
//extern char *fileToSendCopy;
// ja2_mp.ini: File
#define JA2MP_INI_FILENAME "ja2_mp.ini"
// "ja2_mp.ini: Sections
#define JA2MP_INI_INITIAL_SECTION "JA2 Multiplayer Initial Settings"
#define JA2MP_INI_SERVER_SECTION "JA2 Multiplayer Servers"
// ja2_mp.ini: Properties
#define JA2MP_ALLOW_CUSTOM_NIV "INVENTORY_ATTACHMENTS"
#define JA2MP_CIV_ENABLED "ENABLE_CIVILIANS_IN_COOP"
#define JA2MP_CLIENT_NAME "PLAYER_NAME"
#define JA2MP_DAMAGE_MULTIPLIER "WEAPON_DAMAGE"
#define JA2MP_DIFFICULT_LEVEL "DIFFICULTY_LEVEL"
#define JA2MP_DISABLE_BOBBY_RAYS "BOBBY_RAYS"
#define JA2MP_FILE_TRANSFER_DIRECTORY "GAME_DATA_SYNC_DIRECTORY"
#define JA2MP_GAME_MODE "GAME_TYPE"
#define JA2MP_KIT_BAG "KIT_BAG"
#define JA2MP_MAX_CLIENTS "MAX_PLAYERS"
#define JA2MP_MAX_MERCS "MAX_MERCS"
#define JA2MP_OVERRIDE_MAX_AI "MAX_ENEMIES_IN_COOP"
#define JA2MP_RANDOM_EDGES "STARTING_SECTOR_EDGE"
#define JA2MP_RANDOM_MERCS "HIRE_MERCS_METHOD"
#define JA2MP_REPORT_NAME "REPORT_HIRED_MERC_NAME"
#define JA2MP_SAME_MERC "SAME_MERC_ALLOWED"
#define JA2MP_SERVER_IP "SERVER_IP"
#define JA2MP_SERVER_NAME "SERVER_NAME"
#define JA2MP_SERVER_PORT "SERVER_PORT"
#define JA2MP_STARTING_BALANCE "STARTING_CASH"
#define JA2MP_SYNC_CLIENTS_MP_DIR "SYNC_GAME_DIRECTORY"
#define JA2MP_TIMED_TURN_SECS_PER_TICK "TIMED_TURNS"
#define JA2MP_TIME "STARTING_TIME"
#define JA2MP_NEW_TRAITS "SKILL_TRAITS"
typedef struct
{
@@ -26,60 +52,56 @@ typedef struct
typedef struct
{
int max_clients;
int same_merc;
float damage_multiplier;
INT16 gsMercArriveSectorX;
INT16 gsMercArriveSectorY;
int ENEMY_ENABLED;
int CREATURE_ENABLED;
int MILITIA_ENABLED;
int CIV_ENABLED;
int gsPLAYER_BSIDE;
INT32 secs_per_tick;
INT32 starting_balance;
bool soDis_Bobby;
bool soDis_Equip;
UINT8 maxClients;
UINT8 sameMercAllowed;
float damageMultiplier;
INT16 gsMercArriveSectorX;
INT16 gsMercArriveSectorY;
UINT8 enemyEnabled;
UINT8 creatureEnabled;
UINT8 militiaEnabled;
UINT8 civEnabled;
UINT8 gameType;
INT32 secondsPerTick;
INT32 startingCash;
UINT8 disableBobbyRay;
UINT8 disableMercEquipment;
BOOLEAN sofGunNut;
UINT8 soubGameStyle;
UINT8 soubDifficultyLevel;
UINT8 soubSkillTraits;
BOOLEAN sofTurnTimeLimit;
BOOLEAN sofIronManMode;
UINT8 soubBobbyRay;
BOOLEAN sofNewInv;
INT32 gsMAX_MERCS;
UINT8 client_num;
char client_name[30];
char client_names[4][30];
// OJW - added 20081204
int client_edges[5];
int client_teams[4];
char server_name[30];
//int cl_ops[4];
int team;
int TESTING;
char kitbag[100];
bool emorale;
int gsREPORT_NAME;
int cl_edge;
float TIME;
int WEAPON_READIED_BONUS;
int ALLOW_CUSTOM_NIV;
int DISABLE_SPEC_MODE;
UINT8 soubBobbyRay;
UINT8 maxMercs;
UINT8 client_num;
char client_name[30];
char client_names[4][30];
int client_edges[5];
int client_teams[4];
char server_name[30];
int team;
char kitBag[100];
UINT8 disableMorale;
UINT8 reportHiredMerc;
UINT8 startingSectorEdge;
float startingTime;
UINT8 weaponReadyBonus;
UINT8 inventoryAttachment;
UINT8 disableSpectatorMode;
// OJW - added 20081220
int RANDOM_SPAWN;
int RANDOM_MERCS;
int random_mercs[7];
char server_version[30];
UINT8 randomStartingEdge;
UINT8 randomMercs;
int random_mercs[7];
char server_version[30];
// OJW - added 20091024
UINT32 random_table[MAX_PREGENERATED_NUMS];
UINT32 random_table[MAX_PREGENERATED_NUMS];
} settings_struct;
// WANNE: FILE TRANSFER
typedef struct
{
STRING512 fileTransferDirectory;
//char fileTransferDirectory[600]; // The file transfer directory path from the server
STRING512 fileTransferDirectory;
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;
@@ -90,7 +112,7 @@ typedef struct
{
INT16 gsMercArriveSectorX;
INT16 gsMercArriveSectorY;
float TIME;
float startingTime;
} mapchange_struct;
typedef struct
@@ -112,18 +134,6 @@ typedef struct
UINT8 downloading;
} progress_struct;
//typedef struct
//{
// int clnum;
// UINT8 ubid;
//}ovh_struct;
//
//typedef struct
//{
// UINT8 ubid;
//}adv;
typedef struct
{
BOOLEAN fMarkInterruptOccurred;
@@ -142,3 +152,10 @@ typedef struct
UINT8 ubStartingTeam;
}sc_struct;
namespace ja2
{
namespace mp
{
void InitializeMultiplayerProfile(vfs::Path const& profileRoot);
}
}