Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tied region_pager_lua.cpp to region_api.hpp

Browse Source
This commit is contained in:
Kayne Ruse
2014-08-14 00:03:22 +10:00
parent b6c70cbc0d
commit 1b041d7771
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/map/region_pager_lua.cpp
+6 -5
View File
@@ -21,6 +21,7 @@
*/ */
#include "region_pager_lua.hpp" #include "region_pager_lua.hpp"
#include "region_api.hpp"
#include "utility.hpp" #include "utility.hpp"
#include <stdexcept> #include <stdexcept>
@@ -32,7 +33,7 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
Region tmpRegion(x, y); Region tmpRegion(x, y);
//API hook //API hook
lua_getglobal(lua, "Region"); lua_getglobal(lua, TORTUGA_REGION_NAME);
lua_getfield(lua, -1, "Load"); lua_getfield(lua, -1, "Load");
lua_pushlightuserdata(lua, &tmpRegion); lua_pushlightuserdata(lua, &tmpRegion);
if (lua_pcall(lua, 1, 1, 0) != LUA_OK) { if (lua_pcall(lua, 1, 1, 0) != LUA_OK) {
@@ -53,7 +54,7 @@ Region* RegionPagerLua::SaveRegion(int x, int y) {
Region* ptr = FindRegion(x, y); Region* ptr = FindRegion(x, y);
if (ptr) { if (ptr) {
//API hook //API hook
lua_getglobal(lua, "Region"); lua_getglobal(lua, TORTUGA_REGION_NAME);
lua_getfield(lua, -1, "Save"); lua_getfield(lua, -1, "Save");
lua_pushlightuserdata(lua, ptr); lua_pushlightuserdata(lua, ptr);
if (lua_pcall(lua, 1, 0, 0) != LUA_OK) { if (lua_pcall(lua, 1, 0, 0) != LUA_OK) {
@@ -73,7 +74,7 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
Region tmpRegion(x, y); Region tmpRegion(x, y);
//API hook //API hook
lua_getglobal(lua, "Region"); lua_getglobal(lua, TORTUGA_REGION_NAME);
lua_getfield(lua, -1, "Create"); lua_getfield(lua, -1, "Create");
lua_pushlightuserdata(lua, &tmpRegion); lua_pushlightuserdata(lua, &tmpRegion);
//TODO: parameters //TODO: parameters
@@ -86,7 +87,7 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
} }
void RegionPagerLua::UnloadRegion(int x, int y) { void RegionPagerLua::UnloadRegion(int x, int y) {
lua_getglobal(lua, "Region"); lua_getglobal(lua, TORTUGA_REGION_NAME);
regionList.remove_if([&](Region& region) -> bool { regionList.remove_if([&](Region& region) -> bool {
if (region.GetX() == x && region.GetY() == y) { if (region.GetX() == x && region.GetY() == y) {
@@ -107,7 +108,7 @@ void RegionPagerLua::UnloadRegion(int x, int y) {
} }
void RegionPagerLua::UnloadAll() { void RegionPagerLua::UnloadAll() {
lua_getglobal(lua, "Region"); lua_getglobal(lua, TORTUGA_REGION_NAME);
for (auto& it : regionList) { for (auto& it : regionList) {
//API hook //API hook
rsc/scripts/setup_server.lua
+1 -1
View File
@@ -34,7 +34,7 @@ end
--Get some regions --Get some regions
--BUG: The server fails without this --BUG: The server fails without this
newRoom = RoomMgr.CreateRoom("overworld") newRoom = RoomManager.CreateRoom()
pager = Room.GetPager(newRoom) pager = Room.GetPager(newRoom)
regionTable = { regionTable = {
RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() * 0), RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() * 0),