~ubuntu-branches/ubuntu/trusty/manaplus/trusty

« back to all changes in this revision

Viewing changes to src/gui/theme.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-10-07 10:26:14 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20131007102614-tg2zjdz8vmtl6n7i
Tags: 1.3.9.29-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
292
292
    }
293
293
    else
294
294
    {   // first use correct density images
295
 
        const std::string endStr = "_" + mScreenDensity + ".xml";
 
295
        const std::string endStr("_" + mScreenDensity + ".xml");
296
296
        std::string name = filename;
297
297
        if (findCutLast(name, ".xml"))
298
298
            skin = readSkin(name + endStr, full);
1254
1254
 
1255
1255
    ThemeInfo *info = new ThemeInfo();
1256
1256
 
1257
 
    const std::string fontSize2 = "fontSize_" + mScreenDensity;
1258
 
    const std::string npcfontSize2 = "npcfontSize_" + mScreenDensity;
 
1257
    const std::string fontSize2("fontSize_" + mScreenDensity);
 
1258
    const std::string npcfontSize2("npcfontSize_" + mScreenDensity);
1259
1259
    for_each_xml_child_node(infoNode, rootNode)
1260
1260
    {
1261
1261
        if (xmlNameEqual(infoNode, "name"))