games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fix merge

Browse Source
This commit is contained in:
Ivan Savenko
2024-07-12 12:15:30 +00:00
parent c4b8778e8b
commit 388d65d6b2
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/StartInfo.h
View File

@@ -152,7 +152,7 @@ struct DLL_LINKAGE StartInfo : public Serializeable
h & playerInfos; h & playerInfos;
if (h.version < Handler::Version::REMOVE_LIB_RNG) if (h.version < Handler::Version::REMOVE_LIB_RNG)
{ {
uint32_t oldSeeds; uint32_t oldSeeds = 0;
h & oldSeeds; h & oldSeeds;
h & oldSeeds; h & oldSeeds;
h & oldSeeds; h & oldSeeds;

4
lib/gameState/RumorState.cpp
View File

@@ -10,6 +10,8 @@
#include "StdInc.h" #include "StdInc.h"
#include "RumorState.h" #include "RumorState.h"
VCMI_LIB_NAMESPACE_BEGIN
bool RumorState::update(int id, int extra) bool RumorState::update(int id, int extra)
{ {
if(vstd::contains(last, type)) if(vstd::contains(last, type))
@@ -27,3 +29,5 @@ bool RumorState::update(int id, int extra)
return true; return true;
} }
VCMI_LIB_NAMESPACE_END

2
lib/mapObjects/MiscObjects.cpp
View File

@@ -705,7 +705,7 @@ void CGWhirlpool::teleportDialogAnswered(const CGHeroInstance *hero, ui32 answer
const auto * obj = cb->getObj(exit); const auto * obj = cb->getObj(exit);
std::set<int3> tiles = obj->getBlockedPos(); std::set<int3> tiles = obj->getBlockedPos();
dPos = *RandomGeneratorUtil::nextItem(tiles, cb->gameState()->getRandomGenerator())); dPos = *RandomGeneratorUtil::nextItem(tiles, cb->gameState()->getRandomGenerator());
} }
cb->moveHero(hero->id, hero->convertFromVisitablePos(dPos), EMovementMode::MONOLITH); cb->moveHero(hero->id, hero->convertFromVisitablePos(dPos), EMovementMode::MONOLITH);