actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use Actor for a dummy class, not Sprite

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-03 23:07:56 +00:00
parent 90f4a5a1d8
commit aee7281ab4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+2 -4
View File
@@ -1,7 +1,6 @@
#include "global.h" #include "global.h"
#include "ActorUtil.h" #include "ActorUtil.h"
#include "Sprite.h" #include "Sprite.h"
#include "BitmapText.h"
#include "Model.h" #include "Model.h"
#include "BGAnimation.h" #include "BGAnimation.h"
#include "ThemeManager.h" #include "ThemeManager.h"
@@ -10,7 +9,6 @@
#include "EnumHelper.h" #include "EnumHelper.h"
#include "XmlFile.h" #include "XmlFile.h"
#include "LuaManager.h" #include "LuaManager.h"
#include "MessageManager.h"
#include "Foreach.h" #include "Foreach.h"
#include "arch/Dialog/Dialog.h" #include "arch/Dialog/Dialog.h"
@@ -199,7 +197,7 @@ Actor* ActorUtil::LoadFromActorFile( const CString& sDir, const XNode* pNode )
CString sError = ssprintf( "An xml file in '%s' is missing the File attribute or has an invalid Class \"%s\"", CString sError = ssprintf( "An xml file in '%s' is missing the File attribute or has an invalid Class \"%s\"",
sDir.c_str(), sClass.c_str() ); sDir.c_str(), sClass.c_str() );
Dialog::OK( sError ); Dialog::OK( sError );
pReturn = new Sprite; // Return a dummy object so that we don't crash in AutoActor later. pReturn = new Actor; // Return a dummy object so that we don't crash in AutoActor later.
goto all_done; goto all_done;
} }
@@ -246,7 +244,7 @@ Actor* ActorUtil::MakeActor( const RageTextureID &ID )
if( !xml.LoadFromFile(ID.filename) ) if( !xml.LoadFromFile(ID.filename) )
{ {
// XNode will warn about the error // XNode will warn about the error
return new Sprite; return new Actor;
} }
CString sDir = Dirname( ID.filename ); CString sDir = Dirname( ID.filename );
return LoadFromActorFile( sDir, &xml ); return LoadFromActorFile( sDir, &xml );