Remove RandomAttacks references & a couple of Attack-related things

still left the player options and a couple of tiny things in for compatibility sake (mod charts im thinking about you every day)
jameskr97 · Nov 29, 2019 · 4ecde8a · 4ecde8a
1 parent e27b66d
commit 4ecde8a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 66 deletions.
diff --git a/Data/RandomAttacks.txt b/Data/RandomAttacks.txt
diff --git a/src/Etterna/Actor/Gameplay/NoteField.h b/src/Etterna/Actor/Gameplay/NoteField.h
@@ -9,7 +9,6 @@
 #include "Etterna/Actor/Gameplay/ReceptorArrowRow.h"
 #include "Etterna/Actor/Base/Sprite.h"
 
-struct Attack;
 class NoteData;
 /** @brief An Actor that renders NoteData. */
 class NoteField : public ActorFrame
@@ -99,9 +98,6 @@ class NoteField : public ActorFrame
 								  float horiz_align,
 								  const RageColor& color,
 								  const RageColor& glow);
-	void DrawAttackText(float beat,
-						const Attack& attack,
-						const RageColor& glow);
 	void DrawBGChangeText(float beat,
 						  RString new_bg_name,
 						  const RageColor& glow);

diff --git a/src/Etterna/Models/Misc/PlayerInfo.h b/src/Etterna/Models/Misc/PlayerInfo.h
@@ -88,7 +88,6 @@ class PlayerInfo
 	ScoreKeeper* m_pPrimaryScoreKeeper;
 	/** @brief The current PlayerOptions that are activated. */
 	BitmapText* m_ptextPlayerOptions;
-	/** @brief The current attack modifiers that are in play for the moment. */
 
 	/** @brief The NoteData the Player has to get through. */
 	NoteData m_NoteData;

diff --git a/src/Etterna/Models/StepsAndStyles/Steps.h b/src/Etterna/Models/StepsAndStyles/Steps.h
@@ -246,11 +246,6 @@ class Steps
 	 * @return true if it does, or false otherwise. */
 	bool HasSignificantTimingChanges() const;
 
-	/**
-	 * @brief Determine if the Steps have any attacks.
-	 * @return true if it does, or false otherwise. */
-	bool HasAttacks() const;
-
 	const RString GetMusicPath() const; // Returns the path for loading.
 	const RString& GetMusicFile()
 	  const; // Returns the filename for the simfile.

diff --git a/src/Etterna/Singletons/SongManager.cpp b/src/Etterna/Singletons/SongManager.cpp
@@ -52,10 +52,8 @@ struct Group
 SongManager* SONGMAN =
   NULL; // global and accessible from anywhere in our program
 
-/** @brief The file that contains various random attacks. */
 const RString ADDITIONAL_SONGS_DIR = "/AdditionalSongs/";
 const RString EDIT_SUBDIR = "Edits/";
-const RString ATTACK_FILE = "/Data/RandomAttacks.txt";
 
 static const ThemeMetric<RageColor> EXTRA_COLOR("SongManager", "ExtraColor");
 static const ThemeMetric<int> EXTRA_COLOR_METER("SongManager",