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

Integrate ColourMapA and B

This commit is contained in:
Michał Janiszewski 2016-09-12 17:59:58 +02:00 committed by Ted John
parent f32bab35fa
commit c5cdfb924d
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interface/colour.c
View File

@ -16,10 +16,9 @@
#include "../drawing/drawing.h"
#include "colour.h"
#include "../addresses.h"
rct_colour_map_a *ColourMapA = RCT2_ADDRESS(0x0141FC44, rct_colour_map_a);
rct_colour_map_b *ColourMapB = RCT2_ADDRESS(0x0141FD44, rct_colour_map_b);
rct_colour_map_a ColourMapA[32] = { 0 };
rct_colour_map_b ColourMapB[32] = { 0 };
void colours_init_maps()
{

10
src/interface/colour.h
View File

@ -73,8 +73,6 @@ enum {
#define NUM_COLOURS 32
#pragma pack(push, 1)
typedef struct rct_colour_map_a {
uint8 darkest;
uint8 darker;
@ -85,7 +83,6 @@ typedef struct rct_colour_map_a {
uint8 lighter;
uint8 lightest;
} rct_colour_map_a;
assert_struct_size(rct_colour_map_a, 8);
typedef struct rct_colour_map_b {
uint8 a;
@ -97,12 +94,9 @@ typedef struct rct_colour_map_b {
uint8 g;
uint8 h;
} rct_colour_map_b;
assert_struct_size(rct_colour_map_b, 8);
#pragma pack(pop)
extern rct_colour_map_a *ColourMapA;
extern rct_colour_map_b *ColourMapB;
extern rct_colour_map_a ColourMapA[32];
extern rct_colour_map_b ColourMapB[32];
void colours_init_maps();