diff options
| author | Sven Hesse | 2011-02-02 16:49:20 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-02-02 16:49:20 +0000 |
| commit | 812680d187e1e0802a383d374e8370d04477ffe9 (patch) | |
| tree | 1b0efb47cdf141e99d54187c1af8afe92a6918ab /engines/gob | |
| parent | 113d5a5a9a633c7218b72328c4ad892a015fbed6 (diff) | |
| download | scummvm-rg350-812680d187e1e0802a383d374e8370d04477ffe9.tar.gz scummvm-rg350-812680d187e1e0802a383d374e8370d04477ffe9.tar.bz2 scummvm-rg350-812680d187e1e0802a383d374e8370d04477ffe9.zip | |
GOB: Rename Draw::kSpritesCount to Draw::kSpriteCount
svn-id: r55729
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/draw.cpp | 4 | ||||
| -rw-r--r-- | engines/gob/draw.h | 2 | ||||
| -rw-r--r-- | engines/gob/game.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/inter_playtoons.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/save/savehandler.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp index 1f73e76497..d193f6bfa4 100644 --- a/engines/gob/draw.cpp +++ b/engines/gob/draw.cpp @@ -67,7 +67,7 @@ Draw::Draw(GobEngine *vm) : _vm(vm) { for (int i = 0; i < kFontCount; i++) _fonts[i] = 0; - _spritesArray.resize(kSpritesCount); + _spritesArray.resize(kSpriteCount); _invalidatedCount = 0; for (int i = 0; i < 30; i++) { @@ -332,7 +332,7 @@ void Draw::initSpriteSurf(int16 index, int16 width, int16 height, } void Draw::freeSprite(int16 index) { - assert(index < kSpritesCount); + assert(index < kSpriteCount); _spritesArray[index].reset(); diff --git a/engines/gob/draw.h b/engines/gob/draw.h index 569f2ce526..59bcd58bdb 100644 --- a/engines/gob/draw.h +++ b/engines/gob/draw.h @@ -43,7 +43,7 @@ namespace Gob { class Draw { public: - static const int kSpritesCount = 100; + static const int kSpriteCount = 100; static const int kFontCount = 16; static const int kFrontSurface = 20; static const int kBackSurface = 21; diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index d9d9b93c05..44a730cda0 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -822,7 +822,7 @@ void Game::start() { _vm->_draw->closeScreen(); - for (int i = 0; i < Draw::kSpritesCount; i++) + for (int i = 0; i < Draw::kSpriteCount; i++) _vm->_draw->freeSprite(i); _vm->_draw->_scummvmCursor.reset(); } diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp index 7c02df1f89..e262998e22 100644 --- a/engines/gob/inter_playtoons.cpp +++ b/engines/gob/inter_playtoons.cpp @@ -427,7 +427,7 @@ bool Inter_Playtoons::readSprite(Common::String file, int32 dataVar, } int index = -size - 1; - if ((index < 0) || (index >= Draw::kSpritesCount) || !_vm->_draw->_spritesArray[index]) { + if ((index < 0) || (index >= Draw::kSpriteCount) || !_vm->_draw->_spritesArray[index]) { warning("No such sprite"); return false; } diff --git a/engines/gob/save/savehandler.cpp b/engines/gob/save/savehandler.cpp index e420761df5..8cb8274402 100644 --- a/engines/gob/save/savehandler.cpp +++ b/engines/gob/save/savehandler.cpp @@ -258,7 +258,7 @@ bool TempSpriteHandler::load(int16 dataVar, int32 size, int32 offset) { // Index sane? int index = getIndex(size); - if ((index < 0) || (index >= Draw::kSpritesCount)) + if ((index < 0) || (index >= Draw::kSpriteCount)) return false; SurfacePtr sprite = _vm->_draw->_spritesArray[index]; @@ -333,7 +333,7 @@ SurfacePtr TempSpriteHandler::createSprite(int16 dataVar, int32 size, int32 offs // Index sane? int index = getIndex(size); - if ((index < 0) || (index >= Draw::kSpritesCount)) + if ((index < 0) || (index >= Draw::kSpriteCount)) return sprt; // Sprite exists? |