set aiPolicy in npc constructor

fixes a non-working isPlayer check
Try · Jan 28, 2025 · 732807a · 732807a
1 parent 4f8828c
commit 732807a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/game/world/objects/npc.cpp b/game/world/objects/npc.cpp
@@ -156,8 +156,8 @@ struct Npc::TransformBack {
   };
 
 
-Npc::Npc(World &owner, size_t instance, std::string_view waypoint)
-  :owner(owner),mvAlgo(*this) {
+Npc::Npc(World &owner, size_t instance, std::string_view waypoint, ProcessPolicy aiPolicy)
+  :owner(owner),aiPolicy(aiPolicy),mvAlgo(*this) {
   outputPipe          = owner.script().openAiOuput();
 
   hnpc = std::make_shared<zenkit::INpc>();

diff --git a/game/world/objects/npc.h b/game/world/objects/npc.h
@@ -74,7 +74,7 @@ class Npc final {
 
     using Anim = AnimationSolver::Anim;
 
-    Npc(World &owner, size_t instance, std::string_view waypoint);
+    Npc(World &owner, size_t instance, std::string_view waypoint, ProcessPolicy aiPolicy = AiNormal);
     Npc(const Npc&)=delete;
     ~Npc();
 

diff --git a/game/world/world.cpp b/game/world/world.cpp
@@ -130,9 +130,8 @@ void World::createPlayer(std::string_view cls) {
   if(id==size_t(-1))
     return;
   std::string_view waypoint = wmatrix->startPoint().name;
-  auto             npc      = std::make_unique<Npc>(*this,id,waypoint);
+  auto             npc      = std::make_unique<Npc>(*this,id,waypoint,Npc::ProcessPolicy::Player);
   npcPlayer = wobj.insertPlayer(std::move(npc),waypoint);
-  npcPlayer->setProcessPolicy(Npc::ProcessPolicy::Player);
   game.script()->setInstanceNPC("HERO",*npcPlayer);
   }
 

diff --git a/game/world/worldobjects.cpp b/game/world/worldobjects.cpp
@@ -322,6 +322,8 @@ Npc* WorldObjects::addNpc(size_t npcInstance, const Vec3& pos) {
   Npc* npc   = new Npc(owner,npcInstance,pstr);
   npc->setPosition  (pos.x,pos.y,pos.z);
   npc->updateTransform();
+  if(owner.version().game==2)
+    owner.script().invokeRefreshAtInsert(*npc);
 
   npcArr.emplace_back(npc);
   return npc;