[Scummvm-git-logs] scummvm master -> c0e754ebae1e050ef5373f078306a33fe9b0a260
dreammaster
paulfgilbert at gmail.com
Fri Apr 10 02:07:42 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c0e754ebae ULTIMA4: Adding override keyword
Commit: c0e754ebae1e050ef5373f078306a33fe9b0a260
https://github.com/scummvm/scummvm/commit/c0e754ebae1e050ef5373f078306a33fe9b0a260
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-04-09T19:07:28-07:00
Commit Message:
ULTIMA4: Adding override keyword
Changed paths:
engines/ultima/ultima4/conversation/conversation.h
engines/ultima/ultima4/conversation/dialogueloader_hw.h
engines/ultima/ultima4/conversation/dialogueloader_lb.h
engines/ultima/ultima4/conversation/dialogueloader_tlk.h
engines/ultima/ultima4/events/event.h
engines/ultima/ultima4/game/context.h
engines/ultima/ultima4/game/creature.h
engines/ultima/ultima4/game/game.h
engines/ultima/ultima4/game/menuitem.h
engines/ultima/ultima4/game/object.h
engines/ultima/ultima4/game/person.h
engines/ultima/ultima4/game/player.h
engines/ultima/ultima4/game/stats.h
engines/ultima/ultima4/gfx/imageloader_fmtowns.h
engines/ultima/ultima4/gfx/imageloader_png.h
engines/ultima/ultima4/gfx/imageloader_u4.h
engines/ultima/ultima4/map/camp.h
engines/ultima/ultima4/map/city.h
engines/ultima/ultima4/map/combat.h
engines/ultima/ultima4/map/dungeon.h
engines/ultima/ultima4/map/map.h
engines/ultima/ultima4/map/maploader.h
engines/ultima/ultima4/map/shrine.h
engines/ultima/ultima4/map/tileanim.h
diff --git a/engines/ultima/ultima4/conversation/conversation.h b/engines/ultima/ultima4/conversation/conversation.h
index d7a8a0a262..88a4111c8c 100644
--- a/engines/ultima/ultima4/conversation/conversation.h
+++ b/engines/ultima/ultima4/conversation/conversation.h
@@ -97,7 +97,7 @@ public:
DynamicResponse(Response * (*generator)(const DynamicResponse *), const Common::String ¶m = "");
virtual ~DynamicResponse();
- virtual const Std::vector<ResponsePart> &getParts() const;
+ const Std::vector<ResponsePart> &getParts() const override;
const Common::String &getParam() const {
return _param;
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_hw.h b/engines/ultima/ultima4/conversation/dialogueloader_hw.h
index ff978debae..a01d1262bb 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_hw.h
+++ b/engines/ultima/ultima4/conversation/dialogueloader_hw.h
@@ -33,7 +33,7 @@ namespace Ultima4 {
*/
class U4HWDialogueLoader : public DialogueLoader {
public:
- virtual Dialogue *load(void *source);
+ Dialogue *load(void *source) override;
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_lb.h b/engines/ultima/ultima4/conversation/dialogueloader_lb.h
index 836d13dd06..719a78df00 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_lb.h
+++ b/engines/ultima/ultima4/conversation/dialogueloader_lb.h
@@ -33,7 +33,7 @@ namespace Ultima4 {
*/
class U4LBDialogueLoader : public DialogueLoader {
public:
- virtual Dialogue *load(void *source);
+ Dialogue *load(void *source) override;
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_tlk.h b/engines/ultima/ultima4/conversation/dialogueloader_tlk.h
index b8e4e5651d..9e2e157e7b 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_tlk.h
+++ b/engines/ultima/ultima4/conversation/dialogueloader_tlk.h
@@ -33,7 +33,7 @@ namespace Ultima4 {
*/
class U4TlkDialogueLoader : public DialogueLoader {
public:
- virtual Dialogue *load(void *source);
+ Dialogue *load(void *source) override;
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/events/event.h b/engines/ultima/ultima4/events/event.h
index 2b4d8ea93e..b8bc530e81 100644
--- a/engines/ultima/ultima4/events/event.h
+++ b/engines/ultima/ultima4/events/event.h
@@ -144,7 +144,7 @@ public:
KeyHandlerController(KeyHandler *handler);
~KeyHandlerController();
- virtual bool keyPressed(int key);
+ bool keyPressed(int key) override;
KeyHandler *getKeyHandler();
private:
@@ -164,7 +164,7 @@ public:
*/
ReadStringController(int maxlen, int screenX, int screenY, const Common::String &accepted_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 \n\r\010");
ReadStringController(int maxlen, TextView *view, const Common::String &accepted_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 \n\r\010");
- virtual bool keyPressed(int key);
+ bool keyPressed(int key) override;
static Common::String get(int maxlen, int screenX, int screenY, EventHandler *eh = NULL);
static Common::String get(int maxlen, TextView *view, EventHandler *eh = NULL);
@@ -198,7 +198,7 @@ public:
class ReadChoiceController : public WaitableController<int> {
public:
ReadChoiceController(const Common::String &choices);
- virtual bool keyPressed(int key);
+ bool keyPressed(int key) override;
static char get(const Common::String &choices, EventHandler *eh = NULL);
@@ -212,7 +212,7 @@ protected:
class ReadDirController : public WaitableController<Direction> {
public:
ReadDirController();
- virtual bool keyPressed(int key);
+ bool keyPressed(int key) override;
};
/**
@@ -222,8 +222,8 @@ public:
class WaitController : public Controller {
public:
WaitController(unsigned int cycles);
- virtual bool keyPressed(int key);
- virtual void timerFired();
+ bool keyPressed(int key) override;
+ void timerFired() override;
void wait();
void setCycles(int c);
diff --git a/engines/ultima/ultima4/game/context.h b/engines/ultima/ultima4/game/context.h
index d3431f91c0..5e35e0d471 100644
--- a/engines/ultima/ultima4/game/context.h
+++ b/engines/ultima/ultima4/game/context.h
@@ -76,7 +76,7 @@ public:
/**
* Provides scripts with information
*/
- virtual Common::String translate(Std::vector<Common::String> &parts) {
+ Common::String translate(Std::vector<Common::String> &parts) override {
if (parts.size() == 1) {
if (parts[0] == "wind")
return getDirectionName(static_cast<Direction>(_windDirection));
diff --git a/engines/ultima/ultima4/game/creature.h b/engines/ultima/ultima4/game/creature.h
index f48cf75a35..24f040003c 100644
--- a/engines/ultima/ultima4/game/creature.h
+++ b/engines/ultima/ultima4/game/creature.h
@@ -169,135 +169,135 @@ public:
void load(const ConfigElement &conf);
// Accessor methods
- virtual Common::String getName() const {
+ virtual Common::String getName() const {
return _name;
}
- virtual const Common::String &getHitTile() const {
+ virtual const Common::String &getHitTile() const {
return _rangedHitTile;
}
- virtual const Common::String &getMissTile() const {
+ virtual const Common::String &getMissTile() const {
return _rangedMissTile;
}
- CreatureId getId() const {
+ CreatureId getId() const {
return _id;
}
- CreatureId getLeader() const {
+ CreatureId getLeader() const {
return _leader;
}
- virtual int getHp() const {
+ virtual int getHp() const {
return _hp;
}
- virtual int getXp() const {
+ virtual int getXp() const {
return _xp;
}
virtual const Common::String &getWorldrangedtile() const {
return _worldRangedTile;
}
- SlowedType getSlowedType() const {
+ SlowedType getSlowedType() const {
return _slowedType;
}
- int getEncounterSize() const {
+ int getEncounterSize() const {
return _encounterSize;
}
- unsigned char getResists() const {
+ unsigned char getResists() const {
return _resists;
}
// Setters
- void setName(Common::String s) {
+ void setName(Common::String s) {
_name = s;
}
- void setHitTile(const Common::String &t) {
+ void setHitTile(const Common::String &t) {
_rangedHitTile = t;
}
- void setMissTile(const Common::String &t) {
+ void setMissTile(const Common::String &t) {
_rangedMissTile = t;
}
- virtual void setHp(int points) {
+ virtual void setHp(int points) {
_hp = points;
}
// Query methods
- bool isGood() const {
+ bool isGood() const {
return _mAttr & MATTR_GOOD;
}
- bool isEvil() const {
+ bool isEvil() const {
return !isGood();
}
- bool isUndead() const {
+ bool isUndead() const {
return _mAttr & MATTR_UNDEAD;
}
- bool leavesChest() const {
+ bool leavesChest() const {
return !isAquatic() && !(_mAttr & MATTR_NOCHEST);
}
- bool isAquatic() const {
+ bool isAquatic() const {
return _mAttr & MATTR_WATER;
}
- bool wanders() const {
+ bool wanders() const {
return _movementAttr & MATTR_WANDERS;
}
- bool isStationary() const {
+ bool isStationary() const {
return _movementAttr & MATTR_STATIONARY;
}
- bool flies() const {
+ bool flies() const {
return _movementAttr & MATTR_FLIES;
}
- bool teleports() const {
+ bool teleports() const {
return _movementAttr & MATTR_TELEPORT;
}
- bool swims() const {
+ bool swims() const {
return _movementAttr & MATTR_SWIMS;
}
- bool sails() const {
+ bool sails() const {
return _movementAttr & MATTR_SAILS;
}
- bool walks() const {
+ bool walks() const {
return !(flies() || swims() || sails());
}
- bool divides() const {
+ bool divides() const {
return _mAttr & MATTR_DIVIDES;
}
- bool spawnsOnDeath() const {
+ bool spawnsOnDeath() const {
return _mAttr & MATTR_SPAWNSONDEATH;
}
- bool canMoveOntoCreatures() const {
+ bool canMoveOntoCreatures() const {
return _movementAttr & MATTR_CANMOVECREATURES;
}
- bool canMoveOntoPlayer() const {
+ bool canMoveOntoPlayer() const {
return _movementAttr & MATTR_CANMOVEAVATAR;
}
bool isAttackable() const;
- bool willAttack() const {
+ bool willAttack() const {
return !(_mAttr & MATTR_NOATTACK);
}
- bool stealsGold() const {
+ bool stealsGold() const {
return _mAttr & MATTR_STEALGOLD;
}
- bool stealsFood() const {
+ bool stealsFood() const {
return _mAttr & MATTR_STEALFOOD;
}
- bool negates() const {
+ bool negates() const {
return _mAttr & MATTR_NEGATE;
}
- bool camouflages() const {
+ bool camouflages() const {
return _mAttr & MATTR_CAMOUFLAGE;
}
- bool ambushes() const {
+ bool ambushes() const {
return _mAttr & MATTR_AMBUSHES;
}
- bool isIncorporeal() const {
+ bool isIncorporeal() const {
return _mAttr & MATTR_INCORPOREAL;
}
- bool hasRandomRanged() const {
+ bool hasRandomRanged() const {
return _mAttr & MATTR_RANDOMRANGED;
}
- bool leavesTile() const {
+ bool leavesTile() const {
return _leavesTile;
}
- bool castsSleep() const {
+ bool castsSleep() const {
return _mAttr & MATTR_CASTS_SLEEP;
}
- bool isForceOfNature() const {
+ bool isForceOfNature() const {
return _mAttr & MATTR_FORCE_OF_NATURE;
}
int getDamage() const;
diff --git a/engines/ultima/ultima4/game/game.h b/engines/ultima/ultima4/game/game.h
index 7c76800f4f..1388430d9d 100644
--- a/engines/ultima/ultima4/game/game.h
+++ b/engines/ultima/ultima4/game/game.h
@@ -60,7 +60,7 @@ class ReadPlayerController : public ReadChoiceController {
public:
ReadPlayerController();
~ReadPlayerController();
- virtual bool keyPressed(int key);
+ bool keyPressed(int key) override;
int getPlayer();
int waitFor();
@@ -73,7 +73,7 @@ public:
class AlphaActionController : public WaitableController<int> {
public:
AlphaActionController(char letter, const Common::String &p) : _lastValidLetter(letter), _prompt(p) {}
- bool keyPressed(int key);
+ bool keyPressed(int key) override;
static int get(char lastValidLetter, const Common::String &prompt, EventHandler *eh = NULL);
@@ -87,7 +87,7 @@ private:
*/
class ZtatsController : public WaitableController<void *> {
public:
- bool keyPressed(int key);
+ bool keyPressed(int key) override;
};
class TurnCompleter {
@@ -114,12 +114,12 @@ public:
* The main key handler for the game. Interpretes each key as a
* command - 'a' for attack, 't' for talk, etc.
*/
- virtual bool keyPressed(int key);
+ bool keyPressed(int key) override;
/**
* This function is called every quarter second.
*/
- virtual void timerFired();
+ void timerFired() override;
/* main game functions */
void init();
@@ -139,17 +139,17 @@ public:
* tasks like adjusting the party's food, incrementing the number of
* moves, etc.
*/
- virtual void finishTurn();
+ void finishTurn() override;
/**
* Provide feedback to user after a party event happens.
*/
- virtual void update(Party *party, PartyEvent &event);
+ void update(Party *party, PartyEvent &event) override;
/**
* Provide feedback to user after a movement event happens.
*/
- virtual void update(Location *location, MoveEvent &event);
+ void update(Location *location, MoveEvent &event) override;
/**
* Initializes the moon state according to the savegame file. This method of
diff --git a/engines/ultima/ultima4/game/menuitem.h b/engines/ultima/ultima4/game/menuitem.h
index b3e0b22d8e..1a7da7e9d5 100644
--- a/engines/ultima/ultima4/game/menuitem.h
+++ b/engines/ultima/ultima4/game/menuitem.h
@@ -100,8 +100,8 @@ public:
BoolMenuItem *setValueStrings(const Common::String &onString, const Common::String &offString);
- virtual void activate(MenuEvent &event);
- virtual Common::String getText() const;
+ void activate(MenuEvent &event) override;
+ Common::String getText() const override;
protected:
bool *_val;
@@ -116,8 +116,8 @@ class StringMenuItem : public MenuItem {
public:
StringMenuItem(Common::String text, short xp, short yp, int shortcutKey, Common::String *val, const Std::vector<Common::String> &validSettings);
- virtual void activate(MenuEvent &event);
- virtual Common::String getText() const;
+ void activate(MenuEvent &event) override;
+ Common::String getText() const override;
protected:
Common::String *_val;
@@ -132,8 +132,8 @@ class IntMenuItem : public MenuItem {
public:
IntMenuItem(Common::String text, short xp, short yp, int shortcutKey, int *val, int min, int max, int increment, menuOutputType output = MENU_OUTPUT_INT);
- virtual void activate(MenuEvent &event);
- virtual Common::String getText() const;
+ void activate(MenuEvent &event) override;
+ Common::String getText() const override;
protected:
int *_val;
diff --git a/engines/ultima/ultima4/game/object.h b/engines/ultima/ultima4/game/object.h
index eb847dbf28..627a4314bb 100644
--- a/engines/ultima/ultima4/game/object.h
+++ b/engines/ultima/ultima4/game/object.h
@@ -59,63 +59,63 @@ public:
virtual ~Object() {}
// Methods
- MapTile &getTile() {
+ MapTile &getTile() {
return _tile;
}
- MapTile &getPrevTile() {
+ MapTile &getPrevTile() {
return _prevTile;
}
- const Coords &getCoords() const {
+ const Coords &getCoords() const {
return _coords;
}
- const Coords &getPrevCoords() const {
+ const Coords &getPrevCoords() const {
return _prevCoords;
}
ObjectMovementBehavior getMovementBehavior() const {
return _movementBehavior;
}
- Type getType() const {
+ Type getType() const {
return _objType;
}
- bool hasFocus() const {
+ bool hasFocus() const {
return _focused;
}
- bool isVisible() const {
+ bool isVisible() const {
return _visible;
}
- bool isAnimated() const {
+ bool isAnimated() const {
return _animated;
}
- void setTile(MapTile t) {
+ void setTile(MapTile t) {
_tile = t;
}
- void setTile(Tile *t) {
+ void setTile(Tile *t) {
_tile = t->getId();
}
- void setPrevTile(MapTile t) {
+ void setPrevTile(MapTile t) {
_prevTile = t;
}
- void setCoords(Coords c) {
+ void setCoords(Coords c) {
_prevCoords = _coords;
_coords = c;
}
- void setPrevCoords(Coords c) {
+ void setPrevCoords(Coords c) {
_prevCoords = c;
}
- void setMovementBehavior(ObjectMovementBehavior b) {
+ void setMovementBehavior(ObjectMovementBehavior b) {
_movementBehavior = b;
}
- void setType(Type t) {
+ void setType(Type t) {
_objType = t;
}
- void setFocus(bool f = true) {
+ void setFocus(bool f = true) {
_focused = f;
}
- void setVisible(bool v = true) {
+ void setVisible(bool v = true) {
_visible = v;
}
- void setAnimated(bool a = true) {
+ void setAnimated(bool a = true) {
_animated = a;
}
diff --git a/engines/ultima/ultima4/game/person.h b/engines/ultima/ultima4/game/person.h
index 6b187ca24f..7d0228470b 100644
--- a/engines/ultima/ultima4/game/person.h
+++ b/engines/ultima/ultima4/game/person.h
@@ -61,7 +61,7 @@ public:
bool canConverse() const;
bool isVendor() const;
- virtual Common::String getName() const;
+ Common::String getName() const override;
void goToStartLocation();
void setDialogue(Dialogue *d);
MapCoords &getStart() {
diff --git a/engines/ultima/ultima4/game/player.h b/engines/ultima/ultima4/game/player.h
index 0d9ad2de77..49424008c4 100644
--- a/engines/ultima/ultima4/game/player.h
+++ b/engines/ultima/ultima4/game/player.h
@@ -116,26 +116,26 @@ public:
/**
* Used to translate script values into something useful
*/
- virtual Common::String translate(Std::vector<Common::String> &parts);
+ Common::String translate(Std::vector<Common::String> &parts) override;
// Accessor methods
- virtual int getHp() const;
- int getMaxHp() const {
+ int getHp() const override;
+ int getMaxHp() const {
return _player->_hpMax;
}
- int getExp() const {
+ int getExp() const {
return _player->_xp;
}
- int getStr() const {
+ int getStr() const {
return _player->_str;
}
- int getDex() const {
+ int getDex() const {
return _player->_dex;
}
- int getInt() const {
+ int getInt() const {
return _player->_intel;
}
- int getMp() const {
+ int getMp() const {
return _player->_mp;
}
@@ -147,10 +147,10 @@ public:
const Weapon *getWeapon() const;
const Armor *getArmor() const;
- virtual Common::String getName() const;
+ Common::String getName() const override;
SexType getSex() const;
ClassType getClass() const;
- virtual CreatureStatus getState() const;
+ CreatureStatus getState() const override;
/**
* Determine what level a character has.
@@ -166,7 +166,7 @@ public:
/**
* Adds a status effect to the player
*/
- virtual void addStatus(StatusType status);
+ void addStatus(StatusType status) override;
/**
* Adjusts the player's mp by 'pts'
@@ -196,9 +196,9 @@ public:
/**
* Remove status effects from the party member
*/
- virtual void removeStatus(StatusType status);
+ void removeStatus(StatusType status) override;
- virtual void setHp(int hp);
+ void setHp(int hp) override;
void setMp(int mp);
EquipError setArmor(const Armor *a);
EquipError setWeapon(const Weapon *w);
@@ -211,10 +211,10 @@ public:
* there anything special about being killed by a party member in U5?) Also
* keeps interface consistent for virtual base function Creature::applydamage()
*/
- virtual bool applyDamage(int damage, bool byplayer = false);
- virtual int getAttackBonus() const;
- virtual int getDefense() const;
- virtual bool dealDamage(Creature *m, int damage);
+ bool applyDamage(int damage, bool byplayer = false) override;
+ int getAttackBonus() const override;
+ int getDefense() const override;
+ bool dealDamage(Creature *m, int damage) override;
/**
* Calculate damage for an attack.
@@ -225,13 +225,13 @@ public:
* Returns the tile that will be displayed when the party
* member's attack hits
*/
- virtual const Common::String &getHitTile() const;
+ const Common::String &getHitTile() const override;
/**
* Returns the tile that will be displayed when the party
* member's attack fails
*/
- virtual const Common::String &getMissTile() const;
+ const Common::String &getMissTile() const override;
bool isDead();
bool isDisabled();
@@ -250,7 +250,7 @@ public:
/**
* Wakes up the party member
*/
- virtual void wakeUp();
+ void wakeUp() override;
protected:
static MapTile tileForClass(int klass);
@@ -297,7 +297,7 @@ public:
void notifyOfChange(PartyMember *partyMember = 0, PartyEvent::Type = PartyEvent::GENERIC);
// Used to translate script values into something useful
- virtual Common::String translate(Std::vector<Common::String> &parts);
+ Common::String translate(Std::vector<Common::String> &parts) override;
void adjustFood(int food);
void adjustGold(int gold);
diff --git a/engines/ultima/ultima4/game/stats.h b/engines/ultima/ultima4/game/stats.h
index e737c971f5..453fd8d95c 100644
--- a/engines/ultima/ultima4/game/stats.h
+++ b/engines/ultima/ultima4/game/stats.h
@@ -88,11 +88,11 @@ public:
* Update the stats (ztats) box on the upper right of the screen.
*/
virtual void update(bool avatarOnly = false);
- virtual void update(Aura *aura);
- virtual void update(Party *party, PartyEvent &event) {
+ void update(Aura *aura) override;
+ void update(Party *party, PartyEvent &event) override {
update(); // do a full update
}
- virtual void update(Menu *menu, MenuEvent &event) {
+ void update(Menu *menu, MenuEvent &event) override {
update(); // do a full update
}
@@ -178,7 +178,7 @@ public:
/**
* Handles spell mixing for the Ultima V-style menu-system
*/
- bool keyPressed(int key);
+ bool keyPressed(int key) override;
private:
Ingredients *_ingredients;
diff --git a/engines/ultima/ultima4/gfx/imageloader_fmtowns.h b/engines/ultima/ultima4/gfx/imageloader_fmtowns.h
index 0ff6886b29..0b76a762da 100644
--- a/engines/ultima/ultima4/gfx/imageloader_fmtowns.h
+++ b/engines/ultima/ultima4/gfx/imageloader_fmtowns.h
@@ -38,7 +38,7 @@ public:
/**
* Loads in an FM TOWNS files, which we assume is 16 bits.
*/
- virtual Image *load(U4FILE *file, int width, int height, int bpp);
+ Image *load(U4FILE *file, int width, int height, int bpp) override;
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/gfx/imageloader_png.h b/engines/ultima/ultima4/gfx/imageloader_png.h
index ab9a2f84e6..725397ef68 100644
--- a/engines/ultima/ultima4/gfx/imageloader_png.h
+++ b/engines/ultima/ultima4/gfx/imageloader_png.h
@@ -40,7 +40,7 @@ public:
/**
* Loads in the PNG with the libpng library.
*/
- virtual Image *load(U4FILE *file, int width, int height, int bpp);
+ Image *load(U4FILE *file, int width, int height, int bpp) override;
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/gfx/imageloader_u4.h b/engines/ultima/ultima4/gfx/imageloader_u4.h
index a48d0dab98..6ba0c1d7f8 100644
--- a/engines/ultima/ultima4/gfx/imageloader_u4.h
+++ b/engines/ultima/ultima4/gfx/imageloader_u4.h
@@ -41,7 +41,7 @@ public:
/**
* Loads in the raw image and apply the standard U4 16 or 256 color palette.
*/
- virtual Image *load(U4FILE *file, int width, int height, int bpp);
+ Image *load(U4FILE *file, int width, int height, int bpp) override;
};
/**
@@ -52,7 +52,7 @@ public:
*/
class U4RleImageLoader : public ImageLoader {
public:
- virtual Image *load(U4FILE *file, int width, int height, int bpp);
+ Image *load(U4FILE *file, int width, int height, int bpp) override;
};
/**
@@ -63,7 +63,7 @@ public:
*/
class U4LzwImageLoader : public ImageLoader {
public:
- virtual Image *load(U4FILE *file, int width, int height, int bpp);
+ Image *load(U4FILE *file, int width, int height, int bpp) override;
};
class U4PaletteLoader {
diff --git a/engines/ultima/ultima4/map/camp.h b/engines/ultima/ultima4/map/camp.h
index 4fd1aaeca2..a7e2f59a79 100644
--- a/engines/ultima/ultima4/map/camp.h
+++ b/engines/ultima/ultima4/map/camp.h
@@ -33,9 +33,9 @@ namespace Ultima4 {
class CampController : public CombatController {
public:
CampController();
- virtual void init(Creature *m);
- virtual void begin();
- virtual void end(bool adjustKarma);
+ void init(Creature *m) override;
+ void begin() override;
+ void end(bool adjustKarma) override;
private:
bool heal();
@@ -45,15 +45,13 @@ class InnController : public CombatController {
public:
InnController();
- virtual void begin();
- virtual void awardLoot();
-
+ void begin() override;
+ void awardLoot() override;
private:
bool heal();
void maybeMeetIsaac();
void maybeAmbush();
-
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/map/city.h b/engines/ultima/ultima4/map/city.h
index ba2a48ffa0..4eb8754216 100644
--- a/engines/ultima/ultima4/map/city.h
+++ b/engines/ultima/ultima4/map/city.h
@@ -49,7 +49,7 @@ public:
/**
* Returns the name of the city
*/
- virtual Common::String getName();
+ Common::String getName() override;
/**
* Adds a person object to the map
diff --git a/engines/ultima/ultima4/map/combat.h b/engines/ultima/ultima4/map/combat.h
index dd632bd73a..490857fada 100644
--- a/engines/ultima/ultima4/map/combat.h
+++ b/engines/ultima/ultima4/map/combat.h
@@ -66,17 +66,17 @@ public:
virtual ~CombatController();
// Accessor Methods
- bool isCombatController() const {
+ bool isCombatController() const {
return true;
}
- bool isCamping() const;
- bool isWinOrLose() const;
- Direction getExitDir() const;
+ bool isCamping() const;
+ bool isWinOrLose() const;
+ Direction getExitDir() const;
unsigned char getFocus() const;
- CombatMap *getMap() const;
- Creature *getCreature() const;
+ CombatMap *getMap() const;
+ Creature *getCreature() const;
PartyMemberVector *getParty();
- PartyMember *getCurrentPlayer();
+ PartyMember *getCurrentPlayer();
void setExitDir(Direction d);
void setCreature(Creature *);
@@ -168,15 +168,15 @@ public:
static void doScreenAnimationsWhilePausing(int timeFactor);
// Key handlers
- virtual bool keyPressed(int key);
+ bool keyPressed(int key) override;
- virtual void finishTurn();
+ void finishTurn() override;
/**
* Move a party member during combat and display the appropriate messages
*/
void movePartyMember(MoveEvent &event);
- virtual void update(Party *party, PartyEvent &event);
+ void update(Party *party, PartyEvent &event) override;
// Properties
protected:
diff --git a/engines/ultima/ultima4/map/dungeon.h b/engines/ultima/ultima4/map/dungeon.h
index cb2465ff09..9c3625c633 100644
--- a/engines/ultima/ultima4/map/dungeon.h
+++ b/engines/ultima/ultima4/map/dungeon.h
@@ -92,7 +92,7 @@ public:
/**
* Returns the name of the dungeon
*/
- virtual Common::String getName();
+ Common::String getName() override;
/**
* Returns the dungeon token associated with the given dungeon tile
diff --git a/engines/ultima/ultima4/map/map.h b/engines/ultima/ultima4/map/map.h
index f7e0b4a65f..729466e4df 100644
--- a/engines/ultima/ultima4/map/map.h
+++ b/engines/ultima/ultima4/map/map.h
@@ -166,7 +166,7 @@ public:
* Returns the object at the given (x,y,z) coords, if one exists.
* Otherwise, returns NULL.
*/
- class Object *objectAt(const Coords &coords);
+ Object *objectAt(const Coords &coords);
/**
* Returns the portal for the correspoding action(s) given.
diff --git a/engines/ultima/ultima4/map/maploader.h b/engines/ultima/ultima4/map/maploader.h
index 95a4b2baa8..1377cbb98e 100644
--- a/engines/ultima/ultima4/map/maploader.h
+++ b/engines/ultima/ultima4/map/maploader.h
@@ -97,7 +97,7 @@ public:
/**
* Loads a combat map from the 'con' file
*/
- virtual bool load(Map *map);
+ bool load(Map *map) override;
};
class DngMapLoader : public MapLoader {
@@ -107,7 +107,7 @@ public:
/**
* Loads a dungeon map from the 'dng' file
*/
- virtual bool load(Map *map);
+ bool load(Map *map) override;
private:
/**
@@ -122,7 +122,7 @@ public:
/**
* Loads the world map data in from the 'world' file.
*/
- virtual bool load(Map *map);
+ bool load(Map *map) override;
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/map/shrine.h b/engines/ultima/ultima4/map/shrine.h
index 6d50e6cf35..2378580207 100644
--- a/engines/ultima/ultima4/map/shrine.h
+++ b/engines/ultima/ultima4/map/shrine.h
@@ -37,12 +37,12 @@ public:
Shrine();
// Methods
- virtual Common::String getName();
- Virtue getVirtue() const;
- Common::String getMantra() const;
+ Common::String getName() override;
+ Virtue getVirtue() const;
+ Common::String getMantra() const;
- void setVirtue(Virtue v);
- void setMantra(Common::String mantra);
+ void setVirtue(Virtue v);
+ void setMantra(Common::String mantra);
/**
* Enter the shrine
diff --git a/engines/ultima/ultima4/map/tileanim.h b/engines/ultima/ultima4/map/tileanim.h
index c04bb362cb..4225b0bb9a 100644
--- a/engines/ultima/ultima4/map/tileanim.h
+++ b/engines/ultima/ultima4/map/tileanim.h
@@ -36,7 +36,7 @@ struct RGBA;
/**
* The interface for tile animation transformations.
*/
-class TileAnimTransform {
+class TileAnimTransform {
public:
static TileAnimTransform *create(const ConfigElement &config);
@@ -63,8 +63,8 @@ private:
class TileAnimInvertTransform : public TileAnimTransform {
public:
TileAnimInvertTransform(int xp, int yp, int width, int height);
- virtual void draw(Image *dest, Tile *tile, MapTile &mapTile);
- virtual bool drawsTile() const;
+ void draw(Image *dest, Tile *tile, MapTile &mapTile) override;
+ bool drawsTile() const override;
private:
int x, y, w, h;
@@ -78,8 +78,8 @@ private:
class TileAnimPixelTransform : public TileAnimTransform {
public:
TileAnimPixelTransform(int xp, int yp);
- virtual void draw(Image *dest, Tile *tile, MapTile &mapTile);
- virtual bool drawsTile() const;
+ void draw(Image *dest, Tile *tile, MapTile &mapTile) override;
+ bool drawsTile() const override;
int x, y;
Std::vector<RGBA *> _colors;
@@ -92,8 +92,8 @@ public:
class TileAnimScrollTransform : public TileAnimTransform {
public:
TileAnimScrollTransform(int increment);
- virtual void draw(Image *dest, Tile *tile, MapTile &mapTile);
- virtual bool drawsTile() const;
+ void draw(Image *dest, Tile *tile, MapTile &mapTile) override;
+ bool drawsTile() const override;
private:
int _increment, _current, _lastOffset;
};
@@ -106,12 +106,12 @@ class TileAnimFrameTransform : public TileAnimTransform {
public:
TileAnimFrameTransform() : _currentFrame(0) {
}
- virtual void draw(Image *dest, Tile *tile, MapTile &mapTile);
+ void draw(Image *dest, Tile *tile, MapTile &mapTile) override;
/**
* Advance the frame by one and draw it!
*/
- virtual bool drawsTile() const;
+ bool drawsTile() const override;
protected:
int _currentFrame;
};
@@ -124,8 +124,8 @@ protected:
class TileAnimPixelColorTransform : public TileAnimTransform {
public:
TileAnimPixelColorTransform(int xp, int yp, int width, int height);
- virtual void draw(Image *dest, Tile *tile, MapTile &mapTile);
- virtual bool drawsTile() const;
+ void draw(Image *dest, Tile *tile, MapTile &mapTile) override;
+ bool drawsTile() const override;
int x, y, w, h;
RGBA *_start, *_end;
@@ -170,7 +170,7 @@ public:
* A context which depends on the tile's current frame for animation
*/
TileAnimFrameContext(int frame);
- virtual bool isInContext(Tile *t, MapTile &mapTile, Direction d);
+ bool isInContext(Tile *t, MapTile &mapTile, Direction d) override;
private:
int _frame;
@@ -185,7 +185,7 @@ public:
* An animation context which changes the animation based on the player's current facing direction
*/
TileAnimPlayerDirContext(Direction dir);
- virtual bool isInContext(Tile *t, MapTile &mapTile, Direction d);
+ bool isInContext(Tile *t, MapTile &mapTile, Direction d) override;
private:
Direction _dir;
More information about the Scummvm-git-logs
mailing list