Fix win and macos compilation errors

This commit is contained in:
dP
2021-04-03 03:25:38 +03:00
parent d238660219
commit ce4b4712fd
2 changed files with 3 additions and 3 deletions

View File

@@ -106,12 +106,12 @@ void CcPlaySound_CONSTRUCTION_RAIL(const CommandCost &result, TileIndex tile, ui
if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_20_CONSTRUCTION_RAIL, tile);
}
static CommandContainer GenericPlaceRailCmd(TileIndex tile, int cmd)
static CommandContainer GenericPlaceRailCmd(TileIndex tile, uint32 cmd)
{
CommandContainer ret = {
tile, // tile
_cur_railtype, // p1
cmd | (_settings_client.gui.auto_remove_signals << 3), // p2
cmd | ((uint32)_settings_client.gui.auto_remove_signals << 3), // p2
_remove_button_clicked ?
CMD_REMOVE_SINGLE_RAIL | CMD_MSG(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK) :
CMD_BUILD_SINGLE_RAIL | CMD_MSG(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK), // cmd

View File

@@ -843,7 +843,7 @@ void VideoDriver_Win32Base::InputLoop()
bool old_ctrl_pressed = _ctrl_pressed;
_ctrl_pressed = this->has_focus && GetAsyncKeyState(VK_CONTROL) < 0;
_alt_pressed = _wnd.has_focus && GetAsyncKeyState(VK_MENU) < 0;
_alt_pressed = this->has_focus && GetAsyncKeyState(VK_MENU) < 0;
_shift_pressed = this->has_focus && GetAsyncKeyState(VK_SHIFT) < 0;
#if defined(_DEBUG)