Commit: 8a979c540d006196f585d9208d94e0dc3fd86892 - zandronum-tspg (hg)

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

Commit MetaInfo

• Revision: 8a979c540d006196f585d9208d94e0dc3fd86892 (tree)
• Time: 2021-11-11 00:50:41
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Inform clients exactly how much longer they still need to wait before joining, changing teams, or suiciding again, not how long they should at least wait for.

Change Summary

• modified: src/cl_commands.cpp
• modified: src/d_netinfo.cpp

Incremental Difference

diff -r 01c61a151347 -r 8a979c540d00 src/cl_commands.cpp
--- a/src/cl_commands.cpp	Wed Nov 10 09:10:26 2021 -0500
+++ b/src/cl_commands.cpp	Wed Nov 10 10:50:41 2021 -0500
@@ -564,7 +564,8 @@
 {
 	if (( sv_limitcommands ) && ( g_ulLastJoinTime > 0 ) && ( (ULONG)gametic < ( g_ulLastJoinTime + ( TICRATE * 3 ))))
 	{
-		Printf( "You must wait at least 3 seconds before joining again.\n" );
+		// [AK] Show the client how many more seconds they need to wait before they can join again.
+		Printf( "You must wait %d seconds before joining again.\n", static_cast<int>( 3 - ( gametic - g_ulLastJoinTime ) / TICRATE ));
 		return;
 	}
 
@@ -598,7 +599,8 @@
 {
 	if (( sv_limitcommands ) && ( g_ulLastSuicideTime > 0 ) && ( (ULONG)gametic < ( g_ulLastSuicideTime + ( TICRATE * 10 ))))
 	{
-		Printf( "You must wait at least 10 seconds before suiciding again.\n" );
+		// [AK] Show the client how many more seconds they need to wait before they can suicide again.
+		Printf( "You must wait %d seconds before suiciding again.\n", static_cast<int>( 10 - ( gametic - g_ulLastSuicideTime ) / TICRATE ));
 		return;
 	}
 
@@ -612,7 +614,8 @@
 {
 	if (( sv_limitcommands ) && !( ( lastmanstanding || teamlms ) && ( LASTMANSTANDING_GetState( ) == LMSS_COUNTDOWN ) ) && ( g_ulLastChangeTeamTime > 0 ) && ( (ULONG)gametic < ( g_ulLastChangeTeamTime + ( TICRATE * 3 ))))
 	{
-		Printf( "You must wait at least 3 seconds before changing teams again.\n" );
+		// [AK] Show the client how many more seconds they need to wait before they can change teams again.
+		Printf( "You must wait %d seconds before changing teams again.\n", static_cast<int>( 3 - ( gametic - g_ulLastChangeTeamTime ) / TICRATE ));
 		return;
 	}
 

diff -r 01c61a151347 -r 8a979c540d00 src/d_netinfo.cpp
--- a/src/d_netinfo.cpp	Wed Nov 10 09:10:26 2021 -0500
+++ b/src/d_netinfo.cpp	Wed Nov 10 10:50:41 2021 -0500
@@ -990,7 +990,7 @@
 			&& ( (ULONG)gametic < ( g_ulLastNameChangeTime + ( TICRATE * CLIENT_NAMECHANGE_WAITTIME ))))
 		{
 			// [AK] Show the client how many more seconds they need to wait before they can change their name again.
-			Printf( "You must wait another %d seconds before changing your name again.\n", static_cast<int>(CLIENT_NAMECHANGE_WAITTIME - ( gametic - g_ulLastNameChangeTime ) / TICRATE) );
+			Printf( "You must wait %d seconds before changing your name again.\n", static_cast<int>(CLIENT_NAMECHANGE_WAITTIME - ( gametic - g_ulLastNameChangeTime ) / TICRATE) );
 			return false;
 		}
 	}