cleanup
This commit is contained in:
@@ -256,16 +256,15 @@ Actor* ActorUtil::MakeActor( const RageTextureID &ID )
|
|||||||
CString sDir = ID.filename;
|
CString sDir = ID.filename;
|
||||||
if( sDir.Right(1) != "/" )
|
if( sDir.Right(1) != "/" )
|
||||||
sDir += '/';
|
sDir += '/';
|
||||||
CString sIni = sDir + "BGAnimation.ini";
|
|
||||||
CString sXml = sDir + "default.xml";
|
|
||||||
|
|
||||||
|
CString sXml = sDir + "default.xml";
|
||||||
if( DoesFileExist(sXml) )
|
if( DoesFileExist(sXml) )
|
||||||
{
|
{
|
||||||
XNode xml;
|
XNode xml;
|
||||||
if( !xml.LoadFromFile(sXml) )
|
if( !xml.LoadFromFile(sXml) )
|
||||||
{
|
{
|
||||||
// XNode will warn about the error
|
// XNode will warn about the error
|
||||||
return new Sprite;
|
return new Actor;
|
||||||
}
|
}
|
||||||
return LoadFromActorFile( sDir, &xml );
|
return LoadFromActorFile( sDir, &xml );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
#include "ActorFrame.h"
|
#include "ActorFrame.h"
|
||||||
#include "Quad.h"
|
#include "Quad.h"
|
||||||
#include "BGAnimation.h"
|
|
||||||
#include "PlayerNumber.h"
|
#include "PlayerNumber.h"
|
||||||
#include "BackgroundUtil.h"
|
#include "BackgroundUtil.h"
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
/* Includes */
|
/* Includes */
|
||||||
|
|
||||||
#include "ScreenSelect.h"
|
#include "ScreenSelect.h"
|
||||||
#include "BGAnimation.h"
|
|
||||||
#include "Screen.h"
|
#include "Screen.h"
|
||||||
#include "Sprite.h"
|
#include "Sprite.h"
|
||||||
#include "Quad.h"
|
#include "Quad.h"
|
||||||
@@ -53,7 +52,7 @@ protected:
|
|||||||
Sprite m_CurChar[NUM_PLAYERS];
|
Sprite m_CurChar[NUM_PLAYERS];
|
||||||
int m_iCurrentChar[NUM_PLAYERS];
|
int m_iCurrentChar[NUM_PLAYERS];
|
||||||
Sprite m_Guide;
|
Sprite m_Guide;
|
||||||
vector<BGAnimation*> m_Backgrounds;
|
// vector<BGAnimation*> m_Backgrounds;
|
||||||
bool m_bSelected;
|
bool m_bSelected;
|
||||||
bool m_b2DAvailable;
|
bool m_b2DAvailable;
|
||||||
bool m_bCharsAvailable;
|
bool m_bCharsAvailable;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* Transition - Transition that draws a BGAnimation. */
|
/* Transition - Transition that draws an actor. */
|
||||||
|
|
||||||
#ifndef TRANSITION_H
|
#ifndef TRANSITION_H
|
||||||
#define TRANSITION_H
|
#define TRANSITION_H
|
||||||
|
|||||||
Reference in New Issue
Block a user