Code review: Hunter and skinner have same behaviour. Time for hunter and skinner in case of active leather addon to finish their work is doubled to give the skinner the chance to reach the dead animal in time

Author: ottml

libs/s25main/figures/nofSkinner.cpp

@@ -53,6 +53,22 @@ void nofSkinner::WorkAborted()
     }
 }
 
+void nofSkinner::AnimalLost()
+{
+    animal = nullptr;
+
+    switch(state)
+    {
+        default: return;
+        case State::SkinnerWalkingToCarcass: StartWalkingHome(); break;
+        case State::SkinnerSkinningCarcass:
+            // Remove Working-Event
+            GetEvMgr().RemoveEvent(current_ev);
+            StartWalkingHome();
+            break;
+    }
+}
+
 unsigned short nofSkinner::GetCarryID() const
 {
     throw std::logic_error("Must not be called. Handled by custom DrawWalkingWithWare");

libs/s25main/figures/nofSkinner.h

@@ -46,4 +46,5 @@ class nofSkinner : public nofWorkman
     GO_Type GetGOT() const final { return GO_Type::NofSkinner; }
 
     void WorkAborted() override;
+    void AnimalLost();
 };

libs/s25main/nodeObjs/noAnimal.cpp

@@ -4,6 +4,7 @@
 
 #include "noAnimal.h"
 #include "EventManager.h"
+#include "LeatherLoader.h"
 #include "Loader.h"
 #include "SerializedGameData.h"
 #include "SoundManager.h"
@@ -159,23 +160,21 @@ void noAnimal::HandleEvent(const unsigned id)
         // Sterbe-Event
         case 2:
         {
-            // we stay in dead state until skinner has done his work, otherwise he has no chance to reach the animal in
-            // time
-            if(skinner)
-                current_ev = GetEvMgr().AddEvent(this, 30, 2);
-            else
-            {
-                // nun verschwinden
-                current_ev = GetEvMgr().AddEvent(this, 30, 3);
-                state = State::Disappearing;
-            }
+            // nun verschwinden
+            current_ev = GetEvMgr().AddEvent(this, 30, 3);
+            state = State::Disappearing;
 
             // Jäger ggf. Bescheid sagen (falls der es nicht mehr rechtzeitig schafft, bis ich verwest bin)
             if(hunter)
             {
                 hunter->AnimalLost();
                 hunter = nullptr;
             }
+            if(skinner)
+            {
+                skinner->AnimalLost();
+                skinner = nullptr;
+            }
         }
         break;
         // Verschwind-Event
@@ -322,6 +321,7 @@ bool noAnimal::IsGettingSkinned() const
 void noAnimal::Skinned()
 {
     if(!hunter)
+        // Remove decay event for animal because skinner has taken it
         GetEvMgr().RemoveEvent(current_ev);
     // Reset skinner
     skinner = nullptr;
@@ -402,7 +402,8 @@ void noAnimal::Die()
     if(ANIMALCONSTS[species].dead_id)
     {
         // Verwesungsevent
-        current_ev = GetEvMgr().AddEvent(this, 300, 2);
+        unsigned gf_length = leatheraddon::isAddonActive(*world) ? 600 : 300;
+        current_ev = GetEvMgr().AddEvent(this, gf_length, 2);
         state = State::Dead;
     } else
     {