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

fix 6xC9 command format

Browse Source
This commit is contained in:
Martin Michelsen
2023-06-19 19:31:17 -07:00
parent 15954c9576
commit 5c9242a156
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CommandFormats.hh
+1 -1
View File
@@ -5253,7 +5253,7 @@ struct G_EnemyKilled_BB_6xC8 {
struct G_MesetaRewardRequest_BB_6xC9 { struct G_MesetaRewardRequest_BB_6xC9 {
G_UnusedHeader header; G_UnusedHeader header;
le_uint32_t amount; le_int32_t amount;
} __packed__; } __packed__;
// 6xCA: Item reward from quest (BB; handled by server) // 6xCA: Item reward from quest (BB; handled by server)
src/ReceiveSubcommands.cc
+2 -2
View File
@@ -1509,7 +1509,7 @@ void on_meseta_reward_request_bb(shared_ptr<ServerState>,
auto p = c->game_data.player(); auto p = c->game_data.player();
if (cmd.amount < 0) { if (cmd.amount < 0) {
if (-cmd.amount > p->disp.meseta) { if (-cmd.amount > static_cast<int32_t>(p->disp.meseta.load())) {
p->disp.meseta = 0; p->disp.meseta = 0;
} else { } else {
p->disp.meseta += cmd.amount; p->disp.meseta += cmd.amount;
@@ -1517,7 +1517,7 @@ void on_meseta_reward_request_bb(shared_ptr<ServerState>,
} else { } else {
PlayerInventoryItem item; PlayerInventoryItem item;
item.data.data1[0] = 0x04; item.data.data1[0] = 0x04;
item.data.data2d = cmd.amount; item.data.data2d = cmd.amount.load();
item.data.id = l->generate_item_id(0xFF); item.data.id = l->generate_item_id(0xFF);
c->game_data.player()->add_item(item); c->game_data.player()->add_item(item);
send_create_inventory_item(l, c, item.data); send_create_inventory_item(l, c, item.data);