Remove <vector> from globals.h

Author: staticssleever668

src/Etterna/Actor/Base/Actor.cpp

@@ -38,8 +38,8 @@ REGISTER_ACTOR_CLASS_WITH_NAME(HiddenActor, Actor);
 float Actor::g_fCurrentBGMTime = 0, Actor::g_fCurrentBGMBeat;
 float Actor::g_fCurrentBGMTimeNoOffset = 0,
 	  Actor::g_fCurrentBGMBeatNoOffset = 0;
-vector<float> Actor::g_vfCurrentBGMBeatPlayer(NUM_PlayerNumber, 0);
-vector<float> Actor::g_vfCurrentBGMBeatPlayerNoOffset(NUM_PlayerNumber, 0);
+std::vector<float> Actor::g_vfCurrentBGMBeatPlayer(NUM_PlayerNumber, 0);
+std::vector<float> Actor::g_vfCurrentBGMBeatPlayerNoOffset(NUM_PlayerNumber, 0);
 
 Actor*
 Actor::Copy() const

src/Etterna/Actor/Base/Actor.h

@@ -868,7 +868,7 @@ class Actor : public MessageSubscriber
 
 	// Stuff for effects
 #if defined(SSC_FUTURES) // be able to stack effects
-	vector<Effect> m_Effects;
+	std::vector<Effect> m_Effects;
 #else // compatibility
 	Effect m_Effect;
 #endif

src/Etterna/Actor/Base/ActorFrame.cpp

@@ -147,7 +147,7 @@ ActorFrame::AddChild(Actor* pActor)
 {
 #ifdef DEBUG
 	// check that this Actor isn't already added.
-	vector<Actor*>::iterator iter =
+	std::vector<Actor*>::iterator iter =
 	  find(m_SubActors.begin(), m_SubActors.end(), pActor);
 	if (iter != m_SubActors.end())
 		Dialog::OK(ssprintf("Actor \"%s\" adds child \"%s\" more than once",
@@ -808,7 +808,7 @@ class LunaActorFrame : public Luna<ActorFrame>
 	{
 		luaL_checktype(L, 1, LUA_TTABLE);
 		lua_pushvalue(L, 1);
-		vector<float> coords;
+		std::vector<float> coords;
 		LuaHelpers::ReadArrayFromTable(coords, L);
 		lua_pop(L, 1);
 		if (coords.size() != 3) {

src/Etterna/Actor/Base/ActorMultiVertex.cpp

@@ -332,14 +332,14 @@ ActorMultiVertex::SetVertsFromSplinesInternal(size_t num_splines, size_t offset)
 	  AMV_DestTweenState().GetSafeNumToDraw(AMV_DestTweenState()._DrawMode,
 											AMV_DestTweenState().NumToDraw) -
 	  offset;
-	vector<float> tper(num_splines, 0.0f);
+	std::vector<float> tper(num_splines, 0.0f);
 	const auto num_parts =
 	  (static_cast<float>(num_verts) / static_cast<float>(num_splines)) - 1.0f;
 	for (size_t i = 0; i < num_splines; ++i) {
 		tper[i] = _splines[i].get_max_t() / num_parts;
 	}
 	for (size_t v = 0; v < num_verts; ++v) {
-		vector<float> pos;
+		std::vector<float> pos;
 		const int spi = v % num_splines;
 		const auto part = static_cast<float>(v) / num_splines;
 		_splines[spi].evaluate(part * tper[spi], pos);
@@ -1079,7 +1079,7 @@ class LunaActorMultiVertex : public Luna<ActorMultiVertex>
 		if (tex == nullptr) {
 			luaL_error(L, "The texture must be set before adding states.");
 		}
-		vector<ActorMultiVertex::State> new_states;
+		std::vector<ActorMultiVertex::State> new_states;
 		const auto num_states = lua_objlen(L, 1);
 		new_states.resize(num_states);
 		for (size_t i = 0; i < num_states; ++i) {

src/Etterna/Actor/Base/ActorMultiVertex.h

@@ -57,8 +57,8 @@ class ActorMultiVertex : public Actor
 		void SetDrawState(DrawMode dm, int first, int num);
 		[[nodiscard]] 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{ DrawMode_Invalid };
 		int FirstToDraw{ 0 };
@@ -172,7 +172,7 @@ class ActorMultiVertex : public Actor
 		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);
@@ -212,8 +212,8 @@ class ActorMultiVertex : public Actor
   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;
 
@@ -225,12 +225,12 @@ class ActorMultiVertex : public Actor
 
 	// 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;
 };
 
 #endif // ACTOR_MULTI_VERTEX_H

src/Etterna/Actor/Base/ActorScroller.cpp

@@ -287,7 +287,7 @@ ActorScroller::PositionItemsAndDrawPrimitives(bool bDrawPrimitives)
 		iLastItemToDraw = std::clamp(iLastItemToDraw, 0, m_iNumItems);
 	}
 
-	vector<Actor*> subs;
+	std::vector<Actor*> subs;
 
 	{
 		// Shift m_SubActors so iFirstItemToDraw is at the beginning.

src/Etterna/Actor/Base/ActorUtil.cpp

@@ -54,7 +54,7 @@ ActorUtil::ResolvePath(std::string& sPath,
 	// so "foo" doesn't partial match "foobar" if "foo" exists.
 	const auto ft = FILEMAN->GetFileType(sPath);
 	if (ft != RageFileManager::TYPE_FILE && ft != RageFileManager::TYPE_DIR) {
-		vector<std::string> asPaths;
+		std::vector<std::string> asPaths;
 		GetDirListing(sPath + "*", asPaths, false, true); // return path too
 
 		if (asPaths.empty()) {
@@ -476,7 +476,7 @@ CompareActorsByZPosition(const Actor* p1, const Actor* p2)
 }
 
 void
-ActorUtil::SortByZPosition(vector<Actor*>& vActors)
+ActorUtil::SortByZPosition(std::vector<Actor*>& vActors)
 {
 	// Preserve ordering of Actors with equal Z positions.
 	stable_sort(vActors.begin(), vActors.end(), CompareActorsByZPosition);
@@ -492,7 +492,7 @@ LuaXType(FileType);
 
 // convenience so the for-loop lines can be shorter.
 typedef map<std::string, FileType> etft_cont_t;
-typedef map<FileType, vector<std::string>> fttel_cont_t;
+typedef map<FileType, std::vector<std::string>> fttel_cont_t;
 etft_cont_t ExtensionToFileType;
 fttel_cont_t FileTypeToExtensionList;
 
@@ -548,14 +548,14 @@ ActorUtil::InitFileTypeLists()
 	}
 }
 
-vector<std::string> const&
+std::vector<std::string> const&
 ActorUtil::GetTypeExtensionList(FileType ft)
 {
 	return FileTypeToExtensionList[ft];
 }
 
 void
-ActorUtil::AddTypeExtensionsToList(FileType ft, vector<std::string>& add_to)
+ActorUtil::AddTypeExtensionsToList(FileType ft, std::vector<std::string>& add_to)
 {
 	auto ext_list = FileTypeToExtensionList.find(ft);
 	if (ext_list != FileTypeToExtensionList.end()) {

src/Etterna/Actor/Base/BitmapText.cpp

@@ -39,7 +39,7 @@ REGISTER_ACTOR_CLASS(ColorBitmapText);
 #define RAINBOW_COLOR(n)                                                       \
 	THEME->GetMetricC("BitmapText", ssprintf("RainbowColor%i", (n) + 1))
 
-static vector<RageColor> RAINBOW_COLORS;
+static std::vector<RageColor> RAINBOW_COLORS;
 
 BitmapText::BitmapText()
 {
@@ -574,11 +574,11 @@ BitmapText::SetTextInternal()
 		/* "...I can add Japanese wrapping, at least. We could handle hyphens
 		 * and soft hyphens and pretty easily, too." -glenn */
 		// TODO: Move this wrapping logic into Font.
-		vector<std::string> asLines;
+		std::vector<std::string> asLines;
 		split(m_sText, "\n", asLines, false);
 
 		for (auto& asLine : asLines) {
-			vector<std::string> asWords;
+			std::vector<std::string> asWords;
 			split(asLine, " ", asWords);
 
 			std::string sCurLine;
@@ -832,7 +832,7 @@ BitmapText::DrawPrimitives()
 				else
 					iEnd = i + attr.length * 4;
 				iEnd = min(iEnd, m_aVertices.size());
-				vector<RageColor> temp_attr_diffuse(NUM_DIFFUSE_COLORS,
+				std::vector<RageColor> temp_attr_diffuse(NUM_DIFFUSE_COLORS,
 													m_internalDiffuse);
 				for (size_t c = 0; c < NUM_DIFFUSE_COLORS; ++c) {
 					temp_attr_diffuse[c] *= attr.diffuse[c];
@@ -850,7 +850,7 @@ BitmapText::DrawPrimitives()
 		}
 
 		// apply jitter to verts
-		vector<RageVector3> vGlyphJitter;
+		std::vector<RageVector3> vGlyphJitter;
 		if (m_bJitter) {
 			const int iSeed = lround(RageTimer::GetTimeSinceStart() * 8);
 			RandomGen rnd(iSeed);

src/Etterna/Actor/Base/Model.cpp

@@ -666,7 +666,7 @@ Model::AdvanceFrame(float fDeltaTime)
 void
 Model::SetBones(const msAnimation* pAnimation,
 				float fFrame,
-				vector<myBone_t>& vpBones)
+				std::vector<myBone_t>& vpBones)
 {
 	for (size_t i = 0; i < pAnimation->Bones.size(); ++i) {
 		const auto* pBone = &pAnimation->Bones[i];

src/Etterna/Actor/Base/Model.h

@@ -69,14 +69,14 @@ class Model : public Actor
 	RageModelGeometry* m_pGeometry;
 
 	float m_animation_length_seconds;
-	vector<msMaterial> m_Materials;
+	std::vector<msMaterial> m_Materials;
 	std::map<std::string, msAnimation> m_mapNameToAnimation;
 	const msAnimation* m_pCurAnimation;
 
 	static void SetBones(const msAnimation* pAnimation,
 						 float fFrame,
-						 vector<myBone_t>& vpBones);
-	vector<myBone_t> m_vpBones;
+						 std::vector<myBone_t>& vpBones);
+	std::vector<myBone_t> m_vpBones;
 
 	// If any vertex has a bone weight, then then render from m_pTempGeometry.
 	// Otherwise, render directly from m_pGeometry.
@@ -86,7 +86,7 @@ class Model : public Actor
 	/* Keep a copy of the mesh data only if m_pTempGeometry is in use.  The
 	 * normal and position data will be changed; the rest is static and kept
 	 * only to prevent making a complete copy. */
-	vector<msMesh> m_vTempMeshes;
+	std::vector<msMesh> m_vTempMeshes;
 
 	void DrawMesh(int i) const;
 	void AdvanceFrame(float fDeltaTime);