[Scummvm-git-logs] scummvm master -> 28442d47c41b62947737402e239e220e965d53e0

[dreammaster]

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

Summary:
bad821d451 TITANIC: Removed unused CWaveFile constructor
28442d47c4 CRUISE: Add explicit fall through comments to switch


Commit: bad821d451ac4b7af4225e5c4fcfa71a2f7a47a3
    https://github.com/scummvm/scummvm/commit/bad821d451ac4b7af4225e5c4fcfa71a2f7a47a3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-06T22:08:52-04:00

Commit Message:
TITANIC: Removed unused CWaveFile constructor

Changed paths:
    engines/titanic/sound/wave_file.cpp
    engines/titanic/sound/wave_file.h


diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
index 90367b0..8a4755a 100644
--- a/engines/titanic/sound/wave_file.cpp
+++ b/engines/titanic/sound/wave_file.cpp
@@ -70,12 +70,6 @@ CWaveFile::CWaveFile(Audio::Mixer *mixer) : _mixer(mixer), _pendingAudioStream(n
 	setup();
 }
 
-CWaveFile::CWaveFile(QSoundManager *owner) : _pendingAudioStream(nullptr),
-		_waveData(nullptr), _waveSize(0), _dataSize(0), _headerSize(0),
-		_rate(0), _flags(0), _wavType(0), _soundType(Audio::Mixer::kPlainSoundType) {
-	setup();
-}
-
 void CWaveFile::setup() {
 	_loadMode = LOADMODE_SCUMMVM;
 	_dataSize = 0;
diff --git a/engines/titanic/sound/wave_file.h b/engines/titanic/sound/wave_file.h
index c41d2a8..474f8b0 100644
--- a/engines/titanic/sound/wave_file.h
+++ b/engines/titanic/sound/wave_file.h
@@ -33,8 +33,6 @@ namespace Titanic {
 
 enum LoadMode { LOADMODE_AUDIO_BUFFER = 1, LOADMODE_SCUMMVM = 2 };
 
-class QSoundManager;
-
 class CWaveFile {
 private:
 	Audio::Mixer *_mixer;
@@ -70,7 +68,6 @@ public:
 	int _channel;
 public:
 	CWaveFile(Audio::Mixer *mixer);
-	CWaveFile(QSoundManager *owner);
 	~CWaveFile();
 
 	/**


Commit: 28442d47c41b62947737402e239e220e965d53e0
    https://github.com/scummvm/scummvm/commit/28442d47c41b62947737402e239e220e965d53e0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-06T22:09:14-04:00

Commit Message:
CRUISE: Add explicit fall through comments to switch

Changed paths:
    engines/cruise/actor.cpp


diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index 331b1c1..7d5c16c 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -853,6 +853,7 @@ void processAnimation() {
 						}
 					}
 				}
+				// fall through
 
 				case ANIM_PHASE_MOVE:
 				{
@@ -893,6 +894,7 @@ void processAnimation() {
 						break;
 					}
 				}
+				// fall through
 
 				case ANIM_PHASE_END:
 				{