Skip to content

Commit

Permalink
Fixed ACS HudMessage and HudMessageBold not considering layer flags
Browse files Browse the repository at this point in the history
  • Loading branch information
Evghenii committed Nov 3, 2023
1 parent f29bc80 commit f0d2c8a
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 34 deletions.
4 changes: 4 additions & 0 deletions protocolspec/spec.print.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Command PrintHUDMessage
String fontName
Bool log
Long id
Byte layer
EndCommand

Command PrintHUDMessageFadeOut
Expand All @@ -37,6 +38,7 @@ Command PrintHUDMessageFadeOut
String fontName
Bool log
Long id
Byte layer
EndCommand

Command PrintHUDMessageFadeInOut
Expand All @@ -52,6 +54,7 @@ Command PrintHUDMessageFadeInOut
String fontName
Bool log
Long id
Byte layer
EndCommand

Command PrintHUDMessageTypeOnFadeOut
Expand All @@ -67,4 +70,5 @@ Command PrintHUDMessageTypeOnFadeOut
String fontName
Bool log
Long id
Byte layer
EndCommand
8 changes: 4 additions & 4 deletions src/cl_main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4956,7 +4956,7 @@ void ServerCommands::PrintHUDMessage::Execute()
holdTime );

// Now attach the message.
StatusBar->AttachMessage( hudMessage, id );
StatusBar->AttachMessage( hudMessage, id, layer );

// Log the message if desired.
if ( log )
Expand Down Expand Up @@ -4987,7 +4987,7 @@ void ServerCommands::PrintHUDMessageFadeOut::Execute()
fadeOutTime );

// Now attach the message.
StatusBar->AttachMessage( hudMessage, id );
StatusBar->AttachMessage( hudMessage, id, layer );

// Log the message if desired.
if ( log )
Expand Down Expand Up @@ -5019,7 +5019,7 @@ void ServerCommands::PrintHUDMessageFadeInOut::Execute()
fadeOutTime );

// Now attach the message.
StatusBar->AttachMessage( hudMessage, id );
StatusBar->AttachMessage( hudMessage, id, layer );

// Log the message if desired.
if ( log )
Expand Down Expand Up @@ -5051,7 +5051,7 @@ void ServerCommands::PrintHUDMessageTypeOnFadeOut::Execute()
fadeOutTime );

// Now attach the message.
StatusBar->AttachMessage( hudMessage, id );
StatusBar->AttachMessage( hudMessage, id, layer );

// Log the message if desired.
if ( log )
Expand Down
18 changes: 9 additions & 9 deletions src/g_shared/a_flags.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,11 +640,11 @@ void AFlag::DisplayFlagTaken( AActor *pToucher )
{
sprintf( szString, "\\c%cYou have the %s flag!", V_GetColorChar( TEAM_GetTextColor( TEAM_GetTeamFromItem( this ))), TEAM_GetName( TEAM_GetTeamFromItem( this )));
V_ColorizeString( szString );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), ULONG( pToucher->player - players ), SVCF_ONLYTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), 0, ULONG( pToucher->player - players ), SVCF_ONLYTHISCLIENT );

sprintf( szString, "\\c%c%s flag taken!", V_GetColorChar( TEAM_GetTextColor( TEAM_GetTeamFromItem( this ))), TEAM_GetName( TEAM_GetTeamFromItem( this )));
V_ColorizeString( szString );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), 0, ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
}

// [RC] Create the "held by" message for the team.
Expand Down Expand Up @@ -672,7 +672,7 @@ void AFlag::DisplayFlagTaken( AActor *pToucher )
// If necessary, send it to clients.
else
{
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "SmallFont", false, MAKE_ID('S','U','B','S'), ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "SmallFont", false, MAKE_ID('S','U','B','S'), 0, ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
SERVER_Printf( PRINT_MEDIUM, "%s \\c-has taken the \\c%c%s \\c-flag.\n", players[playerIndex].userinfo.GetName(), V_GetColorChar( TEAM_GetTextColor( TEAM_GetTeamFromItem( this ))), TEAM_GetName( TEAM_GetTeamFromItem( this )));
}
}
Expand Down Expand Up @@ -1046,11 +1046,11 @@ void AWhiteFlag::DisplayFlagTaken( AActor *pToucher )
{
sprintf( szString, "\\cCYou have the flag!" );
V_ColorizeString( szString );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_WHITE, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), ULONG( pToucher->player - players ), SVCF_ONLYTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_WHITE, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), 0, ULONG( pToucher->player - players ), SVCF_ONLYTHISCLIENT );

sprintf( szString, "\\cCWhite flag taken!" );
V_ColorizeString( szString );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_WHITE, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_WHITE, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), 0, ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
}

// [BC] Rivecoder's "held by" messages.
Expand Down Expand Up @@ -1079,7 +1079,7 @@ void AWhiteFlag::DisplayFlagTaken( AActor *pToucher )
}
// If necessary, send it to clients.
else
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "SmallFont", false, MAKE_ID('S','U','B','S'), ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "SmallFont", false, MAKE_ID('S','U','B','S'), 0, ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
}

//===========================================================================
Expand Down Expand Up @@ -1249,11 +1249,11 @@ void ASkull::DisplayFlagTaken( AActor *pToucher )
{
sprintf( szString, "\\c%cYou have the %s skull!", V_GetColorChar( TEAM_GetTextColor( TEAM_GetTeamFromItem( this ))), TEAM_GetName( TEAM_GetTeamFromItem( this )));
V_ColorizeString( szString );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), ULONG( pToucher->player - players ), SVCF_ONLYTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), 0, ULONG( pToucher->player - players ), SVCF_ONLYTHISCLIENT );

sprintf( szString, "\\c%c%s skull taken!", V_GetColorChar( TEAM_GetTextColor( TEAM_GetTeamFromItem( this ))), TEAM_GetName( TEAM_GetTeamFromItem( this )));
V_ColorizeString( szString );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), 0, ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
}

// [RC] Create the "held by" message for this team.
Expand Down Expand Up @@ -1281,7 +1281,7 @@ void ASkull::DisplayFlagTaken( AActor *pToucher )
// If necessary, send it to clients.
else
{
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "SmallFont", false, MAKE_ID('S','U','B','S'), ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( szString, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "SmallFont", false, MAKE_ID('S','U','B','S'), 0, ULONG( pToucher->player - players ), SVCF_SKIPTHISCLIENT );
SERVER_Printf( PRINT_MEDIUM, "%s \\c-has taken the \\c%c%s \\c-skull.\n", players[playerIndex].userinfo.GetName(), V_GetColorChar( TEAM_GetTextColor( TEAM_GetTeamFromItem( this ))), TEAM_GetName( TEAM_GetTeamFromItem( this )));
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/gamemode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ void GAMEMODE_DisplayCNTRMessage( const char *pszMessage, const bool bInformClie
// If necessary, send it to clients.
else if ( bInformClients )
{
SERVERCOMMANDS_PrintHUDMessageFadeOut( pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), ulPlayerExtra, ServerCommandFlags::FromInt( ulFlags ) );
SERVERCOMMANDS_PrintHUDMessageFadeOut( pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "BigFont", false, MAKE_ID('C','N','T','R'), 0, ulPlayerExtra, ServerCommandFlags::FromInt( ulFlags ) );
}
}

Expand All @@ -1342,7 +1342,7 @@ void GAMEMODE_DisplaySUBSMessage( const char *pszMessage, const bool bInformClie
// If necessary, send it to clients.
else if ( bInformClients )
{
SERVERCOMMANDS_PrintHUDMessageFadeOut( pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "SmallFont", false, MAKE_ID( 'S','U','B','S' ), ulPlayerExtra, ServerCommandFlags::FromInt( ulFlags ) );
SERVERCOMMANDS_PrintHUDMessageFadeOut( pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f, "SmallFont", false, MAKE_ID( 'S','U','B','S' ), 0, ulPlayerExtra, ServerCommandFlags::FromInt( ulFlags ) );
}
}

Expand Down
19 changes: 9 additions & 10 deletions src/p_acs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9902,9 +9902,9 @@ int DLevelScript::RunScript ()
if ( NETWORK_GetState( ) == NETSTATE_SERVER )
{
if (( pcd == PCD_ENDHUDMESSAGEBOLD ) || ( screen == NULL ))
SERVERCOMMANDS_PrintHUDMessage( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id );
SERVERCOMMANDS_PrintHUDMessage( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, (type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT );
else if ( screen->player && !( GetNetworkReplicationFlags() & NETREP_SKIPOWNER ) )
SERVERCOMMANDS_PrintHUDMessage( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, screen->player - players, SVCF_ONLYTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessage( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, (type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT, screen->player - players, SVCF_ONLYTHISCLIENT );
}
else
msg = new DHUDMessage (activefont, work, x, y, hudwidth, hudheight, color, holdTime);
Expand All @@ -9918,9 +9918,9 @@ int DLevelScript::RunScript ()
if ( NETWORK_GetState( ) == NETSTATE_SERVER )
{
if (( pcd == PCD_ENDHUDMESSAGEBOLD ) || ( screen == NULL ))
SERVERCOMMANDS_PrintHUDMessageFadeOut( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, fadeTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id );
SERVERCOMMANDS_PrintHUDMessageFadeOut( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, fadeTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, (type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT );
else if ( screen->player && !( GetNetworkReplicationFlags() & NETREP_SKIPOWNER ) )
SERVERCOMMANDS_PrintHUDMessageFadeOut( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, fadeTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, screen->player - players, SVCF_ONLYTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeOut( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, fadeTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, (type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT, screen->player - players, SVCF_ONLYTHISCLIENT );
}
else
msg = new DHUDMessageFadeOut (activefont, work, x, y, hudwidth, hudheight, color, holdTime, fadeTime);
Expand All @@ -9936,9 +9936,9 @@ int DLevelScript::RunScript ()
if ( NETWORK_GetState( ) == NETSTATE_SERVER )
{
if (( pcd == PCD_ENDHUDMESSAGEBOLD ) || ( screen == NULL ))
SERVERCOMMANDS_PrintHUDMessageTypeOnFadeOut( work.GetChars( ), x, y, hudwidth, hudheight, color, typeTime, holdTime, fadeTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id );
SERVERCOMMANDS_PrintHUDMessageTypeOnFadeOut( work.GetChars( ), x, y, hudwidth, hudheight, color, typeTime, holdTime, fadeTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, (type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT );
else if ( screen->player && !( GetNetworkReplicationFlags() & NETREP_SKIPOWNER ) )
SERVERCOMMANDS_PrintHUDMessageTypeOnFadeOut( work.GetChars( ), x, y, hudwidth, hudheight, color, typeTime, holdTime, fadeTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, screen->player - players, SVCF_ONLYTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageTypeOnFadeOut( work.GetChars( ), x, y, hudwidth, hudheight, color, typeTime, holdTime, fadeTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, (type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT, screen->player - players, SVCF_ONLYTHISCLIENT );
}
else
msg = new DHUDMessageTypeOnFadeOut (activefont, work, x, y, hudwidth, hudheight, color, typeTime, holdTime, fadeTime);
Expand All @@ -9954,9 +9954,9 @@ int DLevelScript::RunScript ()
if ( NETWORK_GetState( ) == NETSTATE_SERVER )
{
if (( pcd == PCD_ENDHUDMESSAGEBOLD ) || ( screen == NULL ))
SERVERCOMMANDS_PrintHUDMessageFadeInOut( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, inTime, outTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id );
SERVERCOMMANDS_PrintHUDMessageFadeInOut( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, inTime, outTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, (type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT );
else if ( screen->player && !( GetNetworkReplicationFlags() & NETREP_SKIPOWNER ) )
SERVERCOMMANDS_PrintHUDMessageFadeInOut( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, inTime, outTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, screen->player - players, SVCF_ONLYTHISCLIENT );
SERVERCOMMANDS_PrintHUDMessageFadeInOut( work.GetChars( ), x, y, hudwidth, hudheight, color, holdTime, inTime, outTime, SERVER_GetCurrentFont( ), !!( type & HUDMSG_LOG ), id, (type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT, screen->player - players, SVCF_ONLYTHISCLIENT );
}
else
msg = new DHUDMessageFadeInOut (activefont, work, x, y, hudwidth, hudheight, color, holdTime, inTime, outTime);
Expand Down Expand Up @@ -9985,8 +9985,7 @@ int DLevelScript::RunScript ()
{
msg->SetRenderStyle(STYLE_Add);
}
StatusBar->AttachMessage (msg, id ? 0xff000000|id : 0,
(type & HUDMSG_LAYER_MASK) >> HUDMSG_LAYER_SHIFT);
StatusBar->AttachMessage (msg, id ? 0xff000000|id : 0);
}
if (type & HUDMSG_LOG)
{
Expand Down
12 changes: 8 additions & 4 deletions src/sv_commands.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1905,7 +1905,7 @@ void SERVERCOMMANDS_PrintMOTD( const char *pszString, ULONG ulPlayerExtra, Serve

//*****************************************************************************
//
void SERVERCOMMANDS_PrintHUDMessage( const char *pszString, float fX, float fY, LONG lHUDWidth, LONG lHUDHeight, LONG lColor, float fHoldTime, const char *pszFont, bool bLog, LONG lID, ULONG ulPlayerExtra, ServerCommandFlags flags )
void SERVERCOMMANDS_PrintHUDMessage( const char *pszString, float fX, float fY, LONG lHUDWidth, LONG lHUDHeight, LONG lColor, float fHoldTime, const char *pszFont, bool bLog, LONG lID, LONG lLayer, ULONG ulPlayerExtra, ServerCommandFlags flags )
{
ServerCommands::PrintHUDMessage command;
command.SetMessage( pszString );
Expand All @@ -1918,12 +1918,13 @@ void SERVERCOMMANDS_PrintHUDMessage( const char *pszString, float fX, float fY,
command.SetFontName( pszFont );
command.SetLog( bLog );
command.SetId( lID );
command.SetLayer( lLayer );
command.sendCommandToClients( ulPlayerExtra, flags );
}

//*****************************************************************************
//
void SERVERCOMMANDS_PrintHUDMessageFadeOut( const char *pszString, float fX, float fY, LONG lHUDWidth, LONG lHUDHeight, LONG lColor, float fHoldTime, float fFadeOutTime, const char *pszFont, bool bLog, LONG lID, ULONG ulPlayerExtra, ServerCommandFlags flags )
void SERVERCOMMANDS_PrintHUDMessageFadeOut( const char *pszString, float fX, float fY, LONG lHUDWidth, LONG lHUDHeight, LONG lColor, float fHoldTime, float fFadeOutTime, const char *pszFont, bool bLog, LONG lID, LONG lLayer, ULONG ulPlayerExtra, ServerCommandFlags flags )
{
ServerCommands::PrintHUDMessageFadeOut command;
command.SetMessage( pszString );
Expand All @@ -1937,12 +1938,13 @@ void SERVERCOMMANDS_PrintHUDMessageFadeOut( const char *pszString, float fX, flo
command.SetFontName( pszFont );
command.SetLog( bLog );
command.SetId( lID );
command.SetLayer( lLayer );
command.sendCommandToClients( ulPlayerExtra, flags );
}

//*****************************************************************************
//
void SERVERCOMMANDS_PrintHUDMessageFadeInOut( const char *pszString, float fX, float fY, LONG lHUDWidth, LONG lHUDHeight, LONG lColor, float fHoldTime, float fFadeInTime, float fFadeOutTime, const char *pszFont, bool bLog, LONG lID, ULONG ulPlayerExtra, ServerCommandFlags flags )
void SERVERCOMMANDS_PrintHUDMessageFadeInOut( const char *pszString, float fX, float fY, LONG lHUDWidth, LONG lHUDHeight, LONG lColor, float fHoldTime, float fFadeInTime, float fFadeOutTime, const char *pszFont, bool bLog, LONG lID, LONG lLayer, ULONG ulPlayerExtra, ServerCommandFlags flags )
{
ServerCommands::PrintHUDMessageFadeInOut command;
command.SetMessage( pszString );
Expand All @@ -1957,12 +1959,13 @@ void SERVERCOMMANDS_PrintHUDMessageFadeInOut( const char *pszString, float fX, f
command.SetFontName( pszFont );
command.SetLog( bLog );
command.SetId( lID );
command.SetLayer( lLayer );
command.sendCommandToClients( ulPlayerExtra, flags );
}

//*****************************************************************************
//
void SERVERCOMMANDS_PrintHUDMessageTypeOnFadeOut( const char *pszString, float fX, float fY, LONG lHUDWidth, LONG lHUDHeight, LONG lColor, float fTypeTime, float fHoldTime, float fFadeOutTime, const char *pszFont, bool bLog, LONG lID, ULONG ulPlayerExtra, ServerCommandFlags flags )
void SERVERCOMMANDS_PrintHUDMessageTypeOnFadeOut( const char *pszString, float fX, float fY, LONG lHUDWidth, LONG lHUDHeight, LONG lColor, float fTypeTime, float fHoldTime, float fFadeOutTime, const char *pszFont, bool bLog, LONG lID, LONG lLayer, ULONG ulPlayerExtra, ServerCommandFlags flags )
{
ServerCommands::PrintHUDMessageTypeOnFadeOut command;
command.SetMessage( pszString );
Expand All @@ -1977,6 +1980,7 @@ void SERVERCOMMANDS_PrintHUDMessageTypeOnFadeOut( const char *pszString, float f
command.SetFontName( pszFont );
command.SetLog( bLog );
command.SetId( lID );
command.SetLayer( lLayer );
command.sendCommandToClients( ulPlayerExtra, flags );
}

Expand Down
Loading

0 comments on commit f0d2c8a

Please sign in to comment.