diff --git a/src/client/npc.c b/src/client/npc.c index 9e7f64a1..35163e3a 100644 --- a/src/client/npc.c +++ b/src/client/npc.c @@ -96,5 +96,7 @@ NPC_ReadEntity(float new) if (new) { setcustomskin(pl, "", sprintf("geomset 1 %i\n", pl.body)); } + + setorigin(pl, pl.origin); } diff --git a/src/client/obituary.c b/src/client/obituary.c index 137a44a9..1e72da63 100644 --- a/src/client/obituary.c +++ b/src/client/obituary.c @@ -173,6 +173,11 @@ Obituary_Parse(void) victim = readstring(); weapon = readbyte(); flags = readbyte(); + + if (!attacker) { + return; + } Obituary_Add(attacker, victim, weapon, flags); + //print("Obituary received\n"); } diff --git a/src/gs-entbase/server/func_door_rotating.cpp b/src/gs-entbase/server/func_door_rotating.cpp index 04882fc7..7659761c 100644 --- a/src/gs-entbase/server/func_door_rotating.cpp +++ b/src/gs-entbase/server/func_door_rotating.cpp @@ -337,7 +337,7 @@ void func_door_rotating::Respawn(void) setmodel(this, m_oldModel); setorigin(this, m_oldOrigin); think = __NULL__; - nextthink = -1; + nextthink = 0; m_pMove = 0; avelocity = [0,0,0]; diff --git a/src/server/scihunt/monster_scientist.cpp b/src/server/scihunt/monster_scientist.cpp index 8c1fa528..f965d077 100644 --- a/src/server/scihunt/monster_scientist.cpp +++ b/src/server/scihunt/monster_scientist.cpp @@ -225,8 +225,8 @@ string sci_sndscream[] = { "scientist/scream6.wav", "scientist/scream7.wav", "scientist/evergetout.wav", - "scientist/scream8.wav", - "scientist/scream9.wav", + //"scientist/scream8.wav", + //"scientist/scream9.wav", "scientist/scream10.wav", "scientist/scream11.wav", "scientist/getoutalive.wav", diff --git a/src/server/valve/damage.c b/src/server/valve/damage.c index 93d880b3..01d1d463 100644 --- a/src/server/valve/damage.c +++ b/src/server/valve/damage.c @@ -20,7 +20,11 @@ Damage_Obituary(entity c, entity t, float weapon, float flags) { WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, EV_OBITUARY); - WriteString(MSG_MULTICAST, c.netname); + if (c.netname) { + WriteString(MSG_MULTICAST, c.netname); + } else { + WriteString(MSG_MULTICAST, c.classname); + } WriteString(MSG_MULTICAST, t.netname); WriteByte(MSG_MULTICAST, weapon); WriteByte(MSG_MULTICAST, flags);