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

**********************************************************

Browse Source 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-28 18:38:52 +00:00
parent a98c44ac78
commit 14750c6903
461 changed files with 23615 additions and 120157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Cinematics.cpp
+11 -11
View File
@@ -193,6 +193,7 @@ SMKFLIC *pSmack;
SMKFLIC *SmkOpenFlic(CHAR8 *cFilename)
{
SMKFLIC *pSmack;
// Get an available flic slot from the list
if(!(pSmack=SmkGetFreeFlic()))
@@ -216,30 +217,29 @@ SMKFLIC *SmkOpenFlic(CHAR8 *cFilename)
#else
vfs::Path introname(cFilename);
vfs::Path dir,filename;
introname.SplitLast(dir,filename);
introname.splitLast(dir,filename);
vfs::Path tempfile = vfs::Path(L"Temp") + filename;
if(!GetVFS()->FileExists(tempfile))
if(!getVFS()->fileExists(tempfile))
{
try
{
if(!GetVFS()->FileExists(introname))
if(!getVFS()->fileExists(introname))
{
return NULL;
}
vfs::COpenReadFile rfile(introname);
vfs::UInt32 size = rfile.file().GetFileSize();
vfs::size_t size = rfile.file().getSize();
std::vector<vfs::Byte> data(size);
vfs::UInt32 io;
rfile.file().Read(&data[0],size,io);
rfile.file().read(&data[0],size);
vfs::COpenWriteFile wfile(tempfile,true);
wfile.file().Write(&data[0],size,io);
wfile.file().write(&data[0],size);
}
catch(CBasicException& ex)
{
std::wstringstream wss;
wss << L"Intro file \"" << filename() << L"\" could not be extracted";
RETHROWEXCEPTION(wss.str().c_str(),&ex);
BuildString bs;
bs.add(L"Intro file \"").add(filename()).add(L"\" could not be extracted");
RETHROWEXCEPTION(bs.get(), &ex);
}
}
#endif
@@ -267,7 +267,7 @@ SMKFLIC *SmkOpenFlic(CHAR8 *cFilename)
{
RETHROWEXCEPTION(L"Temporary intro file could not be read", &ex);
}
if(!(pSmack->SmackHandle=SmackOpen(tempfilename().utf8().c_str(), SMACKTRACKS, SMACKAUTOEXTRA)))
if(!(pSmack->SmackHandle=SmackOpen(tempfilename.to_string().c_str(), SMACKTRACKS, SMACKAUTOEXTRA)))
#endif
{
ErrorMsg("SMK ERROR: Smacker won't open the SMK file");