*** 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
+18 -1
View File
@@ -173,7 +173,6 @@ extern STR16 gzIMPColorChoosingText[];
extern STR16 sColorChoiceExplanationTexts[];
extern STR16 gzIMPDisabilityTraitText[];
//****
enum
{
ANTIHACKERSTR_EXITGAME,
@@ -1506,6 +1505,12 @@ enum
MPH_TIMER_INVALID,
MPH_ENABLECIV_TEXT,
MPH_USENIV_TEXT,
MPH_OVERRIDEMAXAI_TEXT,
MPH_SYNC_CLIENT_MP_DIR,
MPH_FILE_TRANSFER_DIR_TEXT,
MPH_FILE_TRANSFER_DIR_INVALID,
MPH_FILE_TRANSFER_DIR_TEXT_ADDITIONAL,
MPH_FILE_TRANSFER_DIR_NOT_EXIST,
};
extern STR16 gzMPHScreenText[];
enum
@@ -1522,8 +1527,20 @@ enum
MPS_ACCURACY_TEXT,
MPS_DMGDONE_TEXT,
MPS_DMGTAKEN_TEXT,
MPS_WAITSERVER_TEXT
};
extern STR16 gzMPSScreenText[];
enum
{
MPC_CANCEL_TEXT,
MPC_CONNECTING_TEXT,
MPC_GETSETTINGS_TEXT,
MPC_DOWNLOADING_TEXT,
MPC_HELP1_TEXT,
MPC_HELP2_TEXT,
MPC_READY_TEXT,
};
extern STR16 gzMPCScreenText[];
// Multiplayer Starting Edges
enum
{