starting work to load an save games;

Author: zethon

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/Scenes/Scene.cpp

@@ -1,3 +1,5 @@
+#include <boost/range/adaptor/indexed.hpp>
+
 #include <lua.hpp>
 
 #include <fmt/core.h>
@@ -711,13 +713,15 @@ void Scene::createItems()
             // default info for the item
             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 = 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/IntroScreen.cpp

@@ -245,11 +245,6 @@ PollResult IntroScreen::poll(const sf::Event& e)
             break;
 
             case 0: // new game
-            {
-                return {true, { ScreenActionType::CHANGE_SCREEN, SCREEN_LOADING }};
-            }
-
-            case 1: // load game
             {
                 _gui = std::make_unique<tgui::Gui>(_window);
 
@@ -297,6 +292,11 @@ PollResult IntroScreen::poll(const sf::Event& e)
                 break;
             }
 
+            case 1: // load game
+            {
+                return {true, { ScreenActionType::CHANGE_SCREEN, SCREEN_LOADING }};
+            }
+
             case 2: // settings
             {
                 return {true, { ScreenActionType::CHANGE_SCREEN, SCREEN_SETTINGS }};

src/TTUtils.cpp

@@ -2,6 +2,7 @@
 #   include <windows.h>
 #   include <shellapi.h>
 #   include <Shlobj.h>
+#   include <codecvt>
 #else
 #   include <unistd.h>
 #   include <sys/types.h>
@@ -156,4 +157,18 @@ retval = pw->pw_dir;
     return retval;
 }
 
+std::string getDataFolder()
+{
+    std::string retval;
+
+#ifdef _WINDOWS
+    retval = getWindowsFolder(CSIDL_COMMON_APPDATA);
+#else
+    struct passwd *pw = getpwuid(getuid());
+    retval = pw->pw_dir;
+#endif
+
+    return retval;
+}
+
 } // namespace tt

src/TTUtils.h

@@ -6,6 +6,8 @@
 #include <iterator>
 #include <cmath>
 
+#include <fmt/core.h>
+
 #include <boost/spirit/home/x3.hpp>
 
 #include <nlohmann/json.hpp>
@@ -14,6 +16,16 @@
 
 namespace nl = nlohmann;
 
+// There's some weirdness going on in Ubuntu where using the / operator
+// on Ubuntu was throwing an error in some instances. Instead I set out
+// to use boost::filesystem::path::seperator but that turned out to be
+// a pain since it is multibyte on Windows! So I did this manually.
+#ifdef _WINDOWS
+#   define PATH_SEPERATOR   '\\'
+#else
+#   define PATH_SEPERATOR   '/'
+#endif
+
 namespace sf
 {
 
@@ -165,5 +177,7 @@ inline float distance(const sf::Vector2f& v1, const sf::Vector2f& v2)
 void openBrowser(const std::string& url_str);
 std::string getOsString();
 std::string getUserFolder();
+std::string getDataFolder();
+
 
 } // namespace tt

src/main.cpp

@@ -63,6 +63,13 @@ amb::SettingsPtr registerSettings()
     retval->registerBool("logs.sfx.enabled", false);
     retval->registerBool("video.fullscreen", true);
 
+    // default gamedb folder
+    const std::string dbfolder = fmt::format("{}{}{}",
+        tt::getDataFolder(), PATH_SEPERATOR, "TommyTuscon");
+
+    retval->registerString("database.gamefolder", dbfolder,  
+        std::make_shared<amb::NotEmptyValidator>());
+
     return retval;
 }
 
@@ -103,6 +110,15 @@ void initLogging(std::string_view logfile)
     }
 }
 
+void initGameFolder(const std::string& gamefolder)
+{
+    fs::path folder = gamefolder;
+    if (!fs::exists(folder))
+    {
+        fs::create_directories(folder);
+    }
+}
+
 int main(int argc, char *argv[])
 {
     po::options_description desc("Allowed options");
@@ -184,6 +200,9 @@ int main(int argc, char *argv[])
         return 1;
     }
 
+    // make sure the game folder exists before we start up
+    initGameFolder(settings->value("database.gamefolder", ""s));
+
     std::size_t width   = window_width;
     std::size_t height  = window_height;
     if (vm.count("window-size") > 0)
@@ -264,6 +283,7 @@ int main(int argc, char *argv[])
         win->display();
     }
 
+    settings->save();
     logger->info("game shut down");
     return 0;
 }