A listed player can be taken off the market again

transfer.submit {action: withdraw, playerId} ends the manager's own list
entry as it ends without a buyer. The transfer market's first button does
it for a listed player.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Fable 5.2 committed 2026-11-17 14:02:17 +01:00
1 parent ce8b871202
commit 1ec8295c84
9 files changed
+85 -4

No files matched your search

+32
View File
@@ -543,6 +543,38 @@ bool set_training_camp_focus(ModernState& g, int manager, const std::array<uint8
return true;
}
// OpenBMH deviates from the original: in Modern a manager can take a player he listed off the transfer list again.
TransferActionResult withdraw_manager_player(ModernState& g, int manager, int player) {
TransferActionResult out;
if (manager < 0 || size_t(manager) >= g.manager_teams.size()) {
out.status = TransferActionStatus::invalid_manager;
return out;
}
out.status = TransferActionStatus::invalid_player;
const int team = g.manager_teams[size_t(manager)];
if (team < 0 || team >= league_clubs() || player < 0 || player >= 0xfff) return out;
const SquadRange range = squad_range(team);
bool own = false;
for (size_t i = 0; i < range.count && !own; ++i) own = (g.squad_slots.at(range.first + i) & 0xfff) == player;
if (!own) return out;
for (int entry = 0; entry < 40; ++entry) {
const size_t slot = modern::transfer_list_slot() + size_t(entry);
const uint32_t row = ::bmh::layout::EditorList + uint32_t(entry) * 0x58;
if ((g.squad_slots.at(slot) & 0xfff) != player || !g.memory.has(row + 9) || (g.memory.u16(row + 8) & 0x7fff) != uint16_t(team)) continue;
for (uint32_t b = 0; b < 4; ++b) {
const int bidder = g.memory.u16(row + b * 2);
if (bidder == 0xffff) continue;
for (const int human : g.manager_teams)
if (human == bidder) { out.status = TransferActionStatus::rejected; return out; }
}
for (uint32_t b = 0; b < 4; ++b) g.memory.set16(row + b * 2, 0xffff);
g.squad_slots.at(slot) = 0x0fff;
out.status = TransferActionStatus::accepted, out.player = player, out.list_entry = entry;
return out;
}
return out;
}
TransferActionResult list_manager_player(ModernState& g, int manager, int squad_row, WatcomRandom& rand,
MinuteReport& report) {
TransferActionResult out;