Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-31 02:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed std::vector for SafeDataPointer for internal FileSystem FileGet.

Browse Source
This commit is contained in:
Martín Lucas Golini
2013-01-01 21:28:11 -03:00
parent 43d581bbe6
commit bf81f1d6d5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/linux/ee.creator.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.6.1, 2012-12-28T15:26:48. -->
<!-- Written by Qt Creator 2.6.1, 2013-01-01T00:14:50. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>

4
src/eepp/system/cpak.cpp
View File

@@ -270,11 +270,11 @@ bool cPak::AddFile( const std::string& path, const std::string& inpack ) {
if ( path.size() > 56 )
return false;
std::vector<Uint8> file;
SafeDataPointer file;
FileSystem::FileGet( path, file );
return AddFile( file, inpack );
return AddFile( file.Data, file.DataSize, inpack );
}
bool cPak::AddFiles( std::map<std::string, std::string> paths ) {

4
src/eepp/system/czip.cpp
View File

@@ -69,11 +69,11 @@ bool cZip::Close() {
}
bool cZip::AddFile( const std::string& path, const std::string& inpack ) {
std::vector<Uint8> file;
SafeDataPointer file;
FileSystem::FileGet( path, file );
return AddFile( file, inpack );
return AddFile( file.Data, file.DataSize, inpack );
}
bool cZip::AddFile( const Uint8 * data, const Uint32& dataSize, const std::string& inpack ) {