diff options
| author | maedhros <maedhros@openttd.org> | 2007-05-23 12:45:56 +0000 |
|---|---|---|
| committer | maedhros <maedhros@openttd.org> | 2007-05-23 12:45:56 +0000 |
| commit | ca5c578d0f51724d9c4e5b1101b81b442c049341 (patch) | |
| tree | 6595e32b2d16537c3647b01f1ff39b07b4d0f57a /src/terraform_gui.cpp | |
| parent | 9f148789c8ddb64bdc098d24a87aad3293d034b2 (diff) | |
| download | openttd-ca5c578d0f51724d9c4e5b1101b81b442c049341.tar.xz | |
(svn r9900) -Codechange: Separate the variables for how to highlight a land area and what to do with it afterwards.
Diffstat (limited to 'src/terraform_gui.cpp')
| -rw-r--r-- | src/terraform_gui.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index cb3c2aa81..99def0e85 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -104,23 +104,24 @@ bool GUIPlaceProcDragXY(const WindowEvent *e) TileIndex start_tile = e->we.place.starttile; TileIndex end_tile = e->we.place.tile; - switch (e->we.place.userdata >> 4) { - case GUI_PlaceProc_DemolishArea >> 4: - DoCommandP(end_tile, start_tile, 0, CcPlaySound10, CMD_CLEAR_AREA | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA)); - break; - case GUI_PlaceProc_LevelArea >> 4: - DoCommandP(end_tile, start_tile, 0, CcPlaySound10, CMD_LEVEL_LAND | CMD_AUTO); - break; - case GUI_PlaceProc_RockyArea >> 4: - GenerateRockyArea(end_tile, start_tile); - break; - case GUI_PlaceProc_DesertArea >> 4: - GenerateDesertArea(end_tile, start_tile); - break; - case GUI_PlaceProc_WaterArea >> 4: - DoCommandP(end_tile, start_tile, _ctrl_pressed, CcBuildCanal, CMD_BUILD_CANAL | CMD_AUTO | CMD_MSG(STR_CANT_BUILD_CANALS)); - break; - default: return false; + switch (e->we.place.select_proc) { + case GUI_PlaceProc_DemolishArea: + DoCommandP(end_tile, start_tile, 0, CcPlaySound10, CMD_CLEAR_AREA | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA)); + break; + case GUI_PlaceProc_LevelArea: + DoCommandP(end_tile, start_tile, 0, CcPlaySound10, CMD_LEVEL_LAND | CMD_AUTO); + break; + case GUI_PlaceProc_RockyArea: + GenerateRockyArea(end_tile, start_tile); + break; + case GUI_PlaceProc_DesertArea: + GenerateDesertArea(end_tile, start_tile); + break; + case GUI_PlaceProc_WaterArea: + DoCommandP(end_tile, start_tile, _ctrl_pressed, CcBuildCanal, CMD_BUILD_CANAL | CMD_AUTO | CMD_MSG(STR_CANT_BUILD_CANALS)); + break; + default: + return false; } return true; @@ -140,7 +141,7 @@ static const uint16 _terraform_keycodes[] = { void PlaceProc_DemolishArea(TileIndex tile) { - VpStartPlaceSizing(tile, VPM_X_AND_Y | GUI_PlaceProc_DemolishArea); + VpStartPlaceSizing(tile, VPM_X_AND_Y, GUI_PlaceProc_DemolishArea); } static void PlaceProc_RaiseLand(TileIndex tile) @@ -161,7 +162,7 @@ static void PlaceProc_LowerLand(TileIndex tile) void PlaceProc_LevelLand(TileIndex tile) { - VpStartPlaceSizing(tile, VPM_X_AND_Y | GUI_PlaceProc_LevelArea); + VpStartPlaceSizing(tile, VPM_X_AND_Y, GUI_PlaceProc_LevelArea); } static void TerraformClick_Lower(Window *w) @@ -239,12 +240,11 @@ static void TerraformToolbWndProc(Window *w, WindowEvent *e) return; case WE_PLACE_DRAG: - VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.userdata & 0xF); + VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.select_method); break; case WE_PLACE_MOUSEUP: - if (e->we.place.pt.x != -1 && - (e->we.place.userdata & 0xF) == VPM_X_AND_Y) { // dragged actions + if (e->we.place.pt.x != -1 && e->we.place.select_method == VPM_X_AND_Y) { GUIPlaceProcDragXY(e); } break; |