summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-12-19 23:46:15 +0000
committersmatz <smatz@openttd.org>2009-12-19 23:46:15 +0000
commit061de2b2df9cab664006a075ad574c6e93873b94 (patch)
tree96aa194d876048ced1ddda595e0e5fd2588214d8
parente46a9078e657323d191938c4c2e5a51225587832 (diff)
downloadopenttd-061de2b2df9cab664006a075ad574c6e93873b94.tar.xz
(svn r18555) -Fix (r15027): fake definitions of squirrel types were wrong for eg. 64bit systems, don't use them
-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.hpp2
-rw-r--r--src/script/fake_squirrel_types.hpp23
5 files changed, 1 insertions, 33 deletions
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index fa7267ef1..049536a2f 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -2340,10 +2340,6 @@
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 40d535982..d32ec7361 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -2337,10 +2337,6 @@
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 a6c083988..9f70b0016 100644
--- a/source.list
+++ b/source.list
@@ -518,7 +518,6 @@ table/water_land.h
3rdparty/minilzo/minilzo.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 dc0805492..ff435131d 100644
--- a/src/ai/api/ai_types.hpp
+++ b/src/ai/api/ai_types.hpp
@@ -79,7 +79,7 @@
#include "../../core/overflowsafe_type.hpp"
#include "../../company_type.h"
-#include "../../script/fake_squirrel_types.hpp"
+#include <squirrel.h>
/* 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.
diff --git a/src/script/fake_squirrel_types.hpp b/src/script/fake_squirrel_types.hpp
deleted file mode 100644
index 7ab0212d4..000000000
--- a/src/script/fake_squirrel_types.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/** @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 */