Merge pull request #108 from cortex-command-community/CF49-variable-actor-passengerslots

Add PassengerSlots variable to Actors

Author: garethyr

Entities/Actor.cpp

@@ -113,6 +113,7 @@ void Actor::Clear()
     m_WhiteFlashTimer.Reset();
     m_PieSlices.clear();
 	m_DeploymentID = 0;
+    m_PassengerSlots = 1;
 
     m_ScriptedAIUpdate = false;
     m_AIMode = AIMODE_NONE;
@@ -293,6 +294,7 @@ int Actor::Create(const Actor &reference)
         m_sIconsLoaded = true;
     }
 	m_DeploymentID = reference.m_DeploymentID;
+    m_PassengerSlots = reference.m_PassengerSlots;
 
     m_ScriptedAIUpdate = reference.m_ScriptedAIUpdate;
     m_AIMode = reference.m_AIMode;
@@ -338,6 +340,8 @@ int Actor::ReadProperty(std::string propName, Reader &reader)
         reader >> m_Status;
     else if (propName == "DeploymentID")
         reader >> m_DeploymentID;
+    else if (propName == "PassengerSlots")
+        reader >> m_PassengerSlots;
     else if (propName == "Health")
     {
         reader >> m_Health;

Entities/Actor.h

@@ -395,6 +395,15 @@ ADD_SCRIPT_FUNCTION_NAMES(MOSRotating, "UpdateAI")
 
     float GetAimAngle(bool adjustForFlipped = true) const { return adjustForFlipped ? FacingAngle(m_AimAngle) : m_AimAngle; }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+// Method:          GetPassengerSlots
+//////////////////////////////////////////////////////////////////////////////////////////
+// Description:     Gets this Actor's passenger slots.
+// Arguments:       None.
+// Return value:    The Actor's passenger plots
+
+    int GetPassengerSlots() const { return m_PassengerSlots; }
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  GetCPUPos
@@ -530,6 +539,15 @@ ADD_SCRIPT_FUNCTION_NAMES(MOSRotating, "UpdateAI")
 
     void SetAimAngle(float newAngle) { m_AimAngle = newAngle; Clamp(m_AimAngle, m_AimRange, -m_AimRange); }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+// Method:          SetPassengerSlots
+//////////////////////////////////////////////////////////////////////////////////////////
+// Description:     Sets this Actor's passenger slots.
+// Arguments:       A new amount of passenger slots.
+// Return value:    None.
+
+    void SetPassengerSlots(int newPassengerSlots) { m_PassengerSlots = newPassengerSlots;; }
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:          SetViewPoint
@@ -1454,6 +1472,8 @@ ADD_SCRIPT_FUNCTION_NAMES(MOSRotating, "UpdateAI")
     float m_DigStrength;
 	// ID of deployment which spawned this actor
 	unsigned int m_DeploymentID;
+    // How many passenger slots this actor will take in a craft
+    int m_PassengerSlots;
 
 
     ////////////////////

Managers/LuaMan.cpp

@@ -923,7 +923,8 @@ int LuaMan::Create()
             .def("IsDead", &Actor::IsDead)
             .def("FacingAngle", &Actor::FacingAngle)
             .property("AIMode", &Actor::GetAIMode, &Actor::SetAIMode)
-			.property("DeploymentID", &Actor::GetDeploymentID)
+            .property("DeploymentID", &Actor::GetDeploymentID)
+            .property("PassengerSlots", &Actor::GetPassengerSlots, &Actor::SetPassengerSlots)
 			.def("AddAISceneWaypoint", &Actor::AddAISceneWaypoint)
             .def("AddAIMOWaypoint", &Actor::AddAIMOWaypoint)
             .def("ClearAIWaypoints", &Actor::ClearAIWaypoints)

Menus/BuyMenuGUI.cpp

@@ -782,7 +782,7 @@ float BuyMenuGUI::GetCraftMass()
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:          GetTotalOrderPassengers
 //////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Return teh total number of passengers in the order box.
+// Description:     Return the total number of passengers in the order box.
 // Arguments:       None.
 // Return value:    The total number of passengers.
 
@@ -791,8 +791,11 @@ int BuyMenuGUI::GetTotalOrderPassengers()
 	int passengers = 0;
 	for (vector<GUIListPanel::Item *>::iterator itr = m_pCartList->GetItemList()->begin(); itr != m_pCartList->GetItemList()->end(); ++itr)
 	{
-		if (dynamic_cast<const Actor *>((*itr)->m_pEntity))
-			passengers++;
+        const Actor* passenger = dynamic_cast<const Actor*>((*itr)->m_pEntity);
+        if (passenger)
+        {
+            passengers += passenger->GetPassengerSlots();
+        }
 	}
 
 	return passengers;