mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Integrate WeatherColours

Browse Source
This commit is contained in:
Marijn van der Werf
2016-08-09 23:40:21 +02:00
parent 7f71bece5c
commit 0ae97d5f4c
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game.c
View File

@@ -178,7 +178,8 @@ void update_palette_effects()
// animate the water/lava/chain movement palette
int q = 0;
int weather_colour = RCT2_ADDRESS(0x98195C, uint32)[gClimateCurrentWeatherGloom];
extern const sint32 WeatherColours[4];
int weather_colour = WeatherColours[gClimateCurrentWeatherGloom];
if (weather_colour != -1) {
q = 1;
if (weather_colour != 0x2000031) {

10
src/interface/viewport.c
View File

@@ -663,6 +663,14 @@ void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, int left, i
#endif
}
/** rct2: 0x0098195C */
const sint32 WeatherColours[] = {
-1,
0x2000000 | 49,
0x2000000 | 50,
0x2000000 | 47,
};
/**
*
* rct2: 0x00685CBF
@@ -754,7 +762,7 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
sub_688217();
paint_quadrant_ps();
int weather_colour = RCT2_ADDRESS(0x98195C, uint32)[gClimateCurrentWeatherGloom];
int weather_colour = WeatherColours[gClimateCurrentWeatherGloom];
if ((weather_colour != -1) && (!(gCurrentViewportFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES)) && (!(RCT2_GLOBAL(0x9DEA6F, uint8) & 1))){
gfx_fill_rect(dpi2, dpi2->x, dpi2->y, dpi2->width + dpi2->x - 1, dpi2->height + dpi2->y - 1, weather_colour);
}