From 25160b191ced68b9d2b1056b5c2c56ea85050a49 Mon Sep 17 00:00:00 2001
From: baz <bazzadobs@live.co.uk>
Date: Fri, 15 Aug 2025 22:15:17 +0100
Subject: [PATCH] Reduce number of bindings

---
 Source/vampires/Widgets/GameOverWidget.cpp | 23 +++++++++++++++-------
 Source/vampires/Widgets/GameOverWidget.h   |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Source/vampires/Widgets/GameOverWidget.cpp b/Source/vampires/Widgets/GameOverWidget.cpp
index 9b547f0..e1ad6f3 100644
--- a/Source/vampires/Widgets/GameOverWidget.cpp
+++ b/Source/vampires/Widgets/GameOverWidget.cpp
@@ -16,13 +16,8 @@ void UGameOverWidget::NativeConstruct()
 	if (ReturnButton)
 	{
 		ReturnButton->OnClicked.AddUniqueDynamic(this, &UGameOverWidget::ReturnButtonOnClicked);
-		ReturnButton->OnClicked.AddUniqueDynamic(this, &UGameOverWidget::PlayClickedSound);
-
-		ReturnButton->OnHovered.AddUniqueDynamic(this, &UGameOverWidget::PlayHoveredSound);
-		ReturnButton->OnHovered.AddUniqueDynamic(this, &UGameOverWidget::ReturnTextBlockHoveredDelegate);
-
-		ReturnButton->OnUnhovered.AddUniqueDynamic(this, &UGameOverWidget::ReturnTextBlockUnhoveredDelegate);
-		ReturnButton->OnUnhovered.AddUniqueDynamic(this, &UGameOverWidget::PlayUnhoveredSound);
+		ReturnButton->OnHovered.AddUniqueDynamic(this, &UGameOverWidget::ReturnButtonOnHovered);
+		ReturnButton->OnUnhovered.AddUniqueDynamic(this, &UGameOverWidget::ReturnButtonOnUnhovered);
 	}
 }
 
@@ -57,6 +52,8 @@ void UGameOverWidget::SetGameInfo(int Level, float Timer, int Kill, int Gold)
 
 void UGameOverWidget::ReturnButtonOnClicked()
 {
+	PlayClickedSound();
+
 	if (UVampireGameInstance* GameInstance = Cast<UVampireGameInstance>(GetGameInstance()))
 	{
 		if (!GameInstance->MainMenuWorld.IsNull())
@@ -71,3 +68,15 @@ void UGameOverWidget::ReturnButtonOnClicked()
 		}
 	}
 }
+
+void UGameOverWidget::ReturnButtonOnHovered()
+{
+	SetTextBlockHovered(ReturnBlock);
+	PlayHoveredSound();
+}
+
+void UGameOverWidget::ReturnButtonOnUnhovered()
+{
+	SetTextBlockUnhovered(ReturnBlock);
+	PlayUnhoveredSound();
+}
diff --git a/Source/vampires/Widgets/GameOverWidget.h b/Source/vampires/Widgets/GameOverWidget.h
index fa510ec..3f73f82 100644
--- a/Source/vampires/Widgets/GameOverWidget.h
+++ b/Source/vampires/Widgets/GameOverWidget.h
@@ -46,8 +46,8 @@ private:
 	void ReturnButtonOnClicked();
 
 	UFUNCTION()
-	void ReturnTextBlockHoveredDelegate() { SetTextBlockHovered(ReturnBlock); }
+	void ReturnButtonOnHovered();
 
 	UFUNCTION()
-	void ReturnTextBlockUnhoveredDelegate() { SetTextBlockUnhovered(ReturnBlock); }
+	void ReturnButtonOnUnhovered();
 };