Air rifle / debug pickups
This commit is contained in:
parent
622105656b
commit
759a256988
@ -84,9 +84,10 @@ game::OpenWorld::OpenWorld(Game& game) : EnterableWorld("openworld"), game_(game
|
|||||||
CreateTuningGarage(loc.transform.position, glm::eulerAngles(loc.transform.rotation).x);
|
CreateTuningGarage(loc.transform.position, glm::eulerAngles(loc.transform.rotation).x);
|
||||||
}
|
}
|
||||||
|
|
||||||
CreatePermaItemPickups("pickup_uzi", "uzi");
|
CreatePermaItemPickups("airrifle");
|
||||||
CreatePermaItemPickups("pickup_ak47", "ak47");
|
CreatePermaItemPickups("airsniper");
|
||||||
CreatePermaItemPickups("pickup_airsniper", "airsniper");
|
CreatePermaItemPickups("ak47");
|
||||||
|
CreatePermaItemPickups("uzi");
|
||||||
|
|
||||||
SpawnNpcs();
|
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);
|
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)
|
void game::OpenWorld::CreatePermaItemPickup(const glm::vec3& position, const std::string& item_name)
|
||||||
|
|||||||
@ -25,7 +25,7 @@ private:
|
|||||||
void SpawnNpcVehicleWithPassengers();
|
void SpawnNpcVehicleWithPassengers();
|
||||||
|
|
||||||
void CreateTuningGarage(const glm::vec3& position, float yaw);
|
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 CreatePermaItemPickup(const glm::vec3& position, const std::string& item);
|
||||||
|
|
||||||
void RecoverPlayer(Player& player);
|
void RecoverPlayer(Player& player);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user