From b416df7b8c874a8b5bd047ef521fceb6b6850ca2 Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Sat, 10 Jun 2006 20:02:44 +0000 Subject: [PATCH] better fix for LMS crash git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1550 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/gamec/cl_weaponsystem.c | 7 +++++-- data/qcsrc/server/gamec/g_world.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/gamec/cl_weaponsystem.c b/data/qcsrc/server/gamec/cl_weaponsystem.c index 8c1899ca3..b261421af 100644 --- a/data/qcsrc/server/gamec/cl_weaponsystem.c +++ b/data/qcsrc/server/gamec/cl_weaponsystem.c @@ -307,8 +307,11 @@ void() w_clear = void() w_ready = { - self.weaponentity.state = WS_READY; - weapon_thinkf(WFRAME_IDLE, 0.1, w_ready); + if (self.weaponentity) + { + self.weaponentity.state = WS_READY; + weapon_thinkf(WFRAME_IDLE, 0.1, w_ready); + } }; // FIXME: add qw-style client-custom weaponrating (cl_weaponrating)? diff --git a/data/qcsrc/server/gamec/g_world.c b/data/qcsrc/server/gamec/g_world.c index 29f3a4b5c..4070fc4b4 100644 --- a/data/qcsrc/server/gamec/g_world.c +++ b/data/qcsrc/server/gamec/g_world.c @@ -778,7 +778,7 @@ void() NextLevel = other.angles_x = other.angles_x * -1; self = other; - //w_ready(); + w_ready(); if(clienttype(other) == CLIENTTYPE_REAL) if(cvar("sv_autoscreenshot")) -- 2.39.2