From 0fd9cb8c9c1870b42fa7c02506a4212cff647df2 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 5 Dec 2004 15:19:11 +0000
Subject: [PATCH] Trying to get MVDs working again.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@572 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
engine/server/sv_user.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/engine/server/sv_user.c b/engine/server/sv_user.c
index cbb47660f..8ea1e66f5 100644
--- a/engine/server/sv_user.c
+++ b/engine/server/sv_user.c
@@ -661,6 +661,10 @@ void SV_Soundlist_f (void)
*sv.demsound_precache[i] && host_client->netchan.message.cursize < (MAX_QWMSGLEN/2);
i++, n++)
MSG_WriteString (&host_client->netchan.message, sv.demsound_precache[i]);
+
+
+ if (!*sv.demsound_precache[i])
+ n = 0;
}
else
{
@@ -668,14 +672,14 @@ void SV_Soundlist_f (void)
*sv.sound_precache[i] && host_client->netchan.message.cursize < (MAX_QWMSGLEN/2);
i++, n++)
MSG_WriteString (&host_client->netchan.message, sv.sound_precache[i]);
+
+ if (!*sv.sound_precache[i])
+ n = 0;
}
MSG_WriteByte (&host_client->netchan.message, 0);
// next msg
- if (*sv.sound_precache[i])
- MSG_WriteByte (&host_client->netchan.message, n);
- else
- MSG_WriteByte (&host_client->netchan.message, 0);
+ MSG_WriteByte (&host_client->netchan.message, n);
}
/*
@@ -736,6 +740,9 @@ void SV_Modellist_f (void)
*sv.demmodel_precache[i] && ((n&255)==0||host_client->netchan.message.cursize < (MAX_QWMSGLEN/2));
i++, n++)
MSG_WriteString (&host_client->netchan.message, sv.demmodel_precache[i]);
+
+ if (!*sv.demmodel_precache[i])
+ n = 0;
}
else
{
@@ -743,15 +750,15 @@ void SV_Modellist_f (void)
*sv.model_precache[i] && (((n&255)==0)||(host_client->netchan.message.cursize < (MAX_QWMSGLEN/2))); //make sure we don't send a 0 next...
i++, n++)
MSG_WriteString (&host_client->netchan.message, sv.model_precache[i]);
+
+ if (!*sv.model_precache[i])
+ n = 0;
}
MSG_WriteByte (&host_client->netchan.message, 0);
// next msg
- if ((sv.democausesreconnect && *sv.demmodel_precache[i]) || (!sv.democausesreconnect && *sv.model_precache[i]))
- MSG_WriteByte (&host_client->netchan.message, n);
- else
- MSG_WriteByte (&host_client->netchan.message, 0);
+ MSG_WriteByte (&host_client->netchan.message, n);
}
/*
@@ -2734,6 +2741,8 @@ void SV_ExecuteUserCommand (char *s, qboolean fromQC)
{
ucmd_t *u;
client_t *oldhost = host_client;
+
+ Con_DPrintf("Client command: %s\n", s);
Cmd_TokenizeString (s);
sv_player = host_client->edict;
@@ -3205,7 +3214,7 @@ void SVNQ_ExecuteUserCommand (char *s)
{
if (!strcmp (Cmd_Argv(0), u->name) )
{
- if (!fromQC && !u->noqchandling)
+ if (/*!fromQC && */!u->noqchandling)
if (PR_UserCmd(s))
{
host_client = oldhost;