incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix incorrect next item IDs in synthesized 6x6D commands

Browse Source
This commit is contained in:
Martin Michelsen
2023-12-31 21:26:31 -08:00
parent f479f586cb
commit 40dcbb77ad
5 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SendCommands.cc
+1 -17
View File
@@ -2385,23 +2385,7 @@ void send_game_item_state(shared_ptr<Client> c) {
G_SyncItemState_6x6D_Decompressed decompressed_header;
for (size_t z = 0; z < 12; z++) {
// If the player is the leader, they will construct their TObjPlayer BEFORE
// they handle the 6x6D, so we should send an appropriate next item ID for
// after that has occurred. (We have already done this assignment, so we can
// just send our next item ID for the player.) If the player is not the
// leader, they will construct their TObjPlayer when they receive a 6x71
// command from the leader, so we should adjust the next item ID to what it
// should have been before they will assign their inventory item IDs.
if ((z == c->lobby_client_id) && (c->lobby_client_id != l->leader_id)) {
size_t num_items = c->character()->inventory.num_items;
uint32_t next_id = l->next_item_id_for_client[z] - num_items;
if ((next_id & 0xFFE00000) != (l->next_item_id_for_client[z] & 0xFFE00000)) {
throw runtime_error("next item ID underflow during joining player item state generation");
}
decompressed_header.next_item_id_per_player[z] = next_id;
} else {
decompressed_header.next_item_id_per_player[z] = l->next_item_id_for_client[z];
}
decompressed_header.next_item_id_per_player[z] = l->next_item_id_for_client[z];
}
l->log.info("Sending next item IDs to client: %08" PRIX32 " %08" PRIX32 " %08" PRIX32 " %08" PRIX32,
decompressed_header.next_item_id_per_player[0].load(),