Merge branch 'master' into mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_player.qc

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index dcf1ab76842afdd5a8885d68d4aacc16811c4627..2d028c17cd5455de63257dcba03bff7996ec5027 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -26,7 +26,7 @@ void WeaponStats_ready(entity fh, entity pass, float status)
                        url_fputs(fh, "#begin statsfile\n");
                        url_fputs(fh, strcat("#date ", strftime(TRUE, "%a %b %e %H:%M:%S %Z %Y"), "\n"));
 #ifdef WATERMARK
-                       url_fputs(fh, strcat("#version ", WATERMARK(), "\n"));
+                       url_fputs(fh, strcat("#version ", WATERMARK, "\n"));
 #endif
                        url_fputs(fh, strcat("#config ", ftos(crc16(FALSE, cvar_purechanges)), "\n"));
                        url_fputs(fh, strcat("#cvar_purechanges ", ftos(cvar_purechanges_count), "\n"));
@@ -273,7 +273,7 @@ void player_anim (void)
 
        if (!self.animstate_override)
        {
-               if (self.freezetag_frozen)
+               if (self.freezetag_frozen || self.frozen)
                        setanim(self, self.anim_idle, TRUE, FALSE, FALSE);
                else if (!(self.flags & FL_ONGROUND) || self.BUTTON_JUMP)
                {