games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

wipe constexpr on @DjWarmonger request

Browse Source
This commit is contained in:
AlexVinS
2016-01-29 00:34:54 +03:00
parent 7429403d80
commit 0011507e42
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapObjects/CQuest.h
View File

@@ -130,7 +130,7 @@ public:
h & rewardType & rID & rVal & seerName; h & rewardType & rID & rVal & seerName;
} }
protected: protected:
static constexpr int OBJPROP_VISITED = 10; static const int OBJPROP_VISITED = 10;
void setPropertyDer(ui8 what, ui32 val) override; void setPropertyDer(ui8 what, ui32 val) override;
}; };

4
lib/mapObjects/MiscObjects.h
View File

@@ -29,7 +29,7 @@ public:
h & players; h & players;
} }
static constexpr int OBJPROP_VISITED = 10; static const int OBJPROP_VISITED = 10;
}; };
class DLL_LINKAGE CGCreature : public CArmedInstance //creatures on map class DLL_LINKAGE CGCreature : public CArmedInstance //creatures on map
@@ -453,7 +453,7 @@ class DLL_LINKAGE CGDenOfthieves : public CGObjectInstance
class DLL_LINKAGE CGObelisk : public CPlayersVisited class DLL_LINKAGE CGObelisk : public CPlayersVisited
{ {
public: public:
static constexpr int OBJPROP_INC = 20; static const int OBJPROP_INC = 20;
static ui8 obeliskCount; //how many obelisks are on map static ui8 obeliskCount; //how many obelisks are on map
static std::map<TeamID, ui8> visited; //map: team_id => how many obelisks has been visited static std::map<TeamID, ui8> visited; //map: team_id => how many obelisks has been visited