Fix issues with inherited method from templated base classes

OpenXRay · Sep 24, 2018 · d57d607 · d57d607
1 parent 913f619
commit d57d607
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 2 deletions.
diff --git a/src/utils/xrQSlim/src/MxDynBlock.h b/src/utils/xrQSlim/src/MxDynBlock.h
@@ -18,6 +18,8 @@ class MxDynBlock : public MxBlock<T>
 {
 private:
     int fill;
+    using MxBlock<T>::resize;
+    using MxBlock<T>::begin;
 
 public:
     MxDynBlock(int n = 2) : MxBlock<T>(n) { fill = 0; }

diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state.h
@@ -10,6 +10,14 @@ class CBloodsuckerStateAttack : public CStateMonsterAttack<_Object>
     using inherited::current_substate;
     using inherited::m_time_start_check_behinder;
     using inherited::object;
+    using inherited::check_steal_state;
+    using inherited::select_state;
+    using inherited::check_camp_state;
+    using inherited::check_home_point;
+    using inherited::check_find_enemy_state;
+    using inherited::get_state_current;
+    using inherited::get_state;
+    using inherited::check_run_attack_state;
 
     u32 m_time_stop_invis;
     Fvector m_dir_point;

diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator.h
@@ -10,6 +10,8 @@ class CStateBloodsuckerPredator : public CState<_Object>
     using inherited::prev_substate;
     using inherited::time_state_started;
     using inherited::current_substate;
+    using inherited::select_state;
+    using inherited::get_state_current;
 
     u32 m_target_node;
     u32 m_time_start_camp;

diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_state_capture_jump.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_state_capture_jump.h
@@ -10,6 +10,10 @@ class CStateCaptureJumpBloodsucker : public CState<_Object>
     typedef CState<_Object>* state_ptr;
     using inherited::prev_substate;
     using inherited::current_substate;
+    using inherited::get_state_current;
+    using inherited::check_home_point;
+    using inherited::check_find_enemy;
+    using inherited::select_state;
 
 public:
     CStateCaptureJumpBloodsucker(_Object* obj);

diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire.h
@@ -10,6 +10,9 @@ class CStateBloodsuckerVampire : public CState<_Object>
     using inherited::object;
     using inherited::current_substate;
     using inherited::prev_substate;
+    using inherited::get_state;
+    using inherited::select_state;
+    using inherited::get_state_current;
 
     const CEntityAlive* enemy;
 

diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_hide.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_hide.h
@@ -9,6 +9,9 @@ class CStateBloodsuckerVampireHide : public CState<_Object>
     using inherited::object;
     using inherited::prev_substate;
     using inherited::current_substate;
+    using inherited::select_state;
+    using inherited::get_state;
+    using inherited::get_state_current;
 
 public:
     CStateBloodsuckerVampireHide(_Object* obj);

diff --git a/src/xrGame/ai/monsters/group_states/group_state_home_point_attack.h b/src/xrGame/ai/monsters/group_states/group_state_home_point_attack.h
@@ -10,6 +10,8 @@ class CStateGroupAttackMoveToHomePoint : public CState<_Object>
     using inherited::object;
     using inherited::prev_substate;
     using inherited::current_substate;
+    using inherited::select_state;
+    using inherited::get_state_current;
 
     u32 m_target_node;
     bool m_skip_camp;

diff --git a/src/xrGame/ai/monsters/pseudodog/psy_dog_state_psy_attack.h b/src/xrGame/ai/monsters/pseudodog/psy_dog_state_psy_attack.h
@@ -8,6 +8,7 @@ class CStatePsyDogPsyAttack : public CState<_Object>
 protected:
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::select_state;
 
 public:
     CStatePsyDogPsyAttack(_Object* obj);

diff --git a/src/xrServerEntities/PropertiesListTypes.h b/src/xrServerEntities/PropertiesListTypes.h
@@ -733,7 +733,7 @@ class TokenValue : public CustomValue<T>, public TokenValueCustom
             OnDrawText(this, draw_val);
         else
             for (int i = 0; this->token[i].name; i++)
-                if (this->token[i].id == (int)GetValue())
+                if (this->token[i].id == (int)this->GetValue())
                     return this->token[i].name;
         return draw_val;
     }
@@ -765,7 +765,7 @@ class RTokenValue : public CustomValue<T>, public RTokenValueCustom
             OnDrawText(this, draw_val);
         else
             for (u32 k = 0; k < token_count; k++)
-                if ((T)token[k].id == GetValue())
+                if ((T)token[k].id == this->GetValue())
                     return *token[k].name;
         return draw_val;
     }