Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-09-15 06:52:34 +02:00
Code Issues Projects Releases Activity

rwengine: use applyOffset

Browse Source
This commit is contained in:
Anonymous Maarten 2018-09-15 23:41:57 +02:00
parent 40575e79b6
commit d06d4fc264
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rwengine/src/ai/TrafficDirector.cpp
View File

@ -152,7 +152,6 @@ std::vector<GameObject*> TrafficDirector::populateNearby(
// We have not reached the limit of spawned pedestrians
if (maximumPedestrians > world->pedestrianPool.objects.size()) {
const auto availablePeds = maximumPedestrians - world->pedestrianPool.objects.size();
static const glm::vec3 kSpawnOffset{0.f, 0.f, 1.f};
size_t counter = availablePeds;
// maxSpawn can be -1 for "as many as possible"
@ -172,8 +171,8 @@ std::vector<GameObject*> TrafficDirector::populateNearby(
// Spawn a pedestrian from the available pool
const auto pedId = static_cast<std::uint16_t>(
peds[std::uniform_int_distribution<size_t>(0, peds.size() - 1)(random)]);
auto ped = world->createPedestrian(pedId,
spawn->position + kSpawnOffset);
auto ped = world->createPedestrian(pedId, spawn->position);
ped->applyOffset();
ped->setLifetime(GameObject::TrafficLifetime);
ped->controller->setGoal(CharacterController::TrafficWander);
created.push_back(ped);
@ -185,7 +184,6 @@ std::vector<GameObject*> TrafficDirector::populateNearby(
// We have not reached the limit of spawned vehicles
if (maximumCars > world->vehiclePool.objects.size()) {
const auto availableCars = maximumCars - world->vehiclePool.objects.size();
static const glm::vec3 kSpawnOffset{0.f, 0.f, 1.f};
size_t counter = availableCars;
// maxSpawn can be -1 for "as many as possible"

2
rwengine/src/objects/PickupObject.hpp
View File

@ -234,7 +234,7 @@ public:
bool onPlayerTouch() override;
};
const static std::array<glm::vec3, 106> bigNVeinyPickupsLocations = {{
constexpr static std::array<glm::vec3, 106> bigNVeinyPickupsLocations = {{
glm::vec3(913.62219f, -155.13692f, 4.9699469f),
glm::vec3(913.92401f, -124.12943f, 4.9692569f),
glm::vec3(913.27899f, -93.524231f, 7.4325991f),