From 51329c0dc6ee56d8b843f058aa3257ec9f30b71a Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Wed, 8 Nov 2017 16:46:05 -0600 Subject: ALL: Fix misuse of comma operator --- engines/cruise/actor.cpp | 3 ++- engines/cruise/sound.cpp | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'engines/cruise') 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; -- cgit v1.2.3