*** 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
+20
View File
@@ -5,6 +5,8 @@
#include "ScreenIds.h"
#include "mousesystem.h"
#include "Button System.h"
#include <list>
#include "VFS/utf8string.h"
extern UINT32 EditScreenInit(void);
extern UINT32 EditScreenHandle(void);
@@ -137,6 +139,11 @@ extern UINT32 MPChatScreenInit( void );
extern UINT32 MPChatScreenHandle( void );
extern UINT32 MPChatScreenShutdown( void );
// OJW - 20090422
extern UINT32 MPConnectScreenInit( void );
extern UINT32 MPConnectScreenHandle( void );
extern UINT32 MPConnectScreenShutdown( void );
// External functions
void DisplayFrameRate( );
@@ -145,6 +152,7 @@ void HandleTitleScreenAnimation();
//External Globals
extern CHAR8 gubFilename[ 200 ];
extern UINT32 guiCurrentScreen;
extern UINT32 guiPendingScreen;
typedef void (*RENDER_HOOK)( void );
@@ -157,5 +165,17 @@ void DisableFPSOverlay( BOOLEAN fEnable );
void EnterTacticalScreen( );
void LeaveTacticalScreen( UINT32 uiNewScreen );
//////////////////////////////////////////////////////////////////////////
struct SExceptionData
{
utf8string message,function,file;
int line;
};
extern std::list<SExceptionData> g_ExceptionList;
void PrintExceptionList();
#endif