This commit is contained in:
Glenn Maynard
2005-09-03 05:58:22 +00:00
parent f0090c2096
commit 8b21f7924f
4 changed files with 4 additions and 7 deletions
+2 -3
View File
@@ -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 );
}
-1
View File
@@ -5,7 +5,6 @@
#include "ActorFrame.h"
#include "Quad.h"
#include "BGAnimation.h"
#include "PlayerNumber.h"
#include "BackgroundUtil.h"
#include <deque>
+1 -2
View File
@@ -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<BGAnimation*> m_Backgrounds;
// vector<BGAnimation*> m_Backgrounds;
bool m_bSelected;
bool m_b2DAvailable;
bool m_bCharsAvailable;
+1 -1
View File
@@ -1,4 +1,4 @@
/* Transition - Transition that draws a BGAnimation. */
/* Transition - Transition that draws an actor. */
#ifndef TRANSITION_H
#define TRANSITION_H