Apply settings on game load

heimskr · Mar 10, 2024 · c869911 · c869911
1 parent 30f9f77
commit c869911
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/include/data/Identifier.h b/include/data/Identifier.h
@@ -14,8 +14,8 @@ namespace Game3 {
 		std::string space;
 		std::string name;
 
-		constexpr Identifier() = default;
-		constexpr Identifier(const char *space_, const char *name_): space(space_), name(name_) {}
+		Identifier() = default;
+		Identifier(const char *space_, const char *name_): space(space_), name(name_) {}
 		Identifier(std::string_view);
 		Identifier(const char *);
 

diff --git a/include/util/Math.h b/include/util/Math.h
@@ -3,6 +3,7 @@
 #include <bit>
 #include <cmath>
 #include <concepts>
+#include <cstdint>
 #include <type_traits>
 
 namespace Game3 {

diff --git a/src/item/Flower.cpp b/src/item/Flower.cpp
@@ -1,10 +1,10 @@
-#include "types/Position.h"
-#include "graphics/Tileset.h"
 #include "entity/Player.h"
 #include "game/Game.h"
 #include "game/Inventory.h"
+#include "graphics/Tileset.h"
 #include "item/Flower.h"
 #include "realm/Realm.h"
+#include "types/Position.h"
 
 namespace Game3 {
 	Flower::Flower(ItemID identifier_, std::string name_, Identifier tilename_, Identifier valid_ground, MoneyCount base_price, ItemCount max_count):

diff --git a/src/item/Pickaxe.cpp b/src/item/Pickaxe.cpp
@@ -12,10 +12,10 @@ namespace Game3 {
 		Tool(id_, std::move(name_), base_price, base_cooldown, max_durability, "base:attribute/pickaxe"_id) {}
 
 	bool Pickaxe::use(Slot slot, const ItemStackPtr &stack, const Place &place, Modifiers, std::pair<float, float>) {
-		Realm &realm = *place.realm;
-		Tileset &tileset = realm.getTileset();
+		const RealmPtr realm = place.realm;
+		const Tileset &tileset = realm->getTileset();
 
-		if (auto tile = realm.tryTile(Layer::Terrain, place.position); tile && tileset.isInCategory(*tile, "base:category/farmable")) {
+		if (auto tile = realm->tryTile(Layer::Terrain, place.position); tile && tileset.isInCategory(*tile, "base:category/farmable")) {
 			{
 				InventoryPtr inventory = place.player->getInventory(0);
 				auto lock = inventory->uniqueLock();
@@ -35,8 +35,8 @@ namespace Game3 {
 	}
 
 	Identifier Pickaxe::findDirtTilename(const Place &place) {
-		RealmPtr realm = place.realm;
-		Tileset &tileset = realm->getTileset();
+		const RealmPtr realm = place.realm;
+		const Tileset &tileset = realm->getTileset();
 
 		for (const Direction direction: ALL_DIRECTIONS)
 			if (auto tilename = (place + direction).getName(Layer::Terrain); tilename && tileset.isInCategory(*tilename, "base:category/tillable"))

diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp
@@ -421,6 +421,7 @@ namespace Game3 {
 		debugAction->set_state(Glib::Variant<bool>::create(game->debugMode));
 		game->initInteractionSets();
 		canvas->game = game;
+		settings.apply(*game);
 
 		for (auto &[widget, tab]: tabMap)
 			tab->reset(game);