cpp/openttd-patchpack/source Changeset - r14003:c3388b79f725

Changeset - r14003:c3388b79f725

Parent rev.

Child rev.

[Not reviewed]

master

1 4 0

smatz - 15 years ago 2009-12-19 23:46:15
smatz@openttd.org

(svn r18555) -Fix (r15027): fake definitions of squirrel types were wrong for eg. 64bit systems, don't use them

5 files changed with 1 insertions and 33 deletions:

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/ai/api/ai_types.hpp

src/script/fake_squirrel_types.hpp

0 comments (0 inline, 0 general)

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -2331,28 +2331,24 @@ @@
 				RelativePath=".\..\src\3rdparty\minilzo\minilzo.c"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\minilzo\minilzo.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Script"
+			>
 			<File
 				RelativePath=".\..\src\script\fake_squirrel_types.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_info.cpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_info.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_scanner.cpp"
+				>
 			</File>
 			<File

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -2328,28 +2328,24 @@ @@
 				RelativePath=".\..\src\3rdparty\minilzo\minilzo.c"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\3rdparty\minilzo\minilzo.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Script"
+			>
 			<File
 				RelativePath=".\..\src\script\fake_squirrel_types.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_info.cpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_info.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\script\script_scanner.cpp"
+				>
 			</File>
 			<File

source.list

➞

Show inline comments

@@ @@ -509,25 +509,24 @@ table/water_land.h @@
 # MD5
 rdparty/md5/md5.cpp
 rdparty/md5/md5.h
 # MiniLZO
 rdparty/minilzo/lzoconf.h
 rdparty/minilzo/lzodefs.h
 rdparty/minilzo/minilzo.c
 rdparty/minilzo/minilzo.h
 # Script
 script/fake_squirrel_types.hpp
 script/script_info.cpp
 script/script_info.hpp
 script/script_scanner.cpp
 script/script_scanner.hpp
 script/squirrel.cpp
 script/squirrel.hpp
 script/squirrel_class.hpp
 script/squirrel_helper.hpp
 script/squirrel_helper_type.hpp
 script/squirrel_std.cpp
 script/squirrel_std.hpp

src/ai/api/ai_types.hpp

➞

Show inline comments

@@ @@ -70,25 +70,25 @@ @@
  * </table>
+ *
  * @remarks
  *  \li \anchor newgrf_changes  (1) in-game changes of newgrfs may reassign/invalidate IDs (will also cause other trouble though).
  *  \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
 #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.
 typedef byte CargoID;        //!< The ID of a cargo.
 class CommandCost;           //!< The cost of a command.
 typedef uint16 EngineID;     //!< The ID of an engine.
 typedef uint16 GroupID;      //!< The ID of a group.
 typedef uint16 IndustryID;   //!< The ID of an industry.
 typedef uint8 IndustryType;  //!< The ID of an industry-type.
 typedef OverflowSafeInt64 Money; //!< Money, stored in a 32bit/64bit safe way. For AIs money is always in pounds.
 typedef uint16 SignID;       //!< The ID of a sign.
 typedef uint16 StationID;    //!< The ID of a station.

src/script/fake_squirrel_types.hpp

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)