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

current maps can be loaded in the map editor

Browse Source
This commit is contained in:
devZoGok
2023-01-07 15:27:43 +02:00
parent 482549c852
commit f91592712f
6 changed files with 158 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapEditorAppState.cpp
+9 -6
View File
@@ -44,13 +44,15 @@ namespace battleship{
ufCtr->setPlacingFrames(true);
}
MapEditorAppState::MapEditor::MapEditor(string name, Vector2 size){
MapEditorAppState::MapEditor::MapEditor(string name, Vector2 size, bool newMap){
map = Map::getSingleton();
map->load(name, true);
map->load(name, newMap);
map->addPlayer(new Player(0, 0, 0));
if(newMap){
map->addPlayer(new Player(0, 0, 0));
generatePlane(size);
}
generatePlane(size);
prepareGui();
string basePath = GameManager::getSingleton()->getPath();
@@ -322,13 +324,14 @@ namespace battleship{
}
}
MapEditorAppState::MapEditorAppState(string name, Vector2 size) : AbstractAppState(
MapEditorAppState::MapEditorAppState(string name, Vector2 size, bool newMap) : AbstractAppState(
AppStateType::MAP_EDITOR,
configData::calcSumBinds(AppStateType::MAP_EDITOR, true),
configData::calcSumBinds(AppStateType::MAP_EDITOR, false),
GameManager::getSingleton()->getPath() + "Scripts/options.lua"){
mapName = name;
mapSize = size;
this->newMap = newMap;
}
void MapEditorAppState::update(){
@@ -347,7 +350,7 @@ namespace battleship{
void MapEditorAppState::onAttached(){
AbstractAppState::onAttached();
mapEditor = new MapEditor(mapName, mapSize);
mapEditor = new MapEditor(mapName, mapSize, newMap);
Root *root = Root::getSingleton();
Material *mat = new Material(root->getLibPath() + "text");