Recalculate cursor position after level change

Source/diablo.cpp

@@ -747,8 +747,6 @@ void GameEventHandler(const SDL_Event &event, uint16_t modState)
 			nthread_ignore_mutex(true);
 			PaletteFadeOut(8);
 			sound_stop();
-			LastMouseButtonAction = MouseActionType::None;
-			sgbMouseDown = CLICK_NONE;
 			ShowProgress(GetCustomEvent(event.type));
 
 			RedrawEverything();
@@ -2923,12 +2921,12 @@ void LoadGameLevel(bool firstflag, lvl_entry lvldir)
 
 	CompleteProgress();
 
-	// Reset mouse selection of entities
+	// Recalculate mouse selection of entities after level change/load
-	pcursmonst = -1;
+	LastMouseButtonAction = MouseActionType::None;
-	ObjectUnderCursor = nullptr;
+	sgbMouseDown = CLICK_NONE;
-	pcursitem = -1;
+	ResetItemlabelHighlighted(); // level changed => item changed
-	pcursinvitem = -1;
+	pcursmonst = -1;             // ensure pcurstemp is set to a valid value
-	pcursplr = -1;
+	CheckCursMove();
 }
 
 bool game_loop(bool bStartup)

Source/qol/itemlabels.cpp

@@ -83,6 +83,11 @@ bool IsItemLabelHighlighted()
 	return isLabelHighlighted;
 }
 
+void ResetItemlabelHighlighted()
+{
+	isLabelHighlighted = false;
+}
+
 bool IsHighlightingLabelsEnabled()
 {
 	return altPressed != *sgOptions.Gameplay.showItemLabels;

Source/qol/itemlabels.h

@@ -12,6 +12,7 @@ namespace devilution {
 void ToggleItemLabelHighlight();
 void AltPressed(bool pressed);
 bool IsItemLabelHighlighted();
+void ResetItemlabelHighlighted();
 bool IsHighlightingLabelsEnabled();
 void AddItemToLabelQueue(int id, Point position);
 void DrawItemNameLabels(const Surface &out);