(svn r9229) [NoAI] -Change: move more header-mess from .hpp to .cpp noai
authortruelight
Thu, 15 Mar 2007 22:22:51 +0000
branchnoai
changeset 9426 b90c0d1a36b7
parent 9425 8eec6d10844a
child 9427 ef0c109c5661
(svn r9229) [NoAI] -Change: move more header-mess from .hpp to .cpp
src/ai/squirrel/squirrel.cpp
src/ai/squirrel/squirrel.hpp
--- a/src/ai/squirrel/squirrel.cpp	Thu Mar 15 22:17:28 2007 +0000
+++ b/src/ai/squirrel/squirrel.cpp	Thu Mar 15 22:22:51 2007 +0000
@@ -7,18 +7,29 @@
 #include "../../openttd.h"
 #include "../../string.h"
 #include "../../fios.h"
-#include "squirrel.hpp"
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#ifdef _UNICODE
+/* Disable unicode for squirrel to allow compilation with MINGW
+ * and simplify coding for WIN32 (squirrel headers miss a lot of "string" functions)
+ */
+#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"
+
 /* Convert all AI related classes to Squirrel data */
 #define DEFINE_SQUIRREL_CLASS
-#include "../../squirrel_helper.hpp"
-#include "../../squirrel_class.hpp"
 #include "../core/ai_base.hpp"
 #include "../core/ai_cargo.hpp"
+#include "../core/ai_controller.hpp"
 #include "../core/ai_company.hpp"
-#include "../core/ai_controller.hpp"
 #include "../core/ai_industry.hpp"
 #include "../core/ai_map.hpp"
 #include "../core/ai_town.hpp"
--- a/src/ai/squirrel/squirrel.hpp	Thu Mar 15 22:17:28 2007 +0000
+++ b/src/ai/squirrel/squirrel.hpp	Thu Mar 15 22:22:51 2007 +0000
@@ -5,17 +5,6 @@
 #ifndef AI_SQUIRREL_HPP
 #define AI_SQUIRREL_HPP
 
-#ifdef _UNICODE
-/* Disable unicode for squirrel to allow compilation with MINGW
- * and simplify coding for WIN32 (squirrel headers miss a lot of "string" functions)
- */
-#undef _UNICODE
-#endif
-#include <squirrel.h>
-#include "../core/ai_controller.hpp"
-#include "../core/ai_factory.hpp"
-#include "../../squirrel.hpp"
-
 class AIControllerSquirrel: public AIController {
 private:
 	Squirrel *engine; ///< The Squirrel engine