mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor code cleanup

This commit is contained in:
duncanspumpkin 2019-12-01 14:53:52 +00:00
parent 813ed4fdac
commit ef10cb243b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/drawing/LightFX.cpp
View File

@ -16,22 +16,19 @@
# include "../config/Config.h" # include "../config/Config.h"
# include "../interface/Viewport.h" # include "../interface/Viewport.h"
# include "../interface/Window.h" # include "../interface/Window.h"
# include "../interface/Window_internal.h"
# include "../paint/Paint.h"
# include "../ride/Ride.h" # include "../ride/Ride.h"
# include "../util/Util.h" # include "../util/Util.h"
# include "../world/Climate.h" # include "../world/Climate.h"
# include "../world/Map.h" # include "../world/Map.h"
# include "../world/Sprite.h" # include "../world/Sprite.h"
# include "Drawing.h" # include "Drawing.h"
#include "../paint/Paint.h"
#include "../interface/Window_internal.h"
# include <algorithm> # include <algorithm>
# include <cmath> # include <cmath>
# include <cstring> # include <cstring>
struct InteractionInfo;
InteractionInfo set_interaction_info_from_paint_session(paint_session* session, uint16_t filter);
static uint8_t _bakedLightTexture_lantern_0[32 * 32]; static uint8_t _bakedLightTexture_lantern_0[32 * 32];
static uint8_t _bakedLightTexture_lantern_1[64 * 64]; static uint8_t _bakedLightTexture_lantern_1[64 * 64];
static uint8_t _bakedLightTexture_lantern_2[128 * 128]; static uint8_t _bakedLightTexture_lantern_2[128 * 128];
@ -272,6 +269,7 @@ void lightfx_prepare_light_list()
}; };
// clang-format on // clang-format on
// Light occlusion code
if (true) if (true)
{ {
int32_t totalSamplePoints = 5; int32_t totalSamplePoints = 5;

1
src/openrct2/interface/Viewport.h
View File

@ -168,6 +168,7 @@ void get_map_coordinates_from_pos_window(
rct_window* window, ScreenCoordsXY screenCoords, int32_t flags, CoordsXY& mapCoords, int32_t* interactionType, rct_window* window, ScreenCoordsXY screenCoords, int32_t flags, CoordsXY& mapCoords, int32_t* interactionType,
TileElement** tileElement, rct_viewport** viewport); TileElement** tileElement, rct_viewport** viewport);
InteractionInfo set_interaction_info_from_paint_session(paint_session* session, uint16_t filter);
int32_t viewport_interaction_get_item_left(ScreenCoordsXY screenCoords, viewport_interaction_info* info); int32_t viewport_interaction_get_item_left(ScreenCoordsXY screenCoords, viewport_interaction_info* info);
int32_t viewport_interaction_left_over(ScreenCoordsXY screenCoords); int32_t viewport_interaction_left_over(ScreenCoordsXY screenCoords);
int32_t viewport_interaction_left_click(ScreenCoordsXY screenCoords); int32_t viewport_interaction_left_click(ScreenCoordsXY screenCoords);