TrafficDirector: put correct drivers into special cars

Police cars are driven by cops.
Ambulances by medics.
Firetrucks by firefigters.

Signed-off-by: David Heidelberg <[email protected]>

Author: okias

rwengine/src/ai/TrafficDirector.cpp

@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
+#include <string>
 
 #include <glm/glm.hpp>
 #include <glm/gtx/norm.hpp>
@@ -93,6 +94,23 @@ void TrafficDirector::setDensity(ai::NodeType type, float density) {
     }
 }
 
+uint16_t TrafficDirector::assignDriver(std::string vehiclename) {
+    enum ped_types {
+      COP = 1,
+      MEDIC = 5,
+      FIREMAN = 6
+    };
+    if (vehiclename == "POLICAR") {
+        return COP;
+    } else if (vehiclename == "AMBULAN") {
+        return MEDIC;
+    } else if (vehiclename == "FIRETRUK") {
+	return FIREMAN;
+    } else {
+	return 0;
+    }
+}
+
 std::vector<GameObject*> TrafficDirector::populateNearby(
     const ViewCamera& camera, float radius, int maxSpawn) {
 
@@ -133,6 +151,7 @@ std::vector<GameObject*> TrafficDirector::populateNearby(
 
     // Hardcoded cop Pedestrian
     std::vector<uint16_t> peds = {1};
+    uint16_t pedId;
 
     // Determine which zone the viewpoint is in
     auto zone = world->data->findZoneAt(camera.position);
@@ -170,7 +189,7 @@ std::vector<GameObject*> TrafficDirector::populateNearby(
             counter--;
 
             // Spawn a pedestrian from the available pool
-            const auto pedId =
+            pedId =
                 peds.at(world->getRandomNumber(0u, peds.size() - 1));
             auto ped = world->createPedestrian(pedId, spawn->position);
             ped->applyOffset();
@@ -244,9 +263,15 @@ std::vector<GameObject*> TrafficDirector::populateNearby(
             vehicle->setHandbraking(false);
 
             // Spawn a pedestrian and put it into the vehicle
-            const auto pedId =
-                peds.at(world->getRandomNumber(0u, peds.size() - 1));
-            CharacterObject* character = world->createPedestrian(pedId, vehicle->getPosition());
+	    pedId =
+		TrafficDirector::assignDriver(vehicle->getVehicle()->vehiclename_);
+	    if (pedId == 0) {
+		// not an special car, random person in
+		pedId = peds.at(world->getRandomNumber(0u, peds.size() - 1));
+	    }
+            CharacterObject* character = world->createPedestrian(
+		pedId,
+		vehicle->getPosition());
             character->setLifetime(GameObject::TrafficLifetime);
             character->setCurrentVehicle(vehicle, 0);
             character->controller->setGoal(CharacterController::TrafficDriver);

rwengine/src/ai/TrafficDirector.hpp

@@ -3,6 +3,8 @@
 
 #include <vector>
 #include <cstddef>
+#include <cstdint>
+#include <string>
 
 class GameWorld;
 class GameObject;
@@ -24,6 +26,11 @@ class TrafficDirector {
 
     void setDensity(NodeType type, float density);
 
+    /**
+     * Put the right pedestrian inside the car
+     */
+    uint16_t assignDriver(std::string vehiclename);
+
     /**
      * Creates new traffic at available locations.
      * @param camera The camera to spawn around