From: terencehill <piuntn@gmail.com>
Date: Sun, 18 Jul 2010 20:16:43 +0000 (+0200)
Subject: Avoid double checks of numModels by calling go in configure instead of in loadCvars... 
X-Git-Tag: xonotic-v0.1.0preview~341^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f5af11a8794a82f13d066452580dd8d0cc756bc;p=xonotic%2Fxonotic-data.pk3dir.git

Avoid double checks of numModels by calling go in configure instead of in loadCvars. Then changed a bit the code to be cleaner (now loadCvars doesn't do part of go's work).
---

diff --git a/qcsrc/menu/xonotic/playermodel.c b/qcsrc/menu/xonotic/playermodel.c
index 150cea0ce..f4f7526f0 100644
--- a/qcsrc/menu/xonotic/playermodel.c
+++ b/qcsrc/menu/xonotic/playermodel.c
@@ -88,7 +88,8 @@ void XonoticPlayerModelSelector_configureXonoticPlayerModelSelector(entity me)
 	}
 	buf_del(sortbuf);
 	get_model_parameters(string_null, 0);
-	me.loadCvars(me);
+	me.loadCvars(me); // this will select the initial model, depending on the current cvars
+	me.go(me, 0); // this will set the vars for the selected model
 }
 void XonoticPlayerModelSelector_destroy(entity me)
 {
@@ -98,27 +99,25 @@ void XonoticPlayerModelSelector_destroy(entity me)
 
 void XonoticPlayerModelSelector_loadCvars(entity me)
 {
+	string skin, model;
 	float i;
-	if(me.currentModel)
-		strunzone(me.currentModel);
-	me.currentSkin = cvar("_cl_playerskin");
-	me.currentModel = strzone(cvar_string("_cl_playermodel"));
+
+	skin = cvar_string("_cl_playerskin");
+	model = cvar_string("_cl_playermodel");
+
 	for(i = 0; i < me.numModels; ++i)
 	{
-		if(bufstr_get(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_MODEL) == me.currentModel)
-		if(bufstr_get(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_SKIN) == ftos(me.currentSkin))
+		if(bufstr_get(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_MODEL) == model)
+		if(bufstr_get(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_SKIN) == skin)
 			break;
 	}
 	if(i >= me.numModels) // fail
 		i = 0;
 	me.idxModels = i;
-	me.go(me, 0); // this will set the other vars for currentSkin and currentModel
 }
 
 void XonoticPlayerModelSelector_go(entity me, float d)
 {
-	if (me.numModels <= 0)
-		return;
 	me.idxModels = mod(me.idxModels + d + me.numModels, me.numModels);
 
 	if(me.currentModel)