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

Fix #10: Do not auto-terraform in polyrail remove mode

Browse Source
This commit is contained in:
dP
2021-10-23 19:36:03 +03:00
parent e921aae3bc
commit 4082c7c787
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cm_changelog.txt
View File

@@ -75,8 +75,9 @@ This is usable for any OpenTTD servers
== CHANGELOG == == CHANGELOG ==
*** 12.1 (? Oct 2021) *** *** 12.1 (? Oct 2021) ***
- Hide new auto-terraforming mode for polyrail behind a setting for now as it is still quite bugged. - Hid new auto-terraforming mode for polyrail behind a setting for now as it is still quite bugged.
- Fix modifer keys selection in settings ui. - Fixed auto-terraforming messing remove mode in polyrail tool.
- Fixed modifer keys selection in settings ui.
*** 12.0 (17 Oct 2021) *** *** 12.0 (17 Oct 2021) ***
- Automatically search servers when opening multiplayer window. - Automatically search servers when opening multiplayer window.

8
src/citymania/cm_hotkeys.cpp
View File

@@ -74,6 +74,10 @@ std::pair<uint32, uint32> GetEPM() {
_last_actions.size()); _last_actions.size());
} }
bool HasSeparateRemoveMod() {
return (_settings_client.gui.cm_fn_mod != _settings_client.gui.cm_remove_mod);
}
void UpdateModKeys(bool shift_pressed, bool ctrl_pressed, bool alt_pressed) { void UpdateModKeys(bool shift_pressed, bool ctrl_pressed, bool alt_pressed) {
bool mod_pressed[(size_t)ModKey::END] = {false}; bool mod_pressed[(size_t)ModKey::END] = {false};
if (shift_pressed) mod_pressed[(size_t)ModKey::SHIFT] = true; if (shift_pressed) mod_pressed[(size_t)ModKey::SHIFT] = true;
@@ -97,10 +101,6 @@ void UpdateModKeys(bool shift_pressed, bool ctrl_pressed, bool alt_pressed) {
} }
} }
bool HasSeparateRemoveMod() {
return (_settings_client.gui.cm_fn_mod != _settings_client.gui.cm_remove_mod);
}
ToolRemoveMode RailToolbar_GetRemoveMode(int widget) { ToolRemoveMode RailToolbar_GetRemoveMode(int widget) {
switch(widget) { switch(widget) {
case WID_RAT_BUILD_NS: case WID_RAT_BUILD_NS:

1
src/citymania/cm_hotkeys.hpp
View File

@@ -9,6 +9,7 @@ extern bool _fn_mod;
extern bool _estimate_mod; extern bool _estimate_mod;
extern bool _remove_mod; extern bool _remove_mod;
enum class ToolRemoveMode : uint8 { enum class ToolRemoveMode : uint8 {
NONE = 0, NONE = 0,
BUTTON = 1, BUTTON = 1,

2
src/rail_gui.cpp
View File

@@ -515,7 +515,7 @@ static void HandleAutodirPlacement()
if (citymania::_estimate_mod || !(_thd.place_mode & HT_POLY) || if (citymania::_estimate_mod || !(_thd.place_mode & HT_POLY) ||
DoCommand(&cmd, DC_AUTO | DC_NO_WATER).GetErrorMessage() != STR_ERROR_ALREADY_BUILT || DoCommand(&cmd, DC_AUTO | DC_NO_WATER).GetErrorMessage() != STR_ERROR_ALREADY_BUILT ||
_rail_track_endtile == INVALID_TILE) { _rail_track_endtile == INVALID_TILE) {
if (_thd.cm_poly_terra) { if (_thd.cm_poly_terra && !_remove_button_clicked) {
if (!citymania::HandleAutodirTerraform(start_tile, end_tile, track, cmd)) return; if (!citymania::HandleAutodirTerraform(start_tile, end_tile, track, cmd)) return;
} else { } else {
if (!DoCommandP(&cmd)) return; if (!DoCommandP(&cmd)) return;

2
src/viewport.cpp
View File

@@ -1181,7 +1181,7 @@ static void DrawTileSelection(const TileInfo *ti)
case HT_LINE: { case HT_LINE: {
HighLightStyle type = GetPartOfAutoLine(ti->x, ti->y, _thd.selstart, _thd.selend, _thd.drawstyle & HT_DIR_MASK); HighLightStyle type = GetPartOfAutoLine(ti->x, ti->y, _thd.selstart, _thd.selend, _thd.drawstyle & HT_DIR_MASK);
if (type < HT_DIR_END) { if (type < HT_DIR_END) {
DrawAutorailSelection(ti, type, _thd.cm_poly_terra ? CM_SPR_PALETTE_ZONING_YELLOW : PAL_NONE); DrawAutorailSelection(ti, type, _thd.cm_poly_terra && !_thd.make_square_red ? CM_SPR_PALETTE_ZONING_YELLOW : PAL_NONE);
} else if (_thd.dir2 < HT_DIR_END) { } else if (_thd.dir2 < HT_DIR_END) {
type = GetPartOfAutoLine(ti->x, ti->y, _thd.selstart2, _thd.selend2, _thd.dir2); type = GetPartOfAutoLine(ti->x, ti->y, _thd.selstart2, _thd.selend2, _thd.dir2);
if (type < HT_DIR_END) DrawAutorailSelection(ti, type, PALETTE_SEL_TILE_BLUE); if (type < HT_DIR_END) DrawAutorailSelection(ti, type, PALETTE_SEL_TILE_BLUE);