New non-atacking player

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 1a22117142c4727a5902142b209fefe00f0a8a4b..ed1aed93a4c4ed8ff8a0652efbf8234c5120a20d 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -1472,6 +1472,9 @@ void Game::ProcessDevInput()
             Person::players.back()->power = Person::players[0]->power;
             Person::players.back()->speedmult = Person::players[0]->speedmult;
 
             Person::players.back()->power = Person::players[0]->power;
             Person::players.back()->speedmult = Person::players[0]->speedmult;
 

+            if (Input::isKeyDown(SDL_SCANCODE_RSHIFT))
+                Person::players.back()->isplayerfriend = true;
+

             Person::players.back()->loaded = true;
         }
 
             Person::players.back()->loaded = true;
         }
 

diff --git a/Source/Objects/Person.cpp b/Source/Objects/Person.cpp
index d0e8f083742ffd22baf8a5b7b864382d29f0af66..8022c0fc3323f023bc485bb3ff2eb20a7ae12ad9 100644 (file)
--- a/Source/Objects/Person.cpp
+++ b/Source/Objects/Person.cpp
@@ -169,6 +169,7 @@ Person::Person()
 
     victim(nullptr)
     , hasvictim(false)
 
     victim(nullptr)
     , hasvictim(false)

+    , isplayerfriend(false)

     ,
 
     updatedelay(0)
     ,
 
     updatedelay(0)


@@ -7324,7 +7325,7 @@ bool Person::addClothes(const int& clothesId)
 
 void Person::doAI()
 {
 
 void Person::doAI()
 {

-    if (!isPlayerControlled() && !Dialog::inDialog()) {
+    if (!isPlayerControlled() && !isPlayerFriend() && !Dialog::inDialog()) {

         jumpclimb = 0;
         //disable movement in editor
         if (Game::editorenabled) {
         jumpclimb = 0;
         //disable movement in editor
         if (Game::editorenabled) {

diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp
index 89d5b40277022d92e445c55449f42e86a08cbf0a..22c76eb17c4e82fd9038352c5e35ad2b022067b4 100644 (file)
--- a/Source/Objects/Person.hpp
+++ b/Source/Objects/Person.hpp
@@ -157,6 +157,7 @@ public:
 
     std::shared_ptr<Person> victim;
     bool hasvictim;
 
     std::shared_ptr<Person> victim;
     bool hasvictim;

+    bool isplayerfriend;

 
     float updatedelay;
     float normalsupdatedelay;
 
     float updatedelay;
     float normalsupdatedelay;


@@ -405,6 +406,7 @@ public:
 
     bool hasWeapon() { return (weaponactive != -1); }
     bool isPlayerControlled() { return (aitype == playercontrolled); }
 
     bool hasWeapon() { return (weaponactive != -1); }
     bool isPlayerControlled() { return (aitype == playercontrolled); }

+    bool isPlayerFriend() { return isplayerfriend; }

 };
 
 const int maxplayers = 10;
 };
 
 const int maxplayers = 10;