fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

host.c (Host_ShutdownServer): no need to clear the sv structure, because 

ServerSpawn already do this by Host_ClearMemory.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@782 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2012-11-06 08:56:09 +00:00
parent 7ce7ce71ca
commit b3d2bb6884
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Quake/host.c
View File

@ -368,12 +368,14 @@ void SV_BroadcastPrintf (const char *fmt, ...)
q_vsnprintf (string, sizeof(string), fmt, argptr); q_vsnprintf (string, sizeof(string), fmt, argptr);
va_end (argptr); va_end (argptr);
for (i=0 ; i<svs.maxclients ; i++) for (i = 0; i < svs.maxclients; i++)
{
if (svs.clients[i].active && svs.clients[i].spawned) if (svs.clients[i].active && svs.clients[i].spawned)
{ {
MSG_WriteByte (&svs.clients[i].message, svc_print); MSG_WriteByte (&svs.clients[i].message, svc_print);
MSG_WriteString (&svs.clients[i].message, string); MSG_WriteString (&svs.clients[i].message, string);
} }
}
} }
/* /*
@ -443,7 +445,7 @@ void SV_DropClient (qboolean crash)
net_activeconnections--; net_activeconnections--;
// send notification to all clients // send notification to all clients
for (i=0, client = svs.clients ; i<svs.maxclients ; i++, client++) for (i = 0, client = svs.clients; i < svs.maxclients; i++, client++)
{ {
if (!client->active) if (!client->active)
continue; continue;
@ -518,14 +520,14 @@ void Host_ShutdownServer(qboolean crash)
if (count) if (count)
Con_Printf("Host_ShutdownServer: NET_SendToAll failed for %u clients\n", count); Con_Printf("Host_ShutdownServer: NET_SendToAll failed for %u clients\n", count);
for (i=0, host_client = svs.clients ; i<svs.maxclients ; i++, host_client++) for (i = 0, host_client = svs.clients; i < svs.maxclients; i++, host_client++)
if (host_client->active) if (host_client->active)
SV_DropClient(crash); SV_DropClient(crash);
// //
// clear structures // clear structures
// //
memset (&sv, 0, sizeof(sv)); // memset (&sv, 0, sizeof(sv)); // ServerSpawn already do this by Host_ClearMemory
memset (svs.clients, 0, svs.maxclientslimit*sizeof(client_t)); memset (svs.clients, 0, svs.maxclientslimit*sizeof(client_t));
} }
@ -792,7 +794,7 @@ void Host_Frame (float time)
timecount = 0; timecount = 0;
timetotal = 0; timetotal = 0;
c = 0; c = 0;
for (i=0 ; i<svs.maxclients ; i++) for (i = 0; i < svs.maxclients; i++)
{ {
if (svs.clients[i].active) if (svs.clients[i].active)
c++; c++;
@ -810,8 +812,7 @@ void Host_Init (void)
{ {
if (standard_quake) if (standard_quake)
minimum_memory = MINIMUM_MEMORY; minimum_memory = MINIMUM_MEMORY;
else else minimum_memory = MINIMUM_MEMORY_LEVELPAK;
minimum_memory = MINIMUM_MEMORY_LEVELPAK;
if (COM_CheckParm ("-minmemory")) if (COM_CheckParm ("-minmemory"))
host_parms->memsize = minimum_memory; host_parms->memsize = minimum_memory;
@ -856,7 +857,7 @@ void Host_Init (void)
ExtraMaps_Init (); //johnfitz ExtraMaps_Init (); //johnfitz
Modlist_Init (); //johnfitz Modlist_Init (); //johnfitz
VID_Init (); VID_Init ();
IN_Init (); // moved here, SDL inits the input system with the video system -- kristian IN_Init ();
TexMgr_Init (); //johnfitz TexMgr_Init (); //johnfitz
Draw_Init (); Draw_Init ();
SCR_Init (); SCR_Init ();
@ -926,7 +927,7 @@ void Host_Shutdown(void)
BGM_Shutdown(); BGM_Shutdown();
CDAudio_Shutdown (); CDAudio_Shutdown ();
S_Shutdown (); S_Shutdown ();
IN_Shutdown (); // input is only initialized in Host_Init if we're not dedicated -- kristian IN_Shutdown ();
VID_Shutdown(); VID_Shutdown();
} }