Browse Source

Fix trading time pause output

Trading time output announcement didn't actually check whether any
changes took place. Now it does.
feature_improvement
Anton Tarasenko 2 years ago
parent
commit
70543fe970
  1. 17
      sources/Commands/ACommandTrader.uc

17
sources/Commands/ACommandTrader.uc

@ -178,24 +178,33 @@ protected function ListTradersFor(EPlayer target)
protected function HandleTraderTime(CallData result) protected function HandleTraderTime(CallData result)
{ {
local bool oldIsPaused, newIsPaused;
local int countDownValue; local int countDownValue;
local Text parameter; local Text parameter;
local Parser parser; local Parser parser;
parameter = result.parameters.GetText(T(TTRADER_TIME)); parameter = result.parameters.GetText(T(TTRADER_TIME));
if (parameter.Compare(T(TPAUSE), SCASE_INSENSITIVE)) if (parameter.Compare(T(TPAUSE), SCASE_INSENSITIVE))
{ {
if (!_.kf.trading.IsCountDownPaused()) { oldIsPaused = _.kf.trading.IsCountDownPaused();
if (!oldIsPaused) {
_.kf.trading.SetCountdownPause(true);
}
newIsPaused = _.kf.trading.IsCountDownPaused();
if (oldIsPaused != newIsPaused) {
announcer.AnnouncePausedTime(); announcer.AnnouncePausedTime();
} }
_.kf.trading.SetCountdownPause(true);
return; return;
} }
else if (parameter.Compare(T(TUNPAUSE), SCASE_INSENSITIVE)) else if (parameter.Compare(T(TUNPAUSE), SCASE_INSENSITIVE))
{ {
if (_.kf.trading.IsCountDownPaused()) { oldIsPaused = _.kf.trading.IsCountDownPaused();
if (oldIsPaused) {
_.kf.trading.SetCountdownPause(false);
}
newIsPaused = _.kf.trading.IsCountDownPaused();
if (oldIsPaused != newIsPaused) {
announcer.AnnounceUnpausedTime(); announcer.AnnounceUnpausedTime();
} }
_.kf.trading.SetCountdownPause(false);
return; return;
} }
parser = _.text.Parse(parameter); parser = _.text.Parse(parameter);

Loading…
Cancel
Save