mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25993) [1.3] -Backport from trunk: 

- Fix: Comma key collided with F12 key for hotkeys; also remove '+' as that is generally not a key (the '+' on the numpad is a separate one) [FS#5679] (r25973)
- Fix: Rail laying sounds of others could be heard in multiplayer [FS#5665] (r25972)
- Fix: [SDL] Recursive mutex locking when changing blitter [FS#5787] (r25970)
release/1.3
rubidium 2013-11-13 22:04:22 +00:00
parent 1ffa019bb5
commit 47fe12ebc2
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotkeys.cpp
View File

@ -48,8 +48,7 @@ static const KeycodeNames _keycode_to_name[] = {
{"F11", WKC_F11}, {"F11", WKC_F11},
{"F12", WKC_F12}, {"F12", WKC_F12},
{"PAUSE", WKC_PAUSE}, {"PAUSE", WKC_PAUSE},
{"PLUS", (WindowKeyCodes)'+'}, {"COMMA", WKC_COMMA},
{"COMMA", (WindowKeyCodes)','},
{"NUM_PLUS", WKC_NUM_PLUS}, {"NUM_PLUS", WKC_NUM_PLUS},
{"NUM_MINUS", WKC_NUM_MINUS}, {"NUM_MINUS", WKC_NUM_MINUS},
{"=", WKC_EQUALS}, {"=", WKC_EQUALS},

2
src/rail_cmd.cpp
View File

@ -843,8 +843,6 @@ static CommandCost CmdRailTrackHelper(TileIndex tile, DoCommandFlag flags, uint3
CommandCost ret = ValidateAutoDrag(&trackdir, tile, end_tile); CommandCost ret = ValidateAutoDrag(&trackdir, tile, end_tile);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
if ((flags & DC_EXEC) && _settings_client.sound.confirm) SndPlayTileFx(SND_20_SPLAT_2, tile);
bool had_success = false; bool had_success = false;
CommandCost last_error = CMD_ERROR; CommandCost last_error = CMD_ERROR;
for (;;) { for (;;) {

3
src/rail_gui.cpp
View File

@ -351,7 +351,8 @@ static void DoRailroadTrack(int mode)
DoCommandP(TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), _cur_railtype | (mode << 4), DoCommandP(TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), _cur_railtype | (mode << 4),
_remove_button_clicked ? _remove_button_clicked ?
CMD_REMOVE_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) : CMD_REMOVE_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) :
CMD_BUILD_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK)); CMD_BUILD_RAILROAD_TRACK | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK),
CcPlaySound1E);
} }
static void HandleAutodirPlacement() static void HandleAutodirPlacement()

2
src/video/sdl_v.cpp
View File

@ -837,7 +837,7 @@ bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen)
bool VideoDriver_SDL::AfterBlitterChange() bool VideoDriver_SDL::AfterBlitterChange()
{ {
return this->ChangeResolution(_screen.width, _screen.height); return CreateMainSurface(_screen.width, _screen.height);
} }
#endif /* WITH_SDL */ #endif /* WITH_SDL */