diff options
| author | Alyssa Milburn | 2011-08-20 00:40:44 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-20 00:40:44 +0200 |
| commit | e916f9ce8c284a429798ea2dc74fd0b6fc1b09ab (patch) | |
| tree | 537f8500514ef80588bab0a1cc4cd0083bdd53e5 /engines | |
| parent | e4a37322a6678aa3874d96ce131bebbccbdd7a44 (diff) | |
| download | scummvm-rg350-e916f9ce8c284a429798ea2dc74fd0b6fc1b09ab.tar.gz scummvm-rg350-e916f9ce8c284a429798ea2dc74fd0b6fc1b09ab.tar.bz2 scummvm-rg350-e916f9ce8c284a429798ea2dc74fd0b6fc1b09ab.zip | |
CGE: Another few formatting tweaks.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cge/bitmap.cpp | 2 | ||||
| -rw-r--r-- | engines/cge/cge_main.cpp | 11 | ||||
| -rw-r--r-- | engines/cge/snddrv.h | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp index 1de10e2bfd..f9eae101ce 100644 --- a/engines/cge/bitmap.cpp +++ b/engines/cge/bitmap.cpp @@ -223,7 +223,7 @@ BitmapPtr Bitmap::code() { skip = (pix == kPixelTransp); cnt = 0; } - if (! skip) { + if (!skip) { if (_v) *im = pix; im++; diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index 99cb5d487f..fb92f93e01 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -369,7 +369,6 @@ void CGEEngine::syncGame(Common::SeekableReadStream *readStream, Common::WriteSt } } debugC(1, kCGEDebugEngine, "CGEEngine::saveSound()"); - } bool CGEEngine::readSavegameHeader(Common::InSaveFile *in, SavegameHeader &header) { @@ -401,7 +400,6 @@ bool CGEEngine::readSavegameHeader(Common::InSaveFile *in, SavegameHeader &heade header.saveMinutes = in->readSint16LE(); return true; - } void CGEEngine::heroCover(int cvr) { @@ -546,9 +544,9 @@ void CGEEngine::AltCtrlDel() { void CGEEngine::miniStep(int stp) { debugC(1, kCGEDebugEngine, "CGEEngine::miniStep(%d)", stp); - if (stp < 0) + if (stp < 0) { _miniCave->_flags._hide = true; - else { + } else { *_miniShp[0] = *_miniShpList[stp]; if (_fx->_current) &*(_fx->_current->addr()); @@ -640,7 +638,6 @@ void CGEEngine::caveUp() { _mouse->on(); } - void CGEEngine::caveDown() { debugC(1, kCGEDebugEngine, "CGEEngine::caveDown()"); @@ -656,6 +653,7 @@ void CGEEngine::caveDown() { } spr = n; } + _text->clear(1000); } @@ -867,7 +865,6 @@ void System::touch(uint16 mask, int x, int y) { } } - void System::tick() { if (!_vm->_startupMode) if (--_funDel == 0) { @@ -1031,7 +1028,6 @@ void CGEEngine::saveMapping() { } } - void CGEEngine::sayDebug() { // 1111111111222222222233333333334444444444555555555566666666667777777777 // 01234567890123456789012345678901234567890123456789012345678901234567890123456789 @@ -1177,7 +1173,6 @@ void Sprite::touch(uint16 mask, int x, int y) { } } - void CGEEngine::loadSprite(const char *fname, int ref, int cav, int col = 0, int row = 0, int pos = 0) { static const char *Comd[] = { "Name", "Type", "Phase", "East", "Left", "Right", "Top", "Bottom", diff --git a/engines/cge/snddrv.h b/engines/cge/snddrv.h index 7af214365f..9e937d1cbf 100644 --- a/engines/cge/snddrv.h +++ b/engines/cge/snddrv.h @@ -45,7 +45,7 @@ namespace CGE { // sample info struct SmpInfo { - const uint8 *_saddr; // address + const uint8 *_saddr; // address uint16 _slen; // length uint16 _span; // left/right pan (0-15) int _sflag; // flag |