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

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

Commit MetaInfo

• Revision: f885ca50ff29597d78b782e45adcbb046133cd7c (tree)
• Time: 2022-10-09 23:44:38
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Moved the sv_maxlives definition from survival.cpp into gamemode.cpp, survival isn't the only game mode that uses this CVar.

Change Summary

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

Incremental Difference

diff -r 420ac83eb02f -r f885ca50ff29 src/gamemode.cpp
--- a/src/gamemode.cpp	Thu Oct 06 23:22:08 2022 -0400
+++ b/src/gamemode.cpp	Sun Oct 09 10:44:38 2022 -0400
@@ -77,6 +77,17 @@
 
 CVAR( Bool, sv_suddendeath, true, CVAR_SERVERINFO | CVAR_LATCH | CVAR_GAMEPLAYSETTING );
 
+CUSTOM_CVAR( Int, sv_maxlives, 0, CVAR_SERVERINFO | CVAR_LATCH | CVAR_GAMEPLAYSETTING )
+{
+	if ( self >= 256 )
+		self = 255;
+	if ( self < 0 )
+		self = 0;
+
+	// [AK] Notify the clients about the change.
+	SERVER_SettingChanged( self, false );
+}
+
 //*****************************************************************************
 //	VARIABLES
 

diff -r 420ac83eb02f -r f885ca50ff29 src/gamemode.h
--- a/src/gamemode.h	Thu Oct 06 23:22:08 2022 -0400
+++ b/src/gamemode.h	Sun Oct 09 10:44:38 2022 -0400
@@ -74,6 +74,7 @@
 EXTERN_CVAR( Bool, instagib )
 EXTERN_CVAR( Bool, buckshot )
 EXTERN_CVAR( Bool, sv_suddendeath )
+EXTERN_CVAR( Int, sv_maxlives )
 
 //*****************************************************************************
 typedef enum

diff -r 420ac83eb02f -r f885ca50ff29 src/survival.cpp
--- a/src/survival.cpp	Thu Oct 06 23:22:08 2022 -0400
+++ b/src/survival.cpp	Sun Oct 09 10:44:38 2022 -0400
@@ -68,17 +68,6 @@
 #include "sv_commands.h"
 #include "v_video.h"
 
-CUSTOM_CVAR( Int, sv_maxlives, 0, CVAR_SERVERINFO | CVAR_LATCH | CVAR_GAMEPLAYSETTING )
-{
-	if ( self >= 256 )
-		self = 255;
-	if ( self < 0 )
-		self = 0;
-
-	// [AK] Notify the clients about the change.
-	SERVER_SettingChanged( self, false );
-}
-
 //*****************************************************************************
 //	VARIABLES
 

diff -r 420ac83eb02f -r f885ca50ff29 src/survival.h
--- a/src/survival.h	Thu Oct 06 23:22:08 2022 -0400
+++ b/src/survival.h	Sun Oct 09 10:44:38 2022 -0400
@@ -87,6 +87,5 @@
 //  EXTERNAL CONSOLE VARIABLES
 
 EXTERN_CVAR( Int, sv_survivalcountdowntime )
-EXTERN_CVAR( Int, sv_maxlives )
 
 #endif	// __SURVIVAL_H__