devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated sol invocations

Browse Source
This commit is contained in:
devZoGok
2023-09-03 09:39:23 +03:00
parent 85dc917ba6
commit 6011fb7aa7
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
concreteGuiManager.cpp
-2
View File
@@ -218,8 +218,6 @@ namespace battleship{
break;
case UNITS:{
string path = GameManager::getSingleton()->getPath();
SOL_LUA_STATE.script("PATH = \"" + path + "\";");
SOL_LUA_STATE.script_file(path + "Scripts/unitData.lua");
bool vehicles = guiTable["vehicles"];
int numUnits = SOL_LUA_STATE["numUnits"];
map.cpp
+4 -3
View File
@@ -59,6 +59,7 @@ namespace battleship{
string texPath = "";
Quad *quad = nullptr;
Node *node = nullptr;
sol::state_view SOL_LUA_STATE = generateView();
if(id == -1){
string basePath = GameManager::getSingleton()->getPath() + "Models/Maps/" + mapName + "/";
@@ -167,6 +168,7 @@ namespace battleship{
}
void Map::loadCells(){
sol::state_view SOL_LUA_STATE = generateView();
int numCells = SOL_LUA_STATE[mapTable]["numCells"];
sol::table cellsTable = SOL_LUA_STATE[mapTable]["cells"];
@@ -200,13 +202,12 @@ namespace battleship{
Pathfinder::getSingleton()->setImpassibleNodeVal(u16(0 - 1));
string path = GameManager::getSingleton()->getPath();
SOL_LUA_STATE.script("PATH = \"" + path + "\"");
SOL_LUA_STATE.script_file(path + configData::scripts[1]);
sol::state_view SOL_LUA_STATE = generateView();
preprareScene();
if(!empty){
sol::state_view SOL_LUA_STATE = generateView();
sol::state_view SOL_LUA_STATE = generateView();
SOL_LUA_STATE.script_file(GameManager::getSingleton()->getPath() + "Models/Maps/" + mapName + "/" + mapName + ".lua");
int numWaterbodies = SOL_LUA_STATE[mapTable]["numWaterBodies"];