From 8b21f7924f68c3be37b169097e3d898c96d2a09c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 3 Sep 2005 05:58:22 +0000 Subject: [PATCH] cleanup --- stepmania/src/ActorUtil.cpp | 5 ++--- stepmania/src/Background.h | 1 - stepmania/src/ScreenSelectMode.h | 3 +-- stepmania/src/Transition.h | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp index d30ff7f197..a70fe28aa0 100644 --- a/stepmania/src/ActorUtil.cpp +++ b/stepmania/src/ActorUtil.cpp @@ -256,16 +256,15 @@ Actor* ActorUtil::MakeActor( const RageTextureID &ID ) CString sDir = ID.filename; if( sDir.Right(1) != "/" ) sDir += '/'; - CString sIni = sDir + "BGAnimation.ini"; - CString sXml = sDir + "default.xml"; + CString sXml = sDir + "default.xml"; if( DoesFileExist(sXml) ) { XNode xml; if( !xml.LoadFromFile(sXml) ) { // XNode will warn about the error - return new Sprite; + return new Actor; } return LoadFromActorFile( sDir, &xml ); } diff --git a/stepmania/src/Background.h b/stepmania/src/Background.h index 221fa7520b..798df21ae9 100644 --- a/stepmania/src/Background.h +++ b/stepmania/src/Background.h @@ -5,7 +5,6 @@ #include "ActorFrame.h" #include "Quad.h" -#include "BGAnimation.h" #include "PlayerNumber.h" #include "BackgroundUtil.h" #include diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h index 3425fa881e..3acb272a55 100644 --- a/stepmania/src/ScreenSelectMode.h +++ b/stepmania/src/ScreenSelectMode.h @@ -5,7 +5,6 @@ /* Includes */ #include "ScreenSelect.h" -#include "BGAnimation.h" #include "Screen.h" #include "Sprite.h" #include "Quad.h" @@ -53,7 +52,7 @@ protected: Sprite m_CurChar[NUM_PLAYERS]; int m_iCurrentChar[NUM_PLAYERS]; Sprite m_Guide; - vector m_Backgrounds; +// vector m_Backgrounds; bool m_bSelected; bool m_b2DAvailable; bool m_bCharsAvailable; diff --git a/stepmania/src/Transition.h b/stepmania/src/Transition.h index 2dafa2d8d7..4394132cbc 100644 --- a/stepmania/src/Transition.h +++ b/stepmania/src/Transition.h @@ -1,4 +1,4 @@ -/* Transition - Transition that draws a BGAnimation. */ +/* Transition - Transition that draws an actor. */ #ifndef TRANSITION_H #define TRANSITION_H