Remove warnings from NDS build.

svn-id: r35172

6 files changed, 33 insertions, 27 deletions

diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp
index 96d901fbba..52c07faca3 100644
--- a/engines/saga/actor.cpp
+++ b/engines/saga/actor.cpp
@@ -925,8 +925,8 @@ uint16 Actor::hitTest(const Point &testPoint, bool skipProtagonist) {
 
 	CommonObjectOrderList::iterator drawOrderIterator;
 	CommonObjectDataPointer drawObject;
-	int frameNumber;
-	SpriteList *spriteList;
+	int frameNumber = 0;
+	SpriteList *spriteList = NULL;
 
 	createDrawOrderList();
 
@@ -1044,8 +1044,8 @@ void Actor::drawActors() {
 
 	CommonObjectOrderList::iterator drawOrderIterator;
 	CommonObjectDataPointer drawObject;
-	int frameNumber;
-	SpriteList *spriteList;
+	int frameNumber = 0;
+	SpriteList *spriteList = NULL;
 
 	Surface *backBuffer;
 
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 38d126c5d4..4f4c90fc9c 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -1243,7 +1243,7 @@ bool Interface::processTextInput(Common::KeyState keystate) {
 		_textInputPos = _textInputStringLength + 1;
 		break;
 	default:
-		if (keystate.ascii <= 255 && isalnum(keystate.ascii) || (keystate.ascii == ' ') ||
+		if (((keystate.ascii <= 255) && (isalnum(keystate.ascii))) || (keystate.ascii == ' ') ||
 		    (keystate.ascii == '-') || (keystate.ascii == '_')) {
 			if (_textInputStringLength < save_title_size - 1) {
 				ch[0] = keystate.ascii;
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 328dee3566..b4a8f23203 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -139,7 +139,9 @@ DigitalMusicInputStream::~DigitalMusicInputStream() {
 }
 
 void DigitalMusicInputStream::createCompressedStream() {
+#if defined(USE_MAD) || defined(USE_VORBIS) || defined(USE_FLAC)
 	uint numLoops = _looping ? 0 : 1;
+#endif
 	_memoryStream = _file->readStream(resourceData->size - 9);
 
 	switch (soundType) {
diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp
index 7e85338a8d..d84435fc5d 100644
--- a/engines/saga/saveload.cpp
+++ b/engines/saga/saveload.cpp
@@ -190,8 +190,8 @@ void SagaEngine::save(const char *fileName, const char *saveName) {
 	tm curTime;
 	_system->getTimeAndDate(curTime);
 
-	uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | (curTime.tm_year + 1900) & 0xFFFF;
-	uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | (curTime.tm_min) & 0xFF;
+	uint32 saveDate = ((curTime.tm_mday & 0xFF) << 24) | (((curTime.tm_mon + 1) & 0xFF) << 16) | ((curTime.tm_year + 1900) & 0xFFFF);
+	uint16 saveTime = ((curTime.tm_hour & 0xFF) << 8) | ((curTime.tm_min) & 0xFF);
 
 	out->writeUint32BE(saveDate);
 	out->writeUint16BE(saveTime);
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index 1d41d39cf2..107b637167 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -92,7 +92,9 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, SoundBuffer &buffer, int
 					buffer.size, buffer.frequency, flags, -1, volume);
 	} else {
 		Audio::AudioStream *stream = NULL;
+#if defined(USE_MAD) || defined(USE_VORBIS) || defined(USE_FLAC)
 		MemoryReadStream *tmp = NULL;
+#endif
 
 		switch (buffer.soundType) {
 #ifdef USE_MAD
diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index a1f78e1b9f..879299e290 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -254,11 +254,11 @@ void Sprite::drawClip(Surface *ds, const Rect &clipRect, const Point &spritePoin
 }
 
 void Sprite::draw(Surface *ds, const Rect &clipRect, SpriteList &spriteList, int32 spriteNumber, const Point &screenCoord, int scale) {
-	const byte *spriteBuffer;
-	int width;
-	int height;
-	int xAlign;
-	int yAlign;
+	const byte *spriteBuffer = NULL;
+	int width  = 0;
+	int height = 0;
+	int xAlign = 0;
+	int yAlign = 0;
 	Point spritePointer;
 
 	getScaledSpriteBuffer(spriteList, spriteNumber, scale, width, height, xAlign, yAlign, spriteBuffer);
@@ -270,11 +270,13 @@ void Sprite::draw(Surface *ds, const Rect &clipRect, SpriteList &spriteList, int
 }
 
 void Sprite::draw(Surface *ds, const Rect &clipRect, SpriteList &spriteList, int32 spriteNumber, const Rect &screenRect, int scale) {
-	const byte *spriteBuffer;
-	int width;
-	int height;
-	int xAlign, spw;
-	int yAlign, sph;
+	const byte *spriteBuffer = NULL;
+	int width  = 0;
+	int height = 0;
+	int xAlign = 0;
+	int spw;
+	int yAlign = 0;
+	int sph;
 	Point spritePointer;
 
 	getScaledSpriteBuffer(spriteList, spriteNumber, scale, width, height, xAlign, yAlign, spriteBuffer);
@@ -292,13 +294,13 @@ void Sprite::draw(Surface *ds, const Rect &clipRect, SpriteList &spriteList, int
 }
 
 bool Sprite::hitTest(SpriteList &spriteList, int spriteNumber, const Point &screenCoord, int scale, const Point &testPoint) {
-	const byte *spriteBuffer;
+	const byte *spriteBuffer = NULL;
 	int i, j;
 	const byte *srcRowPointer;
-	int width;
-	int height;
-	int xAlign;
-	int yAlign;
+	int width  = 0;
+	int height = 0;
+	int xAlign = 0;
+	int yAlign = 0;
 	Point spritePointer;
 
 	getScaledSpriteBuffer(spriteList, spriteNumber, scale, width, height, xAlign, yAlign, spriteBuffer);
@@ -319,17 +321,17 @@ bool Sprite::hitTest(SpriteList &spriteList, int spriteNumber, const Point &scre
 }
 
 void Sprite::drawOccluded(Surface *ds, const Rect &clipRect, SpriteList &spriteList, int spriteNumber, const Point &screenCoord, int scale, int depth) {
-	const byte *spriteBuffer;
+	const byte *spriteBuffer = NULL;
 	int x, y;
 	byte *destRowPointer;
 	const byte *sourceRowPointer;
 	const byte *sourcePointer;
 	byte *destPointer;
 	byte *maskPointer;
-	int width;
-	int height;
-	int xAlign;
-	int yAlign;
+	int width  = NULL;
+	int height = 0;
+	int xAlign = 0;
+	int yAlign = 0;
 
 	ClipData clipData;