mirror of
https://github.com/fortressforever/fortressforever-2013.git
synced 2024-11-10 07:11:45 +00:00
when using nested template type parameters, space them out or else they do not compile on gcc
This commit is contained in:
parent
d3d45f42f3
commit
ee3fa73350
1 changed files with 14 additions and 14 deletions
|
@ -79,21 +79,21 @@ private:
|
||||||
CNetworkVar( int, m_iCriteria_TeamsAllowed );
|
CNetworkVar( int, m_iCriteria_TeamsAllowed );
|
||||||
CNetworkVar( int, m_iCriteria_ClassesAllowed );
|
CNetworkVar( int, m_iCriteria_ClassesAllowed );
|
||||||
|
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsCarriedByActivator;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsCarriedByActivator;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsNotCarriedByActivator;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsNotCarriedByActivator;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsCarriedByTeam;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsCarriedByTeam;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsNotCarriedByTeam;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsNotCarriedByTeam;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsCarriedByAny;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsCarriedByAny;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsNotCarriedByAny;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsNotCarriedByAny;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsCarriedByOne;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsCarriedByOne;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsNotCarriedByOne;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsNotCarriedByOne;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsAtSpawnPoint;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsAtSpawnPoint;
|
||||||
CUtlVector<CHandle<CFF_SH_ItemFFGoal>> m_Criteria_ItemsNotAtSpawnPoint;
|
CUtlVector<CHandle <CFF_SH_ItemFFGoal> > m_Criteria_ItemsNotAtSpawnPoint;
|
||||||
|
|
||||||
CUtlVector<CHandle<CFF_SH_BaseFFGoal>> m_Criteria_GoalsAreActive;
|
CUtlVector<CHandle <CFF_SH_BaseFFGoal> > m_Criteria_GoalsAreActive;
|
||||||
CUtlVector<CHandle<CFF_SH_BaseFFGoal>> m_Criteria_GoalsAreInactive;
|
CUtlVector<CHandle <CFF_SH_BaseFFGoal> > m_Criteria_GoalsAreInactive;
|
||||||
CUtlVector<CHandle<CFF_SH_BaseFFGoal>> m_Criteria_GoalsAreEnabled;
|
CUtlVector<CHandle <CFF_SH_BaseFFGoal> > m_Criteria_GoalsAreEnabled;
|
||||||
CUtlVector<CHandle<CFF_SH_BaseFFGoal>> m_Criteria_GoalsAreDisabled;
|
CUtlVector<CHandle <CFF_SH_BaseFFGoal> > m_Criteria_GoalsAreDisabled;
|
||||||
|
|
||||||
#ifdef GAME_DLL
|
#ifdef GAME_DLL
|
||||||
protected:
|
protected:
|
||||||
|
|
Loading…
Reference in a new issue