Commit: dd665db7e154dda80a15bac37a30d5946f176d12 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

Commit MetaInfo

• Revision: dd665db7e154dda80a15bac37a30d5946f176d12 (tree)
• Time: 2022-07-08 10:04:38
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Added the compiler flag SERVER_ALLOWBOTS that decides if the "addbot" CCMD is usable or not. Also added a message to informs users if bots are not allowed.

Change Summary

• modified: src/CMakeLists.txt
• modified: src/bots.cpp

Incremental Difference

diff -r 08dce2175aab -r dd665db7e154 src/CMakeLists.txt
--- a/src/CMakeLists.txt	Thu Jul 07 21:01:51 2022 -0400
+++ b/src/CMakeLists.txt	Thu Jul 07 21:04:38 2022 -0400
@@ -192,7 +192,8 @@
 		if( SERVERONLY )
 			# [TSPG]
 			option( TSPG_BLACKLIST "Disable blacklisted commands and protect some cvars" )
-			
+			option( TSPG_ALLOWBOTS "Allow bots to be added to the server" )
+
 			set( NO_SOUND ON )
 			set( NO_GTK ON )
 			set( NO_GL ON )
@@ -202,6 +203,10 @@
 			if( TSPG_BLACKLIST )
 				add_definitions( -DSERVER_BLACKLIST=1 )
 			endif( TSPG_BLACKLIST )
+			if( TSPG_ALLOWBOTS )
+				add_definitions( -DSERVER_ALLOWBOTS=1 )
+			endif( TSPG_ALLOWBOTS )
+
 		endif( SERVERONLY )
 
 		set( FMOD_SEARCH_PATHS

diff -r 08dce2175aab -r dd665db7e154 src/bots.cpp
--- a/src/bots.cpp	Thu Jul 07 21:01:51 2022 -0400
+++ b/src/bots.cpp	Thu Jul 07 21:04:38 2022 -0400
@@ -3841,9 +3841,12 @@
 CCMD( addbot )
 {
 	// [TSPG]
-	#if defined( SERVER_ONLY ) && defined( SERVER_BLACKLIST )
+	#if defined( SERVER_ONLY ) && !defined( SERVER_ALLOWBOTS )
 		if ( gamestate != GS_STARTUP )
+		{
+			Printf( "Bots are not allowed!\n" );
 			return;
+		}
 	#endif
 
 	CSkullBot	*pBot;