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

integrate variables for various drawing pointers

Browse Source
This commit is contained in:
Ted John
2016-04-24 12:31:13 +01:00
committed by Michał Janiszewski
parent a5c119ba60
commit ad1b9265dc
34 changed files with 110 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/interface/viewport.c
View File

@@ -41,6 +41,11 @@
rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT];
#if NO_RCT2
paint_struct *unk_EE7884;
paint_struct *unk_EE7888;
#endif
/**
* This is not a viewport function. It is used to setup many variables for
* multiple things.
@@ -741,7 +746,7 @@ void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, in
gfx_clear(dpi2, colour);
}
RCT2_GLOBAL(0xEE7880, uint32) = 0xF1A4CC;
RCT2_GLOBAL(0x140E9A8, uint32) = (int)dpi2;
unk_140E9A8 = dpi2;
painter_setup();
viewport_paint_setup();
sub_688217();
@@ -1019,7 +1024,7 @@ static bool sub_679236_679662_679B0D_679FF1(uint32 ebx, rct_g1_element *image, u
}
if (ebx & 0x20000000) {
uint8 *ebx_palette = RCT2_GLOBAL(0x009ABDA4, uint8*);
uint8 *ebx_palette = unk_9ABDA4;
uint8 al = *esi;
uint8 al2 = *(al + ebx_palette);
@@ -1288,7 +1293,7 @@ void sub_679023(rct_drawpixelinfo *dpi, int imageId, int x, int y)
index &= 0x1F;
}
int g1Index = RCT2_ADDRESS(0x0097FCBC, uint32)[index];
RCT2_GLOBAL(0x009ABDA4, uint8*) = g1Elements[g1Index].offset;
unk_9ABDA4 = g1Elements[g1Index].offset;
} else {
RCT2_GLOBAL(0x00EDF81C, uint32) = 0;
}
@@ -1301,8 +1306,8 @@ void sub_679023(rct_drawpixelinfo *dpi, int imageId, int x, int y)
*/
void sub_68862C()
{
rct_drawpixelinfo *dpi = RCT2_GLOBAL(0x0140E9A8, rct_drawpixelinfo*);
paint_struct *ps = RCT2_GLOBAL(0x00EE7884, paint_struct*), *old_ps, *next_ps;
rct_drawpixelinfo *dpi = unk_140E9A8;
paint_struct *ps = unk_EE7884, *old_ps, *next_ps;
while ((ps = ps->next_quadrant_ps) != NULL) {
old_ps = ps;
@@ -1372,7 +1377,7 @@ void get_map_coordinates_from_pos(int screenX, int screenY, int flags, sint16 *x
dpi->x = RCT2_GLOBAL(RCT2_ADDRESS_VIEWPORT_PAINT_X, int16_t);
dpi->width = 1;
RCT2_GLOBAL(0xEE7880, uint32_t) = 0xF1A4CC;
RCT2_GLOBAL(0x140E9A8, rct_drawpixelinfo*) = dpi;
unk_140E9A8 = dpi;
painter_setup();
viewport_paint_setup();
sub_688217();

8
src/interface/viewport.h
View File

@@ -19,6 +19,7 @@
#include "../world/map.h"
#include "../world/sprite.h"
#include "../paint/paint.h"
#include "window.h"
enum {
@@ -95,6 +96,13 @@ typedef struct viewport_interaction_info {
// rct2: 0x014234BC
extern rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT];
#if NO_RCT2
extern paint_struct *unk_EE7884;
extern paint_struct *unk_EE7888;
#else
#define unk_EE7884 RCT2_GLOBAL(0x00EE7884, paint_struct*)
#define unk_EE7888 RCT2_GLOBAL(0x00EE7888, paint_struct*)
#endif
void viewport_init_all();
void center_2d_coordinates(int x, int y, int z, int* out_x, int* out_y, rct_viewport* viewport);