[Client] Add ActorList methods for sending ActorAI packets

Additionally, use consistent capitalization for AI-related methods.

apps/openmw/mwmp/ActorList.cpp

@@ -79,6 +79,11 @@ void ActorList::addEquipmentActor(BaseActor baseActor)
     equipmentActors.push_back(baseActor);
 }
 
+void ActorList::addAiActor(BaseActor baseActor)
+{
+    aiActors.push_back(baseActor);
+}
+
 void ActorList::addAttackActor(BaseActor baseActor)
 {
     attackActors.push_back(baseActor);
@@ -159,6 +164,16 @@ void ActorList::sendEquipmentActors()
     }
 }
 
+void ActorList::sendAiActors()
+{
+    if (aiActors.size() > 0)
+    {
+        baseActors = aiActors;
+        Main::get().getNetworking()->getActorPacket(ID_ACTOR_AI)->setActorList(this);
+        Main::get().getNetworking()->getActorPacket(ID_ACTOR_AI)->Send();
+    }
+}
+
 void ActorList::sendAttackActors()
 {
     if (attackActors.size() > 0)

apps/openmw/mwmp/ActorList.hpp

@@ -27,6 +27,7 @@ namespace mwmp
         void addStatsDynamicActor(BaseActor baseActor);
         void addDeathActor(BaseActor baseActor);
         void addEquipmentActor(BaseActor baseActor);
+        void addAiActor(BaseActor baseActor);
         void addAttackActor(BaseActor baseActor);
         void addCellChangeActor(BaseActor baseActor);
 
@@ -37,6 +38,7 @@ namespace mwmp
         void sendStatsDynamicActors();
         void sendDeathActors();
         void sendEquipmentActors();
+        void sendAiActors();
         void sendAttackActors();
         void sendCellChangeActors();
 
@@ -52,6 +54,7 @@ namespace mwmp
         std::vector<BaseActor> statsDynamicActors;
         std::vector<BaseActor> deathActors;
         std::vector<BaseActor> equipmentActors;
+        std::vector<BaseActor> aiActors;
         std::vector<BaseActor> attackActors;
         std::vector<BaseActor> cellChangeActors;
     };

apps/openmw/mwmp/Cell.cpp

@@ -245,7 +245,7 @@ void Cell::readSpeech(ActorList& actorList)
     }
 }
 
-void Cell::readAI(ActorList& actorList)
+void Cell::readAi(ActorList& actorList)
 {
     initializeDedicatedActors(actorList);
 
@@ -263,7 +263,7 @@ void Cell::readAI(ActorList& actorList)
             actor->aiCoordinates = baseActor.aiCoordinates;
             actor->hasAiTarget = baseActor.hasAiTarget;
             actor->aiTarget = baseActor.aiTarget;
-            actor->setAI();
+            actor->setAi();
         }
     }
 }

apps/openmw/mwmp/Cell.hpp

@@ -24,7 +24,7 @@ namespace mwmp
         void readStatsDynamic(ActorList& actorList);
         void readEquipment(ActorList& actorList);
         void readSpeech(ActorList& actorList);
-        void readAI(ActorList& actorList);
+        void readAi(ActorList& actorList);
         void readAttack(ActorList& actorList);
         void readCellChange(ActorList& actorList);
 

apps/openmw/mwmp/CellController.cpp

@@ -154,7 +154,7 @@ void CellController::readSpeech(ActorList& actorList)
         cellsInitialized[mapIndex]->readSpeech(actorList);
 }
 
-void CellController::readAI(ActorList& actorList)
+void CellController::readAi(ActorList& actorList)
 {
     std::string mapIndex = actorList.cell.getDescription();
 
@@ -162,7 +162,7 @@ void CellController::readAI(ActorList& actorList)
 
     // If this now exists, send it the data
     if (cellsInitialized.count(mapIndex) > 0)
-        cellsInitialized[mapIndex]->readAI(actorList);
+        cellsInitialized[mapIndex]->readAi(actorList);
 }
 
 void CellController::readAttack(ActorList& actorList)

apps/openmw/mwmp/CellController.hpp

@@ -27,7 +27,7 @@ namespace mwmp
         void readStatsDynamic(mwmp::ActorList& actorList);
         void readEquipment(mwmp::ActorList& actorList);
         void readSpeech(mwmp::ActorList& actorList);
-        void readAI(mwmp::ActorList& actorList);
+        void readAi(mwmp::ActorList& actorList);
         void readAttack(mwmp::ActorList& actorList);
         void readCellChange(mwmp::ActorList& actorList);
 

apps/openmw/mwmp/DedicatedActor.cpp

@@ -211,7 +211,7 @@ void DedicatedActor::setEquipment()
     }
 }
 
-void DedicatedActor::setAI()
+void DedicatedActor::setAi()
 {
     MWMechanics::CreatureStats *ptrCreatureStats = &ptr.getClass().getCreatureStats(ptr);
     ptrCreatureStats->setAiSetting(MWMechanics::CreatureStats::AI_Fight, 0);

apps/openmw/mwmp/DedicatedActor.hpp

@@ -22,7 +22,7 @@ namespace mwmp
         void setAnimFlags();
         void setStatsDynamic();
         void setEquipment();
-        void setAI();
+        void setAi();
         void playAnimation();
         void playSound();
 

apps/openmw/mwmp/processors/actor/ProcessorActorAI.hpp

@@ -19,7 +19,7 @@ namespace mwmp
         {
             LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s about %s", strPacketID.c_str(), actorList.cell.getDescription().c_str());
 
-            Main::get().getCellController()->readAI(actorList);
+            Main::get().getCellController()->readAi(actorList);
         }
     };
 }