diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj index ae342e584f..a43a2ea97d 100644 --- a/projects/openttd_vs100.vcxproj +++ b/projects/openttd_vs100.vcxproj @@ -852,109 +852,109 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters index 7414553d0a..08f0dd2b8f 100644 --- a/projects/openttd_vs100.vcxproj.filters +++ b/projects/openttd_vs100.vcxproj.filters @@ -1776,313 +1776,313 @@ AI Core - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - AI API - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - - - AI API - AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + AI API - + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + + AI API + + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation - + AI API Implementation diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index a91958de86..d602fdc587 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -2730,216 +2730,216 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2947,203 +2947,203 @@ Name="AI API Implementation" > diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index b0ff55897f..65541ce18b 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -2727,216 +2727,216 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2944,203 +2944,203 @@ Name="AI API Implementation" > diff --git a/source.list b/source.list index 5b10f43c5f..c4e56e8a29 100644 --- a/source.list +++ b/source.list @@ -625,111 +625,111 @@ ai/ai_scanner.hpp ai/ai_storage.hpp # AI API -ai/api/ai_accounting.hpp -ai/api/ai_airport.hpp -ai/api/ai_base.hpp -ai/api/ai_basestation.hpp -ai/api/ai_bridge.hpp -ai/api/ai_bridgelist.hpp -ai/api/ai_cargo.hpp -ai/api/ai_cargolist.hpp ai/api/ai_changelog.hpp -ai/api/ai_company.hpp -ai/api/ai_controller.hpp -ai/api/ai_date.hpp -ai/api/ai_depotlist.hpp -ai/api/ai_engine.hpp -ai/api/ai_enginelist.hpp -ai/api/ai_error.hpp -ai/api/ai_event.hpp -ai/api/ai_event_types.hpp -ai/api/ai_execmode.hpp -ai/api/ai_gamesettings.hpp -ai/api/ai_group.hpp -ai/api/ai_grouplist.hpp -ai/api/ai_industry.hpp -ai/api/ai_industrylist.hpp -ai/api/ai_industrytype.hpp -ai/api/ai_industrytypelist.hpp ai/api/ai_info_docs.hpp -ai/api/ai_list.hpp -ai/api/ai_log.hpp -ai/api/ai_map.hpp -ai/api/ai_marine.hpp -ai/api/ai_object.hpp -ai/api/ai_order.hpp -ai/api/ai_rail.hpp -ai/api/ai_railtypelist.hpp -ai/api/ai_road.hpp -ai/api/ai_sign.hpp -ai/api/ai_signlist.hpp -ai/api/ai_station.hpp -ai/api/ai_stationlist.hpp -ai/api/ai_subsidy.hpp -ai/api/ai_subsidylist.hpp -ai/api/ai_testmode.hpp -ai/api/ai_tile.hpp -ai/api/ai_tilelist.hpp -ai/api/ai_town.hpp -ai/api/ai_townlist.hpp -ai/api/ai_tunnel.hpp -ai/api/ai_types.hpp -ai/api/ai_vehicle.hpp -ai/api/ai_vehiclelist.hpp -ai/api/ai_waypoint.hpp -ai/api/ai_waypointlist.hpp +script/api/script_accounting.hpp +script/api/script_airport.hpp +script/api/script_base.hpp +script/api/script_basestation.hpp +script/api/script_bridge.hpp +script/api/script_bridgelist.hpp +script/api/script_cargo.hpp +script/api/script_cargolist.hpp +script/api/script_company.hpp +script/api/script_controller.hpp +script/api/script_date.hpp +script/api/script_depotlist.hpp +script/api/script_engine.hpp +script/api/script_enginelist.hpp +script/api/script_error.hpp +script/api/script_event.hpp +script/api/script_event_types.hpp +script/api/script_execmode.hpp +script/api/script_gamesettings.hpp +script/api/script_group.hpp +script/api/script_grouplist.hpp +script/api/script_industry.hpp +script/api/script_industrylist.hpp +script/api/script_industrytype.hpp +script/api/script_industrytypelist.hpp +script/api/script_list.hpp +script/api/script_log.hpp +script/api/script_map.hpp +script/api/script_marine.hpp +script/api/script_object.hpp +script/api/script_order.hpp +script/api/script_rail.hpp +script/api/script_railtypelist.hpp +script/api/script_road.hpp +script/api/script_sign.hpp +script/api/script_signlist.hpp +script/api/script_station.hpp +script/api/script_stationlist.hpp +script/api/script_subsidy.hpp +script/api/script_subsidylist.hpp +script/api/script_testmode.hpp +script/api/script_tile.hpp +script/api/script_tilelist.hpp +script/api/script_town.hpp +script/api/script_townlist.hpp +script/api/script_tunnel.hpp +script/api/script_types.hpp +script/api/script_vehicle.hpp +script/api/script_vehiclelist.hpp +script/api/script_waypoint.hpp +script/api/script_waypointlist.hpp # AI API Implementation -ai/api/ai_accounting.cpp -ai/api/ai_airport.cpp -ai/api/ai_base.cpp -ai/api/ai_basestation.cpp -ai/api/ai_bridge.cpp -ai/api/ai_bridgelist.cpp -ai/api/ai_cargo.cpp -ai/api/ai_cargolist.cpp -ai/api/ai_company.cpp -ai/api/ai_controller.cpp -ai/api/ai_date.cpp -ai/api/ai_depotlist.cpp -ai/api/ai_engine.cpp -ai/api/ai_enginelist.cpp -ai/api/ai_error.cpp -ai/api/ai_event.cpp -ai/api/ai_event_types.cpp -ai/api/ai_execmode.cpp -ai/api/ai_gamesettings.cpp -ai/api/ai_group.cpp -ai/api/ai_grouplist.cpp -ai/api/ai_industry.cpp -ai/api/ai_industrylist.cpp -ai/api/ai_industrytype.cpp -ai/api/ai_industrytypelist.cpp -ai/api/ai_list.cpp -ai/api/ai_log.cpp -ai/api/ai_map.cpp -ai/api/ai_marine.cpp -ai/api/ai_object.cpp -ai/api/ai_order.cpp -ai/api/ai_rail.cpp -ai/api/ai_railtypelist.cpp -ai/api/ai_road.cpp -ai/api/ai_sign.cpp -ai/api/ai_signlist.cpp -ai/api/ai_station.cpp -ai/api/ai_stationlist.cpp -ai/api/ai_subsidy.cpp -ai/api/ai_subsidylist.cpp -ai/api/ai_testmode.cpp -ai/api/ai_tile.cpp -ai/api/ai_tilelist.cpp -ai/api/ai_town.cpp -ai/api/ai_townlist.cpp -ai/api/ai_tunnel.cpp -ai/api/ai_vehicle.cpp -ai/api/ai_vehiclelist.cpp -ai/api/ai_waypoint.cpp -ai/api/ai_waypointlist.cpp +script/api/script_accounting.cpp +script/api/script_airport.cpp +script/api/script_base.cpp +script/api/script_basestation.cpp +script/api/script_bridge.cpp +script/api/script_bridgelist.cpp +script/api/script_cargo.cpp +script/api/script_cargolist.cpp +script/api/script_company.cpp +script/api/script_controller.cpp +script/api/script_date.cpp +script/api/script_depotlist.cpp +script/api/script_engine.cpp +script/api/script_enginelist.cpp +script/api/script_error.cpp +script/api/script_event.cpp +script/api/script_event_types.cpp +script/api/script_execmode.cpp +script/api/script_gamesettings.cpp +script/api/script_group.cpp +script/api/script_grouplist.cpp +script/api/script_industry.cpp +script/api/script_industrylist.cpp +script/api/script_industrytype.cpp +script/api/script_industrytypelist.cpp +script/api/script_list.cpp +script/api/script_log.cpp +script/api/script_map.cpp +script/api/script_marine.cpp +script/api/script_object.cpp +script/api/script_order.cpp +script/api/script_rail.cpp +script/api/script_railtypelist.cpp +script/api/script_road.cpp +script/api/script_sign.cpp +script/api/script_signlist.cpp +script/api/script_station.cpp +script/api/script_stationlist.cpp +script/api/script_subsidy.cpp +script/api/script_subsidylist.cpp +script/api/script_testmode.cpp +script/api/script_tile.cpp +script/api/script_tilelist.cpp +script/api/script_town.cpp +script/api/script_townlist.cpp +script/api/script_tunnel.cpp +script/api/script_vehicle.cpp +script/api/script_vehiclelist.cpp +script/api/script_waypoint.cpp +script/api/script_waypointlist.cpp #end # Blitters diff --git a/src/ai/ai.hpp b/src/ai/ai.hpp index c8e5036b50..2d5355a9ca 100644 --- a/src/ai/ai.hpp +++ b/src/ai/ai.hpp @@ -13,7 +13,7 @@ #define AI_HPP #ifdef ENABLE_AI -#include "api/ai_event_types.hpp" +#include "../script/api/script_event_types.hpp" #include "../date_type.h" #include "../core/string_compare_type.hpp" #include diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp index a370bda9df..5ea4ddac0c 100644 --- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -21,7 +21,7 @@ #include "ai_scanner.hpp" #include "ai_instance.hpp" #include "ai_config.hpp" -#include "api/ai_error.hpp" +#include "../script/api/script_error.hpp" /* static */ uint AI::frame_counter = 0; /* static */ AIScanner *AI::ai_scanner = NULL; diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index d8b55c6c29..90f900f9b1 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -26,7 +26,7 @@ #include "../core/backup_type.hpp" #include "ai.hpp" -#include "api/ai_log.hpp" +#include "../script/api/script_log.hpp" #include "ai_config.hpp" #include "ai_instance.hpp" diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp index 0062ffa875..832b898876 100644 --- a/src/ai/ai_scanner.cpp +++ b/src/ai/ai_scanner.cpp @@ -18,7 +18,7 @@ #include "../script/squirrel_class.hpp" #include "ai_info.hpp" #include "ai_scanner.hpp" -#include "api/ai_controller.hpp" +#include "../script/api/script_controller.hpp" void AIScanner::RescanAIDir() { diff --git a/src/ai/api/ai_accounting.hpp.sq b/src/ai/api/ai_accounting.hpp.sq index 0bebf7a180..f3513f7dd3 100644 --- a/src/ai/api/ai_accounting.hpp.sq +++ b/src/ai/api/ai_accounting.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_accounting.hpp" +#include "../../script/api/script_accounting.hpp" namespace SQConvert { /* Allow AIAccounting to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_airport.hpp.sq b/src/ai/api/ai_airport.hpp.sq index e68ae7c917..4a98e895eb 100644 --- a/src/ai/api/ai_airport.hpp.sq +++ b/src/ai/api/ai_airport.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_airport.hpp" +#include "../../script/api/script_airport.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_base.hpp.sq b/src/ai/api/ai_base.hpp.sq index 677c062738..4f993f786e 100644 --- a/src/ai/api/ai_base.hpp.sq +++ b/src/ai/api/ai_base.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_base.hpp" +#include "../../script/api/script_base.hpp" namespace SQConvert { /* Allow AIBase to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_basestation.hpp.sq b/src/ai/api/ai_basestation.hpp.sq index 070e0640d5..07ca83a5f2 100644 --- a/src/ai/api/ai_basestation.hpp.sq +++ b/src/ai/api/ai_basestation.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_basestation.hpp" +#include "../../script/api/script_basestation.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_bridge.hpp.sq b/src/ai/api/ai_bridge.hpp.sq index 28e37bc74e..ef426f25a0 100644 --- a/src/ai/api/ai_bridge.hpp.sq +++ b/src/ai/api/ai_bridge.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_bridge.hpp" +#include "../../script/api/script_bridge.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_bridgelist.hpp.sq b/src/ai/api/ai_bridgelist.hpp.sq index b02a700be9..62ea99303b 100644 --- a/src/ai/api/ai_bridgelist.hpp.sq +++ b/src/ai/api/ai_bridgelist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_bridgelist.hpp" +#include "../../script/api/script_bridgelist.hpp" namespace SQConvert { /* Allow AIBridgeList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_cargo.hpp.sq b/src/ai/api/ai_cargo.hpp.sq index da92e3e4f2..463a0e0acb 100644 --- a/src/ai/api/ai_cargo.hpp.sq +++ b/src/ai/api/ai_cargo.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_cargo.hpp" +#include "../../script/api/script_cargo.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_cargolist.hpp.sq b/src/ai/api/ai_cargolist.hpp.sq index e046bc43d9..f32cffeb4e 100644 --- a/src/ai/api/ai_cargolist.hpp.sq +++ b/src/ai/api/ai_cargolist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_cargolist.hpp" +#include "../../script/api/script_cargolist.hpp" namespace SQConvert { /* Allow AICargoList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_company.hpp.sq b/src/ai/api/ai_company.hpp.sq index e6ad843c57..0970811980 100644 --- a/src/ai/api/ai_company.hpp.sq +++ b/src/ai/api/ai_company.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_company.hpp" +#include "../../script/api/script_company.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_controller.hpp.sq b/src/ai/api/ai_controller.hpp.sq index f66c234817..20c6818031 100644 --- a/src/ai/api/ai_controller.hpp.sq +++ b/src/ai/api/ai_controller.hpp.sq @@ -7,7 +7,7 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -#include "ai_controller.hpp" +#include "../../script/api/script_controller.hpp" template <> const char *GetClassName() { return "AIController"; } diff --git a/src/ai/api/ai_date.hpp.sq b/src/ai/api/ai_date.hpp.sq index d84f3c078f..f6c534ef57 100644 --- a/src/ai/api/ai_date.hpp.sq +++ b/src/ai/api/ai_date.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_date.hpp" +#include "../../script/api/script_date.hpp" namespace SQConvert { /* Allow AIDate to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_depotlist.hpp.sq b/src/ai/api/ai_depotlist.hpp.sq index 89f9b3b968..aeb835b84e 100644 --- a/src/ai/api/ai_depotlist.hpp.sq +++ b/src/ai/api/ai_depotlist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_depotlist.hpp" +#include "../../script/api/script_depotlist.hpp" namespace SQConvert { /* Allow AIDepotList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_engine.hpp.sq b/src/ai/api/ai_engine.hpp.sq index 8e37b2b1b0..effab73cbb 100644 --- a/src/ai/api/ai_engine.hpp.sq +++ b/src/ai/api/ai_engine.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_engine.hpp" +#include "../../script/api/script_engine.hpp" namespace SQConvert { /* Allow AIEngine to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_enginelist.hpp.sq b/src/ai/api/ai_enginelist.hpp.sq index 7d135f6432..e1879c4412 100644 --- a/src/ai/api/ai_enginelist.hpp.sq +++ b/src/ai/api/ai_enginelist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_enginelist.hpp" +#include "../../script/api/script_enginelist.hpp" namespace SQConvert { /* Allow AIEngineList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_error.hpp.sq b/src/ai/api/ai_error.hpp.sq index 62874810b0..c124c204bf 100644 --- a/src/ai/api/ai_error.hpp.sq +++ b/src/ai/api/ai_error.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_error.hpp" +#include "../../script/api/script_error.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_event.hpp.sq b/src/ai/api/ai_event.hpp.sq index aa86ce8b93..cb79f58f46 100644 --- a/src/ai/api/ai_event.hpp.sq +++ b/src/ai/api/ai_event.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_event.hpp" +#include "../../script/api/script_event.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_event_types.hpp.sq b/src/ai/api/ai_event_types.hpp.sq index 8766e2f3b5..a4d6b4f0ca 100644 --- a/src/ai/api/ai_event_types.hpp.sq +++ b/src/ai/api/ai_event_types.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_event_types.hpp" +#include "../../script/api/script_event_types.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_execmode.hpp.sq b/src/ai/api/ai_execmode.hpp.sq index 61e3673ac8..8e6b77a751 100644 --- a/src/ai/api/ai_execmode.hpp.sq +++ b/src/ai/api/ai_execmode.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_execmode.hpp" +#include "../../script/api/script_execmode.hpp" namespace SQConvert { /* Allow AIExecMode to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_gamesettings.hpp.sq b/src/ai/api/ai_gamesettings.hpp.sq index f0e3c3d6a8..db85025207 100644 --- a/src/ai/api/ai_gamesettings.hpp.sq +++ b/src/ai/api/ai_gamesettings.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_gamesettings.hpp" +#include "../../script/api/script_gamesettings.hpp" namespace SQConvert { /* Allow AIGameSettings to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_group.hpp.sq b/src/ai/api/ai_group.hpp.sq index 5fc4ae34b7..4b0cc7b221 100644 --- a/src/ai/api/ai_group.hpp.sq +++ b/src/ai/api/ai_group.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_group.hpp" +#include "../../script/api/script_group.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_grouplist.hpp.sq b/src/ai/api/ai_grouplist.hpp.sq index bf07c8da27..254cd24752 100644 --- a/src/ai/api/ai_grouplist.hpp.sq +++ b/src/ai/api/ai_grouplist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_grouplist.hpp" +#include "../../script/api/script_grouplist.hpp" namespace SQConvert { /* Allow AIGroupList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_industry.hpp.sq b/src/ai/api/ai_industry.hpp.sq index 7fee363b21..dbc7d1dd6d 100644 --- a/src/ai/api/ai_industry.hpp.sq +++ b/src/ai/api/ai_industry.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_industry.hpp" +#include "../../script/api/script_industry.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_industrylist.hpp.sq b/src/ai/api/ai_industrylist.hpp.sq index 00fb1f6df1..3c10362948 100644 --- a/src/ai/api/ai_industrylist.hpp.sq +++ b/src/ai/api/ai_industrylist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_industrylist.hpp" +#include "../../script/api/script_industrylist.hpp" namespace SQConvert { /* Allow AIIndustryList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_industrytype.hpp.sq b/src/ai/api/ai_industrytype.hpp.sq index ba1d993c84..9a05838056 100644 --- a/src/ai/api/ai_industrytype.hpp.sq +++ b/src/ai/api/ai_industrytype.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_industrytype.hpp" +#include "../../script/api/script_industrytype.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_industrytypelist.hpp.sq b/src/ai/api/ai_industrytypelist.hpp.sq index 4187572ee0..5e7ac4baa4 100644 --- a/src/ai/api/ai_industrytypelist.hpp.sq +++ b/src/ai/api/ai_industrytypelist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_industrytypelist.hpp" +#include "../../script/api/script_industrytypelist.hpp" namespace SQConvert { /* Allow AIIndustryTypeList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_list.hpp.sq b/src/ai/api/ai_list.hpp.sq index ec31ca220f..3465c69573 100644 --- a/src/ai/api/ai_list.hpp.sq +++ b/src/ai/api/ai_list.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_list.hpp" +#include "../../script/api/script_list.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_log.hpp.sq b/src/ai/api/ai_log.hpp.sq index b35625d1d9..ccc850bb3d 100644 --- a/src/ai/api/ai_log.hpp.sq +++ b/src/ai/api/ai_log.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_log.hpp" +#include "../../script/api/script_log.hpp" namespace SQConvert { /* Allow AILog to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_map.hpp.sq b/src/ai/api/ai_map.hpp.sq index 4f051c9b4c..e9c1ac0f28 100644 --- a/src/ai/api/ai_map.hpp.sq +++ b/src/ai/api/ai_map.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_map.hpp" +#include "../../script/api/script_map.hpp" namespace SQConvert { /* Allow AIMap to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_marine.hpp.sq b/src/ai/api/ai_marine.hpp.sq index 7d7f05fa53..3b30a34422 100644 --- a/src/ai/api/ai_marine.hpp.sq +++ b/src/ai/api/ai_marine.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_marine.hpp" +#include "../../script/api/script_marine.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_order.hpp.sq b/src/ai/api/ai_order.hpp.sq index 3d0a6b62f8..c116adc682 100644 --- a/src/ai/api/ai_order.hpp.sq +++ b/src/ai/api/ai_order.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_order.hpp" +#include "../../script/api/script_order.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_rail.hpp.sq b/src/ai/api/ai_rail.hpp.sq index a5a8f663bb..002892f140 100644 --- a/src/ai/api/ai_rail.hpp.sq +++ b/src/ai/api/ai_rail.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_rail.hpp" +#include "../../script/api/script_rail.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_railtypelist.hpp.sq b/src/ai/api/ai_railtypelist.hpp.sq index 9902357964..0ed5789f29 100644 --- a/src/ai/api/ai_railtypelist.hpp.sq +++ b/src/ai/api/ai_railtypelist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_railtypelist.hpp" +#include "../../script/api/script_railtypelist.hpp" namespace SQConvert { /* Allow AIRailTypeList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_road.hpp.sq b/src/ai/api/ai_road.hpp.sq index 20b79e249d..8596866348 100644 --- a/src/ai/api/ai_road.hpp.sq +++ b/src/ai/api/ai_road.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_road.hpp" +#include "../../script/api/script_road.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_sign.hpp.sq b/src/ai/api/ai_sign.hpp.sq index c33e18d749..87a3bc1712 100644 --- a/src/ai/api/ai_sign.hpp.sq +++ b/src/ai/api/ai_sign.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_sign.hpp" +#include "../../script/api/script_sign.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_signlist.hpp.sq b/src/ai/api/ai_signlist.hpp.sq index 91a2383c4c..a07a8f66e6 100644 --- a/src/ai/api/ai_signlist.hpp.sq +++ b/src/ai/api/ai_signlist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_signlist.hpp" +#include "../../script/api/script_signlist.hpp" namespace SQConvert { /* Allow AISignList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_station.hpp.sq b/src/ai/api/ai_station.hpp.sq index 3f064995a7..fb5fd85689 100644 --- a/src/ai/api/ai_station.hpp.sq +++ b/src/ai/api/ai_station.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_station.hpp" +#include "../../script/api/script_station.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_stationlist.hpp.sq b/src/ai/api/ai_stationlist.hpp.sq index 04e0b86465..1c57de0892 100644 --- a/src/ai/api/ai_stationlist.hpp.sq +++ b/src/ai/api/ai_stationlist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_stationlist.hpp" +#include "../../script/api/script_stationlist.hpp" namespace SQConvert { /* Allow AIStationList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_subsidy.hpp.sq b/src/ai/api/ai_subsidy.hpp.sq index b32dabe726..d55564a735 100644 --- a/src/ai/api/ai_subsidy.hpp.sq +++ b/src/ai/api/ai_subsidy.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_subsidy.hpp" +#include "../../script/api/script_subsidy.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_subsidylist.hpp.sq b/src/ai/api/ai_subsidylist.hpp.sq index cfe4412133..ab614975e8 100644 --- a/src/ai/api/ai_subsidylist.hpp.sq +++ b/src/ai/api/ai_subsidylist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_subsidylist.hpp" +#include "../../script/api/script_subsidylist.hpp" namespace SQConvert { /* Allow AISubsidyList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_testmode.hpp.sq b/src/ai/api/ai_testmode.hpp.sq index dc369e36e1..01e294b5c0 100644 --- a/src/ai/api/ai_testmode.hpp.sq +++ b/src/ai/api/ai_testmode.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_testmode.hpp" +#include "../../script/api/script_testmode.hpp" namespace SQConvert { /* Allow AITestMode to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_tile.hpp.sq b/src/ai/api/ai_tile.hpp.sq index 6a7f771e53..a6702d43b7 100644 --- a/src/ai/api/ai_tile.hpp.sq +++ b/src/ai/api/ai_tile.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_tile.hpp" +#include "../../script/api/script_tile.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_tilelist.hpp.sq b/src/ai/api/ai_tilelist.hpp.sq index 0cbfbc3326..361b6ecf0d 100644 --- a/src/ai/api/ai_tilelist.hpp.sq +++ b/src/ai/api/ai_tilelist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_tilelist.hpp" +#include "../../script/api/script_tilelist.hpp" namespace SQConvert { /* Allow AITileList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_town.hpp.sq b/src/ai/api/ai_town.hpp.sq index 7bbc9a4023..9b11d0bd2e 100644 --- a/src/ai/api/ai_town.hpp.sq +++ b/src/ai/api/ai_town.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_town.hpp" +#include "../../script/api/script_town.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_townlist.hpp.sq b/src/ai/api/ai_townlist.hpp.sq index 36798478bd..ccec80e576 100644 --- a/src/ai/api/ai_townlist.hpp.sq +++ b/src/ai/api/ai_townlist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_townlist.hpp" +#include "../../script/api/script_townlist.hpp" namespace SQConvert { /* Allow AITownList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_tunnel.hpp.sq b/src/ai/api/ai_tunnel.hpp.sq index 6837253a93..6c138945a6 100644 --- a/src/ai/api/ai_tunnel.hpp.sq +++ b/src/ai/api/ai_tunnel.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_tunnel.hpp" +#include "../../script/api/script_tunnel.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_vehicle.hpp.sq b/src/ai/api/ai_vehicle.hpp.sq index ce8ff22dff..b1e7dc799e 100644 --- a/src/ai/api/ai_vehicle.hpp.sq +++ b/src/ai/api/ai_vehicle.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_vehicle.hpp" +#include "../../script/api/script_vehicle.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_vehiclelist.hpp.sq b/src/ai/api/ai_vehiclelist.hpp.sq index ff8df7614a..ce4fe14703 100644 --- a/src/ai/api/ai_vehiclelist.hpp.sq +++ b/src/ai/api/ai_vehiclelist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_vehiclelist.hpp" +#include "../../script/api/script_vehiclelist.hpp" namespace SQConvert { /* Allow AIVehicleList to be used as Squirrel parameter */ diff --git a/src/ai/api/ai_waypoint.hpp.sq b/src/ai/api/ai_waypoint.hpp.sq index e4db4896d3..4d126f38cc 100644 --- a/src/ai/api/ai_waypoint.hpp.sq +++ b/src/ai/api/ai_waypoint.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_waypoint.hpp" +#include "../../script/api/script_waypoint.hpp" namespace SQConvert { /* Allow enums to be used as Squirrel parameters */ diff --git a/src/ai/api/ai_waypointlist.hpp.sq b/src/ai/api/ai_waypointlist.hpp.sq index 3fedd74cf0..d57ebe30f0 100644 --- a/src/ai/api/ai_waypointlist.hpp.sq +++ b/src/ai/api/ai_waypointlist.hpp.sq @@ -9,7 +9,7 @@ /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */ -#include "ai_waypointlist.hpp" +#include "../../script/api/script_waypointlist.hpp" namespace SQConvert { /* Allow AIWaypointList to be used as Squirrel parameter */ diff --git a/src/ai/api/squirrel_export.awk b/src/ai/api/squirrel_export.awk index bece800d6c..168d146f24 100644 --- a/src/ai/api/squirrel_export.awk +++ b/src/ai/api/squirrel_export.awk @@ -70,7 +70,8 @@ BEGIN { print "" print "/* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */" print "" - print "#include \"" $3 "\"" + gsub("^" tolower(api) "_", "script_", $3) + print "#include \"../../script/api/" $3 "\"" } # Remove the old squirrel stuff diff --git a/src/ai/api/squirrel_export.sh b/src/ai/api/squirrel_export.sh index 94a16f5257..725890951a 100755 --- a/src/ai/api/squirrel_export.sh +++ b/src/ai/api/squirrel_export.sh @@ -25,20 +25,21 @@ apilc=`pwd | sed "s@/api@@;s@.*/@@"` apiuc=`echo ${apilc} | tr [a-z] [A-Z]` if [ -z "$1" ]; then - for f in `ls *.hpp`; do - case "${f}" in + for f in `ls ../../script/api/*.hpp`; do + bf=`basename $f | sed s/script/${apilc}/` + case "${bf}" in # these files should not be changed by this script "ai_controller.hpp" | "ai_object.hpp" | "ai_types.hpp" | "ai_changelog.hpp" | "ai_info_docs.hpp" ) continue; esac - ${AWK} -v api=${apiuc} -f squirrel_export.awk ${f} > ${f}.tmp - if ! [ -f "${f}.sq" ] || [ -n "`diff -I '$Id' ${f}.tmp ${f}.sq 2> /dev/null || echo boo`" ]; then - mv ${f}.tmp ${f}.sq - echo "Updated: ${f}.sq" - svn add ${f}.sq > /dev/null 2>&1 - svn propset svn:eol-style native ${f}.sq > /dev/null 2>&1 - svn propset svn:keywords Id ${f}.sq > /dev/null 2>&1 + ${AWK} -v api=${apiuc} -f squirrel_export.awk ${f} > ${bf}.tmp + if ! [ -f "${bf}.sq" ] || [ -n "`diff -I '$Id' ${bf}.tmp ${bf}.sq 2> /dev/null || echo boo`" ]; then + mv ${bf}.tmp ${bf}.sq + echo "Updated: ${bf}.sq" + svn add ${bf}.sq > /dev/null 2>&1 + svn propset svn:eol-style native ${bf}.sq > /dev/null 2>&1 + svn propset svn:keywords Id ${bf}.sq > /dev/null 2>&1 else - rm -f ${f}.tmp + rm -f ${bf}.tmp fi done else @@ -56,8 +57,8 @@ fi # Remove .hpp.sq if .hpp doesn't exist anymore for f in `ls *.hpp.sq`; do - f=`echo ${f} | sed "s/.hpp.sq$/.hpp/"` - if [ ! -f ${f} ];then + f=`echo ${f} | sed "s/.hpp.sq$/.hpp/;s/${apilc}/script/"` + if [ ! -f ../../script/api/${f} ];then echo "Deleted: ${f}.sq" svn del --force ${f}.sq > /dev/null 2>&1 fi diff --git a/src/ai/api/ai_accounting.cpp b/src/script/api/script_accounting.cpp similarity index 90% rename from src/ai/api/ai_accounting.cpp rename to src/script/api/script_accounting.cpp index 770f51286c..3255f86135 100644 --- a/src/ai/api/ai_accounting.cpp +++ b/src/script/api/script_accounting.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_accounting.cpp Implementation of AIAccounting. */ +/** @file script_accounting.cpp Implementation of AIAccounting. */ #include "../../stdafx.h" -#include "ai_accounting.hpp" +#include "script_accounting.hpp" Money AIAccounting::GetCosts() { diff --git a/src/ai/api/ai_accounting.hpp b/src/script/api/script_accounting.hpp similarity index 90% rename from src/ai/api/ai_accounting.hpp rename to src/script/api/script_accounting.hpp index a685718052..e01a7684a3 100644 --- a/src/ai/api/ai_accounting.hpp +++ b/src/script/api/script_accounting.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_accounting.hpp Everything to handle AI accounting things. */ +/** @file script_accounting.hpp Everything to handle AI accounting things. */ -#ifndef AI_ACCOUNTING_HPP -#define AI_ACCOUNTING_HPP +#ifndef SCRIPT_ACCOUNTING_HPP +#define SCRIPT_ACCOUNTING_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that keeps track of the costs, so you can request how much a block of @@ -62,4 +62,4 @@ private: Money last_costs; ///< The last cost we did return. }; -#endif /* AI_ACCOUNTING_HPP */ +#endif /* SCRIPT_ACCOUNTING_HPP */ diff --git a/src/ai/api/ai_airport.cpp b/src/script/api/script_airport.cpp similarity index 97% rename from src/ai/api/ai_airport.cpp rename to src/script/api/script_airport.cpp index ac0dd6422c..97d6e6bb79 100644 --- a/src/ai/api/ai_airport.cpp +++ b/src/script/api/script_airport.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_airport.cpp Implementation of AIAirport. */ +/** @file script_airport.cpp Implementation of AIAirport. */ #include "../../stdafx.h" -#include "ai_airport.hpp" -#include "ai_station.hpp" +#include "script_airport.hpp" +#include "script_station.hpp" #include "../../station_base.h" #include "../../company_func.h" #include "../../town.h" diff --git a/src/ai/api/ai_airport.hpp b/src/script/api/script_airport.hpp similarity index 97% rename from src/ai/api/ai_airport.hpp rename to src/script/api/script_airport.hpp index 28b870bbaa..c605645260 100644 --- a/src/ai/api/ai_airport.hpp +++ b/src/script/api/script_airport.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_airport.hpp Everything to query and build airports. */ +/** @file script_airport.hpp Everything to query and build airports. */ -#ifndef AI_AIRPORT_HPP -#define AI_AIRPORT_HPP +#ifndef SCRIPT_AIRPORT_HPP +#define SCRIPT_AIRPORT_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that handles all airport related functions. @@ -194,4 +194,4 @@ public: static TownID GetNearestTown(TileIndex tile, AirportType type); }; -#endif /* AI_AIRPORT_HPP */ +#endif /* SCRIPT_AIRPORT_HPP */ diff --git a/src/ai/api/ai_base.cpp b/src/script/api/script_base.cpp similarity index 95% rename from src/ai/api/ai_base.cpp rename to src/script/api/script_base.cpp index 439715f16f..72e0ad721e 100644 --- a/src/ai/api/ai_base.cpp +++ b/src/script/api/script_base.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_base.cpp Implementation of AIBase. */ +/** @file script_base.cpp Implementation of AIBase. */ #include "../../stdafx.h" -#include "ai_base.hpp" +#include "script_base.hpp" #include "../../network/network.h" #include "../../core/random_func.hpp" diff --git a/src/ai/api/ai_base.hpp b/src/script/api/script_base.hpp similarity index 94% rename from src/ai/api/ai_base.hpp rename to src/script/api/script_base.hpp index a98f2b844e..13daa36438 100644 --- a/src/ai/api/ai_base.hpp +++ b/src/script/api/script_base.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_base.hpp Everything to query basic things. */ +/** @file script_base.hpp Everything to query basic things. */ -#ifndef AI_BASE_HPP -#define AI_BASE_HPP +#ifndef SCRIPT_BASE_HPP +#define SCRIPT_BASE_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that handles some basic functions. @@ -73,4 +73,4 @@ public: static bool ChanceItem(int unused_param, uint out, uint max); }; -#endif /* AI_BASE_HPP */ +#endif /* SCRIPT_BASE_HPP */ diff --git a/src/ai/api/ai_basestation.cpp b/src/script/api/script_basestation.cpp similarity index 95% rename from src/ai/api/ai_basestation.cpp rename to src/script/api/script_basestation.cpp index b31a0d037f..2ff811346d 100644 --- a/src/ai/api/ai_basestation.cpp +++ b/src/script/api/script_basestation.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_basestation.cpp Implementation of AIBaseStation. */ +/** @file script_basestation.cpp Implementation of AIBaseStation. */ #include "../../stdafx.h" -#include "ai_basestation.hpp" +#include "script_basestation.hpp" #include "../../station_base.h" #include "../../string_func.h" #include "../../strings_func.h" diff --git a/src/ai/api/ai_basestation.hpp b/src/script/api/script_basestation.hpp similarity index 93% rename from src/ai/api/ai_basestation.hpp rename to src/script/api/script_basestation.hpp index d17acf4741..b26dbaecc3 100644 --- a/src/ai/api/ai_basestation.hpp +++ b/src/script/api/script_basestation.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_basestation.hpp Base for stations/waypoint handling. */ +/** @file script_basestation.hpp Base for stations/waypoint handling. */ -#ifndef AI_BASESTATION_HPP -#define AI_BASESTATION_HPP +#ifndef SCRIPT_BASESTATION_HPP +#define SCRIPT_BASESTATION_HPP -#include "ai_error.hpp" +#include "script_error.hpp" /** * Base class for stations and waypoints. @@ -75,4 +75,4 @@ public: static int32 GetConstructionDate(StationID station_id); }; -#endif /* AI_BASESTATION_HPP */ +#endif /* SCRIPT_BASESTATION_HPP */ diff --git a/src/ai/api/ai_bridge.cpp b/src/script/api/script_bridge.cpp similarity index 97% rename from src/ai/api/ai_bridge.cpp rename to src/script/api/script_bridge.cpp index 8550b3df5b..a1757f3158 100644 --- a/src/ai/api/ai_bridge.cpp +++ b/src/script/api/script_bridge.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_bridge.cpp Implementation of AIBridge. */ +/** @file script_bridge.cpp Implementation of AIBridge. */ #include "../../stdafx.h" -#include "ai_bridge.hpp" -#include "ai_rail.hpp" -#include "../ai_instance.hpp" +#include "script_bridge.hpp" +#include "script_rail.hpp" +#include "../../ai/ai_instance.hpp" #include "../../bridge_map.h" #include "../../strings_func.h" #include "../../economy_func.h" diff --git a/src/ai/api/ai_bridge.hpp b/src/script/api/script_bridge.hpp similarity index 96% rename from src/ai/api/ai_bridge.hpp rename to src/script/api/script_bridge.hpp index e3d4eaa10d..bb6f6a9c88 100644 --- a/src/ai/api/ai_bridge.hpp +++ b/src/script/api/script_bridge.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_bridge.hpp Everything to query and build bridges. */ +/** @file script_bridge.hpp Everything to query and build bridges. */ -#ifndef AI_BRIDGE_HPP -#define AI_BRIDGE_HPP +#ifndef SCRIPT_BRIDGE_HPP +#define SCRIPT_BRIDGE_HPP -#include "ai_vehicle.hpp" +#include "script_vehicle.hpp" /** * Class that handles all bridge related functions. @@ -166,4 +166,4 @@ public: static TileIndex GetOtherBridgeEnd(TileIndex tile); }; -#endif /* AI_BRIDGE_HPP */ +#endif /* SCRIPT_BRIDGE_HPP */ diff --git a/src/ai/api/ai_bridgelist.cpp b/src/script/api/script_bridgelist.cpp similarity index 88% rename from src/ai/api/ai_bridgelist.cpp rename to src/script/api/script_bridgelist.cpp index 4a3f590f17..95ae96cc89 100644 --- a/src/ai/api/ai_bridgelist.cpp +++ b/src/script/api/script_bridgelist.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_bridgelist.cpp Implementation of AIBridgeList and friends. */ +/** @file script_bridgelist.cpp Implementation of AIBridgeList and friends. */ #include "../../stdafx.h" -#include "ai_bridgelist.hpp" -#include "ai_bridge.hpp" +#include "script_bridgelist.hpp" +#include "script_bridge.hpp" #include "../../bridge.h" AIBridgeList::AIBridgeList() diff --git a/src/ai/api/ai_bridgelist.hpp b/src/script/api/script_bridgelist.hpp similarity index 84% rename from src/ai/api/ai_bridgelist.hpp rename to src/script/api/script_bridgelist.hpp index cae2f82c0f..8d089d4a5b 100644 --- a/src/ai/api/ai_bridgelist.hpp +++ b/src/script/api/script_bridgelist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_bridgelist.hpp List all the bridges. */ +/** @file script_bridgelist.hpp List all the bridges. */ -#ifndef AI_BRIDGELIST_HPP -#define AI_BRIDGELIST_HPP +#ifndef SCRIPT_BRIDGELIST_HPP +#define SCRIPT_BRIDGELIST_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Create a list of bridges. @@ -35,4 +35,4 @@ public: AIBridgeList_Length(uint length); }; -#endif /* AI_BRIDGELIST_HPP */ +#endif /* SCRIPT_BRIDGELIST_HPP */ diff --git a/src/ai/api/ai_cargo.cpp b/src/script/api/script_cargo.cpp similarity index 96% rename from src/ai/api/ai_cargo.cpp rename to src/script/api/script_cargo.cpp index f77fe6dfb6..a4b9fbd1a5 100644 --- a/src/ai/api/ai_cargo.cpp +++ b/src/script/api/script_cargo.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_cargo.cpp Implementation of AICargo. */ +/** @file script_cargo.cpp Implementation of AICargo. */ #include "../../stdafx.h" -#include "ai_cargo.hpp" +#include "script_cargo.hpp" #include "../../cargotype.h" #include "../../economy_func.h" #include "../../core/bitmath_func.hpp" diff --git a/src/ai/api/ai_cargo.hpp b/src/script/api/script_cargo.hpp similarity index 96% rename from src/ai/api/ai_cargo.hpp rename to src/script/api/script_cargo.hpp index 0d6a86451f..ab1e1ea747 100644 --- a/src/ai/api/ai_cargo.hpp +++ b/src/script/api/script_cargo.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_cargo.hpp Everything to query cargos. */ +/** @file script_cargo.hpp Everything to query cargos. */ -#ifndef AI_CARGO_HPP -#define AI_CARGO_HPP +#ifndef SCRIPT_CARGO_HPP +#define SCRIPT_CARGO_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that handles all cargo related functions. @@ -118,4 +118,4 @@ public: static Money GetCargoIncome(CargoID cargo_type, uint32 distance, uint32 days_in_transit); }; -#endif /* AI_CARGO_HPP */ +#endif /* SCRIPT_CARGO_HPP */ diff --git a/src/ai/api/ai_cargolist.cpp b/src/script/api/script_cargolist.cpp similarity index 91% rename from src/ai/api/ai_cargolist.cpp rename to src/script/api/script_cargolist.cpp index 4b226f65d2..12964a72d8 100644 --- a/src/ai/api/ai_cargolist.cpp +++ b/src/script/api/script_cargolist.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_cargolist.cpp Implementation of AICargoList and friends. */ +/** @file script_cargolist.cpp Implementation of AICargoList and friends. */ #include "../../stdafx.h" -#include "ai_cargolist.hpp" -#include "ai_industry.hpp" -#include "ai_station.hpp" +#include "script_cargolist.hpp" +#include "script_industry.hpp" +#include "script_station.hpp" #include "../../cargotype.h" #include "../../industry.h" #include "../../station_base.h" diff --git a/src/ai/api/ai_cargolist.hpp b/src/script/api/script_cargolist.hpp similarity index 91% rename from src/ai/api/ai_cargolist.hpp rename to src/script/api/script_cargolist.hpp index 01d2ec605b..334792358c 100644 --- a/src/ai/api/ai_cargolist.hpp +++ b/src/script/api/script_cargolist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_cargolist.hpp List all the cargos. */ +/** @file script_cargolist.hpp List all the cargos. */ -#ifndef AI_CARGOLIST_HPP -#define AI_CARGOLIST_HPP +#ifndef SCRIPT_CARGOLIST_HPP +#define SCRIPT_CARGOLIST_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Creates a list of cargos that can be produced in the current game. @@ -61,4 +61,4 @@ public: AICargoList_StationAccepting(StationID station_id); }; -#endif /* AI_CARGOLIST_HPP */ +#endif /* SCRIPT_CARGOLIST_HPP */ diff --git a/src/ai/api/ai_company.cpp b/src/script/api/script_company.cpp similarity index 98% rename from src/ai/api/ai_company.cpp rename to src/script/api/script_company.cpp index 90487951c4..d2b897f944 100644 --- a/src/ai/api/ai_company.cpp +++ b/src/script/api/script_company.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_company.cpp Implementation of AICompany. */ +/** @file script_company.cpp Implementation of AICompany. */ #include "../../stdafx.h" -#include "ai_company.hpp" -#include "ai_error.hpp" +#include "script_company.hpp" +#include "script_error.hpp" #include "../../command_func.h" #include "../../company_func.h" #include "../../company_base.h" diff --git a/src/ai/api/ai_company.hpp b/src/script/api/script_company.hpp similarity index 97% rename from src/ai/api/ai_company.hpp rename to src/script/api/script_company.hpp index 6a5d64d5d0..c8a7128d76 100644 --- a/src/ai/api/ai_company.hpp +++ b/src/script/api/script_company.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_company.hpp Everything to query a company's financials and statistics or build company related buildings. */ +/** @file script_company.hpp Everything to query a company's financials and statistics or build company related buildings. */ -#ifndef AI_COMPANY_HPP -#define AI_COMPANY_HPP +#ifndef SCRIPT_COMPANY_HPP +#define SCRIPT_COMPANY_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that handles all company related functions. @@ -278,4 +278,4 @@ public: DECLARE_POSTFIX_INCREMENT(AICompany::CompanyID) -#endif /* AI_COMPANY_HPP */ +#endif /* SCRIPT_COMPANY_HPP */ diff --git a/src/ai/api/ai_controller.cpp b/src/script/api/script_controller.cpp similarity index 95% rename from src/ai/api/ai_controller.cpp rename to src/script/api/script_controller.cpp index c99c4c0a22..bdd9bc1a7e 100644 --- a/src/ai/api/ai_controller.cpp +++ b/src/script/api/script_controller.cpp @@ -7,7 +7,7 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_controller.cpp Implementation of AIControler. */ +/** @file script_controller.cpp Implementation of AIControler. */ #include "../../stdafx.h" #include "../../string_func.h" @@ -16,11 +16,11 @@ #include "../../script/squirrel.hpp" #include "../../rev.h" -#include "ai_controller.hpp" -#include "../ai_instance.hpp" -#include "../ai_config.hpp" -#include "../ai.hpp" -#include "ai_log.hpp" +#include "script_controller.hpp" +#include "../../ai/ai_instance.hpp" +#include "../../ai/ai_config.hpp" +#include "../../ai/ai.hpp" +#include "script_log.hpp" /* static */ void AIController::SetCommandDelay(int ticks) { diff --git a/src/ai/api/ai_controller.hpp b/src/script/api/script_controller.hpp similarity index 96% rename from src/ai/api/ai_controller.hpp rename to src/script/api/script_controller.hpp index 8f3dd4b66f..2e0e64f2e2 100644 --- a/src/ai/api/ai_controller.hpp +++ b/src/script/api/script_controller.hpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_controller.hpp The controller of the AI. */ +/** @file script_controller.hpp The controller of the AI. */ -#ifndef AI_CONTROLLER_HPP -#define AI_CONTROLLER_HPP +#ifndef SCRIPT_CONTROLLER_HPP +#define SCRIPT_CONTROLLER_HPP #include "../../core/string_compare_type.hpp" #include @@ -132,4 +132,4 @@ private: void RegisterClasses(); }; -#endif /* AI_CONTROLLER_HPP */ +#endif /* SCRIPT_CONTROLLER_HPP */ diff --git a/src/ai/api/ai_date.cpp b/src/script/api/script_date.cpp similarity index 94% rename from src/ai/api/ai_date.cpp rename to src/script/api/script_date.cpp index ff0375ad62..af72a69d12 100644 --- a/src/ai/api/ai_date.cpp +++ b/src/script/api/script_date.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_date.cpp Implementation of AIDate. */ +/** @file script_date.cpp Implementation of AIDate. */ #include "../../stdafx.h" -#include "ai_date.hpp" +#include "script_date.hpp" #include "../../date_func.h" /* static */ int32 AIDate::GetCurrentDate() diff --git a/src/ai/api/ai_date.hpp b/src/script/api/script_date.hpp similarity index 91% rename from src/ai/api/ai_date.hpp rename to src/script/api/script_date.hpp index 3927845b34..d8ed4044f0 100644 --- a/src/ai/api/ai_date.hpp +++ b/src/script/api/script_date.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_date.hpp Everything to query and manipulate date related information. */ +/** @file script_date.hpp Everything to query and manipulate date related information. */ -#ifndef AI_DATE_HPP -#define AI_DATE_HPP +#ifndef SCRIPT_DATE_HPP +#define SCRIPT_DATE_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that handles all date related (calculation) functions. @@ -66,4 +66,4 @@ public: static int32 GetDate(int32 year, int32 month, int32 day_of_month); }; -#endif /* AI_DATE_HPP */ +#endif /* SCRIPT_DATE_HPP */ diff --git a/src/ai/api/ai_depotlist.cpp b/src/script/api/script_depotlist.cpp similarity index 93% rename from src/ai/api/ai_depotlist.cpp rename to src/script/api/script_depotlist.cpp index e897405fb9..c4b6e2d14d 100644 --- a/src/ai/api/ai_depotlist.cpp +++ b/src/script/api/script_depotlist.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_depotlist.cpp Implementation of AIDepotList and friends. */ +/** @file script_depotlist.cpp Implementation of AIDepotList and friends. */ #include "../../stdafx.h" -#include "ai_depotlist.hpp" +#include "script_depotlist.hpp" #include "../../company_func.h" #include "../../depot_base.h" #include "../../station_base.h" diff --git a/src/ai/api/ai_depotlist.hpp b/src/script/api/script_depotlist.hpp similarity index 81% rename from src/ai/api/ai_depotlist.hpp rename to src/script/api/script_depotlist.hpp index a84e698eab..450fea9a88 100644 --- a/src/ai/api/ai_depotlist.hpp +++ b/src/script/api/script_depotlist.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_depotlist.hpp List all the depots (you own). */ +/** @file script_depotlist.hpp List all the depots (you own). */ -#ifndef AI_DEPOTLIST_HPP -#define AI_DEPOTLIST_HPP +#ifndef SCRIPT_DEPOTLIST_HPP +#define SCRIPT_DEPOTLIST_HPP -#include "ai_list.hpp" -#include "ai_tile.hpp" +#include "script_list.hpp" +#include "script_tile.hpp" /** * Creates a list of the locations of the depots (and hangars) of which you are the owner. @@ -27,4 +27,4 @@ public: AIDepotList(AITile::TransportType transport_type); }; -#endif /* AI_DEPOTLIST_HPP */ +#endif /* SCRIPT_DEPOTLIST_HPP */ diff --git a/src/ai/api/ai_engine.cpp b/src/script/api/script_engine.cpp similarity index 98% rename from src/ai/api/ai_engine.cpp rename to src/script/api/script_engine.cpp index 904b7fe333..f054bda318 100644 --- a/src/ai/api/ai_engine.cpp +++ b/src/script/api/script_engine.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_engine.cpp Implementation of AIEngine. */ +/** @file script_engine.cpp Implementation of AIEngine. */ #include "../../stdafx.h" -#include "ai_engine.hpp" -#include "ai_cargo.hpp" +#include "script_engine.hpp" +#include "script_cargo.hpp" #include "../../company_func.h" #include "../../company_base.h" #include "../../strings_func.h" diff --git a/src/ai/api/ai_engine.hpp b/src/script/api/script_engine.hpp similarity index 97% rename from src/ai/api/ai_engine.hpp rename to src/script/api/script_engine.hpp index f442686688..26788d3d5f 100644 --- a/src/ai/api/ai_engine.hpp +++ b/src/script/api/script_engine.hpp @@ -7,14 +7,14 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_engine.hpp Everything to query and build engines. */ +/** @file script_engine.hpp Everything to query and build engines. */ -#ifndef AI_ENGINE_HPP -#define AI_ENGINE_HPP +#ifndef SCRIPT_ENGINE_HPP +#define SCRIPT_ENGINE_HPP -#include "ai_vehicle.hpp" -#include "ai_rail.hpp" -#include "ai_airport.hpp" +#include "script_vehicle.hpp" +#include "script_rail.hpp" +#include "script_airport.hpp" /** * Class that handles all engine related functions. @@ -251,4 +251,4 @@ public: static AIAirport::PlaneType GetPlaneType(EngineID engine_id); }; -#endif /* AI_ENGINE_HPP */ +#endif /* SCRIPT_ENGINE_HPP */ diff --git a/src/ai/api/ai_enginelist.cpp b/src/script/api/script_enginelist.cpp similarity index 89% rename from src/ai/api/ai_enginelist.cpp rename to src/script/api/script_enginelist.cpp index 549d59b0d1..cbbdb725ee 100644 --- a/src/ai/api/ai_enginelist.cpp +++ b/src/script/api/script_enginelist.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_enginelist.cpp Implementation of AIEngineList and friends. */ +/** @file script_enginelist.cpp Implementation of AIEngineList and friends. */ #include "../../stdafx.h" -#include "ai_enginelist.hpp" +#include "script_enginelist.hpp" #include "../../company_func.h" #include "../../engine_base.h" #include "../../core/bitmath_func.hpp" diff --git a/src/ai/api/ai_enginelist.hpp b/src/script/api/script_enginelist.hpp similarity index 80% rename from src/ai/api/ai_enginelist.hpp rename to src/script/api/script_enginelist.hpp index d5e67ddd83..763c908faf 100644 --- a/src/ai/api/ai_enginelist.hpp +++ b/src/script/api/script_enginelist.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_enginelist.hpp List all the engines. */ +/** @file script_enginelist.hpp List all the engines. */ -#ifndef AI_ENGINELIST_HPP -#define AI_ENGINELIST_HPP +#ifndef SCRIPT_ENGINELIST_HPP +#define SCRIPT_ENGINELIST_HPP -#include "ai_list.hpp" -#include "ai_vehicle.hpp" +#include "script_list.hpp" +#include "script_vehicle.hpp" /** * Create a list of engines based on a vehicle type. @@ -27,4 +27,4 @@ public: AIEngineList(AIVehicle::VehicleType vehicle_type); }; -#endif /* AI_ENGINELIST_HPP */ +#endif /* SCRIPT_ENGINELIST_HPP */ diff --git a/src/ai/api/ai_error.cpp b/src/script/api/script_error.cpp similarity index 96% rename from src/ai/api/ai_error.cpp rename to src/script/api/script_error.cpp index db1acbc0ec..0614c299e9 100644 --- a/src/ai/api/ai_error.cpp +++ b/src/script/api/script_error.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_error.cpp Implementation of AIError. */ +/** @file script_error.cpp Implementation of AIError. */ #include "../../stdafx.h" -#include "ai_error.hpp" +#include "script_error.hpp" #include "../../core/bitmath_func.hpp" AIError::AIErrorMap AIError::error_map = AIError::AIErrorMap(); diff --git a/src/ai/api/ai_error.hpp b/src/script/api/script_error.hpp similarity index 98% rename from src/ai/api/ai_error.hpp rename to src/script/api/script_error.hpp index 77f0a5ea46..12fa83b976 100644 --- a/src/ai/api/ai_error.hpp +++ b/src/script/api/script_error.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_error.hpp Everything to query errors. */ +/** @file script_error.hpp Everything to query errors. */ -#ifndef AI_ERROR_HPP -#define AI_ERROR_HPP +#ifndef SCRIPT_ERROR_HPP +#define SCRIPT_ERROR_HPP -#include "ai_object.hpp" +#include "script_object.hpp" #include /** @@ -176,4 +176,4 @@ private: static AIErrorMapString error_map_string; ///< The mapping between error type and textual representation. }; -#endif /* AI_ERROR_HPP */ +#endif /* SCRIPT_ERROR_HPP */ diff --git a/src/ai/api/ai_event.cpp b/src/script/api/script_event.cpp similarity index 95% rename from src/ai/api/ai_event.cpp rename to src/script/api/script_event.cpp index d659aea60f..6fdbea02a3 100644 --- a/src/ai/api/ai_event.cpp +++ b/src/script/api/script_event.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_event.cpp Implementation of AIEvent. */ +/** @file script_event.cpp Implementation of AIEvent. */ #include "../../stdafx.h" -#include "ai_event_types.hpp" +#include "script_event_types.hpp" #include diff --git a/src/ai/api/ai_event.hpp b/src/script/api/script_event.hpp similarity index 93% rename from src/ai/api/ai_event.hpp rename to src/script/api/script_event.hpp index cbd5134f8a..449ee0361b 100644 --- a/src/ai/api/ai_event.hpp +++ b/src/script/api/script_event.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_event.hpp Everything to handle events from the game. */ +/** @file script_event.hpp Everything to handle events from the game. */ -#ifndef AI_EVENT_HPP -#define AI_EVENT_HPP +#ifndef SCRIPT_EVENT_HPP +#define SCRIPT_EVENT_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that handles all event related functions. @@ -111,4 +111,4 @@ private: static void CreateEventPointer(); }; -#endif /* AI_EVENT_HPP */ +#endif /* SCRIPT_EVENT_HPP */ diff --git a/src/ai/api/ai_event_types.cpp b/src/script/api/script_event_types.cpp similarity index 96% rename from src/ai/api/ai_event_types.cpp rename to src/script/api/script_event_types.cpp index 30787d3af4..a74f849699 100644 --- a/src/ai/api/ai_event_types.cpp +++ b/src/script/api/script_event_types.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_event_types.cpp Implementation of all EventTypes. */ +/** @file script_event_types.cpp Implementation of all EventTypes. */ #include "../../stdafx.h" -#include "ai_event_types.hpp" -#include "ai_vehicle.hpp" +#include "script_event_types.hpp" +#include "script_vehicle.hpp" #include "../../command_type.h" #include "../../strings_func.h" #include "../../settings_type.h" diff --git a/src/ai/api/ai_event_types.hpp b/src/script/api/script_event_types.hpp similarity index 98% rename from src/ai/api/ai_event_types.hpp rename to src/script/api/script_event_types.hpp index 92d7e3cfe7..8c541241bf 100644 --- a/src/ai/api/ai_event_types.hpp +++ b/src/script/api/script_event_types.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_event_types.hpp The detailed types of all events. */ +/** @file script_event_types.hpp The detailed types of all events. */ -#ifndef AI_EVENT_TYPES_HPP -#define AI_EVENT_TYPES_HPP +#ifndef SCRIPT_EVENT_TYPES_HPP +#define SCRIPT_EVENT_TYPES_HPP -#include "ai_event.hpp" -#include "ai_company.hpp" +#include "script_event.hpp" +#include "script_company.hpp" /** * Event Vehicle Crash, indicating a vehicle of yours is crashed. @@ -775,4 +775,4 @@ private: TownID town; ///< The town that got founded. }; -#endif /* AI_EVENT_TYPES_HPP */ +#endif /* SCRIPT_EVENT_TYPES_HPP */ diff --git a/src/ai/api/ai_execmode.cpp b/src/script/api/script_execmode.cpp similarity index 91% rename from src/ai/api/ai_execmode.cpp rename to src/script/api/script_execmode.cpp index f5e1e502bc..b4631b0f0a 100644 --- a/src/ai/api/ai_execmode.cpp +++ b/src/script/api/script_execmode.cpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_execmode.cpp Implementation of AIExecMode. */ +/** @file script_execmode.cpp Implementation of AIExecMode. */ #include "../../stdafx.h" -#include "ai_execmode.hpp" +#include "script_execmode.hpp" #include "../../company_base.h" #include "../../company_func.h" -#include "../ai_instance.hpp" +#include "../../ai/ai_instance.hpp" bool AIExecMode::ModeProc() { diff --git a/src/ai/api/ai_execmode.hpp b/src/script/api/script_execmode.hpp similarity index 89% rename from src/ai/api/ai_execmode.hpp rename to src/script/api/script_execmode.hpp index 43765f177e..4772251d77 100644 --- a/src/ai/api/ai_execmode.hpp +++ b/src/script/api/script_execmode.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_execmode.hpp Switch the AI to Execute Mode. */ +/** @file script_execmode.hpp Switch the AI to Execute Mode. */ -#ifndef AI_EXECMODE_HPP -#define AI_EXECMODE_HPP +#ifndef SCRIPT_EXECMODE_HPP +#define SCRIPT_EXECMODE_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class to switch current mode to Execute Mode. @@ -47,4 +47,4 @@ public: ~AIExecMode(); }; -#endif /* AI_EXECMODE_HPP */ +#endif /* SCRIPT_EXECMODE_HPP */ diff --git a/src/ai/api/ai_gamesettings.cpp b/src/script/api/script_gamesettings.cpp similarity index 93% rename from src/ai/api/ai_gamesettings.cpp rename to src/script/api/script_gamesettings.cpp index cbd7f6e6aa..3dba54a000 100644 --- a/src/ai/api/ai_gamesettings.cpp +++ b/src/script/api/script_gamesettings.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_gamesettings.cpp Implementation of AIGameSettings. */ +/** @file script_gamesettings.cpp Implementation of AIGameSettings. */ #include "../../stdafx.h" -#include "ai_gamesettings.hpp" +#include "script_gamesettings.hpp" #include "../../settings_internal.h" /* static */ bool AIGameSettings::IsValid(const char *setting) diff --git a/src/ai/api/ai_gamesettings.hpp b/src/script/api/script_gamesettings.hpp similarity index 93% rename from src/ai/api/ai_gamesettings.hpp rename to src/script/api/script_gamesettings.hpp index 947dc8f996..07efd630e6 100644 --- a/src/ai/api/ai_gamesettings.hpp +++ b/src/script/api/script_gamesettings.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_gamesettings.hpp Everything to read game settings. */ +/** @file script_gamesettings.hpp Everything to read game settings. */ -#ifndef AI_GAMESETTINGS_HPP -#define AI_GAMESETTINGS_HPP +#ifndef SCRIPT_GAMESETTINGS_HPP +#define SCRIPT_GAMESETTINGS_HPP -#include "ai_vehicle.hpp" +#include "script_vehicle.hpp" /** * Class that handles all game settings related functions. @@ -68,4 +68,4 @@ public: static bool IsDisabledVehicleType(AIVehicle::VehicleType vehicle_type); }; -#endif /* AI_GAMESETTINGS_HPP */ +#endif /* SCRIPT_GAMESETTINGS_HPP */ diff --git a/src/ai/api/ai_group.cpp b/src/script/api/script_group.cpp similarity index 96% rename from src/ai/api/ai_group.cpp rename to src/script/api/script_group.cpp index 5a95ee7c82..3c879bf52e 100644 --- a/src/ai/api/ai_group.cpp +++ b/src/script/api/script_group.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_group.cpp Implementation of AIGroup. */ +/** @file script_group.cpp Implementation of AIGroup. */ #include "../../stdafx.h" -#include "ai_group.hpp" -#include "ai_engine.hpp" -#include "../ai_instance.hpp" +#include "script_group.hpp" +#include "script_engine.hpp" +#include "../../ai/ai_instance.hpp" #include "../../company_func.h" #include "../../group.h" #include "../../string_func.h" diff --git a/src/ai/api/ai_group.hpp b/src/script/api/script_group.hpp similarity index 97% rename from src/ai/api/ai_group.hpp rename to src/script/api/script_group.hpp index 2e025e013d..2c9368188f 100644 --- a/src/ai/api/ai_group.hpp +++ b/src/script/api/script_group.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_group.hpp Everything to put vehicles into groups. */ +/** @file script_group.hpp Everything to put vehicles into groups. */ -#ifndef AI_GROUP_HPP -#define AI_GROUP_HPP +#ifndef SCRIPT_GROUP_HPP +#define SCRIPT_GROUP_HPP -#include "ai_vehicle.hpp" +#include "script_vehicle.hpp" /** * Class that handles all group related functions. @@ -172,4 +172,4 @@ public: static bool StopAutoReplace(GroupID group_id, EngineID engine_id); }; -#endif /* AI_GROUP_HPP */ +#endif /* SCRIPT_GROUP_HPP */ diff --git a/src/ai/api/ai_grouplist.cpp b/src/script/api/script_grouplist.cpp similarity index 88% rename from src/ai/api/ai_grouplist.cpp rename to src/script/api/script_grouplist.cpp index 04413d6043..017af8b8a4 100644 --- a/src/ai/api/ai_grouplist.cpp +++ b/src/script/api/script_grouplist.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_grouplist.cpp Implementation of AIGroupList and friends. */ +/** @file script_grouplist.cpp Implementation of AIGroupList and friends. */ #include "../../stdafx.h" -#include "ai_grouplist.hpp" +#include "script_grouplist.hpp" #include "../../company_func.h" #include "../../group.h" diff --git a/src/ai/api/ai_grouplist.hpp b/src/script/api/script_grouplist.hpp similarity index 81% rename from src/ai/api/ai_grouplist.hpp rename to src/script/api/script_grouplist.hpp index 1631a1d1d0..3e02d1ce3f 100644 --- a/src/ai/api/ai_grouplist.hpp +++ b/src/script/api/script_grouplist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_grouplist.hpp List all the groups (you own). */ +/** @file script_grouplist.hpp List all the groups (you own). */ -#ifndef AI_GROUPLIST_HPP -#define AI_GROUPLIST_HPP +#ifndef SCRIPT_GROUPLIST_HPP +#define SCRIPT_GROUPLIST_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Creates a list of groups of which you are the owner. @@ -24,4 +24,4 @@ public: AIGroupList(); }; -#endif /* AI_GROUPLIST_HPP */ +#endif /* SCRIPT_GROUPLIST_HPP */ diff --git a/src/ai/api/ai_industry.cpp b/src/script/api/script_industry.cpp similarity index 97% rename from src/ai/api/ai_industry.cpp rename to src/script/api/script_industry.cpp index 6175eb1b86..a3330fdeb4 100644 --- a/src/ai/api/ai_industry.cpp +++ b/src/script/api/script_industry.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_industry.cpp Implementation of AIIndustry. */ +/** @file script_industry.cpp Implementation of AIIndustry. */ #include "../../stdafx.h" -#include "ai_industry.hpp" -#include "ai_cargo.hpp" -#include "ai_map.hpp" +#include "script_industry.hpp" +#include "script_cargo.hpp" +#include "script_map.hpp" #include "../../industry.h" #include "../../strings_func.h" #include "../../station_base.h" diff --git a/src/ai/api/ai_industry.hpp b/src/script/api/script_industry.hpp similarity index 97% rename from src/ai/api/ai_industry.hpp rename to src/script/api/script_industry.hpp index a5513e4538..32c77ee25c 100644 --- a/src/ai/api/ai_industry.hpp +++ b/src/script/api/script_industry.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_industry.hpp Everything to query and build industries. */ +/** @file script_industry.hpp Everything to query and build industries. */ -#ifndef AI_INDUSTRY_HPP -#define AI_INDUSTRY_HPP +#ifndef SCRIPT_INDUSTRY_HPP +#define SCRIPT_INDUSTRY_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that handles all industry related functions. @@ -199,4 +199,4 @@ public: static IndustryType GetIndustryType(IndustryID industry_id); }; -#endif /* AI_INDUSTRY_HPP */ +#endif /* SCRIPT_INDUSTRY_HPP */ diff --git a/src/ai/api/ai_industrylist.cpp b/src/script/api/script_industrylist.cpp similarity index 91% rename from src/ai/api/ai_industrylist.cpp rename to src/script/api/script_industrylist.cpp index 2211abfb20..c3ec20fa3a 100644 --- a/src/ai/api/ai_industrylist.cpp +++ b/src/script/api/script_industrylist.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_industrylist.cpp Implementation of AIIndustryList and friends. */ +/** @file script_industrylist.cpp Implementation of AIIndustryList and friends. */ #include "../../stdafx.h" -#include "ai_industrylist.hpp" +#include "script_industrylist.hpp" #include "../../industry.h" AIIndustryList::AIIndustryList() diff --git a/src/ai/api/ai_industrylist.hpp b/src/script/api/script_industrylist.hpp similarity index 87% rename from src/ai/api/ai_industrylist.hpp rename to src/script/api/script_industrylist.hpp index 255873b82b..41a2e6586c 100644 --- a/src/ai/api/ai_industrylist.hpp +++ b/src/script/api/script_industrylist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_industrylist.hpp List all the industries. */ +/** @file script_industrylist.hpp List all the industries. */ -#ifndef AI_INDUSTRYLIST_HPP -#define AI_INDUSTRYLIST_HPP +#ifndef SCRIPT_INDUSTRYLIST_HPP +#define SCRIPT_INDUSTRYLIST_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Creates a list of industries that are currently on the map. @@ -48,4 +48,4 @@ public: AIIndustryList_CargoProducing(CargoID cargo_id); }; -#endif /* AI_INDUSTRYLIST_HPP */ +#endif /* SCRIPT_INDUSTRYLIST_HPP */ diff --git a/src/ai/api/ai_industrytype.cpp b/src/script/api/script_industrytype.cpp similarity index 96% rename from src/ai/api/ai_industrytype.cpp rename to src/script/api/script_industrytype.cpp index bd28df2899..0a369b8f13 100644 --- a/src/ai/api/ai_industrytype.cpp +++ b/src/script/api/script_industrytype.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_industrytype.cpp Implementation of AIIndustryType. */ +/** @file script_industrytype.cpp Implementation of AIIndustryType. */ #include "../../stdafx.h" -#include "ai_industrytype.hpp" -#include "ai_map.hpp" -#include "ai_error.hpp" +#include "script_industrytype.hpp" +#include "script_map.hpp" +#include "script_error.hpp" #include "../../strings_func.h" #include "../../industry.h" #include "../../newgrf_industries.h" diff --git a/src/ai/api/ai_industrytype.hpp b/src/script/api/script_industrytype.hpp similarity index 96% rename from src/ai/api/ai_industrytype.hpp rename to src/script/api/script_industrytype.hpp index 523fad8e3b..ad37acedab 100644 --- a/src/ai/api/ai_industrytype.hpp +++ b/src/script/api/script_industrytype.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_industrytype.hpp Everything to query and build industries. */ +/** @file script_industrytype.hpp Everything to query and build industries. */ -#ifndef AI_INDUSTRYTYPE_HPP -#define AI_INDUSTRYTYPE_HPP +#ifndef SCRIPT_INDUSTRYTYPE_HPP +#define SCRIPT_INDUSTRYTYPE_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Class that handles all industry-type related functions. @@ -150,4 +150,4 @@ public: static bool HasDock(IndustryType industry_type); }; -#endif /* AI_INDUSTRYTYPE_HPP */ +#endif /* SCRIPT_INDUSTRYTYPE_HPP */ diff --git a/src/ai/api/ai_industrytypelist.cpp b/src/script/api/script_industrytypelist.cpp similarity index 87% rename from src/ai/api/ai_industrytypelist.cpp rename to src/script/api/script_industrytypelist.cpp index c417ae8475..fbbe6bcf2e 100644 --- a/src/ai/api/ai_industrytypelist.cpp +++ b/src/script/api/script_industrytypelist.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_industrytypelist.cpp Implementation of AIIndustryTypeList. */ +/** @file script_industrytypelist.cpp Implementation of AIIndustryTypeList. */ #include "../../stdafx.h" -#include "ai_industrytypelist.hpp" +#include "script_industrytypelist.hpp" #include "../../industry.h" AIIndustryTypeList::AIIndustryTypeList() diff --git a/src/ai/api/ai_industrytypelist.hpp b/src/script/api/script_industrytypelist.hpp similarity index 76% rename from src/ai/api/ai_industrytypelist.hpp rename to src/script/api/script_industrytypelist.hpp index 90991096af..b0f25715db 100644 --- a/src/ai/api/ai_industrytypelist.hpp +++ b/src/script/api/script_industrytypelist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_industrytypelist.hpp List all available industry types. */ +/** @file script_industrytypelist.hpp List all available industry types. */ -#ifndef AI_INDUSTRYTYPELIST_HPP -#define AI_INDUSTRYTYPELIST_HPP +#ifndef SCRIPT_INDUSTRYTYPELIST_HPP +#define SCRIPT_INDUSTRYTYPELIST_HPP -#include "ai_industrytype.hpp" +#include "script_industrytype.hpp" /** * Creates a list of valid industry types. @@ -24,4 +24,4 @@ public: }; -#endif /* AI_INDUSTRYTYPELIST_HPP */ +#endif /* SCRIPT_INDUSTRYTYPELIST_HPP */ diff --git a/src/ai/api/ai_list.cpp b/src/script/api/script_list.cpp similarity index 99% rename from src/ai/api/ai_list.cpp rename to src/script/api/script_list.cpp index 2188d66742..331b852d83 100644 --- a/src/ai/api/ai_list.cpp +++ b/src/script/api/script_list.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_list.cpp Implementation of AIList. */ +/** @file script_list.cpp Implementation of AIList. */ #include "../../stdafx.h" -#include "ai_list.hpp" +#include "script_list.hpp" #include "../../debug.h" #include "../../script/squirrel.hpp" diff --git a/src/ai/api/ai_list.hpp b/src/script/api/script_list.hpp similarity index 97% rename from src/ai/api/ai_list.hpp rename to src/script/api/script_list.hpp index 9087f26c54..9c5765b213 100644 --- a/src/ai/api/ai_list.hpp +++ b/src/script/api/script_list.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_list.hpp A list which can keep item/value pairs, which you can walk. */ +/** @file script_list.hpp A list which can keep item/value pairs, which you can walk. */ /** @defgroup AIList Classes that create a list of items. */ -#ifndef AI_LIST_HPP -#define AI_LIST_HPP +#ifndef SCRIPT_LIST_HPP +#define SCRIPT_LIST_HPP -#include "ai_object.hpp" +#include "script_object.hpp" #include #include @@ -280,4 +280,4 @@ public: #endif /* DOXYGEN_AI_DOCS */ }; -#endif /* AI_LIST_HPP */ +#endif /* SCRIPT_LIST_HPP */ diff --git a/src/ai/api/ai_log.cpp b/src/script/api/script_log.cpp similarity index 96% rename from src/ai/api/ai_log.cpp rename to src/script/api/script_log.cpp index fb29354796..10eff90887 100644 --- a/src/ai/api/ai_log.cpp +++ b/src/script/api/script_log.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_log.cpp Implementation of AILog. */ +/** @file script_log.cpp Implementation of AILog. */ #include "../../stdafx.h" -#include "ai_log.hpp" +#include "script_log.hpp" #include "../../core/alloc_func.hpp" #include "../../company_func.h" #include "../../debug.h" diff --git a/src/ai/api/ai_log.hpp b/src/script/api/script_log.hpp similarity index 93% rename from src/ai/api/ai_log.hpp rename to src/script/api/script_log.hpp index 00ada4e3f0..e352e232c0 100644 --- a/src/ai/api/ai_log.hpp +++ b/src/script/api/script_log.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_log.hpp Everything to handle and issue log messages. */ +/** @file script_log.hpp Everything to handle and issue log messages. */ -#ifndef AI_LOG_HPP -#define AI_LOG_HPP +#ifndef SCRIPT_LOG_HPP +#define SCRIPT_LOG_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class that handles all log related functions. @@ -82,4 +82,4 @@ private: static void Log(AILog::AILogType level, const char *message); }; -#endif /* AI_LOG_HPP */ +#endif /* SCRIPT_LOG_HPP */ diff --git a/src/ai/api/ai_map.cpp b/src/script/api/script_map.cpp similarity index 95% rename from src/ai/api/ai_map.cpp rename to src/script/api/script_map.cpp index d5728b9ebc..b347f45724 100644 --- a/src/ai/api/ai_map.cpp +++ b/src/script/api/script_map.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_map.cpp Implementation of AIMap. */ +/** @file script_map.cpp Implementation of AIMap. */ #include "../../stdafx.h" -#include "ai_map.hpp" +#include "script_map.hpp" #include "../../tile_map.h" /* static */ bool AIMap::IsValidTile(TileIndex t) diff --git a/src/ai/api/ai_map.hpp b/src/script/api/script_map.hpp similarity index 95% rename from src/ai/api/ai_map.hpp rename to src/script/api/script_map.hpp index 15ff5c337b..3567a58907 100644 --- a/src/ai/api/ai_map.hpp +++ b/src/script/api/script_map.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_map.hpp Everything to query and manipulate map metadata. */ +/** @file script_map.hpp Everything to query and manipulate map metadata. */ -#ifndef AI_MAP_HPP -#define AI_MAP_HPP +#ifndef SCRIPT_MAP_HPP +#define SCRIPT_MAP_HPP -#include "ai_object.hpp" +#include "script_object.hpp" #include "../../tile_type.h" /** @@ -122,4 +122,4 @@ public: static int32 DistanceFromEdge(TileIndex tile); }; -#endif /* AI_MAP_HPP */ +#endif /* SCRIPT_MAP_HPP */ diff --git a/src/ai/api/ai_marine.cpp b/src/script/api/script_marine.cpp similarity index 97% rename from src/ai/api/ai_marine.cpp rename to src/script/api/script_marine.cpp index 00cff66238..1bfd7ddb3a 100644 --- a/src/ai/api/ai_marine.cpp +++ b/src/script/api/script_marine.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_marine.cpp Implementation of AIMarine. */ +/** @file script_marine.cpp Implementation of AIMarine. */ #include "../../stdafx.h" -#include "ai_marine.hpp" -#include "ai_station.hpp" +#include "script_marine.hpp" +#include "script_station.hpp" #include "../../station_base.h" #include "../../tile_cmd.h" diff --git a/src/ai/api/ai_marine.hpp b/src/script/api/script_marine.hpp similarity index 97% rename from src/ai/api/ai_marine.hpp rename to src/script/api/script_marine.hpp index 1eb691fe3a..d9d013c9df 100644 --- a/src/ai/api/ai_marine.hpp +++ b/src/script/api/script_marine.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_marine.hpp Everything to query and build marine. */ +/** @file script_marine.hpp Everything to query and build marine. */ -#ifndef AI_MARINE_HPP -#define AI_MARINE_HPP +#ifndef SCRIPT_MARINE_HPP +#define SCRIPT_MARINE_HPP -#include "ai_error.hpp" +#include "script_error.hpp" /** * Class that handles all marine related functions. @@ -207,4 +207,4 @@ public: static Money GetBuildCost(BuildType build_type); }; -#endif /* AI_MARINE_HPP */ +#endif /* SCRIPT_MARINE_HPP */ diff --git a/src/ai/api/ai_object.cpp b/src/script/api/script_object.cpp similarity index 97% rename from src/ai/api/ai_object.cpp rename to src/script/api/script_object.cpp index 53f2f2b553..ce734c6081 100644 --- a/src/ai/api/ai_object.cpp +++ b/src/script/api/script_object.cpp @@ -7,7 +7,7 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_object.cpp Implementation of AIObject. */ +/** @file script_object.cpp Implementation of AIObject. */ #include "../../stdafx.h" #include "../../script/squirrel.hpp" @@ -15,9 +15,9 @@ #include "../../network/network.h" #include "../../tunnelbridge.h" -#include "../ai_storage.hpp" -#include "../ai_instance.hpp" -#include "ai_error.hpp" +#include "../../ai/ai_storage.hpp" +#include "../../ai/ai_instance.hpp" +#include "script_error.hpp" /** * Get the storage associated with the current AIInstance. diff --git a/src/ai/api/ai_object.hpp b/src/script/api/script_object.hpp similarity index 96% rename from src/ai/api/ai_object.hpp rename to src/script/api/script_object.hpp index deac277ddb..214d0e7ccb 100644 --- a/src/ai/api/ai_object.hpp +++ b/src/script/api/script_object.hpp @@ -7,16 +7,16 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_object.hpp Main object, on which all objects depend. */ +/** @file script_object.hpp Main object, on which all objects depend. */ -#ifndef AI_OBJECT_HPP -#define AI_OBJECT_HPP +#ifndef SCRIPT_OBJECT_HPP +#define SCRIPT_OBJECT_HPP #include "../../misc/countedptr.hpp" #include "../../road_type.h" #include "../../rail_type.h" -#include "ai_types.hpp" +#include "script_types.hpp" /** * The callback function when an AI suspends. @@ -246,4 +246,4 @@ private: #endif /* DOXYGEN_AI_DOCS */ }; -#endif /* AI_OBJECT_HPP */ +#endif /* SCRIPT_OBJECT_HPP */ diff --git a/src/ai/api/ai_order.cpp b/src/script/api/script_order.cpp similarity index 99% rename from src/ai/api/ai_order.cpp rename to src/script/api/script_order.cpp index a905aedb83..1811207cb9 100644 --- a/src/ai/api/ai_order.cpp +++ b/src/script/api/script_order.cpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_order.cpp Implementation of AIOrder. */ +/** @file script_order.cpp Implementation of AIOrder. */ #include "../../stdafx.h" -#include "ai_order.hpp" -#include "ai_vehicle.hpp" -#include "ai_cargo.hpp" -#include "../ai_instance.hpp" +#include "script_order.hpp" +#include "script_vehicle.hpp" +#include "script_cargo.hpp" +#include "../../ai/ai_instance.hpp" #include "../../debug.h" #include "../../vehicle_base.h" #include "../../roadstop_base.h" diff --git a/src/ai/api/ai_order.hpp b/src/script/api/script_order.hpp similarity index 99% rename from src/ai/api/ai_order.hpp rename to src/script/api/script_order.hpp index 470b6faafc..0f2372e778 100644 --- a/src/ai/api/ai_order.hpp +++ b/src/script/api/script_order.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_order.hpp Everything to query and build orders. */ +/** @file script_order.hpp Everything to query and build orders. */ -#ifndef AI_ORDER_HPP -#define AI_ORDER_HPP +#ifndef SCRIPT_ORDER_HPP +#define SCRIPT_ORDER_HPP -#include "ai_error.hpp" +#include "script_error.hpp" /** * Class that handles all order related functions. @@ -558,4 +558,4 @@ public: }; DECLARE_ENUM_AS_BIT_SET(AIOrder::AIOrderFlags) -#endif /* AI_ORDER_HPP */ +#endif /* SCRIPT_ORDER_HPP */ diff --git a/src/ai/api/ai_rail.cpp b/src/script/api/script_rail.cpp similarity index 99% rename from src/ai/api/ai_rail.cpp rename to src/script/api/script_rail.cpp index 8d46065442..236106d158 100644 --- a/src/ai/api/ai_rail.cpp +++ b/src/script/api/script_rail.cpp @@ -7,14 +7,14 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_rail.cpp Implementation of AIRail. */ +/** @file script_rail.cpp Implementation of AIRail. */ #include "../../stdafx.h" -#include "ai_rail.hpp" -#include "ai_map.hpp" -#include "ai_station.hpp" -#include "ai_industrytype.hpp" -#include "ai_cargo.hpp" +#include "script_rail.hpp" +#include "script_map.hpp" +#include "script_station.hpp" +#include "script_industrytype.hpp" +#include "script_cargo.hpp" #include "../../debug.h" #include "../../station_base.h" #include "../../company_func.h" diff --git a/src/ai/api/ai_rail.hpp b/src/script/api/script_rail.hpp similarity index 99% rename from src/ai/api/ai_rail.hpp rename to src/script/api/script_rail.hpp index 0a9f70c5b6..57b0fa42b2 100644 --- a/src/ai/api/ai_rail.hpp +++ b/src/script/api/script_rail.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_rail.hpp Everything to query and build rails. */ +/** @file script_rail.hpp Everything to query and build rails. */ -#ifndef AI_RAIL_HPP -#define AI_RAIL_HPP +#ifndef SCRIPT_RAIL_HPP +#define SCRIPT_RAIL_HPP -#include "ai_tile.hpp" +#include "script_tile.hpp" /** * Class that handles all rail related functions. @@ -465,4 +465,4 @@ public: static int32 GetMaxSpeed(RailType railtype); }; -#endif /* AI_RAIL_HPP */ +#endif /* SCRIPT_RAIL_HPP */ diff --git a/src/ai/api/ai_railtypelist.cpp b/src/script/api/script_railtypelist.cpp similarity index 87% rename from src/ai/api/ai_railtypelist.cpp rename to src/script/api/script_railtypelist.cpp index 9f2801e299..7052f7551b 100644 --- a/src/ai/api/ai_railtypelist.cpp +++ b/src/script/api/script_railtypelist.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_railtypelist.cpp Implementation of AIRailTypeList and friends. */ +/** @file script_railtypelist.cpp Implementation of AIRailTypeList and friends. */ #include "../../stdafx.h" -#include "ai_railtypelist.hpp" +#include "script_railtypelist.hpp" #include "../../rail.h" #include "../../company_func.h" diff --git a/src/ai/api/ai_railtypelist.hpp b/src/script/api/script_railtypelist.hpp similarity index 79% rename from src/ai/api/ai_railtypelist.hpp rename to src/script/api/script_railtypelist.hpp index 8162b80f5f..fcc7595cf8 100644 --- a/src/ai/api/ai_railtypelist.hpp +++ b/src/script/api/script_railtypelist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_railtypelist.hpp List all available railtypes. */ +/** @file script_railtypelist.hpp List all available railtypes. */ -#ifndef AI_RAILTYPELIST_HPP -#define AI_RAILTYPELIST_HPP +#ifndef SCRIPT_RAILTYPELIST_HPP +#define SCRIPT_RAILTYPELIST_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Creates a list of all available railtypes. @@ -23,4 +23,4 @@ public: AIRailTypeList(); }; -#endif /* AI_RAILTYPELIST_HPP */ +#endif /* SCRIPT_RAILTYPELIST_HPP */ diff --git a/src/ai/api/ai_road.cpp b/src/script/api/script_road.cpp similarity index 99% rename from src/ai/api/ai_road.cpp rename to src/script/api/script_road.cpp index 784ca69b78..a60f994806 100644 --- a/src/ai/api/ai_road.cpp +++ b/src/script/api/script_road.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_road.cpp Implementation of AIRoad. */ +/** @file script_road.cpp Implementation of AIRoad. */ #include "../../stdafx.h" -#include "ai_map.hpp" -#include "ai_station.hpp" -#include "ai_cargo.hpp" +#include "script_map.hpp" +#include "script_station.hpp" +#include "script_cargo.hpp" #include "../../station_base.h" #include "../../company_func.h" #include "../../script/squirrel_helper_type.hpp" diff --git a/src/ai/api/ai_road.hpp b/src/script/api/script_road.hpp similarity index 99% rename from src/ai/api/ai_road.hpp rename to src/script/api/script_road.hpp index 32095799f3..8e67574990 100644 --- a/src/ai/api/ai_road.hpp +++ b/src/script/api/script_road.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_road.hpp Everything to query and build roads. */ +/** @file script_road.hpp Everything to query and build roads. */ -#ifndef AI_ROAD_HPP -#define AI_ROAD_HPP +#ifndef SCRIPT_ROAD_HPP +#define SCRIPT_ROAD_HPP -#include "ai_tile.hpp" +#include "script_tile.hpp" /** * Class that handles all road related functions. @@ -483,4 +483,4 @@ private: static bool _BuildRoadStationInternal(TileIndex tile, TileIndex front, RoadVehicleType road_veh_type, bool drive_through, StationID station_id); }; -#endif /* AI_ROAD_HPP */ +#endif /* SCRIPT_ROAD_HPP */ diff --git a/src/ai/api/ai_sign.cpp b/src/script/api/script_sign.cpp similarity index 95% rename from src/ai/api/ai_sign.cpp rename to src/script/api/script_sign.cpp index 971d52ce5c..2178f38465 100644 --- a/src/ai/api/ai_sign.cpp +++ b/src/script/api/script_sign.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_sign.cpp Implementation of AISign. */ +/** @file script_sign.cpp Implementation of AISign. */ #include "../../stdafx.h" -#include "ai_sign.hpp" +#include "script_sign.hpp" #include "table/strings.h" -#include "../ai_instance.hpp" +#include "../../ai/ai_instance.hpp" #include "../../command_func.h" #include "../../core/alloc_func.hpp" #include "../../signs_base.h" diff --git a/src/ai/api/ai_sign.hpp b/src/script/api/script_sign.hpp similarity index 94% rename from src/ai/api/ai_sign.hpp rename to src/script/api/script_sign.hpp index afbcf0d77e..385e24f683 100644 --- a/src/ai/api/ai_sign.hpp +++ b/src/script/api/script_sign.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_sign.hpp Everything to query and build signs. */ +/** @file script_sign.hpp Everything to query and build signs. */ -#ifndef AI_SIGN_HPP -#define AI_SIGN_HPP +#ifndef SCRIPT_SIGN_HPP +#define SCRIPT_SIGN_HPP -#include "ai_error.hpp" +#include "script_error.hpp" /** * Class that handles all sign related functions. @@ -89,4 +89,4 @@ public: static bool RemoveSign(SignID sign_id); }; -#endif /* AI_SIGN_HPP */ +#endif /* SCRIPT_SIGN_HPP */ diff --git a/src/ai/api/ai_signlist.cpp b/src/script/api/script_signlist.cpp similarity index 85% rename from src/ai/api/ai_signlist.cpp rename to src/script/api/script_signlist.cpp index 6617799372..3d7b228f3f 100644 --- a/src/ai/api/ai_signlist.cpp +++ b/src/script/api/script_signlist.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_signlist.cpp Implementation of AISignList and friends. */ +/** @file script_signlist.cpp Implementation of AISignList and friends. */ #include "../../stdafx.h" -#include "ai_signlist.hpp" -#include "ai_sign.hpp" +#include "script_signlist.hpp" +#include "script_sign.hpp" #include "../../signs_base.h" AISignList::AISignList() diff --git a/src/ai/api/ai_signlist.hpp b/src/script/api/script_signlist.hpp similarity index 79% rename from src/ai/api/ai_signlist.hpp rename to src/script/api/script_signlist.hpp index d96e8c6583..af6a9614b2 100644 --- a/src/ai/api/ai_signlist.hpp +++ b/src/script/api/script_signlist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_signlist.hpp List all the signs of your company. */ +/** @file script_signlist.hpp List all the signs of your company. */ -#ifndef AI_SIGNLIST_HPP -#define AI_SIGNLIST_HPP +#ifndef SCRIPT_SIGNLIST_HPP +#define SCRIPT_SIGNLIST_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Create a list of signs your company has created. @@ -23,4 +23,4 @@ public: AISignList(); }; -#endif /* AI_SIGNLIST_HPP */ +#endif /* SCRIPT_SIGNLIST_HPP */ diff --git a/src/ai/api/ai_station.cpp b/src/script/api/script_station.cpp similarity index 95% rename from src/ai/api/ai_station.cpp rename to src/script/api/script_station.cpp index 68a00368c5..6dc0c009df 100644 --- a/src/ai/api/ai_station.cpp +++ b/src/script/api/script_station.cpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_station.cpp Implementation of AIStation. */ +/** @file script_station.cpp Implementation of AIStation. */ #include "../../stdafx.h" -#include "ai_station.hpp" -#include "ai_cargo.hpp" -#include "ai_map.hpp" -#include "ai_town.hpp" +#include "script_station.hpp" +#include "script_cargo.hpp" +#include "script_map.hpp" +#include "script_town.hpp" #include "../../debug.h" #include "../../station_base.h" #include "../../roadstop_base.h" diff --git a/src/ai/api/ai_station.hpp b/src/script/api/script_station.hpp similarity index 96% rename from src/ai/api/ai_station.hpp rename to src/script/api/script_station.hpp index 66b1690bf2..b9266c7d32 100644 --- a/src/ai/api/ai_station.hpp +++ b/src/script/api/script_station.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_station.hpp Everything to query and build stations. */ +/** @file script_station.hpp Everything to query and build stations. */ -#ifndef AI_STATION_HPP -#define AI_STATION_HPP +#ifndef SCRIPT_STATION_HPP +#define SCRIPT_STATION_HPP -#include "ai_road.hpp" -#include "ai_basestation.hpp" +#include "script_road.hpp" +#include "script_basestation.hpp" /** * Class that handles all station related functions. @@ -155,4 +155,4 @@ public: DECLARE_ENUM_AS_BIT_SET(AIStation::StationType) -#endif /* AI_STATION_HPP */ +#endif /* SCRIPT_STATION_HPP */ diff --git a/src/ai/api/ai_stationlist.cpp b/src/script/api/script_stationlist.cpp similarity index 89% rename from src/ai/api/ai_stationlist.cpp rename to src/script/api/script_stationlist.cpp index 778052d32e..46394851fb 100644 --- a/src/ai/api/ai_stationlist.cpp +++ b/src/script/api/script_stationlist.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_stationlist.cpp Implementation of AIStationList and friends. */ +/** @file script_stationlist.cpp Implementation of AIStationList and friends. */ #include "../../stdafx.h" -#include "ai_stationlist.hpp" -#include "ai_vehicle.hpp" +#include "script_stationlist.hpp" +#include "script_vehicle.hpp" #include "../../company_func.h" #include "../../station_base.h" #include "../../vehicle_base.h" diff --git a/src/ai/api/ai_stationlist.hpp b/src/script/api/script_stationlist.hpp similarity index 83% rename from src/ai/api/ai_stationlist.hpp rename to src/script/api/script_stationlist.hpp index b066523abe..6894ecf41f 100644 --- a/src/ai/api/ai_stationlist.hpp +++ b/src/script/api/script_stationlist.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_stationlist.hpp List all the stations (you own). */ +/** @file script_stationlist.hpp List all the stations (you own). */ -#ifndef AI_STATIONLIST_HPP -#define AI_STATIONLIST_HPP +#ifndef SCRIPT_STATIONLIST_HPP +#define SCRIPT_STATIONLIST_HPP -#include "ai_list.hpp" -#include "ai_station.hpp" +#include "script_list.hpp" +#include "script_station.hpp" /** * Creates a list of stations of which you are the owner. @@ -39,4 +39,4 @@ public: AIStationList_Vehicle(VehicleID vehicle_id); }; -#endif /* AI_STATIONLIST_HPP */ +#endif /* SCRIPT_STATIONLIST_HPP */ diff --git a/src/ai/api/ai_subsidy.cpp b/src/script/api/script_subsidy.cpp similarity index 95% rename from src/ai/api/ai_subsidy.cpp rename to src/script/api/script_subsidy.cpp index 47a1c55dd7..f770d29f7c 100644 --- a/src/ai/api/ai_subsidy.cpp +++ b/src/script/api/script_subsidy.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_subsidy.cpp Implementation of AISubsidy. */ +/** @file script_subsidy.cpp Implementation of AISubsidy. */ #include "../../stdafx.h" -#include "ai_subsidy.hpp" -#include "ai_date.hpp" +#include "script_subsidy.hpp" +#include "script_date.hpp" #include "../../subsidy_base.h" #include "../../station_base.h" diff --git a/src/ai/api/ai_subsidy.hpp b/src/script/api/script_subsidy.hpp similarity index 95% rename from src/ai/api/ai_subsidy.hpp rename to src/script/api/script_subsidy.hpp index f9f0cf140b..3e7ac3ee09 100644 --- a/src/ai/api/ai_subsidy.hpp +++ b/src/script/api/script_subsidy.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_subsidy.hpp Everything to query subsidies. */ +/** @file script_subsidy.hpp Everything to query subsidies. */ -#ifndef AI_SUBSIDY_HPP -#define AI_SUBSIDY_HPP +#ifndef SCRIPT_SUBSIDY_HPP +#define SCRIPT_SUBSIDY_HPP -#include "ai_company.hpp" +#include "script_company.hpp" /** * Class that handles all subsidy related functions. @@ -110,4 +110,4 @@ public: static int32 GetDestinationIndex(SubsidyID subsidy_id); }; -#endif /* AI_SUBSIDY_HPP */ +#endif /* SCRIPT_SUBSIDY_HPP */ diff --git a/src/ai/api/ai_subsidylist.cpp b/src/script/api/script_subsidylist.cpp similarity index 88% rename from src/ai/api/ai_subsidylist.cpp rename to src/script/api/script_subsidylist.cpp index 299ab9d998..f694b9870c 100644 --- a/src/ai/api/ai_subsidylist.cpp +++ b/src/script/api/script_subsidylist.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_subsidylist.cpp Implementation of AISubsidyList. */ +/** @file script_subsidylist.cpp Implementation of AISubsidyList. */ #include "../../stdafx.h" -#include "ai_subsidylist.hpp" +#include "script_subsidylist.hpp" #include "../../subsidy_base.h" AISubsidyList::AISubsidyList() diff --git a/src/ai/api/ai_subsidylist.hpp b/src/script/api/script_subsidylist.hpp similarity index 79% rename from src/ai/api/ai_subsidylist.hpp rename to src/script/api/script_subsidylist.hpp index 786f1377f4..332412c9d6 100644 --- a/src/ai/api/ai_subsidylist.hpp +++ b/src/script/api/script_subsidylist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_subsidylist.hpp List all the subsidies. */ +/** @file script_subsidylist.hpp List all the subsidies. */ -#ifndef AI_SUBSIDYLIST_HPP -#define AI_SUBSIDYLIST_HPP +#ifndef SCRIPT_SUBSIDYLIST_HPP +#define SCRIPT_SUBSIDYLIST_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Creates a list of all current subsidies. @@ -23,4 +23,4 @@ public: AISubsidyList(); }; -#endif /* AI_SUBSIDYLIST_HPP */ +#endif /* SCRIPT_SUBSIDYLIST_HPP */ diff --git a/src/ai/api/ai_testmode.cpp b/src/script/api/script_testmode.cpp similarity index 91% rename from src/ai/api/ai_testmode.cpp rename to src/script/api/script_testmode.cpp index 6e2f515b4b..a2e696f591 100644 --- a/src/ai/api/ai_testmode.cpp +++ b/src/script/api/script_testmode.cpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_testmode.cpp Implementation of AITestMode. */ +/** @file script_testmode.cpp Implementation of AITestMode. */ #include "../../stdafx.h" -#include "ai_testmode.hpp" +#include "script_testmode.hpp" #include "../../company_base.h" #include "../../company_func.h" -#include "../ai_instance.hpp" +#include "../../ai/ai_instance.hpp" bool AITestMode::ModeProc() { diff --git a/src/ai/api/ai_testmode.hpp b/src/script/api/script_testmode.hpp similarity index 90% rename from src/ai/api/ai_testmode.hpp rename to src/script/api/script_testmode.hpp index 16964ef28e..a6a3c8da81 100644 --- a/src/ai/api/ai_testmode.hpp +++ b/src/script/api/script_testmode.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_testmode.hpp Switch the AI to Test Mode. */ +/** @file script_testmode.hpp Switch the AI to Test Mode. */ -#ifndef AI_TESTMODE_HPP -#define AI_TESTMODE_HPP +#ifndef SCRIPT_TESTMODE_HPP +#define SCRIPT_TESTMODE_HPP -#include "ai_object.hpp" +#include "script_object.hpp" /** * Class to switch current mode to Test Mode. @@ -49,4 +49,4 @@ public: ~AITestMode(); }; -#endif /* AI_TESTMODE_HPP */ +#endif /* SCRIPT_TESTMODE_HPP */ diff --git a/src/ai/api/ai_tile.cpp b/src/script/api/script_tile.cpp similarity index 98% rename from src/ai/api/ai_tile.cpp rename to src/script/api/script_tile.cpp index b07c7cbf53..c395aa516b 100644 --- a/src/ai/api/ai_tile.cpp +++ b/src/script/api/script_tile.cpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_tile.cpp Implementation of AITile. */ +/** @file script_tile.cpp Implementation of AITile. */ #include "../../stdafx.h" -#include "ai_tile.hpp" -#include "ai_map.hpp" -#include "ai_town.hpp" -#include "ai_cargo.hpp" +#include "script_tile.hpp" +#include "script_map.hpp" +#include "script_town.hpp" +#include "script_cargo.hpp" #include "../../station_func.h" #include "../../company_func.h" #include "../../water_map.h" diff --git a/src/ai/api/ai_tile.hpp b/src/script/api/script_tile.hpp similarity index 98% rename from src/ai/api/ai_tile.hpp rename to src/script/api/script_tile.hpp index f9f5ba3674..0e9205d3ce 100644 --- a/src/ai/api/ai_tile.hpp +++ b/src/script/api/script_tile.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_tile.hpp Everything to query and manipulate tiles. */ +/** @file script_tile.hpp Everything to query and manipulate tiles. */ -#ifndef AI_TILE_HPP -#define AI_TILE_HPP +#ifndef SCRIPT_TILE_HPP +#define SCRIPT_TILE_HPP -#include "ai_error.hpp" -#include "ai_company.hpp" +#include "script_error.hpp" +#include "script_company.hpp" /** * Class that handles all tile related functions. @@ -471,4 +471,4 @@ public: static Money GetBuildCost(BuildType build_type); }; -#endif /* AI_TILE_HPP */ +#endif /* SCRIPT_TILE_HPP */ diff --git a/src/ai/api/ai_tilelist.cpp b/src/script/api/script_tilelist.cpp similarity index 97% rename from src/ai/api/ai_tilelist.cpp rename to src/script/api/script_tilelist.cpp index 0782b29f58..75b5c438e1 100644 --- a/src/ai/api/ai_tilelist.cpp +++ b/src/script/api/script_tilelist.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_tilelist.cpp Implementation of AITileList and friends. */ +/** @file script_tilelist.cpp Implementation of AITileList and friends. */ #include "../../stdafx.h" -#include "ai_tilelist.hpp" -#include "ai_industry.hpp" +#include "script_tilelist.hpp" +#include "script_industry.hpp" #include "../../industry.h" #include "../../station_base.h" diff --git a/src/ai/api/ai_tilelist.hpp b/src/script/api/script_tilelist.hpp similarity index 94% rename from src/ai/api/ai_tilelist.hpp rename to src/script/api/script_tilelist.hpp index 803429a60d..ea0f241bb7 100644 --- a/src/ai/api/ai_tilelist.hpp +++ b/src/script/api/script_tilelist.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_tilelist.hpp List tiles. */ +/** @file script_tilelist.hpp List tiles. */ -#ifndef AI_TILELIST_HPP -#define AI_TILELIST_HPP +#ifndef SCRIPT_TILELIST_HPP +#define SCRIPT_TILELIST_HPP -#include "ai_station.hpp" -#include "ai_list.hpp" +#include "script_station.hpp" +#include "script_list.hpp" /** * Creates an empty list, in which you can add tiles. @@ -100,4 +100,4 @@ public: AITileList_StationType(StationID station_id, AIStation::StationType station_type); }; -#endif /* AI_TILELIST_HPP */ +#endif /* SCRIPT_TILELIST_HPP */ diff --git a/src/ai/api/ai_town.cpp b/src/script/api/script_town.cpp similarity index 97% rename from src/ai/api/ai_town.cpp rename to src/script/api/script_town.cpp index 79ce96ec7c..acde58e181 100644 --- a/src/ai/api/ai_town.cpp +++ b/src/script/api/script_town.cpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_town.cpp Implementation of AITown. */ +/** @file script_town.cpp Implementation of AITown. */ #include "../../stdafx.h" -#include "ai_town.hpp" -#include "ai_map.hpp" -#include "ai_cargo.hpp" -#include "ai_error.hpp" +#include "script_town.hpp" +#include "script_map.hpp" +#include "script_cargo.hpp" +#include "script_error.hpp" #include "../../town.h" #include "../../strings_func.h" #include "../../company_func.h" diff --git a/src/ai/api/ai_town.hpp b/src/script/api/script_town.hpp similarity index 98% rename from src/ai/api/ai_town.hpp rename to src/script/api/script_town.hpp index 165045f5f0..e2efb28888 100644 --- a/src/ai/api/ai_town.hpp +++ b/src/script/api/script_town.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_town.hpp Everything to query towns. */ +/** @file script_town.hpp Everything to query towns. */ -#ifndef AI_TOWN_HPP -#define AI_TOWN_HPP +#ifndef SCRIPT_TOWN_HPP +#define SCRIPT_TOWN_HPP -#include "ai_cargo.hpp" -#include "ai_company.hpp" +#include "script_cargo.hpp" +#include "script_company.hpp" /** * Class that handles all town related functions. @@ -329,4 +329,4 @@ public: static RoadLayout GetRoadLayout(TownID town_id); }; -#endif /* AI_TOWN_HPP */ +#endif /* SCRIPT_TOWN_HPP */ diff --git a/src/ai/api/ai_townlist.cpp b/src/script/api/script_townlist.cpp similarity index 88% rename from src/ai/api/ai_townlist.cpp rename to src/script/api/script_townlist.cpp index 2ae29a7253..7495557226 100644 --- a/src/ai/api/ai_townlist.cpp +++ b/src/script/api/script_townlist.cpp @@ -7,10 +7,10 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_townlist.cpp Implementation of AITownList and friends. */ +/** @file script_townlist.cpp Implementation of AITownList and friends. */ #include "../../stdafx.h" -#include "ai_townlist.hpp" +#include "script_townlist.hpp" #include "../../town.h" AITownList::AITownList() diff --git a/src/ai/api/ai_townlist.hpp b/src/script/api/script_townlist.hpp similarity index 84% rename from src/ai/api/ai_townlist.hpp rename to src/script/api/script_townlist.hpp index 60f9da7270..6b3ba4ebc9 100644 --- a/src/ai/api/ai_townlist.hpp +++ b/src/script/api/script_townlist.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_townlist.hpp List all the towns. */ +/** @file script_townlist.hpp List all the towns. */ -#ifndef AI_TOWNLIST_HPP -#define AI_TOWNLIST_HPP +#ifndef SCRIPT_TOWNLIST_HPP +#define SCRIPT_TOWNLIST_HPP -#include "ai_list.hpp" +#include "script_list.hpp" /** * Creates a list of towns that are currently on the map. @@ -32,4 +32,4 @@ public: AITownEffectList(); }; -#endif /* AI_TOWNLIST_HPP */ +#endif /* SCRIPT_TOWNLIST_HPP */ diff --git a/src/ai/api/ai_tunnel.cpp b/src/script/api/script_tunnel.cpp similarity index 96% rename from src/ai/api/ai_tunnel.cpp rename to src/script/api/script_tunnel.cpp index 310a751afc..1d03eae79b 100644 --- a/src/ai/api/ai_tunnel.cpp +++ b/src/script/api/script_tunnel.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_tunnel.cpp Implementation of AITunnel. */ +/** @file script_tunnel.cpp Implementation of AITunnel. */ #include "../../stdafx.h" -#include "ai_tunnel.hpp" -#include "ai_rail.hpp" -#include "../ai_instance.hpp" +#include "script_tunnel.hpp" +#include "script_rail.hpp" +#include "../../ai/ai_instance.hpp" #include "../../tunnel_map.h" #include "../../command_func.h" diff --git a/src/ai/api/ai_tunnel.hpp b/src/script/api/script_tunnel.hpp similarity index 95% rename from src/ai/api/ai_tunnel.hpp rename to src/script/api/script_tunnel.hpp index 18f14a03ed..86def379d7 100644 --- a/src/ai/api/ai_tunnel.hpp +++ b/src/script/api/script_tunnel.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_tunnel.hpp Everything to query and build tunnels. */ +/** @file script_tunnel.hpp Everything to query and build tunnels. */ -#ifndef AI_TUNNEL_HPP -#define AI_TUNNEL_HPP +#ifndef SCRIPT_TUNNEL_HPP +#define SCRIPT_TUNNEL_HPP -#include "ai_vehicle.hpp" +#include "script_vehicle.hpp" /** * Class that handles all tunnel related functions. @@ -108,4 +108,4 @@ public: static bool RemoveTunnel(TileIndex tile); }; -#endif /* AI_TUNNEL_HPP */ +#endif /* SCRIPT_TUNNEL_HPP */ diff --git a/src/ai/api/ai_types.hpp b/src/script/api/script_types.hpp similarity index 97% rename from src/ai/api/ai_types.hpp rename to src/script/api/script_types.hpp index e1f76bcc06..a797d3e29f 100644 --- a/src/ai/api/ai_types.hpp +++ b/src/script/api/script_types.hpp @@ -8,7 +8,7 @@ */ /** - * @file ai_types.hpp Defines all the types of the game, like IDs of various objects. + * @file script_types.hpp Defines all the types of the game, like IDs of various objects. * * IDs are used to identify certain objects. They are only unique within the object type, so for example a vehicle may have VehicleID 2009, * while a station has StationID 2009 at the same time. Also IDs are assigned arbitrary, you cannot assume them to be consecutive. @@ -75,8 +75,8 @@ * \li \anchor dynamic_engines (2) engine IDs are reassigned/invalidated on changing 'allow multiple newgrf engine sets' (only allowed as long as no vehicles are built). */ -#ifndef AI_TYPES_HPP -#define AI_TYPES_HPP +#ifndef SCRIPT_TYPES_HPP +#define SCRIPT_TYPES_HPP #include "../../core/overflowsafe_type.hpp" #include "../../company_type.h" @@ -103,4 +103,4 @@ typedef uint32 VehicleID; ///< The ID of a vehicle. typedef uint AIErrorType; ///< The types of errors inside the NoAI framework. typedef BridgeType BridgeID; ///< The ID of a bridge. -#endif /* AI_TYPES_HPP */ +#endif /* SCRIPT_TYPES_HPP */ diff --git a/src/ai/api/ai_vehicle.cpp b/src/script/api/script_vehicle.cpp similarity index 98% rename from src/ai/api/ai_vehicle.cpp rename to src/script/api/script_vehicle.cpp index 02b463c869..e1b9972521 100644 --- a/src/ai/api/ai_vehicle.cpp +++ b/src/script/api/script_vehicle.cpp @@ -7,14 +7,14 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_vehicle.cpp Implementation of AIVehicle. */ +/** @file script_vehicle.cpp Implementation of AIVehicle. */ #include "../../stdafx.h" -#include "ai_engine.hpp" -#include "ai_cargo.hpp" -#include "ai_gamesettings.hpp" -#include "ai_group.hpp" -#include "../ai_instance.hpp" +#include "script_engine.hpp" +#include "script_cargo.hpp" +#include "script_gamesettings.hpp" +#include "script_group.hpp" +#include "../../ai/ai_instance.hpp" #include "../../company_func.h" #include "../../string_func.h" #include "../../strings_func.h" diff --git a/src/ai/api/ai_vehicle.hpp b/src/script/api/script_vehicle.hpp similarity index 99% rename from src/ai/api/ai_vehicle.hpp rename to src/script/api/script_vehicle.hpp index b994c810a0..e9b403f54f 100644 --- a/src/ai/api/ai_vehicle.hpp +++ b/src/script/api/script_vehicle.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_vehicle.hpp Everything to query and build vehicles. */ +/** @file script_vehicle.hpp Everything to query and build vehicles. */ -#ifndef AI_VEHICLE_HPP -#define AI_VEHICLE_HPP +#ifndef SCRIPT_VEHICLE_HPP +#define SCRIPT_VEHICLE_HPP -#include "ai_road.hpp" +#include "script_road.hpp" /** * Class that handles all vehicle related functions. @@ -538,4 +538,4 @@ private: static bool _MoveWagonInternal(VehicleID source_vehicle_id, int source_wagon, bool move_attached_wagons, int dest_vehicle_id, int dest_wagon); }; -#endif /* AI_VEHICLE_HPP */ +#endif /* SCRIPT_VEHICLE_HPP */ diff --git a/src/ai/api/ai_vehiclelist.cpp b/src/script/api/script_vehiclelist.cpp similarity index 94% rename from src/ai/api/ai_vehiclelist.cpp rename to src/script/api/script_vehiclelist.cpp index dd1c552459..dde717e300 100644 --- a/src/ai/api/ai_vehiclelist.cpp +++ b/src/script/api/script_vehiclelist.cpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_vehiclelist.cpp Implementation of AIVehicleList and friends. */ +/** @file script_vehiclelist.cpp Implementation of AIVehicleList and friends. */ #include "../../stdafx.h" -#include "ai_vehiclelist.hpp" -#include "ai_group.hpp" -#include "ai_map.hpp" -#include "ai_station.hpp" +#include "script_vehiclelist.hpp" +#include "script_group.hpp" +#include "script_map.hpp" +#include "script_station.hpp" #include "../../company_func.h" #include "../../depot_map.h" #include "../../vehicle_base.h" diff --git a/src/ai/api/ai_vehiclelist.hpp b/src/script/api/script_vehiclelist.hpp similarity index 91% rename from src/ai/api/ai_vehiclelist.hpp rename to src/script/api/script_vehiclelist.hpp index e6b01c360d..059041f3b7 100644 --- a/src/ai/api/ai_vehiclelist.hpp +++ b/src/script/api/script_vehiclelist.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_vehiclelist.hpp List all the vehicles (you own). */ +/** @file script_vehiclelist.hpp List all the vehicles (you own). */ -#ifndef AI_VEHICLELIST_HPP -#define AI_VEHICLELIST_HPP +#ifndef SCRIPT_VEHICLELIST_HPP +#define SCRIPT_VEHICLELIST_HPP -#include "ai_list.hpp" -#include "ai_vehicle.hpp" +#include "script_list.hpp" +#include "script_vehicle.hpp" /** * Creates a list of vehicles of which you are the owner. @@ -89,4 +89,4 @@ public: AIVehicleList_DefaultGroup(AIVehicle::VehicleType vehicle_type); }; -#endif /* AI_VEHICLELIST_HPP */ +#endif /* SCRIPT_VEHICLELIST_HPP */ diff --git a/src/ai/api/ai_waypoint.cpp b/src/script/api/script_waypoint.cpp similarity index 90% rename from src/ai/api/ai_waypoint.cpp rename to src/script/api/script_waypoint.cpp index 7e902a9510..29357cd1dc 100644 --- a/src/ai/api/ai_waypoint.cpp +++ b/src/script/api/script_waypoint.cpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_waypoint.cpp Implementation of AIWaypoint. */ +/** @file script_waypoint.cpp Implementation of AIWaypoint. */ #include "../../stdafx.h" -#include "ai_waypoint.hpp" -#include "ai_rail.hpp" -#include "ai_marine.hpp" +#include "script_waypoint.hpp" +#include "script_rail.hpp" +#include "script_marine.hpp" #include "../../company_func.h" #include "../../waypoint_base.h" diff --git a/src/ai/api/ai_waypoint.hpp b/src/script/api/script_waypoint.hpp similarity index 92% rename from src/ai/api/ai_waypoint.hpp rename to src/script/api/script_waypoint.hpp index 413035a466..b42c33487d 100644 --- a/src/ai/api/ai_waypoint.hpp +++ b/src/script/api/script_waypoint.hpp @@ -7,12 +7,12 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_waypoint.hpp Everything to query and build waypoints. */ +/** @file script_waypoint.hpp Everything to query and build waypoints. */ -#ifndef AI_WAYPOINT_HPP -#define AI_WAYPOINT_HPP +#ifndef SCRIPT_WAYPOINT_HPP +#define SCRIPT_WAYPOINT_HPP -#include "ai_basestation.hpp" +#include "script_basestation.hpp" /** * Class that handles all waypoint related functions. @@ -69,4 +69,4 @@ public: DECLARE_ENUM_AS_BIT_SET(AIWaypoint::WaypointType) -#endif /* AI_WAYPOINT_HPP */ +#endif /* SCRIPT_WAYPOINT_HPP */ diff --git a/src/ai/api/ai_waypointlist.cpp b/src/script/api/script_waypointlist.cpp similarity index 89% rename from src/ai/api/ai_waypointlist.cpp rename to src/script/api/script_waypointlist.cpp index ff1f81cb13..83db15cb30 100644 --- a/src/ai/api/ai_waypointlist.cpp +++ b/src/script/api/script_waypointlist.cpp @@ -7,11 +7,11 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_waypointlist.cpp Implementation of AIWaypointList and friends. */ +/** @file script_waypointlist.cpp Implementation of AIWaypointList and friends. */ #include "../../stdafx.h" -#include "ai_waypointlist.hpp" -#include "ai_vehicle.hpp" +#include "script_waypointlist.hpp" +#include "script_vehicle.hpp" #include "../../company_func.h" #include "../../vehicle_base.h" #include "../../waypoint_base.h" diff --git a/src/ai/api/ai_waypointlist.hpp b/src/script/api/script_waypointlist.hpp similarity index 83% rename from src/ai/api/ai_waypointlist.hpp rename to src/script/api/script_waypointlist.hpp index 83642238fe..9bbbd27310 100644 --- a/src/ai/api/ai_waypointlist.hpp +++ b/src/script/api/script_waypointlist.hpp @@ -7,13 +7,13 @@ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . */ -/** @file ai_waypointlist.hpp List all the waypoints (you own). */ +/** @file script_waypointlist.hpp List all the waypoints (you own). */ -#ifndef AI_WAYPOINTLIST_HPP -#define AI_WAYPOINTLIST_HPP +#ifndef SCRIPT_WAYPOINTLIST_HPP +#define SCRIPT_WAYPOINTLIST_HPP -#include "ai_list.hpp" -#include "ai_waypoint.hpp" +#include "script_list.hpp" +#include "script_waypoint.hpp" /** * Creates a list of waypoints of which you are the owner. @@ -39,4 +39,4 @@ public: AIWaypointList_Vehicle(VehicleID vehicle_id); }; -#endif /* AI_WAYPOINTLIST_HPP */ +#endif /* SCRIPT_WAYPOINTLIST_HPP */