Commit: 1c2a632122c18e88cb59bc1b582093ca37daefca - zandronum-tspg (hg)

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

Commit MetaInfo

• Revision: 1c2a632122c18e88cb59bc1b582093ca37daefca (tree)
• Time: 2021-09-21 22:25:50
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Cleaned up and moved the code responsible for drawing the MOTD, and fixed the MOTD not using the color to print mid-screen messages with.

Change Summary

• modified: src/c_console.cpp
• modified: src/c_console.h
• modified: src/cl_main.cpp
• modified: src/cl_main.h

Incremental Difference

diff -r 16625849dbee -r 1c2a632122c1 src/c_console.cpp
--- a/src/c_console.cpp	Wed Sep 22 23:05:13 2021 +1000
+++ b/src/c_console.cpp	Tue Sep 21 09:25:50 2021 -0400
@@ -2277,6 +2277,28 @@
 	}
 }
 
+// [AK] Prints the MOTD in the centre of the screen.
+void C_MOTDPrint (FString msg)
+{
+	if (msg.Len( ) <= 0)
+		return;
+
+	FString ConsoleString;
+	ConsoleString.Format ("%s\n%s\n%s\n", bar1, msg, bar3);
+
+	// Add this message to the console window.
+	AddToConsole (-1, ConsoleString);
+
+	// We cannot create the message if there's no status bar to attach it to.
+	if (StatusBar == NULL)
+		return;
+
+	// [AK] Print the MOTD in the same color the user wishes to print mid-screen messages in.
+	EColorRange Color = static_cast<EColorRange> (PrintColors[PRINTLEVELS]);
+	DHUDMessageFadeOut* pMsg = new DHUDMessageFadeOut (SmallFont, msg, 1.5f, 0.375f, 0, 0, Color, cl_motdtime, 0.35f);
+	StatusBar->AttachMessage (pMsg, MAKE_ID('M','O','T','D'));
+}
+
 /****** Tab completion code ******/
 
 struct TabData

diff -r 16625849dbee -r 1c2a632122c1 src/c_console.h
--- a/src/c_console.h	Wed Sep 22 23:05:13 2021 +1000
+++ b/src/c_console.h	Tue Sep 21 09:25:50 2021 -0400
@@ -84,6 +84,7 @@
 class FFont;
 void C_MidPrint (FFont *font, const char *message);
 void C_MidPrintBold (FFont *font, const char *message);
+void C_MOTDPrint (FString message); // [AK]
 
 bool C_Responder (event_t *ev);
 

diff -r 16625849dbee -r 1c2a632122c1 src/cl_main.cpp
--- a/src/cl_main.cpp	Wed Sep 22 23:05:13 2021 +1000
+++ b/src/cl_main.cpp	Tue Sep 21 09:25:50 2021 -0400
@@ -2801,46 +2801,6 @@
 
 //*****************************************************************************
 //
-// :(. This is needed so that the MOTD can be printed in the color the user wishes to print
-// mid-screen messages in.
-extern	int PrintColors[7];
-void CLIENT_DisplayMOTD( void )
-{
-	FString	ConsoleString;
-
-	if ( g_MOTD.Len( ) <= 0 )
-		return;
-
-	// Add pretty colors/formatting!
-	V_ColorizeString( g_MOTD );
-
-	ConsoleString.AppendFormat( TEXTCOLOR_RED
-		"\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36"
-		"\36\36\36\36\36\36\36\36\36\36\36\36\37" TEXTCOLOR_TAN
-		"\n\n%s\n" TEXTCOLOR_RED
-		"\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36"
-		"\36\36\36\36\36\36\36\36\36\36\36\36\37" TEXTCOLOR_NORMAL "\n\n" ,
-		g_MOTD.GetChars() );
-
-	// Add this message to the console window.
-	AddToConsole( -1, ConsoleString );
-
-	// We cannot create the message if there's no status bar to attach it to.
-	if ( StatusBar == NULL )
-		return;
-
-	StatusBar->AttachMessage( new DHUDMessageFadeOut( SmallFont, g_MOTD,
-		1.5f,
-		0.375f,
-		0,
-		0,
-		(EColorRange)PrintColors[5],
-		cl_motdtime,
-		0.35f ), MAKE_ID('M','O','T','D') );
-}
-
-//*****************************************************************************
-//
 AActor *CLIENT_FindThingByNetID( LONG lNetID )
 {
     return ( g_NetIDList.findPointerByID ( lNetID ) );
@@ -3383,7 +3343,7 @@
 	}
 
 	// Display the message of the day.
-	CLIENT_DisplayMOTD( );
+	C_MOTDPrint( g_MOTD );
 }
 
 //*****************************************************************************
@@ -5693,6 +5653,8 @@
 	g_MOTD = motd;
 	// [BB] Some cleaning of the string since we can't trust the server.
 	V_RemoveTrailingCrapFromFString ( g_MOTD );
+	// [AK] Add pretty colors/formatting!
+	V_ColorizeString( g_MOTD );
 }
 
 //*****************************************************************************
@@ -9542,7 +9504,10 @@
 
 //*****************************************************************************
 // [Dusk] Redisplay the MOTD
-CCMD( motd ) {CLIENT_DisplayMOTD();}
+CCMD( motd )
+{
+	C_MOTDPrint( g_MOTD );
+}
 
 //*****************************************************************************
 //	CONSOLE VARIABLES

diff -r 16625849dbee -r 1c2a632122c1 src/cl_main.h
--- a/src/cl_main.h	Wed Sep 22 23:05:13 2021 +1000
+++ b/src/cl_main.h	Tue Sep 21 09:25:50 2021 -0400
@@ -162,7 +162,6 @@
 void				CLIENT_SpawnMissile( const PClass *pType, fixed_t X, fixed_t Y, fixed_t Z, fixed_t VelX, fixed_t VelY, fixed_t VelZ, LONG lNetID, LONG lTargetNetID );
 void				CLIENT_MoveThing( AActor *pActor, fixed_t X, fixed_t Y, fixed_t Z );
 AActor				*CLIENT_FindThingByNetID( LONG lID );
-void				CLIENT_DisplayMOTD( void );
 void				CLIENT_RestoreSpecialPosition( AActor *pActor );
 void				CLIENT_RestoreSpecialDoomThing( AActor *pActor, bool bFog );
 AInventory			*CLIENT_FindPlayerInventory( ULONG ulPlayer, const PClass *pType );