From 111260cdf335376747c28afee1fae41bb9dd1c85 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sat, 30 Dec 2023 12:14:59 -0800 Subject: [PATCH] clean up challenge mode template syntax --- src/PlayerSubordinates.cc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/PlayerSubordinates.cc b/src/PlayerSubordinates.cc index f9ffa072..9d8a6917 100644 --- a/src/PlayerSubordinates.cc +++ b/src/PlayerSubordinates.cc @@ -915,24 +915,7 @@ BattleRules::MesetaMode enum_for_name(const char* name) } static PlayerInventoryItem make_template_item(bool equipped, uint64_t first_data, uint64_t second_data) { - PlayerInventoryItem ret(ItemData(), equipped); - ret.data.data1[0] = first_data >> 56; - ret.data.data1[1] = first_data >> 48; - ret.data.data1[2] = first_data >> 40; - ret.data.data1[3] = first_data >> 32; - ret.data.data1[4] = first_data >> 24; - ret.data.data1[5] = first_data >> 16; - ret.data.data1[6] = first_data >> 8; - ret.data.data1[7] = first_data >> 0; - ret.data.data1[8] = second_data >> 56; - ret.data.data1[9] = second_data >> 48; - ret.data.data1[10] = second_data >> 40; - ret.data.data1[11] = second_data >> 32; - ret.data.data2[0] = second_data >> 24; - ret.data.data2[1] = second_data >> 16; - ret.data.data2[2] = second_data >> 8; - ret.data.data2[3] = second_data >> 0; - return ret; + return PlayerInventoryItem(ItemData(first_data, second_data), equipped); } static PlayerInventoryItem v2_item(bool equipped, uint64_t first_data, uint64_t second_data) {