diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp index c8eee68f19ac..ce111ffefc72 100644 --- a/engines/wage/combat.cpp +++ b/engines/wage/combat.cpp @@ -147,30 +147,30 @@ void WageEngine::performCombatAction(Chr *npc, Chr *player) { int token = hat.drawToken(); switch (token) { - case kTokWeapons: - // TODO: I think the monster should choose the "best" weapon. - performAttack(npc, player, weapons->operator[](_rnd->getRandomNumber(weapons->size() - 1))); + case kTokWeapons: + // TODO: I think the monster should choose the "best" weapon. + performAttack(npc, player, weapons->operator[](_rnd->getRandomNumber(weapons->size() - 1))); + break; + case kTokMagic: + // TODO: I think the monster should choose the "best" magic. + performMagic(npc, player, magics->operator[](_rnd->getRandomNumber(magics->size() - 1))); + break; + case kTokRun: + performMove(npc, validMoves); + break; + case kTokOffer: + performOffer(npc, player); + break; + case kTokNone: + break; + default: + { + int cnt = 0; + for (ObjList::const_iterator it = objs->begin(); it != objs->end(); ++it, ++cnt) + if (cnt == token) + performTake(npc, *it); break; - case kTokMagic: - // TODO: I think the monster should choose the "best" magic. - performMagic(npc, player, magics->operator[](_rnd->getRandomNumber(magics->size() - 1))); - break; - case kTokRun: - performMove(npc, validMoves); - break; - case kTokOffer: - performOffer(npc, player); - break; - case kTokNone: - break; - default: - { - int cnt = 0; - for (ObjList::const_iterator it = objs->begin(); it != objs->end(); ++it, ++cnt) - if (cnt == token) - performTake(npc, *it); - break; - } + } } delete weapons; diff --git a/engines/wage/entities.h b/engines/wage/entities.h index a9066fe91bb0..f72df3472362 100644 --- a/engines/wage/entities.h +++ b/engines/wage/entities.h @@ -333,7 +333,7 @@ class Scene : public Designed { class Sound { public: - Sound(Common::String name, Common::SeekableReadStream *data) : _name(name), _data(data) {} + Sound(Common::String name, Common::SeekableReadStream *data) : _name(name), _data(data) {} ~Sound() { } Common::String _name;