[Scummvm-cvs-logs] SF.net SVN: scummvm:[55729] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Wed Feb 2 17:49:20 CET 2011
Revision: 55729
http://scummvm.svn.sourceforge.net/scummvm/?rev=55729&view=rev
Author: drmccoy
Date: 2011-02-02 16:49:20 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
GOB: Rename Draw::kSpritesCount to Draw::kSpriteCount
Modified Paths:
--------------
scummvm/trunk/engines/gob/draw.cpp
scummvm/trunk/engines/gob/draw.h
scummvm/trunk/engines/gob/game.cpp
scummvm/trunk/engines/gob/inter_playtoons.cpp
scummvm/trunk/engines/gob/save/savehandler.cpp
Modified: scummvm/trunk/engines/gob/draw.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw.cpp 2011-02-02 16:48:46 UTC (rev 55728)
+++ scummvm/trunk/engines/gob/draw.cpp 2011-02-02 16:49:20 UTC (rev 55729)
@@ -67,7 +67,7 @@
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::freeSprite(int16 index) {
- assert(index < kSpritesCount);
+ assert(index < kSpriteCount);
_spritesArray[index].reset();
Modified: scummvm/trunk/engines/gob/draw.h
===================================================================
--- scummvm/trunk/engines/gob/draw.h 2011-02-02 16:48:46 UTC (rev 55728)
+++ scummvm/trunk/engines/gob/draw.h 2011-02-02 16:49:20 UTC (rev 55729)
@@ -43,7 +43,7 @@
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;
Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp 2011-02-02 16:48:46 UTC (rev 55728)
+++ scummvm/trunk/engines/gob/game.cpp 2011-02-02 16:49:20 UTC (rev 55729)
@@ -822,7 +822,7 @@
_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();
}
Modified: scummvm/trunk/engines/gob/inter_playtoons.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_playtoons.cpp 2011-02-02 16:48:46 UTC (rev 55728)
+++ scummvm/trunk/engines/gob/inter_playtoons.cpp 2011-02-02 16:49:20 UTC (rev 55729)
@@ -427,7 +427,7 @@
}
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;
}
Modified: scummvm/trunk/engines/gob/save/savehandler.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/savehandler.cpp 2011-02-02 16:48:46 UTC (rev 55728)
+++ scummvm/trunk/engines/gob/save/savehandler.cpp 2011-02-02 16:49:20 UTC (rev 55729)
@@ -258,7 +258,7 @@
// 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 @@
// Index sane?
int index = getIndex(size);
- if ((index < 0) || (index >= Draw::kSpritesCount))
+ if ((index < 0) || (index >= Draw::kSpriteCount))
return sprt;
// Sprite exists?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list