From: TimePath <andrew.hardaker1995@gmail.com>
Date: Fri, 11 Dec 2015 11:04:06 +0000 (+1100)
Subject: precache_playermodels: fix insidious bug; sounds loaded as models
X-Git-Tag: xonotic-v0.8.2~1507
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6df216a3c36cd0e09ebd42cfa39c440d91fc0d6;p=xonotic%2Fxonotic-data.pk3dir.git

precache_playermodels: fix insidious bug; sounds loaded as models
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index e7eed32b4..07dd423dc 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -735,32 +735,20 @@ void precache_playermodel(string m)
 }
 void precache_all_playermodels(string pattern)
 {
-	float globhandle, i, n;
-	string f;
-
-	globhandle = search_begin(pattern, true, false);
-	if (globhandle < 0)
-		return;
-	n = search_getsize(globhandle);
-	for (i = 0; i < n; ++i)
+	int globhandle = search_begin(pattern, true, false);
+	if (globhandle < 0) return;
+	int n = search_getsize(globhandle);
+	for (int i = 0; i < n; ++i)
 	{
-		//print(search_getfilename(globhandle, i), "\n");
-		f = search_getfilename(globhandle, i);
-		precache_playermodel(f);
+		string s = search_getfilename(globhandle, i);
+		precache_playermodel(s);
 	}
 	search_end(globhandle);
 }
 
 void precache_playermodels(string s)
 {
-	if(s != "")
-	{
-		int n = tokenize_console(s);
-		precache_playermodel(argv(0));
-
-		for (int i = 1; i < n; ++i)
-			precache_model(argv(i));
-	}
+	FOREACH_WORD(s, true, LAMBDA(precache_playermodel(it)));
 }
 
 void precache()