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

Fix level up crashes: 1) Crash on double level up. 2) Crash on custom class level up.

Browse Source
This commit is contained in:
Dmitry Orlov
2020-10-19 22:39:57 +03:00
parent 643cc00db6
commit b25baf66be
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/CHeroHandler.h
View File

@ -195,6 +195,13 @@ public:
h & imageBattleFemale; h & imageBattleFemale;
h & imageMapMale; h & imageMapMale;
h & imageMapFemale; h & imageMapFemale;
if(!h.saving)
{
for(auto i = 0; i < secSkillProbability.size(); i++)
if(secSkillProbability[i] < 0)
secSkillProbability[i] = 0;
}
} }
EAlignment::EAlignment getAlignment() const; EAlignment::EAlignment getAlignment() const;
}; };

1
lib/CSkillHandler.cpp
View File

@ -34,6 +34,7 @@ CSkill::LevelInfo::~LevelInfo()
CSkill::CSkill(SecondarySkill id, std::string identifier) CSkill::CSkill(SecondarySkill id, std::string identifier)
: id(id), identifier(identifier) : id(id), identifier(identifier)
{ {
gainChance[0] = gainChance[1] = 0; //affects CHeroClassHandler::afterLoadFinalization()
levels.resize(NSecondarySkill::levels.size() - 1); levels.resize(NSecondarySkill::levels.size() - 1);
} }

14
server/CGameHandler.cpp
View File

@ -1812,7 +1812,7 @@ void CGameHandler::newTurn()
setPortalDwelling(t, true, (n.specialWeek == NewTurn::PLAGUE ? true : false)); //set creatures for Portal of Summoning setPortalDwelling(t, true, (n.specialWeek == NewTurn::PLAGUE ? true : false)); //set creatures for Portal of Summoning
if (!firstTurn) if (!firstTurn)
if (t->hasBuilt(BuildingID::TREASURY, ETownType::RAMPART) && player < PlayerColor::PLAYER_LIMIT) if (t->hasBuilt(BuildingSubID::TREASURY) && player < PlayerColor::PLAYER_LIMIT)
n.res[player][Res::GOLD] += hadGold.at(player)/10; //give 10% of starting gold n.res[player][Res::GOLD] += hadGold.at(player)/10; //give 10% of starting gold
if (!vstd::contains(n.cres, t->id)) if (!vstd::contains(n.cres, t->id))
@ -3848,8 +3848,18 @@ bool CGameHandler::queryReply(QueryID qid, const JsonNode & answer, PlayerColor
logGlobal->trace(answer.toJson()); logGlobal->trace(answer.toJson());
auto topQuery = queries.topQuery(player); auto topQuery = queries.topQuery(player);
COMPLAIN_RET_FALSE_IF(!topQuery, "This player doesn't have any queries!"); COMPLAIN_RET_FALSE_IF(!topQuery, "This player doesn't have any queries!");
COMPLAIN_RET_FALSE_IF(topQuery->queryID != qid, "This player top query has different ID!");
if(topQuery->queryID != qid)
{
auto currentQuery = queries.getQuery(qid);
if(currentQuery != nullptr && currentQuery->endsByPlayerAnswer())
currentQuery->setReply(answer);
COMPLAIN_RET("This player top query has different ID!"); //topQuery->queryID != qid
}
COMPLAIN_RET_FALSE_IF(!topQuery->endsByPlayerAnswer(), "This query cannot be ended by player's answer!"); COMPLAIN_RET_FALSE_IF(!topQuery->endsByPlayerAnswer(), "This query cannot be ended by player's answer!");
topQuery->setReply(answer); topQuery->setReply(answer);

13
server/CQuery.cpp
View File

@ -248,10 +248,10 @@ std::vector<std::shared_ptr<const CQuery>> Queries::allQueries() const
return ret; return ret;
} }
std::vector<std::shared_ptr<CQuery>> Queries::allQueries() std::vector<QueryPtr> Queries::allQueries()
{ {
//TODO code duplication with const function :( //TODO code duplication with const function :(
std::vector<std::shared_ptr<CQuery>> ret; std::vector<QueryPtr> ret;
for(auto & playerQueries : queries) for(auto & playerQueries : queries)
for(auto & query : playerQueries.second) for(auto & query : playerQueries.second)
ret.push_back(query); ret.push_back(query);
@ -259,6 +259,15 @@ std::vector<std::shared_ptr<CQuery>> Queries::allQueries()
return ret; return ret;
} }
QueryPtr Queries::getQuery(QueryID queryID)
{
for(auto & playerQueries : queries)
for(auto & query : playerQueries.second)
if(query->queryID == queryID)
return query;
return nullptr;
}
void CBattleQuery::notifyObjectAboutRemoval(const CObjectVisitQuery & objectVisit) const void CBattleQuery::notifyObjectAboutRemoval(const CObjectVisitQuery & objectVisit) const
{ {
assert(result); assert(result);

4
server/CQuery.h
View File

@ -219,7 +219,7 @@ public:
QueryPtr topQuery(PlayerColor player); QueryPtr topQuery(PlayerColor player);
std::vector<std::shared_ptr<const CQuery>> allQueries() const; std::vector<std::shared_ptr<const CQuery>> allQueries() const;
std::vector<std::shared_ptr<CQuery>> allQueries(); std::vector<QueryPtr> allQueries();
QueryPtr getQuery(QueryID queryID);
//void removeQuery //void removeQuery
}; };