Skip to content

Fix underflow when trading #1969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ottml wants to merge 8 commits into
base: master
Choose a base branch
from
+33 −2
Open

Fix underflow when trading #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf0719d
Add test for overflow when trading less figures as in the nearest sto…
ottml Aug 17, 2026
a900bb6
Fix overflow
ottml Aug 17, 2026
2b296a3
Return correct value for GetAvailableFiguresForTrading if not Job Helper
ottml Aug 17, 2026
da7337b
Use better name
ottml Aug 26, 2026
8f5b0db
Improve test
ottml Aug 26, 2026
8920757
Improve test
ottml Aug 26, 2026
5544855
Improve test
ottml Aug 26, 2026
ddc7684
Code review
ottml Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/s25main/GamePlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,7 @@ void GamePlayer::Trade(nobBaseWarehouse* goalWh, const boost_variant2<GoodType,
tradePathCache.addEntry(tr.GetTradePath(), GetPlayerId());

wh->StartTradeCaravane(what, actualCount, tr, goalWh);
count -= available;
count -= actualCount;
if(count == 0)
return;
}
Expand Down
2 changes: 1 addition & 1 deletion libs/s25main/buildings/nobBaseWarehouse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,7 @@ unsigned nobBaseWarehouse::GetAvailableFiguresForTrading(const Job job) const
if(job == Job::Helper)
return (inventory[Job::Helper] - 1) / 2; // need one as leader
else
return std::min(inventory[job], inventory[Job::Helper] - 1);
Comment thread
Flamefire marked this conversation as resolved.
return inventory[job];
}

void nobBaseWarehouse::StartTradeCaravane(const boost_variant2<GoodType, Job>& what, const unsigned count,
Expand Down
31 changes: 31 additions & 0 deletions tests/s25Main/integration/testTrading.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "gameData/JobConsts.h"
#include <rttr/test/LogAccessor.hpp>
#include <boost/test/unit_test.hpp>
#include <factories/BuildingFactory.h>
#include <variant.h>

struct TradeFixture : public WorldWithGCExecution3P
Expand Down Expand Up @@ -205,6 +206,36 @@ BOOST_AUTO_TEST_CASE(TradeToMuch)
testAfterLeaving(20);
}

BOOST_AUTO_TEST_CASE(TradeLessFiguresThenInStoreHouse)
{
initGameRNG();

auto* const hqPlayer1 = world.GetSpecObj<nobBaseWarehouse>(players[1]->GetHQPos());

// Add second warehouse
auto* wh1 = static_cast<nobBaseWarehouse*>(BuildingFactory::CreateBuilding(
world, BuildingType::Storehouse, players[1]->GetHQPos() + MapPoint(2, 0), 1, Nation::Romans));
world.BuildRoad(0, false, wh1->GetFlagPos(), {2, Direction::East});

PeopleCounts inv;
inv[Job::Woodcutter] = 2;
inv[Job::Helper] = 1;
wh1->AddToInventory(inv, true);

BOOST_TEST_REQUIRE(hqPlayer1->GetNumRealFigures(Job::Woodcutter) == 8);
BOOST_TEST_REQUIRE(wh1->GetNumRealFigures(Job::Woodcutter) == 2);

// Trade less figures then in nearest warehouse wh1
this->TradeOverLand(players[0]->GetHQPos(), Job::Woodcutter, 1);

// Trade less figures then in nearest warehouse wh1 should use only figures from that WH
// Run enough GFs so all trade caravans are out (~numTradeItems + 1 people need to leave taking 30GFs max each)
RTTR_EXEC_TILL(30 * (1 + 1), wh1->GetLeavingFigures().empty() && hqPlayer1->GetLeavingFigures().empty());

BOOST_TEST_REQUIRE(hqPlayer1->GetNumRealFigures(Job::Woodcutter) == 8);
BOOST_TEST_REQUIRE(wh1->GetNumRealFigures(Job::Woodcutter) == 1);
}

BOOST_AUTO_TEST_CASE(TradeFail)
{
initGameRNG();
Expand Down
Loading