From 404f7065128deb0aedebaff5d5d49d1f90b4a4e2 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 24 Sep 2005 14:48:43 +0000 Subject: [PATCH] Say bug fixed, and hopefully the chaining bug too. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1361 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- fteqtv/qw.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fteqtv/qw.c b/fteqtv/qw.c index ce39bffb4..994e0d21b 100644 --- a/fteqtv/qw.c +++ b/fteqtv/qw.c @@ -656,7 +656,10 @@ void Prox_SendInitialEnts(sv_t *qtv, oproxy_t *prox, netmsg_t *msg) int i; WriteByte(msg, svc_packetentities); for (i = 0; i < qtv->maxents; i++) - SV_WriteDelta(i, &nullentstate, &qtv->entity[i].current, msg, true); + { + if (qtv->entity[i].current.modelindex) + SV_WriteDelta(i, &nullentstate, &qtv->entity[i].current, msg, true); + } WriteShort(msg, 0); } @@ -923,7 +926,8 @@ void QTV_Say(sv_t *qtv, viewer_t *v, char *message) char buf[1024]; netmsg_t msg; - message[strlen(message)-1] = '\0'; + if (message[strlen(message)-1] == '\"') + message[strlen(message)-1] = '\0'; InitNetMsg(&msg, buf, sizeof(buf)); @@ -962,6 +966,8 @@ void ParseQWC(sv_t *qtv, viewer_t *v, netmsg_t *m) SendServerData(qtv, v); else if (!strncmp(buf, "say \"", 5) && !qtv->notalking) QTV_Say(qtv, v, buf); + else if (!strncmp(buf, "say ", 4) && !qtv->notalking) + QTV_Say(qtv, v, buf); else if (!strncmp(buf, "modellist ", 10)) { char *cmd = buf+10; @@ -1152,8 +1158,7 @@ void QW_UpdateUDPStuff(sv_t *qtv) { sprintf(buffer, "a\n%i\n0\n", qtv->mastersequence++); //fill buffer with a heartbeat //why is there no \xff\xff\xff\xff ?.. - NET_SendPacket(qtv->qwdsocket, 1, "k", from); //ping, just like qw. - NET_SendPacket(qtv->qwdsocket, strlen(buffer), buffer, from); //ping, just like qw. + NET_SendPacket(qtv->qwdsocket, strlen(buffer), buffer, from); } else printf("Cannot resolve master %s\n", qtv->master);