Skip to content

Commit d57d607

Browse files
committed
Fix issues with inherited method from templated base classes
1 parent 913f619 commit d57d607

File tree

9 files changed

+27
-2
lines changed

9 files changed

+27
-2
lines changed

src/utils/xrQSlim/src/MxDynBlock.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ class MxDynBlock : public MxBlock<T>
1818
{
1919
private:
2020
int fill;
21+
using MxBlock<T>::resize;
22+
using MxBlock<T>::begin;
2123

2224
public:
2325
MxDynBlock(int n = 2) : MxBlock<T>(n) { fill = 0; }

src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ class CBloodsuckerStateAttack : public CStateMonsterAttack<_Object>
1010
using inherited::current_substate;
1111
using inherited::m_time_start_check_behinder;
1212
using inherited::object;
13+
using inherited::check_steal_state;
14+
using inherited::select_state;
15+
using inherited::check_camp_state;
16+
using inherited::check_home_point;
17+
using inherited::check_find_enemy_state;
18+
using inherited::get_state_current;
19+
using inherited::get_state;
20+
using inherited::check_run_attack_state;
1321

1422
u32 m_time_stop_invis;
1523
Fvector m_dir_point;

src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ class CStateBloodsuckerPredator : public CState<_Object>
1010
using inherited::prev_substate;
1111
using inherited::time_state_started;
1212
using inherited::current_substate;
13+
using inherited::select_state;
14+
using inherited::get_state_current;
1315

1416
u32 m_target_node;
1517
u32 m_time_start_camp;

src/xrGame/ai/monsters/bloodsucker/bloodsucker_state_capture_jump.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ class CStateCaptureJumpBloodsucker : public CState<_Object>
1010
typedef CState<_Object>* state_ptr;
1111
using inherited::prev_substate;
1212
using inherited::current_substate;
13+
using inherited::get_state_current;
14+
using inherited::check_home_point;
15+
using inherited::check_find_enemy;
16+
using inherited::select_state;
1317

1418
public:
1519
CStateCaptureJumpBloodsucker(_Object* obj);

src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ class CStateBloodsuckerVampire : public CState<_Object>
1010
using inherited::object;
1111
using inherited::current_substate;
1212
using inherited::prev_substate;
13+
using inherited::get_state;
14+
using inherited::select_state;
15+
using inherited::get_state_current;
1316

1417
const CEntityAlive* enemy;
1518

src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_hide.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ class CStateBloodsuckerVampireHide : public CState<_Object>
99
using inherited::object;
1010
using inherited::prev_substate;
1111
using inherited::current_substate;
12+
using inherited::select_state;
13+
using inherited::get_state;
14+
using inherited::get_state_current;
1215

1316
public:
1417
CStateBloodsuckerVampireHide(_Object* obj);

src/xrGame/ai/monsters/group_states/group_state_home_point_attack.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ class CStateGroupAttackMoveToHomePoint : public CState<_Object>
1010
using inherited::object;
1111
using inherited::prev_substate;
1212
using inherited::current_substate;
13+
using inherited::select_state;
14+
using inherited::get_state_current;
1315

1416
u32 m_target_node;
1517
bool m_skip_camp;

src/xrGame/ai/monsters/pseudodog/psy_dog_state_psy_attack.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ class CStatePsyDogPsyAttack : public CState<_Object>
88
protected:
99
typedef CState<_Object> inherited;
1010
typedef CState<_Object>* state_ptr;
11+
using inherited::select_state;
1112

1213
public:
1314
CStatePsyDogPsyAttack(_Object* obj);

src/xrServerEntities/PropertiesListTypes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ class TokenValue : public CustomValue<T>, public TokenValueCustom
733733
OnDrawText(this, draw_val);
734734
else
735735
for (int i = 0; this->token[i].name; i++)
736-
if (this->token[i].id == (int)GetValue())
736+
if (this->token[i].id == (int)this->GetValue())
737737
return this->token[i].name;
738738
return draw_val;
739739
}
@@ -765,7 +765,7 @@ class RTokenValue : public CustomValue<T>, public RTokenValueCustom
765765
OnDrawText(this, draw_val);
766766
else
767767
for (u32 k = 0; k < token_count; k++)
768-
if ((T)token[k].id == GetValue())
768+
if ((T)token[k].id == this->GetValue())
769769
return *token[k].name;
770770
return draw_val;
771771
}

0 commit comments

Comments
 (0)