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

- Merged Source Code from MP branch Revision 2972

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Cinematics.cpp
+50 -1
View File
@@ -30,6 +30,8 @@
#include "DirectDraw Calls.h"
#include "Cinematics.h"
#include "soundman.h"
#include "VFS/vfs.h"
#include "VFS/vfs_file_raii.h"
#ifdef JA2
#include "video.h"
@@ -200,6 +202,7 @@ SMKFLIC *SmkOpenFlic(CHAR8 *cFilename)
return(NULL);
}
#ifndef USE_VFS
// Attempt opening the filename
if(!(pSmack->hFileHandle=FileOpen(cFilename, FILE_OPEN_EXISTING | FILE_ACCESS_READ, FALSE)))
{
@@ -209,6 +212,36 @@ SMKFLIC *SmkOpenFlic(CHAR8 *cFilename)
//Get the real file handle for the file man handle for the smacker file
hFile = GetRealFileHandleFromFileManFileHandle( pSmack->hFileHandle );
#else
vfs::Path introname(cFilename);
vfs::Path dir,filename;
introname.SplitLast(dir,filename);
vfs::Path tempfile = vfs::Path(L"Temp") + filename;
if(!GetVFS()->FileExists(tempfile))
{
try
{
if(!GetVFS()->FileExists(introname))
{
return NULL;
}
vfs::COpenReadFile rfile(introname);
vfs::UInt32 size = rfile.file().GetFileSize();
std::vector<vfs::Byte> data(size);
vfs::UInt32 io;
rfile.file().Read(&data[0],size,io);
vfs::COpenWriteFile wfile(tempfile,true);
wfile.file().Write(&data[0],size,io);
}
catch(CBasicException& ex)
{
std::wstringstream wss;
wss << L"Intro file \"" << filename() << L"\" could not be extracted";
RETHROWEXCEPTION(wss.str().c_str(),&ex);
}
}
#endif
// Allocate a Smacker buffer for video decompression
if(!(pSmack->SmackBuffer=SmackBufferOpen(hDisplayWindow,SMACKAUTOBLIT,SCREEN_WIDTH,SCREEN_HEIGHT,0,0)))
@@ -216,9 +249,25 @@ SMKFLIC *SmkOpenFlic(CHAR8 *cFilename)
ErrorMsg("SMK ERROR: Can't allocate a Smacker decompression buffer");
return(NULL);
}
#ifndef USE_VFS
if(!(pSmack->SmackHandle=SmackOpen((CHAR8 *)hFile, SMACKFILEHANDLE | SMACKTRACKS, SMACKAUTOEXTRA)))
#else
// if(!(pSmack->SmackHandle=SmackOpen(cFilename, SMACKTRACKS, SMACKAUTOEXTRA)))
vfs::Path tempfilename;
try
{
vfs::COpenWriteFile wfile(tempfile);
if(!wfile.file()._getRealPath(tempfilename))
{
return NULL;
}
}
catch(CBasicException& ex)
{
RETHROWEXCEPTION(L"Temporary intro file could not be read", &ex);
}
if(!(pSmack->SmackHandle=SmackOpen(tempfilename().utf8().c_str(), SMACKTRACKS, SMACKAUTOEXTRA)))
#endif
{
ErrorMsg("SMK ERROR: Smacker won't open the SMK file");
return(NULL);