Move is_night() from Dog to BaseMonster

Author: BalintArszenovits

src/xrGame/ai/monsters/basemonster/base_monster.cpp

@@ -43,6 +43,7 @@
 #include "ai_space.h"
 #include "xrScriptEngine/script_engine.hpp"
 #include "ai/monsters/anti_aim_ability.h"
+#include "date_time.h"
 
 // Lain: added
 #include "level_debug.h"
@@ -946,6 +947,17 @@ bool CBaseMonster::check_eated_corpse_draggable()
     return false;
 }
 
+bool CBaseMonster::is_night()
+{
+    u32 year = 0, month = 0, day = 0, hours = 0, mins = 0, secs = 0, milisecs = 0;
+    split_time(Level().GetGameTime(), year, month, day, hours, mins, secs, milisecs);
+    if (hours <= db().m_dwDayTimeBegin || hours >= db().m_dwDayTimeEnd)
+    {
+        return true;
+    }
+    return false;
+}
+
 //-------------------------------------------------------------------
 // CBaseMonster's  Atack on Move
 //-------------------------------------------------------------------

src/xrGame/ai/monsters/basemonster/base_monster.h

@@ -265,6 +265,7 @@ class CBaseMonster : public CCustomMonster, public CStepManager, public CInvento
     const CEntityAlive* EatedCorpse;
     // Lain: added
     bool check_eated_corpse_draggable();
+    bool is_night();
     virtual bool is_base_monster_with_enemy() { return EnemyMan.get_enemy() != NULL; }
     bool hear_dangerous_sound;
     bool hear_interesting_sound;

src/xrGame/ai/monsters/dog/dog.cpp

@@ -4,7 +4,6 @@
 #include "ai/monsters/monster_velocity_space.h"
 #include "ai/monsters/control_animation_base.h"
 #include "ai/monsters/control_movement_base.h"
-#include "date_time.h"
 #include "Include/xrRender/KinematicsAnimated.h"
 #include "ai/monsters/monster_home.h"
 #include "ai/monsters/ai_monster_squad.h"
@@ -194,17 +193,6 @@ void CAI_Dog::UpdateCL()
     }
 }
 
-bool CAI_Dog::is_night()
-{
-    u32 year = 0, month = 0, day = 0, hours = 0, mins = 0, secs = 0, milisecs = 0;
-    split_time(Level().GetGameTime(), year, month, day, hours, mins, secs, milisecs);
-    if (hours <= 6 || hours >= 21)
-    {
-        return true;
-    }
-    return false;
-}
-
 void CAI_Dog::CheckSpecParams(u32 spec_params)
 {
     if ((spec_params & ASP_CHECK_CORPSE) == ASP_CHECK_CORPSE)

src/xrGame/ai/monsters/dog/dog.h

@@ -34,7 +34,6 @@ class CAI_Dog : public CBaseMonster, public CControlledEntity<CAI_Dog>
     void set_custom_anim_state(bool b_state_animation);
     u32 get_number_animation();
     u32 random_anim();
-    bool is_night();
 
     bool b_end_state_eat;
     bool b_state_check;