krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Client] Add ActorList methods for sending ActorAI packets

Browse source 
Additionally, use consistent capitalization for AI-related methods.
This commit is contained in:
David Cernat 2018-07-12 20:48:47 +03:00
parent 0fd8f7660b
commit 6316f1e590
9 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw/mwmp/ActorList.cpp
View file

@ -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)

3
apps/openmw/mwmp/ActorList.hpp
View file

@ -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;
};

4
apps/openmw/mwmp/Cell.cpp
View file

@ -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();
}
}
}

2
apps/openmw/mwmp/Cell.hpp
View file

@ -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);

4
apps/openmw/mwmp/CellController.cpp
View file

@ -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)

2
apps/openmw/mwmp/CellController.hpp
View file

@ -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);

2
apps/openmw/mwmp/DedicatedActor.cpp
View file

@ -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);

2
apps/openmw/mwmp/DedicatedActor.hpp
View file

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

2
apps/openmw/mwmp/processors/actor/ProcessorActorAI.hpp
View file

@ -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);
}
};
}