4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/sv_client.c b/src/server/sv_client.c
index cbc2e8c9..0272fab0 100644
--- a/src/server/sv_client.c
+++ b/src/server/sv_client.c
@@ -101,7 +101,7 @@ void SV_DirectConnect( netadr_t from ) {
 	int			challenge;
 	char		*password;
 	int			startIndex;
-	int		denied;
+	intptr_t		denied;
 	int			count;
 
 	Com_DPrintf ("SVC_DirectConnect ()\n");
diff --git a/src/server/sv_game.c b/src/server/sv_game.c
index cefcddeb..cd6354f5 100644
--- a/src/server/sv_game.c
+++ b/src/server/sv_game.c
@@ -306,7 +306,7 @@ SV_GameSystemCalls
 The module is making a system call
 ====================
 */
-long SV_GameSystemCalls( long *args ) {
+intptr_t SV_GameSystemCalls( intptr_t *args ) {
 	switch( args[0] ) {
 	case G_PRINT:
 		Com_Printf( "%s", VMA(1) );
diff --git a/src/server/sv_init.c b/src/server/sv_init.c
index 15c3de0c..4adff6f2 100644
--- a/src/server/sv_init.c
+++ b/src/server/sv_init.c
@@ -664,7 +664,7 @@ void SV_Shutdown( char *finalmsg ) {
 		return;
 	}
 
-	Com_Printf( "----- Server Shutdown -----\n" );
+	Com_Printf( "----- Server Shutdown (%s) -----\n", finalmsg );
 
 	if ( svs.clients && !com_errorEntered ) {
 		SV_FinalMessage( finalmsg );
diff --git a/src/server/sv_main.c b/src/server/sv_main.c
index be579268..adc472ed 100644
--- a/src/server/sv_main.c
+++ b/src/server/sv_main.c
@@ -824,13 +824,13 @@ void SV_Frame( int msec ) {
 	// 2giga-milliseconds = 23 days, so it won't be too often
 	if ( svs.time > 0x70000000 ) {
 		SV_Shutdown( "Restarting server due to time wrapping" );
-		Cbuf_AddText( "vstr nextmap\n" );
+		Cbuf_AddText( va( "map %s\n", Cvar_VariableString( "mapname" ) ) );
 		return;
 	}
 	// this can happen considerably earlier when lots of clients play and the map doesn't change
 	if ( svs.nextSnapshotEntities >= 0x7FFFFFFE - svs.numSnapshotEntities ) {
 		SV_Shutdown( "Restarting server due to numSnapshotEntities wrapping" );
-		Cbuf_AddText( "vstr nextmap\n" );
+		Cbuf_AddText( va( "map %s\n", Cvar_VariableString( "mapname" ) ) );
 		return;
 	}