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

Added more checks to detect illegal access in CList's class

Browse Source
This commit is contained in:
Ivan Savenko
2023-12-24 00:16:29 +02:00
parent 08a4b67cd7
commit bcbd708fa7
4 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/PlayerLocalState.cpp
View File

@ -204,7 +204,7 @@ const CGHeroInstance * PlayerLocalState::getWanderingHero(size_t index)
{
if(index < wanderingHeroes.size())
return wanderingHeroes[index];
return nullptr;
throw std::runtime_error("No hero with index " + std::to_string(index));
}
void PlayerLocalState::addWanderingHero(const CGHeroInstance * hero)
@ -235,10 +235,10 @@ void PlayerLocalState::removeWanderingHero(const CGHeroInstance * hero)
setSelection(ownedTowns.front());
}
void PlayerLocalState::swapWanderingHero(int pos1, int pos2)
void PlayerLocalState::swapWanderingHero(size_t pos1, size_t pos2)
{
assert(wanderingHeroes[pos1] && wanderingHeroes[pos2]);
std::swap(wanderingHeroes[pos1], wanderingHeroes[pos2]);
std::swap(wanderingHeroes.at(pos1), wanderingHeroes.at(pos2));
adventureInt->onHeroOrderChanged();
}
@ -252,7 +252,7 @@ const CGTownInstance * PlayerLocalState::getOwnedTown(size_t index)
{
if(index < ownedTowns.size())
return ownedTowns[index];
return nullptr;
throw std::runtime_error("No town with index " + std::to_string(index));
}
void PlayerLocalState::addOwnedTown(const CGTownInstance * town)
@ -278,10 +278,10 @@ void PlayerLocalState::removeOwnedTown(const CGTownInstance * town)
setSelection(ownedTowns.front());
}
void PlayerLocalState::swapOwnedTowns(int pos1, int pos2)
void PlayerLocalState::swapOwnedTowns(size_t pos1, size_t pos2)
{
assert(ownedTowns[pos1] && ownedTowns[pos2]);
std::swap(ownedTowns[pos1], ownedTowns[pos2]);
std::swap(ownedTowns.at(pos1), ownedTowns.at(pos2));
adventureInt->onTownOrderChanged();
}