cpp/openttd-patchpack/source File Diff

File diff r11916:e3a8d08bf479 → r11917:612c11f7ab47

src/signs_cmd.cpp

➞

Show inline comments

@@ @@ -70,13 +70,13 @@ CommandCost CmdRenameSign(TileIndex tile @@
 	/* Rename the signs when empty, otherwise remove it */
 	if (!StrEmpty(text)) {
 		if (strlen(text) >= MAX_LENGTH_SIGN_NAME_BYTES) return CMD_ERROR;
 		if (flags & DC_EXEC) {
-			Sign *si = GetSign(p1);
+			Sign *si = Sign::Get(p1);
 			/* Delete the old name */
 			free(si->name);
 			/* Assign the new one */
 			si->name = strdup(text);
 			si->owner = _current_company;
@@ @@ -86,13 +86,13 @@ CommandCost CmdRenameSign(TileIndex tile @@
 			UpdateSignVirtCoords(si);
 			MarkSignDirty(si);
 			InvalidateWindowData(WC_SIGN_LIST, 0, 1);
+		}
 	} else { // Delete sign
 		if (flags & DC_EXEC) {
-			Sign *si = GetSign(p1);
+			Sign *si = Sign::Get(p1);
 			MarkSignDirty(si);
 			delete si;
 			InvalidateWindowData(WC_SIGN_LIST, 0, 0);
+		}
@@ @@ -108,13 +108,13 @@ CommandCost CmdRenameSign(TileIndex tile @@
  * @param p1 unused
  * @param p2 unused
  */
 void CcPlaceSign(bool success, TileIndex tile, uint32 p1, uint32 p2)
+{
 	if (success) {
-		ShowRenameSignWindow(GetSign(_new_sign_id));
+		ShowRenameSignWindow(Sign::Get(_new_sign_id));
 		ResetObjectToPlace();
+	}
+}
 /**
+ *