games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-31 22:05:10 +02:00
Code Issues Releases Activity

Add reset to some static variables on client

Browse Source
This commit is contained in:
Arseniy Shestakov 2016-08-25 15:52:20 +03:00
parent f020fa06fd
commit a90b657b86
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/Client.cpp
View File

@ -240,6 +240,8 @@ void CClient::endGame( bool closeConnection /*= true*/ )
battleints.clear(); battleints.clear();
callbacks.clear(); callbacks.clear();
battleCallbacks.clear(); battleCallbacks.clear();
CGKeys::reset();
CGMagi::reset();
CGObelisk::reset(); CGObelisk::reset();
logNetwork->infoStream() << "Deleted playerInts."; logNetwork->infoStream() << "Deleted playerInts.";
logNetwork->infoStream() << "Client stopped."; logNetwork->infoStream() << "Client stopped.";

5
lib/mapObjects/CQuest.cpp
View File

@ -762,6 +762,11 @@ void CGQuestGuard::completeQuest(const CGHeroInstance *h) const
cb->removeObject(this); cb->removeObject(this);
} }
void CGKeys::reset()
{
playerKeyMap.clear();
}
void CGKeys::setPropertyDer (ui8 what, ui32 val) //101-108 - enable key for player 1-8 void CGKeys::setPropertyDer (ui8 what, ui32 val) //101-108 - enable key for player 1-8
{ {
if (what >= 101 && what <= (100 + PlayerColor::PLAYER_LIMIT_I)) if (what >= 101 && what <= (100 + PlayerColor::PLAYER_LIMIT_I))

2
lib/mapObjects/CQuest.h
View File

@ -154,6 +154,8 @@ public:
static std::map <PlayerColor, std::set <ui8> > playerKeyMap; //[players][keysowned] static std::map <PlayerColor, std::set <ui8> > playerKeyMap; //[players][keysowned]
//SubID 0 - lightblue, 1 - green, 2 - red, 3 - darkblue, 4 - brown, 5 - purple, 6 - white, 7 - black //SubID 0 - lightblue, 1 - green, 2 - red, 3 - darkblue, 4 - brown, 5 - purple, 6 - white, 7 - black
static void reset();
bool wasMyColorVisited (PlayerColor player) const; bool wasMyColorVisited (PlayerColor player) const;
std::string getObjectName() const override; //depending on color std::string getObjectName() const override; //depending on color

5
lib/mapObjects/MiscObjects.cpp
View File

@ -1869,6 +1869,11 @@ void CGGarrison::serializeJsonOptions(JsonSerializeFormat& handler)
CCreatureSet::serializeJson(handler, "army"); CCreatureSet::serializeJson(handler, "army");
} }
void CGMagi::reset()
{
eyelist.clear();
}
void CGMagi::initObj() void CGMagi::initObj()
{ {
if (ID == Obj::EYE_OF_MAGI) if (ID == Obj::EYE_OF_MAGI)

2
lib/mapObjects/MiscObjects.h
View File

@ -441,6 +441,8 @@ class DLL_LINKAGE CGMagi : public CGObjectInstance
public: public:
static std::map <si32, std::vector<ObjectInstanceID> > eyelist; //[subID][id], supports multiple sets as in H5 static std::map <si32, std::vector<ObjectInstanceID> > eyelist; //[subID][id], supports multiple sets as in H5
static void reset();
void initObj() override; void initObj() override;
void onHeroVisit(const CGHeroInstance * h) const override; void onHeroVisit(const CGHeroInstance * h) const override;