Correct ReplacePremium() qlvl

Author: Yggdrasill

Source/items.cpp

@@ -4416,10 +4416,11 @@ void SpawnSmith(int lvl)
 	SortVendor(SmithItems, PinnedItemCount);
 }
 
-void ReplacePremium(const Player &player, Item &item)
+void ReplacePremium(const Player &player, int idx)
 {
-	int plvl = item._iCreateInfo & CF_LEVEL;
-	SpawnOnePremium(item, plvl, player);
+	int plvl = gbIsHellfire ? itemLevelAddHf[idx] : itemLevelAdd[idx];
+	plvl += player.getCharacterLevel();
+	SpawnOnePremium(PremiumItems[idx], plvl, player);
 }
 
 void SpawnPremium(const Player &player)

Source/items.h

@@ -558,7 +558,7 @@ void UseItem(Player &player, item_misc_id Mid, SpellID spellID, int spellFrom);
 bool UseItemOpensHive(const Item &item, Point position);
 bool UseItemOpensGrave(const Item &item, Point position);
 void SpawnSmith(int lvl);
-void ReplacePremium(const Player &player, Item &item);
+void ReplacePremium(const Player &player, int idx);
 void SpawnPremium(const Player &player);
 void SpawnWitch(int lvl);
 void SpawnBoy(int lvl);

Source/stores.cpp

@@ -1348,7 +1348,7 @@ void SmithBuyPItem(Item &item)
 	StoreAutoPlace(item, true);
 
 	int idx = OldScrollPos + ((OldTextLine - PreviousScrollPos) / 4);
-	ReplacePremium(*MyPlayer, PremiumItems[idx]);
+	ReplacePremium(*MyPlayer, idx);
 }
 
 void SmithPremiumBuyEnter()

test/vendor_test.cpp

@@ -270,9 +270,9 @@ TEST_F(VendorTest, PremiumQlvl)
 	qlvls[3] = 0;
 	qlvls[5] = 0;
 
-	ReplacePremium(*MyPlayer, PremiumItems[0]);
-	ReplacePremium(*MyPlayer, PremiumItems[3]);
-	ReplacePremium(*MyPlayer, PremiumItems[5]);
+	ReplacePremium(*MyPlayer, 0);
+	ReplacePremium(*MyPlayer, 3);
+	ReplacePremium(*MyPlayer, 5);
 	test_premium_qlvl(qlvls, NumSmithItems, MyPlayer->getCharacterLevel(), plvl, gbIsHellfire);
 	for (int i = 0; i < NumSmithItems; i++) {
 		EXPECT_EQ(PremiumItems[i]._iCreateInfo & CF_LEVEL, qlvls[i]) << "Index: " << i;
@@ -331,9 +331,9 @@ TEST_F(VendorTest, PremiumQlvlHf)
 	qlvls[7] = 0;
 	qlvls[14] = 0;
 
-	ReplacePremium(*MyPlayer, PremiumItems[0]);
-	ReplacePremium(*MyPlayer, PremiumItems[7]);
-	ReplacePremium(*MyPlayer, PremiumItems[14]);
+	ReplacePremium(*MyPlayer, 0);
+	ReplacePremium(*MyPlayer, 7);
+	ReplacePremium(*MyPlayer, 14);
 	test_premium_qlvl(qlvls, NumSmithItemsHf, MyPlayer->getCharacterLevel(), plvl, gbIsHellfire);
 	for (int i = 0; i < NumSmithItemsHf; i++) {
 		EXPECT_EQ(PremiumItems[i]._iCreateInfo & CF_LEVEL, qlvls[i]) << "Index: " << i;