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

Merge remote-tracking branch 'upstream/1.11' into 1.11

Browse Source
This commit is contained in:
dP
2021-03-15 20:11:52 +03:00
parent c8ff7bcf4d 1381a86a1e
commit c36ef2b3f3
327 changed files with 31198 additions and 8572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/toolbar_gui.cpp
View File

@@ -304,7 +304,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;
}
@@ -2250,7 +2251,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);
}
@@ -2645,7 +2646,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();
}