Skip to content

Commit

Permalink
Fix QM bug where it lost items
Browse files Browse the repository at this point in the history
  • Loading branch information
@jt-traub
jt-traub committed Dec 18, 2024
1 parent 5ce3399 commit 7eb39b6
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
26 changes: 13 additions & 13 deletions runorders.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ void Game::Do1Steal(ARegion *r, Object *o, Unit *u)
}

// Make sure we dispose of the allocated AList properly until we get rid of alists entirely.
std::unique_ptr<AList> seers(CanSeeSteal(r, u));
std::unique_ptr<AList> seers(CanSeeSteal(r, u));
int succ = 1;
forlist(seers) {
Faction *f = ((FactionPtr *) elem)->ptr;
Expand Down Expand Up @@ -610,7 +610,7 @@ void Game::Do1Destroy(ARegion *r, Object *o, Unit *u) {
}
else {
u->event("Destroys " + string(o->name->const_str()) + ".", "destroy");

Object *dest = r->GetDummy();
forlist(&o->units) {
Unit *u = (Unit *) elem;
Expand Down Expand Up @@ -702,7 +702,7 @@ int Game::FortTaxBonus(Object *o, Unit *u)
}
}
protect -= men;
if (protect < 0) protect = 0;
if (protect < 0) protect = 0;
}
return(fortbonus);
}
Expand Down Expand Up @@ -1151,7 +1151,7 @@ void Game::RemoveEmptyObjects()
ARegion *r = (ARegion *) elem;
forlist(&r->objects) {
Object *o = (Object *) elem;
if ((o->IsFleet()) &&
if ((o->IsFleet()) &&
(TerrainDefs[r->type].similar_type != R_OCEAN)) continue;
if (ObjectDefs[o->type].cost &&
o->incomplete >= ObjectDefs[o->type].cost) {
Expand Down Expand Up @@ -1600,7 +1600,7 @@ void Game::RunBuyOrders()
ARegion *r = (ARegion *) elem;
for (const auto& m : r->markets) {
if (m->type == M_BUY) DoBuy(r, m);
}
}
forlist((&r->objects)) {
Object *obj = (Object *) elem;
forlist((&obj->units)) {
Expand Down Expand Up @@ -1725,8 +1725,8 @@ void Game::DoBuy(ARegion *r, Market *m)
if (skill == -1) continue;
int curxp = u->skills.GetExp(skill);
u->skills.SetExp(skill,exp+curxp);
}
}
}
}
}
/* region economy effects */
r->Recruit(temp);
Expand Down Expand Up @@ -2490,7 +2490,7 @@ int Game::DoGiveOrder(ARegion *r, Unit *u, GiveOrder *o)
if (ship > 0) u->items.SetNum(ship,0);
return 0;
// abandon fleet ships
} else if (!(u->object->IsFleet()) ||
} else if (!(u->object->IsFleet()) ||
(u->num != u->object->GetOwner()->num)) {
u->error(ord + ": only fleet owner can give ships.");
return 0;
Expand Down Expand Up @@ -2529,7 +2529,7 @@ int Game::DoGiveOrder(ARegion *r, Unit *u, GiveOrder *o)
u->event("Abandons " + ItemString(o->item, num - o->amount) + ".", event_type);
return 0;
}
// GIVE to unit:
// GIVE to unit:
t = r->GetUnitId(o->target, u->faction->num);
if (!t) {
u->error(ord + ": Nonexistant target (" + o->target->Print() + ").");
Expand Down Expand Up @@ -2704,7 +2704,7 @@ int Game::DoGiveOrder(ARegion *r, Unit *u, GiveOrder *o)
}
return 0;
}

if (o->target->unitnum == -1) {
/* Give 0 */
// Check there is enough to give
Expand Down Expand Up @@ -3120,7 +3120,7 @@ void Game::CheckTransportOrders()
} else { // sender isn't a valid QM
if (!target_is_valid_qm) { // Non-qms or invalid qms can only send to valid QMs
// Give a specific error message depending on why they aren't considered a quartermaster
string temp = "TRANSPORT: Target " + string(tar->unit->name->const_str());
string temp = "TRANSPORT: Target " + string(tar->unit->name->const_str());
temp += (
target_owns_qm_building ?
" does not own a transport structure." :
Expand Down Expand Up @@ -3313,7 +3313,7 @@ void Game::RunTransportPhase(TransportOrder::TransportPhase phase) {
}

if (phase == TransportOrder::INTER_QM_TRANSPORT) {
tar->unit->transport_items.SetNum(t->item, amt);
tar->unit->transport_items.SetNum(t->item, tar->unit->transport_items.GetNum(t->item) + amt);
} else {
tar->unit->items.SetNum(t->item, tar->unit->items.GetNum(t->item) + amt);
}
Expand Down Expand Up @@ -3544,7 +3544,7 @@ void Game::RunAnnihilateOrders() {

// annihilate our neigbors
for (auto n = 0; n < NDIRS; n++) {
ARegion *neigh = r->neighbors[n];
ARegion *neigh = r->neighbors[n];
if (neigh == nullptr) continue;
Do1Annihilate(neigh);
}
Expand Down
19 changes: 10 additions & 9 deletions unittest/quartermaster_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,39 @@ ut::suite<"Quartermaster"> quartermaster_suite = []
stringstream ss;
ss << "#atlantis 3\n";
ss << "unit 2\n";
ss << "transport 3 50 stone\n"; // unit 1 -> QM 1
ss << "transport 3 70 stone\n"; // unit 1 -> QM 1
ss << "unit 3\n";
ss << "transport 4 50 stone\n"; // QM 1 -> QM 2
ss << "transport 4 20 stone\n"; // QM 1 -> QM 2 (should make 70 stone total, not 20 as in reported bug)
ss << "unit 4\n";
ss << "transport 5 50 stone\n"; // QM 2 -> unit 2
helper.parse_orders(faction->num, ss);
helper.check_transport_orders();

helper.transport_phase(TransportOrder::SHIP_TO_QM);
expect(unit1->items.GetNum(I_STONE) == 50_i);
expect(qm1->items.GetNum(I_STONE) == 50_i);
expect(unit1->items.GetNum(I_STONE) == 30_i);
expect(qm1->items.GetNum(I_STONE) == 70_i);
expect(qm2->items.GetNum(I_STONE) == 0_i);
expect(unit2->items.GetNum(I_STONE) == 0_i);

helper.transport_phase(TransportOrder::INTER_QM_TRANSPORT);
expect(unit1->items.GetNum(I_STONE) == 50_i);
expect(unit1->items.GetNum(I_STONE) == 30_i);
expect(qm1->items.GetNum(I_STONE) == 0_i);
expect(qm2->transport_items.GetNum(I_STONE) == 50_i);
expect(qm2->transport_items.GetNum(I_STONE) == 70_i);
expect(qm2->items.GetNum(I_STONE) == 0_i);
expect(unit2->items.GetNum(I_STONE) == 0_i);

helper.collect_transported_goods();
expect(unit1->items.GetNum(I_STONE) == 50_i);
expect(unit1->items.GetNum(I_STONE) == 30_i);
expect(qm1->items.GetNum(I_STONE) == 0_i);
expect(qm2->transport_items.GetNum(I_STONE) == 0_i);
expect(qm2->items.GetNum(I_STONE) == 50_i);
expect(qm2->items.GetNum(I_STONE) == 70_i);
expect(unit2->items.GetNum(I_STONE) == 0_i);

helper.transport_phase(TransportOrder::DISTRIBUTE_FROM_QM);
expect(unit1->items.GetNum(I_STONE) == 50_i);
expect(unit1->items.GetNum(I_STONE) == 30_i);
expect(qm1->items.GetNum(I_STONE) == 0_i);
expect(qm2->items.GetNum(I_STONE) == 0_i);
expect(qm2->items.GetNum(I_STONE) == 20_i);
expect(unit2->items.GetNum(I_STONE) == 50_i);
};

Expand Down

0 comments on commit 7eb39b6

Please sign in to comment.