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

declaring local variables where needed instead of at the top (#3599)

Browse Source
This commit is contained in:
Hielke Morsink
2016-05-15 11:25:24 +02:00
committed by Ted John
parent 800dc83951
commit 8c1395bd46
11 changed files with 402 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmdline/CommandLine.cpp
View File

@@ -130,8 +130,7 @@ namespace CommandLine
if (allCommands)
{
const CommandLineCommand * command;
for (command = RootCommands; command->Name != nullptr; command++)
for (const CommandLineCommand *command = RootCommands; command->Name != nullptr; command++)
{
if (command->SubCommands != nullptr)
{
@@ -159,8 +158,6 @@ namespace CommandLine
static void PrintHelpFor(const CommandLineCommand * commands)
{
const CommandLineCommand * command;
// Print usage
const char * usageString = "usage: openrct2 ";
const size_t usageStringLength = String::LengthOf(usageString);
@@ -169,6 +166,7 @@ namespace CommandLine
// Get the largest command name length and parameter length
size_t maxNameLength = 0;
size_t maxParamsLength = 0;
const CommandLineCommand * command;
for (command = commands; command->Name != nullptr; command++)
{
maxNameLength = Math::Max(maxNameLength, String::LengthOf(command->Name));

14
src/drawing/drawing.c
View File

@@ -124,14 +124,11 @@ static void gfx_draw_dirty_blocks(int x, int y, int columns, int rows);
*/
void gfx_clear(rct_drawpixelinfo *dpi, int colour)
{
int y, w, h;
uint8* ptr;
int w = dpi->width >> dpi->zoom_level;
int h = dpi->height >> dpi->zoom_level;
uint8* ptr = dpi->bits;
w = dpi->width >> dpi->zoom_level;
h = dpi->height >> dpi->zoom_level;
ptr = dpi->bits;
for (y = 0; y < h; y++) {
for (int y = 0; y < h; y++) {
memset(ptr, colour, w);
ptr += w + dpi->pitch;
}
@@ -338,7 +335,6 @@ static void gfx_draw_dirty_blocks(int x, int y, int columns, int rows)
*/
void gfx_redraw_screen_rect(short left, short top, short right, short bottom)
{
rct_window* w;
rct_drawpixelinfo *screenDPI = &gScreenDPI;
rct_drawpixelinfo *windowDPI = &gWindowDPI;
@@ -349,7 +345,7 @@ void gfx_redraw_screen_rect(short left, short top, short right, short bottom)
windowDPI->height = bottom - top;
windowDPI->pitch = screenDPI->width + screenDPI->pitch + left - right;
for (w = g_window_list; w < gWindowNextSlot; w++) {
for (rct_window *w = g_window_list; w < gWindowNextSlot; w++) {
if (w->flags & WF_TRANSPARENT)
continue;
if (right <= w->x || bottom <= w->y)

3
src/drawing/line.c
View File

@@ -49,9 +49,8 @@ void gfx_draw_line_on_buffer(rct_drawpixelinfo *dpi, char colour, int y, int x,
if (no_pixels <= 0)return;
}
uint8* bits_pointer;
//Get the buffer we are drawing to and move to the first coordinate.
bits_pointer = dpi->bits + y*(dpi->pitch + dpi->width) + x;
uint8* bits_pointer = dpi->bits + y*(dpi->pitch + dpi->width) + x;
//Draw the line to the specified colour
for (; no_pixels > 0; --no_pixels, ++bits_pointer){

18
src/drawing/rect.c
View File

@@ -32,13 +32,11 @@
*/
void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bottom, int colour)
{
int left_, right_, top_, bottom_;
rct_drawpixelinfo* dpi_;
left_ = left;
right_ = right;
top_ = top;
bottom_ = bottom;
dpi_ = dpi;
int left_ = left;
int right_ = right;
int top_ = top;
int bottom_ = bottom;
rct_drawpixelinfo *dpi_ = dpi;
if ((left > right) || (top > bottom) || (dpi->x > right) || (left >= (dpi->x + dpi->width)) ||
(bottom < dpi->y) || (top >= (dpi->y + dpi->height)))
@@ -123,8 +121,7 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
if (colour & 0x4000000){
//0x4000000
// 00678B8A 00678E38
uint8* dest_pointer;
dest_pointer = start_y * (dpi->width + dpi->pitch) + start_x + dpi->bits;
uint8* dest_pointer = start_y * (dpi->width + dpi->pitch) + start_x + dpi->bits;
//The pattern loops every 15 lines this is which
//part the pattern is on.
@@ -135,8 +132,7 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
int start_pattern_x = (start_x + dpi_->x) % 16;
int pattern_x = start_pattern_x;
uint16* pattern_pointer;
pattern_pointer = RCT2_ADDRESS(0x0097FEFC,uint16*)[colour >> 28]; // or possibly uint8)[esi*4] ?
uint16* pattern_pointer = RCT2_ADDRESS(0x0097FEFC,uint16*)[colour >> 28]; // or possibly uint8)[esi*4] ?
for (int no_lines = height; no_lines > 0; no_lines--) {
uint8* next_dest_pointer = dest_pointer + dpi->width + dpi->pitch;

26
src/drawing/string.c
View File

@@ -245,9 +245,7 @@ int gfx_wrap_string(utf8 *text, int width, int *outNumLines, int *outFontHeight)
*/
void gfx_draw_string_left_clipped(rct_drawpixelinfo* dpi, int format, void* args, int colour, int x, int y, int width)
{
char* buffer;
buffer = RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char);
char* buffer = RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char);
format_string(buffer, format, args);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
@@ -272,16 +270,13 @@ void gfx_draw_string_left_clipped(rct_drawpixelinfo* dpi, int format, void* args
*/
void gfx_draw_string_centred_clipped(rct_drawpixelinfo *dpi, int format, void *args, int colour, int x, int y, int width)
{
char* buffer;
int text_width;
buffer = RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char);
char* buffer = RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char);
format_string(buffer, format, args);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
// Clip text
text_width = gfx_clip_string(buffer, width);
int text_width = gfx_clip_string(buffer, width);
// Draw the text centred
if (text_width <= 0xFFFF && text_width >= 0) {
@@ -304,14 +299,11 @@ void gfx_draw_string_centred_clipped(rct_drawpixelinfo *dpi, int format, void *a
*/
void gfx_draw_string_right(rct_drawpixelinfo* dpi, int format, void* args, int colour, int x, int y)
{
char* buffer;
short text_width;
buffer = RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char);
char* buffer = RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char);
format_string(buffer, format, args);
// Measure text width
text_width = gfx_get_string_width(buffer);
short text_width = gfx_get_string_width(buffer);
// Draw the text right aligned
x -= text_width;
@@ -433,9 +425,7 @@ int gfx_draw_string_left_wrapped(rct_drawpixelinfo *dpi, void *args, int x, int
*/
void gfx_draw_string_left(rct_drawpixelinfo *dpi, int format, void *args, int colour, int x, int y)
{
char* buffer;
buffer = RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char);
char* buffer = RCT2_ADDRESS(RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER, char);
format_string(buffer, format, args);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
gfx_draw_string(dpi, buffer, colour, x, y);
@@ -446,10 +436,8 @@ void gfx_draw_string_left(rct_drawpixelinfo *dpi, int format, void *args, int co
*/
void gfx_draw_string_left_centred(rct_drawpixelinfo *dpi, rct_string_id format, void *args, int colour, int x, int y)
{
char* buffer;
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
buffer = (char*)RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER;
char *buffer = (char*)RCT2_ADDRESS_COMMON_STRING_FORMAT_BUFFER;
format_string(buffer, format, args);
int height = string_get_height_raw(buffer);
gfx_draw_string(dpi, buffer, colour, x, y - (height / 2));

44
src/interface/viewport.c
View File

@@ -875,10 +875,9 @@ rct_xy16 viewport_coord_to_map_coord(int x, int y, int z)
*/
void show_gridlines()
{
rct_window *mainWindow;
if (RCT2_GLOBAL(0x009E32B0, uint8) == 0) {
if ((mainWindow = window_get_main()) != NULL) {
rct_window *mainWindow = window_get_main();
if (mainWindow != NULL) {
if (!(mainWindow->viewport->flags & VIEWPORT_FLAG_GRIDLINES)) {
mainWindow->viewport->flags |= VIEWPORT_FLAG_GRIDLINES;
window_invalidate(mainWindow);
@@ -894,11 +893,10 @@ void show_gridlines()
*/
void hide_gridlines()
{
rct_window *mainWindow;
RCT2_GLOBAL(0x009E32B0, uint8)--;
if (RCT2_GLOBAL(0x009E32B0, uint8) == 0) {
if ((mainWindow = window_get_main()) != NULL) {
rct_window *mainWindow = window_get_main();
if (mainWindow != NULL) {
if (!gConfigGeneral.always_show_gridlines) {
mainWindow->viewport->flags &= ~VIEWPORT_FLAG_GRIDLINES;
window_invalidate(mainWindow);
@@ -913,10 +911,9 @@ void hide_gridlines()
*/
void show_land_rights()
{
rct_window *mainWindow;
if (RCT2_GLOBAL(0x009E32B2, uint8) == 0) {
if ((mainWindow = window_get_main()) != NULL) {
rct_window *mainWindow = window_get_main();
if (mainWindow != NULL) {
if (!(mainWindow->viewport->flags & VIEWPORT_FLAG_LAND_OWNERSHIP)) {
mainWindow->viewport->flags |= VIEWPORT_FLAG_LAND_OWNERSHIP;
window_invalidate(mainWindow);
@@ -932,11 +929,10 @@ void show_land_rights()
*/
void hide_land_rights()
{
rct_window *mainWindow;
RCT2_GLOBAL(0x009E32B2, uint8)--;
if (RCT2_GLOBAL(0x009E32B2, uint8) == 0) {
if ((mainWindow = window_get_main()) != NULL) {
rct_window *mainWindow = window_get_main();
if (mainWindow != NULL) {
if (mainWindow->viewport->flags & VIEWPORT_FLAG_LAND_OWNERSHIP) {
mainWindow->viewport->flags &= ~VIEWPORT_FLAG_LAND_OWNERSHIP;
window_invalidate(mainWindow);
@@ -951,10 +947,9 @@ void hide_land_rights()
*/
void show_construction_rights()
{
rct_window *mainWindow;
if (RCT2_GLOBAL(0x009E32B3, uint8) == 0) {
if ((mainWindow = window_get_main()) != NULL) {
rct_window *mainWindow = window_get_main();
if (mainWindow != NULL) {
if (!(mainWindow->viewport->flags & VIEWPORT_FLAG_CONSTRUCTION_RIGHTS)) {
mainWindow->viewport->flags |= VIEWPORT_FLAG_CONSTRUCTION_RIGHTS;
window_invalidate(mainWindow);
@@ -970,11 +965,10 @@ void show_construction_rights()
*/
void hide_construction_rights()
{
rct_window *mainWindow;
RCT2_GLOBAL(0x009E32B3, uint8)--;
if (RCT2_GLOBAL(0x009E32B3, uint8) == 0) {
if ((mainWindow = window_get_main()) != NULL) {
rct_window *mainWindow = window_get_main();
if (mainWindow != NULL) {
if (mainWindow->viewport->flags & VIEWPORT_FLAG_CONSTRUCTION_RIGHTS) {
mainWindow->viewport->flags &= ~VIEWPORT_FLAG_CONSTRUCTION_RIGHTS;
window_invalidate(mainWindow);
@@ -1371,7 +1365,6 @@ void sub_68862C()
{
rct_drawpixelinfo *dpi = RCT2_GLOBAL(0x0140E9A8, rct_drawpixelinfo*);
paint_struct *ps = RCT2_GLOBAL(0x00EE7884, paint_struct*), *old_ps, *next_ps;
attached_paint_struct* attached_ps;
while ((ps = ps->next_quadrant_ps) != NULL) {
old_ps = ps;
@@ -1385,7 +1378,7 @@ void sub_68862C()
next_ps = ps->var_20;
}
for (attached_ps = ps->attached_ps; attached_ps != NULL; attached_ps = attached_ps->next) {
for (attached_paint_struct *attached_ps = ps->attached_ps; attached_ps != NULL; attached_ps = attached_ps->next) {
sub_679023(
dpi,
attached_ps->image_id,
@@ -1489,14 +1482,11 @@ void viewport_invalidate(rct_viewport *viewport, int left, int top, int right, i
rct_viewport *viewport_find_from_point(int screenX, int screenY)
{
rct_window *w;
rct_viewport *viewport;
w = window_find_from_point(screenX, screenY);
rct_window *w = window_find_from_point(screenX, screenY);
if (w == NULL)
return NULL;
viewport = w->viewport;
rct_viewport *viewport = w->viewport;
if (viewport == NULL)
return NULL;
@@ -1522,7 +1512,7 @@ rct_viewport *viewport_find_from_point(int screenX, int screenY)
*/
void screen_get_map_xy(int screenX, int screenY, sint16 *x, sint16 *y, rct_viewport **viewport) {
sint16 my_x, my_y;
int z, interactionType;
int interactionType;
rct_viewport *myViewport;
get_map_coordinates_from_pos(screenX, screenY, VIEWPORT_INTERACTION_MASK_TERRAIN, &my_x, &my_y, &interactionType, NULL, &myViewport);
if (interactionType == VIEWPORT_INTERACTION_ITEM_NONE) {
@@ -1539,7 +1529,7 @@ void screen_get_map_xy(int screenX, int screenY, sint16 *x, sint16 *y, rct_viewp
rct_xy16 map_pos = { my_x + 16, my_y + 16 };
for (int i = 0; i < 5; i++) {
z = map_element_height(map_pos.x, map_pos.y);
int z = map_element_height(map_pos.x, map_pos.y);
map_pos = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z);
map_pos.x = clamp(RCT2_GLOBAL(0x00F1AD34, sint16), map_pos.x, RCT2_GLOBAL(0x00F1AD38, sint16));
map_pos.y = clamp(RCT2_GLOBAL(0x00F1AD36, sint16), map_pos.y, RCT2_GLOBAL(0x00F1AD3A, sint16));

8
src/interface/viewport_interaction.c
View File

@@ -477,9 +477,7 @@ void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int
*/
static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, int x, int y)
{
rct_scenery_entry* sceneryEntry;
sceneryEntry = g_wallSceneryEntries[mapElement->properties.fence.type];
rct_scenery_entry* sceneryEntry = g_wallSceneryEntries[mapElement->properties.fence.type];
if (sceneryEntry->wall.var_0D != 0xFF){
window_sign_small_open(mapElement->properties.fence.item[0]);
} else {
@@ -502,9 +500,7 @@ static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, i
*/
static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, int x, int y)
{
rct_scenery_entry* sceneryEntry;
sceneryEntry = g_largeSceneryEntries[mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK];
rct_scenery_entry* sceneryEntry = g_largeSceneryEntries[mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK];
if (sceneryEntry->large_scenery.var_11 != 0xFF){
int id = (mapElement->type & 0xC0) |

334
src/interface/widget.c
View File

@@ -50,18 +50,14 @@ static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
*/
void widget_scroll_update_thumbs(rct_window *w, int widget_index)
{
rct_widget* widget;
rct_scroll* scroll;
int x, y, view_size;
widget = &w->widgets[widget_index];
scroll = &w->scrolls[window_get_scroll_data_index(w, widget_index)];
rct_widget *widget = &w->widgets[widget_index];
rct_scroll* scroll = &w->scrolls[window_get_scroll_data_index(w, widget_index)];
if (scroll->flags & HSCROLLBAR_VISIBLE) {
view_size = widget->right - widget->left - 21;
int view_size = widget->right - widget->left - 21;
if (scroll->flags & VSCROLLBAR_VISIBLE)
view_size -= 11;
x = scroll->h_left * view_size;
int x = scroll->h_left * view_size;
if (scroll->h_right != 0)
x /= scroll->h_right;
scroll->h_thumb_left = x + 11;
@@ -78,10 +74,10 @@ void widget_scroll_update_thumbs(rct_window *w, int widget_index)
}
if (scroll->flags & VSCROLLBAR_VISIBLE) {
view_size = widget->bottom - widget->top - 21;
int view_size = widget->bottom - widget->top - 21;
if (scroll->flags & HSCROLLBAR_VISIBLE)
view_size -= 11;
y = scroll->v_top * view_size;
int y = scroll->v_top * view_size;
if (scroll->v_bottom != 0)
y /= scroll->v_bottom;
scroll->v_thumb_top = y + 11;
@@ -172,24 +168,20 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
*/
static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b, press;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
//
press = (w->flags & WF_10 ? 0x80 : 0);
int press = (w->flags & WF_10 ? 0x80 : 0);
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
// Draw the frame
gfx_fill_rect_inset(dpi, l, t, r, b, colour, press);
@@ -212,21 +204,17 @@ static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
*/
static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
// Draw the panel
gfx_fill_rect_inset(dpi, l, t, r, b, colour, 0);
@@ -249,24 +237,20 @@ static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget
*/
static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b, press;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Check if the button is pressed down
press = widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex) ? 0x20 : 0;
int press = widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex) ? 0x20 : 0;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
if (widget->image == -2) {
// Draw border with no fill
@@ -286,13 +270,8 @@ static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget
*/
static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b;
uint32 image;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
//
if (widget->image == -1)
@@ -313,14 +292,14 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetInd
}
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour and image
colour = w->colours[widget->colour] & 0x7F;
image = widget->image + 2;
uint8 colour = w->colours[widget->colour] & 0x7F;
uint32 image = widget->image + 2;
// Draw coloured image
gfx_draw_sprite(dpi, image | (colour << 19), l, t, 0);
@@ -332,26 +311,22 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetInd
*/
static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b;
uint8 colour;
if (!widget_is_disabled(w, widgetIndex) && widget_is_highlighted(w, widgetIndex)) {
widget_button_draw(dpi, w, widgetIndex);
return;
}
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
// Check if the button is pressed down
if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex)) {
@@ -375,24 +350,20 @@ static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int w
*/
static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b, press;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
// Border
press = widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex) ? 0x20 : 0;
int press = widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex) ? 0x20 : 0;
gfx_fill_rect_inset(dpi, l, t, r, b, colour, press);
// Text
@@ -405,25 +376,21 @@ static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widget
*/
static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b, stringId;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
// do not use widget colour as this is already used as background for the text_button
// colour = 2;
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
stringId = widget->image;
int stringId = widget->image;
if (stringId == -1)
return;
@@ -464,21 +431,17 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widge
*/
static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
if (widget->image == (uint32)-2 || widget->image == (uint32)-1)
return;
@@ -494,21 +457,17 @@ static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
*/
static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
gfx_fill_rect_inset(dpi, l, t, r, b, colour, 0x60);
widget_text(dpi, w, widgetIndex);
@@ -520,23 +479,19 @@ static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
*/
static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b, press;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left + 5;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left + 5;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
press = 0;
int press = 0;
if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex))
press |= 0x20;
@@ -553,23 +508,19 @@ static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIn
*/
static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b, textRight;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left + 5;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
textRight = l;
int l = w->x + widget->left + 5;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
int textRight = l;
// Text
if (widget->image != (uint32)-1) {
colour = w->colours[widget->colour] & 0x7F;
uint8 colour = w->colours[widget->colour] & 0x7F;
if (widget_is_disabled(w, widgetIndex))
colour |= 0x40;
gfx_draw_string_left(dpi, widget->image, (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS, colour, l, t);
@@ -584,7 +535,7 @@ static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour] & 0x7F;
uint8 colour = w->colours[widget->colour] & 0x7F;
// Border left of text
gfx_fill_rect(dpi, l, t, l + 4, t, ColourMapA[colour].mid_dark);
@@ -613,21 +564,17 @@ static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
*/
static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b, width, press;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
//
if (w->var_4B8 != -1) {
@@ -641,7 +588,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
}
//
press = 0x70;
int press = 0x70;
if (w->flags & WF_10)
press |= 0x80;
@@ -649,7 +596,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
gfx_fill_rect(dpi, r + 1, t, r + 1, b, ColourMapA[colour].mid_dark);
} else {
//
press = 0x60;
int press = 0x60;
if (w->flags & WF_10)
press |= 0x80;
@@ -668,7 +615,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
l = widget->left + w->x + 2;
t = widget->top + w->y + 1;
width = widget->right - widget->left - 4;
int width = widget->right - widget->left - 4;
if ((widget + 1)->type == WWT_CLOSEBOX) {
width -= 10;
if ((widget + 2)->type == WWT_CLOSEBOX)
@@ -684,28 +631,24 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
*/
static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b, press;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Check if the button is pressed down
press = 0;
int press = 0;
if (w->flags & WF_10)
press |= 0x80;
if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex))
press |= 0x20;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
// Draw the button
gfx_fill_rect_inset(dpi, l, t, r, b, colour, press);
@@ -728,21 +671,17 @@ static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
*/
static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, b, yMid;
uint8 colour;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltb
l = w->x + widget->left;
t = w->y + widget->top;
b = w->y + widget->bottom;
yMid = (b + t) / 2;
int l = w->x + widget->left;
int t = w->y + widget->top;
int b = w->y + widget->bottom;
int yMid = (b + t) / 2;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
if (widget->type != WWT_24) {
// checkbox
@@ -772,27 +711,19 @@ static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
*/
static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
rct_scroll* scroll;
int scrollIndex;
int l, t, r, b;
int cl, ct, cr, cb;
uint8 colour;
rct_drawpixelinfo scroll_dpi;
// Get the widget
scrollIndex = window_get_scroll_data_index(w, widgetIndex);
widget = &w->widgets[widgetIndex];
scroll = &w->scrolls[scrollIndex];
int scrollIndex = window_get_scroll_data_index(w, widgetIndex);
rct_widget *widget = &w->widgets[widgetIndex];
rct_scroll* scroll = &w->scrolls[scrollIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
// Draw the border
gfx_fill_rect_inset(dpi, l, t, r, b, colour, 0x60);
@@ -823,13 +754,13 @@ static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget
r++;
// Create a new inner scroll dpi
scroll_dpi = *dpi;
rct_drawpixelinfo scroll_dpi = *dpi;
// Clip the scroll dpi against the outer dpi
cl = max(dpi->x, l);
ct = max(dpi->y, t);
cr = min(dpi->x + dpi->width, r);
cb = min(dpi->y + dpi->height, b);
int cl = max(dpi->x, l);
int ct = max(dpi->y, t);
int cr = min(dpi->x + dpi->width, r);
int cb = min(dpi->y + dpi->height, b);
// Set the respective dpi attributes
scroll_dpi.x = cl - l + scroll->h_left;
@@ -903,25 +834,22 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
*/
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
int l, t, r, b, colour, image;
rct_widget *widget;
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Get the image
image = widget->image;
int image = widget->image;
if (image == -1)
return;
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour] & 0x7F;
uint8 colour = w->colours[widget->colour] & 0x7F;
if (widget->type == WWT_4 || widget->type == WWT_COLOURBTN || widget->type == WWT_TRNBTN || widget->type == WWT_TAB)
if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex))
@@ -1019,7 +947,7 @@ int widget_is_active_tool(rct_window *w, int widgetIndex)
* esi: w
* edi: widget
*/
void widget_scroll_get_part(rct_window *w, rct_widget* widget, int x, int y, int *output_x, int *output_y, int *output_scroll_area, int *scroll_id)
void widget_scroll_get_part(rct_window *w, rct_widget *widget, int x, int y, int *output_x, int *output_y, int *output_scroll_area, int *scroll_id)
{
rct_widget* iterator = w->widgets;
*scroll_id = 0;
@@ -1132,25 +1060,21 @@ void widget_set_checkbox_value(rct_window *w, int widgetIndex, int value)
static void widget_text_box_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
{
rct_widget* widget;
int l, t, r, b;
uint8 colour;
int no_lines = 0;
int font_height = 0;
char wrapped_string[512];
// Get the widget
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
// Resolve the absolute ltrb
l = w->x + widget->left;
t = w->y + widget->top;
r = w->x + widget->right;
b = w->y + widget->bottom;
int l = w->x + widget->left;
int t = w->y + widget->top;
int r = w->x + widget->right;
int b = w->y + widget->bottom;
// Get the colour
colour = w->colours[widget->colour];
uint8 colour = w->colours[widget->colour];
bool active = w->classification == gCurrentTextBox.window.classification &&
w->number == gCurrentTextBox.window.number &&

124
src/interface/window.c
View File

@@ -76,10 +76,8 @@ static int window_draw_split(rct_window *w, int left, int top, int right, int bo
int window_get_widget_index(rct_window *w, rct_widget *widget)
{
rct_widget *widget2;
int i = 0;
for (widget2 = w->widgets; widget2->type != WWT_LAST; widget2++, i++)
for (rct_widget *widget2 = w->widgets; widget2->type != WWT_LAST; widget2++, i++)
if (widget == widget2)
return i;
return -1;
@@ -87,15 +85,12 @@ int window_get_widget_index(rct_window *w, rct_widget *widget)
int window_get_scroll_index(rct_window *w, int targetWidgetIndex)
{
int widgetIndex, scrollIndex;
rct_widget *widget;
if (w->widgets[targetWidgetIndex].type != WWT_SCROLL)
return -1;
scrollIndex = 0;
widgetIndex = 0;
for (widget = w->widgets; widget->type != WWT_LAST; widget++, widgetIndex++) {
int scrollIndex = 0;
int widgetIndex = 0;
for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++, widgetIndex++) {
if (widgetIndex == targetWidgetIndex)
break;
if (widget->type == WWT_SCROLL)
@@ -107,14 +102,11 @@ int window_get_scroll_index(rct_window *w, int targetWidgetIndex)
int window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget)
{
int scrollIndex;
rct_widget *widget2;
if (widget->type != WWT_SCROLL)
return -1;
scrollIndex = 0;
for (widget2 = w->widgets; widget2->type != WWT_LAST; widget2++) {
int scrollIndex = 0;
for (rct_widget *widget2 = w->widgets; widget2->type != WWT_LAST; widget2++) {
if (widget2 == widget)
break;
if (widget2->type == WWT_SCROLL)
@@ -126,9 +118,7 @@ int window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget)
rct_widget *window_get_scroll_widget(rct_window *w, int scrollIndex)
{
rct_widget *widget;
for (widget = w->widgets; widget->type != WWT_LAST; widget++) {
for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++) {
if (widget->type != WWT_SCROLL)
continue;
@@ -146,11 +136,9 @@ rct_widget *window_get_scroll_widget(rct_window *w, int scrollIndex)
*/
void window_dispatch_update_all()
{
rct_window *w;
RCT2_GLOBAL(0x01423604, sint32)++;
// gTooltipNotShownTicks++;
for (w = RCT2_LAST_WINDOW; w >= g_window_list; w--)
for (rct_window *w = RCT2_LAST_WINDOW; w >= g_window_list; w--)
window_event_update_call(w);
}
@@ -167,8 +155,6 @@ void window_update_all_viewports()
*/
void window_update_all()
{
rct_window* w;
RCT2_GLOBAL(0x009E3CD8, sint32)++;
gfx_draw_all_dirty_blocks();
@@ -179,12 +165,12 @@ void window_update_all()
RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_UPDATE_TICKS, sint16) += RCT2_GLOBAL(RCT2_ADDRESS_TICKS_SINCE_LAST_UPDATE, sint16);
if (RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_UPDATE_TICKS, sint16) >= 1000) {
RCT2_GLOBAL(RCT2_ADDRESS_WINDOW_UPDATE_TICKS, sint16) = 0;
for (w = RCT2_LAST_WINDOW; w >= g_window_list; w--)
for (rct_window* w = RCT2_LAST_WINDOW; w >= g_window_list; w--)
window_event_unknown_07_call(w);
}
// Border flash invalidation
for (w = RCT2_LAST_WINDOW; w >= g_window_list; w--) {
for (rct_window* w = RCT2_LAST_WINDOW; w >= g_window_list; w--) {
if (w->flags & WF_WHITE_BORDER_MASK) {
w->flags -= WF_WHITE_BORDER_ONE;
if (!(w->flags & WF_WHITE_BORDER_MASK))
@@ -201,22 +187,18 @@ void window_update_all()
*/
static void window_scroll_wheel_input(rct_window *w, int scrollIndex, int wheel)
{
int widgetIndex, size;
rct_scroll *scroll;
rct_widget *widget;
scroll = &w->scrolls[scrollIndex];
widget = window_get_scroll_widget(w, scrollIndex);
widgetIndex = window_get_widget_index(w, widget);
rct_scroll *scroll = &w->scrolls[scrollIndex];
rct_widget *widget = window_get_scroll_widget(w, scrollIndex);
int widgetIndex = window_get_widget_index(w, widget);
if (scroll->flags & VSCROLLBAR_VISIBLE) {
size = widget->bottom - widget->top - 1;
int size = widget->bottom - widget->top - 1;
if (scroll->flags & HSCROLLBAR_VISIBLE)
size -= 11;
size = max(0, scroll->v_bottom - size);
scroll->v_top = min(max(0, scroll->v_top + wheel), size);
} else {
size = widget->right - widget->left - 1;
int size = widget->right - widget->left - 1;
if (scroll->flags & VSCROLLBAR_VISIBLE)
size -= 11;
size = max(0, scroll->h_right - size);
@@ -233,17 +215,13 @@ static void window_scroll_wheel_input(rct_window *w, int scrollIndex, int wheel)
*/
static int window_wheel_input(rct_window *w, int wheel)
{
int i;
rct_widget *widget;
rct_scroll *scroll;
i = 0;
for (widget = w->widgets; widget->type != WWT_LAST; widget++) {
int i = 0;
for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++) {
if (widget->type != WWT_SCROLL)
continue;
// Originally always checked first scroll view, bug maybe?
scroll = &w->scrolls[i];
rct_scroll *scroll = &w->scrolls[i];
if (scroll->flags & (HSCROLLBAR_VISIBLE | VSCROLLBAR_VISIBLE)) {
window_scroll_wheel_input(w, i, wheel);
return 1;
@@ -308,14 +286,9 @@ static bool window_other_wheel_input(rct_window *w, int widgetIndex, int wheel)
*/
static void window_all_wheel_input()
{
int raw, wheel, widgetIndex;
rct_window *w;
rct_widget *widget;
rct_scroll *scroll;
// Get wheel value
raw = gCursorState.wheel;
wheel = 0;
int raw = gCursorState.wheel;
int wheel = 0;
while (1) {
raw -= 120;
if (raw < 0)
@@ -337,7 +310,7 @@ static void window_all_wheel_input()
// Check window cursor is over
if (!(gInputFlags & INPUT_FLAG_5)) {
w = window_find_from_point(gCursorState.x, gCursorState.y);
rct_window *w = window_find_from_point(gCursorState.x, gCursorState.y);
if (w != NULL) {
// Check if main window
if (w->classification == WC_MAIN_WINDOW || w->classification == WC_VIEWPORT) {
@@ -346,11 +319,11 @@ static void window_all_wheel_input()
}
// Check scroll view, cursor is over
widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y);
int widgetIndex = window_find_widget_from_point(w, gCursorState.x, gCursorState.y);
if (widgetIndex != -1) {
widget = &w->widgets[widgetIndex];
rct_widget *widget = &w->widgets[widgetIndex];
if (widget->type == WWT_SCROLL) {
scroll = &w->scrolls[RCT2_GLOBAL(0x01420075, uint8)];
rct_scroll *scroll = &w->scrolls[RCT2_GLOBAL(0x01420075, uint8)];
if (scroll->flags & (HSCROLLBAR_VISIBLE | VSCROLLBAR_VISIBLE)) {
window_scroll_wheel_input(w, window_get_scroll_index(w, widgetIndex), wheel);
return;
@@ -369,7 +342,7 @@ static void window_all_wheel_input()
}
// Check windows, front to back
for (w = RCT2_LAST_WINDOW; w >= g_window_list; w--)
for (rct_window *w = RCT2_LAST_WINDOW; w >= g_window_list; w--)
if (window_wheel_input(w, wheel))
return;
}
@@ -388,9 +361,9 @@ static void window_all_wheel_input()
*/
rct_window *window_create(int x, int y, int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags)
{
rct_window *w;
// Check if there are any window slots left
if (RCT2_NEW_WINDOW >= &(g_window_list[MAX_WINDOW_COUNT])) {
rct_window *w = NULL;
// Close least recently used window
for (w = g_window_list; w < RCT2_NEW_WINDOW; w++)
if (!(w->flags & (WF_STICK_TO_BACK | WF_STICK_TO_FRONT | WF_NO_AUTO_CLOSE)))
@@ -399,7 +372,7 @@ rct_window *window_create(int x, int y, int width, int height, rct_window_event_
window_close(w);
}
w = RCT2_NEW_WINDOW;
rct_window *w = RCT2_NEW_WINDOW;
// Flags
if (flags & WF_STICK_TO_BACK) {
@@ -515,9 +488,7 @@ static bool sub_6EA934(int x, int y, int width, int height)
*/
static bool sub_6EA95D(int x, int y, int width, int height)
{
rct_window *w;
for (w = g_window_list; w < RCT2_LAST_WINDOW; w++) {
for (rct_window *w = g_window_list; w < RCT2_LAST_WINDOW; w++) {
if (w->flags & WF_STICK_TO_BACK)
continue;
@@ -543,22 +514,19 @@ static bool sub_6EA95D(int x, int y, int width, int height)
*/
rct_window *window_create_auto_pos(int width, int height, rct_window_event_list *event_handlers, rct_windowclass cls, uint16 flags)
{
rct_window *w;
int x, y;
uint16 screenWidth = gScreenWidth;
uint16 screenHeight = gScreenHeight;
if (cls & 0x80) {
cls &= ~0x80;
w = window_find_by_number(RCT2_GLOBAL(0x0013CE928, rct_windowclass), RCT2_GLOBAL(0x0013CE92A, rct_windownumber));
rct_window *w = window_find_by_number(RCT2_GLOBAL(0x0013CE928, rct_windowclass), RCT2_GLOBAL(0x0013CE92A, rct_windownumber));
if (w != NULL) {
if (w->x > -60 && w->x < gScreenWidth - 20) {
if (w->y < gScreenHeight - 20) {
x = w->x;
int x = w->x;
if (w->x + width > gScreenWidth)
x = gScreenWidth - 20 - width;
y = w->y;
int y = w->y;
return window_create(x + 10, y + 10, width, height, event_handlers, cls, flags);
}
}
@@ -566,8 +534,8 @@ rct_window *window_create_auto_pos(int width, int height, rct_window_event_list
}
// Place window in an empty corner of the screen
x = 0;
y = 30;
int x = 0;
int y = 30;
if (sub_6EA934(x, y, width, height)) goto foundSpace;
x = screenWidth - width;
@@ -583,12 +551,12 @@ rct_window *window_create_auto_pos(int width, int height, rct_window_event_list
if (sub_6EA934(x, y, width, height)) goto foundSpace;
// Place window next to another
for (w = g_window_list; w < RCT2_LAST_WINDOW; w++) {
for (rct_window *w = g_window_list; w < RCT2_LAST_WINDOW; w++) {
if (w->flags & WF_STICK_TO_BACK)
continue;
x = w->x + w->width + 2;
y = w->y;
int x = w->x + w->width + 2;
int y = w->y;
if (sub_6EA934(x, y, width, height)) goto foundSpace;
x = w->x - w->width - 2;
@@ -621,12 +589,12 @@ rct_window *window_create_auto_pos(int width, int height, rct_window_event_list
}
// Overlap
for (w = g_window_list; w < RCT2_LAST_WINDOW; w++) {
for (rct_window *w = g_window_list; w < RCT2_LAST_WINDOW; w++) {
if (w->flags & WF_STICK_TO_BACK)
continue;
x = w->x + w->width + 2;
y = w->y;
int x = w->x + w->width + 2;
int y = w->y;
if (sub_6EA8EC(x, y, width, height)) goto foundSpace;
x = w->x - w->width - 2;
@@ -645,7 +613,7 @@ rct_window *window_create_auto_pos(int width, int height, rct_window_event_list
// Cascade
x = 0;
y = 30;
for (w = g_window_list; w < RCT2_LAST_WINDOW; w++) {
for (rct_window *w = g_window_list; w < RCT2_LAST_WINDOW; w++) {
if (x != w->x || y != w->y)
continue;
@@ -721,9 +689,7 @@ void window_close(rct_window* window)
*/
void window_close_by_class(rct_windowclass cls)
{
rct_window *w;
for (w = g_window_list; w < RCT2_NEW_WINDOW; w++) {
for (rct_window *w = g_window_list; w < RCT2_NEW_WINDOW; w++) {
if (w->classification == cls) {
window_close(w);
w = g_window_list - 1;
@@ -739,9 +705,7 @@ void window_close_by_class(rct_windowclass cls)
*/
void window_close_by_number(rct_windowclass cls, rct_windownumber number)
{
rct_window* w;
for (w = g_window_list; w < RCT2_NEW_WINDOW; w++) {
for (rct_window* w = g_window_list; w < RCT2_NEW_WINDOW; w++) {
if (w->classification == cls && w->number == number) {
window_close(w);
w = g_window_list - 1;
@@ -757,9 +721,7 @@ void window_close_by_number(rct_windowclass cls, rct_windownumber number)
*/
rct_window *window_find_by_class(rct_windowclass cls)
{
rct_window *w;
for (w = g_window_list; w < RCT2_NEW_WINDOW; w++)
for (rct_window *w = g_window_list; w < RCT2_NEW_WINDOW; w++)
if (w->classification == cls)
return w;

468
src/ride/ride_ratings.c
View File

File diff suppressed because it is too large Load Diff

4
src/windows/ride_construction.c
View File

@@ -36,9 +36,7 @@
/* move to ride.c */
void sub_6B2FA9(rct_windownumber number)
{
rct_window* w;
w = window_find_by_number(WC_RIDE, number);
rct_window* w = window_find_by_number(WC_RIDE, number);
if (w != NULL && w->page == 1)
window_close(w);
}