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

Merge branch 'develop' into ft-118-unit-fx

Browse Source
This commit is contained in:
devZoGok
2024-06-16 14:39:12 +03:00
parent 631ccfa140 6e86eecbb4
commit a01e3b9ea3
21 changed files with 113 additions and 124715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game.cpp
+2 -1
View File
@@ -113,7 +113,8 @@ namespace battleship{
generateView().script_file(gm->getPath() + f);
guiManager->readLuaScreenScript("inGame.lua", activeState->getButtons());
AssetManager::getSingleton()->load(gm->getPath() + (string)generateView()["modelPrefix"], true);
string mp = generateView()["modelPrefix"];
AssetManager::getSingleton()->load(gm->getPath() + mp, true);
vector<GameObject*> gameObjs;