From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 9 Jan 2010 18:46:49 +0000 (+0000)
Subject: fix some compile errors. Now it should work.
X-Git-Tag: xonotic-v0.1.0preview~230^2~650
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=11c4295b8ffc664deec6e3b01e90eaa2b03c0c7f

fix some compile errors. Now it should work.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9817 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/fs.c b/fs.c
index 775d766b..af163ce1 100644
--- a/fs.c
+++ b/fs.c
@@ -1046,11 +1046,15 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname,
 		}
 		search->pack = pak;
 		if(!pak)
-			search->filename = fn;
-		if(strlen(filename) >= strlen(shortname))
-			search->vpack = search->filename + strlen(search->filename) - strlen(shortname);
+		{
+			strlcpy(search->filename, pakfile, sizeof(search->filename));
+			if(strlen(search->filename) >= strlen(shortname))
+				search->vpack = search->filename + strlen(search->filename) - strlen(shortname);
+			else
+				search->vpack = search->filename;
+		}
 		else
-			search->vpack = search->filename;
+			search->vpack = search->pack->shortname;
 		return true;
 	}
 	else