Fix Mouse Controls:

- Fix mouse controls when virtual dpad overlaps game screen - Only react on mouse clicks if clicks are within game space
joyrider3774 · Jun 18, 2024 · 070e816 · 070e816
1 parent d3eba11
commit 070e816
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/formula1.c b/src/formula1.c
@@ -184,10 +184,10 @@ void Game()
 		GameState -= GSInitDiff;
 	}
 
-	if(buttonReleased(BUTTON_LEFT) || mouseButtonReleased(MOUSE_LEFT))
+	if(buttonReleased(BUTTON_LEFT) || ((mouseButtonReleased(MOUSE_LEFT) &&  !anyButtonReleased() && mouseInGameBounds())))
 		if(CanMove)
 			MoveLeft();
-	if(buttonReleased(BUTTON_RIGHT) || mouseButtonReleased(MOUSE_RIGHT))		
+	if(buttonReleased(BUTTON_RIGHT) || ((mouseButtonReleased(MOUSE_RIGHT) && !anyButtonReleased() && mouseInGameBounds())))
 		if(CanMove)
 			MoveRight();
 
@@ -259,7 +259,7 @@ void GameOver()
 
 	if(buttonReleased(BUTTON_LEFT) || buttonReleased(BUTTON_RIGHT) || buttonReleased(BUTTON_UP) ||
 		buttonReleased(BUTTON_DOWN) || buttonReleased(BUTTON_1) || buttonReleased(BUTTON_2) || 
-		mouseButtonReleased(MOUSE_LEFT) || mouseButtonReleased(MOUSE_RIGHT))
+		((mouseButtonReleased(MOUSE_LEFT) || mouseButtonReleased(MOUSE_RIGHT)) && !anyButtonReleased() && mouseInGameBounds()))
 		GameState = GSGameInit;
 	setDrawColor(3,4,2,1);
 	blit(background, 0, 0, backgroundWidth, backgroundHeight, backgroundFlags);
@@ -292,7 +292,7 @@ void Intro()
 
 	if(buttonReleased(BUTTON_LEFT) || buttonReleased(BUTTON_RIGHT) || buttonReleased(BUTTON_UP) ||
 		buttonReleased(BUTTON_DOWN) || buttonReleased(BUTTON_1) || buttonReleased(BUTTON_2) || 
-		mouseButtonReleased(MOUSE_LEFT) || mouseButtonReleased(MOUSE_RIGHT))
+		((mouseButtonReleased(MOUSE_LEFT) || mouseButtonReleased(MOUSE_RIGHT)) && !anyButtonReleased() && mouseInGameBounds()))
 		GameState = GSGameInit;
 	setDrawColor(3,4,2,1);
 	blit(background, 0, 0, backgroundWidth, backgroundHeight, backgroundFlags);

diff --git a/src/helperfuncs.c b/src/helperfuncs.c
@@ -130,3 +130,13 @@ void clear(ColorIndex Index)
 	rect(0,0, SCREEN_SIZE, SCREEN_SIZE);
 	setDrawColor(Index1, Index2, Index3, Index4);
 }
+
+bool mouseInGameBounds()
+{
+	return (*MOUSE_Y <= SCREEN_SIZE) && (*MOUSE_X <= SCREEN_SIZE) && (*MOUSE_Y >= 0) && (*MOUSE_X >=0);
+}
+
+bool anyButtonReleased()
+{
+	return buttonReleased(BUTTON_1) || buttonReleased(BUTTON_2) || buttonReleased(BUTTON_DOWN) || buttonReleased(BUTTON_LEFT) || buttonReleased(BUTTON_RIGHT) || buttonReleased(BUTTON_UP);
+}
diff --git a/src/helperfuncs.h b/src/helperfuncs.h
@@ -31,4 +31,6 @@ void getDrawColor(ColorIndex *Index1, ColorIndex *Index2, ColorIndex *Index3, Co
 void setDrawColor(ColorIndex Index1, ColorIndex Index2, ColorIndex Index3, ColorIndex Index4);
 bool buttonReleased(uint32_t Button);
 bool mouseButtonReleased(uint32_t Button);
+bool mouseInGameBounds();
+bool anyButtonReleased();
 #endif