quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed crash loading quake4 1.3 entity definitions

Browse Source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@100 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog
2006-08-22 17:37:07 +00:00
parent 3e076b28de
commit 3f1cbdde23
3 changed files with 223 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/vfspk3/vfs.cpp
View File

@@ -57,6 +57,7 @@ ArchiveModules& FileSystemQ3API_getArchiveModules();
#include "generic/callback.h"
#include "string/string.h"
#include "container/array.h"
#include "stream/stringstream.h"
#include "os/path.h"
#include "moduleobservers.h"
@@ -141,7 +142,14 @@ static void InitPakFile (ArchiveModules& archiveModules, const char *filename)
if(table != 0)
{
archive_entry_t entry;
entry.name = filename;
std::size_t length = string_length(filename);
Array<char> tmp(length + 2);
std::copy(filename, filename + length, tmp.begin());
tmp[length] = ':';
tmp[length + 1] = '\0';
entry.name = tmp.begin();
entry.archive = table->m_pfnOpenArchive(filename);
entry.is_pakfile = true;
g_archives.push_back(entry);
@@ -520,7 +528,7 @@ const char* FindFile(const char* relative)
{
for(archives_t::iterator i = g_archives.begin(); i != g_archives.end(); ++i)
{
if(!(*i).is_pakfile && (*i).archive->containsFile(relative))
if((*i).archive->containsFile(relative))
{
return (*i).name.c_str();
}
@@ -533,7 +541,7 @@ const char* FindPath(const char* absolute)
{
for(archives_t::iterator i = g_archives.begin(); i != g_archives.end(); ++i)
{
if(!(*i).is_pakfile && path_equal_n(absolute, (*i).name.c_str(), string_length((*i).name.c_str())))
if(path_equal_n(absolute, (*i).name.c_str(), string_length((*i).name.c_str())))
{
return (*i).name.c_str();
}