diff options
Diffstat (limited to 'src/resources')
57 files changed, 184 insertions, 184 deletions
diff --git a/src/resources/animation/simpleanimation.cpp b/src/resources/animation/simpleanimation.cpp index 11ec9a01b..de9375489 100644 --- a/src/resources/animation/simpleanimation.cpp +++ b/src/resources/animation/simpleanimation.cpp @@ -67,7 +67,7 @@ SimpleAnimation::SimpleAnimation(XmlNodeConstPtr animationNode, SimpleAnimation::~SimpleAnimation() { - delete2(mAnimation); + delete2(mAnimation) if (mImageSet != nullptr) { mImageSet->decRef(); @@ -185,7 +185,7 @@ void SimpleAnimation::initializeAnimation(XmlNodeConstPtr animationNode, if (index < 0) { - reportAlways("No valid value for 'index'"); + reportAlways("No valid value for 'index'") continue; } @@ -193,7 +193,7 @@ void SimpleAnimation::initializeAnimation(XmlNodeConstPtr animationNode, if (img == nullptr) { - reportAlways("No image at index %d", index); + reportAlways("No image at index %d", index) continue; } @@ -207,7 +207,7 @@ void SimpleAnimation::initializeAnimation(XmlNodeConstPtr animationNode, if (start < 0 || end < 0) { - reportAlways("No valid value for 'start' or 'end'"); + reportAlways("No valid value for 'start' or 'end'") continue; } @@ -217,7 +217,7 @@ void SimpleAnimation::initializeAnimation(XmlNodeConstPtr animationNode, if (img == nullptr) { - reportAlways("No image at index %d", start); + reportAlways("No image at index %d", start) continue; } diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index 783e8b137..e1c847909 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -348,7 +348,7 @@ void AtlasManager::createSDLAtlas(TextureAtlas *const atlas) { reportAlways("Error creating surface for atlas. Size: %dx%d", width, - height); + height) BLOCK_END("AtlasManager::createSDLAtlas") return; } @@ -365,7 +365,7 @@ void AtlasManager::createSDLAtlas(TextureAtlas *const atlas) { reportAlways("Error converting surface to texture. Size: %dx%d", width, - height); + height) return; } diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index d7ffc2882..04c900538 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -215,8 +215,8 @@ void BeingInfo::addAttack(const int id, void BeingInfo::clear() { - delete2(unknown); - delete2(empty); + delete2(unknown) + delete2(empty) } void BeingInfo::init() diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp index 3bc8f8a2c..4502b93f8 100644 --- a/src/resources/db/avatardb.cpp +++ b/src/resources/db/avatardb.cpp @@ -50,7 +50,7 @@ void AvatarDB::load() logger->log1("Initializing avatar database..."); loadXmlFile(paths.getStringValue("avatarsFile"), SkipError_false); loadXmlFile(paths.getStringValue("avatarsPatchFile"), SkipError_true); - loadXmlDir("avatarsPatchDir", loadXmlFile); + loadXmlDir("avatarsPatchDir", loadXmlFile) } void AvatarDB::loadXmlFile(const std::string &fileName, diff --git a/src/resources/db/clandb.cpp b/src/resources/db/clandb.cpp index c613067e3..52959e4f9 100644 --- a/src/resources/db/clandb.cpp +++ b/src/resources/db/clandb.cpp @@ -50,7 +50,7 @@ void ClanDb::load() logger->log1("Initializing clans database..."); loadXmlFile(paths.getStringValue("clansFile"), SkipError_false); loadXmlFile(paths.getStringValue("clansPatchFile"), SkipError_true); - loadXmlDir("clansPatchDir", loadXmlFile); + loadXmlDir("clansPatchDir", loadXmlFile) mLoaded = true; } @@ -90,7 +90,7 @@ void ClanDb::loadXmlFile(const std::string &fileName, ClanInfo *clanInfo = nullptr; if (mClansInfos.find(id) != mClansInfos.end()) { - reportAlways("ClanDb: Redefinition of clan ID %d", id); + reportAlways("ClanDb: Redefinition of clan ID %d", id) clanInfo = mClansInfos[id]; } if (clanInfo == nullptr) @@ -130,7 +130,7 @@ const ClanInfo *ClanDb::get(const int clanId) { reportAlways("ClanDb: Warning, unknown clan ID " "%d requested", - clanId); + clanId) return nullptr; } } diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp index 236c4d934..401f67ed2 100644 --- a/src/resources/db/colordb.cpp +++ b/src/resources/db/colordb.cpp @@ -67,7 +67,7 @@ void ColorDB::load() SkipError_false); loadColorLists(paths.getStringValue("itemColorsPatchFile"), SkipError_true); - loadXmlDir("itemColorsPatchDir", loadColorLists); + loadXmlDir("itemColorsPatchDir", loadColorLists) it = mColorLists.find("hair"); if (it != mColorLists.end()) @@ -95,7 +95,7 @@ void ColorDB::loadHair(const std::string &fileName, return; } - reportAlways("Found legacy hair.xml"); + reportAlways("Found legacy hair.xml") for_each_xml_child_node(node, root) { if (xmlNameEqual(node, "include")) @@ -113,7 +113,7 @@ void ColorDB::loadHair(const std::string &fileName, if (colors.find(id) != colors.end()) { reportAlways("ColorDB: Redefinition of dye ID %d", - toInt(id, int)); + toInt(id, int)) } colors[id] = ItemColorData(id, XML::langProperty(node, "name", ""), @@ -194,7 +194,7 @@ std::string &ColorDB::getHairColorName(const ItemColor id) const ColorListsIterator it = mColorLists.find("hair"); if (it == mColorLists.end()) { - reportAlways("ColorDB: Error, hair colors list empty"); + reportAlways("ColorDB: Error, hair colors list empty") return mFail; } @@ -203,7 +203,7 @@ std::string &ColorDB::getHairColorName(const ItemColor id) if (i == (*it).second.end()) { reportAlways("ColorDB: Error, unknown dye ID# %d", - toInt(id, int)); + toInt(id, int)) return mFail; } return i->second.name; diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp index ab98e7402..8195205d9 100644 --- a/src/resources/db/commandsdb.cpp +++ b/src/resources/db/commandsdb.cpp @@ -45,7 +45,7 @@ void CommandsDB::load() SkipError_false); loadXmlFile(paths.getStringValue("defaultCommandsPatchFile"), SkipError_true); - loadXmlDir("defaultCommandsPatchDir", loadXmlFile); + loadXmlDir("defaultCommandsPatchDir", loadXmlFile) mLoaded = true; } diff --git a/src/resources/db/deaddb.cpp b/src/resources/db/deaddb.cpp index cd921d05a..11f681bb1 100644 --- a/src/resources/db/deaddb.cpp +++ b/src/resources/db/deaddb.cpp @@ -44,7 +44,7 @@ void DeadDB::load() loadXmlFile(paths.getStringValue("deadMessagesFile"), SkipError_false); loadXmlFile(paths.getStringValue("deadMessagesPatchFile"), SkipError_true); - loadXmlDir("deadMessagesPatchDir", loadXmlFile); + loadXmlDir("deadMessagesPatchDir", loadXmlFile) mLoaded = true; } diff --git a/src/resources/db/elementaldb.cpp b/src/resources/db/elementaldb.cpp index 4263c930c..a1c55ef67 100644 --- a/src/resources/db/elementaldb.cpp +++ b/src/resources/db/elementaldb.cpp @@ -46,7 +46,7 @@ void ElementalDb::load() logger->log1("Initializing elemental database..."); loadXmlFile(paths.getStringValue("elementalsFile"), SkipError_false); loadXmlFile(paths.getStringValue("elementalsPatchFile"), SkipError_true); - loadXmlDir("elementalsPatchDir", loadXmlFile); + loadXmlDir("elementalsPatchDir", loadXmlFile) mLoaded = true; } @@ -145,7 +145,7 @@ BeingInfo *ElementalDb::get(const BeingTypeId id) { reportAlways("ElementalDb: Warning, unknown elemental ID " "%d requested", - toInt(id, int)); + toInt(id, int)) return BeingInfo::unknown; } } diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp index 05808170a..65a1e0179 100644 --- a/src/resources/db/emotedb.cpp +++ b/src/resources/db/emotedb.cpp @@ -63,7 +63,7 @@ void EmoteDB::load() mLastEmote = 0; loadXmlFile(paths.getStringValue("emotesFile"), SkipError_false); loadXmlFile(paths.getStringValue("emotesPatchFile"), SkipError_true); - loadXmlDir("emotesPatchDir", loadXmlFile); + loadXmlDir("emotesPatchDir", loadXmlFile) loadSpecialXmlFile("graphics/sprites/manaplus_emotes.xml", SkipError_false); @@ -106,7 +106,7 @@ void EmoteDB::loadXmlFile(const std::string &fileName, if (id == -1) { reportAlways("Emote Database: Emote with missing ID in %s!", - paths.getStringValue("emotesFile").c_str()); + paths.getStringValue("emotesFile").c_str()) continue; } EmoteInfo *currentInfo = nullptr; @@ -179,7 +179,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName, if (id == -1) { reportAlways("Emote Database: Emote with missing ID in " - "manaplus_emotes.xml!"); + "manaplus_emotes.xml!") continue; } const int altId = XML::getProperty(emoteNode, "altid", -1); @@ -263,7 +263,7 @@ const EmoteInfo *EmoteDB::get(const int id, const bool allowNull) if (allowNull) return nullptr; reportAlways("EmoteDB: Warning, unknown emote ID %d requested", - id); + id) return &mUnknown; } return i->second; @@ -282,7 +282,7 @@ const EmoteInfo *EmoteDB::get2(int id, const bool allowNull) if (allowNull) return nullptr; reportAlways("EmoteDB: Warning, unknown emote ID %d requested", - id); + id) return &mUnknown; } return i->second; diff --git a/src/resources/db/groupdb.cpp b/src/resources/db/groupdb.cpp index ea7ad0853..62db6c684 100644 --- a/src/resources/db/groupdb.cpp +++ b/src/resources/db/groupdb.cpp @@ -51,7 +51,7 @@ void GroupDb::load() loadXmlFile(paths.getStringValue("groupsFile"), SkipError_false); loadXmlFile(paths.getStringValue("groupsPatchFile"), SkipError_true); - loadXmlDir("groupsPatchDir", loadXmlFile); + loadXmlDir("groupsPatchDir", loadXmlFile) mLoaded = true; } @@ -75,7 +75,7 @@ static ServerCommandTypeT parseCommand(const std::string &str, { reportAlways("GroupsDb: unknown command name: '%s' in group id '%d'.", str.c_str(), - id); + id) } return ServerCommandType::Max; @@ -103,7 +103,7 @@ static ServerPermissionTypeT parsePermission(const std::string &str, reportAlways("GroupsDb: unknown permission name: " "'%s' in group id '%d'.", str.c_str(), - id); + id) } return ServerPermissionType::Max; @@ -137,7 +137,7 @@ static ServerCommandEnable::Type parseUseFlag(const std::string &str, reportAlways("GroupsDb: unknown use flag: '%s' in group id '%d'." "Possible values 'self', 'other', 'both'.", str.c_str(), - id); + id) return ServerCommandEnable::No; } } @@ -234,7 +234,7 @@ static void parseInherit(XmlNodePtr groupNode, { reportAlways("Unknown inherit group id '%d' in group '%d'", id2, - id); + id) continue; } GroupInfo *const groupInfo2 = (*it2).second; @@ -271,7 +271,7 @@ void GroupDb::loadXmlFile(const std::string &fileName, else { reportAlways("GroupsDb: Error while loading %s!", - fileName.c_str()); + fileName.c_str()) } return; } @@ -292,7 +292,7 @@ void GroupDb::loadXmlFile(const std::string &fileName, -1); if (id < 0) { - reportAlways("Empty id field in GroupDb"); + reportAlways("Empty id field in GroupDb") continue; } GroupInfosIter it = mGroups.find(id); @@ -300,7 +300,7 @@ void GroupDb::loadXmlFile(const std::string &fileName, if (it != mGroups.end()) { reportAlways("GroupDb: group with id %d already added", - id); + id) group = (*it).second; } else @@ -345,7 +345,7 @@ const std::string &GroupDb::getName(const int id) GroupInfos::const_iterator it = mGroups.find(id); if (it == mGroups.end()) { - reportAlways("Unknown group id requested: %d", id); + reportAlways("Unknown group id requested: %d", id) return mEmptyGroup.name; } return (*it).second->name; @@ -356,7 +356,7 @@ const std::string &GroupDb::getLongName(const int id) GroupInfos::const_iterator it = mGroups.find(id); if (it == mGroups.end()) { - reportAlways("Unknown group id requested: %d", id); + reportAlways("Unknown group id requested: %d", id) return mEmptyGroup.longName; } return (*it).second->longName; @@ -367,7 +367,7 @@ bool GroupDb::getShowBadge(const int id) GroupInfos::const_iterator it = mGroups.find(id); if (it == mGroups.end()) { - reportAlways("Unknown group id requested: %d", id); + reportAlways("Unknown group id requested: %d", id) return mEmptyGroup.showBadge; } return (*it).second->showBadge; @@ -378,7 +378,7 @@ bool GroupDb::getHighlightName(const int id) GroupInfos::const_iterator it = mGroups.find(id); if (it == mGroups.end()) { - reportAlways("Unknown group id requested: %d", id); + reportAlways("Unknown group id requested: %d", id) return mEmptyGroup.highlightName; } return (*it).second->highlightName; @@ -389,7 +389,7 @@ const std::string &GroupDb::getBadge(const int id) GroupInfos::const_iterator it = mGroups.find(id); if (it == mGroups.end()) { - reportAlways("Unknown group id requested: %d", id); + reportAlways("Unknown group id requested: %d", id) return mEmptyGroup.badge; } return (*it).second->badge; @@ -400,7 +400,7 @@ const GroupInfo *GroupDb::getGroup(const int id) GroupInfos::const_iterator it = mGroups.find(id); if (it == mGroups.end()) { - reportAlways("Unknown group id requested: %d", id); + reportAlways("Unknown group id requested: %d", id) return &mEmptyGroup; } return (*it).second; diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp index 0d45a3864..1bbec6815 100644 --- a/src/resources/db/homunculusdb.cpp +++ b/src/resources/db/homunculusdb.cpp @@ -47,7 +47,7 @@ void HomunculusDB::load() logger->log1("Initializing homunculus database..."); loadXmlFile(paths.getStringValue("homunculusesFile"), SkipError_false); loadXmlFile(paths.getStringValue("homunculusesPatchFile"), SkipError_true); - loadXmlDir("homunculusesPatchDir", loadXmlFile); + loadXmlDir("homunculusesPatchDir", loadXmlFile) mLoaded = true; } @@ -151,7 +151,7 @@ BeingInfo *HomunculusDB::get(const BeingTypeId id) { reportAlways("HomunculusDB: Warning, unknown homunculus ID " "%d requested", - toInt(id, int)); + toInt(id, int)) return BeingInfo::unknown; } } diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp index 56d646eba..f7d2b0173 100644 --- a/src/resources/db/horsedb.cpp +++ b/src/resources/db/horsedb.cpp @@ -77,7 +77,7 @@ void HorseDB::load() loadXmlFile(paths.getStringValue("horsesFile"), SkipError_false); loadXmlFile(paths.getStringValue("horsesPatchFile"), SkipError_true); - loadXmlDir("horsesPatchDir", loadXmlFile); + loadXmlDir("horsesPatchDir", loadXmlFile) mLoaded = true; } @@ -135,7 +135,7 @@ static void loadRiderOffset(XmlNodePtrConst node, if (dir == -1) { reportAlways("Wrong or missing horse rider direcion: %s", - dirName.c_str()); + dirName.c_str()) return; } HorseOffset &offset = currentInfo->offsets[dir]; @@ -180,7 +180,7 @@ void HorseDB::loadXmlFile(const std::string &fileName, if (id == -1) { reportAlways("Horse Database: Horse with missing ID in %s!", - paths.getStringValue("horsesFile").c_str()); + paths.getStringValue("horsesFile").c_str()) continue; } HorseInfo *currentInfo = nullptr; @@ -214,7 +214,7 @@ static void loadOffset(XmlNodePtrConst node, if (dir == -1) { reportAlways("Wrong or missing horse direcion: %s", - dirName.c_str()); + dirName.c_str()) return; } HorseOffset &offset = currentInfo->offsets[dir]; @@ -290,7 +290,7 @@ HorseInfo *HorseDB::get(const int id, const bool allowNull) if (allowNull) return nullptr; reportAlways("HorseDB: Warning, unknown horse ID %d requested", - id); + id) return &mUnknown; } return i->second; diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 78ac033a6..5fbc16a79 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -304,7 +304,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, if (id == 0) { reportAlways("ItemDB: Invalid or missing item ID in %s!", - fileName.c_str()); + fileName.c_str()) continue; } else if (mItemInfos.find(id) != mItemInfos.end()) @@ -403,7 +403,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, { reportAlways("Inherit item %d from not existing item %d", id, - inherit); + inherit) } } @@ -682,7 +682,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, if (attackRange == 0) { reportAlways("ItemDB: Missing attack range from weapon %i!", - id); + id) } } @@ -760,7 +760,7 @@ void ItemDB::unload() { logger->log1("Unloading item database..."); - delete2(mUnknown); + delete2(mUnknown) delete_all(mItemInfos); mItemInfos.clear(); @@ -798,7 +798,7 @@ const ItemInfo &ItemDB::get(const int id) if (i == mItemInfos.end()) { - reportAlways("ItemDB: Warning, unknown item ID# %d", id); + reportAlways("ItemDB: Warning, unknown item ID# %d", id) return *mUnknown; } @@ -818,7 +818,7 @@ const ItemInfo &ItemDB::get(const std::string &name) if (!name.empty()) { reportAlways("ItemDB: Warning, unknown item name \"%s\"", - name.c_str()); + name.c_str()) } return *mUnknown; } @@ -1000,7 +1000,7 @@ static void loadSoundRef(ItemInfo *const itemInfo, XmlNodeConstPtr node) else { reportAlways("ItemDB: Ignoring unknown sound event '%s'", - event.c_str()); + event.c_str()) } } diff --git a/src/resources/db/itemfielddb.cpp b/src/resources/db/itemfielddb.cpp index 76ad26036..ef289a1b4 100644 --- a/src/resources/db/itemfielddb.cpp +++ b/src/resources/db/itemfielddb.cpp @@ -47,7 +47,7 @@ void ItemFieldDb::load() loadXmlFile(paths.getStringValue("itemFieldsFile"), SkipError_false); loadXmlFile(paths.getStringValue("itemFieldsPatchFile"), SkipError_true); - loadXmlDir("itemFieldsPatchDir", loadXmlFile); + loadXmlDir("itemFieldsPatchDir", loadXmlFile) mLoaded = true; } @@ -65,7 +65,7 @@ static void loadFields(XmlNodeConstPtr groupNode, ""); if (name.empty()) { - reportAlways("Empty name field in ItemFieldDb"); + reportAlways("Empty name field in ItemFieldDb") continue; } const std::string description = XML::langProperty(node, @@ -73,7 +73,7 @@ static void loadFields(XmlNodeConstPtr groupNode, ""); if (description.empty()) { - reportAlways("Empty description field in ItemFieldDb"); + reportAlways("Empty description field in ItemFieldDb") continue; } const bool sign = XML::getBoolProperty(node, @@ -83,14 +83,14 @@ static void loadFields(XmlNodeConstPtr groupNode, { reportAlways( "Same field name detected in requeted and add groups: %s", - name.c_str()); + name.c_str()) continue; } if (fields1.find(name) != fields1.end()) { reportAlways( "Same field name detected: %s", - name.c_str()); + name.c_str()) continue; } fields1[name] = new ItemFieldType(name, diff --git a/src/resources/db/itemoptiondb.cpp b/src/resources/db/itemoptiondb.cpp index e983cd801..e66019a3d 100644 --- a/src/resources/db/itemoptiondb.cpp +++ b/src/resources/db/itemoptiondb.cpp @@ -45,7 +45,7 @@ void ItemOptionDb::load() logger->log1("Initializing item options database..."); loadXmlFile(paths.getStringValue("itemOptionsFile"), SkipError_false); loadXmlFile(paths.getStringValue("itemOptionsPatchFile"), SkipError_true); - loadXmlDir("itemOptionsPatchDir", loadXmlFile); + loadXmlDir("itemOptionsPatchDir", loadXmlFile) mLoaded = true; } @@ -99,7 +99,7 @@ void ItemOptionDb::loadXmlFile(const std::string &fileName, else { reportAlways("ItemFieldDb: Error while loading %s!", - fileName.c_str()); + fileName.c_str()) } return; } @@ -125,7 +125,7 @@ void ItemOptionDb::loadXmlFile(const std::string &fileName, 0); if (id <= 0) { - reportAlways("Empty id field in ItemOptionDb"); + reportAlways("Empty id field in ItemOptionDb") continue; } STD_VECTOR<ItemFieldType*> &options = mOptions[id]; diff --git a/src/resources/db/languagedb.cpp b/src/resources/db/languagedb.cpp index 92ae888de..5f162223a 100644 --- a/src/resources/db/languagedb.cpp +++ b/src/resources/db/languagedb.cpp @@ -42,7 +42,7 @@ void LanguageDb::load() logger->log1("Initializing languages database..."); loadXmlFile(paths.getStringValue("languagesFile"), SkipError_false); loadXmlFile(paths.getStringValue("languagesPatchFile"), SkipError_true); - loadXmlDir("languagesPatchDir", loadXmlFile); + loadXmlDir("languagesPatchDir", loadXmlFile) } void LanguageDb::loadXmlFile(const std::string &fileName, @@ -73,14 +73,14 @@ void LanguageDb::loadXmlFile(const std::string &fileName, const int id = XML::getProperty(node, "id", -1); if (id < 0) { - reportAlways("Missing lang id"); + reportAlways("Missing lang id") continue; } const std::string icon = XML::getProperty(node, "icon", ""); const std::string po = XML::getProperty(node, "po", ""); if (icon.empty()) { - reportAlways("LanguageDb: empty icon field"); + reportAlways("LanguageDb: empty icon field") } else { @@ -88,7 +88,7 @@ void LanguageDb::loadXmlFile(const std::string &fileName, } if (po.empty()) { - reportAlways("LanguageDb: empty po field"); + reportAlways("LanguageDb: empty po field") } else { diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp index 971fa4578..818c50a9d 100644 --- a/src/resources/db/mapdb.cpp +++ b/src/resources/db/mapdb.cpp @@ -53,11 +53,11 @@ void MapDB::load() SkipError_true); loadRemapXmlFile(paths.getStringValue("mapsRemapPatchFile"), SkipError_true); - loadXmlDir("mapsRemapPatchDir", loadRemapXmlFile); + loadXmlDir("mapsRemapPatchDir", loadRemapXmlFile) loadInfo(paths.getStringValue("mapsFile"), SkipError_false); loadInfo(paths.getStringValue("mapsPatchFile"), SkipError_true); - loadXmlDir("mapsPatchDir", loadInfo); + loadXmlDir("mapsPatchDir", loadInfo) mLoaded = true; } diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index 72e6b3837..97ce1d014 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -47,7 +47,7 @@ void MercenaryDB::load() logger->log1("Initializing mercenary database..."); loadXmlFile(paths.getStringValue("mercenariesFile"), SkipError_false); loadXmlFile(paths.getStringValue("mercenariesPatchFile"), SkipError_true); - loadXmlDir("mercenariesPatchDir", loadXmlFile); + loadXmlDir("mercenariesPatchDir", loadXmlFile) mLoaded = true; } @@ -149,7 +149,7 @@ BeingInfo *MercenaryDB::get(const BeingTypeId id) { reportAlways("MercenaryDB: Warning, unknown mercenary ID " "%d requested", - toInt(id, int)); + toInt(id, int)) return BeingInfo::unknown; } } diff --git a/src/resources/db/moddb.cpp b/src/resources/db/moddb.cpp index 7e80fc393..b32264df7 100644 --- a/src/resources/db/moddb.cpp +++ b/src/resources/db/moddb.cpp @@ -45,7 +45,7 @@ void ModDB::load() logger->log1("Initializing mod database..."); loadXmlFile(paths.getStringValue("modsFile"), SkipError_false); loadXmlFile(paths.getStringValue("modsPatchFile"), SkipError_true); - loadXmlDir("modsPatchDir", loadXmlFile); + loadXmlDir("modsPatchDir", loadXmlFile) mLoaded = true; } diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index 68bc40703..3141c1cf5 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -51,7 +51,7 @@ void MonsterDB::load() logger->log1("Initializing monster database..."); loadXmlFile(paths.getStringValue("monstersFile"), SkipError_false); loadXmlFile(paths.getStringValue("monstersPatchFile"), SkipError_true); - loadXmlDir("monstersPatchDir", loadXmlFile); + loadXmlDir("monstersPatchDir", loadXmlFile) mLoaded = true; } @@ -152,7 +152,7 @@ BeingInfo *MonsterDB::get(const BeingTypeId id) if (i == mMonsterInfos.end()) { reportAlways("MonsterDB: Warning, unknown monster ID %d requested", - toInt(id, int)); + toInt(id, int)) return BeingInfo::unknown; } } diff --git a/src/resources/db/networkdb.cpp b/src/resources/db/networkdb.cpp index f44e94d75..3caebbc8a 100644 --- a/src/resources/db/networkdb.cpp +++ b/src/resources/db/networkdb.cpp @@ -44,7 +44,7 @@ void NetworkDb::load() logger->log1("Initializing network database..."); loadXmlFile(paths.getStringValue("networkFile"), SkipError_false); loadXmlFile(paths.getStringValue("networkPatchFile"), SkipError_true); - loadXmlDir("networkPatchDir", loadXmlFile); + loadXmlDir("networkPatchDir", loadXmlFile) mLoaded = true; } diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp index 3f858ccc3..a647522d1 100644 --- a/src/resources/db/npcdb.cpp +++ b/src/resources/db/npcdb.cpp @@ -53,7 +53,7 @@ void NPCDB::load() loadXmlFile(paths.getStringValue("npcsFile"), SkipError_false); loadXmlFile(paths.getStringValue("npcsPatchFile"), SkipError_true); - loadXmlDir("npcsPatchDir", loadXmlFile); + loadXmlDir("npcsPatchDir", loadXmlFile) mLoaded = true; } @@ -92,7 +92,7 @@ void NPCDB::loadXmlFile(const std::string &fileName, if (id == BeingTypeId_zero) { reportAlways("NPC Database: NPC with missing ID in %s!", - paths.getStringValue("npcsFile").c_str()); + paths.getStringValue("npcsFile").c_str()) continue; } else if (mNPCInfos.find(id) != mNPCInfos.end()) @@ -127,7 +127,7 @@ void NPCDB::loadXmlFile(const std::string &fileName, { reportAlways("Not found currency '%s' for npc %d", currency.c_str(), - CAST_S32(id)); + CAST_S32(id)) } currentInfo->setCurrency(currency); @@ -191,7 +191,7 @@ BeingInfo *NPCDB::get(const BeingTypeId id) if (i == mNPCInfos.end()) { reportAlways("NPCDB: Warning, unknown NPC ID %d requested", - toInt(id, int)); + toInt(id, int)) return BeingInfo::unknown; } return i->second; diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp index e2ec324ed..104884904 100644 --- a/src/resources/db/npcdialogdb.cpp +++ b/src/resources/db/npcdialogdb.cpp @@ -44,7 +44,7 @@ void NpcDialogDB::load() logger->log1("Loading npc dialog database..."); loadXmlFile(paths.getStringValue("npcDialogsFile"), SkipError_false); loadXmlFile(paths.getStringValue("npcDialogsPatchFile"), SkipError_true); - loadXmlDir("npcDialogsPatchDir", loadXmlFile); + loadXmlDir("npcDialogsPatchDir", loadXmlFile) mLoaded = true; } @@ -74,7 +74,7 @@ static void loadNpcDialogMenu(NpcDialogInfo *const dialog, button->image = XML::getProperty(childNode, "image", ""); if (button->name.empty() && button->image.empty()) { - reportAlways("Error: npc button without name or image"); + reportAlways("Error: npc button without name or image") delete button; continue; } @@ -89,7 +89,7 @@ static void loadNpcDialogMenu(NpcDialogInfo *const dialog, const std::string image = XML::getProperty(childNode, "image", ""); if (image.empty()) { - reportAlways("Error: no image attribute found in image tag."); + reportAlways("Error: no image attribute found in image tag.") continue; } NpcImageInfo *const imageInfo = new NpcImageInfo; @@ -105,7 +105,7 @@ static void loadNpcDialogMenu(NpcDialogInfo *const dialog, const std::string text = XML::getProperty(childNode, "text", ""); if (text.empty()) { - reportAlways("Error: no text attribute found in text tag."); + reportAlways("Error: no text attribute found in text tag.") continue; } NpcTextInfo *const textInfo = new NpcTextInfo; diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp index 987f20389..fd61f20f5 100644 --- a/src/resources/db/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -60,7 +60,7 @@ void PaletteDB::loadPalette() } if (*it != "GIMP Palette") { - reportAlways("wrong GIMP palette file"); + reportAlways("wrong GIMP palette file") return; } ++ it; diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp index c01e80d42..f1570ed08 100644 --- a/src/resources/db/petdb.cpp +++ b/src/resources/db/petdb.cpp @@ -49,7 +49,7 @@ void PETDB::load() logger->log1("Initializing PET database..."); loadXmlFile(paths.getStringValue("petsFile"), SkipError_false); loadXmlFile(paths.getStringValue("petsPatchFile"), SkipError_true); - loadXmlDir("petsPatchDir", loadXmlFile); + loadXmlDir("petsPatchDir", loadXmlFile) mLoaded = true; } @@ -88,7 +88,7 @@ void PETDB::loadXmlFile(const std::string &fileName, if (id == BeingTypeId_negOne) { reportAlways("PET Database: PET with missing ID in %s!", - paths.getStringValue("petsFile").c_str()); + paths.getStringValue("petsFile").c_str()) continue; } @@ -160,7 +160,7 @@ BeingInfo *PETDB::get(const BeingTypeId id) if (i == mPETInfos.end()) { reportAlways("PETDB: Warning, unknown PET ID %d requested", - toInt(id, int)); + toInt(id, int)) return BeingInfo::unknown; } return i->second; diff --git a/src/resources/db/questdb.cpp b/src/resources/db/questdb.cpp index 03d9bc31a..65d29f586 100644 --- a/src/resources/db/questdb.cpp +++ b/src/resources/db/questdb.cpp @@ -49,7 +49,7 @@ void QuestDb::load() logger->log1("Initializing quest database..."); loadXmlFile(paths.getStringValue("questsFile"), SkipError_false); loadXmlFile(paths.getStringValue("questsPatchFile"), SkipError_true); - loadXmlDir("questsPatchDir", loadXmlFile); + loadXmlDir("questsPatchDir", loadXmlFile) } static void loadQuest(const int var, diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp index db7e3b2ed..130d40683 100644 --- a/src/resources/db/skillunitdb.cpp +++ b/src/resources/db/skillunitdb.cpp @@ -49,7 +49,7 @@ void SkillUnitDb::load() logger->log1("Initializing skill unit database..."); loadXmlFile(paths.getStringValue("skillUnitsFile"), SkipError_false); loadXmlFile(paths.getStringValue("skillUnitsPatchFile"), SkipError_true); - loadXmlDir("skillUnitsPatchDir", loadXmlFile); + loadXmlDir("skillUnitsPatchDir", loadXmlFile) mLoaded = true; } @@ -87,7 +87,7 @@ void SkillUnitDb::loadXmlFile(const std::string &fileName, if (id == BeingTypeId_negOne) { reportAlways("SkillUnitDb: skill unit with missing ID in %s!", - paths.getStringValue("skillUnitsFile").c_str()); + paths.getStringValue("skillUnitsFile").c_str()) continue; } @@ -154,7 +154,7 @@ BeingInfo *SkillUnitDb::get(const BeingTypeId id) { reportAlways("SkillUnitDb: Warning, unknown skill unit id " "%d requested", - toInt(id, int)); + toInt(id, int)) return BeingInfo::unknown; } return i->second; diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp index 781f8915d..61149eb4e 100644 --- a/src/resources/db/sounddb.cpp +++ b/src/resources/db/sounddb.cpp @@ -42,7 +42,7 @@ void SoundDB::load() logger->log1("Initializing sound database..."); loadXmlFile(paths.getStringValue("soundsFile"), SkipError_false); loadXmlFile(paths.getStringValue("soundsPatchFile"), SkipError_true); - loadXmlDir("soundsPatchDir", loadXmlFile); + loadXmlDir("soundsPatchDir", loadXmlFile) } void SoundDB::loadXmlFile(const std::string &fileName, diff --git a/src/resources/db/statdb.cpp b/src/resources/db/statdb.cpp index 2757c0085..88300203f 100644 --- a/src/resources/db/statdb.cpp +++ b/src/resources/db/statdb.cpp @@ -92,7 +92,7 @@ void StatDb::load() loadXmlFile(paths.getStringValue("statFile"), SkipError_false); loadXmlFile(paths.getStringValue("statPatchFile"), SkipError_true); - loadXmlDir("statPatchDir", loadXmlFile); + loadXmlDir("statPatchDir", loadXmlFile) mLoaded = true; } @@ -112,7 +112,7 @@ static void loadBasicStats(XmlNodeConstPtr rootNode) { reportAlways("Wrong attr or id for basic " "stat with name %s", - name.c_str()); + name.c_str()) continue; } const std::string tag = XML::getProperty(node, "tag", ""); @@ -150,7 +150,7 @@ static void loadStats(XmlNodeConstPtr rootNode, { reportAlways("Wrong attr or id for extended " "stat with name %s", - name.c_str()); + name.c_str()) continue; } stats.push_back(BasicStat(static_cast<AttributesT>(id), @@ -207,7 +207,7 @@ void StatDb::loadXmlFile(const std::string &fileName, std::string page = XML::langProperty(node, "name", ""); if (page.empty()) { - reportAlways("Page without name in stats.xml"); + reportAlways("Page without name in stats.xml") page = "Unknown"; } loadStats(node, page); @@ -218,7 +218,7 @@ void StatDb::loadXmlFile(const std::string &fileName, if (mBasicStats.empty() && mStats.empty()) { - reportAlways("StatDb: no stats found"); + reportAlways("StatDb: no stats found") addDefaultStats(); } } diff --git a/src/resources/db/statuseffectdb.cpp b/src/resources/db/statuseffectdb.cpp index 9bc5e4e95..0eb7c27a6 100644 --- a/src/resources/db/statuseffectdb.cpp +++ b/src/resources/db/statuseffectdb.cpp @@ -52,7 +52,7 @@ StatusEffect *StatusEffectDB::getStatusEffect(const int index, if (it != effects.end()) return (*it).second; reportAlways("Missing status effect: %d", - index); + index) return nullptr; } @@ -66,7 +66,7 @@ void StatusEffectDB::load() loadXmlFile(paths.getStringValue("statusEffectsFile"), SkipError_false); loadXmlFile(paths.getStringValue("statusEffectsPatchFile"), SkipError_true); - loadXmlDir("statusEffectsPatchDir", loadXmlFile); + loadXmlDir("statusEffectsPatchDir", loadXmlFile) mLoaded = true; } diff --git a/src/resources/db/textdb.cpp b/src/resources/db/textdb.cpp index b6a902382..7304ac249 100644 --- a/src/resources/db/textdb.cpp +++ b/src/resources/db/textdb.cpp @@ -39,7 +39,7 @@ void TextDb::load() logger->log1("Initializing text database..."); loadXmlFile(paths.getStringValue("textsFile"), SkipError_false); loadXmlFile(paths.getStringValue("textsPatchFile"), SkipError_true); - loadXmlDir("textsPatchDir", loadXmlFile); + loadXmlDir("textsPatchDir", loadXmlFile) } void TextDb::loadXmlFile(const std::string &fileName, diff --git a/src/resources/db/unitsdb.cpp b/src/resources/db/unitsdb.cpp index b56be8fec..c9514b640 100644 --- a/src/resources/db/unitsdb.cpp +++ b/src/resources/db/unitsdb.cpp @@ -113,7 +113,7 @@ void UnitsDb::load() loadXmlFile(paths.getStringValue("unitsFile"), SkipError_false); loadXmlFile(paths.getStringValue("unitsPatchFile"), SkipError_true); - loadXmlDir("unitsPatchDir", loadXmlFile); + loadXmlDir("unitsPatchDir", loadXmlFile) } void UnitsDb::unload() @@ -186,7 +186,7 @@ static void loadCurrencies(XmlNodePtr parentNode) const std::string name = XML::getProperty(node, "name", ""); if (name.empty()) { - reportAlways("Error: unknown currency name."); + reportAlways("Error: unknown currency name.") continue; } mCurrencies[name] = loadUnit(node); diff --git a/src/resources/inventory/inventory.cpp b/src/resources/inventory/inventory.cpp index d013ef3f6..529a1b0b5 100644 --- a/src/resources/inventory/inventory.cpp +++ b/src/resources/inventory/inventory.cpp @@ -152,7 +152,7 @@ void Inventory::setItem(const int index, if (index < 0 || index >= CAST_S32(mSize)) { reportAlways("Warning: invalid inventory index: %d", - index); + index) return; } @@ -197,7 +197,7 @@ void Inventory::setCards(const int index, if (index < 0 || index >= CAST_S32(mSize)) { reportAlways("Warning: invalid inventory index: %d", - index); + index) return; } @@ -212,7 +212,7 @@ void Inventory::setOptions(const int index, if (index < 0 || index >= CAST_S32(mSize)) { reportAlways("Warning: invalid inventory index: %d", - index); + index) return; } Item *const item1 = mItems[index]; @@ -226,7 +226,7 @@ void Inventory::setTag(const int index, if (index < 0 || index >= CAST_S32(mSize)) { reportAlways("Warning: invalid inventory index: %d", - index); + index) return; } Item *const item1 = mItems[index]; @@ -254,7 +254,7 @@ void Inventory::removeItemAt(const int index) { if (mItems[index] == nullptr) return; - delete2(mItems[index]); + delete2(mItems[index]) mUsed--; if (mUsed < 0) // Already at 0, no need to distribute event mUsed = 0; diff --git a/src/resources/item/item.cpp b/src/resources/item/item.cpp index fb7290721..ff59fcd19 100644 --- a/src/resources/item/item.cpp +++ b/src/resources/item/item.cpp @@ -83,7 +83,7 @@ Item::~Item() mImage->decRef(); mImage = nullptr; } - delete2(mOptions); + delete2(mOptions) dragDrop.clearItem(this); } @@ -187,7 +187,7 @@ void Item::addCard(const int card) void Item::setOptions(const ItemOptionsList *const options) { - delete2(mOptions); + delete2(mOptions) mOptions = ItemOptionsList::copy(options); } diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index a1bd98bdb..1d2f8cfda 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -420,7 +420,7 @@ std::string ItemInfo::getColorName(const ItemColor idx) const { reportAlways("Color %d for palette %s not found", CAST_S32(idx), - mColorsListName.c_str()); + mColorsListName.c_str()) return std::string(); } return it->second.name; @@ -437,7 +437,7 @@ std::string ItemInfo::getColor(const ItemColor idx) const { reportAlways("Color %d for palette %s not found", CAST_S32(idx), - mColorsListName.c_str()); + mColorsListName.c_str()) return std::string(); } return it->second.color; @@ -454,7 +454,7 @@ std::string ItemInfo::getIconColorName(const ItemColor idx) const { reportAlways("Color %d for palette %s not found", CAST_S32(idx), - mColorsListName.c_str()); + mColorsListName.c_str()) return std::string(); } return it->second.name; @@ -471,7 +471,7 @@ std::string ItemInfo::getIconColor(const ItemColor idx) const { reportAlways("Color %d for palette %s not found", CAST_S32(idx), - mColorsListName.c_str()); + mColorsListName.c_str()) return std::string(); } return it->second.color; diff --git a/src/resources/loaders/atlasloader.cpp b/src/resources/loaders/atlasloader.cpp index aa2585b27..fd435e57f 100644 --- a/src/resources/loaders/atlasloader.cpp +++ b/src/resources/loaders/atlasloader.cpp @@ -47,7 +47,7 @@ struct AtlasLoader final AtlasResource *const resource = AtlasManager::loadTextureAtlas( rl->name, *rl->files); if (resource == nullptr) - reportAlways("Atlas creation error: %s", rl->name.c_str()); + reportAlways("Atlas creation error: %s", rl->name.c_str()) return resource; } }; diff --git a/src/resources/loaders/emptyatlasloader.cpp b/src/resources/loaders/emptyatlasloader.cpp index b3d943075..71ea865e9 100644 --- a/src/resources/loaders/emptyatlasloader.cpp +++ b/src/resources/loaders/emptyatlasloader.cpp @@ -48,7 +48,7 @@ struct EmptyAtlasLoader final AtlasResource *const resource = AtlasManager::loadEmptyAtlas( rl->name, *rl->files); if (resource == nullptr) - reportAlways("Empty atlas creation error: %s", rl->name.c_str()); + reportAlways("Empty atlas creation error: %s", rl->name.c_str()) return resource; } }; diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp index 2c619a4b8..4c573e98d 100644 --- a/src/resources/loaders/imageloader.cpp +++ b/src/resources/loaders/imageloader.cpp @@ -67,7 +67,7 @@ namespace if (rw == nullptr) { delete d; - reportAlways("Image loading error: %s", path1.c_str()); + reportAlways("Image loading error: %s", path1.c_str()) BLOCK_END("DyedImageLoader::load") return nullptr; } @@ -75,7 +75,7 @@ namespace : imageHelper->load(rw); delete d; if (res == nullptr) - reportAlways("Image loading error: %s", path1.c_str()); + reportAlways("Image loading error: %s", path1.c_str()) BLOCK_END("DyedImageLoader::load") return res; } diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp index 4fbcc2fc2..d62d3727b 100644 --- a/src/resources/loaders/imagesetloader.cpp +++ b/src/resources/loaders/imagesetloader.cpp @@ -53,7 +53,7 @@ struct ImageSetLoader final Image *const img = Loader::getImage(rl->path); if (img == nullptr) { - reportAlways("Image loading error: %s", rl->path.c_str()); + reportAlways("Image loading error: %s", rl->path.c_str()) return nullptr; } ImageSet *const res = new ImageSet(img, rl->w, rl->h, 0, 0); diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index 6bd906490..97b5ceb73 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -51,7 +51,7 @@ namespace if (rw == nullptr) { reportAlways("Error loading resource: %s", - rl->path.c_str()); + rl->path.c_str()) return nullptr; } if (Mix_Music *const music = SDL::LoadMUSOgg_RW(rw)) diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp index 085614870..8f872943b 100644 --- a/src/resources/loaders/rescaledloader.cpp +++ b/src/resources/loaders/rescaledloader.cpp @@ -53,7 +53,7 @@ namespace if (rescaled == nullptr) { reportAlways("Rescale image failed: %s", - rl->image->mIdPath.c_str()); + rl->image->mIdPath.c_str()) return nullptr; } return rescaled; diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp index 5f1edd3a7..ca3cd6a13 100644 --- a/src/resources/loaders/shaderloader.cpp +++ b/src/resources/loaders/shaderloader.cpp @@ -51,7 +51,7 @@ namespace = static_cast<const ShaderLoader *>(v); Shader *const resource = shaders.createShader(rl->type, rl->name); if (resource == nullptr) - reportAlways("Shader creation error: %s", rl->name.c_str()); + reportAlways("Shader creation error: %s", rl->name.c_str()) return resource; } }; diff --git a/src/resources/loaders/shaderprogramloader.cpp b/src/resources/loaders/shaderprogramloader.cpp index d0c6f1f41..2f981f590 100644 --- a/src/resources/loaders/shaderprogramloader.cpp +++ b/src/resources/loaders/shaderprogramloader.cpp @@ -55,7 +55,7 @@ namespace rl->fragment, rl->isNewShader); if (resource == nullptr) - reportAlways("Shader program creation error"); + reportAlways("Shader program creation error") return resource; } }; diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp index 96c90d4b4..f8550f631 100644 --- a/src/resources/loaders/soundloader.cpp +++ b/src/resources/loaders/soundloader.cpp @@ -50,7 +50,7 @@ namespace if (rw == nullptr) { reportAlways("Error loading resource: %s", - rl->path.c_str()); + rl->path.c_str()) return nullptr; } // Load the music data and free the RWops structure @@ -61,7 +61,7 @@ namespace return new SoundEffect(tmpSoundEffect, rl->path); } reportAlways("Error, failed to load sound effect: %s", - SDL_GetError()); + SDL_GetError()) return nullptr; } }; diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp index 3b8672821..6abba11c9 100644 --- a/src/resources/loaders/subimageloader.cpp +++ b/src/resources/loaders/subimageloader.cpp @@ -57,7 +57,7 @@ namespace if (res == nullptr) { reportAlways("SubImage loading error: %s", - rl->parent->mSource.c_str()); + rl->parent->mSource.c_str()) } return res; } diff --git a/src/resources/loaders/walklayerloader.cpp b/src/resources/loaders/walklayerloader.cpp index 3fcff35c2..c4bd99c44 100644 --- a/src/resources/loaders/walklayerloader.cpp +++ b/src/resources/loaders/walklayerloader.cpp @@ -49,7 +49,7 @@ struct WalkLayerLoader final WalkLayerLoader *>(v); Resource *const resource = NavigationManager::loadWalkLayer(rl->map); if (resource == nullptr) - reportAlways("WalkLayer creation error"); + reportAlways("WalkLayer creation error") return resource; } }; diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index bcec1a4a3..3cc6ecafe 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -191,9 +191,9 @@ Map::~Map() delete_all(mForegrounds); delete_all(mBackgrounds); delete_all(mTileAnimations); - delete2(mSpecialLayer); - delete2(mTempLayer); - delete2(mObjects); + delete2(mSpecialLayer) + delete2(mTempLayer) + delete2(mObjects) delete_all(mMapPortals); #ifdef USE_OPENGL if (mAtlas != nullptr) @@ -202,7 +202,7 @@ Map::~Map() mAtlas = nullptr; } #endif // USE_OPENGL - delete2(mHeights); + delete2(mHeights) delete [] mMetaTiles; } @@ -601,12 +601,12 @@ void Map::drawCollision(Graphics *restrict const graphics, int width = 0; const int x0 = x; - fillCollision(BlockMask::WALL, COLLISION_HIGHLIGHT); - fillCollision(BlockMask::AIR, AIR_COLLISION_HIGHLIGHT); - fillCollision(BlockMask::WATER, WATER_COLLISION_HIGHLIGHT); - fillCollision(BlockMask::GROUNDTOP, GROUNDTOP_COLLISION_HIGHLIGHT); - fillCollision(BlockMask::PLAYERWALL, COLLISION_HIGHLIGHT); - fillCollision(BlockMask::MONSTERWALL, MONSTER_COLLISION_HIGHLIGHT); + fillCollision(BlockMask::WALL, COLLISION_HIGHLIGHT) + fillCollision(BlockMask::AIR, AIR_COLLISION_HIGHLIGHT) + fillCollision(BlockMask::WATER, WATER_COLLISION_HIGHLIGHT) + fillCollision(BlockMask::GROUNDTOP, GROUNDTOP_COLLISION_HIGHLIGHT) + fillCollision(BlockMask::PLAYERWALL, COLLISION_HIGHLIGHT) + fillCollision(BlockMask::MONSTERWALL, MONSTER_COLLISION_HIGHLIGHT) } } } @@ -1241,7 +1241,7 @@ void Map::saveExtraLayer() const restrict2 if (!mapFile.is_open()) { reportAlways("Error opening file for writing: %s", - mapFileName.c_str()); + mapFileName.c_str()) return; } diff --git a/src/resources/map/tileanimation.cpp b/src/resources/map/tileanimation.cpp index f31fed7ae..6f6ee9e3e 100644 --- a/src/resources/map/tileanimation.cpp +++ b/src/resources/map/tileanimation.cpp @@ -40,7 +40,7 @@ TileAnimation::TileAnimation(Animation *const ani) : TileAnimation::~TileAnimation() { - delete2(mAnimation); + delete2(mAnimation) } bool TileAnimation::update(const int ticks) diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 74059a034..eac985d02 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -203,19 +203,19 @@ int inflateMemory(unsigned char *restrict const in, { if (ret == Z_MEM_ERROR) { - reportAlways("Error: Out of memory while decompressing map data!"); + reportAlways("Error: Out of memory while decompressing map data!") } else if (ret == Z_VERSION_ERROR) { - reportAlways("Error: Incompatible zlib version!"); + reportAlways("Error: Incompatible zlib version!") } else if (ret == Z_DATA_ERROR) { - reportAlways("Error: Incorrect zlib compressed data!"); + reportAlways("Error: Incorrect zlib compressed data!") } else { - reportAlways("Error: Unknown error while decompressing map data!"); + reportAlways("Error: Unknown error while decompressing map data!") } free(out); @@ -284,7 +284,7 @@ Map *MapReader::readMap(const std::string &restrict filename, else { reportAlways("Error while parsing map file (%s)!", - realFilename.c_str()); + realFilename.c_str()) } if (map != nullptr) @@ -306,7 +306,7 @@ Map *MapReader::readMap(const std::string &restrict filename, void MapReader::loadLayers(const std::string &path) { BLOCK_START("MapReader::loadLayers") - loadXmlDir2(path, addLayerToList, ".tmx", SkipError_false); + loadXmlDir2(path, addLayerToList, ".tmx", SkipError_false) BLOCK_END("MapReader::loadLayers") } @@ -348,7 +348,7 @@ Map *MapReader::readMap(XmlNodePtrConst node, const std::string &path) { reportAlways("MapReader: Warning: " "Uninitialized tile width or height value for map: %s", - path.c_str()); + path.c_str()) BLOCK_END("MapReader::readMap xml") return nullptr; } @@ -377,7 +377,7 @@ Map *MapReader::readMap(XmlNodePtrConst node, const std::string &path) else { reportAlways("Missing atlas for map: %s", - fileName.c_str()); + fileName.c_str()) } } BLOCK_END("MapReader::readMap load atlas") @@ -674,7 +674,7 @@ bool MapReader::readBase64Layer(XmlNodeConstPtrConst childNode, && compression != "zlib") { reportAlways("Warning: only gzip and zlib layer" - " compression supported!"); + " compression supported!") return false; } @@ -730,7 +730,7 @@ bool MapReader::readBase64Layer(XmlNodeConstPtrConst childNode, if (inflated == nullptr) { - reportAlways("Error: Could not decompress layer!"); + reportAlways("Error: Could not decompress layer!") return false; } } @@ -1143,14 +1143,14 @@ Tileset *MapReader::readTileset(XmlNodePtr node, graphicsManager.getUseAtlases()) { reportAlways("Error: image '%s' not present in atlas", - source.c_str()); + source.c_str()) } #endif // USE_OPENGL } else { reportAlways("Error: Failed to load tileset (%s)", - source.c_str()); + source.c_str()) } } } diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index a2aa72958..ff3a2e4f3 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -69,7 +69,7 @@ Image *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye) SDL_Surface *const tmpImage = loadPng(rw); if (tmpImage == nullptr) { - reportAlways("Error, image load failed: %s", SDL_GetError()); + reportAlways("Error, image load failed: %s", SDL_GetError()) return nullptr; } @@ -148,7 +148,7 @@ SDL_Surface *OpenGLImageHelper::convertSurfaceNormalize(SDL_Surface *tmpImage, if (realWidth < width || realHeight < height) { reportAlways("Warning: image too large, cropping to %dx%d texture!", - tmpImage->w, tmpImage->h); + tmpImage->w, tmpImage->h) } #ifdef USE_SDL2 @@ -190,7 +190,7 @@ SDL_Surface *OpenGLImageHelper::convertSurfaceNormalize(SDL_Surface *tmpImage, if (tmpImage == nullptr) { - reportAlways("Error, image convert failed: out of memory"); + reportAlways("Error, image convert failed: out of memory") return nullptr; } SDL_BlitSurface(oldImage, nullptr, tmpImage, nullptr); @@ -242,7 +242,7 @@ SDL_Surface *OpenGLImageHelper::convertSurface(SDL_Surface *tmpImage, if (tmpImage == nullptr) { - reportAlways("Error, image convert failed: out of memory"); + reportAlways("Error, image convert failed: out of memory") return nullptr; } SDL_BlitSurface(oldImage, nullptr, tmpImage, nullptr); @@ -298,7 +298,7 @@ void OpenGLImageHelper::bindTexture(const GLuint texture) case RENDER_NULL: case RENDER_LAST: default: - reportAlways("Unknown OpenGL backend: %d", mUseOpenGL); + reportAlways("Unknown OpenGL backend: %d", mUseOpenGL) break; } } @@ -416,7 +416,7 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, { std::string errmsg = GraphicsManager::errorToString(error); reportAlways("Error: Image GL import failed: %s (%u)", - errmsg.c_str(), error); + errmsg.c_str(), error) // return nullptr; } diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 0a28ac83a..db175ea20 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -96,7 +96,7 @@ void deleteResourceManager() #ifdef UNITTESTS if (status) - reportAlways("Found leaked resources."); + reportAlways("Found leaked resources.") #endif // UNITTESTS iter = mResources.begin(); @@ -447,7 +447,7 @@ Resource *get(const std::string &idPath, } else { - reportAlways("Error loading image: %s", idPath.c_str()); + reportAlways("Error loading image: %s", idPath.c_str()) } #else // DISABLE_RESOURCE_CACHING @@ -464,7 +464,7 @@ Resource *get(const std::string &idPath, } else { - reportAlways("Error loading image: " + idPath); + reportAlways("Error loading image: " + idPath) } #endif // DISABLE_RESOURCE_CACHING @@ -493,7 +493,7 @@ void release(Resource *const res) { // +++ need reenable after Resource will have type field // reportAlways("no resource in cache: %s", -// res->mIdPath.c_str()); +// res->mIdPath.c_str()) delete res; return; } @@ -501,7 +501,7 @@ void release(Resource *const res) { // +++ need reenable after Resource will have type field // reportAlways("in cache other image: %s", -// res->mIdPath.c_str()); +// res->mIdPath.c_str()) delete res; return; } @@ -619,7 +619,7 @@ void deleteInstance() } #ifdef UNITTESTS if (status) - reportAlways("Found leaked resources."); + reportAlways("Found leaked resources.") #endif // UNITTESTS #endif // DUMP_LEAKED_RESOURCES diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp index 0875a341f..3340032b7 100644 --- a/src/resources/sdl2imagehelper.cpp +++ b/src/resources/sdl2imagehelper.cpp @@ -71,7 +71,7 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) if (!texture) { reportAlways("Texture from surface creation failed: %s", - SDL_GetError()); + SDL_GetError()) return nullptr; } SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND); diff --git a/src/resources/sdlgfxblitfunc.cpp b/src/resources/sdlgfxblitfunc.cpp index d72e7fbc5..fa74c82c3 100644 --- a/src/resources/sdlgfxblitfunc.cpp +++ b/src/resources/sdlgfxblitfunc.cpp @@ -383,7 +383,7 @@ static void _SDL_gfxBlitBlitterRGBA(const SDL_gfxBlitInfo *const info) src += 4; dst += 4; - }, width); + }, width) src += srcskip; dst += dstskip; } @@ -451,7 +451,7 @@ int SDLgfxBlitRGBA(SDL_Surface *const src, if (src == nullptr || dst == nullptr) { - reportAlways("SDLgfxBlitRGBA: passed a NULL surface"); + reportAlways("SDLgfxBlitRGBA: passed a NULL surface") return -1; } diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index 2c5970a49..0ed5c9f52 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -57,7 +57,7 @@ Image *SDLImageHelper::load(SDL_RWops *const rw, Dye const &dye) if (tmpImage == nullptr) { reportAlways("Error, image load failed: %s", - SDL_GetError()); + SDL_GetError()) return nullptr; } @@ -196,7 +196,7 @@ Image *SDLImageHelper::createTextSurface(SDL_Surface *const tmpImage, if (image == nullptr) { - reportAlways("Error: Image convert failed."); + reportAlways("Error: Image convert failed.") delete [] alphaChannel; return nullptr; } @@ -224,7 +224,7 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) if (tmpImage->format->BitsPerPixel != 32) { - reportAlways("Non 32 bit image detected"); + reportAlways("Non 32 bit image detected") tmpImage = convertTo32Bit(tmpImage); if (tmpImage == nullptr) @@ -296,7 +296,7 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) if (image == nullptr) { - reportAlways("Error: Image convert failed."); + reportAlways("Error: Image convert failed.") delete [] alphaChannel; return nullptr; } diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 965cffbec..9e6e2e327 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -134,7 +134,7 @@ AnimatedSprite::~AnimatedSprite() { mDelayLoad->clearSprite(); DelayedManager::removeDelayLoad(mDelayLoad); - delete2(mDelayLoad); + delete2(mDelayLoad) } } diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index b2a53fd93..1e38c4ca5 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -105,7 +105,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, if ((rootNode == nullptr) || !xmlNameEqual(rootNode, "sprite")) { reportAlways("Error, failed to parse sprite %s", - animationFile.c_str()); + animationFile.c_str()) const std::string errorFile = pathJoin(paths.getStringValue("sprites"), paths.getStringValue("spriteErrorFile")); BLOCK_END("SpriteDef::load") @@ -256,7 +256,7 @@ void SpriteDef::loadImageSet(XmlNodeConstPtr node, { reportAlways("%s: Couldn't load imageset: %s", mSource.c_str(), - imageSrc.c_str()); + imageSrc.c_str()) return; } @@ -273,7 +273,7 @@ const ImageSet *SpriteDef::getImageSet(const std::string &imageSetName) const reportAlways("%s: Imageset \"%s\" not defined in %s", mSource.c_str(), imageSetName.c_str(), - mIdPath.c_str()); + mIdPath.c_str()) return nullptr; } return si->second; @@ -295,7 +295,7 @@ void SpriteDef::loadAction(XmlNodeConstPtr node, reportAlways("%s: Unknown action \"%s\" defined in %s", mSource.c_str(), actionName.c_str(), - mIdPath.c_str()); + mIdPath.c_str()) return; } Action *const action = new Action(actionName); @@ -305,7 +305,7 @@ void SpriteDef::loadAction(XmlNodeConstPtr node, // dirty hack to fix bad resources in tmw server if (actionName == "attack_stab") { - reportAlways("Found legacy attribute attack_stab in animation"); + reportAlways("Found legacy attribute attack_stab in animation") addAction(hp, "attack", action); } @@ -345,7 +345,7 @@ void SpriteDef::loadAnimation(XmlNodeConstPtr animationNode, reportAlways("%s: Unknown direction \"%s\" used in %s", mSource.c_str(), directionName.c_str(), - mIdPath.c_str()); + mIdPath.c_str()) return; } @@ -383,7 +383,7 @@ void SpriteDef::loadAnimation(XmlNodeConstPtr animationNode, reportAlways( "%s: No valid value for 'index' at direction '%s'", mSource.c_str(), - directionName.c_str()); + directionName.c_str()) continue; } @@ -393,7 +393,7 @@ void SpriteDef::loadAnimation(XmlNodeConstPtr animationNode, reportAlways("%s: No image at index %d at direction '%s'", mSource.c_str(), index + variant_offset, - directionName.c_str()); + directionName.c_str()) continue; } @@ -411,7 +411,7 @@ void SpriteDef::loadAnimation(XmlNodeConstPtr animationNode, { reportAlways("%s: No valid value for 'repeat' at direction %s", mSource.c_str(), - directionName.c_str()); + directionName.c_str()) continue; } @@ -495,7 +495,7 @@ void SpriteDef::includeSprite(XmlNodeConstPtr includeNode, const int variant) { reportAlways("%s: Tried to include %s which already is included.", mSource.c_str(), - filename.c_str()); + filename.c_str()) return; } mProcessedFiles.insert(filename); @@ -511,7 +511,7 @@ void SpriteDef::includeSprite(XmlNodeConstPtr includeNode, const int variant) { reportAlways("%s: No sprite root node in %s", mSource.c_str(), - filename.c_str()); + filename.c_str()) doc->decRef(); return; } @@ -599,7 +599,7 @@ bool SpriteDef::addSequence(const int start, if (start < 0 || end < 0) { reportAlways("%s: No valid value for 'start' or 'end'", - mSource.c_str()); + mSource.c_str()) return true; } @@ -616,7 +616,7 @@ bool SpriteDef::addSequence(const int start, { reportAlways("%s: No image at index %d", mSource.c_str(), - pos + variant_offset); + pos + variant_offset) pos ++; continue; } @@ -641,7 +641,7 @@ bool SpriteDef::addSequence(const int start, { reportAlways("%s: No image at index %d", mSource.c_str(), - pos + variant_offset); + pos + variant_offset) pos ++; continue; } |