Fix issue with non-template derived member variables

Zegeri · Zegeri · commit d0989ff3abdf · 2018-09-16T21:19:30.000+02:00
It must be stated somewhere that these seemingly nondependent names are in the parent template class. See: https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-types
diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state.h
@@ -5,6 +5,11 @@ template <typename _Object>
 class CBloodsuckerStateAttack : public CStateMonsterAttack<_Object>
 {
     typedef CStateMonsterAttack<_Object> inherited_attack;
+    using inherited = typename inherited_attack::inherited;
+    using inherited::prev_substate;
+    using inherited::current_substate;
+    using inherited::m_time_start_check_behinder;
+    using inherited::object;
 
     u32 m_time_stop_invis;
     Fvector m_dir_point;
@@ -32,6 +37,7 @@ template <typename _Object>
 class CStateMonsterBackstubEnemy : public CState<_Object>
 {
     typedef CState<_Object> inherited;
+    using inherited::object;
 
 public:
     struct StateParams : SStateDataMoveToPointEx
diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state_inline.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state_inline.h
@@ -183,7 +183,7 @@ bool CBloodsuckerStateAttackAbstract::check_hiding()
 TEMPLATE_SPECIALIZATION
 void CBloodsuckerStateAttackAbstract::setup_substates()
 {
-    state_ptr state = get_state_current();
+    typename inherited::state_ptr state = get_state_current();
 
     if (current_substate == eStateAttack_Hide)
     {
diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator.h
@@ -6,6 +6,10 @@ class CStateBloodsuckerPredator : public CState<_Object>
 {
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
+    using inherited::prev_substate;
+    using inherited::time_state_started;
+    using inherited::current_substate;
 
     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
@@ -8,6 +8,8 @@ class CStateCaptureJumpBloodsucker : public CState<_Object>
 protected:
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::prev_substate;
+    using inherited::current_substate;
 
 public:
     CStateCaptureJumpBloodsucker(_Object* obj);
diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire.h
@@ -7,6 +7,9 @@ class CStateBloodsuckerVampire : public CState<_Object>
 {
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
+    using inherited::current_substate;
+    using inherited::prev_substate;
 
     const CEntityAlive* enemy;
 
diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_approach.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_approach.h
@@ -5,6 +5,7 @@ template <typename _Object>
 class CStateBloodsuckerVampireApproach : public CState<_Object>
 {
     typedef CState<_Object> inherited;
+    using inherited::object;
 
 public:
     CStateBloodsuckerVampireApproach(_Object* obj);
diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_hide.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_hide.h
@@ -6,6 +6,9 @@ class CStateBloodsuckerVampireHide : public CState<_Object>
 {
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
+    using inherited::prev_substate;
+    using inherited::current_substate;
 
 public:
     CStateBloodsuckerVampireHide(_Object* obj);
diff --git a/src/xrGame/ai/monsters/chimera/chimera_state_threaten.h b/src/xrGame/ai/monsters/chimera/chimera_state_threaten.h
@@ -7,6 +7,8 @@ class CStateChimeraThreaten : public CState<_Object>
 protected:
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
+    using inherited::prev_substate;
 
     enum
     {
diff --git a/src/xrGame/ai/monsters/chimera/chimera_state_threaten_roar.h b/src/xrGame/ai/monsters/chimera/chimera_state_threaten_roar.h
@@ -5,6 +5,8 @@ template <typename _Object>
 class CStateChimeraThreatenRoar : public CState<_Object>
 {
     typedef CState<_Object> inherited;
+    using inherited::object;
+    using inherited::time_state_started;
 
 public:
     IC CStateChimeraThreatenRoar(_Object* obj) : inherited(obj) {}
diff --git a/src/xrGame/ai/monsters/chimera/chimera_state_threaten_steal.h b/src/xrGame/ai/monsters/chimera/chimera_state_threaten_steal.h
@@ -5,6 +5,8 @@ template <typename _Object>
 class CStateChimeraThreatenSteal : public CStateMonsterMoveToPointEx<_Object>
 {
     typedef CStateMonsterMoveToPointEx<_Object> inherited;
+    using inherited::object;
+    using inherited::data;
 
 public:
     IC CStateChimeraThreatenSteal(_Object* obj) : inherited(obj) {}
diff --git a/src/xrGame/ai/monsters/chimera/chimera_state_threaten_walk.h b/src/xrGame/ai/monsters/chimera/chimera_state_threaten_walk.h
@@ -5,6 +5,8 @@ template <typename _Object>
 class CStateChimeraThreatenWalk : public CStateMonsterMoveToPointEx<_Object>
 {
     typedef CStateMonsterMoveToPointEx<_Object> inherited;
+    using inherited::object;
+    using inherited::data;
 
 public:
     IC CStateChimeraThreatenWalk(_Object* obj) : inherited(obj) {}
diff --git a/src/xrGame/ai/monsters/controller/controller_state_attack_camp.h b/src/xrGame/ai/monsters/controller/controller_state_attack_camp.h
@@ -4,6 +4,8 @@ template <typename _Object>
 class CStateControlCamp : public CState<_Object>
 {
     typedef CState<_Object> inherited;
+    using inherited::object;
+    using inherited::time_state_started;
 
     float m_angle_from;
     float m_angle_to;
diff --git a/src/xrGame/ai/monsters/controller/controller_state_attack_fire.h b/src/xrGame/ai/monsters/controller/controller_state_attack_fire.h
@@ -4,6 +4,7 @@ template <typename _Object>
 class CStateControlFire : public CState<_Object>
 {
     typedef CState<_Object> inherited;
+    using inherited::object;
 
     u32 m_time_started;
     u32 m_time_state_last_execute;
diff --git a/src/xrGame/ai/monsters/controller/controller_state_attack_hide_lite.h b/src/xrGame/ai/monsters/controller/controller_state_attack_hide_lite.h
@@ -6,6 +6,7 @@ class CStateControlHideLite : public CState<_Object>
 {
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
 
     struct
     {
diff --git a/src/xrGame/ai/monsters/controller/controller_state_attack_moveout.h b/src/xrGame/ai/monsters/controller/controller_state_attack_moveout.h
@@ -5,6 +5,8 @@ class CStateControlMoveOut : public CState<_Object>
 {
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
+    using inherited::time_state_started;
 
     Fvector m_look_point;
 
diff --git a/src/xrGame/ai/monsters/controller/controller_tube.h b/src/xrGame/ai/monsters/controller/controller_tube.h
@@ -5,6 +5,7 @@ template <typename _Object>
 class CStateControllerTube : public CState<_Object>
 {
     typedef CState<_Object> inherited;
+    using inherited::object;
 
 public:
     CStateControllerTube(_Object* obj) : inherited(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
@@ -7,6 +7,9 @@ class CStateGroupAttackMoveToHomePoint : public CState<_Object>
 protected:
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
+    using inherited::prev_substate;
+    using inherited::current_substate;
 
     u32 m_target_node;
     bool m_skip_camp;
diff --git a/src/xrGame/ai/monsters/pseudodog/psy_dog_state_psy_attack_hide.h b/src/xrGame/ai/monsters/pseudodog/psy_dog_state_psy_attack_hide.h
@@ -5,6 +5,7 @@ class CStatePsyDogHide : public CState<_Object>
 {
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
 
     struct
     {
diff --git a/src/xrGame/ai/monsters/states/monster_state_attack.h b/src/xrGame/ai/monsters/states/monster_state_attack.h
@@ -9,6 +9,7 @@ class CStateMonsterAttack : public CState<_Object>
 protected:
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
 
     u32 m_time_next_run_away;
     u32 m_time_start_check_behinder;
diff --git a/src/xrGame/ai/monsters/states/state_test_state.h b/src/xrGame/ai/monsters/states/state_test_state.h
@@ -6,6 +6,7 @@ class CStateMonsterTestState : public CState<_Object>
 {
     typedef CState<_Object> inherited;
     typedef CState<_Object>* state_ptr;
+    using inherited::object;
 
 public:
     CStateMonsterTestState(_Object* obj);
diff --git a/src/xrGame/level_location_selector.h b/src/xrGame/level_location_selector.h
@@ -18,6 +18,12 @@ class CBaseLocationSelector<CLevelGraph, _VertexEvaluator, _vertex_id_type>
     typedef CLevelGraph _Graph;
     typedef CAbstractLocationSelector<_Graph, _VertexEvaluator, _vertex_id_type> inherited;
 
+    // Needed for template-derived-classes.
+    using inherited::m_evaluator;
+    using inherited::m_graph;
+    using inherited::m_path;
+    using inherited::m_restricted_object;
+
 public:
     IC CBaseLocationSelector(CRestrictedObject* object);
 

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ bool CBloodsuckerStateAttackAbstract::check_hiding()`
`183`	`183`	`TEMPLATE_SPECIALIZATION`
`184`	`184`	`void CBloodsuckerStateAttackAbstract::setup_substates()`
`185`	`185`	`{`
`186`		`- state_ptr state = get_state_current();`
	`186`	`+ typename inherited::state_ptr state = get_state_current();`
`187`	`187`
`188`	`188`	`if (current_substate == eStateAttack_Hide)`
`189`	`189`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@ class CStateBloodsuckerVampire : public CState<_Object>`
`7`	`7`	`{`
`8`	`8`	`typedef CState<_Object> inherited;`
`9`	`9`	`typedef CState<_Object>* state_ptr;`
	`10`	`+ using inherited::object;`
	`11`	`+ using inherited::current_substate;`
	`12`	`+ using inherited::prev_substate;`
`10`	`13`
`11`	`14`	`const CEntityAlive* enemy;`
`12`	`15`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ template <typename _Object>`
`5`	`5`	`class CStateBloodsuckerVampireApproach : public CState<_Object>`
`6`	`6`	`{`
`7`	`7`	`typedef CState<_Object> inherited;`
	`8`	`+ using inherited::object;`
`8`	`9`
`9`	`10`	`public:`
`10`	`11`	`CStateBloodsuckerVampireApproach(_Object* obj);`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ class CStateBloodsuckerVampireHide : public CState<_Object>`
`6`	`6`	`{`
`7`	`7`	`typedef CState<_Object> inherited;`
`8`	`8`	`typedef CState<_Object>* state_ptr;`
	`9`	`+ using inherited::object;`
	`10`	`+ using inherited::prev_substate;`
	`11`	`+ using inherited::current_substate;`
`9`	`12`
`10`	`13`	`public:`
`11`	`14`	`CStateBloodsuckerVampireHide(_Object* obj);`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ class CStateChimeraThreaten : public CState<_Object>`
`7`	`7`	`protected:`
`8`	`8`	`typedef CState<_Object> inherited;`
`9`	`9`	`typedef CState<_Object>* state_ptr;`
	`10`	`+ using inherited::object;`
	`11`	`+ using inherited::prev_substate;`
`10`	`12`
`11`	`13`	`enum`
`12`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ template <typename _Object>`
`5`	`5`	`class CStateChimeraThreatenRoar : public CState<_Object>`
`6`	`6`	`{`
`7`	`7`	`typedef CState<_Object> inherited;`
	`8`	`+ using inherited::object;`
	`9`	`+ using inherited::time_state_started;`
`8`	`10`
`9`	`11`	`public:`
`10`	`12`	`IC CStateChimeraThreatenRoar(_Object* obj) : inherited(obj) {}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ template <typename _Object>`
`5`	`5`	`class CStateChimeraThreatenSteal : public CStateMonsterMoveToPointEx<_Object>`
`6`	`6`	`{`
`7`	`7`	`typedef CStateMonsterMoveToPointEx<_Object> inherited;`
	`8`	`+ using inherited::object;`
	`9`	`+ using inherited::data;`
`8`	`10`
`9`	`11`	`public:`
`10`	`12`	`IC CStateChimeraThreatenSteal(_Object* obj) : inherited(obj) {}`