Mercurial Mercurial > openttd-ottdgrfs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r9232) [NoAI] -Fix r9230: incode update about file/dir moving noai
authortruelight
Thu, 15 Mar 2007 22:33:39 +0000
branchnoai
changeset 9429 25b7d020a3a9
parent 9428 677545faebce
child 9430 9e0a193b2bec
(svn r9232) [NoAI] -Fix r9230: incode update about file/dir moving
projects/openttd.vcproj file | annotate | diff | comparison | revisions
projects/openttd_vs80.vcproj file | annotate | diff | comparison | revisions
source.list file | annotate | diff | comparison | revisions
src/ai/ai.cpp file | annotate | diff | comparison | revisions
src/ai/squirrel.cpp file | annotate | diff | comparison | revisions
src/economy.cpp file | annotate | diff | comparison | revisions
src/misc.cpp file | annotate | diff | comparison | revisions
src/oldloader.cpp file | annotate | diff | comparison | revisions
src/openttd.cpp file | annotate | diff | comparison | revisions
src/players.cpp file | annotate | diff | comparison | revisions 
--- a/projects/openttd.vcproj	Thu Mar 15 22:28:56 2007 +0000
+++ b/projects/openttd.vcproj	Thu Mar 15 22:33:39 2007 +0000
@@ -971,78 +971,74 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="AI Headers"
-			Filter="">
-			<File
-				RelativePath=".\..\src\ai\core\ai.h">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_base.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_cargo.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_company.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_controller.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_industry.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_map.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_object.hpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_town.hpp">
-			</File>
-		</Filter>
-		<Filter
 			Name="AI Core"
 			Filter="">
 			<File
-				RelativePath=".\..\src\ai\core\ai.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\base\random.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\cargo\query.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\company\name.cpp">
+				RelativePath=".\..\src\ai\ai.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\company\money.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\industry\query.cpp">
+				RelativePath=".\..\src\ai\ai.h">
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\map\conversion.cpp">
+				RelativePath=".\..\src\ai\squirrel.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\map\query.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\object\commands.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\town\query.cpp">
+				RelativePath=".\..\src\ai\squirrel.hpp">
 			</File>
 		</Filter>
 		<Filter
-			Name="AIs"
+			Name="AI API"
 			Filter="">
 			<File
-				RelativePath=".\..\src\ai\squirrel\squirrel.cpp">
+				RelativePath=".\..\src\ai\api\ai_base.hpp">
 			</File>
 			<File
-				RelativePath=".\..\src\ai\squirrel\squirrel.hpp">
+				RelativePath=".\..\src\ai\api\ai_cargo.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_company.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_controller.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_industry.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_map.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_object.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_town.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\base\random.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\cargo\query.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\company\name.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\company\money.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\industry\query.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\map\conversion.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\map\query.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\object\commands.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\town\query.cpp">
 			</File>
 		</Filter>
 		<Filter
--- a/projects/openttd_vs80.vcproj	Thu Mar 15 22:28:56 2007 +0000
+++ b/projects/openttd_vs80.vcproj	Thu Mar 15 22:33:39 2007 +0000
@@ -1517,98 +1517,94 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="AI Headers"
+			Name="AI Core"
 			>
 			<File
-				RelativePath=".\..\src\ai\core\ai.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_base.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_cargo.hpp"
+				RelativePath=".\..\src\ai\ai.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\ai_company.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_controller.hpp"
+				RelativePath=".\..\src\ai\ai.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\ai_industry.hpp"
+				RelativePath=".\..\src\ai\squirrel.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\ai_map.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_object.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\ai_town.hpp"
+				RelativePath=".\..\src\ai\squirrel.hpp"
 				>
 			</File>
 		</Filter>
 		<Filter
-			Name="AI Core"
+			Name="AI API"
 			>
 			<File
-				RelativePath=".\..\src\ai\core\ai.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\base\random.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\cargo\query.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\company\name.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\company\money.cpp"
+				RelativePath=".\..\src\ai\api\ai_base.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\industry\query.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\map\conversion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\core\map\query.cpp"
+				RelativePath=".\..\src\ai\api\ai_cargo.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\object\commands.cpp"
+				RelativePath=".\..\src\ai\api\ai_company.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\core\town\query.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="AIs"
-			>
-			<File
-				RelativePath=".\..\src\ai\squirrel\squirrel.cpp"
+				RelativePath=".\..\src\ai\api\ai_controller.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\squirrel\squirrel.hpp"
+				RelativePath=".\..\src\ai\api\ai_industry.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_map.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_object.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_town.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\base\random.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\cargo\query.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\company\name.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\company\money.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\industry\query.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\map\conversion.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\map\query.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\object\commands.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ai\api\town\query.cpp"
 				>
 			</File>
 		</Filter>
--- a/source.list	Thu Mar 15 22:28:56 2007 +0000
+++ b/source.list	Thu Mar 15 22:33:39 2007 +0000
@@ -294,32 +294,30 @@
 3rdparty/squirrel/sqstdlib/sqstdstring.cpp
 3rdparty/squirrel/sqstdlib/sqstdsystem.cpp
 
-# AI Headers
-ai/core/ai.h
-ai/core/ai_base.hpp
-ai/core/ai_cargo.hpp
-ai/core/ai_company.hpp
-ai/core/ai_controller.hpp
-ai/core/ai_industry.hpp
-ai/core/ai_map.hpp
-ai/core/ai_object.hpp
-ai/core/ai_town.hpp
-
 # AI Core
-ai/core/ai.cpp
-ai/core/base/random.cpp
-ai/core/cargo/query.cpp
-ai/core/company/name.cpp
-ai/core/company/money.cpp
-ai/core/industry/query.cpp
-ai/core/map/conversion.cpp
-ai/core/map/query.cpp
-ai/core/object/commands.cpp
-ai/core/town/query.cpp
+ai/ai.cpp
+ai/ai.h
+ai/squirrel.cpp
+ai/squirrel.hpp
 
-# AIs
-ai/squirrel/squirrel.cpp
-ai/squirrel/squirrel.hpp
+# AI API
+ai/api/ai_base.hpp
+ai/api/ai_cargo.hpp
+ai/api/ai_company.hpp
+ai/api/ai_controller.hpp
+ai/api/ai_industry.hpp
+ai/api/ai_map.hpp
+ai/api/ai_object.hpp
+ai/api/ai_town.hpp
+ai/api/base/random.cpp
+ai/api/cargo/query.cpp
+ai/api/company/name.cpp
+ai/api/company/money.cpp
+ai/api/industry/query.cpp
+ai/api/map/conversion.cpp
+ai/api/map/query.cpp
+ai/api/object/commands.cpp
+ai/api/town/query.cpp
 
 # NewGRF
 newgrf.cpp
--- a/src/ai/ai.cpp	Thu Mar 15 22:28:56 2007 +0000
+++ b/src/ai/ai.cpp	Thu Mar 15 22:33:39 2007 +0000
@@ -2,17 +2,17 @@
 
 /** @file ai.cpp handles the communication between the AI layer and the OpenTTD core */
 
-#include "../../stdafx.h"
-#include "../../openttd.h"
-#include "../../variables.h"
-#include "../../command.h"
-#include "../../network/network.h"
-#include "../../helpers.hpp"
-#include "../../debug.h"
+#include "../stdafx.h"
+#include "../openttd.h"
+#include "../variables.h"
+#include "../command.h"
+#include "../network/network.h"
+#include "../helpers.hpp"
+#include "../debug.h"
 #include "ai.h"
-#include "ai_base.hpp"
-#include "ai_controller.hpp"
-#include "ai_factory.hpp"
+#include "api/ai_base.hpp"
+#include "api/ai_controller.hpp"
+#include "api/ai_factory.hpp"
 
 static AIController *_ai_player[MAX_PLAYERS];
 static uint _ai_frame_counter;
--- a/src/ai/squirrel.cpp	Thu Mar 15 22:28:56 2007 +0000
+++ b/src/ai/squirrel.cpp	Thu Mar 15 22:33:39 2007 +0000
@@ -2,11 +2,11 @@
 
 /** @file squirrel.cpp allows loading squirrel scripts to control an AI */
 
-#include "../../stdafx.h"
-#include "../../debug.h"
-#include "../../openttd.h"
-#include "../../string.h"
-#include "../../fios.h"
+#include "../stdafx.h"
+#include "../debug.h"
+#include "../openttd.h"
+#include "../string.h"
+#include "../fios.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -17,22 +17,22 @@
 #undef _UNICODE
 #endif
 #include <squirrel.h>
-#include "../../squirrel.hpp"
-#include "../../squirrel_helper.hpp"
-#include "../../squirrel_class.hpp"
-#include "../core/ai_factory.hpp"
-#include "../core/ai_controller.hpp"
+#include "../squirrel.hpp"
+#include "../squirrel_helper.hpp"
+#include "../squirrel_class.hpp"
+#include "api/ai_factory.hpp"
+#include "api/ai_controller.hpp"
 #include "squirrel.hpp"
 
 /* Convert all AI related classes to Squirrel data */
 #define DEFINE_SQUIRREL_CLASS
-#include "../core/ai_base.hpp"
-#include "../core/ai_cargo.hpp"
-#include "../core/ai_controller.hpp"
-#include "../core/ai_company.hpp"
-#include "../core/ai_industry.hpp"
-#include "../core/ai_map.hpp"
-#include "../core/ai_town.hpp"
+#include "api/ai_base.hpp"
+#include "api/ai_cargo.hpp"
+#include "api/ai_controller.hpp"
+#include "api/ai_company.hpp"
+#include "api/ai_industry.hpp"
+#include "api/ai_map.hpp"
+#include "api/ai_town.hpp"
 
 static FSquirrel iFSquirrel; ///< Tell the AI-core that we have an AI with which we like to play.
 
--- a/src/economy.cpp	Thu Mar 15 22:28:56 2007 +0000
+++ b/src/economy.cpp	Thu Mar 15 22:33:39 2007 +0000
@@ -27,7 +27,7 @@
 #include "network/network_data.h"
 #include "variables.h"
 #include "vehicle_gui.h"
-#include "ai/core/ai.h"
+#include "ai/ai.h"
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf_engine.h"
--- a/src/misc.cpp	Thu Mar 15 22:28:56 2007 +0000
+++ b/src/misc.cpp	Thu Mar 15 22:33:39 2007 +0000
@@ -17,7 +17,7 @@
 #include "engine.h"
 #include "vehicle_gui.h"
 #include "variables.h"
-#include "ai/core/ai.h"
+#include "ai/ai.h"
 #include "date.h"
 #include "cargotype.h"
 
--- a/src/oldloader.cpp	Thu Mar 15 22:28:56 2007 +0000
+++ b/src/oldloader.cpp	Thu Mar 15 22:33:39 2007 +0000
@@ -17,7 +17,7 @@
 #include "debug.h"
 #include "depot.h"
 #include "network/network.h"
-#include "ai/core/ai.h"
+#include "ai/ai.h"
 #include "date.h"
 
 enum {
--- a/src/openttd.cpp	Thu Mar 15 22:28:56 2007 +0000
+++ b/src/openttd.cpp	Thu Mar 15 22:33:39 2007 +0000
@@ -47,7 +47,7 @@
 #include "signs.h"
 #include "depot.h"
 #include "waypoint.h"
-#include "ai/core/ai.h"
+#include "ai/ai.h"
 #include "train.h"
 #include "yapf/yapf.h"
 #include "settings.h"
--- a/src/players.cpp	Thu Mar 15 22:28:56 2007 +0000
+++ b/src/players.cpp	Thu Mar 15 22:33:39 2007 +0000
@@ -23,7 +23,7 @@
 #include "network/network.h"
 #include "variables.h"
 #include "engine.h"
-#include "ai/core/ai.h"
+#include "ai/ai.h"
 #include "date.h"
 #include "window.h"
 #include "player_face.h"
openttd-ottdgrfs