games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Merge branch 'develop' into 'lobby'

Browse Source
This commit is contained in:
Ivan Savenko committed 2024-02-11 16:13:13 +02:00
2 parents 1a144fc516 51f24178a3
commit f2ecd4cf11
141 files changed
+908 -514
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

server/queries/BattleQueries.h
+5 -5
View File
@@ -28,10 +28,10 @@ public:
CBattleQuery(CGameHandler * owner);
CBattleQuery(CGameHandler * owner, const IBattleInfo * Bi); //TODO
virtual void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
virtual bool blocksPack(const CPack *pack) const override;
virtual void onRemoval(PlayerColor color) override;
virtual void onExposure(QueryPtr topQuery) override;
void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
bool blocksPack(const CPack *pack) const override;
void onRemoval(PlayerColor color) override;
void onExposure(QueryPtr topQuery) override;
};
class CBattleDialogQuery : public CDialogQuery
@@ -41,5 +41,5 @@ public:
const IBattleInfo * bi;
virtual void onRemoval(PlayerColor color) override;
void onRemoval(PlayerColor color) override;
};
server/queries/CQuery.h
+2 -2
View File
@@ -68,8 +68,8 @@ class CDialogQuery : public CQuery
{
public:
CDialogQuery(CGameHandler * owner);
virtual bool endsByPlayerAnswer() const override;
virtual bool blocksPack(const CPack *pack) const override;
bool endsByPlayerAnswer() const override;
bool blocksPack(const CPack *pack) const override;
void setReply(std::optional<int32_t> reply) override;
protected:
std::optional<ui32> answer;
server/queries/MapQueries.h
+14 -14
View File
@@ -46,9 +46,9 @@ public:
CObjectVisitQuery(CGameHandler * owner, const CGObjectInstance *Obj, const CGHeroInstance *Hero, int3 Tile);
virtual bool blocksPack(const CPack *pack) const override;
virtual void onRemoval(PlayerColor color) override;
virtual void onExposure(QueryPtr topQuery) override;
bool blocksPack(const CPack *pack) const override;
void onRemoval(PlayerColor color) override;
void onExposure(QueryPtr topQuery) override;
};
//Created when hero attempts move and something happens
@@ -60,11 +60,11 @@ public:
bool visitDestAfterVictory; //if hero moved to guarded tile and it should be visited once guard is defeated
const CGHeroInstance *hero;
virtual void onExposure(QueryPtr topQuery) override;
void onExposure(QueryPtr topQuery) override;
CHeroMovementQuery(CGameHandler * owner, const TryMoveHero & Tmh, const CGHeroInstance * Hero, bool VisitDestAfterVictory = false);
virtual void onAdding(PlayerColor color) override;
virtual void onRemoval(PlayerColor color) override;
void onAdding(PlayerColor color) override;
void onRemoval(PlayerColor color) override;
};
class CGarrisonDialogQuery : public CDialogQuery //used also for hero exchange dialogs
@@ -73,8 +73,8 @@ public:
std::array<const CArmedInstance *,2> exchangingArmies;
CGarrisonDialogQuery(CGameHandler * owner, const CArmedInstance *up, const CArmedInstance *down);
virtual void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
virtual bool blocksPack(const CPack *pack) const override;
void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
bool blocksPack(const CPack *pack) const override;
};
//yes/no and component selection dialogs
@@ -85,7 +85,7 @@ public:
CBlockingDialogQuery(CGameHandler * owner, const BlockingDialog &bd);
virtual void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
};
class OpenWindowQuery : public CDialogQuery
@@ -105,7 +105,7 @@ public:
CTeleportDialogQuery(CGameHandler * owner, const TeleportDialog &td);
virtual void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
};
class CHeroLevelUpDialogQuery : public CDialogQuery
@@ -113,8 +113,8 @@ class CHeroLevelUpDialogQuery : public CDialogQuery
public:
CHeroLevelUpDialogQuery(CGameHandler * owner, const HeroLevelUp &Hlu, const CGHeroInstance * Hero);
virtual void onRemoval(PlayerColor color) override;
virtual void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
void onRemoval(PlayerColor color) override;
void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
HeroLevelUp hlu;
const CGHeroInstance * hero;
@@ -125,8 +125,8 @@ class CCommanderLevelUpDialogQuery : public CDialogQuery
public:
CCommanderLevelUpDialogQuery(CGameHandler * owner, const CommanderLevelUp &Clu, const CGHeroInstance * Hero);
virtual void onRemoval(PlayerColor color) override;
virtual void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
void onRemoval(PlayerColor color) override;
void notifyObjectAboutRemoval(const CObjectVisitQuery &objectVisit) const override;
CommanderLevelUp clu;
const CGHeroInstance * hero;