organisation: move peep and staff to sub directory of its own

src/editor.c

@@ -30,11 +30,11 @@
 #include "management/finance.h"
 #include "management/news_item.h"
 #include "object.h"
+#include "peep/staff.h"
 #include "ride/ride.h"
 #include "world/map.h"
 #include "world/park.h"
 #include "world/sprite.h"
-#include "world/staff.h"
 
 static void set_all_land_owned();
 

src/game.c

@@ -31,6 +31,8 @@
 #include "management/finance.h"
 #include "management/news_item.h"
 #include "object.h"
+#include "peep/peep.h"
+#include "peep/staff.h"
 #include "platform/osinterface.h"
 #include "ride/ride.h"
 #include "ride/vehicle.h"
@@ -42,9 +44,7 @@
 #include "windows/tooltip.h"
 #include "world/climate.h"
 #include "world/park.h"
-#include "world/peep.h"
 #include "world/sprite.h"
-#include "world/staff.h"
 
 int gGameSpeed = 1;
 

src/interface/window.h

@@ -23,9 +23,9 @@
 
 #include "../common.h"
 #include "../drawing/drawing.h"
+#include "../peep/peep.h"
 #include "../ride/ride.h"
 #include "../world/park.h"
-#include "../world/peep.h"
 
 struct rct_window;
 union rct_window_event;

src/management/award.c

@@ -21,9 +21,9 @@
 #include "../addresses.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
+#include "../peep/peep.h"
 #include "../ride/ride.h"
 #include "../scenario.h"
-#include "../world/peep.h"
 #include "../world/sprite.h"
 #include "award.h"
 #include "news_item.h"

src/management/finance.c

@@ -20,9 +20,9 @@
 
 #include "../addresses.h"
 #include "../interface/window.h"
+#include "../peep/peep.h"
 #include "../ride/ride.h"
 #include "../world/park.h"
-#include "../world/peep.h"
 #include "../world/sprite.h"
 #include "finance.h"
 

src/management/marketing.h

@@ -22,7 +22,7 @@
 #define _MARKETING_H_
 
 #include "../common.h"
-#include "../world/peep.h"
+#include "../peep/peep.h"
 
 enum {
 	ADVERTISING_CAMPAIGN_PARK_ENTRY_FREE,

src/peep/peep.c

@@ -26,8 +26,8 @@
 #include "../management/news_item.h"
 #include "../ride/ride.h"
 #include "../sprites.h"
+#include "../world/sprite.h"
 #include "peep.h"
-#include "sprite.h"
 #include "staff.h"
 
 static void peep_update(rct_peep *peep);

src/peep/staff.c

@@ -23,8 +23,8 @@
 #include "../interface/viewport.h"
 #include "../localisation/string_ids.h"
 #include "../management/finance.h"
+#include "../world/sprite.h"
 #include "peep.h"
-#include "sprite.h"
 #include "staff.h"
 
 /**

src/ride/ride.c

@@ -24,11 +24,11 @@
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
 #include "../management/news_item.h"
+#include "../peep/peep.h"
+#include "../peep/staff.h"
 #include "../scenario.h"
 #include "../world/map.h"
-#include "../world/peep.h"
 #include "../world/sprite.h"
-#include "../world/staff.h"
 #include "ride.h"
 #include "ride_data.h"
 

src/ride/ride.h

@@ -22,8 +22,8 @@
 #define _RIDE_H_
 
 #include "../common.h"
+#include "../peep/peep.h"
 #include "../world/map.h"
-#include "../world/peep.h"
 
 typedef fixed16_2dp ride_rating;
 

src/windows/cheats.c

@@ -26,12 +26,12 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
+#include "../peep/peep.h"
 #include "../ride/ride.h"
 #include "../scenario.h"
 #include "../sprites.h"
 #include "../world/climate.h"
 #include "../world/park.h"
-#include "../world/peep.h"
 #include "../world/sprite.h"
 
 //#define WW 200

src/windows/game_bottom_toolbar.c

@@ -26,10 +26,10 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../management/news_item.h"
+#include "../peep/peep.h"
 #include "../sprites.h"
 #include "../world/climate.h"
 #include "../world/park.h"
-#include "../world/peep.h"
 #include "../world/sprite.h"
 
 enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX {

src/windows/guest_list.c

@@ -22,13 +22,13 @@
 #include <assert.h>
 #include "../addresses.h"
 #include "../game.h"
-#include "../world/peep.h"
-#include "../localisation/localisation.h"
-#include "../world/sprite.h"
-#include "../sprites.h"
-#include "../ride/ride.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
+#include "../localisation/localisation.h"
+#include "../peep/peep.h"
+#include "../ride/ride.h"
+#include "../sprites.h"
+#include "../world/sprite.h"
 #include "dropdown.h"
 
 enum {

src/windows/park.c

@@ -29,12 +29,12 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../management/award.h"
+#include "../peep/peep.h"
 #include "../ride/ride.h"
 #include "../scenario.h"
 #include "../sprites.h"
 #include "../util/util.h"
 #include "../world/park.h"
-#include "../world/peep.h"
 #include "../world/sprite.h"
 #include "dropdown.h"
 

src/windows/peep.c

@@ -22,11 +22,11 @@
 #include "../game.h"
 #include "../world/map.h"
 #include "../management/marketing.h"
+#include "../peep/peep.h"
+#include "../peep/staff.h"
 #include "../ride/ride.h"
-#include "../world/peep.h"
 #include "../scenario.h"
 #include "../localisation/localisation.h"
-#include "../world/staff.h"
 #include "../world/sprite.h"
 #include "../sprites.h"
 #include "../interface/viewport.h"

src/windows/ride.c

@@ -21,16 +21,16 @@
 #include <string.h>
 #include "../addresses.h"
 #include "../game.h"
-#include "../world/map.h"
-#include "../ride/ride.h"
-#include "../ride/ride_data.h"
-#include "../world/staff.h"
-#include "../localisation/localisation.h"
-#include "../world/sprite.h"
-#include "../sprites.h"
 #include "../interface/viewport.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
+#include "../localisation/localisation.h"
+#include "../peep/staff.h"
+#include "../ride/ride.h"
+#include "../ride/ride_data.h"
+#include "../sprites.h"
+#include "../world/map.h"
+#include "../world/sprite.h"
 #include "dropdown.h"
 
 #define var_496(w)	RCT2_GLOBAL((int)w + 0x496, uint16)

src/windows/scenery.c

@@ -22,16 +22,16 @@
 #include <stdbool.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
-#include "../game.h"
-#include "../world/map.h"
 #include "../drawing/drawing.h"
-#include "../world/peep.h"
-#include "../world/sprite.h"
-#include "../world/scenery.h"
-#include "../localisation/localisation.h"
+#include "../game.h"
 #include "../interface/viewport.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
+#include "../localisation/localisation.h"
+#include "../peep/peep.h"
+#include "../world/map.h"
+#include "../world/scenery.h"
+#include "../world/sprite.h"
 #include "dropdown.h"
 #include "scenery.h"
 

src/windows/staff.c

@@ -22,13 +22,13 @@
 #include "../addresses.h"
 #include "../game.h"
 #include "../drawing/drawing.h"
-#include "../world/peep.h"
-#include "../world/staff.h"
-#include "../world/sprite.h"
-#include "../localisation/localisation.h"
 #include "../interface/viewport.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
+#include "../localisation/localisation.h"
+#include "../peep/peep.h"
+#include "../peep/staff.h"
+#include "../world/sprite.h"
 #include "dropdown.h"
 
 enum {

src/windows/staff_peep.c

@@ -20,15 +20,15 @@
 
 #include "../addresses.h"
 #include "../game.h"
-#include "../world/peep.h"
-#include "../localisation/localisation.h"
-#include "../world/sprite.h"
-#include "../sprites.h"
 #include "../interface/viewport.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
+#include "../localisation/localisation.h"
+#include "../peep/peep.h"
+#include "../peep/staff.h"
+#include "../sprites.h"
+#include "../world/sprite.h"
 #include "dropdown.h"
-#include "../world/staff.h"
 
 enum WINDOW_STAFF_PEEP_PAGE {
 	WINDOW_STAFF_PEEP_OVERVIEW,

src/world/park.c

@@ -26,11 +26,11 @@
 #include "../management/finance.h"
 #include "../management/marketing.h"
 #include "../management/news_item.h"
+#include "../peep/peep.h"
 #include "../ride/ride.h"
 #include "../scenario.h"
 #include "../world/map.h"
 #include "park.h"
-#include "peep.h"
 #include "sprite.h"
 
 /**

src/world/sprite.h

@@ -22,8 +22,8 @@
 #define _SPRITE_H_
 
 #include "../common.h"
+#include "../peep/peep.h"
 #include "../ride/vehicle.h"
-#include "peep.h"
 
 #define SPRITE_INDEX_NULL    0xFFFF
 #define SPRITE_LOCATION_NULL 0x8000