Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
@@ -48,8 +48,8 @@ public:
|
||||
void SetDrawState( DrawMode dm, int first, int num );
|
||||
int GetSafeNumToDraw( DrawMode dm, int num ) const;
|
||||
|
||||
vector<RageSpriteVertex> vertices;
|
||||
vector<size_t> quad_states;
|
||||
std::vector<RageSpriteVertex> vertices;
|
||||
std::vector<size_t> quad_states;
|
||||
|
||||
DrawMode _DrawMode;
|
||||
int FirstToDraw;
|
||||
@@ -128,7 +128,7 @@ public:
|
||||
{ ASSERT(i < _states.size()); return _states[i]; }
|
||||
void SetStateData(size_t i, const State& s)
|
||||
{ ASSERT(i < _states.size()); _states[i]= s; }
|
||||
void SetStateProperties(const vector<State>& new_states)
|
||||
void SetStateProperties(const std::vector<State>& new_states)
|
||||
{ _states= new_states; SetState(0); }
|
||||
void SetState(size_t i);
|
||||
void SetAllStateDelays(float delay);
|
||||
@@ -153,8 +153,8 @@ public:
|
||||
private:
|
||||
RageTexture* _Texture;
|
||||
|
||||
vector<RageSpriteVertex> _Vertices;
|
||||
vector<AMV_TweenState> AMV_Tweens;
|
||||
std::vector<RageSpriteVertex> _Vertices;
|
||||
std::vector<AMV_TweenState> AMV_Tweens;
|
||||
AMV_TweenState AMV_current;
|
||||
AMV_TweenState AMV_start;
|
||||
|
||||
@@ -166,12 +166,12 @@ private:
|
||||
|
||||
// Four splines for controlling vert positions, because quads drawmode
|
||||
// requires four. -Kyz
|
||||
vector<CubicSplineN> _splines;
|
||||
std::vector<CubicSplineN> _splines;
|
||||
|
||||
bool _skip_next_update;
|
||||
float _secs_into_state;
|
||||
size_t _cur_state;
|
||||
vector<State> _states;
|
||||
std::vector<State> _states;
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user