diff options
| author | Johannes Schickel | 2008-05-08 21:23:14 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-08 21:23:14 +0000 |
| commit | b53fe83695318a4e5545185a4fe7e7daa77f2bed (patch) | |
| tree | 63375abab1ec4d915c0067400764247b8546155f /engines/kyra | |
| parent | e0689193efa852a4391c9afcf7581238b1c4a0d9 (diff) | |
| download | scummvm-rg350-b53fe83695318a4e5545185a4fe7e7daa77f2bed.tar.gz scummvm-rg350-b53fe83695318a4e5545185a4fe7e7daa77f2bed.tar.bz2 scummvm-rg350-b53fe83695318a4e5545185a4fe7e7daa77f2bed.zip | |
Silenced some g++ 4.3 warnings.
svn-id: r31956
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/screen.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/sequences_v1.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/sound.h | 2 | ||||
| -rw-r--r-- | engines/kyra/sprites.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/text_hof.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 0f3d3f0259..6a6141b5c0 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -1933,7 +1933,7 @@ void Screen::convertAmigaGfx(uint8 *data, int w, int h, bool offscreen) { 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; diff --git a/engines/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp index 75aa1b4518..607def3583 100644 --- a/engines/kyra/sequences_v1.cpp +++ b/engines/kyra/sequences_v1.cpp @@ -176,7 +176,7 @@ void KyraEngine_v1::seq_introLogos() { _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; diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 85648f6b7e..4efe6779bd 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -192,7 +192,7 @@ public: 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 diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 4177f4cd7b..0ba9f456bf 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -140,7 +140,7 @@ void Sprites::updateSceneAnims() { 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; diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp index 3a0dab730c..0d40827390 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -649,7 +649,7 @@ void KyraEngine_HoF::npcChatSequence(const char *str, int objectId, int vocHigh, } 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) |