Skip to content

Show donkey icon for donkey breeder #1857

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

Merged
Flow86 merged 1 commit into from
Jan 12, 2026
Merged

Show donkey icon for donkey breeder #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions libs/s25main/BuildingRegister.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ helpers::EnumArray<uint16_t, BuildingType> BuildingRegister::CalcProductivities(

unsigned BuildingRegister::CalcAverageProductivity(BuildingType bldType) const
{
if(!BLD_WORK_DESC[bldType].producedWare)
if(holds_alternative<boost::none_t>(BLD_WORK_DESC[bldType].producedWare))
return 0;
unsigned productivity = 0;
const auto& buildings = GetBuildings(bldType);
Expand All @@ -173,7 +173,7 @@ unsigned short BuildingRegister::CalcAverageProductivity() const
unsigned numBlds = 0;
for(const auto bldType : helpers::enumRange<BuildingType>())
{
if(!BLD_WORK_DESC[bldType].producedWare)
if(holds_alternative<boost::none_t>(BLD_WORK_DESC[bldType].producedWare))
continue;

const auto& buildings = GetBuildings(bldType);
Expand Down
5 changes: 2 additions & 3 deletions libs/s25main/gameData/BuildingConsts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ const helpers::EnumArray<BldWorkDescription, BuildingType> SUPPRESS_UNUSED BLD_W
{Job::Helper, GoodType::Water},
{Job::Shipwright, GoodType::Boat, WaresNeeded(GoodType::Boards)},
{Job::Farmer, GoodType::Grain},
{Job::DonkeyBreeder, GoodType::Nothing,
WaresNeeded(GoodType::Grain, GoodType::Water)}, // Produces a job. TODO: Better way
{}, // Harbour
{Job::DonkeyBreeder, Job::PackDonkey, WaresNeeded(GoodType::Grain, GoodType::Water)},
{}, // Harbour
}};

/// Smoke consts for all buildings and nations
Expand Down
3 changes: 2 additions & 1 deletion libs/s25main/gameTypes/BuildingTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "JobTypes.h"
#include "Point.h"
#include "helpers/OptionalEnum.h"
#include "variant.h"
#include <cassert>

struct BuildingCost
Expand Down Expand Up @@ -44,7 +45,7 @@ struct BldWorkDescription
/// Worker belonging to the building, if any
helpers::OptionalEnum<Job> job = boost::none;
/// Ware produced, if any
helpers::OptionalEnum<GoodType> producedWare = boost::none;
boost_variant2<GoodType, Job, boost::none_t> producedWare = boost::none;
// Required for use in aggregate initialization
// NOLINTBEGIN(readability-redundant-member-init)
/// Wares the building needs, if any
Expand Down
11 changes: 8 additions & 3 deletions libs/s25main/ingameWindows/iwBuilding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,16 @@ iwBuilding::iwBuilding(GameWorldView& gwv, GameCommandFactory& gcFactory, nobUsu
AddImage(1, DrawPoint(117, 114), &building->GetBuildingImage());

// Symbol der produzierten Ware (falls hier was produziert wird)
const auto producedWare = BLD_WORK_DESC[building->GetBuildingType()].producedWare;
if(producedWare && producedWare != GoodType::Nothing)
const auto& producedWare = BLD_WORK_DESC[building->GetBuildingType()].producedWare;
ITexture* tex = visit(
composeVisitor([](GoodType gt) -> ITexture* { return gt != GoodType::Nothing ? LOADER.GetWareTex(gt) : nullptr; },
[](Job job) -> ITexture* { return LOADER.GetJobTex(job); },
[](boost::none_t) -> ITexture* { return nullptr; }),
producedWare);
if(tex)
{
AddImage(2, DrawPoint(196, 39), LOADER.GetMapTexture(2298));
AddImage(3, DrawPoint(196, 39), LOADER.GetWareTex(*producedWare));
AddImage(3, DrawPoint(196, 39), tex);
}

// Info
Expand Down
2 changes: 1 addition & 1 deletion tests/s25Main/simple/testGameData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(ProductionBuildingsAreNobUsual)
if(!BuildingProperties::IsValid(bld))
continue;
// Only nobUsuals can produce wares (though not all do)
if(BLD_WORK_DESC[bld].producedWare)
if(!holds_alternative<boost::none_t>(BLD_WORK_DESC[bld].producedWare))
{
BOOST_TEST_INFO("bld: " << bld);
BOOST_TEST(BuildingProperties::IsUsual(bld));
Expand Down
Loading