This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 3503e5cbb244155a28541bcb1944a1a0196c690d
Author: m4n4t4...@gmail.com
<m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Sun Feb 2 01:21:07 2014 +0000
All: Don't restart the renderer in SV_SpawnServer
---
MP/code/server/sv_init.c | 13 ++++++++-----
SP/code/server/sv_init.c | 23 ++++++++++-------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/MP/code/server/sv_init.c b/MP/code/server/sv_init.c
index 832438f..bd9f0c2 100644
--- a/MP/code/server/sv_init.c
+++ b/MP/code/server/sv_init.c
@@ -531,11 +531,6 @@ void SV_SpawnServer( char *server, qboolean killBots ) {
// clear the whole hunk because we're (re)loading the server
Hunk_Clear();
-#ifndef DEDICATED
- // Restart renderer
- CL_StartHunkUsers( qtrue );
-#endif
-
// clear collision map data // (SA) NOTE: TODO: used in
missionpack
CM_ClearMap();
@@ -755,6 +750,14 @@ void SV_SpawnServer( char *server, qboolean killBots ) {
Hunk_SetMark();
+#ifndef DEDICATED
+ if ( com_dedicated->integer ) {
+ // restart renderer in order to show console for dedicated
servers
+ // launched through the regular binary
+ CL_StartHunkUsers( qtrue );
+ }
+#endif
+
Cvar_Set( "sv_serverRestarting", "0" );
Com_Printf( "-----------------------------------\n" );
diff --git a/SP/code/server/sv_init.c b/SP/code/server/sv_init.c
index 178a088..59ecfd3 100644
--- a/SP/code/server/sv_init.c
+++ b/SP/code/server/sv_init.c
@@ -743,11 +743,6 @@ void SV_SpawnServer( char *server, qboolean killBots ) {
// clear the whole hunk because we're (re)loading the server
Hunk_Clear();
-#ifndef DEDICATED
- // Restart renderer
- CL_StartHunkUsers( qtrue );
-#endif
-
// // clear collision map data // (SA) NOTE: TODO: used in
missionpack
// CM_ClearMap();
@@ -941,15 +936,17 @@ void SV_SpawnServer( char *server, qboolean killBots ) {
Hunk_SetMark();
- Com_Printf( "-----------------------------------\n" );
-
- /* MrE: 2000-09-13: now called in CL_DownloadsComplete
- // don't call when running dedicated
- if ( !com_dedicated->integer ) {
- // note that this is called after setting the hunk mark with
Hunk_SetMark
- CL_StartHunkUsers();
+/*
+#ifndef DEDICATED
+ if ( com_dedicated->integer ) {
+ // restart renderer in order to show console for dedicated
servers
+ // launched through the regular binary
+ CL_StartHunkUsers( qtrue );
}
- */
+#endif
+*/
+
+ Com_Printf( "-----------------------------------\n" );
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
