Better save files format

Fix error in development reload
pinguin999 · Jun 10, 2024 · e5bab7c · e5bab7c
1 parent 85d38df
commit e5bab7c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/game.cpp b/src/game.cpp
@@ -801,6 +801,11 @@ std::string Game::backupLuaTable(const sol::table table, const std::string &pare
 			k = std::to_string(key.as<int>());
 		}
 
+		if (!parent.empty())
+		{
+			k = "[\"" + k + "\"]";
+		}
+
 		if (k != "_entry_node" &&
 			k != "_VERSION" &&
 			k.substr(0, 4) != "sol." &&
@@ -829,7 +834,12 @@ std::string Game::backupLuaTable(const sol::table table, const std::string &pare
 				result += parent + k + " = \"" + v + "\"\n";
 				break;
 			case sol::type::number:
+				if (value.is<int>())
+				{
+					v = std::to_string(value.as<int>());
+				}else{
 				v = std::to_string(value.as<double>());
+				}
 				result += parent + k + " = " + v + "\n";
 				break;
 			case sol::type::boolean:
@@ -847,7 +857,7 @@ std::string Game::backupLuaTable(const sol::table table, const std::string &pare
 				break;
 			case sol::type::table:
 				result += parent + k + " = {}\n";
-				result += backupLuaTable(value.as<sol::table>(), parent + k + ".");
+				result += backupLuaTable(value.as<sol::table>(), parent + k);
 				break;
 			}
 		}

diff --git a/src/spine_object.cpp b/src/spine_object.cpp
@@ -103,11 +103,12 @@ std::optional<jngl::Vec2> SpineObject::getPoint(const std::string &point_name) c
     spPointAttachment *point = SUB_CAST(spPointAttachment, att);
     float x = 0;
     float y = 0;
-    if (point)
+    if (point && point->super.type == SP_ATTACHMENT_POINT)
     {
         spPointAttachment_computeWorldPosition(point, slot->bone, &x, &y);
+        return jngl::Vec2(x, y);
     }
-    return jngl::Vec2(x, y);
+    return std::nullopt;
 }
 
 std::vector<std::string> SpineObject::getPointNames() const