diff --git a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs index f48c837..08b0626 100644 --- a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs +++ b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs @@ -70,6 +70,15 @@ if( $Host::LoadScreenColor2 $= " " ) $Host::LoadScreenColor2 = "29DEE7"; if( $Host::LoadScreenColor3 $= " " ) $Host::LoadScreenColor3 = "33CCCC"; if( $Host::Info !$= " " ) $Host::Info = " "; +// So ServerDefaults wont replace a "" value when meant to be blank +for(%x = 1; %x <= 4; %x++) +{ + if( $Host::LoadScreenMOTD[%x] $= "") + { + $Host::LoadScreenMOTD[%x] = " "; + } +} + // Keep it in a package to be neat and organized! package LoadScreenPackage @@ -268,7 +277,6 @@ function ALTsendModInfoToClient(%client) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "Info:"; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "" @ %line1; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "" @ %line2; @@ -278,6 +286,7 @@ function ALTsendModInfoToClient(%client) $dtLoadingScreen::LoadScreenMessage[$dmlP++] = " "; + $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "" @ $Host::GameName @ ":"; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "" @ %line4; $dtLoadingScreen::LoadScreenMessage[$dmlP++] = "" @ %line5; @@ -340,20 +349,17 @@ function sendLoadscreen(%client) %MOTDMsg3 = "" @ $Host::LoadScreenMOTD3; %MOTDMsg4 = "" @ $Host::LoadScreenMOTD4; - if($Host::LoadScreenMOTD1 !$= " ") + //MOTD Loop + //Leave line " " in ServerPrefs to not show a line + for(%x = 1; %x <= 4; %x++) { - messageClient(%client, 'MsgDebriefAddLine', "", %MOTDHeader); - messageClient(%client, 'MsgDebriefAddLine', "", %MOTDMsg1); - if($Host::LoadScreenMOTD2 !$= " ") + if( $Host::LoadScreenMOTD[%x] !$= " " && %x $= 1 ) { - messageClient(%client, 'MsgDebriefAddLine', "", %MOTDMsg2); - if($Host::LoadScreenMOTD3 !$= " ") - { - messageClient(%client, 'MsgDebriefAddLine', "", %MOTDMsg3); - if($Host::LoadScreenMOTD4 !$= " ") - messageClient(%client, 'MsgDebriefAddLine', "", %MOTDMsg4); - } + messageClient(%client, 'MsgDebriefAddLine', "", %MOTDHeader); + messageClient(%client, 'MsgDebriefAddLine', "", %MOTDMsg[%x]); } + else if( $Host::LoadScreenMOTD[%x] !$= " " ) + messageClient(%client, 'MsgDebriefAddLine', "", %MOTDMsg[%x]); } // Normal Screen Always in the Background