diff --git a/sources/GameModes/GameMode.uc b/sources/GameModes/GameMode.uc index 44f79eb..3c044f5 100644 --- a/sources/GameModes/GameMode.uc +++ b/sources/GameModes/GameMode.uc @@ -140,7 +140,7 @@ public function Text GetAcronym() return _.text.FromString(string(name)); } else { - return _.text.FromString(acronym); + return _.text.FromFormattedString(acronym); } } diff --git a/sources/Packages.uc b/sources/Packages.uc index d35e0e5..25cfc42 100644 --- a/sources/Packages.uc +++ b/sources/Packages.uc @@ -103,13 +103,15 @@ private function InitializeServer() { votingAdapter = VotingHandlerAdapter( _.memory.Allocate(class'VotingHandlerAdapter')); - votingAdapter.InjectIntoVotingHandler(); currentGameMode = votingAdapter.SetupGameModeAfterTravel(); if (currentGameMode != none) { currentGameMode.UpdateFeatureArray(availableFeatures); } } EnableFeatures(availableFeatures); + if (votingAdapter != none) { + votingAdapter.InjectIntoVotingHandler(); + } } // "Finalizer" diff --git a/sources/VotingHandlerAdapter.uc b/sources/VotingHandlerAdapter.uc index 72db29e..736e2c5 100644 --- a/sources/VotingHandlerAdapter.uc +++ b/sources/VotingHandlerAdapter.uc @@ -139,12 +139,23 @@ public final function InjectIntoVotingHandler() private function VotingHandler.MapVoteGameConfig BuildVotingHandlerConfig( GameMode gameMode) { - local VotingHandler.MapVoteGameConfig result; + local MutableText nextColoredName; + local VotingHandler.MapVoteGameConfig result; result.gameClass = _.text.IntoString(gameMode.GetGameTypeClass()); - result.gameName = _.text.ToColoredString(gameMode.GetTitle()); result.prefix = _.text.IntoString(gameMode.GetMapPrefix()); - result.acronym = _.text.IntoString(gameMode.GetAcronym()); + nextColoredName = gameMode + .GetTitle() + .IntoMutableText() + .ChangeDefaultColor(_.color.white); + result.gameName = _.text.IntoColoredString(nextColoredName) + $ _.color.GetColorTag(_.color.White); + nextColoredName = gameMode + .GetAcronym() + .IntoMutableText() + .ChangeDefaultColor(_.color.white); + result.acronym = _.text.IntoColoredString(nextColoredName) + $ _.color.GetColorTag(_.color.White); result.mutators = BuildMutatorString(gameMode); result.options = BuildOptionsString(gameMode); return result;