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/blitter/32bpp_anim.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/gfxinit.cpp
#	src/network/core/os_abstraction.cpp
#	src/spritecache.cpp
This commit is contained in:
Jonathan G Rennison
2023-12-28 16:01:08 +00:00
parent 507fd1839c 5cf9c46b29
commit b72366419b
48 changed files with 852 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/smallmap_colours.h
View File

@@ -10,16 +10,9 @@
#ifndef SMALLMAP_COLOURS_H
#define SMALLMAP_COLOURS_H
#include "palette_func.h"
#include "core/endian_func.hpp"
static const uint8 PC_ROUGH_LAND = 0x52; ///< Dark green palette colour for rough land.
static const uint8 PC_GRASS_LAND = 0x54; ///< Dark green palette colour for grass land.
static const uint8 PC_BARE_LAND = 0x37; ///< Brown palette colour for bare land.
static const uint8 PC_RAINFOREST = 0x5C; ///< Pale green palette colour for rainforest.
static const uint8 PC_FIELDS = 0x25; ///< Light brown palette colour for fields.
static const uint8 PC_TREES = 0x57; ///< Green palette colour for trees.
static const uint8 PC_WATER = 0xC9; ///< Dark blue palette colour for water.
#define MKCOLOUR(x) TO_LE32X(x)
#define MKCOLOUR_XXXX(x) (MKCOLOUR(0x01010101) * (uint)(x))