mirror of https://github.com/OpenTTD/OpenTTD.git
Add: Road waypoint default graphics
This commit is contained in:
parent
3bcf5dfd8f
commit
60e8b633af
Binary file not shown.
|
@ -1 +1 @@
|
||||||
4f03553f614a06d86dc06376db3353c7
|
8bc3926cb50e19747de498357417d973
|
||||||
|
|
|
@ -20,6 +20,7 @@ if(GRFCODEC_FOUND)
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui.nfo
|
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui.nfo
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/palette.nfo
|
${CMAKE_CURRENT_SOURCE_DIR}/palette.nfo
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/roadstops.nfo
|
${CMAKE_CURRENT_SOURCE_DIR}/roadstops.nfo
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/road_waypoints.nfo
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/signals.nfo
|
${CMAKE_CURRENT_SOURCE_DIR}/signals.nfo
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/sloped_tracks.nfo
|
${CMAKE_CURRENT_SOURCE_DIR}/sloped_tracks.nfo
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/tramtracks.nfo
|
${CMAKE_CURRENT_SOURCE_DIR}/tramtracks.nfo
|
||||||
|
@ -42,6 +43,7 @@ if(GRFCODEC_FOUND)
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui_convert_tram.png
|
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui_convert_tram.png
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui_group_livery.png
|
${CMAKE_CURRENT_SOURCE_DIR}/openttdgui_group_livery.png
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/roadstops.png
|
${CMAKE_CURRENT_SOURCE_DIR}/roadstops.png
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/road_waypoints.png
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/signals.png
|
${CMAKE_CURRENT_SOURCE_DIR}/signals.png
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/sloped_tracks.png
|
${CMAKE_CURRENT_SOURCE_DIR}/sloped_tracks.png
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/tramtracks.png
|
${CMAKE_CURRENT_SOURCE_DIR}/tramtracks.png
|
||||||
|
|
|
@ -98,3 +98,4 @@
|
||||||
#include "mono.nfo"
|
#include "mono.nfo"
|
||||||
#include "tunnel_portals.nfo"
|
#include "tunnel_portals.nfo"
|
||||||
#include "palette.nfo"
|
#include "palette.nfo"
|
||||||
|
#include "road_waypoints.nfo"
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
// 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/>.
|
||||||
|
//
|
||||||
|
|
||||||
|
-1 * 0 0C "Road waypoints"
|
||||||
|
//@@LINT OFF
|
||||||
|
-1 * 3 05 19 04
|
||||||
|
//@@LINT ON
|
||||||
|
-1 sprites/road_waypoints.png 8bpp 10 10 64 40 -5 -22 normal
|
||||||
|
-1 sprites/road_waypoints.png 8bpp 90 10 64 40 -31 -9 normal
|
||||||
|
-1 sprites/road_waypoints.png 8bpp 170 10 64 35 -31 -4 normal
|
||||||
|
-1 sprites/road_waypoints.png 8bpp 240 10 64 35 -57 -17 normal
|
Binary file not shown.
After Width: | Height: | Size: 8.4 KiB |
|
@ -6426,6 +6426,7 @@ static constexpr auto _action5_types = std::to_array<Action5Type>({
|
||||||
/* 0x16 */ { A5BLOCK_ALLOW_OFFSET, SPR_AIRPORT_PREVIEW_BASE, 1, SPR_AIRPORT_PREVIEW_COUNT, "Airport preview graphics" },
|
/* 0x16 */ { A5BLOCK_ALLOW_OFFSET, SPR_AIRPORT_PREVIEW_BASE, 1, SPR_AIRPORT_PREVIEW_COUNT, "Airport preview graphics" },
|
||||||
/* 0x17 */ { A5BLOCK_ALLOW_OFFSET, SPR_RAILTYPE_TUNNEL_BASE, 1, RAILTYPE_TUNNEL_BASE_COUNT, "Railtype tunnel base" },
|
/* 0x17 */ { A5BLOCK_ALLOW_OFFSET, SPR_RAILTYPE_TUNNEL_BASE, 1, RAILTYPE_TUNNEL_BASE_COUNT, "Railtype tunnel base" },
|
||||||
/* 0x18 */ { A5BLOCK_ALLOW_OFFSET, SPR_PALETTE_BASE, 1, PALETTE_SPRITE_COUNT, "Palette" },
|
/* 0x18 */ { A5BLOCK_ALLOW_OFFSET, SPR_PALETTE_BASE, 1, PALETTE_SPRITE_COUNT, "Palette" },
|
||||||
|
/* 0x19 */ { A5BLOCK_ALLOW_OFFSET, SPR_ROAD_WAYPOINTS_BASE, 1, ROAD_WAYPOINTS_SPRITE_COUNT, "Road waypoints" },
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -307,8 +307,16 @@ static const uint16_t EMPTY_BOUNDING_BOX_SPRITE_COUNT = 1;
|
||||||
static const SpriteID SPR_PALETTE_BASE = SPR_EMPTY_BOUNDING_BOX + EMPTY_BOUNDING_BOX_SPRITE_COUNT;
|
static const SpriteID SPR_PALETTE_BASE = SPR_EMPTY_BOUNDING_BOX + EMPTY_BOUNDING_BOX_SPRITE_COUNT;
|
||||||
static const uint16_t PALETTE_SPRITE_COUNT = 1;
|
static const uint16_t PALETTE_SPRITE_COUNT = 1;
|
||||||
|
|
||||||
|
/** Road waypoint sprites. */
|
||||||
|
static const SpriteID SPR_ROAD_WAYPOINTS_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
|
||||||
|
static const SpriteID SPR_ROAD_WAYPOINT_Y_W = SPR_ROAD_WAYPOINTS_BASE;
|
||||||
|
static const SpriteID SPR_ROAD_WAYPOINT_Y_E = SPR_ROAD_WAYPOINTS_BASE + 1;
|
||||||
|
static const SpriteID SPR_ROAD_WAYPOINT_X_W = SPR_ROAD_WAYPOINTS_BASE + 2;
|
||||||
|
static const SpriteID SPR_ROAD_WAYPOINT_X_E = SPR_ROAD_WAYPOINTS_BASE + 3;
|
||||||
|
static const uint16_t ROAD_WAYPOINTS_SPRITE_COUNT = 4;
|
||||||
|
|
||||||
/* From where can we start putting NewGRFs? */
|
/* From where can we start putting NewGRFs? */
|
||||||
static const SpriteID SPR_NEWGRFS_BASE = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
|
static const SpriteID SPR_NEWGRFS_BASE = SPR_ROAD_WAYPOINTS_BASE + ROAD_WAYPOINTS_SPRITE_COUNT;
|
||||||
|
|
||||||
/* Manager face sprites */
|
/* Manager face sprites */
|
||||||
static const SpriteID SPR_GRADIENT = 874; // background gradient behind manager face
|
static const SpriteID SPR_GRADIENT = 874; // background gradient behind manager face
|
||||||
|
|
|
@ -763,6 +763,20 @@ static const DrawTileSeqStruct _station_display_datas_0171[] = {
|
||||||
TILE_SEQ_END()
|
TILE_SEQ_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* road waypoint X */
|
||||||
|
static const DrawTileSeqStruct _station_display_datas_road_waypoint_X[] = {
|
||||||
|
TILE_SEQ_LINE( 0, 0, 0, 16, 3, 16, SPR_ROAD_WAYPOINT_X_W | (1U << PALETTE_MODIFIER_COLOUR))
|
||||||
|
TILE_SEQ_LINE( 0, 13, 0, 16, 3, 16, SPR_ROAD_WAYPOINT_X_E | (1U << PALETTE_MODIFIER_COLOUR))
|
||||||
|
TILE_SEQ_END()
|
||||||
|
};
|
||||||
|
|
||||||
|
/* road waypoint Y */
|
||||||
|
static const DrawTileSeqStruct _station_display_datas_road_waypoint_Y[] = {
|
||||||
|
TILE_SEQ_LINE(13, 0, 0, 3, 16, 16, SPR_ROAD_WAYPOINT_Y_W | (1U << PALETTE_MODIFIER_COLOUR))
|
||||||
|
TILE_SEQ_LINE( 0, 0, 0, 3, 16, 16, SPR_ROAD_WAYPOINT_Y_E | (1U << PALETTE_MODIFIER_COLOUR))
|
||||||
|
TILE_SEQ_END()
|
||||||
|
};
|
||||||
|
|
||||||
static const DrawTileSeqStruct _station_display_datas_waypoint_X[] = {
|
static const DrawTileSeqStruct _station_display_datas_waypoint_X[] = {
|
||||||
TILE_SEQ_LINE( 0, 0, 0, 16, 5, 23, SPR_WAYPOINT_X_1 | (1U << PALETTE_MODIFIER_COLOUR))
|
TILE_SEQ_LINE( 0, 0, 0, 16, 5, 23, SPR_WAYPOINT_X_1 | (1U << PALETTE_MODIFIER_COLOUR))
|
||||||
TILE_SEQ_LINE( 0, 11, 0, 16, 5, 23, SPR_WAYPOINT_X_2 | (1U << PALETTE_MODIFIER_COLOUR))
|
TILE_SEQ_LINE( 0, 11, 0, 16, 5, 23, SPR_WAYPOINT_X_2 | (1U << PALETTE_MODIFIER_COLOUR))
|
||||||
|
@ -956,12 +970,12 @@ static const DrawTileSprites _station_display_datas_bus[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const DrawTileSprites _station_display_datas_road_waypoint[] = {
|
static const DrawTileSprites _station_display_datas_road_waypoint[] = {
|
||||||
TILE_SPRITE_LINE(SPR_BUS_STOP_NE_GROUND | (1U << PALETTE_MODIFIER_COLOUR), _station_display_datas_71)
|
TILE_SPRITE_LINE(0, nullptr)
|
||||||
TILE_SPRITE_LINE(SPR_BUS_STOP_SE_GROUND | (1U << PALETTE_MODIFIER_COLOUR), _station_display_datas_72)
|
TILE_SPRITE_LINE(0, nullptr)
|
||||||
TILE_SPRITE_LINE(SPR_BUS_STOP_SW_GROUND | (1U << PALETTE_MODIFIER_COLOUR), _station_display_datas_73)
|
TILE_SPRITE_LINE(0, nullptr)
|
||||||
TILE_SPRITE_LINE(SPR_BUS_STOP_NW_GROUND | (1U << PALETTE_MODIFIER_COLOUR), _station_display_datas_74)
|
TILE_SPRITE_LINE(0, nullptr)
|
||||||
TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_X, _station_display_datas_0170)
|
TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_X, _station_display_datas_road_waypoint_X)
|
||||||
TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_Y, _station_display_datas_0171)
|
TILE_SPRITE_LINE(SPR_ROAD_PAVED_STRAIGHT_Y, _station_display_datas_road_waypoint_Y)
|
||||||
};
|
};
|
||||||
|
|
||||||
static const DrawTileSprites _station_display_datas_oilrig[] = {
|
static const DrawTileSprites _station_display_datas_oilrig[] = {
|
||||||
|
|
Loading…
Reference in New Issue