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

finish colour tab for ride window

Browse Source
This commit is contained in:
IntelOrca
2014-09-18 00:31:20 +01:00
parent 403d52b5e6
commit ccdc383a92
1 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/window_ride.c
View File

@@ -458,7 +458,6 @@ static void window_ride_colour_resize();
static void window_ride_colour_mousedown(int widgetIndex, rct_window *w, rct_widget *widget);
static void window_ride_colour_dropdown();
static void window_ride_colour_update(rct_window *w);
static void window_ride_colour_toolupdate();
static void window_ride_colour_tooldown();
static void window_ride_colour_tooldrag();
static void window_ride_colour_invalidate();
@@ -604,7 +603,7 @@ static void* window_ride_colour_events[] = {
window_ride_colour_update,
window_ride_emptysub,
window_ride_emptysub,
window_ride_colour_toolupdate,
window_ride_emptysub,
window_ride_colour_tooldown,
window_ride_colour_tooldrag,
window_ride_emptysub,
@@ -2684,6 +2683,42 @@ static int window_ride_has_track_colour(rct_ride *ride, int trackColour)
}
}
static void window_ride_set_track_colour_scheme(rct_window *w, int x, int y)
{
rct_map_element *mapElement;
uint8 newColourScheme;
newColourScheme = (uint8)(*((uint16*)&w->var_494));
// Get map coordinates from point
int eax, ebx, ecx, edx, esi, edi, ebp;
eax = x;
ebx = y;
edx = -5;
RCT2_CALLFUNC_X(0x00685ADC, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
x = eax & 0xFFFF;
y = ecx & 0xFFFF;
mapElement = (rct_map_element*)edx;
if ((ebx & 0xFF) != 3)
return;
if (mapElement->properties.track.ride_index != w->number)
return;
if ((mapElement->properties.track.colour & 3) == newColourScheme)
return;
RCT2_CALLPROC_X(
0x006C683D,
x,
((mapElement->type & 3) << 8) | mapElement->properties.track.type,
y,
mapElement->base_height << 3,
newColourScheme,
0,
4
);
}
/**
*
* rct2: 0x006B04FA
@@ -2956,23 +2991,35 @@ static void window_ride_colour_update(rct_window *w)
widget_invalidate(WC_RIDE, w->number, WIDX_VEHICLE_PREVIEW);
}
/**
*
* rct2: 0x006B04E5
*/
static void window_ride_colour_toolupdate() { }
/**
*
* rct2: 0x006B04EC
*/
static void window_ride_colour_tooldown() { }
static void window_ride_colour_tooldown()
{
rct_window *w;
short widgetIndex, x, y;
window_tool_get_registers(w, widgetIndex, x, y);
if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
window_ride_set_track_colour_scheme(w, x, y);
}
/**
*
* rct2: 0x006B04F3
*/
static void window_ride_colour_tooldrag() { }
static void window_ride_colour_tooldrag()
{
rct_window *w;
short widgetIndex, x, y;
window_tool_get_registers(w, widgetIndex, x, y);
if (widgetIndex == WIDX_PAINT_INDIVIDUAL_AREA)
window_ride_set_track_colour_scheme(w, x, y);
}
/**
*