[Scummvm-git-logs] scummvm master -> b314b79619cdcf16423833f6d913c0e87d38a283

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b314b79619 BAGEL: Remove a useless include, add a couple of default cases, remove useless initialization in MusicPlayer::play


Commit: b314b79619cdcf16423833f6d913c0e87d38a283
    https://github.com/scummvm/scummvm/commit/b314b79619cdcf16423833f6d913c0e87d38a283
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-06-10T21:48:32+01:00

Commit Message:
BAGEL: Remove a useless include, add a couple of default cases, remove useless initialization in MusicPlayer::play

Changed paths:
    engines/bagel/dialogs/quit_dialog.h
    engines/bagel/music.cpp
    engines/bagel/spacebar/bibble_window.cpp


diff --git a/engines/bagel/dialogs/quit_dialog.h b/engines/bagel/dialogs/quit_dialog.h
index f961cfc8ed6..a1a4099fd82 100644
--- a/engines/bagel/dialogs/quit_dialog.h
+++ b/engines/bagel/dialogs/quit_dialog.h
@@ -25,7 +25,6 @@
 
 #include "bagel/boflib/gui/dialog.h"
 #include "bagel/boflib/gui/button.h"
-#include "bagel/boflib/gfx/text.h"
 
 namespace Bagel {
 
diff --git a/engines/bagel/music.cpp b/engines/bagel/music.cpp
index 486b429a534..e8b1365983b 100644
--- a/engines/bagel/music.cpp
+++ b/engines/bagel/music.cpp
@@ -49,8 +49,8 @@ void MusicPlayer::play(CBofSound *sound) {
 		return;
 	}
 
-	MidiParser *parser = nullptr;
-	bool loaded = false;
+	MidiParser *parser;
+	bool loaded;
 	if (sound->_chType == SOUND_TYPE_XM) {
 		parser = MidiParser::createParser_XMIDI();
 		loaded = parser->loadMusic(sound->_pFileBuf, sound->_iFileSize);
diff --git a/engines/bagel/spacebar/bibble_window.cpp b/engines/bagel/spacebar/bibble_window.cpp
index a25f55f66d0..f55a39d62a4 100644
--- a/engines/bagel/spacebar/bibble_window.cpp
+++ b/engines/bagel/spacebar/bibble_window.cpp
@@ -727,6 +727,9 @@ ErrorCode CBibbleWindow::playGame() {
 					case 2:
 						BofPlaySoundEx(BuildDir(BIBBLE_AUDIO_PAYS4), SOUND_MIX | SOUND_QUEUE, 7, true);
 						break;
+
+					default:
+						break;
 					}
 				}
 
@@ -983,6 +986,9 @@ void CBibbleWindow::calcOutcome() {
 				g_engine->g_cBetAreas[i]._bWon = true;
 			}
 			break;
+
+		default:
+			break;
 		}
 	}