diff --git a/rituals.cpp b/rituals.cpp index 6fd7521..d4a3902 100644 --- a/rituals.cpp +++ b/rituals.cpp @@ -36,8 +36,7 @@ namespace ritual { } void Engine::load_junk(CraftingState& ritual, const JunkItem& item) { - Config config("assets/rituals.json"); - auto& junk = config["junk"]; + auto& junk = $config["junk"]; auto& item_desc = junk[item]; fmt::print("Item {} provides: ", item); diff --git a/systems.cpp b/systems.cpp index d92fef9..283d2ff 100644 --- a/systems.cpp +++ b/systems.cpp @@ -487,7 +487,7 @@ std::shared_ptr System::sprite_effect(GameLevel &level, Entity entit } Entity System::spawn_item(World& world, const std::string& name) { - Config config("assets/items.json"); + auto& config = world.get_the().items; auto& item_config = config[name]; auto item_id = world.entity(); world.set(item_id, {1, item_config}); diff --git a/worldbuilder.cpp b/worldbuilder.cpp index 5107495..dfeb787 100644 --- a/worldbuilder.cpp +++ b/worldbuilder.cpp @@ -168,7 +168,7 @@ void WorldBuilder::place_stairs(DinkyECS::World& world, GameConfig& config) { void WorldBuilder::configure_starting_items(DinkyECS::World &world) { auto& blanket = world.get_the(); - Config config("assets/rituals.json"); + auto& config = world.get_the().rituals; for(auto& el : config["starting_junk"]) { ritual::JunkItem name = el;