Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adapted the code to lua 5.3 and the new version of opengl for glDeleteTextures.

Browse source
This commit is contained in:
Victor Gil 2018-12-09 16:13:20 +01:00
parent 05d1cac88f
commit 2451f512b5
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -26,3 +26,5 @@ obj-*
./stratagus.suo
./tolua.cpp
./tolua.cpp.rule
build
.vscode

24
src/stratagus/script.cpp
View file

@ -2124,9 +2124,14 @@ void InitLua()
Lua = luaL_newstate();
for (const luaL_Reg *lib = lualibs; lib->func; ++lib) {
#if LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 502
luaL_requiref(Lua, lib->name, lib->func, 1);
lua_pop(Lua, 1);
#else
lua_pushcfunction(Lua, lib->func);
lua_pushstring(Lua, lib->name);
lua_call(Lua, 1, 0);
#endif
}
tolua_stratagus_open(Lua);
lua_settop(Lua, 0); // discard any results
@ -2306,9 +2311,16 @@ static std::string SaveGlobal(lua_State *l, bool is_root, std::vector<std::strin
lua_pop(l, 1); // pop the value
continue;
}
std::string lhsLine;
if (tablesName.empty() == false) {
if (type_key == LUA_TSTRING) {
/*if(key.empty()) {
lua_pop(l, 1);
lua_pop(l, 1);
return res;
}*/
lhsLine = tablesName + "." + key;
} else if (type_key == LUA_TNUMBER) {
lua_pushvalue(l, -2);
@ -2331,11 +2343,15 @@ static std::string SaveGlobal(lua_State *l, bool is_root, std::vector<std::strin
key = key + "[" + lua_tostring(l, -1) + "]";
lua_pop(l, 1);
}
lua_pushvalue(l, -1);
//res += "if (" + lhsLine + " == nil) then " + lhsLine + " = {} end\n";
blockTableNames.push_back(key);
res += SaveGlobal(l, false, blockTableNames);
blockTableNames.pop_back();
if(std::find(blockTableNames.begin(), blockTableNames.end(), key) == blockTableNames.end()
&& key != "[]")
{
lua_pushvalue(l, -1);
blockTableNames.push_back(key);
res += SaveGlobal(l, false, blockTableNames);
blockTableNames.pop_back();
}
}
}
lua_pop(l, 1); /* pop the value */

2
src/video/graphic.cpp
View file

@ -1652,7 +1652,7 @@ bool CGraphic::DeleteColorCyclingTextures() {
if (!ColorCyclingTextures) return false;
for (int i = 0; i < NumColorCycles; i++) {
glDeleteTextures(NumTextures, ColorCyclingTextures[i]);
delete[] ColorCyclingTextures[i];
//delete[] ColorCyclingTextures[i]; //glDeleteTextures already deletes the array
}
delete[] ColorCyclingTextures;
ColorCyclingTextures = NULL;