[Scummvm-cvs-logs] SF.net SVN: scummvm: [31956] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31956
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31956&view=rev
Author:   lordhoto
Date:     2008-05-08 14:23:14 -0700 (Thu, 08 May 2008)

Log Message:
-----------
Silenced some g++ 4.3 warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/sequences_v1.cpp
    scummvm/trunk/engines/kyra/sound.h
    scummvm/trunk/engines/kyra/sprites.cpp
    scummvm/trunk/engines/kyra/text_hof.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2008-05-08 20:55:39 UTC (rev 31955)
+++ scummvm/trunk/engines/kyra/screen.cpp	2008-05-08 21:23:14 UTC (rev 31956)
@@ -1933,7 +1933,7 @@
 	for (int y = 0; y < h; ++y) {
 		for (int x = 0; x < w; ++x) {
 			int bytePos = x/8+y*40;
-			int bitPos = 7-x&7;
+			int bitPos = 7-(x&7);
 
 			byte colorIndex = 0;
 			colorIndex |= (((tmp[bytePos + 8000 * 0] & (1 << bitPos)) >> bitPos) & 0x1) << 0;

Modified: scummvm/trunk/engines/kyra/sequences_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v1.cpp	2008-05-08 20:55:39 UTC (rev 31955)
+++ scummvm/trunk/engines/kyra/sequences_v1.cpp	2008-05-08 21:23:14 UTC (rev 31956)
@@ -176,7 +176,7 @@
 		_screen->setScreenPalette(_screen->_currentPalette);
 	}
 
-	if (_seq->playSequence(_seq_KyrandiaLogo, _skipFlag) && !seq_skipSequence() || _quitFlag) {
+	if ((_seq->playSequence(_seq_KyrandiaLogo, _skipFlag) && !seq_skipSequence()) || _quitFlag) {
 		_screen->fadeToBlack();
 		_screen->clearPage(0);
 		return;

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2008-05-08 20:55:39 UTC (rev 31955)
+++ scummvm/trunk/engines/kyra/sound.h	2008-05-08 21:23:14 UTC (rev 31956)
@@ -192,7 +192,7 @@
 protected:
 	const char *fileListEntry(int file) const { return (_soundDataList != 0 && file >= 0 && file < _soundDataList->_fileListLen) ? _soundDataList->_fileList[file] : ""; }
 	const void *cdaData() const { return _soundDataList != 0 ? _soundDataList->_cdaTracks : 0; }
-	const int cdaTrackNum() const { return _soundDataList != 0 ? _soundDataList->_cdaNumTracks : 0; }
+	int cdaTrackNum() const { return _soundDataList != 0 ? _soundDataList->_cdaNumTracks : 0; }
 
 	enum {
 		kNumChannelHandles = 4

Modified: scummvm/trunk/engines/kyra/sprites.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites.cpp	2008-05-08 20:55:39 UTC (rev 31955)
+++ scummvm/trunk/engines/kyra/sprites.cpp	2008-05-08 21:23:14 UTC (rev 31956)
@@ -140,7 +140,7 @@
 	uint16 sound;
 
 	for (int i = 0; i < MAX_NUM_ANIMS; i++) {
-		if (_anims[i].script == 0 || !_anims[i].play || _anims[i].nextRun != 0 && _anims[i].nextRun > currTime)
+		if (_anims[i].script == 0 || !_anims[i].play || (_anims[i].nextRun != 0 && _anims[i].nextRun > currTime))
 			continue;
 
 		data = _anims[i].curPos;

Modified: scummvm/trunk/engines/kyra/text_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_hof.cpp	2008-05-08 20:55:39 UTC (rev 31955)
+++ scummvm/trunk/engines/kyra/text_hof.cpp	2008-05-08 21:23:14 UTC (rev 31956)
@@ -649,7 +649,7 @@
 	}
 
 	while (((textEnabled() && _chatEndTime > _system->getMillis()) || (speechEnabled() && snd_voiceIsPlaying())) && !(_quitFlag || skipFlag())) {
-		if (!speechEnabled() && chatAnimEndTime > _system->getMillis() || speechEnabled() && snd_voiceIsPlaying()) {
+		if ((!speechEnabled() && chatAnimEndTime > _system->getMillis()) || (speechEnabled() && snd_voiceIsPlaying())) {
 			_tim->resetFinishedFlag();
 			while (!_tim->finished() && !skipFlag() && !_quitFlag) {
 				if (_currentTalkSections.TLKTim)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.