From b09e70d1ca528f8eecf31ed1957866d888ede190 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 14 Feb 2016 14:31:57 +0100 Subject: WAGE: Consistently use .empty() instead of .size() == 0 --- engines/wage/combat.cpp | 16 ++++++++-------- engines/wage/design.cpp | 4 ++-- engines/wage/entities.cpp | 4 ++-- engines/wage/gui-console.cpp | 2 +- engines/wage/menu.cpp | 14 +++++++------- engines/wage/script.cpp | 4 ++-- engines/wage/wage.cpp | 2 +- engines/wage/world.cpp | 12 ++++++------ engines/wage/world.h | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) (limited to 'engines') diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp index ce111ffefc..b60c896098 100644 --- a/engines/wage/combat.cpp +++ b/engines/wage/combat.cpp @@ -112,25 +112,25 @@ void WageEngine::performCombatAction(Chr *npc, Chr *player) { // for the chance (e.g. only when all values were set to 0?). if (winning) { if (!_world->_weaponMenuDisabled) { - if (weapons->size() > 0) + if (!weapons->empty()) hat.addTokens(kTokWeapons, npc->_winningWeapons + 1); - if (magics->size() > 0) + if (!magics->empty()) hat.addTokens(kTokMagic, npc->_winningMagic); } if (validMoves != 0) hat.addTokens(kTokRun, npc->_winningRun + 1); - if (npc->_inventory.size()) + if (!npc->_inventory.empty()) hat.addTokens(kTokOffer, npc->_winningOffer + 1); } else { if (!_world->_weaponMenuDisabled) { - if (weapons->size() > 0) + if (!weapons->empty()) hat.addTokens(kTokWeapons, npc->_losingWeapons + 1); - if (magics->size() > 0) + if (!magics->empty()) hat.addTokens(kTokMagic, npc->_losingMagic); } if (validMoves != 0) hat.addTokens(kTokRun, npc->_losingRun + 1); - if (npc->_inventory.size()) + if (!npc->_inventory.empty()) hat.addTokens(kTokOffer, npc->_losingOffer + 1); } @@ -563,7 +563,7 @@ Common::String *WageEngine::getGroundItemsList(Scene *scene) { if ((*it)->_type != Obj::IMMOBILE_OBJECT) objs.push_back(*it); - if (objs.size()) { + if (!objs.empty()) { Common::String *res = new Common::String("On the ground you see "); appendObjNames(*res, objs); return res; @@ -602,7 +602,7 @@ bool WageEngine::handleInventoryCommand() { if (!player->isWearing(*it)) objs.push_back(*it); - if (!objs.size()) { + if (objs.empty()) { appendText("Your pack is empty."); } else { Common::String res("Your pack contains "); diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp index 63721f68ae..a85f655aa1 100644 --- a/engines/wage/design.cpp +++ b/engines/wage/design.cpp @@ -497,7 +497,7 @@ FloodFill::FloodFill(Graphics::Surface *surface, byte color1, byte color2) { } FloodFill::~FloodFill() { - while(_queue.size()) { + while(!_queue.empty()) { Common::Point *p = _queue.front(); delete p; @@ -523,7 +523,7 @@ void FloodFill::addSeed(int x, int y) { } void FloodFill::fill() { - while (_queue.size()) { + while (!_queue.empty()) { Common::Point *p = _queue.front(); _queue.pop_front(); addSeed(p->x , p->y - 1); diff --git a/engines/wage/entities.cpp b/engines/wage/entities.cpp index 27ee745d56..f85a228fbd 100644 --- a/engines/wage/entities.cpp +++ b/engines/wage/entities.cpp @@ -369,7 +369,7 @@ Chr::Chr(Common::String name, Common::SeekableReadStream *data) { _weapon2 = NULL; // Create native weapons - if (_nativeWeapon1.size() && _operativeVerb1.size()) { + if (!_nativeWeapon1.empty() && !_operativeVerb1.empty()) { _weapon1 = new Obj; _weapon1->_name = _nativeWeapon1; @@ -380,7 +380,7 @@ Chr::Chr(Common::String name, Common::SeekableReadStream *data) { _weapon1->_sound = _weaponSound1; } - if (_nativeWeapon2.size() && _operativeVerb2.size()) { + if (!_nativeWeapon2.empty() && !_operativeVerb2.empty()) { _weapon2 = new Obj; _weapon2->_name = _nativeWeapon2; diff --git a/engines/wage/gui-console.cpp b/engines/wage/gui-console.cpp index 2f4bac2937..f1095de3ca 100644 --- a/engines/wage/gui-console.cpp +++ b/engines/wage/gui-console.cpp @@ -119,7 +119,7 @@ void Gui::flowText(Common::String &str) { font->wordWrapText(str, textW, wrappedLines); - if (wrappedLines.size() == 0) // Sometimes we have empty lines + if (wrappedLines.empty()) // Sometimes we have empty lines _lines.push_back(""); for (Common::StringArray::const_iterator j = wrappedLines.begin(); j != wrappedLines.end(); ++j) diff --git a/engines/wage/menu.cpp b/engines/wage/menu.cpp index d6dbcfbd4a..6e2260ad40 100644 --- a/engines/wage/menu.cpp +++ b/engines/wage/menu.cpp @@ -284,7 +284,7 @@ void Menu::createWeaponsMenu(MenuItem *menu) { } delete weapons; - if (menu->subitems.size() == 0) + if (menu->subitems.empty()) menu->subitems.push_back(new MenuSubItem("You have no weapons", 0, 0, 0, false)); } @@ -306,10 +306,10 @@ int Menu::calculateMenuWidth(MenuItem *menu) { int maxWidth = 0; for (int i = 0; i < menu->subitems.size(); i++) { MenuSubItem *item = menu->subitems[i]; - if (item->text.size()) { + if (!item->text.empty()) { Common::String text(item->text); Common::String acceleratorText(getAcceleratorString(item, " ")); - if (acceleratorText.size()) { + if (!acceleratorText.empty()) { text += acceleratorText; } @@ -358,7 +358,7 @@ void Menu::render() { Design::drawFilledRect(&_gui->_screen, hbox, kColorBlack, _gui->_patterns, kPatternSolid); color = kColorWhite; - if (it->subitems.size()) + if (!it->subitems.empty()) renderSubmenu(it); } @@ -387,14 +387,14 @@ void Menu::renderSubmenu(MenuItem *menu) { int accelX = r->right - 25; int color = kColorBlack; - if (i == _activeSubItem && text.size() && menu->subitems[i]->enabled) { + if (i == _activeSubItem && !text.empty() && menu->subitems[i]->enabled) { color = kColorWhite; Common::Rect trect(r->left, y - (_gui->_builtInFonts ? 1 : 0), r->right, y + _font->getFontHeight()); Design::drawFilledRect(&_gui->_screen, trect, kColorBlack, _gui->_patterns, kPatternSolid); } - if (text.size()) { + if (!text.empty()) { Graphics::Surface *s = &_gui->_screen; int tx = x, ty = y; @@ -409,7 +409,7 @@ void Menu::renderSubmenu(MenuItem *menu) { _font->drawString(s, text, tx, ty, r->width(), color); - if (acceleratorText.size()) + if (!acceleratorText.empty()) _font->drawString(s, acceleratorText, accelX, ty, r->width(), color); if (!menu->subitems[i]->enabled) { diff --git a/engines/wage/script.cpp b/engines/wage/script.cpp index a08b324574..523f1e1a1b 100644 --- a/engines/wage/script.cpp +++ b/engines/wage/script.cpp @@ -419,7 +419,7 @@ Script::Operand *Script::readStringOperand() { } _data->seek(-1, SEEK_CUR); - if (allDigits && str->size() > 0) { + if (allDigits && !str->empty()) { int r = atol(str->c_str()); delete str; @@ -1137,7 +1137,7 @@ void Script::convertToText() { } } - if (scr->line.size()) + if (!scr->line.empty()) _scriptText.push_back(scr); else delete scr; diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp index f36d7ce239..1c13a31f66 100644 --- a/engines/wage/wage.cpp +++ b/engines/wage/wage.cpp @@ -160,7 +160,7 @@ void WageEngine::processEvents() { case Common::EVENT_KEYDOWN: switch (event.kbd.keycode) { case Common::KEYCODE_BACKSPACE: - if (_inputText.size()) { + if (!_inputText.empty()) { _inputText.deleteLastChar(); _gui->drawInput(); } diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp index 79dc456e6e..6e79aaa310 100644 --- a/engines/wage/world.cpp +++ b/engines/wage/world.cpp @@ -117,7 +117,7 @@ bool World::loadWorld(Common::MacResManager *resMan) { if (resArray.size() > 1) warning("Too many VERS resources"); - if (resArray.size()) { + if (!resArray.empty()) { debug(3, "Loading version info"); res = resMan->getResource(MKTAG('V','E','R','S'), resArray[0]); @@ -226,10 +226,10 @@ bool World::loadWorld(Common::MacResManager *resMan) { addSound(new Sound(resMan->getResName(MKTAG('A','S','N','D'), *iter), res)); } - if (_soundLibrary1.size() > 0) { + if (!_soundLibrary1.empty()) { loadExternalSounds(_soundLibrary1); } - if (_soundLibrary2.size() > 0) { + if (!_soundLibrary2.empty()) { loadExternalSounds(_soundLibrary2); } @@ -305,8 +305,8 @@ Common::StringArray *World::readMenu(Common::SeekableReadStream *res) { Common::String menu; byte itemData[4]; - while (menuItem.size() > 0) { - if (menu.size() > 0) { + while (!menuItem.empty()) { + if (!menu.empty()) { menu += ';'; } if ((enableFlags & (1 << menuItemNumber)) == 0) { @@ -492,7 +492,7 @@ const char *World::getAboutMenuItemName() { *menu = '\0'; - if (_aboutMenuItemName.size() == 0) { + if (_aboutMenuItemName.empty()) { sprintf(menu, "About %s...", _name.c_str()); } else { // Replace '@' with name const char *str = _aboutMenuItemName.c_str(); diff --git a/engines/wage/world.h b/engines/wage/world.h index cb7239122d..1416fc39e6 100644 --- a/engines/wage/world.h +++ b/engines/wage/world.h @@ -101,7 +101,7 @@ public: Common::String _weaponsMenuName; void addScene(Scene *room) { - if (room->_name.size() != 0) { + if (!room->_name.empty()) { Common::String s = room->_name; s.toLowercase(); _scenes[s] = room; -- cgit v1.2.3