Big huge mega-whooping commit.

I wonder how many things this'll break...
On the plus side, nexuiz works well, and ktpro works as well as in mvdsv. Hurrah!


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1122 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-07-01 19:23:00 +00:00
parent 28e6b70ba7
commit f85340b9a2
42 changed files with 1339 additions and 855 deletions

View file

@ -399,7 +399,7 @@ void CL_SendConnectPacket (
Info_SetValueForStarKey (playerinfo2, "name", "Second player", MAX_INFO_STRING);
clients = 1;
if (cl_splitscreen.value)
if (cl_splitscreen.value && (fteprotextsupported & PEXT_SPLITSCREEN))
{
// if (adr.type == NA_LOOPBACK)
clients = cl_splitscreen.value+1;
@ -827,6 +827,14 @@ void CL_ClearState (void)
memset (cl_baselines, 0, sizeof(cl_baselines));
for (i = 0; i < MAX_EDICTS; i++)
{
cl_baselines[i].scale = 1*16;
cl_baselines[i].trans = 255;
}
//
// allocate the efrags and chain together into a free list
//
@ -980,13 +988,13 @@ void CL_Disconnect (void)
void CL_Disconnect_f (void)
{
CL_Disconnect ();
#ifndef CLIENTONLY
if (sv.state)
SV_UnspawnServer();
#endif
CL_Disconnect ();
Alias_WipeStuffedAliaes();
}
@ -2945,6 +2953,8 @@ void Host_Init (quakeparms_t *parms)
host_initialized = true;
Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to
Cmd_StuffCmds();
Cbuf_Execute (); //if the server initialisation causes a problem, give it a place to abort to