libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HUGO: Some space/tab cleanups

Browse Source 
svn-id: r55088
This commit is contained in:
Arnaud Boutonné 2011-01-01 23:57:50 +00:00
parent 319fdf40b2
commit fcf40ad626
6 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/hugo/display.cpp
View File

@ -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() {

2
engines/hugo/game.h
View File

@ -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."

3
engines/hugo/hugo.h
View File

@ -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);
}

2
engines/hugo/object_v2d.cpp
View File

@ -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

2
engines/hugo/schedule.cpp
View File

@ -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 ;

30
engines/hugo/sound.cpp
View File

@ -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]);