Skip to content

FIX: (#1669) Fix handling emptying granaries and warehouses in request dispatch #1725

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
n-aswin wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −6
Open

FIX: (#1669) Fix handling emptying granaries and warehouses in request dispatch #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbd63a4
Fix handling of emptying warehouses in request dispatch
n-aswin Apr 5, 2026
8e2ad4e
Fix handling of emptying granaries in request dispatch
n-aswin Apr 5, 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
9 changes: 6 additions & 3 deletions src/building/granary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,9 @@ int building_granary_count_available_resource(building *b, int resource, int res
if (b->type != BUILDING_GRANARY || b->state != BUILDING_STATE_IN_USE) {
return 0;
}
if (!respect_maintaining || (building_storage_get_state(b, resource, 1) < BUILDING_STORAGE_STATE_MAINTAINING)) {
if (!respect_maintaining ||
building_storage_get_state(b, resource, 1) < BUILDING_STORAGE_STATE_MAINTAINING ||
building_storage_get_empty_all(b->id)) {
return building_granary_get_amount(b, resource);
} else {
return 0;
Expand Down Expand Up @@ -239,10 +241,11 @@ static void try_create_cart_to_rome(building *b, int resource, int loads)

int building_granaries_send_resources_to_rome(int resource, int amount)
{
// first go for non-getting, non-maintaining granaries with caesar permission
// first go for emptying or non-getting, non-maintaining granaries with caesar permission
for (building *b = building_first_of_type(BUILDING_GRANARY); b && amount; b = b->next_of_type) {
if (b->state == BUILDING_STATE_IN_USE) {
if (building_storage_get_state(b, resource, 1) < BUILDING_STORAGE_STATE_GETTING &&
if ((building_storage_get_empty_all(b->id) ||
building_storage_get_state(b, resource, 1) < BUILDING_STORAGE_STATE_GETTING) &&
building_storage_get_permission(BUILDING_STORAGE_PERMISSION_CAESAR, b)) {
int taken_loads = building_granary_try_remove_resource(b, resource, amount);
amount -= taken_loads;
Expand Down
7 changes: 4 additions & 3 deletions src/building/warehouse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ int building_warehouses_count_available_resource(int resource, int respect_maint
continue;
}
if (!respect_maintaining ||
building_storage_get_state(b, resource, 1) != BUILDING_STORAGE_STATE_MAINTAINING ||
building_storage_get_state(b, resource, 1) < BUILDING_STORAGE_STATE_MAINTAINING ||
building_storage_get_empty_all(b->id)) {
total += building_warehouse_get_amount(b, resource);
}
Expand All @@ -526,10 +526,11 @@ static void try_create_cart_to_rome(building *b, int resource, int loads)

int building_warehouses_send_resources_to_rome(int resource, int amount)
{
// first go for non-getting, non-maintaining warehouses with caesar permission
// first go for emptying or non-getting, non-maintaining warehouses with caesar permission
for (building *b = building_first_of_type(BUILDING_WAREHOUSE); b && amount; b = b->next_of_type) {
if (b->state == BUILDING_STATE_IN_USE) {
if (building_storage_get_state(b, resource, 1) < BUILDING_STORAGE_STATE_GETTING &&
if ((building_storage_get_empty_all(b->id) ||
building_storage_get_state(b, resource, 1) < BUILDING_STORAGE_STATE_GETTING) &&
building_storage_get_permission(BUILDING_STORAGE_PERMISSION_CAESAR, b)) {
int taken_loads = building_warehouse_try_remove_resource(b, resource, amount);
amount -= taken_loads;
Expand Down
Loading