From ebe4ca4df453a00da2fde25baefbfa14a14770b4 Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 24 Oct 2016 13:06:44 +0100 Subject: [PATCH] Rename lightfx guard --- src/common.h | 2 -- src/drawing/engines/SoftwareDrawingEngine.cpp | 10 +++++----- src/drawing/lightfx.c | 4 ++-- src/drawing/lightfx.h | 4 ++-- src/paint/map_element/entrance.c | 4 ++-- src/paint/map_element/path.c | 2 +- src/paint/sprite/peep.c | 2 +- src/platform/shared.c | 2 +- src/rct2.c | 4 ++-- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/common.h b/src/common.h index 904e97d1a0..7de291a628 100644 --- a/src/common.h +++ b/src/common.h @@ -144,6 +144,4 @@ assert_struct_size(registers, 7 * 4); #define UNUSED(x) ((void)(x)) -// #define STOUT_EXPANDED_RENDERING_LIGHT - #endif diff --git a/src/drawing/engines/SoftwareDrawingEngine.cpp b/src/drawing/engines/SoftwareDrawingEngine.cpp index 158de95221..a595557497 100644 --- a/src/drawing/engines/SoftwareDrawingEngine.cpp +++ b/src/drawing/engines/SoftwareDrawingEngine.cpp @@ -195,7 +195,7 @@ private: SDL_Texture * _screenTexture = nullptr; SDL_PixelFormat * _screenTextureFormat = nullptr; uint32 _paletteHWMapped[256] = { 0 }; -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ uint32 _lightPaletteHWMapped[256] = { 0 }; #endif @@ -310,13 +310,13 @@ public: { if (_screenTextureFormat != nullptr) { -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ const SDL_Color * lightPalette = lightfx_get_palette(); #endif for (int i = 0; i < 256; i++) { _paletteHWMapped[i] = SDL_MapRGB(_screenTextureFormat, palette[i].r, palette[i].g, palette[i].b); -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ _lightPaletteHWMapped[i] = SDL_MapRGBA(_screenTextureFormat, lightPalette[i].r, lightPalette[i].g, lightPalette[i].b, lightPalette[i].a); #endif } @@ -533,7 +533,7 @@ private: ConfigureDirtyGrid(); -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ lightfx_update_buffers(dpi); #endif } @@ -695,7 +695,7 @@ private: void DisplayViaTexture() { -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ lightfx_render_to_texture(_screenTexture, _bits, _width, _height, _paletteHWMapped, _lightPaletteHWMapped); #else CopyBitsToTexture(_screenTexture, _bits, (sint32)_width, (sint32)_height, _paletteHWMapped); diff --git a/src/drawing/lightfx.c b/src/drawing/lightfx.c index 9c99489705..53840b3915 100644 --- a/src/drawing/lightfx.c +++ b/src/drawing/lightfx.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ #include "../common.h" #include @@ -1026,4 +1026,4 @@ void lightfx_render_to_texture( } } -#endif // STOUT_EXPANDED_RENDERING_LIGHT +#endif // __ENABLE_LIGHTFX__ diff --git a/src/drawing/lightfx.h b/src/drawing/lightfx.h index a6c15e90f4..7706815718 100644 --- a/src/drawing/lightfx.h +++ b/src/drawing/lightfx.h @@ -17,7 +17,7 @@ #ifndef _LIGHTFX_H #define _LIGHTFX_H -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ #include "../common.h" #include "drawing.h" @@ -75,6 +75,6 @@ void lightfx_render_to_texture( uint32 * palette, uint32 * lightPalette); -#endif // STOUT_EXPANDED_RENDERING_LIGHT +#endif // __ENABLE_LIGHTFX__ #endif diff --git a/src/paint/map_element/entrance.c b/src/paint/map_element/entrance.c index 5535e2ab19..2f989d85a8 100644 --- a/src/paint/map_element/entrance.c +++ b/src/paint/map_element/entrance.c @@ -42,7 +42,7 @@ static void ride_entrance_exit_paint(uint8 direction, int height, rct_map_elemen return; } -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ if (!is_exit) { lightfx_add_3d_light_magic_from_drawing_tile(0, 0, height + 45, LIGHTFX_LIGHT_TYPE_LANTERN_3); @@ -189,7 +189,7 @@ static void park_entrance_paint(uint8 direction, int height, rct_map_element* ma if (gTrackDesignSaveMode) return; -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ lightfx_add_3d_light_magic_from_drawing_tile(0, 0, 155, LIGHTFX_LIGHT_TYPE_LANTERN_3); diff --git a/src/paint/map_element/path.c b/src/paint/map_element/path.c index 4ea2652067..801486cd26 100644 --- a/src/paint/map_element/path.c +++ b/src/paint/map_element/path.c @@ -764,7 +764,7 @@ void path_paint(uint8 direction, uint16 height, rct_map_element * map_element) loc_6A3B57(map_element, height, footpathEntry, word_F3F038, imageFlags, sceneryImageFlags); } -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ if (footpath_element_has_path_scenery(map_element) && !(map_element->flags & MAP_ELEMENT_FLAG_BROKEN)) { rct_scenery_entry *sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_LAMP) { diff --git a/src/paint/sprite/peep.c b/src/paint/sprite/peep.c index 5431045e1c..1b1a926dc6 100644 --- a/src/paint/sprite/peep.c +++ b/src/paint/sprite/peep.c @@ -27,7 +27,7 @@ */ void peep_paint(rct_peep * peep, int imageDirection) { -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ if (peep->type == PEEP_TYPE_STAFF){ sint16 peep_x, peep_y, peep_z; diff --git a/src/platform/shared.c b/src/platform/shared.c index fea87b087e..2e6d427310 100644 --- a/src/platform/shared.c +++ b/src/platform/shared.c @@ -259,7 +259,7 @@ void platform_update_palette(const uint8* colours, int start_index, int num_colo uint8 g = colours[1]; uint8 b = colours[0]; -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ lightfx_apply_palette_filter(i, &r, &g, &b); #else float night = gDayNightCycle; diff --git a/src/rct2.c b/src/rct2.c index 4f5bd145b8..70fcd61e74 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -51,7 +51,7 @@ #include "world/scenery.h" #include "world/sprite.h" -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ #include "drawing/lightfx.h" @@ -199,7 +199,7 @@ bool rct2_init() window_staff_list_init_vars(); -#ifdef STOUT_EXPANDED_RENDERING_LIGHT +#ifdef __ENABLE_LIGHTFX__ lightfx_init();