cpp/openttd-patchpack/source Changeset - r28328:6b936d36ce25

Changeset - r28328:6b936d36ce25

Parent rev.

Child rev.

[Not reviewed]

master

0 6 2

Peter Nelson - 4 months ago 2023-12-22 16:01:32
peter1138@openttd.org

Codechange: Split palette handling to separate file.

8 files changed with 274 insertions and 227 deletions:

src/CMakeLists.txt

src/gfx.cpp

169

src/gfx_func.h

src/gfxinit.cpp

src/palette.cpp

190

src/palette_func.h

src/widgets/dropdown_type.h

src/widgets/slider.cpp

0 comments (0 inline, 0 general)

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -325,6 +325,8 @@ add_files( @@
     order_gui.cpp
     order_type.h
     osk_gui.cpp
     palette.cpp
     palette_func.h
     pbs.cpp
     pbs.h
     progress.cpp

src/gfx.cpp

➞

Show inline comments

@@ @@ -20,12 +20,10 @@ @@
 #include "window_gui.h"
 #include "window_func.h"
 #include "newgrf_debug.h"
 #include "thread.h"
 #include "core/backup_type.hpp"
 #include "core/container_func.hpp"
 #include "viewport_func.h"
 #include "table/palettes.h"
 #include "table/string_colours.h"
 #include "table/sprites.h"
 #include "table/control_codes.h"
@@ @@ -50,13 +48,9 @@ GameMode _game_mode; @@
 SwitchMode _switch_mode;  ///< The next mainloop command.
 std::chrono::steady_clock::time_point _switch_mode_time; ///< The time when the switch mode was requested.
 PauseMode _pause_mode;
 Palette _cur_palette;
 static byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth()
 DrawPixelInfo *_cur_dpi;
 byte _colour_gradient[COLOUR_END][8];
 static std::recursive_mutex _palette_mutex; ///< To coordinate access to _cur_palette.
 static void GfxMainBlitterViewport(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub = nullptr, SpriteID sprite_id = SPR_CURSOR_MOUSE);
 static void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub = nullptr, SpriteID sprite_id = SPR_CURSOR_MOUSE, ZoomLevel zoom = ZOOM_LVL_NORMAL);
@@ @@ -1228,169 +1222,6 @@ static void GfxMainBlitter(const Sprite @@
 	GfxBlitter<1, true>(sprite, x, y, mode, sub, sprite_id, zoom);
+}
 void DoPaletteAnimations();
 void GfxInitPalettes()
+{
 	std::lock_guard<std::recursive_mutex> lock(_palette_mutex);
 	memcpy(&_cur_palette, &_palette, sizeof(_cur_palette));
 	DoPaletteAnimations();
+}
 /**
  * Copy the current palette if the palette was updated.
  * Used by video-driver to get a current up-to-date version of the palette,
  * to avoid two threads accessing the same piece of memory (with a good chance
  * one is already updating the palette while the other is drawing based on it).
  * @param local_palette The location to copy the palette to.
  * @param force_copy Whether to ignore if there is an update for the palette.
  * @return True iff a copy was done.
  */
 bool CopyPalette(Palette &local_palette, bool force_copy)
+{
 	std::lock_guard<std::recursive_mutex> lock(_palette_mutex);
 	if (!force_copy && _cur_palette.count_dirty == 0) return false;
 	local_palette = _cur_palette;
 	_cur_palette.count_dirty = 0;
 	if (force_copy) {
 		local_palette.first_dirty = 0;
 		local_palette.count_dirty = 256;
+	}
 	return true;
+}
 #define EXTR(p, q) (((uint16_t)(palette_animation_counter * (p)) * (q)) >> 16)
 #define EXTR2(p, q) (((uint16_t)(~palette_animation_counter * (p)) * (q)) >> 16)
 void DoPaletteAnimations()
+{
 	std::lock_guard<std::recursive_mutex> lock(_palette_mutex);
 	/* Animation counter for the palette animation. */
 	static int palette_animation_counter = 0;
 	palette_animation_counter += 8;
 	Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 	const Colour *s;
 	const ExtraPaletteValues *ev = &_extra_palette_values;
 	Colour old_val[PALETTE_ANIM_SIZE];
 	const uint old_tc = palette_animation_counter;
 	uint j;
 	if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) {
 		palette_animation_counter = 0;
+	}
 	Colour *palette_pos = &_cur_palette.palette[PALETTE_ANIM_START];  // Points to where animations are taking place on the palette
 	/* Makes a copy of the current animation palette in old_val,
 	 * so the work on the current palette could be compared, see if there has been any changes */
 	memcpy(old_val, palette_pos, sizeof(old_val));
 	/* Fizzy Drink bubbles animation */
 	s = ev->fizzy_drink;
 	j = EXTR2(512, EPV_CYCLES_FIZZY_DRINK);
 	for (uint i = 0; i != EPV_CYCLES_FIZZY_DRINK; i++) {
 		*palette_pos++ = s[j];
 		j++;
 		if (j == EPV_CYCLES_FIZZY_DRINK) j = 0;
+	}
 	/* Oil refinery fire animation */
 	s = ev->oil_refinery;
 	j = EXTR2(512, EPV_CYCLES_OIL_REFINERY);
 	for (uint i = 0; i != EPV_CYCLES_OIL_REFINERY; i++) {
 		*palette_pos++ = s[j];
 		j++;
 		if (j == EPV_CYCLES_OIL_REFINERY) j = 0;
+	}
 	/* Radio tower blinking */
+	{
 		byte i = (palette_animation_counter >> 1) & 0x7F;
 		byte v;
 		if (i < 0x3f) {
 			v = 255;
 		} else if (i < 0x4A || i >= 0x75) {
 			v = 128;
 		} else {
 			v = 20;
+		}
 		palette_pos->r = v;
 		palette_pos->g = 0;
 		palette_pos->b = 0;
 		palette_pos++;
 		i ^= 0x40;
 		if (i < 0x3f) {
 			v = 255;
 		} else if (i < 0x4A || i >= 0x75) {
 			v = 128;
 		} else {
 			v = 20;
+		}
 		palette_pos->r = v;
 		palette_pos->g = 0;
 		palette_pos->b = 0;
 		palette_pos++;
+	}
 	/* Handle lighthouse and stadium animation */
 	s = ev->lighthouse;
 	j = EXTR(256, EPV_CYCLES_LIGHTHOUSE);
 	for (uint i = 0; i != EPV_CYCLES_LIGHTHOUSE; i++) {
 		*palette_pos++ = s[j];
 		j++;
 		if (j == EPV_CYCLES_LIGHTHOUSE) j = 0;
+	}
 	/* Dark blue water */
 	s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->dark_water_toyland : ev->dark_water;
 	j = EXTR(320, EPV_CYCLES_DARK_WATER);
 	for (uint i = 0; i != EPV_CYCLES_DARK_WATER; i++) {
 		*palette_pos++ = s[j];
 		j++;
 		if (j == EPV_CYCLES_DARK_WATER) j = 0;
+	}
 	/* Glittery water */
 	s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->glitter_water_toyland : ev->glitter_water;
 	j = EXTR(128, EPV_CYCLES_GLITTER_WATER);
 	for (uint i = 0; i != EPV_CYCLES_GLITTER_WATER / 3; i++) {
 		*palette_pos++ = s[j];
 		j += 3;
 		if (j >= EPV_CYCLES_GLITTER_WATER) j -= EPV_CYCLES_GLITTER_WATER;
+	}
 	if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) {
 		palette_animation_counter = old_tc;
 	} else if (_cur_palette.count_dirty == 0 && memcmp(old_val, &_cur_palette.palette[PALETTE_ANIM_START], sizeof(old_val)) != 0) {
 		/* Did we changed anything on the palette? Seems so.  Mark it as dirty */
 		_cur_palette.first_dirty = PALETTE_ANIM_START;
 		_cur_palette.count_dirty = PALETTE_ANIM_SIZE;
+	}
+}
 /**
  * Determine a contrasty text colour for a coloured background.
  * @param background Background colour.
  * @param threshold Background colour brightness threshold below which the background is considered dark and TC_WHITE is returned, range: 0 - 255, default 128.
  * @return TC_BLACK or TC_WHITE depending on what gives a better contrast.
  */
 TextColour GetContrastColour(uint8_t background, uint8_t threshold)
+{
 	Colour c = _cur_palette.palette[background];
 	/* Compute brightness according to http://www.w3.org/TR/AERT#color-contrast.
 	 * The following formula computes 1000 * brightness^2, with brightness being in range 0 to 255. */
 	uint sq1000_brightness = c.r * c.r * 299 + c.g * c.g * 587 + c.b * c.b * 114;
 	/* Compare with threshold brightness which defaults to 128 (50%) */
 	return sq1000_brightness < ((uint) threshold) * ((uint) threshold) * 1000 ? TC_WHITE : TC_BLACK;
+}
 /**
  * Initialize _stringwidth_table cache
  * @param monospace Whether to load the monospace cache or the normal fonts.

src/gfx_func.h

➞

Show inline comments

@@ @@ -147,8 +147,6 @@ void DrawDirtyBlocks(); @@
 void AddDirtyBlock(int left, int top, int right, int bottom);
 void MarkWholeScreenDirty();
 bool CopyPalette(Palette &local_palette, bool force_copy = false);
 void GfxInitPalettes();
 void CheckBlitter();
 bool FillDrawPixelInfo(DrawPixelInfo *n, int left, int top, int width, int height);
@@ @@ -191,60 +189,4 @@ int GetCharacterHeight(FontSize size); @@
 extern DrawPixelInfo *_cur_dpi;
 /**
  * Checks if a Colours value is valid.
+ *
  * @param colours The value to check
  * @return true if the given value is a valid Colours.
  */
 static inline bool IsValidColours(Colours colours)
+{
 	return colours < COLOUR_END;
+}
 TextColour GetContrastColour(uint8_t background, uint8_t threshold = 128);
 /**
  * All 16 colour gradients
  * 8 colours per gradient from darkest (0) to lightest (7)
  */
 extern byte _colour_gradient[COLOUR_END][8];
 /**
  * Return the colour for a particular greyscale level.
  * @param level Intensity, 0 = black, 15 = white
  * @return colour
  */
 #define GREY_SCALE(level) (level)
 static const uint8_t PC_BLACK              = GREY_SCALE(1);  ///< Black palette colour.
 static const uint8_t PC_DARK_GREY          = GREY_SCALE(6);  ///< Dark grey palette colour.
 static const uint8_t PC_GREY               = GREY_SCALE(10); ///< Grey palette colour.
 static const uint8_t PC_WHITE              = GREY_SCALE(15); ///< White palette colour.
 static const uint8_t PC_VERY_DARK_RED      = 0xB2;           ///< Almost-black red palette colour.
 static const uint8_t PC_DARK_RED           = 0xB4;           ///< Dark red palette colour.
 static const uint8_t PC_RED                = 0xB8;           ///< Red palette colour.
 static const uint8_t PC_VERY_DARK_BROWN    = 0x56;           ///< Almost-black brown palette colour.
 static const uint8_t PC_ORANGE             = 0xC2;           ///< Orange palette colour.
 static const uint8_t PC_YELLOW             = 0xBF;           ///< Yellow palette colour.
 static const uint8_t PC_LIGHT_YELLOW       = 0x44;           ///< Light yellow palette colour.
 static const uint8_t PC_VERY_LIGHT_YELLOW  = 0x45;           ///< Almost-white yellow palette colour.
 static const uint8_t PC_GREEN              = 0xD0;           ///< Green palette colour.
 static const uint8_t PC_VERY_DARK_BLUE     = 0x9A;           ///< Almost-black blue palette colour.
 static const uint8_t PC_DARK_BLUE          = 0x9D;           ///< Dark blue palette colour.
 static const uint8_t PC_LIGHT_BLUE         = 0x98;           ///< Light blue palette colour.
 static const uint8_t PC_ROUGH_LAND         = 0x52;           ///< Dark green palette colour for rough land.
 static const uint8_t PC_GRASS_LAND         = 0x54;           ///< Dark green palette colour for grass land.
 static const uint8_t PC_BARE_LAND          = 0x37;           ///< Brown palette colour for bare land.
 static const uint8_t PC_RAINFOREST         = 0x5C;           ///< Pale green palette colour for rainforest.
 static const uint8_t PC_FIELDS             = 0x25;           ///< Light brown palette colour for fields.
 static const uint8_t PC_TREES              = 0x57;           ///< Green palette colour for trees.
 static const uint8_t PC_WATER              = 0xC9;           ///< Dark blue palette colour for water.
 #endif /* GFX_FUNC_H */

src/gfxinit.cpp

➞

Show inline comments

@@ @@ -17,6 +17,7 @@ @@
 #include "blitter/factory.hpp"
 #include "video/video_driver.hpp"
 #include "window_func.h"
 #include "palette_func.h"
 /* The type of set we're replacing */
 #define SET_TYPE "graphics"

src/palette.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
  * 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 palette.cpp Handling of palettes. */
 #include "stdafx.h"
 #include "blitter/base.hpp"
 #include "blitter/factory.hpp"
 #include "gfx_type.h"
 #include "landscape_type.h"
 #include "palette_func.h"
 #include "settings_type.h"
 #include "thread.h"
 #include "table/palettes.h"
 #include "safeguards.h"
 Palette _cur_palette;
 byte _colour_gradient[COLOUR_END][8];
 static std::recursive_mutex _palette_mutex; ///< To coordinate access to _cur_palette.
 void DoPaletteAnimations();
 void GfxInitPalettes()
+{
 	std::lock_guard<std::recursive_mutex> lock(_palette_mutex);
 	memcpy(&_cur_palette, &_palette, sizeof(_cur_palette));
 	DoPaletteAnimations();
+}
 /**
  * Copy the current palette if the palette was updated.
  * Used by video-driver to get a current up-to-date version of the palette,
  * to avoid two threads accessing the same piece of memory (with a good chance
  * one is already updating the palette while the other is drawing based on it).
  * @param local_palette The location to copy the palette to.
  * @param force_copy Whether to ignore if there is an update for the palette.
  * @return True iff a copy was done.
  */
 bool CopyPalette(Palette &local_palette, bool force_copy)
+{
 	std::lock_guard<std::recursive_mutex> lock(_palette_mutex);
 	if (!force_copy && _cur_palette.count_dirty == 0) return false;
 	local_palette = _cur_palette;
 	_cur_palette.count_dirty = 0;
 	if (force_copy) {
 		local_palette.first_dirty = 0;
 		local_palette.count_dirty = 256;
+	}
 	return true;
+}
 #define EXTR(p, q) (((uint16_t)(palette_animation_counter * (p)) * (q)) >> 16)
 #define EXTR2(p, q) (((uint16_t)(~palette_animation_counter * (p)) * (q)) >> 16)
 void DoPaletteAnimations()
+{
 	std::lock_guard<std::recursive_mutex> lock(_palette_mutex);
 	/* Animation counter for the palette animation. */
 	static int palette_animation_counter = 0;
 	palette_animation_counter += 8;
 	Blitter *blitter = BlitterFactory::GetCurrentBlitter();
 	const Colour *s;
 	const ExtraPaletteValues *ev = &_extra_palette_values;
 	Colour old_val[PALETTE_ANIM_SIZE];
 	const uint old_tc = palette_animation_counter;
 	uint j;
 	if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) {
 		palette_animation_counter = 0;
+	}
 	Colour *palette_pos = &_cur_palette.palette[PALETTE_ANIM_START];  // Points to where animations are taking place on the palette
 	/* Makes a copy of the current animation palette in old_val,
 	 * so the work on the current palette could be compared, see if there has been any changes */
 	memcpy(old_val, palette_pos, sizeof(old_val));
 	/* Fizzy Drink bubbles animation */
 	s = ev->fizzy_drink;
 	j = EXTR2(512, EPV_CYCLES_FIZZY_DRINK);
 	for (uint i = 0; i != EPV_CYCLES_FIZZY_DRINK; i++) {
 		*palette_pos++ = s[j];
 		j++;
 		if (j == EPV_CYCLES_FIZZY_DRINK) j = 0;
+	}
 	/* Oil refinery fire animation */
 	s = ev->oil_refinery;
 	j = EXTR2(512, EPV_CYCLES_OIL_REFINERY);
 	for (uint i = 0; i != EPV_CYCLES_OIL_REFINERY; i++) {
 		*palette_pos++ = s[j];
 		j++;
 		if (j == EPV_CYCLES_OIL_REFINERY) j = 0;
+	}
 	/* Radio tower blinking */
+	{
 		byte i = (palette_animation_counter >> 1) & 0x7F;
 		byte v;
 		if (i < 0x3f) {
 			v = 255;
 		} else if (i < 0x4A || i >= 0x75) {
 			v = 128;
 		} else {
 			v = 20;
+		}
 		palette_pos->r = v;
 		palette_pos->g = 0;
 		palette_pos->b = 0;
 		palette_pos++;
 		i ^= 0x40;
 		if (i < 0x3f) {
 			v = 255;
 		} else if (i < 0x4A || i >= 0x75) {
 			v = 128;
 		} else {
 			v = 20;
+		}
 		palette_pos->r = v;
 		palette_pos->g = 0;
 		palette_pos->b = 0;
 		palette_pos++;
+	}
 	/* Handle lighthouse and stadium animation */
 	s = ev->lighthouse;
 	j = EXTR(256, EPV_CYCLES_LIGHTHOUSE);
 	for (uint i = 0; i != EPV_CYCLES_LIGHTHOUSE; i++) {
 		*palette_pos++ = s[j];
 		j++;
 		if (j == EPV_CYCLES_LIGHTHOUSE) j = 0;
+	}
 	/* Dark blue water */
 	s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->dark_water_toyland : ev->dark_water;
 	j = EXTR(320, EPV_CYCLES_DARK_WATER);
 	for (uint i = 0; i != EPV_CYCLES_DARK_WATER; i++) {
 		*palette_pos++ = s[j];
 		j++;
 		if (j == EPV_CYCLES_DARK_WATER) j = 0;
+	}
 	/* Glittery water */
 	s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->glitter_water_toyland : ev->glitter_water;
 	j = EXTR(128, EPV_CYCLES_GLITTER_WATER);
 	for (uint i = 0; i != EPV_CYCLES_GLITTER_WATER / 3; i++) {
 		*palette_pos++ = s[j];
 		j += 3;
 		if (j >= EPV_CYCLES_GLITTER_WATER) j -= EPV_CYCLES_GLITTER_WATER;
+	}
 	if (blitter != nullptr && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) {
 		palette_animation_counter = old_tc;
 	} else if (_cur_palette.count_dirty == 0 && memcmp(old_val, &_cur_palette.palette[PALETTE_ANIM_START], sizeof(old_val)) != 0) {
 		/* Did we changed anything on the palette? Seems so.  Mark it as dirty */
 		_cur_palette.first_dirty = PALETTE_ANIM_START;
 		_cur_palette.count_dirty = PALETTE_ANIM_SIZE;
+	}
+}
 /**
  * Determine a contrasty text colour for a coloured background.
  * @param background Background colour.
  * @param threshold Background colour brightness threshold below which the background is considered dark and TC_WHITE is returned, range: 0 - 255, default 128.
  * @return TC_BLACK or TC_WHITE depending on what gives a better contrast.
  */
 TextColour GetContrastColour(uint8_t background, uint8_t threshold)
+{
 	Colour c = _cur_palette.palette[background];
 	/* Compute brightness according to http://www.w3.org/TR/AERT#color-contrast.
 	 * The following formula computes 1000 * brightness^2, with brightness being in range 0 to 255. */
 	uint sq1000_brightness = c.r * c.r * 299 + c.g * c.g * 587 + c.b * c.b * 114;
 	/* Compare with threshold brightness which defaults to 128 (50%) */
 	return sq1000_brightness < ((uint) threshold) * ((uint) threshold) * 1000 ? TC_WHITE : TC_BLACK;
+}

src/palette_func.h

➞

Show inline comments

@@ new file 100644 @@
 /*
  * 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 palette_func.h Functions related to palettes. */
 #ifndef PALETTE_FUNC_H
 #define PALETTE_FUNC_H
 #include "gfx_type.h"
 #include "strings_type.h"
 #include "string_type.h"
 extern Palette _cur_palette; ///< Current palette
 bool CopyPalette(Palette &local_palette, bool force_copy = false);
 void GfxInitPalettes();
 /**
  * Checks if a Colours value is valid.
+ *
  * @param colours The value to check
  * @return true if the given value is a valid Colours.
  */
 static inline bool IsValidColours(Colours colours)
+{
 	return colours < COLOUR_END;
+}
 TextColour GetContrastColour(uint8_t background, uint8_t threshold = 128);
 /**
  * All 16 colour gradients
  * 8 colours per gradient from darkest (0) to lightest (7)
  */
 extern byte _colour_gradient[COLOUR_END][8];
 /**
  * Return the colour for a particular greyscale level.
  * @param level Intensity, 0 = black, 15 = white
  * @return colour
  */
 #define GREY_SCALE(level) (level)
 static const uint8_t PC_BLACK              = GREY_SCALE(1);  ///< Black palette colour.
 static const uint8_t PC_DARK_GREY          = GREY_SCALE(6);  ///< Dark grey palette colour.
 static const uint8_t PC_GREY               = GREY_SCALE(10); ///< Grey palette colour.
 static const uint8_t PC_WHITE              = GREY_SCALE(15); ///< White palette colour.
 static const uint8_t PC_VERY_DARK_RED      = 0xB2;           ///< Almost-black red palette colour.
 static const uint8_t PC_DARK_RED           = 0xB4;           ///< Dark red palette colour.
 static const uint8_t PC_RED                = 0xB8;           ///< Red palette colour.
 static const uint8_t PC_VERY_DARK_BROWN    = 0x56;           ///< Almost-black brown palette colour.
 static const uint8_t PC_ORANGE             = 0xC2;           ///< Orange palette colour.
 static const uint8_t PC_YELLOW             = 0xBF;           ///< Yellow palette colour.
 static const uint8_t PC_LIGHT_YELLOW       = 0x44;           ///< Light yellow palette colour.
 static const uint8_t PC_VERY_LIGHT_YELLOW  = 0x45;           ///< Almost-white yellow palette colour.
 static const uint8_t PC_GREEN              = 0xD0;           ///< Green palette colour.
 static const uint8_t PC_VERY_DARK_BLUE     = 0x9A;           ///< Almost-black blue palette colour.
 static const uint8_t PC_DARK_BLUE          = 0x9D;           ///< Dark blue palette colour.
 static const uint8_t PC_LIGHT_BLUE         = 0x98;           ///< Light blue palette colour.
 static const uint8_t PC_ROUGH_LAND         = 0x52;           ///< Dark green palette colour for rough land.
 static const uint8_t PC_GRASS_LAND         = 0x54;           ///< Dark green palette colour for grass land.
 static const uint8_t PC_BARE_LAND          = 0x37;           ///< Brown palette colour for bare land.
 static const uint8_t PC_RAINFOREST         = 0x5C;           ///< Pale green palette colour for rainforest.
 static const uint8_t PC_FIELDS             = 0x25;           ///< Light brown palette colour for fields.
 static const uint8_t PC_TREES              = 0x57;           ///< Green palette colour for trees.
 static const uint8_t PC_WATER              = 0xC9;           ///< Dark blue palette colour for water.
 #endif /* PALETTE_FUNC_H */

src/widgets/dropdown_type.h

➞

Show inline comments

@@ @@ -13,6 +13,7 @@ @@
 #include "../window_type.h"
 #include "../gfx_func.h"
 #include "../gfx_type.h"
 #include "../palette_func.h"
 #include "../string_func.h"
 #include "../strings_func.h"
 #include "../table/strings.h"

src/widgets/slider.cpp

➞

Show inline comments

@@ @@ -8,6 +8,7 @@ @@
 /** @file slider.cpp Implementation of the horizontal slider widget. */
 #include "../stdafx.h"
 #include "../palette_func.h"
 #include "../window_gui.h"
 #include "../window_func.h"
 #include "../strings_func.h"

0 comments (0 inline, 0 general)