Mercurial > hg > openttd
changeset 12568:895d8f06d5a8 draft
(svn r17006) -Fix (r17005): gcc compile failure
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Fri, 31 Jul 2009 19:57:21 +0000 |
| parents | a2ab2f2e9af8 |
| children | 5a3d12879d91 |
| files | src/ai/api/ai_map.hpp src/ai/api/ai_map.hpp.sq src/ai/api/squirrel_export.awk |
| diffstat | 3 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ai/api/ai_map.hpp +++ b/src/ai/api/ai_map.hpp @@ -13,9 +13,7 @@ class AIMap : public AIObject { public: #ifdef DEFINE_SCRIPT_FILES - enum MapType { - TILE_INVALID = INVALID_TILE, //!< Invalid TileIndex. - }; + static const int TILE_INVALID = INVALID_TILE; //!< Invalid TileIndex. #endif /* DEFINE_SCRIPT_FILES */ #ifdef DOXYGEN_SKIP const static TileIndex TILE_INVALID; //!< Invalid TileIndex.
--- a/src/ai/api/ai_map.hpp.sq +++ b/src/ai/api/ai_map.hpp.sq @@ -4,10 +4,6 @@ #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; }