Commit 1d023654 authored by Cyril Deguet's avatar Cyril Deguet

* attribute "nbFrames" of element Bitmap is now "nbframes", as said in the

 documentation (and the old name was inconsistent with other attribute names)
 Sorry for the compatibility break...
parent 50b01848
...@@ -91,13 +91,13 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -91,13 +91,13 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
RequireDefault( "id" ); RequireDefault( "id" );
RequireDefault( "file" ); RequireDefault( "file" );
RequireDefault( "alphacolor" ); RequireDefault( "alphacolor" );
CheckDefault( "nbFrames", "1" ); CheckDefault( "nbframes", "1" );
CheckDefault( "fps", "4" ); CheckDefault( "fps", "4" );
m_curBitmapId = uniqueId( attr["id"] ); m_curBitmapId = uniqueId( attr["id"] );
const BuilderData::Bitmap bitmap( m_curBitmapId, const BuilderData::Bitmap bitmap( m_curBitmapId,
attr["file"], convertColor( attr["alphacolor"] ), attr["file"], convertColor( attr["alphacolor"] ),
atoi( attr["nbFrames"] ), atoi( attr["fps"] ) ); atoi( attr["nbframes"] ), atoi( attr["fps"] ) );
m_pData->m_listBitmap.push_back( bitmap ); m_pData->m_listBitmap.push_back( bitmap );
} }
...@@ -108,13 +108,13 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr ) ...@@ -108,13 +108,13 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
RequireDefault( "y" ); RequireDefault( "y" );
RequireDefault( "width" ); RequireDefault( "width" );
RequireDefault( "height" ); RequireDefault( "height" );
CheckDefault( "nbFrames", "1" ); CheckDefault( "nbframes", "1" );
CheckDefault( "fps", "4" ); CheckDefault( "fps", "4" );
const BuilderData::SubBitmap bitmap( attr["id"], const BuilderData::SubBitmap bitmap( attr["id"],
m_curBitmapId, atoi( attr["x"] ), atoi( attr["y"] ), m_curBitmapId, atoi( attr["x"] ), atoi( attr["y"] ),
atoi( attr["width"] ), atoi( attr["height"] ), atoi( attr["width"] ), atoi( attr["height"] ),
atoi( attr["nbFrames"] ), atoi( attr["fps"] ) ); atoi( attr["nbframes"] ), atoi( attr["fps"] ) );
m_pData->m_listSubBitmap.push_back( bitmap ); m_pData->m_listSubBitmap.push_back( bitmap );
} }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
id CDATA #REQUIRED id CDATA #REQUIRED
file CDATA #REQUIRED file CDATA #REQUIRED
alphacolor CDATA #REQUIRED alphacolor CDATA #REQUIRED
nbFrames CDATA "1" nbframes CDATA "1"
fps CDATA "0" fps CDATA "0"
> >
<!ELEMENT SubBitmap EMPTY> <!ELEMENT SubBitmap EMPTY>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
y CDATA #REQUIRED y CDATA #REQUIRED
width CDATA #REQUIRED width CDATA #REQUIRED
height CDATA #REQUIRED height CDATA #REQUIRED
nbFrames CDATA "1" nbframes CDATA "1"
fps CDATA "0" fps CDATA "0"
> >
<!ELEMENT Font EMPTY> <!ELEMENT Font EMPTY>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment