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

Merge remote-tracking branch 'upstream/master' into 13.0

Browse Source
This commit is contained in:
Pavel Stupnikov
2022-11-26 22:16:25 +04:00
parent 6f44e08cba 4682b3cffb
commit f3ecdf6f7f
508 changed files with 14617 additions and 9750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tree_gui.cpp
View File

@@ -19,6 +19,7 @@
#include "strings_func.h"
#include "zoom_func.h"
#include "tree_map.h"
#include "tree_cmd.h"
#include "widgets/tree_widget.h"
@@ -230,7 +231,7 @@ public:
TileIndex tile = TileVirtXY(pt.x, pt.y);
if (this->mode == PM_NORMAL) {
DoCommandP(tile, this->tree_to_plant, tile, CMD_PLANT_TREE);
Command<CMD_PLANT_TREE>::Post(tile, tile, this->tree_to_plant);
} else {
this->DoPlantForest(tile);
}
@@ -240,7 +241,7 @@ public:
void OnPlaceMouseUp(ViewportPlaceMethod select_method, ViewportDragDropSelectionProcess select_proc, Point pt, TileIndex start_tile, TileIndex end_tile) override
{
if (_game_mode != GM_EDITOR && this->mode == PM_NORMAL && pt.x != -1 && select_proc == DDSP_PLANT_TREES) {
DoCommandP(end_tile, this->tree_to_plant, start_tile, CMD_PLANT_TREE | CMD_MSG(STR_ERROR_CAN_T_PLANT_TREE_HERE));
Command<CMD_PLANT_TREE>::Post(STR_ERROR_CAN_T_PLANT_TREE_HERE, end_tile, start_tile, this->tree_to_plant);
}
}