miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag '1.11.0-beta2' into master

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-03-03 00:51:28 +02:00
parent da2947e5e3 f30f4b6892
commit 870c254ee2
284 changed files with 26442 additions and 7539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/toolbar_gui.cpp
View File

@@ -298,7 +298,8 @@ static CallBackFunction ToolbarPauseClick(Window *w)
*/
static CallBackFunction ToolbarFastForwardClick(Window *w)
{
_fast_forward ^= true;
ChangeGameSpeed(_game_speed == 100);
if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
return CBF_NONE;
}
@@ -2829,7 +2830,7 @@ struct MainToolbarWindow : Window {
this->SetWidgetDirty(WID_TN_PAUSE);
}
if (this->IsWidgetLowered(WID_TN_FAST_FORWARD) != !!_fast_forward) {
if (this->IsWidgetLowered(WID_TN_FAST_FORWARD) != (_game_speed != 100)) {
this->ToggleWidgetLoweredState(WID_TN_FAST_FORWARD);
this->SetWidgetDirty(WID_TN_FAST_FORWARD);
}
@@ -3271,7 +3272,7 @@ struct ScenarioEditorToolbarWindow : Window {
this->SetDirty();
}
if (this->IsWidgetLowered(WID_TE_FAST_FORWARD) != !!_fast_forward) {
if (this->IsWidgetLowered(WID_TE_FAST_FORWARD) != (_game_speed != 100)) {
this->ToggleWidgetLoweredState(WID_TE_FAST_FORWARD);
this->SetDirty();
}