Replace newly added SPR_NONE's with SPRITE_INDEX_NULL, remove new includes

needed to change its type to match .
This commit is contained in:
Broxzier 2017-06-25 22:44:58 +02:00
parent 71a922b3f5
commit 9e204c11a9
11 changed files with 13 additions and 20 deletions

View File

@ -33,7 +33,6 @@
#include "rct2/addresses.h"
#include "ride/ride.h"
#include "scenario/scenario.h"
#include "sprites.h"
#include "util/sawyercoding.h"
#include "util/util.h"
#include "world/Climate.h"
@ -409,7 +408,7 @@ static void editor_finalise_main_view()
rct_window *w = window_get_main();
rct_viewport *viewport = w->viewport;
w->viewport_target_sprite = SPR_NONE;
w->viewport_target_sprite = SPRITE_INDEX_NULL;
w->saved_view_x = gSavedViewX;
w->saved_view_y = gSavedViewY;
gCurrentRotation = gSavedViewRotation;

View File

@ -43,7 +43,6 @@
#include "ride/track_design.h"
#include "ride/vehicle.h"
#include "scenario/scenario.h"
#include "sprites.h"
#include "title/TitleScreen.h"
#include "util/sawyercoding.h"
#include "util/util.h"
@ -1134,7 +1133,7 @@ void game_load_init()
game_create_windows();
mainWindow = window_get_main();
mainWindow->viewport_target_sprite = SPR_NONE;
mainWindow->viewport_target_sprite = SPRITE_INDEX_NULL;
mainWindow->saved_view_x = gSavedViewX;
mainWindow->saved_view_y = gSavedViewY;
uint8 zoomDifference = gSavedViewZoom - mainWindow->viewport->zoom;

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
center_z = center_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 != SPR_NONE) {
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 != SPR_NONE && 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;

View File

@ -27,7 +27,6 @@
#include "../localisation/localisation.h"
#include "../localisation/string_ids.h"
#include "../platform/platform.h"
#include "../sprites.h"
#include "../world/map.h"
#include "../world/sprite.h"
#include "viewport.h"
@ -1403,7 +1402,7 @@ void window_scroll_to_location(rct_window *w, sint32 x, sint32 y, sint32 z)
}
}
// rct2: 0x006E7C76
if (w->viewport_target_sprite == SPR_NONE) {
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]);

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

View File

@ -34,7 +34,6 @@
#include "../platform/platform.h"
#include "../rct1.h"
#include "../ride/ride.h"
#include "../sprites.h"
#include "../util/sawyercoding.h"
#include "../util/util.h"
#include "../world/Climate.h"
@ -148,7 +147,7 @@ void scenario_begin()
game_create_windows();
mainWindow = window_get_main();
mainWindow->viewport_target_sprite = SPR_NONE;
mainWindow->viewport_target_sprite = SPRITE_INDEX_NULL;
mainWindow->saved_view_x = gSavedViewX;
mainWindow->saved_view_y = gSavedViewY;

View File

@ -35,7 +35,6 @@ extern "C"
#include "../interface/viewport.h"
#include "../interface/window.h"
#include "../management/news_item.h"
#include "../sprites.h"
#include "../world/scenery.h"
}
@ -402,7 +401,7 @@ private:
void PrepareParkForPlayback()
{
rct_window * w = window_get_main();
w->viewport_target_sprite = SPR_NONE;
w->viewport_target_sprite = SPRITE_INDEX_NULL;
w->saved_view_x = gSavedViewX;
w->saved_view_y = gSavedViewY;

View File

@ -719,7 +719,7 @@ void window_guest_viewport_init(rct_window* w){
rct_peep* peep = GET_PEEP(w->number);
if (peep->state == PEEP_STATE_PICKED){
focus.sprite.sprite_id = SPR_NONE;
focus.sprite.sprite_id = SPRITE_INDEX_NULL;
}
else{
uint8 final_check = 1;

View File

@ -1777,7 +1777,7 @@ static void window_ride_init_viewport(rct_window *w)
focus.coordinate.x = 0;
focus.coordinate.y = 0;
focus.coordinate.z = 0;
focus.sprite.sprite_id = SPR_NONE;
focus.sprite.sprite_id = SPRITE_INDEX_NULL;
focus.coordinate.zoom = 0;
focus.coordinate.rotation = get_current_rotation();
focus.coordinate.width = 0;

View File

@ -1220,7 +1220,7 @@ void window_staff_viewport_init(rct_window* w){
rct_peep* peep = GET_PEEP(w->number);
if (peep->state == PEEP_STATE_PICKED){
focus.sprite_id = SPR_NONE;
focus.sprite_id = SPRITE_INDEX_NULL;
}
else{
focus.type |= VIEWPORT_FOCUS_TYPE_SPRITE | VIEWPORT_FOCUS_TYPE_COORDINATE;

View File

@ -23,7 +23,6 @@
#include "../OpenRCT2.h"
#include "../rct2/addresses.h"
#include "../scenario/scenario.h"
#include "../sprites.h"
#include "Fountain.h"
#include "sprite.h"
@ -167,7 +166,7 @@ void reset_sprite_list()
*/
void reset_sprite_spatial_index()
{
memset(gSpriteSpatialIndex, SPR_NONE, sizeof(gSpriteSpatialIndex));
memset(gSpriteSpatialIndex, SPRITE_INDEX_NULL, sizeof(gSpriteSpatialIndex));
for (size_t i = 0; i < MAX_SPRITES; i++) {
rct_sprite *spr = get_sprite(i);
if (spr->unknown.sprite_identifier != SPRITE_IDENTIFIER_NULL) {