diff --git a/common/graphics/makefile b/common/graphics/makefile index 9013447..afcde11 100644 --- a/common/graphics/makefile +++ b/common/graphics/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. +INCLUDES+=. ../map LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/common/map/tile_sheet.cpp b/common/graphics/tile_sheet.cpp similarity index 100% rename from common/map/tile_sheet.cpp rename to common/graphics/tile_sheet.cpp diff --git a/common/map/tile_sheet.hpp b/common/graphics/tile_sheet.hpp similarity index 100% rename from common/map/tile_sheet.hpp rename to common/graphics/tile_sheet.hpp diff --git a/common/map/makefile b/common/map/makefile index 24e7779..769709e 100644 --- a/common/map/makefile +++ b/common/map/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. ../graphics ../utilities +INCLUDES+=. ../utilities LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/common/map/map_system_api.cpp b/common/map/map_system_api.cpp index 1ab6984..7a980c7 100644 --- a/common/map/map_system_api.cpp +++ b/common/map/map_system_api.cpp @@ -24,7 +24,6 @@ //all map API headers #include "region_api.hpp" #include "region_pager_api.hpp" -#include "tile_sheet_api.hpp" //useful "globals" //... @@ -37,7 +36,6 @@ static const luaL_Reg funcs[] = { static const luaL_Reg libs[] = { {"Region", openRegionAPI}, {"RegionPager", openRegionPagerAPI}, -// {"TileSheet", openTileSheetAPI}, {nullptr, nullptr} }; diff --git a/common/map/tile_sheet_api.cpp b/common/map/tile_sheet_api.cpp deleted file mode 100644 index 141f200..0000000 --- a/common/map/tile_sheet_api.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013-2015 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#include "tile_sheet_api.hpp" - -#include "tile_sheet.hpp" - -static int load(lua_State* L) { - TileSheet* sheet = reinterpret_cast(lua_touserdata(L, 1)); - sheet->Load(lua_tostring(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4)); - return 0; -} - -static int unload(lua_State* L) { - TileSheet* sheet = reinterpret_cast(lua_touserdata(L, 1)); - sheet->Unload(); - return 0; -} - -static int getXCount(lua_State* L) { - TileSheet* sheet = reinterpret_cast(lua_touserdata(L, 1)); - lua_pushinteger(L, sheet->GetXCount()); - return 1; -} - -static int getYCount(lua_State* L) { - TileSheet* sheet = reinterpret_cast(lua_touserdata(L, 1)); - lua_pushinteger(L, sheet->GetYCount()); - return 1; -} - -static int getTileW(lua_State* L) { - TileSheet* sheet = reinterpret_cast(lua_touserdata(L, 1)); - lua_pushinteger(L, sheet->GetTileW()); - return 1; -} - -static int getTileH(lua_State* L) { - TileSheet* sheet = reinterpret_cast(lua_touserdata(L, 1)); - lua_pushinteger(L, sheet->GetTileH()); - return 1; -} - -static const luaL_Reg tileSheetLib[] = { - {"Load",load}, - {"Unload",unload}, - {"GetXCount",getXCount}, - {"GetYCount",getYCount}, - {"GetTileW",getTileW}, - {"GetTileH",getTileH}, - {nullptr, nullptr} -}; - -LUAMOD_API int openTileSheetAPI(lua_State* L) { - luaL_newlib(L, tileSheetLib); - return 1; -} \ No newline at end of file diff --git a/common/map/tile_sheet_api.hpp b/common/map/tile_sheet_api.hpp deleted file mode 100644 index 57c812e..0000000 --- a/common/map/tile_sheet_api.hpp +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013-2015 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#ifndef TILESHEETAPI_HPP_ -#define TILESHEETAPI_HPP_ - -#include "lua.hpp" - -#define TORTUGA_TILE_SHEET_NAME "tile_sheet" -LUAMOD_API int openTileSheetAPI(lua_State* L); - -#endif