Commit 2a4da6a5 authored by ipkiss's avatar ipkiss
Browse files

* skins2/parser/skin_parser.cpp: make sure the IDs are unique in the whole skin

parent 6d2df912
......@@ -78,7 +78,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
RequireDefault( "id" );
RequireDefault( "file" );
const BuilderData::IniFile iniFile( attr["id"],
const BuilderData::IniFile iniFile( uniqueId( attr["id"] ),
attr["file"] );
m_pData->m_listIniFile.push_back( iniFile );
}
......@@ -122,7 +122,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
CheckDefault( "nbframes", "1" );
CheckDefault( "fps", "4" );
const BuilderData::SubBitmap bitmap( attr["id"],
const BuilderData::SubBitmap bitmap( uniqueId( attr["id"] ),
m_curBitmapId, atoi( attr["x"] ), atoi( attr["y"] ),
atoi( attr["width"] ), atoi( attr["height"] ),
atoi( attr["nbframes"] ), atoi( attr["fps"] ) );
......@@ -135,7 +135,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
RequireDefault( "file" );
CheckDefault( "type", "digits" );
const BuilderData::BitmapFont font( attr["id"],
const BuilderData::BitmapFont font( uniqueId( attr["id"] ),
attr["file"], attr["type"] );
m_pData->m_listBitmapFont.push_back( font );
}
......
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