From 759a2569880b8304b19780dc9b21665e835544f0 Mon Sep 17 00:00:00 2001 From: tovjemam Date: Sat, 20 Jun 2026 20:42:40 +0200 Subject: [PATCH] Air rifle / debug pickups --- src/game/openworld.cpp | 18 +++++++++++++----- src/game/openworld.hpp | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/game/openworld.cpp b/src/game/openworld.cpp index 4669955..14b1609 100644 --- a/src/game/openworld.cpp +++ b/src/game/openworld.cpp @@ -84,9 +84,10 @@ game::OpenWorld::OpenWorld(Game& game) : EnterableWorld("openworld"), game_(game CreateTuningGarage(loc.transform.position, glm::eulerAngles(loc.transform.rotation).x); } - CreatePermaItemPickups("pickup_uzi", "uzi"); - CreatePermaItemPickups("pickup_ak47", "ak47"); - CreatePermaItemPickups("pickup_airsniper", "airsniper"); + CreatePermaItemPickups("airrifle"); + CreatePermaItemPickups("airsniper"); + CreatePermaItemPickups("ak47"); + CreatePermaItemPickups("uzi"); SpawnNpcs(); @@ -353,12 +354,19 @@ void game::OpenWorld::CreateTuningGarage(const glm::vec3& position, float yaw) }); } -void game::OpenWorld::CreatePermaItemPickups(const std::string& loc_name, const std::string& item_name) +void game::OpenWorld::CreatePermaItemPickups(const std::string& item_name) { - for (auto locs = GetMap().GetLocations(loc_name); const auto& loc : locs) + for (auto locs = GetMap().GetLocations("pickup_" + item_name); const auto& loc : locs) { CreatePermaItemPickup(loc.transform.position, item_name); } + +#ifndef NDEBUG + for (auto locs = GetMap().GetLocations("pickup_" + item_name + "_debug"); const auto& loc : locs) + { + CreatePermaItemPickup(loc.transform.position, item_name); + } +#endif } void game::OpenWorld::CreatePermaItemPickup(const glm::vec3& position, const std::string& item_name) diff --git a/src/game/openworld.hpp b/src/game/openworld.hpp index 86234e8..8fa801c 100644 --- a/src/game/openworld.hpp +++ b/src/game/openworld.hpp @@ -25,7 +25,7 @@ private: void SpawnNpcVehicleWithPassengers(); void CreateTuningGarage(const glm::vec3& position, float yaw); - void CreatePermaItemPickups(const std::string& loc_name, const std::string& item_name); + void CreatePermaItemPickups(const std::string& item_name); void CreatePermaItemPickup(const glm::vec3& position, const std::string& item); void RecoverPlayer(Player& player);