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

unused param and code path

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-27 07:25:33 +00:00
parent 02a4226a90
commit 95e7657039
2 changed files with 6 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+5 -47
View File
@@ -160,43 +160,6 @@ Actor* ActorUtil::LoadFromNode( const XNode* pNode, Actor *pParentActor )
return pReturn; return pReturn;
} }
/*
* Merge commands from a parent into a child. For example,
*
* parent.xml: <Layer File="child" OnCommand="x,10" />
* child.xml: <Layer1 File="image" OffCommand="y,10" />
*
* results in:
*
* <Layer1 File="image" OnCommand="x,10" OffCommand="y,10" />
*
* Warn about duplicate commands.
*/
static void MergeActorXML( XNode *pChild, const XNode *pParent )
{
FOREACH_CONST_Child( pParent, p )
pChild->AppendChild( new XNode(*p) );
FOREACH_CONST_Attr( pParent, p )
{
const RString &sName = p->first;
if( !EndsWith(sName, "Command") )
continue;
if( pChild->GetAttr(p->first) != NULL )
{
RString sWarning =
ssprintf( "%s: overriding \"%s\" in %s node \"%s\"",
ActorUtil::GetWhere(pParent).c_str(),
sName.c_str(),
ActorUtil::GetWhere(pChild).c_str(),
pParent->GetName().c_str() );
Dialog::OK( sWarning, "XML_ATTRIB_OVERRIDE" );
}
pChild->AppendAttrFrom( p->first, p->second->Copy() );
}
}
namespace namespace
{ {
XNode *LoadXNodeFromLuaShowErrors( const RString &sFile ) XNode *LoadXNodeFromLuaShowErrors( const RString &sFile )
@@ -263,12 +226,8 @@ bool ActorUtil::LoadTableFromStackShowErrors( Lua *L )
* If pParent is non-NULL, it's the parent node when nesting XML, which is * If pParent is non-NULL, it's the parent node when nesting XML, which is
* used only by ActorUtil::LoadFromNode. * used only by ActorUtil::LoadFromNode.
*/ */
Actor* ActorUtil::MakeActor( const RString &sPath_, Actor *pParentActor, const XNode *pParent ) Actor* ActorUtil::MakeActor( const RString &sPath_, Actor *pParentActor )
{ {
static const XNode dummy;
if( pParent == NULL )
pParent = &dummy;
RString sPath( sPath_ ); RString sPath( sPath_ );
FileType ft = GetFileType( sPath ); FileType ft = GetFileType( sPath );
@@ -286,13 +245,12 @@ Actor* ActorUtil::MakeActor( const RString &sPath_, Actor *pParentActor, const X
return new Actor; return new Actor;
} }
MergeActorXML( pNode.get(), pParent );
Actor *pRet = ActorUtil::LoadFromNode( pNode.get(), pParentActor ); Actor *pRet = ActorUtil::LoadFromNode( pNode.get(), pParentActor );
return pRet; return pRet;
} }
case FT_Directory: case FT_Directory:
{ {
XNode xml( *pParent ); XNode xml;
xml.AppendAttr( "AniDir", sPath ); xml.AppendAttr( "AniDir", sPath );
return ActorUtil::Create( "BGAnimation", &xml, pParentActor ); return ActorUtil::Create( "BGAnimation", &xml, pParentActor );
@@ -300,14 +258,14 @@ Actor* ActorUtil::MakeActor( const RString &sPath_, Actor *pParentActor, const X
case FT_Bitmap: case FT_Bitmap:
case FT_Movie: case FT_Movie:
{ {
XNode xml( *pParent ); XNode xml;
xml.AppendAttr( "Texture", sPath ); xml.AppendAttr( "Texture", sPath );
return ActorUtil::Create( "Sprite", &xml, pParentActor ); return ActorUtil::Create( "Sprite", &xml, pParentActor );
} }
case FT_Model: case FT_Model:
{ {
XNode xml( *pParent ); XNode xml;
xml.AppendAttr( "Meshes", sPath ); xml.AppendAttr( "Meshes", sPath );
xml.AppendAttr( "Materials", sPath ); xml.AppendAttr( "Materials", sPath );
xml.AppendAttr( "Bones", sPath ); xml.AppendAttr( "Bones", sPath );
@@ -318,7 +276,7 @@ Actor* ActorUtil::MakeActor( const RString &sPath_, Actor *pParentActor, const X
{ {
LOG->Warn( "File \"%s\" has unknown type, \"%s\".", sPath.c_str(), FileTypeToString(ft).c_str() ); LOG->Warn( "File \"%s\" has unknown type, \"%s\".", sPath.c_str(), FileTypeToString(ft).c_str() );
XNode xml( *pParent ); XNode xml;
return ActorUtil::Create( "Actor", &xml, pParentActor ); return ActorUtil::Create( "Actor", &xml, pParentActor );
} }
} }
stepmania/src/ActorUtil.h
+1 -1
View File
@@ -104,7 +104,7 @@ namespace ActorUtil
// Return a Sprite, BitmapText, or Model depending on the file type // Return a Sprite, BitmapText, or Model depending on the file type
Actor* LoadFromNode( const XNode* pNode, Actor *pParentActor = NULL ); Actor* LoadFromNode( const XNode* pNode, Actor *pParentActor = NULL );
Actor* MakeActor( const RString &sPath, Actor *pParentActor = NULL, const XNode *pParent = NULL ); Actor* MakeActor( const RString &sPath, Actor *pParentActor = NULL );
RString GetSourcePath( const XNode *pNode ); RString GetSourcePath( const XNode *pNode );
RString GetWhere( const XNode *pNode ); RString GetWhere( const XNode *pNode );
bool GetAttrPath( const XNode *pNode, const RString &sName, RString &sOut ); bool GetAttrPath( const XNode *pNode, const RString &sName, RString &sOut );