git repos / saland

commit 74a8a2fc

sago007 · 2019-06-10 11:12
74a8a2fc833b4d9c9489e52311d039b16776e943 patch · browse files
parent 52f2e5b362d02f307750a2c2ec654854d8822cd7 

Possible to open tiled from the console

Changed files

M src/saland/Game.cpp before
M src/saland/Game.hpp before
M src/saland/GameRegion.hpp before
diff --git a/src/saland/Game.cpp b/src/saland/Game.cpp index 5210205..ab9d6bc 100644 --- a/src/saland/Game.cpp +++ b/src/saland/Game.cpp
@@ -35,6 +35,7 @@ https://github.com/sago007/saland
#include "globals.hpp"
#include "model/placeables.hpp"
#include "model/Player.hpp"
+#include "../os.hpp"
#include "SDL.h"
#include <SDL2/SDL2_gfxPrimitives.h>
#include <cmath>
@@ -82,6 +83,7 @@ static bool reset_region = false;
static bool teleport = false;
static int teleportX = 0;
static int teleportY = 0;
+static bool openTiled = false;
struct GotoConsoleCommand : public ConsoleCommand {
virtual std::string getCommand() const override {return "goto";}
@@ -127,9 +129,22 @@ struct ShopCommand : public ConsoleCommand {
}
};
+struct ConcoleCommandTiled : public ConsoleCommand {
+ virtual std::string getCommand() const override {return "tiled";}
+ virtual std::string run(const std::vector<std::string>&) override {
+ openTiled = true;
+ return "Requesting tiled";
+ }
+
+ virtual std::string helpMessage() const override {
+ return "Opens current region in tiled";
+ }
+};
+
static GotoConsoleCommand gcc;
static ResetRegionConsoleCommand rrcc;
static ShopCommand sc;
+static ConcoleCommandTiled cct;
struct Game::GameImpl {
GameRegion gameRegion;
@@ -168,8 +183,7 @@ static SpawnPoint GetSpawnpoint(const sago::tiled::TileMap& tm) {
return ret;
}
-void Game::ResetWorld(int x, int y, bool forceResetWorld) {
- data->gameRegion.SaveRegion();
+void Game::ResetWorldNoSave(int x, int y, bool forceResetWorld) {
data->gameRegion.Init(x, y, data->worldName, forceResetWorld);
data->gameRegion.placeables.push_back(data->human);
b2BodyDef myBodyDef;
@@ -188,10 +202,16 @@ void Game::ResetWorld(int x, int y, bool forceResetWorld) {
data->human->body->SetTransform(b2Vec2(spawnpoint.first, spawnpoint.second),data->human->body->GetAngle());
}
+void Game::ResetWorld(int x, int y, bool forceResetWorld) {
+ data->gameRegion.SaveRegion();
+ this->ResetWorldNoSave(x, y, forceResetWorld);
+}
+
Game::Game() {
RegisterCommand(&gcc);
RegisterCommand(&rrcc);
RegisterCommand(&sc);
+ RegisterCommand(&cct);
data.reset(new Game::GameImpl());
data->human.reset(new Human());
data->lastUpdate = SDL_GetTicks();
@@ -485,6 +505,13 @@ void Game::Update() {
ResetWorld(teleportX, teleportY, false);
teleport = false;
}
+ if (openTiled) {
+ openTiled = false;
+ std::string filename = getPathToSaveFiles() + "/" + data->gameRegion.GetFilename();
+ std::string command = std::string("tiled \"")+filename+"\"";
+ std::system(command.c_str());
+ ResetWorldNoSave(data->gameRegion.GetRegionX(), data->gameRegion.GetRegionY(), false);
+ }
if (reset_region) {
ResetWorld(data->gameRegion.GetRegionX(), data->gameRegion.GetRegionY(), true);
reset_region = false;
diff --git a/src/saland/Game.hpp b/src/saland/Game.hpp index 6ce128c..4c96346 100644 --- a/src/saland/Game.hpp +++ b/src/saland/Game.hpp
@@ -40,6 +40,7 @@ private:
struct GameImpl;
std::unique_ptr<GameImpl> data;
void ResetWorld(int region_x, int region_y, bool forceResetWorld);
+ void ResetWorldNoSave(int region_x, int region_y, bool forceResetWorld);
};
#endif /* GAME_HPP */
diff --git a/src/saland/GameRegion.hpp b/src/saland/GameRegion.hpp index 024f601..4184ba5 100644 --- a/src/saland/GameRegion.hpp +++ b/src/saland/GameRegion.hpp
@@ -37,8 +37,9 @@ public:
void SaveRegion();
World world;
uint32_t outerTile = 485;
- int GetRegionX() {return region_x; }
- int GetRegionY() {return region_y; }
+ int GetRegionX() const {return region_x; }
+ int GetRegionY() const {return region_y; }
+ std::string GetFilename() const {return mapFileName; }
private:
int region_x = 0;
int region_y = 0;