games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Implemented serialization of MapObjectSubID, refactoring of related code

Browse Source
This commit is contained in:
Ivan Savenko
2023-11-17 21:18:34 +02:00
parent 9f906ff1d2
commit c872f8418f
15 changed files with 103 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mapObjects/CQuest.h
View File

@@ -168,11 +168,6 @@ protected:
class DLL_LINKAGE CGKeys : public CGObjectInstance //Base class for Keymaster and guards
{
public:
static std::map <PlayerColor, std::set <MapObjectSubID> > playerKeyMap; //[players][keysowned]
//SubID 0 - lightblue, 1 - green, 2 - red, 3 - darkblue, 4 - brown, 5 - purple, 6 - white, 7 - black
static void reset();
bool wasMyColorVisited(const PlayerColor & player) const;
std::string getObjectName() const override; //depending on color
@@ -182,8 +177,6 @@ public:
{
h & static_cast<CGObjectInstance&>(*this);
}
protected:
void setPropertyDer(ObjProperty what, ObjPropertyID identifier) override;
};
class DLL_LINKAGE CGKeymasterTent : public CGKeys