*** 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

MPJoinScreen.h

@@ -1,12 +1,30 @@
 #ifndef _MP_JOIN_SCREEN_H_
 #define _MP_JOIN_SCREEN_H_
 
+#include "VFS/vfs.h"
+
+#ifdef USE_VFS
+
+class CPropertyContainer;
+
+class CUniqueServerId
+{
+public:
+	utf8string const& GetServerId(vfs::Path dir, CPropertyContainer* props = NULL);
+private:
+	utf8string _id;
+};
+
+extern CUniqueServerId s_ServerId;
+
+#endif
 
 UINT32	MPJoinScreenInit( void );
 UINT32	MPJoinScreenHandle( void );
 UINT32	MPJoinScreenShutdown( void );
 
+void		SaveJoinSettings(bool ReSaving);
 
 
 
-#endif
+#endif