Bind the transfer market to world-relative Modern data (by Codex)
This commit is contained in:
1 parent
e559e84a69
commit
1e88304019
23 files changed
+1230
-76
No files matched your search
@@ -567,7 +567,7 @@ TransferActionResult list_manager_player(ModernState& g, int manager, int squad_
|
||||
// The transfer-list slot follows the new pool slot. The engine uses 40 entries
|
||||
// for the normal list; entries 40-43 are reserved for matchday approaches.
|
||||
for (int i = 0; i < 40; ++i)
|
||||
if ((g.squad_slots.at(0xb70u + size_t(i)) & 0xfff) == player) { out.list_entry = i; break; }
|
||||
if ((g.squad_slots.at(modern::transfer_list_slot() + size_t(i)) & 0xfff) == player) { out.list_entry = i; break; }
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -587,7 +587,7 @@ TransferActionResult submit_transfer_bid_impl(ModernState& g, const TransferBidR
|
||||
if (request.list_entry < 0 || request.list_entry >= 40 || request.player < 0 || request.fee <= 0 || request.annual_salary <= 0 ||
|
||||
request.contract_years < 1 || request.contract_years > 4) return out;
|
||||
const uint32_t entry = ::bmh::layout::EditorListUnsigned + uint32_t(request.list_entry) * 0x58;
|
||||
const int player = g.squad_slots.at(0xb70u + size_t(request.list_entry)) & 0xfff;
|
||||
const int player = g.squad_slots.at(modern::transfer_list_slot() + size_t(request.list_entry)) & 0xfff;
|
||||
if (player == 0xfff) {
|
||||
out.status = TransferActionStatus::invalid_player;
|
||||
return out;
|
||||
@@ -684,7 +684,7 @@ TransferActionResult submit_transfer_bid_impl(ModernState& g, const TransferBidR
|
||||
sale.list_entry = request.list_entry;
|
||||
sale.bid_slot = bid;
|
||||
sale.list_address = entry;
|
||||
sale.source_pool_slot = 0xb70u + size_t(request.list_entry);
|
||||
sale.source_pool_slot = modern::transfer_list_slot() + size_t(request.list_entry);
|
||||
sale.expected_seller = seller;
|
||||
sale.expected_buyer = buyer;
|
||||
sale.expected_active_manager = request.manager;
|
||||
@@ -782,13 +782,13 @@ TransferActionResult submit_transfer_bid_source_impl(ModernState& g, const Trans
|
||||
return unsupported("unsupported ordinary human-buyer record or 24-slot squad");
|
||||
|
||||
const uint32_t list = ::bmh::layout::EditorListUnsigned + uint32_t(request.list_entry) * 0x58;
|
||||
const size_t expected_pool_slot = 0xb70u + size_t(request.list_entry);
|
||||
const size_t expected_pool_slot = modern::transfer_list_slot() + size_t(request.list_entry);
|
||||
if (!g.memory.has(list + 0x57) || request.source_slot < 0 ||
|
||||
size_t(request.source_slot) != expected_pool_slot || size_t(request.source_slot) >= g.squad_slots.size())
|
||||
return unsupported("missing or mismatched explicit ordinary Source pool slot");
|
||||
const int player = int(g.squad_slots[size_t(request.source_slot)] & 0x0fff);
|
||||
if (player == 0x0fff || player != request.player ||
|
||||
int(g.squad_slots[0xb70u + size_t(request.list_entry)] & 0x0fff) != player)
|
||||
int(g.squad_slots[modern::transfer_list_slot() + size_t(request.list_entry)] & 0x0fff) != player)
|
||||
return unsupported("ordinary Source list/player identity mismatch");
|
||||
|
||||
if (!g.memory.has(::bmh::layout::ActiveManager) || g.memory.u8(::bmh::layout::ActiveManager) != request.manager ||
|
||||
|
||||
Reference in new issue
Block a user