Commit: ef07e2140416ae8814ec2d61dffa9e9ed1097ca9 - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• Revisão: ef07e2140416ae8814ec2d61dffa9e9ed1097ca9 (tree)
• Hora: 2022-10-09 23:48:31
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Mensagem de Log

Moved the lobby CVar definition from deathmatch.cpp into gamemode.cpp, deathmatch-based game modes aren't the only ones that use this CVar.

Mudança Sumário

• modified: src/deathmatch.cpp
• modified: src/deathmatch.h
• modified: src/gamemode.cpp
• modified: src/gamemode.h

Diff

diff -r a9ffaa9d8e53 -r ef07e2140416 src/deathmatch.cpp
--- a/src/deathmatch.cpp	Sun Oct 09 10:46:33 2022 -0400
+++ b/src/deathmatch.cpp	Sun Oct 09 10:48:31 2022 -0400
@@ -347,34 +347,6 @@
 	SERVER_SettingChanged( self, true, 2 );
 }
 
-// [AM] Set or unset a map as being a "lobby" map.
-CUSTOM_CVAR( String, lobby, "", CVAR_SERVERINFO )
-{
-	if ( strcmp( *self, "" ) == 0 )
-	{
-		// Lobby map is empty.  Tell the client that if necessary.
-		if (( NETWORK_GetState( ) == NETSTATE_SERVER ) && ( gamestate != GS_STARTUP ))
-		{
-			SERVER_Printf( PRINT_HIGH, "%s unset\n", self.GetName( ));
-			SERVERCOMMANDS_SetGameModeLimits( );
-		}
-	}
-	else
-	{
-		// Prevent setting a lobby map that doesn't exist.
-		level_info_t *map = FindLevelByName( *self );
-		if ( map == NULL )
-		{
-			Printf( "map %s doesn't exist.\n", *self );
-			self = "";
-			return;
-		}
-
-		// Update the client about the lobby map if necessary.
-		SERVER_SettingChanged( self, false );
-	}
-}
-
 // Is this a good place for these variables?
 CVAR( Bool, cl_noammoswitch, true, CVAR_ARCHIVE );
 CVAR( Bool, cl_useoriginalweaponorder, false, CVAR_ARCHIVE );

diff -r a9ffaa9d8e53 -r ef07e2140416 src/deathmatch.h
--- a/src/deathmatch.h	Sun Oct 09 10:46:33 2022 -0400
+++ b/src/deathmatch.h	Sun Oct 09 10:48:31 2022 -0400
@@ -66,7 +66,6 @@
 
 EXTERN_CVAR( Int, fraglimit )
 EXTERN_CVAR( Float, timelimit )
-EXTERN_CVAR( String, lobby )
 
 EXTERN_CVAR( Bool, cl_noammoswitch )
 EXTERN_CVAR( Bool, cl_useoriginalweaponorder )

diff -r a9ffaa9d8e53 -r ef07e2140416 src/gamemode.cpp
--- a/src/gamemode.cpp	Sun Oct 09 10:46:33 2022 -0400
+++ b/src/gamemode.cpp	Sun Oct 09 10:48:31 2022 -0400
@@ -88,6 +88,34 @@
 	SERVER_SettingChanged( self, false );
 }
 
+// [AM] Set or unset a map as being a "lobby" map.
+CUSTOM_CVAR( String, lobby, "", CVAR_SERVERINFO )
+{
+	if ( strcmp( *self, "" ) == 0 )
+	{
+		// Lobby map is empty.  Tell the client that if necessary.
+		if (( NETWORK_GetState( ) == NETSTATE_SERVER ) && ( gamestate != GS_STARTUP ))
+		{
+			SERVER_Printf( PRINT_HIGH, "%s unset\n", self.GetName( ));
+			SERVERCOMMANDS_SetGameModeLimits( );
+		}
+	}
+	else
+	{
+		// Prevent setting a lobby map that doesn't exist.
+		level_info_t *map = FindLevelByName( *self );
+		if ( map == NULL )
+		{
+			Printf( "map %s doesn't exist.\n", *self );
+			self = "";
+			return;
+		}
+
+		// Update the client about the lobby map if necessary.
+		SERVER_SettingChanged( self, false );
+	}
+}
+
 //*****************************************************************************
 //	VARIABLES
 

diff -r a9ffaa9d8e53 -r ef07e2140416 src/gamemode.h
--- a/src/gamemode.h	Sun Oct 09 10:46:33 2022 -0400
+++ b/src/gamemode.h	Sun Oct 09 10:48:31 2022 -0400
@@ -76,6 +76,8 @@
 EXTERN_CVAR( Bool, sv_suddendeath )
 EXTERN_CVAR( Int, sv_maxlives )
 
+EXTERN_CVAR( String, lobby )
+
 //*****************************************************************************
 typedef enum
 {