diff options
author | Arnaud Boutonné | 2011-01-01 23:57:50 +0000 |
---|---|---|
committer | Arnaud Boutonné | 2011-01-01 23:57:50 +0000 |
commit | fcf40ad6267a10456351404bea2f488f742fcc6c (patch) | |
tree | 15f0bf4d6e5836bd238b5fbc23760dd4ae28080d | |
parent | 319fdf40b29d922be0a32a3ad8d4cc3d0bb3380b (diff) | |
download | scummvm-rg350-fcf40ad6267a10456351404bea2f488f742fcc6c.tar.gz scummvm-rg350-fcf40ad6267a10456351404bea2f488f742fcc6c.tar.bz2 scummvm-rg350-fcf40ad6267a10456351404bea2f488f742fcc6c.zip |
HUGO: Some space/tab cleanups
svn-id: r55088
-rw-r--r-- | engines/hugo/display.cpp | 2 | ||||
-rw-r--r-- | engines/hugo/game.h | 2 | ||||
-rw-r--r-- | engines/hugo/hugo.h | 3 | ||||
-rw-r--r-- | engines/hugo/object_v2d.cpp | 2 | ||||
-rw-r--r-- | engines/hugo/schedule.cpp | 2 | ||||
-rw-r--r-- | engines/hugo/sound.cpp | 30 |
6 files changed, 20 insertions, 21 deletions
diff --git a/engines/hugo/display.cpp b/engines/hugo/display.cpp index 4500a11fa3..ad0e1f2d4c 100644 --- a/engines/hugo/display.cpp +++ b/engines/hugo/display.cpp @@ -435,7 +435,7 @@ void Screen::shadowStr(int16 sx, int16 sy, const char *s, byte color) { } /** -* Introduce user to the game. In the original games, it was only +* Introduce user to the game. In the original games, it was only * present in the DOS versions */ void Screen::userHelp() { diff --git a/engines/hugo/game.h b/engines/hugo/game.h index 512e96cad2..e7e73edcf0 100644 --- a/engines/hugo/game.h +++ b/engines/hugo/game.h @@ -42,7 +42,7 @@ class SeekableReadStream; namespace Hugo { -// WARNING!! +// WARNING!! // Type "PPG" in the game to enter cheat mode. #define COPYRIGHT "Copyright 1989-1997 David P Gray, All Rights Reserved." diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h index 7ba1d54200..633867b10b 100644 --- a/engines/hugo/hugo.h +++ b/engines/hugo/hugo.h @@ -128,7 +128,7 @@ public: int8 _soundTest; int8 _tunesNbr; uint16 _numScreens; - int8 _normalTPS; // Number of ticks (frames) per second. + int8 _normalTPS; // Number of ticks (frames) per second. //8 for Win versions, 9 for DOS versions @@ -258,7 +258,6 @@ public: return _introXSize; } Common::Error saveGameState(int slot, const char *desc) { - return (_file->saveGame(slot, desc) ? Common::kWritingFailed : Common::kNoError); } diff --git a/engines/hugo/object_v2d.cpp b/engines/hugo/object_v2d.cpp index b75c73ac7b..f97f8af002 100644 --- a/engines/hugo/object_v2d.cpp +++ b/engines/hugo/object_v2d.cpp @@ -52,7 +52,7 @@ ObjectHandler_v2d::ObjectHandler_v2d(HugoEngine *vm) : ObjectHandler_v1d(vm) { ObjectHandler_v2d::~ObjectHandler_v2d() { } -/** +/** * Draw all objects on screen as follows: * 1. Sort 'FLOATING' objects in order of y2 (base of object) * 2. Display new object frames/positions in dib diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp index 6e4e4f5de3..52f0222466 100644 --- a/engines/hugo/schedule.cpp +++ b/engines/hugo/schedule.cpp @@ -133,7 +133,7 @@ uint32 Scheduler::getDosTicks(bool updateFl) { if (!updateFl) return(tick); - if (t_old == 0) + if (t_old == 0) t_old = (uint32) floor((double) (g_system->getMillis() * _vm->getTPS() / 1000)); /* Calculate current wall time in ticks */ t_now = g_system->getMillis() * _vm->getTPS() / 1000 ; diff --git a/engines/hugo/sound.cpp b/engines/hugo/sound.cpp index 8be6efcdca..d2b1e8d089 100644 --- a/engines/hugo/sound.cpp +++ b/engines/hugo/sound.cpp @@ -153,7 +153,7 @@ int MidiPlayer::open() { if (ret) return ret; - _driver->sendGMReset(); + _driver->sendGMReset(); _parser = MidiParser::createParser_SMF(); _parser->setMidiDriver(this); @@ -185,10 +185,10 @@ void MidiPlayer::send(uint32 b) { _channelsVolume[ch] = volume; volume = volume * _masterVolume / 255; b = (b & 0xFF00FFFF) | (volume << 16); - debugC(8, kDebugMusic, "Volume change, channel %d volume %d", ch, volume); + debugC(8, kDebugMusic, "Volume change, channel %d volume %d", ch, volume); break; case 0x7BB0: // all notes off - debugC(8, kDebugMusic, "All notes off, channel %d", ch); + debugC(8, kDebugMusic, "All notes off, channel %d", ch); if (!_channelsTable[ch]) { // channel not yet allocated, no need to send the event return; } @@ -302,23 +302,23 @@ void SoundHandler::playSound(int16 sound, stereo_t channel, byte priority) { sound_pt sound_p; // Sound data uint16 size; // Size of data static byte curPriority = 0; // Priority of currently playing sound - // - /* Sound disabled */ + + // Sound disabled if (!_config.soundFl || !_vm->_mixer->isReady()) return; - + syncVolume(); - + // - // // See if last wave still playing - if so, check priority + // See if last wave still playing - if so, check priority // if (waveOutUnprepareHeader(hwav, lphdr, sizeof(WAVEHDR)) == WAVERR_STILLPLAYING) - // if (priority < curPriority) // Don't override unless priority >= current - // return; - // else - // Stop_sound(); + // if (priority < curPriority) // Don't override unless priority >= current + // return; + // else + // Stop_sound(); curPriority = priority; - // - /* Get sound data */ + + // Get sound data if ((sound_p = _vm->_file->getSound(sound, &size)) == 0) return; @@ -355,7 +355,7 @@ void SoundHandler::checkMusic() { for (int i = 0; _vm->_defltTunes[i] != -1; i++) { if (_vm->_defltTunes[i] == _vm->getGameStatus().song) { - if (_vm->_defltTunes[i + 1] != -1) + if (_vm->_defltTunes[i + 1] != -1) playMusic(_vm->_defltTunes[i + 1]); else playMusic(_vm->_defltTunes[0]); |