Files
@ r26913:e7b3d514fe34
Branch filter:
Location: cpp/openttd-patchpack/source/src/signs_cmd.cpp - annotation
r26913:e7b3d514fe34
4.0 KiB
text/x-c
Revert 92c7551: Line drawing algorithm fix broke other cases (#10497)
This reverts commit 92c755161d6a467d33477bd0041fc720d7d9ba41.
This reverts commit 92c755161d6a467d33477bd0041fc720d7d9ba41.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r23437:6ce81d75a8ed r11345:85f52e96797f r11345:85f52e96797f r26094:7572e88decb3 r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r21383:942c32fb8b0e r21383:942c32fb8b0e r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r26119:a6e64747fa5d r26124:7d51c03a3f5e r11345:85f52e96797f r26124:7d51c03a3f5e r11345:85f52e96797f r11345:85f52e96797f r26124:7d51c03a3f5e r11345:85f52e96797f r11345:85f52e96797f r26124:7d51c03a3f5e r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r18969:91e591a12593 r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r18245:fb370bf5a3c0 r25562:30716ba6a396 r25428:48f543d34f61 r11345:85f52e96797f r23512:89adada9c9f0 r11345:85f52e96797f r26124:7d51c03a3f5e r11345:85f52e96797f r11345:85f52e96797f r26124:7d51c03a3f5e r11345:85f52e96797f r11345:85f52e96797f r15610:623a23fb6560 r15610:623a23fb6560 r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r26119:a6e64747fa5d r13057:58af81fcdcf8 r13057:58af81fcdcf8 r11345:85f52e96797f r26119:a6e64747fa5d r11345:85f52e96797f r26119:a6e64747fa5d r23607:36c15679007d r26082:ed4b80b7fdde r11345:85f52e96797f r11345:85f52e96797f r25562:30716ba6a396 r16672:c10913372b81 r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r24214:a65c412aafcc r18969:91e591a12593 r11345:85f52e96797f r12381:5e06b887e97b r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r23514:44f7e602e9c5 r23942:2580b984b22e r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r26122:02442b0744ee r14220:2b66d13ca715 r26124:7d51c03a3f5e r11345:85f52e96797f r26124:7d51c03a3f5e r11345:85f52e96797f r14220:2b66d13ca715 r14220:2b66d13ca715 r26124:7d51c03a3f5e r14220:2b66d13ca715 r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r11345:85f52e96797f r26119:a6e64747fa5d r11345:85f52e96797f | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file signs_cmd.cpp Handling of sign related commands. */
#include "stdafx.h"
#include "landscape.h"
#include "company_func.h"
#include "signs_base.h"
#include "signs_func.h"
#include "command_func.h"
#include "tilehighlight_func.h"
#include "viewport_kdtree.h"
#include "window_func.h"
#include "string_func.h"
#include "signs_cmd.h"
#include "table/strings.h"
#include "safeguards.h"
/**
* Place a sign at the given coordinates. Ownership of sign has
* no effect whatsoever except for the colour the sign gets for easy recognition,
* but everybody is able to rename/remove it.
* @param tile tile to place sign at
* @param flags type of operation
* @param text contents of the sign
* @return the cost of this operation + the ID of the new sign or an error
*/
std::tuple<CommandCost, SignID> CmdPlaceSign(DoCommandFlag flags, TileIndex tile, const std::string &text)
{
/* Try to locate a new sign */
if (!Sign::CanAllocateItem()) return { CommandCost(STR_ERROR_TOO_MANY_SIGNS), INVALID_SIGN };
/* Check sign text length if any */
if (Utf8StringLength(text) >= MAX_LENGTH_SIGN_NAME_CHARS) return { CMD_ERROR, INVALID_SIGN };
/* When we execute, really make the sign */
if (flags & DC_EXEC) {
Sign *si = new Sign(_game_mode == GM_EDITOR ? OWNER_DEITY : _current_company);
int x = TileX(tile) * TILE_SIZE;
int y = TileY(tile) * TILE_SIZE;
si->x = x;
si->y = y;
si->z = GetSlopePixelZ(x, y);
if (!text.empty()) {
si->name = text;
}
si->UpdateVirtCoord();
InvalidateWindowData(WC_SIGN_LIST, 0, 0);
return { CommandCost(), si->index };
}
return { CommandCost(), INVALID_SIGN };
}
/**
* Rename a sign. If the new name of the sign is empty, we assume
* the user wanted to delete it. So delete it. Ownership of signs
* has no meaning/effect whatsoever except for eyecandy
* @param flags type of operation
* @param sign_id index of the sign to be renamed/removed
* @param text the new name or an empty string when resetting to the default
* @return the cost of this operation or an error
*/
CommandCost CmdRenameSign(DoCommandFlag flags, SignID sign_id, const std::string &text)
{
Sign *si = Sign::GetIfValid(sign_id);
if (si == nullptr) return CMD_ERROR;
if (!CompanyCanRenameSign(si)) return CMD_ERROR;
/* Rename the signs when empty, otherwise remove it */
if (!text.empty()) {
if (Utf8StringLength(text) >= MAX_LENGTH_SIGN_NAME_CHARS) return CMD_ERROR;
if (flags & DC_EXEC) {
/* Assign the new one */
si->name = text;
if (_game_mode != GM_EDITOR) si->owner = _current_company;
si->UpdateVirtCoord();
InvalidateWindowData(WC_SIGN_LIST, 0, 1);
}
} else { // Delete sign
if (flags & DC_EXEC) {
si->sign.MarkDirty();
if (si->sign.kdtree_valid) _viewport_sign_kdtree.Remove(ViewportSignKdtreeItem::MakeSign(si->index));
delete si;
InvalidateWindowData(WC_SIGN_LIST, 0, 0);
}
}
return CommandCost();
}
/**
* Callback function that is called after a sign is placed
* @param cmd unused
* @param result of the operation
* @param new_sign ID of the placed sign.
*/
void CcPlaceSign(Commands cmd, const CommandCost &result, SignID new_sign)
{
if (result.Failed()) return;
ShowRenameSignWindow(Sign::Get(new_sign));
ResetObjectToPlace();
}
/**
*
* PlaceProc function, called when someone pressed the button if the
* sign-tool is selected
* @param tile on which to place the sign
*/
void PlaceProc_Sign(TileIndex tile)
{
Command<CMD_PLACE_SIGN>::Post(STR_ERROR_CAN_T_PLACE_SIGN_HERE, CcPlaceSign, tile, {});
}
|