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

Merge pull request #5705 from Broxzier/hardcoded-values

Browse Source 
Replace -1 with SPR_NONE for viewport sprite, sort some includes
This commit is contained in:
Ted John
2017-07-02 00:08:33 +01:00
committed by GitHub
parent 46d8287bd9 29fb31c69c
commit fd2eda921f
11 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/interface/viewport.c
View File

@@ -26,7 +26,6 @@
#include "../rct2.h"
#include "../ride/ride_data.h"
#include "../ride/track_data.h"
#include "../sprites.h"
#include "../world/banner.h"
#include "../world/Climate.h"
#include "../world/entrance.h"
@@ -193,7 +192,7 @@ void viewport_create(rct_window *w, sint32 x, sint32 y, sint32 width, sint32 hei
centre_z = centre_sprite->unknown.z;
}
else{
w->viewport_target_sprite = SPR_NONE;
w->viewport_target_sprite = SPRITE_INDEX_NULL;
}
sint32 view_x, view_y;
@@ -520,7 +519,7 @@ void viewport_update_position(rct_window *window)
rct_viewport* viewport = window->viewport;
if (!viewport)return;
if (window->viewport_target_sprite != -1) {
if (window->viewport_target_sprite != SPRITE_INDEX_NULL) {
viewport_update_sprite_follow(window);
return;
}
@@ -605,7 +604,7 @@ void viewport_update_position(rct_window *window)
void viewport_update_sprite_follow(rct_window *window)
{
if (window->viewport_target_sprite != -1 && window->viewport){
if (window->viewport_target_sprite != SPRITE_INDEX_NULL && window->viewport) {
rct_sprite* sprite = get_sprite(window->viewport_target_sprite);
sint32 height = (map_element_height(0xFFFF & sprite->unknown.x, 0xFFFF & sprite->unknown.y) & 0xFFFF) - 16;

6
src/openrct2/interface/window.c
View File

@@ -15,14 +15,15 @@
#pragma endregion
#include "../audio/audio.h"
#include "../config/Config.h"
#include "../Context.h"
#include "../core/Guard.hpp"
#include "../drawing/drawing.h"
#include "../editor.h"
#include "../game.h"
#include "../input.h"
#include "../interface/themes.h"
#include "../interface/Cursors.h"
#include "../interface/themes.h"
#include "../localisation/localisation.h"
#include "../localisation/string_ids.h"
#include "../platform/platform.h"
@@ -31,7 +32,6 @@
#include "viewport.h"
#include "widget.h"
#include "window.h"
#include "../config/Config.h"
#define RCT2_FIRST_WINDOW (g_window_list)
#define RCT2_LAST_WINDOW (gWindowNextSlot - 1)
@@ -1402,7 +1402,7 @@ void window_scroll_to_location(rct_window *w, sint32 x, sint32 y, sint32 z)
}
}
// rct2: 0x006E7C76
if (w->viewport_target_sprite == -1) {
if (w->viewport_target_sprite == SPRITE_INDEX_NULL) {
if (!(w->flags & WF_NO_SCROLLING)) {
w->saved_view_x = map_coordinate.x - (sint16)(w->viewport->view_width * window_scroll_locations[i][0]);
w->saved_view_y = map_coordinate.y - (sint16)(w->viewport->view_height * window_scroll_locations[i][1]);

2
src/openrct2/interface/window.h
View File

@@ -300,7 +300,7 @@ typedef struct rct_window {
uint8 var_498[0x14];
sint16 selected_tab; // 0x4AC
sint16 var_4AE;
sint16 viewport_target_sprite; // 0x4B0 viewport target sprite?
uint16 viewport_target_sprite; // 0x4B0 viewport target sprite
sint16 saved_view_x; // 0x4B2
sint16 saved_view_y; // 0x4B4
rct_windowclass classification; // 0x4B6