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

Committing the island generator script, and a bugfix

Browse Source 
region_api.cpp had a bug, where a glue function's name was used twice. It
was an easy catch, but there was an issue in the new script, where I was
counting from 0 instead of 1. As a result, I was chasing a segfault for 5
hours.
This commit is contained in:
Kayne Ruse
2014-06-23 10:29:39 +10:00
parent f5c58bf5ad
commit 95362286f8
5 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/map/region_pager_lua.cpp
+7 -6
View File
@@ -29,12 +29,12 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
//load the region if possible
//something to work on
regionList.emplace_front(x, y);
Region tmpRegion(x, y);
//API hook
lua_getglobal(luaState, "Region");
lua_getfield(luaState, -1, "OnLoad");
lua_pushlightuserdata(luaState, &regionList.front());
lua_pushlightuserdata(luaState, &tmpRegion);
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) ));
@@ -42,10 +42,10 @@ Region* RegionPagerLua::LoadRegion(int x, int y) {
//success or failure
if (!lua_toboolean(luaState, -1)) {
lua_pop(luaState, 2);
regionList.pop_front();
return nullptr;
}
lua_pop(luaState, 2);
regionList.push_front(tmpRegion);
return &regionList.front();
}
@@ -72,18 +72,19 @@ Region* RegionPagerLua::CreateRegion(int x, int y) {
}
//something to work on
regionList.emplace_front(x, y);
Region tmpRegion(x, y);
//API hook
lua_getglobal(luaState, "Region");
lua_getfield(luaState, -1, "OnCreate");
lua_pushlightuserdata(luaState, &regionList.front());
lua_pushlightuserdata(luaState, &tmpRegion);
//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);
return &regionList.front();;
regionList.push_front(tmpRegion);
return &regionList.front();
}
void RegionPagerLua::UnloadRegion(int x, int y) {