Merge branch 'master' of https://github.com/XProger/OpenLara

src/character.h

@@ -69,6 +69,10 @@ struct Character : Controller {
         updateZone();
     }
 
+    bool isActiveTarget() {
+        return flags.state == TR::Entity::asActive && !flags.invisible && health > 0.0f;
+    }
+
     virtual int getRoomIndex() const {
         int index = Controller::getRoomIndex();
         

src/controller.h

@@ -58,7 +58,7 @@ struct IGame {
     virtual TR::Level*   getLevel()     { return NULL; }
     virtual MeshBuilder* getMesh()      { return NULL; }
     virtual Texture*     getAtlas()     { return NULL; }
-    virtual ICamera*     getCamera()    { return NULL; }
+    virtual ICamera*     getCamera(int index = -1)  { return NULL; }
     virtual Controller*  getLara(int index = 0)     { return NULL; }
     virtual Controller*  getLara(const vec3 &pos)   { return NULL; }
     virtual bool         isCutscene()   { return false; }

src/enemy.h

@@ -524,6 +524,24 @@ struct Enemy : Character {
             bullet->setAngle(ang);
         }
     }
+
+    bool isVisible() {
+        for (int i = 0; i < 2; i++) {
+            ICamera *camera = game->getCamera(i);
+            if (!camera) continue;
+
+            TR::Location eye = camera->eye;
+            TR::Location loc;
+            loc.room = getRoomIndex();
+            loc.box  = box;
+            loc.pos  = pos;
+            loc.pos.y -= 1024;
+
+            if (trace(eye, loc))
+                return true;
+        }
+        return false;
+    }
 };
 
 
@@ -2620,6 +2638,9 @@ struct Larson : Human {
 };
 
 
+#define PIERRE_MIN_HEALTH   40
+#define PIERRE_DAMAGE       25
+
 struct Pierre : Human {
 
     Pierre(IGame *game, int entity) : Human(game, entity, 70) {
@@ -2627,11 +2648,93 @@ struct Pierre : Human {
     }
 
     virtual void onDead() {
-        if (level->id == TR::LVL_TR1_7B) {
         game->addEntity(TR::Entity::MAGNUMS,           getRoomIndex(), pos, 0);
         game->addEntity(TR::Entity::SCION_PICKUP_DROP, getRoomIndex(), pos, 0);
         game->addEntity(TR::Entity::KEY_ITEM_1,        getRoomIndex(), pos, 0);
     }
+
+    virtual int getStateGround() {
+        if (!think(false))
+            return state;
+
+        if (!flags.once && health <= PIERRE_MIN_HEALTH) {
+            health = PIERRE_MIN_HEALTH;
+            timer += Core::deltaTime;
+        }
+
+        if (timer > 0.0f && isVisible()) // time to run away!
+            timer = 0.0f;
+
+        if (getRoom().flags.water)
+            timer = 1.0f;
+
+        if (timer > 0.4f) {
+            flags.invisible = true;
+            deactivate(true);
+        }
+
+        fullChestRotation = state == STATE_FIRE || state == STATE_AIM;
+
+        if (nextState == state)
+            nextState = STATE_NONE;
+
+        switch (state) {
+            case STATE_STOP :
+                if (nextState != STATE_NONE)
+                    return nextState;
+                if (mood == MOOD_SLEEP)
+                    return randf() < HUMAN_WAIT ? STATE_WAIT : STATE_WALK;
+                if (mood == MOOD_ESCAPE)
+                    return STATE_RUN;
+                return STATE_WALK;
+            case STATE_WAIT : 
+                if (mood != MOOD_SLEEP)
+                    return STATE_STOP;
+                if (randf() < HUMAN_WAIT) {
+                    nextState = STATE_WALK;
+                    return STATE_STOP;
+                }
+                break;
+            case STATE_WALK :
+                if (mood == MOOD_SLEEP && randf() < HUMAN_WAIT)
+                    nextState = STATE_WAIT;
+                else if (mood == MOOD_ESCAPE)
+                    nextState = STATE_RUN;
+                else if (targetIsVisible(HUMAN_DIST_SHOT))
+                    nextState = STATE_AIM;
+                else if (!targetInView || targetDist > HUMAN_DIST_WALK)
+                    nextState = STATE_RUN;
+                else
+                    break;
+                return STATE_STOP;
+            case STATE_RUN :
+                if (mood == MOOD_SLEEP && randf() < HUMAN_WAIT)
+                    nextState = STATE_WAIT;
+                else if (targetIsVisible(HUMAN_DIST_SHOT))
+                    nextState = STATE_AIM;
+                else if (targetInView && targetDist < HUMAN_DIST_WALK)
+                    nextState = STATE_WALK;
+                else
+                    break;
+                return STATE_STOP;
+            case STATE_AIM :
+                if (nextState != STATE_NONE)
+                    return nextState;
+                if (targetIsVisible(HUMAN_DIST_SHOT))
+                    return STATE_FIRE;
+                return STATE_STOP;
+            case STATE_FIRE :
+                if (nextState == STATE_NONE) {
+                    jointGun = 11; doShot(PIERRE_DAMAGE, vec3(60, 0, 50));
+                    jointGun = 14; doShot(PIERRE_DAMAGE, vec3(-60, 0, 50));
+                    nextState = STATE_AIM;
+                }
+                if (mood == MOOD_ESCAPE && (rand() % 2))
+                    nextState = STATE_STOP;
+                break;
+        }
+
+        return state;
     }
 };
 

src/lara.h

@@ -1246,7 +1246,7 @@ struct Lara : Character {
         bool retarget = false;
         if (Core::settings.controls[camera->cameraIndex].retarget) {
             for (int i = 0; i < 2; i++)
-                if (!arms[i].tracking || ((Character*)arms[i].tracking)->health <= 0.0f) {
+                if (!arms[i].tracking || !((Character*)arms[i].tracking)->isActiveTarget()) {
                     retarget = true;
                     break;
                 }
@@ -1331,7 +1331,7 @@ struct Lara : Character {
                 continue;
 
             Character *enemy = (Character*)c;
-            if (enemy->health <= 0)
+            if (!enemy->isActiveTarget())
                 continue;
 
             Box box = enemy->getBoundingBox();

src/level.h

@@ -301,8 +301,12 @@ struct Level : IGame {
         return atlas;
     }
 
-    virtual ICamera* getCamera() {
+    virtual ICamera* getCamera(int index = -1) {
+        if (index == -1)
             return camera;
+        if (players[index])
+            return players[index]->camera;
+        return NULL;
     }
 
     virtual Controller* getLara(int index = 0) {

src/trigger.h

@@ -37,8 +37,10 @@ struct Switch : Controller {
     virtual void update() {
         updateAnimation(true);
         flags.active = TR::ACTIVE;
-        if (!isActive())
+        if (!isActive()) {
             animation.setState(STATE_UP);
+            timer = 0.0f;
+        }
     }
 };