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

fix initialization order in PlayerInventoryItem

Browse Source
This commit is contained in:
Martin Michelsen
2022-05-08 00:45:49 -07:00
parent 354fdb6163
commit 72810a19f0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CommandFormats.hh
+1 -1
View File
@@ -129,7 +129,7 @@ struct C_Login_Patch_04 {
ptext<char, 0x40> email; // Note: this field is blank on BB ptext<char, 0x40> email; // Note: this field is blank on BB
}; };
// 05 (S->C): Unknown // 05 (S->C): Unknown; probably disconnect
// No arguments // No arguments
// 06 (S->C): Open file for writing // 06 (S->C): Open file for writing
src/Player.cc
+3 -3
View File
@@ -529,9 +529,9 @@ PlayerInventoryItem::PlayerInventoryItem()
: equip_flags(0x0000), tech_flag(0x0000), game_flags(0x00000000), data() { } : equip_flags(0x0000), tech_flag(0x0000), game_flags(0x00000000), data() { }
PlayerInventoryItem::PlayerInventoryItem(const PlayerBankItem& src) PlayerInventoryItem::PlayerInventoryItem(const PlayerBankItem& src)
: equip_flags((this->data.data1[0] > 2) ? 0x0044 : 0x0050), : tech_flag(0x0001), data(src.data) {
tech_flag(0x0001), this->equip_flags = (this->data.data1[0] > 2) ? 0x0044 : 0x0050;
data(src.data) { } }
PlayerBankItem::PlayerBankItem() PlayerBankItem::PlayerBankItem()
: data(), amount(0), show_flags(0) { } : data(), amount(0), show_flags(0) { }