Initial implementation of load and save game;

CMakeLists.txt

@@ -71,6 +71,7 @@ if (MSVC)
     add_compile_options(
         # treat warnings as errors
         /WX
+        /wd4996
     )
 
     add_link_options(

notes/strawberry-lake.md

@@ -0,0 +1,25 @@
+# Manufactring
+# Distribution
+# Laundering
+# Legal
+
+
+# Marijuana
+
+* pots
+* soil
+* lights
+    - different types yield different results
+* fans
+
+# Cocaine
+
+# Meth
+
+# Heroin
+
+# Crack
+
+# Mushrooms
+
+# 

src/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SOURCE_FILES
     Background.cpp
     DelayedSound.cpp
     Engine.cpp
+    GameState.cpp
     GameWorld.cpp
     Intersection.cpp
     Item.cpp
@@ -47,8 +48,9 @@ set(HEADER_FILES
     Engine.h
     Item.h
     ItemFactory.h
-    GameWorld.h
+    GameState.h
     GameTypes.h
+    GameWorld.h
     Intersection.h
     Path.hpp
     PathFactory.h

src/GameState.cpp

@@ -0,0 +1,43 @@
+#include "TTUtils.h"
+#include "GameState.h"
+
+namespace tt
+{
+
+void from_json(const nl::json& j, GameState& gs)
+{
+    j["player"].get_to(gs.playerstate);
+    j["location"].get_to(gs.location);
+}
+
+void to_json(nl::json& j, const GameState& gs)
+{
+    j["player"] = gs.playerstate;
+    j["location"] = gs.location;
+}
+
+void from_json(const nl::json& j, PlayerLocation& pl)
+{
+    j["map"].get_to(pl.map);
+    j["cords"].get_to(pl.cords);
+}
+
+void to_json(nl::json& j, const PlayerLocation& pl)
+{
+    j["map"] = pl.map;
+    j["cords"] = pl.cords;
+}
+
+void from_json(const nl::json& j, PlayerState& ps)
+{
+    j["health"].get_to(ps.health);
+    j["cash"].get_to(ps.cash);
+}
+
+void to_json(nl::json& j, const PlayerState& ps)
+{
+    j["health"] = ps.health;
+    j["cash"] = ps.cash;
+}
+
+} // namespace tt

src/GameState.h

@@ -0,0 +1,47 @@
+#pragma
+
+#include <string>
+
+#include <SFML/System/Vector2.hpp>
+
+#include <nlohmann/json.hpp>
+
+#include "Player.h"
+#include "TTUtils.h"
+
+namespace tt
+{
+
+struct GameState;
+using GameStatePtr = std::shared_ptr<GameState>;
+
+void from_json(const nl::json& j, GameState& pl);
+void to_json(nl::json& j, const GameState& b);
+
+struct PlayerLocation;
+void from_json(const nl::json& j, PlayerLocation& pl);
+void to_json(nl::json& j, const PlayerLocation& b);
+
+struct PlayerState;
+void from_json(const nl::json& j, PlayerState& pl);
+void to_json(nl::json& j, const PlayerState& b);
+
+struct PlayerLocation
+{
+    std::string     map;
+    sf::Vector2f    cords;
+};
+
+struct PlayerState
+{
+    std::uint32_t   health = 0;
+    float           cash = 0.f;
+};
+
+struct GameState
+{
+    PlayerState     playerstate;
+    PlayerLocation  location;
+};
+
+} // namespace tt

src/Item.h

@@ -99,6 +99,7 @@ struct ItemCallbacks
 struct ItemInstanceInfo
 {
     std::string objid; // the id of the object this is an instance of
+    std::optional<std::uint32_t> index; // index of the object in an "instances" array
 
     // a null x,y means that the coordinate was not specified,
     // and a value of -1 means it should be picked randomly
@@ -112,6 +113,14 @@ struct ItemInstanceInfo
 
     ItemCallbacks         callbacks;
 
+    ItemInstanceInfo() = default;
+    ItemInstanceInfo(std::uint32_t idx)
+        : index{idx}
+    {
+        // nothing to do
+    }
+
+
     // will apply the default values if they are set in the `defaults` object
     // and *not* set in this object.
     // NOTE: We cannot use a constructor since these objects are constructed

src/Player.cpp

@@ -6,8 +6,16 @@
 namespace tt
 {
 
-void from_json(const nl::json & j, Player & i)
+void from_json(const nl::json& j, Player& p)
 {
+    j["health"].get_to(p._health);
+    j["cash"].get_to(p._cash);
+}
+
+void to_json(nl::json& j, const Player& p)
+{
+    j["health"] = p.health();
+    j["cash"] = p.balance();
 }
 
 namespace

src/Player.h

@@ -11,14 +11,18 @@ namespace tt
 
 class Player;
 using PlayerPtr = std::shared_ptr<Player>;
+
 void from_json(const nl::json& j, Player& i);
+void to_json(nl::json& j, const Player& p);
 
 class Player : public Item
 {
 public:
     static constexpr auto CLASS_NAME = "Player";
     static const struct luaL_Reg LuaMethods[];
 
+    friend void from_json(const nl::json& j, Player& i);
+
     using Item::Item;
 
     sf::Vector2f getGlobalCenter() const;

src/Scenes/Scene.cpp

@@ -724,12 +724,14 @@ void Scene::createItems()
             ItemInstanceInfo groupinfo = data.get<ItemInstanceInfo>();
             groupinfo.objid = itemid; // we don't want to require the objid to be set in json
 
-            for (const auto& instance : data["instances"])
+            for (const auto& instance : (data["instances"] | boost::adaptors::indexed()))
             {
-                auto instanceinfo = instance.get<ItemInstanceInfo>();
+                auto instanceinfo = instance.value().get<ItemInstanceInfo>();
+                instanceinfo.index = static_cast<std::uint32_t>(instance.index());
+
                 instanceinfo.applyDefaults(groupinfo);
 
-                auto groupcallbacks = instance.get<ItemCallbacks>();
+                auto groupcallbacks = instance.value().get<ItemCallbacks>();
                 auto item = _itemFactory.createItem(instanceinfo);
                 if (item) placeItem(item);
             }

src/Screens/GameScreen.h

@@ -15,6 +15,7 @@
 #include "../GameWorld.h"
 #include "../Settings.h"
 #include "../AudioService.h"
+#include "../GameState.h"
 
 #include "Screen.h"
 
@@ -221,6 +222,7 @@ class GameScreen final : public Screen
 
     sf::Clock                       _gameClock;
     std::shared_ptr<GameWorld>      _gameCalendar;
+    tt::GameState                   _gameState;
 
     std::shared_ptr<Hud>            _hud;
 };