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

Rewardable object randomization is now always server-sided

Browse Source
This commit is contained in:
Ivan Savenko
2024-07-12 15:10:03 +00:00
parent 388d65d6b2
commit d2839c8e52
17 changed files with 126 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjects/CRewardableObject.cpp
View File

@@ -16,6 +16,7 @@
#include "../IGameCallback.h"
#include "../mapObjectConstructors/AObjectTypeHandler.h"
#include "../mapObjectConstructors/CObjectClassesHandler.h"
#include "../mapObjectConstructors/CRewardableConstructor.h"
#include "../mapObjects/CGHeroInstance.h"
#include "../networkPacks/PacksForClient.h"
#include "../serializer/JsonSerializeFormat.h"
@@ -377,9 +378,6 @@ void CRewardableObject::setPropertyDer(ObjProperty what, ObjPropertyID identifie
{
switch (what)
{
case ObjProperty::REWARD_RANDOMIZE:
initObj(cb->gameState()->getRandomGenerator());
break;
case ObjProperty::REWARD_SELECT:
selectedReward = identifier.getNum();
break;
@@ -395,7 +393,9 @@ void CRewardableObject::newTurn(vstd::RNG & rand) const
{
if (configuration.resetParameters.rewards)
{
cb->setObjPropertyValue(id, ObjProperty::REWARD_RANDOMIZE, 0);
auto handler = std::dynamic_pointer_cast<const CRewardableConstructor>(getObjectHandler());
auto newConfiguration = handler->generateConfiguration(cb, rand, ID);
cb->setRewardableObjectConfiguration(id, newConfiguration);
}
if (configuration.resetParameters.visitors)
{