summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--projects/openttd_vs80.vcproj4
-rw-r--r--projects/openttd_vs90.vcproj4
-rw-r--r--source.list1
-rw-r--r--src/ai/api/ai_types.hpp9
-rw-r--r--src/script/fake_squirrel_types.hpp16
5 files changed, 26 insertions, 8 deletions
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 386311ede..caa5cfe1d 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -2268,6 +2268,10 @@
Name="Script"
>
<File
+ RelativePath=".\..\src\script\fake_squirrel_types.hpp"
+ >
+ </File>
+ <File
RelativePath=".\..\src\script\script_info.cpp"
>
</File>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 980b6f67f..4ed8aa9e8 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -2265,6 +2265,10 @@
Name="Script"
>
<File
+ RelativePath=".\..\src\script\fake_squirrel_types.hpp"
+ >
+ </File>
+ <File
RelativePath=".\..\src\script\script_info.cpp"
>
</File>
diff --git a/source.list b/source.list
index c9c8b0d46..6f3489400 100644
--- a/source.list
+++ b/source.list
@@ -518,6 +518,7 @@ table/unmovable_land.h
table/water_land.h
# Script
+script/fake_squirrel_types.hpp
script/script_info.cpp
script/script_info.hpp
script/script_scanner.cpp
diff --git a/src/ai/api/ai_types.hpp b/src/ai/api/ai_types.hpp
index 2ccd1d27d..45db6b324 100644
--- a/src/ai/api/ai_types.hpp
+++ b/src/ai/api/ai_types.hpp
@@ -7,6 +7,7 @@
#include "../../core/overflowsafe_type.hpp"
#include "../../company_type.h"
+#include "../../script/fake_squirrel_types.hpp"
/* Define all types here, so we don't have to include the whole _type.h maze */
typedef uint BridgeType; //!< Internal name, not of any use for you.
@@ -30,12 +31,4 @@ typedef uint AIErrorType; //!< The types of errors inside the NoAI framework.
typedef BridgeType BridgeID; //!< The ID of a bridge.
typedef uint16 SubsidyID; //!< The ID of a subsidy.
-#ifndef _SQUIRREL_H_
-/* Life becomes easier when we can tell about a function it needs the VM, but
- * without really including 'squirrel.h'. */
-typedef struct SQVM *HSQUIRRELVM; //!< Pointer to Squirrel Virtual Machine.
-typedef int SQInteger; //!< Squirrel Integer.
-typedef struct SQObject HSQOBJECT; //!< Squirrel Object (fake declare)
-#endif
-
#endif /* AI_TYPES_HPP */
diff --git a/src/script/fake_squirrel_types.hpp b/src/script/fake_squirrel_types.hpp
new file mode 100644
index 000000000..ef25008f1
--- /dev/null
+++ b/src/script/fake_squirrel_types.hpp
@@ -0,0 +1,16 @@
+/* $Id$ */
+
+/** @file fake_squirrel_types.hpp Provides definitions for some squirrel types to prevent including squirrel.h in header files.*/
+
+#ifndef FAKE_SQUIRREL_TYPES_HPP
+#define FAKE_SQUIRREL_TYPES_HPP
+
+#ifndef _SQUIRREL_H_
+/* Life becomes easier when we can tell about a function it needs the VM, but
+ * without really including 'squirrel.h'. */
+typedef struct SQVM *HSQUIRRELVM; //!< Pointer to Squirrel Virtual Machine.
+typedef int SQInteger; //!< Squirrel Integer.
+typedef struct SQObject HSQOBJECT; //!< Squirrel Object (fake declare)
+#endif
+
+#endif /* FAKE_SQUIRREL_TYPES_HPP */