dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/console.cpp
#	src/console_func.h
#	src/network/network_server.cpp
#	src/os/unix/unix.cpp
#	src/spritecache.cpp
#	src/viewport.cpp
This commit is contained in:
Jonathan G Rennison
2023-09-15 20:44:22 +01:00
parent cb5a132b0c c3fbe7bea8
commit ed1b842ad3
28 changed files with 160 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/table/sprites.h
View File

@@ -42,7 +42,7 @@
static const SpriteID SPR_SELECT_TILE = 752;
static const SpriteID SPR_DOT = 774; // corner marker for lower/raise land
static const SpriteID SPR_DOT_SMALL = 4078;
static const SpriteID SPR_EMPTY = 4078; // empty (transparent blue) sprite
static const SpriteID SPR_WHITE_POINT = 4079;
/* ASCII */