diff options
| author | truebrain <truebrain@openttd.org> | 2009-01-15 21:20:12 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2009-01-15 21:20:12 +0000 |
| commit | 5119132dda807aacb65e2afcce22665e7eedc577 (patch) | |
| tree | ca292d7b9216b6dbb59957f026abe09ed134d97d | |
| parent | e9437c2b2b96d052190e88a416247fe5ca61bb29 (diff) | |
| download | openttd-5119132dda807aacb65e2afcce22665e7eedc577.tar.xz | |
(svn r15100) -Add [NoAI]: introduce TILE_INVALID as const
| -rw-r--r-- | src/ai/ai_instance.cpp | 4 | ||||
| -rw-r--r-- | src/ai/api/ai_map.hpp | 6 | ||||
| -rw-r--r-- | src/ai/api/ai_map.hpp.sq | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp index 07b86b241..cfd952505 100644 --- a/src/ai/ai_instance.cpp +++ b/src/ai/ai_instance.cpp @@ -24,6 +24,8 @@ #include "ai_storage.hpp" #include "ai_instance.hpp" +#define DEFINE_SCRIPT_FILES + /* Convert all AI related classes to Squirrel data. * Note: this line a marker in squirrel_export.sh. Do not change! */ #include "api/ai_abstractlist.hpp.sq" @@ -73,6 +75,8 @@ #include "api/ai_vehicle.hpp.sq" #include "api/ai_vehiclelist.hpp.sq" +#undef DEFINE_SCRIPT_FILES + /* static */ AIInstance *AIInstance::current_instance = NULL; AIStorage::~AIStorage() diff --git a/src/ai/api/ai_map.hpp b/src/ai/api/ai_map.hpp index 9c544ea25..dbf3db08f 100644 --- a/src/ai/api/ai_map.hpp +++ b/src/ai/api/ai_map.hpp @@ -12,6 +12,12 @@ */ class AIMap : public AIObject { public: +#ifdef DEFINE_SCRIPT_FILES + enum MapType { + TILE_INVALID = INVALID_TILE, //!< An invalid tile for every function. + }; +#endif /* DEFINE_SCRIPT_FILES */ + static const char *GetClassName() { return "AIMap"; } /** diff --git a/src/ai/api/ai_map.hpp.sq b/src/ai/api/ai_map.hpp.sq index f65368c8f..7419d17ba 100644 --- a/src/ai/api/ai_map.hpp.sq +++ b/src/ai/api/ai_map.hpp.sq @@ -4,6 +4,10 @@ #include "ai_map.hpp" namespace SQConvert { + /* Allow enums to be used as Squirrel parameters */ + template <> AIMap::MapType GetParam(ForceType<AIMap::MapType>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (AIMap::MapType)tmp; } + template <> int Return<AIMap::MapType>(HSQUIRRELVM vm, AIMap::MapType res) { sq_pushinteger(vm, (int32)res); return 1; } + /* Allow AIMap to be used as Squirrel parameter */ template <> AIMap *GetParam(ForceType<AIMap *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return (AIMap *)instance; } template <> AIMap &GetParam(ForceType<AIMap &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AIMap *)instance; } @@ -17,6 +21,8 @@ void SQAIMap_Register(Squirrel *engine) { SQAIMap.PreRegister(engine); SQAIMap.AddConstructor<void (AIMap::*)(), 1>(engine, "x"); + SQAIMap.DefSQConst(engine, AIMap::TILE_INVALID, "TILE_INVALID"); + SQAIMap.DefSQStaticMethod(engine, &AIMap::GetClassName, "GetClassName", 1, "x"); SQAIMap.DefSQStaticMethod(engine, &AIMap::IsValidTile, "IsValidTile", 2, "xi"); SQAIMap.DefSQStaticMethod(engine, &AIMap::GetMapSize, "GetMapSize", 1, "x"); |