games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Add override keyword where applicable

Browse Source
This commit is contained in:
Michał Janiszewski 2017-02-17 10:16:17 +01:00
parent d23328f697
commit f5ebc763b4
5 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
AI/BattleAI/BattleAI.h
View File

@ -1,100 +1,100 @@
/* /*
* BattleAI.h, part of VCMI engine * BattleAI.h, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *
* License: GNU General Public License v2.0 or later * License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
#pragma once #pragma once
#include "../../lib/AI_Base.h" #include "../../lib/AI_Base.h"
#include "PotentialTargets.h" #include "PotentialTargets.h"
class CSpell; class CSpell;
class EnemyInfo; class EnemyInfo;
/* /*
struct CurrentOffensivePotential struct CurrentOffensivePotential
{ {
std::map<const CStack *, PotentialTargets> ourAttacks; std::map<const CStack *, PotentialTargets> ourAttacks;
std::map<const CStack *, PotentialTargets> enemyAttacks; std::map<const CStack *, PotentialTargets> enemyAttacks;
CurrentOffensivePotential(ui8 side) CurrentOffensivePotential(ui8 side)
{ {
for(auto stack : cbc->battleGetStacks()) for(auto stack : cbc->battleGetStacks())
{ {
if(stack->attackerOwned == !side) if(stack->attackerOwned == !side)
ourAttacks[stack] = PotentialTargets(stack); ourAttacks[stack] = PotentialTargets(stack);
else else
enemyAttacks[stack] = PotentialTargets(stack); enemyAttacks[stack] = PotentialTargets(stack);
} }
} }
int potentialValue() int potentialValue()
{ {
int ourPotential = 0, enemyPotential = 0; int ourPotential = 0, enemyPotential = 0;
for(auto &p : ourAttacks) for(auto &p : ourAttacks)
ourPotential += p.second.bestAction().attackValue(); ourPotential += p.second.bestAction().attackValue();
for(auto &p : enemyAttacks) for(auto &p : enemyAttacks)
enemyPotential += p.second.bestAction().attackValue(); enemyPotential += p.second.bestAction().attackValue();
return ourPotential - enemyPotential; return ourPotential - enemyPotential;
} }
}; };
*/ // These lines may be usefull but they are't used in the code. */ // These lines may be usefull but they are't used in the code.
struct PossibleSpellcast struct PossibleSpellcast
{ {
const CSpell *spell; const CSpell *spell;
BattleHex dest; BattleHex dest;
si32 value; si32 value;
}; };
class CBattleAI : public CBattleGameInterface class CBattleAI : public CBattleGameInterface
{ {
int side; int side;
std::shared_ptr<CBattleCallback> cb; std::shared_ptr<CBattleCallback> cb;
//Previous setting of cb //Previous setting of cb
bool wasWaitingForRealize, wasUnlockingGs; bool wasWaitingForRealize, wasUnlockingGs;
public: public:
CBattleAI(void); CBattleAI(void);
~CBattleAI(void); ~CBattleAI(void);
void init(std::shared_ptr<CBattleCallback> CB) override; void init(std::shared_ptr<CBattleCallback> CB) override;
void attemptCastingSpell(); void attemptCastingSpell();
BattleAction activeStack(const CStack * stack) override; //called when it's turn of that stack BattleAction activeStack(const CStack * stack) override; //called when it's turn of that stack
BattleAction goTowards(const CStack * stack, BattleHex hex ); BattleAction goTowards(const CStack * stack, BattleHex hex );
boost::optional<BattleAction> considerFleeingOrSurrendering(); boost::optional<BattleAction> considerFleeingOrSurrendering();
std::vector<BattleHex> getTargetsToConsider(const CSpell *spell, const ISpellCaster * caster) const; std::vector<BattleHex> getTargetsToConsider(const CSpell *spell, const ISpellCaster * caster) const;
static int distToNearestNeighbour(BattleHex hex, const ReachabilityInfo::TDistances& dists, BattleHex *chosenHex = nullptr); static int distToNearestNeighbour(BattleHex hex, const ReachabilityInfo::TDistances& dists, BattleHex *chosenHex = nullptr);
static bool isCloser(const EnemyInfo & ei1, const EnemyInfo & ei2, const ReachabilityInfo::TDistances & dists); static bool isCloser(const EnemyInfo & ei1, const EnemyInfo & ei2, const ReachabilityInfo::TDistances & dists);
void print(const std::string &text) const; void print(const std::string &text) const;
BattleAction useCatapult(const CStack *stack); BattleAction useCatapult(const CStack *stack);
void battleStart(const CCreatureSet * army1, const CCreatureSet * army2, int3 tile, const CGHeroInstance * hero1, const CGHeroInstance * hero2, bool Side); void battleStart(const CCreatureSet * army1, const CCreatureSet * army2, int3 tile, const CGHeroInstance * hero1, const CGHeroInstance * hero2, bool Side) override;
//void actionFinished(const BattleAction &action) override;//occurs AFTER every action taken by any stack or by the hero //void actionFinished(const BattleAction &action) override;//occurs AFTER every action taken by any stack or by the hero
//void actionStarted(const BattleAction &action) override;//occurs BEFORE every action taken by any stack or by the hero //void actionStarted(const BattleAction &action) override;//occurs BEFORE every action taken by any stack or by the hero
//void battleAttack(const BattleAttack *ba) override; //called when stack is performing attack //void battleAttack(const BattleAttack *ba) override; //called when stack is performing attack
//void battleStacksAttacked(const std::vector<BattleStackAttacked> & bsa) override; //called when stack receives damage (after battleAttack()) //void battleStacksAttacked(const std::vector<BattleStackAttacked> & bsa) override; //called when stack receives damage (after battleAttack())
//void battleEnd(const BattleResult *br) override; //void battleEnd(const BattleResult *br) override;
//void battleResultsApplied() override; //called when all effects of last battle are applied //void battleResultsApplied() override; //called when all effects of last battle are applied
//void battleNewRoundFirst(int round) override; //called at the beginning of each turn before changes are applied; //void battleNewRoundFirst(int round) override; //called at the beginning of each turn before changes are applied;
//void battleNewRound(int round) override; //called at the beginning of each turn, round=-1 is the tactic phase, round=0 is the first "normal" turn //void battleNewRound(int round) override; //called at the beginning of each turn, round=-1 is the tactic phase, round=0 is the first "normal" turn
//void battleStackMoved(const CStack * stack, std::vector<BattleHex> dest, int distance) override; //void battleStackMoved(const CStack * stack, std::vector<BattleHex> dest, int distance) override;
//void battleSpellCast(const BattleSpellCast *sc) override; //void battleSpellCast(const BattleSpellCast *sc) override;
//void battleStacksEffectsSet(const SetStackEffect & sse) override;//called when a specific effect is set to stacks //void battleStacksEffectsSet(const SetStackEffect & sse) override;//called when a specific effect is set to stacks
//void battleTriggerEffect(const BattleTriggerEffect & bte) override; //void battleTriggerEffect(const BattleTriggerEffect & bte) override;
//void battleStart(const CCreatureSet *army1, const CCreatureSet *army2, int3 tile, const CGHeroInstance *hero1, const CGHeroInstance *hero2, bool side) override; //called by engine when battle starts; side=0 - left, side=1 - right //void battleStart(const CCreatureSet *army1, const CCreatureSet *army2, int3 tile, const CGHeroInstance *hero1, const CGHeroInstance *hero2, bool side) override; //called by engine when battle starts; side=0 - left, side=1 - right
//void battleStacksHealedRes(const std::vector<std::pair<ui32, ui32> > & healedStacks, bool lifeDrain, bool tentHeal, si32 lifeDrainFrom) override; //called when stacks are healed / resurrected first element of pair - stack id, second - healed hp //void battleStacksHealedRes(const std::vector<std::pair<ui32, ui32> > & healedStacks, bool lifeDrain, bool tentHeal, si32 lifeDrainFrom) override; //called when stacks are healed / resurrected first element of pair - stack id, second - healed hp
//void battleNewStackAppeared(const CStack * stack) override; //not called at the beginning of a battle or by resurrection; called eg. when elemental is summoned //void battleNewStackAppeared(const CStack * stack) override; //not called at the beginning of a battle or by resurrection; called eg. when elemental is summoned
//void battleObstaclesRemoved(const std::set<si32> & removedObstacles) override; //called when a certain set of obstacles is removed from batlefield; IDs of them are given //void battleObstaclesRemoved(const std::set<si32> & removedObstacles) override; //called when a certain set of obstacles is removed from batlefield; IDs of them are given
//void battleCatapultAttacked(const CatapultAttack & ca) override; //called when catapult makes an attack //void battleCatapultAttacked(const CatapultAttack & ca) override; //called when catapult makes an attack
//void battleStacksRemoved(const BattleStacksRemoved & bsr) override; //called when certain stack is completely removed from battlefield //void battleStacksRemoved(const BattleStacksRemoved & bsr) override; //called when certain stack is completely removed from battlefield
}; };

2
launcher/modManager/cmodlistmodel_moc.h
View File

@ -78,7 +78,7 @@ class CModFilterModel : public QSortFilterProxyModel
bool filterMatchesThis(const QModelIndex & source) const; bool filterMatchesThis(const QModelIndex & source) const;
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const; bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
public: public:
void setTypeFilter(int filteredType, int filterMask); void setTypeFilter(int filteredType, int filterMask);

4
launcher/modManager/cmodlistview_moc.h
View File

@ -27,9 +27,9 @@ class CModListView : public QWidget
SettingsListener settingsListener; SettingsListener settingsListener;
bool repositoriesChanged; bool repositoriesChanged;
void showEvent(QShowEvent * event); void showEvent(QShowEvent * event) override;
void keyPressEvent(QKeyEvent * event); void keyPressEvent(QKeyEvent * event) override;
void setupModModel(); void setupModModel();
void setupFilterModel(); void setupFilterModel();

4
launcher/modManager/imageviewer_moc.h
View File

@ -19,8 +19,8 @@ public:
static void showPixmap(QPixmap & pixmap, QWidget *parent = 0); static void showPixmap(QPixmap & pixmap, QWidget *parent = 0);
protected: protected:
void mousePressEvent(QMouseEvent * event); void mousePressEvent(QMouseEvent * event) override;
void keyPressEvent(QKeyEvent * event); void keyPressEvent(QKeyEvent * event) override;
QSize calculateWindowSize(); QSize calculateWindowSize();

4
server/CGameHandler.cpp
View File

@ -93,7 +93,7 @@ public:
template <typename T> class CApplyOnGH : public CBaseForGHApply template <typename T> class CApplyOnGH : public CBaseForGHApply
{ {
public: public:
bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const override
{ {
T *ptr = static_cast<T*>(pack); T *ptr = static_cast<T*>(pack);
ptr->c = c; ptr->c = c;
@ -106,7 +106,7 @@ template <>
class CApplyOnGH<CPack> : public CBaseForGHApply class CApplyOnGH<CPack> : public CBaseForGHApply
{ {
public: public:
bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const bool applyOnGH(CGameHandler *gh, CConnection *c, void *pack, PlayerColor player) const override
{ {
logGlobal->error("Cannot apply on GH plain CPack!"); logGlobal->error("Cannot apply on GH plain CPack!");
assert(0); assert(0);