Complete AFrontEndMiniGameState2

Author: InfiniteC0re

OpenBarnyard/Source/GUI/AGUI2Element.h

@@ -267,6 +267,8 @@ class AGUI2Element : public AGUI2ElementNode
 		a_rNewChildren.LinkBefore( a_rInsertAfter );
 	}
 
+	TUINT32 GetColour() const { return m_uiColour; }
+
 public:
 	inline static TUINT32 s_uiVisibilityMask = 0xFFFFFFFF;
 

OpenBarnyard/Source/GameInterface/AAudioOptionsState.cpp

@@ -167,10 +167,10 @@ void AAudioOptionsState::OnRemoval()
 }
 
 // $Barnyard: FUNCTION 00443630
-void AAudioOptionsState::OnMenuItemActivated( AGUI2MenuItem& a_rMenuItem )
+void AAudioOptionsState::OnMenuItemActivated( AGUI2MenuItem* a_pMenuItem )
 {
 	ASoundManager::GetSingleton()->PlayCue( soundbank::UI_MENUOK );
-	ABYardMenuState::OnButtonActivated( TSTATICCAST( AGUI2Button, &a_rMenuItem ) );
+	ABYardMenuState::OnButtonActivated( TSTATICCAST( AGUI2Button, a_pMenuItem ) );
 }
 
 // $Barnyard: FUNCTION 00443060

OpenBarnyard/Source/GameInterface/AAudioOptionsState.h

@@ -71,7 +71,7 @@ class AAudioOptionsState : public ABYardMenuState
 	//-----------------------------------------------------------------------------
 	// ABYardMenuState
 	//-----------------------------------------------------------------------------
-	virtual void OnMenuItemActivated( AGUI2MenuItem& a_rMenuItem ) OVERRIDE;
+	virtual void OnMenuItemActivated( AGUI2MenuItem* a_pMenuItem ) OVERRIDE;
 	virtual void OnMenuItemFocused( AGUI2MenuItem& a_rOldFocus, AGUI2MenuItem& a_rNewFocus ) OVERRIDE;
 	virtual void OnMenuClose() OVERRIDE;
 

OpenBarnyard/Source/GameInterface/ABYardMenuState.cpp

@@ -240,7 +240,7 @@ void ABYardMenuState::OnInsertion()
 	// Setup menu
 	m_oMenu.SetFocus( TTRUE );
 	m_oMenu.SetItemActivationCallback( []( void* a_pUserData, AGUI2MenuItem* a_pItem ) {
-		TSTATICCAST( ABYardMenuState, a_pUserData )->OnMenuItemActivated( *a_pItem );
+		TSTATICCAST( ABYardMenuState, a_pUserData )->OnMenuItemActivated( a_pItem );
 	} );
 	m_oMenu.SetItemFocusCallback( []( void* a_pUserData, AGUI2MenuItem* a_pOldFocus, AGUI2MenuItem* a_pNewFocus ) {
 		TSTATICCAST( ABYardMenuState, a_pUserData )->OnMenuItemFocused( *a_pOldFocus, *a_pNewFocus );

OpenBarnyard/Source/GameInterface/ABYardMenuState.h

@@ -42,7 +42,7 @@ class ABYardMenuState : public AGameState
 	// Own methods
 	//-----------------------------------------------------------------------------
 	virtual void OnMenuOpen();
-	virtual void OnMenuItemActivated( AGUI2MenuItem& a_rMenuItem ) = 0;
+	virtual void OnMenuItemActivated( AGUI2MenuItem* a_pMenuItem ) = 0;
 	virtual void OnMenuItemFocused( AGUI2MenuItem& a_rOldFocus, AGUI2MenuItem& a_rNewFocus );
 	virtual void OnMenuClose();
 

OpenBarnyard/Source/GameInterface/AFrontEndMainMenuState2.cpp

@@ -276,9 +276,9 @@ void AFrontEndMainMenuState2::OnDeactivate()
 }
 
 // $Barnyard: FUNCTION 00408ec0
-void AFrontEndMainMenuState2::OnMenuItemActivated( AGUI2MenuItem& a_rMenuItem )
+void AFrontEndMainMenuState2::OnMenuItemActivated( AGUI2MenuItem* a_pMenuItem )
 {
-	AGUI2Button* pButton = TSTATICCAST( AGUI2Button, &a_rMenuItem );
+	AGUI2Button* pButton = TSTATICCAST( AGUI2Button, a_pMenuItem );
 
 	m_iActivatedButtonID = pButton->GetId();
 	OnButtonActivated( pButton );

OpenBarnyard/Source/GameInterface/AFrontEndMainMenuState2.h

@@ -48,7 +48,7 @@ class AFrontEndMainMenuState2 : public ABYardMenuState
 	//-----------------------------------------------------------------------------
 	// ABYardMenuState
 	//-----------------------------------------------------------------------------
-	virtual void OnMenuItemActivated( AGUI2MenuItem& a_rMenuItem ) OVERRIDE;
+	virtual void OnMenuItemActivated( AGUI2MenuItem* a_pMenuItem ) OVERRIDE;
 	virtual void OnMenuClose() OVERRIDE;
 
 private: