- Merged Source Code from MP branch Revision 2972

enable intro videos in VFS mode
workaround for original intro hack
allow to get real path of a file (only CVFSFile)
streamline Allocator usage in VFile
small non-VFS mode fixes in MPHostScreen.cpp
Synced "Cutting Fences" in a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-06 16:13:00 +00:00
parent 8c07f244f3
commit 3850e27bc5
11 changed files with 115 additions and 29 deletions
+6 -2
View File
@@ -4,6 +4,8 @@
#include "vfs_profile.h"
#include <vector>
#define VFILE_BLOCK_CREATE
namespace vfs
{
class CVirtualFile
@@ -17,9 +19,9 @@ namespace vfs
};
public:
~CVirtualFile();
//CVirtualFile(vfs::Path const& sFilePath, CProfileStack& rPStack);
void Destroy();
static CVirtualFile* Create(vfs::Path const& sFilePath, CProfileStack& rPStack);
vfs::Path const& Path();
void Add(vfs::IBaseFile *pFile, utf8string sProfileName, bool bReplace = false);
bool Remove(vfs::IBaseFile *pFile);
@@ -37,7 +39,9 @@ namespace vfs
CProfileStack* _pstack;
private:
unsigned int _myID;
#ifdef VFILE_BLOCK_CREATE
static ObjBlockAllocator<CVirtualFile>* _vfile_pool;
#endif
};
} // end namspace