diff options
| author | Colin Snover | 2017-11-08 16:46:05 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-11-10 09:57:03 -0600 |
| commit | 51329c0dc6ee56d8b843f058aa3257ec9f30b71a (patch) | |
| tree | 85a171532e169bcce6f34a8c3d06555863ab4d0d /engines/cruise | |
| parent | 2de83e09374abd10700e5f2bc4671318f182980b (diff) | |
| download | scummvm-rg350-51329c0dc6ee56d8b843f058aa3257ec9f30b71a.tar.gz scummvm-rg350-51329c0dc6ee56d8b843f058aa3257ec9f30b71a.tar.bz2 scummvm-rg350-51329c0dc6ee56d8b843f058aa3257ec9f30b71a.zip | |
ALL: Fix misuse of comma operator
Diffstat (limited to 'engines/cruise')
| -rw-r--r-- | engines/cruise/actor.cpp | 3 | ||||
| -rw-r--r-- | engines/cruise/sound.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp index 7d5c16c3d2..84a8d4e734 100644 --- a/engines/cruise/actor.cpp +++ b/engines/cruise/actor.cpp @@ -433,7 +433,8 @@ void chemin0(int depart, int arrivee) { for (int i = 0; i < 20 + 1; i++) fl[i] = -1; - X = 0, Y = 30; + X = 0; + Y = 30; explore(depart, arrivee); } diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp index b477dcdf9c..57dcfcea8f 100644 --- a/engines/cruise/sound.cpp +++ b/engines/cruise/sound.cpp @@ -41,7 +41,11 @@ class PCSoundDriver { public: typedef void (*UpdateCallback)(void *); - PCSoundDriver() { _upCb = NULL, _upRef = NULL, _musicVolume = 0, _sfxVolume = 0; } + PCSoundDriver() : + _upCb(nullptr), + _upRef(nullptr), + _musicVolume(0), + _sfxVolume(0) {} virtual ~PCSoundDriver() {} virtual void setupChannel(int channel, const byte *data, int instrument, int volume) = 0; |