diff --git a/src/drawing/Rain.cpp b/src/drawing/Rain.cpp index 49d9589b87..c8cbb6701c 100644 --- a/src/drawing/Rain.cpp +++ b/src/drawing/Rain.cpp @@ -16,7 +16,6 @@ extern "C" { - #include "../addresses.h" #include "../interface/window.h" #include "../world/climate.h" #include "drawing.h" diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h index e9dc09defa..316a13746a 100644 --- a/src/drawing/drawing.h +++ b/src/drawing/drawing.h @@ -19,9 +19,6 @@ #include "../common.h" #include "font.h" -#ifndef NO_RCT2 - #include "../addresses.h" -#endif // For g1 only enable packing when still relying on vanilla #ifndef NO_RCT2 diff --git a/src/drawing/sprite.c b/src/drawing/sprite.c index 6437cacdd1..6b74dbe34d 100644 --- a/src/drawing/sprite.c +++ b/src/drawing/sprite.c @@ -14,6 +14,7 @@ *****************************************************************************/ #pragma endregion +#include "../addresses.h" #include "../common.h" #include "../openrct2.h" #include "../platform/platform.h" diff --git a/src/game.h b/src/game.h index 7e2711250a..23b53d2be7 100644 --- a/src/game.h +++ b/src/game.h @@ -17,6 +17,7 @@ #ifndef _GAME_H_ #define _GAME_H_ +#include "addresses.h" #include "common.h" #include "platform/platform.h" #include "scenario.h" diff --git a/src/interface/chat.c b/src/interface/chat.c index def0d729be..7f69a98426 100644 --- a/src/interface/chat.c +++ b/src/interface/chat.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "chat.h" #include "../audio/audio.h" #include "../audio/mixer.h" diff --git a/src/interface/keyboard_shortcut.c b/src/interface/keyboard_shortcut.c index 1b2ae71931..acb482889f 100644 --- a/src/interface/keyboard_shortcut.c +++ b/src/interface/keyboard_shortcut.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../game.h" #include "../editor.h" diff --git a/src/interface/viewport.c b/src/interface/viewport.c index 7055b4889d..eebdf41b59 100644 --- a/src/interface/viewport.c +++ b/src/interface/viewport.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../drawing/drawing.h" #include "../paint/supports.h" diff --git a/src/network/network.cpp b/src/network/network.cpp index 51e59503a1..0519248b7a 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -31,7 +31,6 @@ extern "C" { #include "network.h" extern "C" { -#include "../addresses.h" } #ifndef DISABLE_NETWORK diff --git a/src/object_list.c b/src/object_list.c index f30b7916d8..49e86776ac 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "addresses.h" #include "game.h" #include "object.h" #include "object_list.h" diff --git a/src/object_list.h b/src/object_list.h index 7a88deb25b..02ec640eba 100644 --- a/src/object_list.h +++ b/src/object_list.h @@ -1,5 +1,6 @@ #pragma once +#include "addresses.h" #include "ride/ride.h" #include "world/banner.h" #include "world/entrance.h" @@ -21,7 +22,6 @@ extern rct_stex_entry *gStexEntries[1]; #else - #include "addresses.h" #define gRideEntries RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*) #define gSmallSceneryEntries RCT2_ADDRESS(RCT2_ADDRESS_SMALL_SCENERY_ENTRIES, rct_small_scenery_entry*) diff --git a/src/openrct2.c b/src/openrct2.c index 9685d76b58..9ef6ad3ce2 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "addresses.h" #include "audio/audio.h" #include "audio/mixer.h" #include "config.h" diff --git a/src/paint/map_element/banner.c b/src/paint/map_element/banner.c index efbcea21e9..5a6d239045 100644 --- a/src/paint/map_element/banner.c +++ b/src/paint/map_element/banner.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../paint.h" #include "../../config.h" #include "../../game.h" diff --git a/src/paint/map_element/fence.c b/src/paint/map_element/fence.c index 3280b12488..3953db4c07 100644 --- a/src/paint/map_element/fence.c +++ b/src/paint/map_element/fence.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../world/map.h" #include "../../drawing/drawing.h" diff --git a/src/paint/map_element/map_element.c b/src/paint/map_element/map_element.c index 5d260c90e0..83173c6ee3 100644 --- a/src/paint/map_element/map_element.c +++ b/src/paint/map_element/map_element.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../paint.h" #include "../../interface/viewport.h" #include "map_element.h" diff --git a/src/paint/map_element/map_element.h b/src/paint/map_element/map_element.h index f57f313ebb..137a317d0f 100644 --- a/src/paint/map_element/map_element.h +++ b/src/paint/map_element/map_element.h @@ -17,6 +17,7 @@ #ifndef _PAINT_MAP_ELEMENT_H #define _PAINT_MAP_ELEMENT_H +#include "../../addresses.h" #include "../../common.h" #include "../../world/map.h" diff --git a/src/paint/map_element/path.c b/src/paint/map_element/path.c index 91d85ae245..83143b3ca5 100644 --- a/src/paint/map_element/path.c +++ b/src/paint/map_element/path.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../config.h" #include "../../game.h" #include "../../interface/viewport.h" diff --git a/src/paint/map_element/scenery.c b/src/paint/map_element/scenery.c index 70fa2e56b2..263cf9c90e 100644 --- a/src/paint/map_element/scenery.c +++ b/src/paint/map_element/scenery.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "map_element.h" #include "../../config.h" #include "../../game.h" diff --git a/src/paint/map_element/scenery_multiple.c b/src/paint/map_element/scenery_multiple.c index 03ecd11d61..1ef3576456 100644 --- a/src/paint/map_element/scenery_multiple.c +++ b/src/paint/map_element/scenery_multiple.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "map_element.h" #include "../paint.h" #include "../supports.h" diff --git a/src/paint/map_element/surface.c b/src/paint/map_element/surface.c index 1cfa5f5f0b..1ef953a3c4 100644 --- a/src/paint/map_element/surface.c +++ b/src/paint/map_element/surface.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../cheats.h" #include "../../common.h" #include "../../config.h" diff --git a/src/paint/paint.c b/src/paint/paint.c index 4990b29f20..a02c6d5965 100644 --- a/src/paint/paint.c +++ b/src/paint/paint.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "paint.h" #include "../drawing/drawing.h" #include "../localisation/localisation.h" diff --git a/src/paint/paint.h b/src/paint/paint.h index 9c21484aa4..518c523896 100644 --- a/src/paint/paint.h +++ b/src/paint/paint.h @@ -17,13 +17,11 @@ #ifndef _PAINT_H #define _PAINT_H +#include "../addresses.h" #include "../common.h" #include "../world/map.h" #include "../interface/colour.h" #include "../drawing/drawing.h" -#ifndef NO_RCT2 - #include "../addresses.h" -#endif typedef struct attached_paint_struct attached_paint_struct; struct paint_struct; diff --git a/src/paint/sprite/sprite.c b/src/paint/sprite/sprite.c index 1387587359..1d3e14960d 100644 --- a/src/paint/sprite/sprite.c +++ b/src/paint/sprite/sprite.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "sprite.h" #include "../paint.h" #include "../../drawing/drawing.h" diff --git a/src/paint/supports.c b/src/paint/supports.c index b65f68a716..1b947de5b5 100644 --- a/src/paint/supports.c +++ b/src/paint/supports.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../interface/viewport.h" #include "../paint/paint.h" #include "supports.h" diff --git a/src/peep/staff.c b/src/peep/staff.c index c64fa17c38..b93253cfb1 100644 --- a/src/peep/staff.c +++ b/src/peep/staff.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../game.h" #include "../scenario.h" diff --git a/src/platform/shared.c b/src/platform/shared.c index 1c95e09c2a..f9428ef96c 100644 --- a/src/platform/shared.c +++ b/src/platform/shared.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../audio/audio.h" #include "../audio/mixer.h" #include "../config.h" diff --git a/src/platform/windows.c b/src/platform/windows.c index 7ab773e0e7..c4a339e28a 100644 --- a/src/platform/windows.c +++ b/src/platform/windows.c @@ -24,7 +24,6 @@ #include #include #include -#include "../addresses.h" #include "../openrct2.h" #include "../localisation/language.h" #include "../util/util.h" diff --git a/src/rct1/S4Importer.cpp b/src/rct1/S4Importer.cpp index 64ff11db58..41b4e7c0d8 100644 --- a/src/rct1/S4Importer.cpp +++ b/src/rct1/S4Importer.cpp @@ -29,7 +29,6 @@ extern "C" { - #include "../addresses.h" #include "../audio/audio.h" #include "../cheats.h" #include "../editor.h" diff --git a/src/rct2/S6Exporter.cpp b/src/rct2/S6Exporter.cpp index 4c9104de14..fbea148c86 100644 --- a/src/rct2/S6Exporter.cpp +++ b/src/rct2/S6Exporter.cpp @@ -21,7 +21,6 @@ extern "C" { - #include "../addresses.h" #include "../config.h" #include "../game.h" #include "../interface/viewport.h" diff --git a/src/rct2/S6Importer.cpp b/src/rct2/S6Importer.cpp index 3e2ebc1a66..33fac05816 100644 --- a/src/rct2/S6Importer.cpp +++ b/src/rct2/S6Importer.cpp @@ -21,7 +21,6 @@ extern "C" { - #include "../addresses.h" #include "../config.h" #include "../game.h" #include "../interface/viewport.h" diff --git a/src/ride/coaster/junior_roller_coaster.c b/src/ride/coaster/junior_roller_coaster.c index 7a7885b4d1..86d2fc70a2 100644 --- a/src/ride/coaster/junior_roller_coaster.c +++ b/src/ride/coaster/junior_roller_coaster.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../config.h" #include "../../drawing/drawing.h" #include "../../paint/supports.h" diff --git a/src/ride/coaster/reverser_roller_coaster.c b/src/ride/coaster/reverser_roller_coaster.c index fbcfd0ca7e..de7fec0ed1 100644 --- a/src/ride/coaster/reverser_roller_coaster.c +++ b/src/ride/coaster/reverser_roller_coaster.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../config.h" #include "../../interface/viewport.h" #include "../../world/sprite.h" diff --git a/src/ride/coaster/virginia_reel.c b/src/ride/coaster/virginia_reel.c index b62288360b..848aab66c0 100644 --- a/src/ride/coaster/virginia_reel.c +++ b/src/ride/coaster/virginia_reel.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../track_paint.h" #include "../track.h" diff --git a/src/ride/gentle/car_ride.c b/src/ride/gentle/car_ride.c index 65b9f9a32e..e090ca8403 100644 --- a/src/ride/gentle/car_ride.c +++ b/src/ride/gentle/car_ride.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../track_paint.h" #include "../track.h" diff --git a/src/ride/gentle/circus_show.c b/src/ride/gentle/circus_show.c index 4c12456a0f..5cbe977aad 100644 --- a/src/ride/gentle/circus_show.c +++ b/src/ride/gentle/circus_show.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/gentle/crooked_house.c b/src/ride/gentle/crooked_house.c index 6b6d5195af..1b7035c99b 100644 --- a/src/ride/gentle/crooked_house.c +++ b/src/ride/gentle/crooked_house.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/gentle/dodgems.c b/src/ride/gentle/dodgems.c index 51b29d0232..a48ecba73a 100644 --- a/src/ride/gentle/dodgems.c +++ b/src/ride/gentle/dodgems.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/gentle/ferris_wheel.c b/src/ride/gentle/ferris_wheel.c index e08e2fd302..60339e2c3e 100644 --- a/src/ride/gentle/ferris_wheel.c +++ b/src/ride/gentle/ferris_wheel.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/gentle/flying_saucers.c b/src/ride/gentle/flying_saucers.c index 80de6ff77e..40ab4fc1f5 100644 --- a/src/ride/gentle/flying_saucers.c +++ b/src/ride/gentle/flying_saucers.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/gentle/ghost_train.c b/src/ride/gentle/ghost_train.c index c98bd8773c..80c650734c 100644 --- a/src/ride/gentle/ghost_train.c +++ b/src/ride/gentle/ghost_train.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../track_paint.h" #include "../track.h" #include "../vehicle_paint.h" diff --git a/src/ride/gentle/haunted_house.c b/src/ride/gentle/haunted_house.c index 8b4ea76d22..16b5c0430e 100644 --- a/src/ride/gentle/haunted_house.c +++ b/src/ride/gentle/haunted_house.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/gentle/maze.c b/src/ride/gentle/maze.c index 52b05ed06e..cefe4ee6b2 100644 --- a/src/ride/gentle/maze.c +++ b/src/ride/gentle/maze.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../paint/supports.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" diff --git a/src/ride/gentle/merry_go_round.c b/src/ride/gentle/merry_go_round.c index ab50c02a0d..52734fa038 100644 --- a/src/ride/gentle/merry_go_round.c +++ b/src/ride/gentle/merry_go_round.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/gentle/mini_golf.c b/src/ride/gentle/mini_golf.c index 1f589bb68c..bca5a23806 100644 --- a/src/ride/gentle/mini_golf.c +++ b/src/ride/gentle/mini_golf.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../config.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" diff --git a/src/ride/gentle/mini_helicopters.c b/src/ride/gentle/mini_helicopters.c index 2d64d74856..fcfa620635 100644 --- a/src/ride/gentle/mini_helicopters.c +++ b/src/ride/gentle/mini_helicopters.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../track_paint.h" #include "../track.h" #include "../vehicle_paint.h" diff --git a/src/ride/gentle/monorail_cycles.c b/src/ride/gentle/monorail_cycles.c index 97f50eea30..375a05adc4 100644 --- a/src/ride/gentle/monorail_cycles.c +++ b/src/ride/gentle/monorail_cycles.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../track_paint.h" #include "../track.h" diff --git a/src/ride/gentle/observation_tower.c b/src/ride/gentle/observation_tower.c index 122bb7ba84..793b00c6e3 100644 --- a/src/ride/gentle/observation_tower.c +++ b/src/ride/gentle/observation_tower.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" diff --git a/src/ride/gentle/space_rings.c b/src/ride/gentle/space_rings.c index 9c6bc38fbb..e042f2f9bb 100644 --- a/src/ride/gentle/space_rings.c +++ b/src/ride/gentle/space_rings.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../interface/viewport.h" #include "../track_paint.h" diff --git a/src/ride/gentle/spiral_slide.c b/src/ride/gentle/spiral_slide.c index 33634115bf..e6d950fb2f 100644 --- a/src/ride/gentle/spiral_slide.c +++ b/src/ride/gentle/spiral_slide.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/shops/facility.c b/src/ride/shops/facility.c index 4c296275b8..cfb64c9bae 100644 --- a/src/ride/shops/facility.c +++ b/src/ride/shops/facility.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../paint/supports.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" diff --git a/src/ride/shops/shop.c b/src/ride/shops/shop.c index 0cf2290b9d..8b98bb3dc4 100644 --- a/src/ride/shops/shop.c +++ b/src/ride/shops/shop.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../paint/supports.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" diff --git a/src/ride/thrill/3d_cinema.c b/src/ride/thrill/3d_cinema.c index b5d1158fb6..fefc58c685 100644 --- a/src/ride/thrill/3d_cinema.c +++ b/src/ride/thrill/3d_cinema.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/thrill/enterprise.c b/src/ride/thrill/enterprise.c index 8e9fe64ac0..12ea7c2f64 100644 --- a/src/ride/thrill/enterprise.c +++ b/src/ride/thrill/enterprise.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../interface/viewport.h" #include "../track_paint.h" diff --git a/src/ride/thrill/go_karts.c b/src/ride/thrill/go_karts.c index ccc8331890..0f8a1afba5 100644 --- a/src/ride/thrill/go_karts.c +++ b/src/ride/thrill/go_karts.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../track_paint.h" #include "../track.h" diff --git a/src/ride/thrill/launched_freefall.c b/src/ride/thrill/launched_freefall.c index 97b990a4eb..4e777e1462 100644 --- a/src/ride/thrill/launched_freefall.c +++ b/src/ride/thrill/launched_freefall.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../config.h" #include "../../interface/viewport.h" diff --git a/src/ride/thrill/magic_carpet.c b/src/ride/thrill/magic_carpet.c index d277286273..d10b34cf3c 100644 --- a/src/ride/thrill/magic_carpet.c +++ b/src/ride/thrill/magic_carpet.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/thrill/motion_simulator.c b/src/ride/thrill/motion_simulator.c index ce0f28a128..e43f562aca 100644 --- a/src/ride/thrill/motion_simulator.c +++ b/src/ride/thrill/motion_simulator.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/thrill/pirate_ship.c b/src/ride/thrill/pirate_ship.c index 4628926d63..9628272a89 100644 --- a/src/ride/thrill/pirate_ship.c +++ b/src/ride/thrill/pirate_ship.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/thrill/roto_drop.c b/src/ride/thrill/roto_drop.c index c124a80430..43137f8530 100644 --- a/src/ride/thrill/roto_drop.c +++ b/src/ride/thrill/roto_drop.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" diff --git a/src/ride/thrill/swinging_inverter_ship.c b/src/ride/thrill/swinging_inverter_ship.c index 8de4b69859..0c605feb0d 100644 --- a/src/ride/thrill/swinging_inverter_ship.c +++ b/src/ride/thrill/swinging_inverter_ship.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" #include "../../paint/supports.h" diff --git a/src/ride/thrill/top_spin.c b/src/ride/thrill/top_spin.c index 2854558885..b6bc1dc2bb 100644 --- a/src/ride/thrill/top_spin.c +++ b/src/ride/thrill/top_spin.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../paint/supports.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" diff --git a/src/ride/thrill/twist.c b/src/ride/thrill/twist.c index ecc21b0b87..76671dddfd 100644 --- a/src/ride/thrill/twist.c +++ b/src/ride/thrill/twist.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../interface/viewport.h" #include "../track_paint.h" diff --git a/src/ride/track_design_save.c b/src/ride/track_design_save.c index 3118cc23df..303be5aef7 100644 --- a/src/ride/track_design_save.c +++ b/src/ride/track_design_save.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../audio/audio.h" #include "../config.h" #include "../game.h" diff --git a/src/ride/track_paint.c b/src/ride/track_paint.c index 20c759aaca..412490acc4 100644 --- a/src/ride/track_paint.c +++ b/src/ride/track_paint.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../drawing/drawing.h" #include "../paint/supports.h" diff --git a/src/ride/track_paint.h b/src/ride/track_paint.h index 1a0dc7f4fc..40b9169278 100644 --- a/src/ride/track_paint.h +++ b/src/ride/track_paint.h @@ -17,6 +17,7 @@ #ifndef _TRACK_PAINT_H #define _TRACK_PAINT_H +#include "../addresses.h" #include "ride_data.h" #include "../common.h" #include "../paint/map_element/map_element.h" diff --git a/src/ride/transport/chairlift.c b/src/ride/transport/chairlift.c index 68b2c3bf23..8cb91ae7f5 100644 --- a/src/ride/transport/chairlift.c +++ b/src/ride/transport/chairlift.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../world/map.h" #include "../track_paint.h" #include "../track.h" diff --git a/src/ride/transport/lift.c b/src/ride/transport/lift.c index a9fd29bf73..31bc84f075 100644 --- a/src/ride/transport/lift.c +++ b/src/ride/transport/lift.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../interface/viewport.h" #include "../../paint/paint.h" diff --git a/src/ride/transport/monorail.c b/src/ride/transport/monorail.c index 20d88c7a5f..5999832f5a 100644 --- a/src/ride/transport/monorail.c +++ b/src/ride/transport/monorail.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../track_paint.h" #include "../track.h" diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 897e5a9817..b06cac3aba 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../game.h" #include "../audio/audio.h" #include "../audio/mixer.h" diff --git a/src/ride/vehicle_paint.c b/src/ride/vehicle_paint.c index 57f2bc8b47..9716f81430 100644 --- a/src/ride/vehicle_paint.c +++ b/src/ride/vehicle_paint.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../paint/paint.h" #include "../drawing/drawing.h" #include "../world/sprite.h" diff --git a/src/ride/water/boat_ride.c b/src/ride/water/boat_ride.c index 5b411da509..70863b2908 100644 --- a/src/ride/water/boat_ride.c +++ b/src/ride/water/boat_ride.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../interface/viewport.h" #include "../track_paint.h" diff --git a/src/ride/water/river_rafts.c b/src/ride/water/river_rafts.c index 7c3736c96a..9ee4348551 100644 --- a/src/ride/water/river_rafts.c +++ b/src/ride/water/river_rafts.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../common.h" #include "../../interface/viewport.h" #include "../../paint/supports.h" diff --git a/src/ride/water/river_rapids.c b/src/ride/water/river_rapids.c index 8faa3da43e..c95eefe0f6 100644 --- a/src/ride/water/river_rapids.c +++ b/src/ride/water/river_rapids.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../config.h" #include "../../interface/viewport.h" #include "../../world/sprite.h" diff --git a/src/ride/water/splash_boats.c b/src/ride/water/splash_boats.c index f73c941482..e817ecaf32 100644 --- a/src/ride/water/splash_boats.c +++ b/src/ride/water/splash_boats.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../../config.h" #include "../../interface/viewport.h" #include "../../world/sprite.h" diff --git a/src/ride/water/submarine_ride.c b/src/ride/water/submarine_ride.c index f1e4f95f4e..a1421fec27 100644 --- a/src/ride/water/submarine_ride.c +++ b/src/ride/water/submarine_ride.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../../addresses.h" #include "../track_paint.h" #include "../track.h" #include "../vehicle_paint.h" diff --git a/src/scenario.c b/src/scenario.c index da27d44795..4ba785c2eb 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "addresses.h" #include "cheats.h" #include "config.h" #include "game.h" diff --git a/src/scenario.h b/src/scenario.h index 5237740186..724256388a 100644 --- a/src/scenario.h +++ b/src/scenario.h @@ -17,6 +17,7 @@ #ifndef _SCENARIO_H_ #define _SCENARIO_H_ +#include "addresses.h" #include "common.h" #include "management/award.h" #include "management/finance.h" diff --git a/src/windows/clear_scenery.c b/src/windows/clear_scenery.c index 96766aa6b2..7d38b8f393 100644 --- a/src/windows/clear_scenery.c +++ b/src/windows/clear_scenery.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../input.h" #include "../localisation/localisation.h" #include "../sprites.h" diff --git a/src/windows/dropdown.c b/src/windows/dropdown.c index fda1e88be9..9f378d3bd6 100644 --- a/src/windows/dropdown.c +++ b/src/windows/dropdown.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../input.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/windows/editor_inventions_list.c b/src/windows/editor_inventions_list.c index d454f8ee18..587fde942a 100644 --- a/src/windows/editor_inventions_list.c +++ b/src/windows/editor_inventions_list.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../cursors.h" #include "../editor.h" #include "../input.h" diff --git a/src/windows/editor_main.c b/src/windows/editor_main.c index 9ad78940e9..e7d4a2a85e 100644 --- a/src/windows/editor_main.c +++ b/src/windows/editor_main.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/windows/editor_objective_options.c b/src/windows/editor_objective_options.c index 172fd775d3..b32555ec79 100644 --- a/src/windows/editor_objective_options.c +++ b/src/windows/editor_objective_options.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../game.h" #include "../interface/themes.h" #include "../interface/widget.h" diff --git a/src/windows/error.c b/src/windows/error.c index 2cf7df4377..f16ec070b6 100644 --- a/src/windows/error.c +++ b/src/windows/error.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../audio/audio.h" #include "../localisation/localisation.h" #include "../interface/widget.h" diff --git a/src/windows/finances.c b/src/windows/finances.c index 69a6323ae1..e569217ccc 100644 --- a/src/windows/finances.c +++ b/src/windows/finances.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../game.h" #include "../interface/graph.h" diff --git a/src/windows/land_rights.c b/src/windows/land_rights.c index e2d70465a0..3d25524416 100644 --- a/src/windows/land_rights.c +++ b/src/windows/land_rights.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../input.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/windows/main.c b/src/windows/main.c index 5ff74a1de9..5f1a6209b7 100644 --- a/src/windows/main.c +++ b/src/windows/main.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../interface/viewport.h" #include "../interface/widget.h" #include "../interface/window.h" diff --git a/src/windows/map_tooltip.c b/src/windows/map_tooltip.c index 161535877c..04d86c8771 100644 --- a/src/windows/map_tooltip.c +++ b/src/windows/map_tooltip.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../localisation/localisation.h" #include "../input.h" #include "../interface/widget.h" diff --git a/src/windows/park.c b/src/windows/park.c index 30b500d842..1cca36b76b 100644 --- a/src/windows/park.c +++ b/src/windows/park.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../game.h" #include "../localisation/date.h" diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index 314c4a3f97..db9f361778 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../audio/audio.h" #include "../cheats.h" #include "../config.h" diff --git a/src/windows/scenery.c b/src/windows/scenery.c index 92f328e662..ece8d7051e 100644 --- a/src/windows/scenery.c +++ b/src/windows/scenery.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../audio/audio.h" #include "../drawing/drawing.h" #include "../game.h" diff --git a/src/windows/shortcut_key_change.c b/src/windows/shortcut_key_change.c index 7698e7a4bb..d51fdf1217 100644 --- a/src/windows/shortcut_key_change.c +++ b/src/windows/shortcut_key_change.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../interface/keyboard_shortcut.h" #include "../interface/themes.h" diff --git a/src/windows/staff_list.c b/src/windows/staff_list.c index 1018a71109..d202680296 100644 --- a/src/windows/staff_list.c +++ b/src/windows/staff_list.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../game.h" #include "../drawing/drawing.h" diff --git a/src/windows/title_scenarioselect.c b/src/windows/title_scenarioselect.c index 9e2e7f8c33..ed66bb697c 100644 --- a/src/windows/title_scenarioselect.c +++ b/src/windows/title_scenarioselect.c @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../addresses.h" #include "../config.h" #include "../audio/audio.h" #include "../localisation/date.h" diff --git a/src/world/map.c b/src/world/map.c index b00c589708..2b77929541 100644 --- a/src/world/map.c +++ b/src/world/map.c @@ -14,6 +14,7 @@ *****************************************************************************/ #pragma endregion +#include "../addresses.h" #include "../audio/audio.h" #include "../cheats.h" #include "../config.h"