mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity

Replace 4 more occurances of -1 with SPR_NONE

Browse Source
This commit is contained in:
Broxzier
2017-06-25 21:37:51 +02:00
parent 36fb2c42d9
commit 71a922b3f5
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/windows/guest.c
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 = -1;
focus.sprite.sprite_id = SPR_NONE;
}
else{
uint8 final_check = 1;

2
src/openrct2/windows/ride.c
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 = -1;
focus.sprite.sprite_id = SPR_NONE;
focus.coordinate.zoom = 0;
focus.coordinate.rotation = get_current_rotation();
focus.coordinate.width = 0;

2
src/openrct2/windows/staff.c
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 = -1;
focus.sprite_id = SPR_NONE;
}
else{
focus.type |= VIEWPORT_FOCUS_TYPE_SPRITE | VIEWPORT_FOCUS_TYPE_COORDINATE;

3
src/openrct2/world/sprite.c
View File

@@ -23,6 +23,7 @@
#include "../OpenRCT2.h"
#include "../rct2/addresses.h"
#include "../scenario/scenario.h"
#include "../sprites.h"
#include "Fountain.h"
#include "sprite.h"
@@ -166,7 +167,7 @@ void reset_sprite_list()
*/
void reset_sprite_spatial_index()
{
memset(gSpriteSpatialIndex, -1, sizeof(gSpriteSpatialIndex));
memset(gSpriteSpatialIndex, SPR_NONE, 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) {