Addressing PR comments

Gamer.cpp

@@ -611,22 +611,7 @@ void Gamer::appendColumn(byte* screen, byte col)
   delay(60);
 }
 
-/**
-  Shows the score. Maximum 2 digits :(
-  @param n the score to be displayed
- */
-void Gamer::showScore(int n)
-{
-  byte result[8];
-  int dig1=n/10;
-  int dig2=n%10;
-  for(byte p=0;p<8;p++) {
-    result[p]=pgm_read_byte(&allNumbers[dig2][p]);
-    if( dig1>0 )
-    result[p]|=(pgm_read_byte(&allNumbers[dig1][p])<<4);
-  }
-  printImage(result);
-}
+// Removed showScore() — games use the version in the main .ino file instead.
 
 /**
   Prints an 8-byte PROGMEM image onto the display.

Gamer.h

@@ -53,8 +53,8 @@ class Gamer {
 	void playTone(int note);
 	void stopTone();
 	void printString(const char* string);
+	void showScore(int score);
 	void appendColumn(byte* screen, byte col);
-	void showScore(int n);
 	void printImagePGM(const byte* pgm_img);
 
 	// Infrared

TWSUGamerPlus.ino

@@ -46,6 +46,13 @@ bool startFromHighScore = false;
 byte startingHighScore = 0;
 
 // ── Helper functions ──────────────────────────────────────────────────────────
+// Common game loop preamble: check sound toggle, update LED flash, optionally stop tone
+inline void updateGameInput(bool stopTone = true) {
+  checkSoundToggle();
+  updateLEDFlash();
+  if (soundEnabled && stopTone) gamer.stopTone();
+}
+
 void startLEDFlash() {
   gamer.setLED(true);
   ledFlashStartTime = millis();

src/games/alien.h

@@ -78,8 +78,7 @@ void alienLoop() {
     moveAlien();
     while (millis() - lastMove < moveDelay) {
       delay(10);
-      checkSoundToggle();
-      updateLEDFlash();
+      updateGameInput();
       if(gamer.isPressed(UP)){
         for(int8_t i = 7; i >= 0; i--) {
           gamer.display[currentX][i] = 1;

src/games/breakout.h

@@ -15,63 +15,44 @@ int origYV=-1;
 byte scoreBreakout = 0;
 
 bool outOfBounds(int xV, int yV) {
-  return (xV > 8 || xV < 0 || yV > 8 || yV < 0);
+  return (xV >= 8 || xV < 0 || yV >= 8 || yV < 0);
+}
+
+// Helper: checks if a position is free (LOW) and in bounds
+inline bool isFree(int x, int y) {
+  return !outOfBounds(x, y) && gamer.display[x][y] == LOW;
 }
 
 void physics() {
-  if(gamer.display[currentXBreakout+velocity[0]][currentYBreakout+velocity[1]]==HIGH || outOfBounds(currentXBreakout+velocity[0],currentYBreakout+velocity[1])) {
-    //Collided with something!!!
+  int nextX = currentXBreakout + velocity[0];
+  int nextY = currentYBreakout + velocity[1];
+
+  // Check if we hit something at the next position
+  if(outOfBounds(nextX, nextY) || gamer.display[nextX][nextY] == HIGH) {
+    // Collision detected!
     startLEDFlash();
     if(soundEnabled) {
-      if(currentYBreakout==6) {
-        gamer.playTone(NOTE_C8);
-      } 
-      else {
-        gamer.playTone(NOTE_E8);
-      }
+      gamer.playTone((currentYBreakout == 6) ? NOTE_C8 : NOTE_E8);
     }
-    if(velocity[0]==1) {
-      if(velocity[1]==1) {
-        if(gamer.display[currentXBreakout+velocity[0]][currentYBreakout-1]==LOW && !outOfBounds(currentXBreakout+velocity[0],currentYBreakout-1)) {
-          velocity[1]=-1;
-        }
-        else if(gamer.display[currentXBreakout-1][currentYBreakout-1]==LOW && !outOfBounds(currentXBreakout-1,currentYBreakout-1)) {
-          velocity[1]=-1;
-          velocity[0]=-1;
-        }
-      }
-      else if(velocity[1]==-1) {
-        if(gamer.display[currentXBreakout+velocity[0]][currentYBreakout+1]==LOW && !outOfBounds(currentXBreakout+velocity[0],currentYBreakout+1)) {
-          velocity[1]=1;
-        } 
-        else if(gamer.display[currentXBreakout-1][currentYBreakout+1]==LOW && !outOfBounds(currentXBreakout-1,currentYBreakout+1)) {
-          velocity[1]=1;
-          velocity[0]=-1;
-        } 
-      } 
-    } 
-    else if(velocity[0]==-1) {
-      if(velocity[1]==1) {
-        if(gamer.display[currentXBreakout+velocity[0]][currentYBreakout-1]==LOW && !outOfBounds(currentXBreakout+velocity[0],currentYBreakout-1)) {
-          velocity[1]=-1;
-        } 
-        else if(gamer.display[currentXBreakout+1][currentYBreakout-1]==LOW && !outOfBounds(currentXBreakout-1,currentYBreakout-1)) {
-          velocity[1]=-1;
-          velocity[0]=1;
-        }
-      } 
-      else if(velocity[1]==-1) {
-        if(gamer.display[currentXBreakout+velocity[0]][currentYBreakout+1]==LOW && !outOfBounds(currentXBreakout+velocity[0],currentYBreakout+1)) {
-          velocity[1]=1;
-        } 
-        else if(gamer.display[currentXBreakout+1][currentYBreakout+1]==LOW && !outOfBounds(currentXBreakout-1,currentYBreakout+1)) {
-          velocity[1]=1;
-          velocity[0]=1;
-        }
-      } 
+
+    // Try to bounce off edges intelligently
+    // Check if we can bounce just horizontally or just vertically
+    bool canBounceY = isFree(nextX, currentYBreakout - velocity[1]);
+    bool canBounceX = isFree(currentXBreakout - velocity[0], nextY);
+
+    if(canBounceY) {
+      velocity[1] *= -1;  // Bounce vertically
+    } else if(canBounceX) {
+      velocity[0] *= -1;  // Bounce horizontally
+    } else {
+      // Corner hit - bounce both directions
+      velocity[0] *= -1;
+      velocity[1] *= -1;
     }
-    if(!outOfBounds(currentXBreakout+origXV,currentYBreakout+origYV)) {
-      blocks[currentXBreakout+origXV][currentYBreakout+origYV]=0;
+
+    // Clear the block we hit (if in bounds)
+    if(!outOfBounds(currentXBreakout + origXV, currentYBreakout + origYV)) {
+      blocks[currentXBreakout + origXV][currentYBreakout + origYV] = 0;
     }
   }
 }
@@ -106,9 +87,7 @@ void startBreakoutReset() {
 }
 
 void breakoutLoop() {
-  checkSoundToggle();
-  updateLEDFlash();
-  if(soundEnabled) gamer.stopTone();
+  updateGameInput();
   if(breakoutCounter>2) {
     for(byte x=0;x<8;x++) {
       for(byte y=0;y<8;y++) {
@@ -142,42 +121,14 @@ void breakoutLoop() {
       }
     }
     physics();
+    // Propagate block destruction to adjacent blocks in a checkerboard pattern
     for(byte x=0;x<8;x++) {
       for(byte y=0;y<8;y++) {
         if(blocks[x][y]==0) {
-          if(x%2==0) {
-            if(y%2==0) {
-              if(x<7) {
-                blocks[x+1][y]=0;
-              } else {
-                blocks[0][y]=0;
-              }
-            } 
-            else {
-              if(x>0) {
-                blocks[x-1][y]=0;
-              } else {
-                blocks[7][y]=0;
-              }
-            }
-          } 
-          else {
-            if(y%2==0) {
-              if(x>0) {
-                blocks[x-1][y]=0;
-              } else {
-                blocks[7][y]=0;
-              }
-            } 
-            else {
-              if(x<7) {
-                blocks[x+1][y]=0;
-              } else {
-                blocks[0][y]=0;
-              }
-            }
-          }
-        }  
+          // Determine adjacent block based on checkerboard pattern
+          byte adjX = ((x % 2) == (y % 2)) ? ((x < 7) ? x + 1 : 0) : ((x > 0) ? x - 1 : 7);
+          blocks[adjX][y] = 0;
+        }
       }
     }
     for(byte x=0;x<8;x++) {

src/games/conway.h

@@ -72,8 +72,7 @@ bool conwayStepSmall() {
 void resetConway() { conwayRandomize(); }
 
 void conwayLoop() {
-  checkSoundToggle();
-  updateLEDFlash();
+  updateGameInput();
 
   bool changed = conwayStep();
   if (!changed) {

src/games/dino.h

@@ -38,9 +38,7 @@ void resetDino() {
 }
 
 void dinoLoop() {
-	checkSoundToggle();
-	updateLEDFlash();
-	if (soundEnabled) gamer.stopTone();
+	updateGameInput();
 
 	// ── Game-over: show score, then auto-restart ──────────────────────────
 	if (dinoOver) {

src/games/flappy.h

@@ -87,9 +87,7 @@ inline void resetFlappyLauncher() {
 
 void flappyLoop()
 {
-  checkSoundToggle();
-  updateLEDFlash();
-  if (soundEnabled) gamer.stopTone();
+  updateGameInput();
   if( menu )
   {
     ++ticks;

src/games/simon.h

@@ -28,8 +28,7 @@ void resetSimon() {
 }
 
 void simonLoop() {
-  checkSoundToggle();
-  updateLEDFlash();
+  updateGameInput();
   static const byte simonNotes[] PROGMEM = {NOTE_E8, NOTE_C8, NOTE_G8, NOTE_D8};
   sequence[simonStep]=random(0, SIMON_NUM_DIRECTIONS);
   if(simonStep>0) {

src/games/snake.h

@@ -90,9 +90,8 @@ void snakeRec() {
 }
 
 void snakeLoop() {
-  checkSoundToggle();
-  updateLEDFlash();
-  if (soundEnabled) gamer.stopTone();
+  updateGameInput();
+  // Clear display manually (faster than gamer.clear() which also calls updateDisplay)
   for(byte x=0;x<8;x++) {
     for(byte y=0;y<8;y++) {
       gamer.display[x][y] = LOW;

src/games/tetris.h

@@ -187,8 +187,7 @@ void resetTetris() {
 }
 
 void tetrisLoop() {
-  checkSoundToggle();
-  updateLEDFlash();
+  updateGameInput(false);  // Don't stop tones - Tetris manages its own melody
 
   if (soundEnabled && tetrisChirpPending) {
     gamer.stopTone();