Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15743) -Codechange: move the definitions of some fake squirrel types to their own file.

Browse Source
This commit is contained in:
yexo 2009-03-16 17:30:49 +00:00
parent b078f8095a
commit 384599ef2c
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openttd_vs80.vcproj
View File

@ -2267,6 +2267,10 @@
<Filter <Filter
Name="Script" Name="Script"
> >
<File
RelativePath=".\..\src\script\fake_squirrel_types.hpp"
>
</File>
<File <File
RelativePath=".\..\src\script\script_info.cpp" RelativePath=".\..\src\script\script_info.cpp"
> >

4
projects/openttd_vs90.vcproj
View File

@ -2264,6 +2264,10 @@
<Filter <Filter
Name="Script" Name="Script"
> >
<File
RelativePath=".\..\src\script\fake_squirrel_types.hpp"
>
</File>
<File <File
RelativePath=".\..\src\script\script_info.cpp" RelativePath=".\..\src\script\script_info.cpp"
> >

1
source.list
View File

@ -518,6 +518,7 @@ table/unmovable_land.h
table/water_land.h table/water_land.h
# Script # Script
script/fake_squirrel_types.hpp
script/script_info.cpp script/script_info.cpp
script/script_info.hpp script/script_info.hpp
script/script_scanner.cpp script/script_scanner.cpp

9
src/ai/api/ai_types.hpp
View File

@ -7,6 +7,7 @@
#include "../../core/overflowsafe_type.hpp" #include "../../core/overflowsafe_type.hpp"
#include "../../company_type.h" #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 */ /* 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 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 BridgeType BridgeID; //!< The ID of a bridge.
typedef uint16 SubsidyID; //!< The ID of a subsidy. 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 */ #endif /* AI_TYPES_HPP */

16
src/script/fake_squirrel_types.hpp Normal file
View File

@ -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 */