Replace -1 with SPR_NONE for viewport sprite, sort some includes

src/openrct2/editor.c

@@ -14,35 +14,36 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "rct2/addresses.h"
 #include "audio/audio.h"
 #include "drawing/drawing.h"
 #include "editor.h"
 #include "game.h"
-#include "interface/window.h"
 #include "interface/viewport.h"
+#include "interface/window.h"
 #include "localisation/date.h"
 #include "localisation/localisation.h"
 #include "management/finance.h"
 #include "management/news_item.h"
+#include "network/network.h"
 #include "object.h"
 #include "object/ObjectManager.h"
 #include "peep/staff.h"
 #include "platform/platform.h"
 #include "rct1.h"
+#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/banner.h"
 #include "world/Climate.h"
-#include "world/footpath.h"
+#include "world/banner.h"
 #include "world/entrance.h"
+#include "world/footpath.h"
 #include "world/map.h"
 #include "world/park.h"
 #include "world/scenery.h"
 #include "world/sprite.h"
-#include "network/network.h"
 
 uint8 _editorSelectedRides[128];
 uint8 _editorSelectedSmallScenery[252];
@@ -408,7 +409,7 @@ static void editor_finalise_main_view()
     rct_window *w = window_get_main();
     rct_viewport *viewport = w->viewport;
 
-    w->viewport_target_sprite = -1;
+    w->viewport_target_sprite = SPR_NONE;
     w->saved_view_x = gSavedViewX;
     w->saved_view_y = gSavedViewY;
     gCurrentRotation = gSavedViewRotation;

src/openrct2/game.c

@@ -43,6 +43,7 @@
 #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"
@@ -1133,7 +1134,7 @@ void game_load_init()
     game_create_windows();
     mainWindow = window_get_main();
 
-    mainWindow->viewport_target_sprite = -1;
+    mainWindow->viewport_target_sprite = SPR_NONE;
     mainWindow->saved_view_x = gSavedViewX;
     mainWindow->saved_view_y = gSavedViewY;
     uint8 zoomDifference = gSavedViewZoom - mainWindow->viewport->zoom;

src/openrct2/interface/viewport.c

@@ -238,8 +238,8 @@ void viewport_adjust_for_map_height(sint16* x, sint16* y, sint16 *z)
         // of the map. This can happen when the height is larger than the map size.
         sint16 max = gMapSizeMinus2;
         if (pos.x > max && pos.y > max) {
-            sint32 x_corr[] = { -1, 1, 1, -1 };
-            sint32 y_corr[] = { -1, -1, 1, 1 };
+            static const sint32 x_corr[] = { -1, 1, 1, -1 };
+            static const sint32 y_corr[] = { -1, -1, 1, 1 };
             pos.x += x_corr[rotation] * height;
             pos.y += y_corr[rotation] * height;
         }
@@ -520,7 +520,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 != SPR_NONE) {
         viewport_update_sprite_follow(window);
         return;
     }
@@ -605,7 +605,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 != SPR_NONE && 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;

src/openrct2/interface/window.c

@@ -15,23 +15,24 @@
 #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"
+#include "../sprites.h"
 #include "../world/map.h"
 #include "../world/sprite.h"
 #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 +1403,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 == SPR_NONE) {
             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]);

src/openrct2/scenario/scenario.c

@@ -34,6 +34,7 @@
 #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"
@@ -42,9 +43,9 @@
 #include "../world/scenery.h"
 #include "../world/sprite.h"
 #include "../world/water.h"
-#include "scenario.h"
 #include "ScenarioRepository.h"
 #include "ScenarioSources.h"
+#include "scenario.h"
 
 const rct_string_id ScenarioCategoryStringIds[SCENARIO_CATEGORY_COUNT] = {
     STR_BEGINNER_PARKS,
@@ -147,7 +148,7 @@ void scenario_begin()
     game_create_windows();
     mainWindow = window_get_main();
 
-    mainWindow->viewport_target_sprite = -1;
+    mainWindow->viewport_target_sprite = SPR_NONE;
     mainWindow->saved_view_x = gSavedViewX;
     mainWindow->saved_view_y = gSavedViewY;
 

src/openrct2/title/TitleSequencePlayer.cpp

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