Merge branch 'new-map' into develop

common/makefile

@@ -3,7 +3,6 @@ all:
 	$(MAKE) -C graphics
 	$(MAKE) -C map
 	$(MAKE) -C network
-	$(MAKE) -C script
 	$(MAKE) -C ui
 	$(MAKE) -C utilities
 

common/map/map_allocator.cpp

@@ -1,60 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * 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 "map_allocator.hpp"
-
-#include <stdexcept>
-
-void BlankAllocator::Create(Region** const ptr, int x, int y) {
-	(*ptr) = new Region(x, y);
-}
-
-void BlankAllocator::Unload(Region* const ptr) {
-	delete ptr;
-}
-
-void LuaAllocator::Create(Region** const ptr, int x, int y) {
-	//something to work on
-	(*ptr) = new Region(x, y);
-
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "create");
-	lua_pushlightuserdata(state, *ptr);
-	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-}
-
-void LuaAllocator::Unload(Region* const ptr) {
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "unload");
-	lua_pushlightuserdata(state, ptr);
-	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-
-	//clean up the memory
-	delete ptr;
-}

common/map/map_file_format.cpp

@@ -1,66 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * 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 "map_file_format.hpp"
-
-#include <stdexcept>
-
-void DummyFormat::Load(Region** const ptr, int x, int y) {
-	//EMPTY
-}
-
-void DummyFormat::Save(Region* const ptr) {
-	//EMPTY
-}
-
-void LuaFormat::Load(Region** const ptr, int x, int y) {
-	//something to load into
-
-	if (!(*ptr)) {
-		(*ptr) = new Region(x, y);
-	}
-
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "load");
-	lua_pushlightuserdata(state, *ptr);
-	lua_pushstring(state, saveDir.c_str());
-	if (lua_pcall(state, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	if (lua_toboolean(state, -1) == false) {
-		delete (*ptr);
-		(*ptr) = nullptr;
-	}
-	lua_pop(state, 2);
-}
-
-void LuaFormat::Save(Region* const ptr) {
-	//API hook
-	lua_getglobal(state, "map");
-	lua_getfield(state, -1, "save");
-	lua_pushlightuserdata(state, ptr);
-	lua_pushstring(state, saveDir.c_str());
-	if (lua_pcall(state, 2, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
-	}
-	lua_pop(state, 1);
-}

common/map/pager_api.cpp

@@ -0,0 +1,156 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * 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 "pager_api.hpp"
+
+#include "region_pager.hpp"
+#include "region.hpp"
+
+#include <stdexcept>
+#include <string>
+
+static int setTile(lua_State* L) {
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	int ret = pager->SetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int getTile(lua_State* L) {
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	int ret = pager->GetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int getRegion(lua_State* L) {
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	lua_pushlightuserdata(L, region);
+	return 1;
+}
+
+static int setDirectory(lua_State* L) {
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	std::string s = pager->SetDirectory(lua_tostring(L, 2));
+	lua_pushstring(L, s.c_str());
+	return 1;
+}
+
+static int getDirectory(lua_State* L) {
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	std::string s = pager->GetDirectory();
+	lua_pushstring(L, s.c_str());
+	return 1;
+}
+
+static int loadRegion(lua_State* L) {
+	//get the parameters
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	std::string s = pager->GetDirectory();
+
+	//push the parameters
+	lua_getglobal(L, "region");
+	lua_getfield(L, -1, "load");
+	lua_pushlightuserdata(L, region);
+	lua_pushstring(L, s.c_str());
+
+	//call the method
+	if (lua_pcall(L, 2, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
+	}
+	return 1;
+}
+
+static int saveRegion(lua_State* L) {
+	//get the parameters
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	std::string s = pager->GetDirectory();
+
+	//push the parameters
+	lua_getglobal(L, "region");
+	lua_getfield(L, -1, "save");
+	lua_pushlightuserdata(L, region);
+	lua_pushstring(L, s.c_str());
+
+	//call the method
+	if (lua_pcall(L, 2, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
+	}
+	return 0;
+}
+
+static int createRegion(lua_State* L) {
+	//get the parameters
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+
+	//push the parameters
+	lua_getglobal(L, "region");
+	lua_getfield(L, -1, "create");
+	lua_pushlightuserdata(L, region);
+	//TODO: parameters
+
+	//call the method
+	if (lua_pcall(L, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
+	}
+	return 0;
+}
+
+static int unloadRegion(lua_State* L) {
+	//get the parameters
+	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
+	std::string s = pager->GetDirectory();
+
+	//push the parameters
+	lua_getglobal(L, "region");
+	lua_getfield(L, -1, "unload");
+	lua_pushlightuserdata(L, region);
+	lua_pushstring(L, s.c_str());
+
+	//call the method
+	if (lua_pcall(L, 2, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(L, -1) ));
+	}
+	return 0;
+}
+
+static const luaL_Reg pagerlib[] = {
+	{"settile", setTile},
+	{"gettile", getTile},
+	{"getregion", getRegion},
+	{"setdirectory", setDirectory},
+	{"getdirectory", getDirectory},
+	{"loadregion", loadRegion},
+	{"saveregion", saveRegion},
+	{"createregion", createRegion},
+	{"unloadregion", unloadRegion},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int luaopen_pagerapi(lua_State* L) {
+	luaL_newlib(L, pagerlib);
+	return 1;
+}

common/map/pager_api.hpp

@@ -19,30 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MAPALLOCATOR_HPP_
+#ifndef PAGERAPI_HPP_
-#define MAPALLOCATOR_HPP_
+#define PAGERAPI_HPP_
-
-#include "region.hpp"
 
 #include "lua/lua.hpp"
 
-class BlankAllocator {
+#define LUA_PAGERLIBNAME "pager"
-public:
+LUAMOD_API int luaopen_pagerapi(lua_State* L);
-	void Create(Region** const, int x, int y);
-	void Unload(Region* const);
-private:
-	//
-};
-
-class LuaAllocator {
-public:
-	void Create(Region** const, int x, int y);
-	void Unload(Region* const);
-
-	lua_State* SetLuaState(lua_State* L) { return state = L; }
-	lua_State* GetLuaState() { return state; }
-private:
-	lua_State* state = nullptr;
-};
 
 #endif

common/map/region_api.cpp

@@ -0,0 +1,106 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * 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 "region_api.hpp"
+
+#include "region.hpp"
+
+static int setTile(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	int ret = region->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int getTile(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	int ret = region->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
+	lua_pushinteger(L, ret);
+	return 1;
+}
+
+static int getX(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, region->GetX());
+	return 1;
+}
+
+static int getY(lua_State* L) {
+	Region* region = reinterpret_cast<Region*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, region->GetY());
+	return 1;
+}
+
+static int getWidth(lua_State* L) {
+	lua_pushinteger(L, REGION_WIDTH);
+	return 1;
+}
+
+static int getHeight(lua_State* L) {
+	lua_pushinteger(L, REGION_HEIGHT);
+	return 1;
+}
+
+static int getDepth(lua_State* L) {
+	lua_pushinteger(L, REGION_DEPTH);
+	return 1;
+}
+
+static int load(lua_State* L) {
+	//TODO: fill this
+	lua_pushboolean(L, false);
+	return 1;
+}
+
+static int save(lua_State* L) {
+	//TODO: fill this
+	return 0;
+}
+
+static int create(lua_State* L) {
+	//TODO: fill this
+	return 0;
+}
+
+static int unload(lua_State* L) {
+	//TODO: fill this
+	return 0;
+}
+
+static const luaL_Reg regionlib[] = {
+	{"settile",setTile},
+	{"gettile",getTile},
+	{"getx",getX},
+	{"gety",getY},
+	{"getwidth",getWidth},
+	{"getheight",getHeight},
+	{"getdepth",getDepth},
+	{"load",load},
+	{"save",save},
+	{"create",create},
+	{"unload",unload},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int luaopen_regionapi(lua_State* L) {
+	luaL_newlib(L, regionlib);
+	return 1;
+}

common/map/region_api.hpp

@@ -19,44 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MAPFILEFORMAT_HPP_
+#ifndef REGIONAPI_HPP_
-#define MAPFILEFORMAT_HPP_
+#define REGIONAPI_HPP_
-
-#include "region.hpp"
 
 #include "lua/lua.hpp"
 
-#include <string>
+#define LUA_REGIONLIBNAME "region"
-
+LUAMOD_API int luaopen_regionapi(lua_State* L);
-//TODO: I'm unhappy with using this system, there needs to be a way to handle saving/loading better
-
-class DummyFormat {
-public:
-	void Load(Region** const, int x, int y);
-	void Save(Region* const);
-
-	std::string SetSaveDir(std::string s) { return saveDir = s; }
-	std::string GetSaveDir() { return saveDir; }
-private:
-	std::string saveDir;
-};
-
-//TODO: verbose save file format
-//TODO: compact save file format
-
-class LuaFormat {
-public:
-	void Load(Region** const, int x, int y);
-	void Save(Region* const);
-
-	std::string SetSaveDir(std::string s) { return saveDir = s; }
-	std::string GetSaveDir() { return saveDir; }
-
-	lua_State* SetLuaState(lua_State* L) { return state = L; }
-	lua_State* GetLuaState() { return state; }
-private:
-	std::string saveDir;
-	lua_State* state = nullptr;
-};
 
 #endif

common/map/region_pager.cpp

@@ -23,17 +23,19 @@
 
 #include "utility.hpp"
 
-Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
+#include <stdexcept>
+
+Region::type_t RegionPager::SetTile(int x, int y, int z, Region::type_t v) {
 	Region* ptr = GetRegion(x, y);
 	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
 }
 
-Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
+Region::type_t RegionPager::GetTile(int x, int y, int z) {
 	Region* ptr = GetRegion(x, y);
 	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
 }
 
-Region* RegionPagerBase::GetRegion(int x, int y) {
+Region* RegionPager::GetRegion(int x, int y) {
 	//snap the coords
 	x = snapToBase(REGION_WIDTH, x);
 	y = snapToBase(REGION_HEIGHT, y);
@@ -47,7 +49,7 @@ Region* RegionPagerBase::GetRegion(int x, int y) {
 	return CreateRegion(x, y);
 }
 
-Region* RegionPagerBase::FindRegion(int x, int y) {
+Region* RegionPager::FindRegion(int x, int y) {
 	//snap the coords
 	x = snapToBase(REGION_WIDTH, x);
 	y = snapToBase(REGION_HEIGHT, y);
@@ -61,7 +63,110 @@ Region* RegionPagerBase::FindRegion(int x, int y) {
 	return nullptr;
 }
 
-Region* RegionPagerBase::PushRegion(Region* ptr) {
+Region* RegionPager::LoadRegion(int x, int y) {
-	regionList.push_front(ptr);
+	//load the region if possible
-	return regionList.front();
+
+	//snap the coords
+	x = snapToBase(REGION_WIDTH, x);
+	y = snapToBase(REGION_HEIGHT, y);
+
+	//overwrite?
+	Region* ptr = FindRegion(x, y);
+	if (!ptr) {
+		ptr = new Region(x, y);
+	}
+
+	//API hook
+	lua_getglobal(luaState, "region");
+	lua_getfield(luaState, -1, "load");
+	lua_pushlightuserdata(luaState, ptr);
+	lua_pushstring(luaState, directory.c_str());
+	if (lua_pcall(luaState, 2, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	}
+	if (lua_toboolean(luaState, -1)) {
+		regionList.push_front(ptr);
+	}
+	else {
+		delete ptr;
+		ptr = nullptr;
+	}
+	lua_pop(luaState, 2);
+
+	return ptr;
+}
+
+Region* RegionPager::SaveRegion(int x, int y) {
+	//snap the coords
+	x = snapToBase(REGION_WIDTH, x);
+	y = snapToBase(REGION_HEIGHT, y);
+
+	//find & save the region
+	Region* ptr = FindRegion(x, y);
+	if (ptr) {
+		//API hook
+		lua_getglobal(luaState, "region");
+		lua_getfield(luaState, -1, "save");
+		lua_pushlightuserdata(luaState, ptr);
+		lua_pushstring(luaState, directory.c_str());
+		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+		}
+		lua_pop(luaState, 1);
+	}
+	return ptr;
+}
+
+Region* RegionPager::CreateRegion(int x, int y) {
+	//snap the coords
+	x = snapToBase(REGION_WIDTH, x);
+	y = snapToBase(REGION_HEIGHT, y);
+
+	//overwrite?
+	Region* ptr = FindRegion(x, y);
+	if (!ptr) {
+		ptr = new Region(x, y);
+	}
+
+	//API hook
+	lua_getglobal(luaState, "region");
+	lua_getfield(luaState, -1, "create");
+	lua_pushlightuserdata(luaState, ptr);
+	//TODO: parameters
+	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	}
+	lua_pop(luaState, 1);
+
+	regionList.push_front(ptr);
+	return ptr;
+}
+
+void RegionPager::UnloadRegion(int x, int y) {
+	//snap the coords
+	x = snapToBase(REGION_WIDTH, x);
+	y = snapToBase(REGION_HEIGHT, y);
+
+	lua_getglobal(luaState, "region");
+
+	//custom loop, not FindRegion()
+	for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); /* EMPTY */) {
+		if ((*it)->GetX() == x && (*it)->GetY() == y) {
+
+			//API hook
+			lua_getfield(luaState, -1, "unload");
+			lua_pushlightuserdata(luaState, *it);
+			lua_pushstring(luaState, directory.c_str());
+			if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
+				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+			}
+
+			delete (*it);
+			it = regionList.erase(it);
+			continue;
+		}
+		++it;
+	}
+
+	lua_pop(luaState, 1);
 }

common/map/region_pager.hpp

@@ -23,14 +23,16 @@
 #define REGIONPAGER_HPP_
 
 #include "region.hpp"
-#include "utility.hpp"
+
+#include "lua/lua.hpp"
 
 #include <list>
+#include <string>
 
-class RegionPagerBase {
+class RegionPager {
 public:
-	RegionPagerBase() {};
+	RegionPager() = default;
-	virtual ~RegionPagerBase() {};
+	~RegionPager() = default;
 
 	//tile manipulation
 	Region::type_t SetTile(int x, int y, int z, Region::type_t v);
@@ -39,95 +41,25 @@ public:
 	//region manipulation
 	Region* GetRegion(int x, int y);
 	Region* FindRegion(int x, int y);
-	Region* PushRegion(Region*);
 
-	//interface
+	Region* LoadRegion(int x, int y);
-	virtual Region* LoadRegion(int x, int y) = 0;
+	Region* SaveRegion(int x, int y);
-	virtual Region* SaveRegion(int x, int y) = 0;
+	Region* CreateRegion(int x, int y);
-	virtual Region* CreateRegion(int x, int y) = 0;
+	void UnloadRegion(int x, int y);
-	virtual void UnloadRegion(int x, int y) = 0;
-	//TODO: delete existing regions
 
 	//accessors & mutators
 	std::list<Region*>* GetContainer() { return &regionList; }
-protected:
+
+	std::string SetDirectory(std::string s) { return directory = s; }
+	std::string GetDirectory() { return directory; }
+
+	lua_State* SetLuaState(lua_State* L) { return luaState = L; }
+	lua_State* GetLuaState() { return luaState; }
+
+private:
 	std::list<Region*> regionList;
-};
+	std::string directory;
-
+	lua_State* luaState = nullptr;
-template<typename Allocator, typename FileFormat>
-class RegionPager : public RegionPagerBase {
-public:
-	RegionPager() {};
-	~RegionPager() {
-		UnloadAll();
-	}
-
-	Region* LoadRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//load the region if possible
-		Region* ptr = nullptr;
-		format.Load(&ptr, x, y);
-		if (ptr) {
-			return PushRegion(ptr);
-		}
-		return nullptr;
-	}
-
-	Region* SaveRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//find & save the region
-		Region* ptr = FindRegion(x, y);
-		if (ptr) {
-			format.Save(ptr);
-		}
-		return ptr;
-	}
-
-	Region* CreateRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//create and push the object
-		Region* ptr = nullptr;
-		allocator.Create(&ptr, x, y);
-		return PushRegion(ptr);
-	}
-
-	void UnloadRegion(int x, int y) {
-		//snap the coords
-		x = snapToBase(REGION_WIDTH, x);
-		y = snapToBase(REGION_HEIGHT, y);
-
-		//custom loop
-		for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); /* EMPTY */) {
-			if ((*it)->GetX() == x && (*it)->GetY() == y) {
-				allocator.Unload(*it);
-				it = regionList.erase(it);
-				continue;
-			}
-			++it;
-		}
-	}
-	void UnloadAll() {
-		for (auto& it : regionList) {
-			allocator.Unload(it);
-		}
-		regionList.clear();
-	}
-
-	//accessors
-	Allocator* GetAllocator() { return &allocator; }
-	FileFormat* GetFormat() { return &format; }
-protected:
-	Allocator allocator;
-	FileFormat format;
 };
 
 #endif

common/network/serial/serial_region.cpp

@@ -23,8 +23,6 @@
 
 #include "serial_util.hpp"
 
-#include "map_allocator.hpp"
-
 void serializeRegionFormat(RegionPacket* packet, void* buffer) {
 	SERIALIZE(buffer, &packet->type, sizeof(SerialPacketType));
 
@@ -71,11 +69,7 @@ void deserializeRegionContent(RegionPacket* packet, void* buffer) {
 	DESERIALIZE(buffer, &packet->y, sizeof(int));
 
 	//an object to work on
-	BlankAllocator().Create(
+	packet->region = new Region(packet->x, packet->y);
-		&packet->region,
-		packet->x,
-		packet->y
-	);
 
 	//content
 	for (register int i = 0; i < REGION_WIDTH; i++) {

common/script/linit.cpp

@@ -1,72 +0,0 @@
-/*
-** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $
-** Initialization of libraries for lua.c and other clients
-** See Copyright Notice in lua.h
-*/
-
-/* Modified for use in Tortuga, renamed to linit.cpp
-*/
-
-
-/*
-** If you embed Lua in your program and need to open the standard
-** libraries, call luaL_openlibs in your program. If you need a
-** different set of libraries, copy this file to your project and edit
-** it to suit your needs.
-*/
-
-
-#define linit_c
-#define LUA_LIB
-
-#include "lua/lua.hpp"
-#include "map_api.hpp"
-
-
-/*
-** these libs are loaded by lua.c and are readily available to any Lua
-** program
-*/
-static const luaL_Reg loadedlibs[] = {
-  /* Standard libs */
-  {"_G", luaopen_base},
-  {LUA_LOADLIBNAME, luaopen_package},
-  {LUA_COLIBNAME, luaopen_coroutine},
-  {LUA_TABLIBNAME, luaopen_table},
-  {LUA_IOLIBNAME, luaopen_io},
-  {LUA_OSLIBNAME, luaopen_os},
-  {LUA_STRLIBNAME, luaopen_string},
-  {LUA_BITLIBNAME, luaopen_bit32},
-  {LUA_MATHLIBNAME, luaopen_math},
-  {LUA_DBLIBNAME, luaopen_debug},
-
-  /* custom libs */
-  {LUA_MAPLIBNAME, luaopen_mapapi},
-
-  {NULL, NULL}
-};
-
-
-/*
-** these libs are preloaded and must be required before used
-*/
-static const luaL_Reg preloadedlibs[] = {
-  {NULL, NULL}
-};
-
-
-LUALIB_API void luaL_openlibs (lua_State *L) {
-  const luaL_Reg *lib;
-  /* call open functions from 'loadedlibs' and set results to global table */
-  for (lib = loadedlibs; lib->func; lib++) {
-    luaL_requiref(L, lib->name, lib->func, 1);
-    lua_pop(L, 1);  /* remove lib */
-  }
-  /* add open functions from 'preloadedlibs' into 'package.preload' table */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
-  for (lib = preloadedlibs; lib->func; lib++) {
-    lua_pushcfunction(L, lib->func);
-    lua_setfield(L, -2, lib->name);
-  }
-  lua_pop(L, 1);  /* remove _PRELOAD table */
-}

common/script/makefile

@@ -1,37 +0,0 @@
-#config
-INCLUDES+=. ../map ../utilities
-LIBS+=
-CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
-
-#source
-CXXSRC=$(wildcard *.cpp)
-
-#objects
-OBJDIR=obj
-OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
-
-#output
-OUTDIR=../..
-OUT=$(addprefix $(OUTDIR)/,libcommon.a)
-
-#targets
-all: $(OBJ) $(OUT)
-	ar -crs $(OUT) $(OBJ)
-
-$(OBJ): | $(OBJDIR)
-
-$(OUT): | $(OUTDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-$(OUTDIR):
-	mkdir $(OUTDIR)
-
-$(OBJDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all

common/script/map_api.cpp

@@ -1,128 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * 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 "map_api.hpp"
-
-//map headers
-#include "map_allocator.hpp"
-#include "map_file_format.hpp"
-#include "region_pager.hpp"
-
-//NOTE: When operating on a region, setTile() & getTile() *are not* zero indexed, but when operating on the entire map they *are* zero indexed.
-//TODO: enforce all possible parameter counts
-//TODO: update the map API to handle multiple rooms
-
-static int setTile(lua_State* L) {
-	if (lua_gettop(L) == 5) {
-		//operating on a region
-		Region* ptr = (Region*)lua_touserdata(L, 1);
-		ptr->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
-	}
-	else {
-		//operating on the whole map
-		lua_pushstring(L, "pager");
-		lua_gettable(L, LUA_REGISTRYINDEX);
-
-		//assume the pager is using lua
-		RegionPager<LuaAllocator, LuaFormat>* pager = reinterpret_cast<RegionPager<LuaAllocator, LuaFormat>*>(lua_touserdata(L, -1));
-
-		//balance the stack
-		lua_pop(L, 1);
-
-		pager->SetTile(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
-	}
-	return 0;
-}
-
-static int getTile(lua_State* L) {
-	if (lua_gettop(L) == 4) {
-		//operating on a region
-		Region* ptr = (Region*)lua_touserdata(L, 1);
-		int ret = ptr->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
-		lua_pushnumber(L, ret);
-	}
-	else {
-		//operating on the whole map
-		lua_pushstring(L, "pager");
-		lua_gettable(L, LUA_REGISTRYINDEX);
-
-		//assume the pager is using lua
-		RegionPager<LuaAllocator, LuaFormat>* pager = reinterpret_cast<RegionPager<LuaAllocator, LuaFormat>*>(lua_touserdata(L, -1));
-
-		//balance the stack
-		lua_pop(L, 1);
-
-		int ret = pager->GetTile(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_tointeger(L, 3));
-		lua_pushnumber(L, ret);
-	}
-	return 1;
-}
-
-static int getX(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	lua_pushinteger(L, ptr->GetX());
-	return 1;
-}
-
-static int getY(lua_State* L) {
-	Region* ptr = (Region*)lua_touserdata(L, 1);
-	lua_pushinteger(L, ptr->GetY());
-	return 1;
-}
-
-static int getRegionWidth(lua_State* L) {
-	lua_pushinteger(L, REGION_WIDTH);
-	return 1;
-}
-
-static int getRegionHeight(lua_State* L) {
-	lua_pushinteger(L, REGION_HEIGHT);
-	return 1;
-}
-
-static int getRegionDepth(lua_State* L) {
-	lua_pushinteger(L, REGION_DEPTH);
-	return 1;
-}
-
-static int dummy(lua_State* L) {
-	return 0;
-}
-
-static const luaL_Reg regionlib[] = {
-	{"create", dummy},
-	{"unload", dummy},
-	{"load", dummy},
-	{"save", dummy},
-	{"settile",setTile},
-	{"gettile",getTile},
-	{"getx",getX},
-	{"gety",getY},
-	{"getregionwidth",getRegionWidth},
-	{"getregionheight",getRegionHeight},
-	{"getregiondepth",getRegionDepth},
-	{nullptr, nullptr}
-};
-
-LUAMOD_API int luaopen_mapapi(lua_State* L) {
-	luaL_newlib(L, regionlib);
-	return 1;
-}

rsc/scripts/setup_server.lua

@@ -4,33 +4,17 @@ print("Lua script check (./rsc)")
 --Map API overrides
 -------------------------
 
-function map.create(region)
+function region.create(r)
-	for i = 1, map.getregionwidth() do
+	for i = 1, region.getwidth() do
-		for j = 1, map.getregionheight() do
+		for j = 1, region.getheight() do
-			if math.abs(map.getx(region) + i -1) == math.abs(map.gety(region) + j -1) then
+			if math.abs(region.getx(r) + i -1) == math.abs(region.gety(r) + j -1) then
-				map.settile(region, i, j, 1, 50)
+				region.settile(r, i, j, 1, 50)
 			else
-				map.settile(region, i, j, 1, 14)
+				region.settile(r, i, j, 1, 14)
-			end
 			end
 		end
 	end
 
-function map.unload(region)
+	--signal
-	--
+	region.settile(r, 4, 5, 2, 86)
 end
-
-function map.load(region, dir)
-	--return true if file loaded, otherwise return false
-	return false
-end
-
-function map.save(region, dir)
-	--
-end
-
--------------------------
---Enemy API
--------------------------
-
---TODO

server/linit.cpp

@@ -0,0 +1,83 @@
+/* $Id: linit.c,v 1.32, modified
+ * Initialization of libraries for lua.c and other clients
+ * See Copyright Notice in lua.h
+ * 
+ * If you embed Lua in your program and need to open the standard
+ * libraries, call luaL_openlibs in your program. If you need a
+ * different set of libraries, copy this file to your project and edit
+ * it to suit your needs.
+ * 
+ * Modified for use in Tortuga, renamed to linit.cpp
+ * Modifications are released under the zlib license:
+ * 
+ * Copyright: (c) Kayne Ruse 2014
+ * 
+ * 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.
+*/
+#define linit_c
+#define LUA_LIB
+
+#include "lua/lua.hpp"
+
+#include "region_api.hpp"
+#include "pager_api.hpp"
+
+//these libs are loaded by lua.c and are readily available to any Lua program
+static const luaL_Reg loadedlibs[] = {
+	//Standard libs
+	{"_G", luaopen_base},
+	{LUA_LOADLIBNAME, luaopen_package},
+	{LUA_COLIBNAME, luaopen_coroutine},
+	{LUA_TABLIBNAME, luaopen_table},
+	{LUA_IOLIBNAME, luaopen_io},
+	{LUA_OSLIBNAME, luaopen_os},
+	{LUA_STRLIBNAME, luaopen_string},
+	{LUA_BITLIBNAME, luaopen_bit32},
+	{LUA_MATHLIBNAME, luaopen_math},
+	{LUA_DBLIBNAME, luaopen_debug},
+
+	//custom libs
+	{LUA_REGIONLIBNAME, luaopen_regionapi},
+	{LUA_PAGERLIBNAME, luaopen_pagerapi},
+
+	{NULL, NULL}
+};
+
+
+//these libs are preloaded and must be required before used
+static const luaL_Reg preloadedlibs[] = {
+	{NULL, NULL}
+};
+
+LUALIB_API void luaL_openlibs (lua_State *L) {
+	const luaL_Reg *lib;
+	//call open functions from 'loadedlibs' and set results to global table
+	for (lib = loadedlibs; lib->func; lib++) {
+		luaL_requiref(L, lib->name, lib->func, 1);
+		lua_pop(L, 1); //remove lib
+	}
+	//add open functions from 'preloadedlibs' into 'package.preload' table
+	luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+	for (lib = preloadedlibs; lib->func; lib++) {
+		lua_pushcfunction(L, lib->func);
+		lua_setfield(L, -2, lib->name);
+	}
+	lua_pop(L, 1); //remove _PRELOAD table
+}

server/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/script ../common/utilities
+INCLUDES+=. ../common/gameplay ../common/map ../common/network ../common/network/packet ../common/network/serial ../common/utilities
 LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

server/room_api.cpp

@@ -0,0 +1,63 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * 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 "room_api.hpp"
+
+#include "room_manager.hpp"
+#include "room_data.hpp"
+
+static int getType(lua_State* L) {
+	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
+	lua_pushinteger(L, static_cast<int>(room->type));
+	return 1;
+}
+
+//TODO: parameters
+
+static int getRegionPager(lua_State* L) {
+	RoomData* room = reinterpret_cast<RoomData*>(lua_touserdata(L, 1));
+	lua_pushlightuserdata(L, reinterpret_cast<void*>(&room->pager));
+	return 1;
+}
+
+//RoomManager only
+static int getRoom(lua_State* L) {
+	//get the room manager
+	lua_pushstring(L, ROOM_MANAGER_PSEUDOINDEX);
+	lua_gettable(L, LUA_REGISTRYINDEX);
+	RoomManager* roomMgr = reinterpret_cast<RoomManager*>(lua_touserdata(L, -1));
+
+	//push the room and return it
+	lua_pushlightuserdata(L, reinterpret_cast<void*>( roomMgr->GetRoom(lua_tointeger(L, -2)) ));
+	return 1;
+}
+
+static const luaL_Reg roomlib[] = {
+	{"gettype",getType},
+	{"getregionpager",getRegionPager},
+	{"getroom",getRoom},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int luaopen_roomapi(lua_State* L) {
+	luaL_newlib(L, roomlib);
+	return 1;
+}

server/room_api.hpp

@@ -19,12 +19,12 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef MAPAPI_HPP_
+#ifndef ROOMAPI_HPP_
-#define MAPAPI_HPP_
+#define ROOMAPI_HPP_
 
 #include "lua/lua.hpp"
 
-#define LUA_MAPLIBNAME "map"
+#define LUA_ROOMLIBNAME "room"
-LUAMOD_API int luaopen_mapapi(lua_State* L);
+LUAMOD_API int luaopen_roomapi(lua_State* L);
 
 #endif

server/room_data.hpp

@@ -23,8 +23,6 @@
 #define ROOMDATA_HPP_
 
 //map system
-#include "map_allocator.hpp"
-#include "map_file_format.hpp"
 #include "region_pager.hpp"
 
 struct RoomData {
@@ -37,7 +35,7 @@ struct RoomData {
 	};
 
 	//members
-	RegionPager<LuaAllocator, LuaFormat> pager;
+	RegionPager pager;
 	RoomType type;
 
 	//TODO: collision map

server/room_manager.hpp

@@ -28,14 +28,15 @@
 
 #include <map>
 
+#define ROOM_MANAGER_PSEUDOINDEX "RoomManager"
+
 class RoomManager {
 public:
 	RoomManager() = default;
 	~RoomManager() = default;
 
 	//public access methods
-	//TODO
+	//TODO: Fill this out
-	//TODO: setup the pagers and functors of each room object
 
 	//accessors and mutators
 	RoomData* GetRoom(int uid);

server/server_application.cpp

@@ -23,6 +23,7 @@
 
 #include "sql_utility.hpp"
 #include "serial.hpp"
+#include "utility.hpp"
 
 #include <stdexcept>
 #include <iostream>
@@ -75,6 +76,7 @@ void ServerApplication::Init(int argc, char** argv) {
 	//Setup the objects
 	//-------------------------
 
+	//set the hooks
 	accountMgr.SetDatabase(database);
 	characterMgr.SetDatabase(database);
 
@@ -82,7 +84,14 @@ void ServerApplication::Init(int argc, char** argv) {
 	roomMgr.SetLuaState(luaState);
 	enemyMgr.SetLuaState(luaState);
 
-	std::cout << "Internal managers ready" << std::endl;
+	std::cout << "Internal managers set" << std::endl;
+
+	//register the "globals"
+	lua_pushstring(luaState, ROOM_MANAGER_PSEUDOINDEX);
+	lua_pushlightuserdata(luaState, &roomMgr);
+	lua_settable(luaState, LUA_REGISTRYINDEX);
+
+	std::cout << "Internal managers registered with lua" << std::endl;
 
 	//-------------------------
 	//Run the startup scripts
@@ -109,6 +118,7 @@ void ServerApplication::Init(int argc, char** argv) {
 	std::cout << "\tRegion Format: " << REGION_WIDTH << ", " << REGION_HEIGHT << ", " << REGION_DEPTH << std::endl;
 	std::cout << "\tRegion Content Footprint: " << REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) << std::endl;
 	std::cout << "\tPACKET_BUFFER_SIZE (max size): " << PACKET_BUFFER_SIZE << std::endl;
+	std::cout << "\tMAX_PACKET_SIZE: " << MAX_PACKET_SIZE << std::endl;
 
 	//-------------------------
 	//finalize the startup
@@ -120,16 +130,7 @@ void ServerApplication::Init(int argc, char** argv) {
 	//debugging
 	//-------------------------
 
-	std::cout << "Debugging dump:" << std::endl;
+	//...
-	std::cout << "\tMAX_PACKET_SIZE:\t\t" << MAX_PACKET_SIZE << std::endl;
-	std::cout << "\tsizeof(SerialPacket):\t\t" << sizeof(SerialPacket) << std::endl;
-	std::cout << "\tsizeof(CharacterPacket):\t" << sizeof(CharacterPacket) << std::endl;
-	std::cout << "\t\tsizeof(Statistics):\t" << sizeof(Statistics) << std::endl;
-	std::cout << "\tsizeof(ClientPacket):\t\t" << sizeof(ClientPacket) << std::endl;
-	std::cout << "\tsizeof(CombatPacket):\t\t" << sizeof(CombatPacket) << std::endl;
-	std::cout << "\tsizeof(EnemyPacket):\t\t" << sizeof(EnemyPacket) << std::endl;
-	std::cout << "\tsizeof(RegionPacket):\t\t" << sizeof(RegionPacket) << std::endl;
-	std::cout << "\tsizeof(ServerPacket):\t\t" << sizeof(ServerPacket) << std::endl;
 }
 
 void ServerApplication::Proc() {

todo.txt

@@ -1,4 +1,3 @@
-TODO: MapLoader, in place of FileFormat
 TODO: Get the rooms working
 TODO: update the map API to handle multiple rooms