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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-15 19:42:47 +00:00
parent c9091a1214
commit 6d64f3aa78
3 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BGAnimation.cpp
+6 -6
View File
@@ -13,10 +13,10 @@
#include "Foreach.h"
BGAnimation::BGAnimation( bool Generic )
BGAnimation::BGAnimation( bool bGeneric )
{
/* See BGAnimationLayer::BGAnimationLayer for explanation. */
m_bGeneric = Generic;
m_bGeneric = bGeneric;
}
BGAnimation::~BGAnimation()
@@ -50,7 +50,7 @@ static bool CompareLayerNames( const CString& s1, const CString& s2 )
return i1 < i2;
}
void AddLayersFromAniDir( const CString &_sAniDir, vector<Actor*> &layersAddTo, bool Generic )
void BGAnimation::AddLayersFromAniDir( const CString &_sAniDir, vector<Actor*> &layersAddTo )
{
if( _sAniDir.empty() )
return;
@@ -105,12 +105,12 @@ void AddLayersFromAniDir( const CString &_sAniDir, vector<Actor*> &layersAddTo,
// import a whole BGAnimation
sImportDir = sAniDir + sImportDir;
CollapsePath( sImportDir );
AddLayersFromAniDir( sImportDir, layersAddTo, Generic );
AddLayersFromAniDir( sImportDir, layersAddTo );
}
else
{
// import as a single layer
BGAnimationLayer* pLayer = new BGAnimationLayer( Generic );
BGAnimationLayer* pLayer = new BGAnimationLayer( m_bGeneric );
pLayer->LoadFromNode( sAniDir, *pKey );
layersAddTo.push_back( pLayer );
}
@@ -136,7 +136,7 @@ void BGAnimation::LoadFromAniDir( const CString &_sAniDir )
if( DoesFileExist(sPathToIni) )
{
// This is a new style BGAnimation (using .ini)
AddLayersFromAniDir( sAniDir, m_SubActors, m_bGeneric ); // TODO: Check for circular load
AddLayersFromAniDir( sAniDir, m_SubActors ); // TODO: Check for circular load
IniFile ini;
ini.ReadFile( sPathToIni );