Fix bad rebase

diasurgical · Sep 20, 2024 · cdc8b9d · cdc8b9d
1 parent ffcb3e6
commit cdc8b9d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -416,7 +416,7 @@ void LeftMouseUp(uint16_t modState)
 		ReleaseChrBtns(isShiftHeld);
 	}
 	if (LevelButtonDown)
-		ReleaseLvlBtn();
+		CheckLevelButtonUp();
 	if (Stores.activeStore != TalkID::None)
 		Stores.ReleaseStoreBtn();
 }

diff --git a/Source/stores.cpp b/Source/stores.cpp
@@ -694,7 +694,7 @@ void StoreSession::DrawTownerSell(TalkID talkId)
 	for (int8_t i = 0; i < MyPlayer->_pNumInv; i++) {
 		if (playerItemIdx >= 48)
 			break;
-		if (talkId == TalkID::SmithSell ? CanSellToSmith(i) : CanSellToWitch(i)) {
+		if (CanSellToTowner(talkId, i)) {
 			sellOk = true;
 			playerItem[playerItemIdx] = MyPlayer->InvList[i];
 
@@ -711,7 +711,7 @@ void StoreSession::DrawTownerSell(TalkID talkId)
 	for (int i = 0; i < MaxBeltItems; i++) {
 		if (playerItemIdx >= 48)
 			break;
-		if (talkId == TalkID::SmithSell ? CanSellToSmith(-(i + 1)) : CanSellToWitch(-(i + 1))) {
+		if (CanSellToTowner(talkId, i)) {
 			sellOk = true;
 			playerItem[playerItemIdx] = MyPlayer->SpdList[i];
 

diff --git a/Source/stores.h b/Source/stores.h
@@ -182,7 +182,7 @@ class StoreSession {
 	void UpdateItemStatFlags(TalkID talkId);
 	void DrawTownerBuy(TalkID talkId);
 	void DrawTownerSell(TalkID talkId);
-	void CanSellToTowner(TalkID talkId, int i);
+	bool CanSellToTowner(TalkID talkId, int i);
 
 	/* Smith */