Merge branch 'master' of https://github.com/ShweetsStuff/snivy
Some checks failed
Build / Build Game (push) Has been cancelled

This commit is contained in:
2026-03-01 14:00:53 -05:00
17 changed files with 32 additions and 2 deletions

View File

@@ -1,6 +1,7 @@
#include "log.hpp" #include "log.hpp"
#include <cstdio> #include <cstdio>
#include <format>
#include <exception> #include <exception>
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>

View File

@@ -3,7 +3,9 @@
#include <SDL3/SDL_properties.h> #include <SDL3/SDL_properties.h>
#include "../log.hpp" #include "../log.hpp"
#include <string> #include <string>
#include <format>
#include <unordered_map> #include <unordered_map>
using namespace game::util; using namespace game::util;

View File

@@ -2,6 +2,8 @@
#include "../log.hpp" #include "../log.hpp"
#include <format>
using namespace game::util; using namespace game::util;
static ImFont* default_font_fallback_get() static ImFont* default_font_fallback_get()

View File

@@ -2,6 +2,8 @@
#include "../log.hpp" #include "../log.hpp"
#include <format>
namespace game::resource namespace game::resource
{ {
Shader::Shader(const char* vertex, const char* fragment) Shader::Shader(const char* vertex, const char* fragment)

View File

@@ -2,6 +2,7 @@
#include <SDL3/SDL_surface.h> #include <SDL3/SDL_surface.h>
#include <string> #include <string>
#include <format>
#include <unordered_map> #include <unordered_map>
#include "../log.hpp" #include "../log.hpp"

View File

@@ -5,6 +5,7 @@
#include "../../log.hpp" #include "../../log.hpp"
#include <format>
#include <ranges> #include <ranges>
using namespace tinyxml2; using namespace tinyxml2;

View File

@@ -1,6 +1,7 @@
#include "area.hpp" #include "area.hpp"
#include "../../log.hpp" #include "../../log.hpp"
#include <format>
#include "util.hpp" #include "util.hpp"

View File

@@ -6,6 +6,8 @@
#include "../../util/preferences.hpp" #include "../../util/preferences.hpp"
#include "util.hpp" #include "util.hpp"
#include <format>
using namespace tinyxml2; using namespace tinyxml2;
using namespace game::util; using namespace game::util;

View File

@@ -6,6 +6,8 @@
#include "../../util/preferences.hpp" #include "../../util/preferences.hpp"
#include "util.hpp" #include "util.hpp"
#include <format>
using namespace tinyxml2; using namespace tinyxml2;
using namespace game::util; using namespace game::util;

View File

@@ -2,6 +2,8 @@
#include "../../log.hpp" #include "../../log.hpp"
#include <format>
using namespace tinyxml2; using namespace tinyxml2;
using namespace game::util; using namespace game::util;
@@ -49,4 +51,4 @@ namespace game::resource::xml
} }
bool Cursor::is_valid() const { return isValid; }; bool Cursor::is_valid() const { return isValid; };
} }

View File

@@ -4,6 +4,8 @@
#include "../../log.hpp" #include "../../log.hpp"
#include "../../util/math.hpp" #include "../../util/math.hpp"
#include <format>
using namespace tinyxml2; using namespace tinyxml2;
using namespace game::util; using namespace game::util;

View File

@@ -8,6 +8,8 @@
#include "../../log.hpp" #include "../../log.hpp"
#include <format>
#include "util.hpp" #include "util.hpp"
using namespace tinyxml2; using namespace tinyxml2;

View File

@@ -2,6 +2,8 @@
#include "../../log.hpp" #include "../../log.hpp"
#include <format>
#include "util.hpp" #include "util.hpp"
using namespace tinyxml2; using namespace tinyxml2;

View File

@@ -3,6 +3,8 @@
#include "../../log.hpp" #include "../../log.hpp"
#include "util.hpp" #include "util.hpp"
#include <format>
using namespace tinyxml2; using namespace tinyxml2;
using namespace game::util; using namespace game::util;
@@ -64,4 +66,4 @@ namespace game::resource::xml
} }
bool Play::is_valid() const { return isValid; }; bool Play::is_valid() const { return isValid; };
} }

View File

@@ -5,6 +5,8 @@
#include "../../log.hpp" #include "../../log.hpp"
#include <format>
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
#include "../../util/web_filesystem.hpp" #include "../../util/web_filesystem.hpp"
#endif #endif

View File

@@ -5,6 +5,8 @@
#include "../../log.hpp" #include "../../log.hpp"
#include <format>
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
#include "../../util/web_filesystem.hpp" #include "../../util/web_filesystem.hpp"
#endif #endif

View File

@@ -7,6 +7,8 @@
#include "../log.hpp" #include "../log.hpp"
#include <format>
namespace game::util::physfs namespace game::util::physfs
{ {
std::string path_normalize(std::string_view path) std::string path_normalize(std::string_view path)