From 013ba75c0d78d12bbada2c8e3dd814b74361d14f Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 1 Jan 2008 13:18:07 +0000 Subject: [PATCH] kill two VM_Warnings git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3068 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 11 +++++------ data/qcsrc/server/miscfunctions.qc | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index f17b8c843..f15a0ad1d 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -508,7 +508,6 @@ void PutClientInServer (void) self.playermodel = CheckPlayerModel(self.playermodel); setmodel_lod (self, self.playermodel); self.skin = RestrictSkin(stof(self.playerskin)); - self.playerskin = ftos(self.skin); } if(!teams_matter) if(strlen(cvar_string("sv_defaultplayercolors"))) @@ -1249,6 +1248,8 @@ void() ctf_setstatus; .float vote_nagtime; void PlayerPreThink (void) { + float f; + // version nagging if(self.version_nagtime) if(self.cvar_g_nexuizversion) @@ -1421,11 +1422,9 @@ void PlayerPreThink (void) setsize (self, m1, m2); } - if(self.skin != stof(self.playerskin)) - { - self.skin = RestrictSkin(stof(self.playerskin)); - self.playerskin = ftos(self.skin); - } + f = RestrictSkin(stof(self.playerskin)); + if(self.skin != f) + self.skin = f; } if(!teams_matter) if(strlen(cvar_string("sv_defaultplayercolors"))) diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index a0e640803..771648bff 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -882,6 +882,8 @@ void precache_all_models(string pattern) string f; globhandle = search_begin(pattern, TRUE, FALSE); + if(globhandle < 0) + return; n = search_getsize(globhandle); for(i = 0; i < n; ++i) { -- 2.39.2