[Scummvm-cvs-logs] SF.net SVN: scummvm: [32733] scummvm/trunk/engines/m4
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Jun 18 23:02:52 CEST 2008
Revision: 32733
http://scummvm.svn.sourceforge.net/scummvm/?rev=32733&view=rev
Author: fingolfin
Date: 2008-06-18 14:02:52 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
Renamed M4Surface::empty() to clear() (two reason: empty is not a verb, and in class String it is used for a bool property)
Modified Paths:
--------------
scummvm/trunk/engines/m4/converse.cpp
scummvm/trunk/engines/m4/graphics.cpp
scummvm/trunk/engines/m4/graphics.h
scummvm/trunk/engines/m4/m4_views.cpp
scummvm/trunk/engines/m4/mads_anim.cpp
scummvm/trunk/engines/m4/viewmgr.cpp
Modified: scummvm/trunk/engines/m4/converse.cpp
===================================================================
--- scummvm/trunk/engines/m4/converse.cpp 2008-06-18 19:46:50 UTC (rev 32732)
+++ scummvm/trunk/engines/m4/converse.cpp 2008-06-18 21:02:52 UTC (rev 32733)
@@ -153,7 +153,7 @@
void ConversationView::onRefresh(RectList *rects, M4Surface *destSurface) {
//if (!this->isVisible())
// return;
- empty();
+ clear();
if (_entriesShown) {
// Write out the conversation options
Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp 2008-06-18 19:46:50 UTC (rev 32732)
+++ scummvm/trunk/engines/m4/graphics.cpp 2008-06-18 21:02:52 UTC (rev 32733)
@@ -320,7 +320,7 @@
void M4Surface::freeData() {
}
-void M4Surface::empty() {
+void M4Surface::clear() {
Common::set_to((byte *) pixels, (byte *) pixels + w * h, _vm->_palette->BLACK);
}
@@ -389,7 +389,7 @@
}
void M4Surface::loadBackground(int sceneNumber, RGBList **palData) {
- this->empty(); // clear previous scene
+ clear(); // clear previous scene
if (_vm->isM4() || (_vm->getGameType() == GType_RexNebular)) {
char resourceName[20];
@@ -502,7 +502,7 @@
//printf("Tile: %i, compressed size: %i\n", i, compressedTileDataSize);
- newTile->empty();
+ newTile->clear();
byte *compressedTileData = new byte[compressedTileDataSize];
Modified: scummvm/trunk/engines/m4/graphics.h
===================================================================
--- scummvm/trunk/engines/m4/graphics.h 2008-06-18 19:46:50 UTC (rev 32732)
+++ scummvm/trunk/engines/m4/graphics.h 2008-06-18 21:02:52 UTC (rev 32733)
@@ -128,7 +128,7 @@
byte *getData();
byte *getBasePtr(int x, int y);
void freeData();
- void empty();
+ void clear();
void frameRect(const Common::Rect &r, uint8 color);
void fillRect(const Common::Rect &r, uint8 color);
void copyFrom(M4Surface *src, const Common::Rect &srcBounds, int destX, int destY,
Modified: scummvm/trunk/engines/m4/m4_views.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4_views.cpp 2008-06-18 19:46:50 UTC (rev 32732)
+++ scummvm/trunk/engines/m4/m4_views.cpp 2008-06-18 21:02:52 UTC (rev 32733)
@@ -331,7 +331,7 @@
}
void GameInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
- empty();
+ clear();
_statusText.onRefresh();
_inventory.onRefresh();
Modified: scummvm/trunk/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.cpp 2008-06-18 19:46:50 UTC (rev 32732)
+++ scummvm/trunk/engines/m4/mads_anim.cpp 2008-06-18 21:02:52 UTC (rev 32733)
@@ -61,9 +61,9 @@
_vm->_font->setColors(5, 6, 4);
- empty();
- _bgSurface.empty();
- _textSurface.empty();
+ clear();
+ _bgSurface.clear();
+ _textSurface.clear();
int y = (height() - MADS_SURFACE_HEIGHT) / 2;
setColor(2);
@@ -83,8 +83,8 @@
}
void TextviewView::reset() {
- _bgSurface.empty();
- _textSurface.empty();
+ _bgSurface.clear();
+ _textSurface.clear();
_animating = false;
_panX = 0;
_panY = 0;
@@ -456,8 +456,8 @@
// Set up system palette colors
_vm->_palette->setMadsSystemPalette();
- empty();
- _bgSurface.empty();
+ clear();
+ _bgSurface.clear();
int y = (height() - MADS_SURFACE_HEIGHT) / 2;
setColor(2);
@@ -471,7 +471,7 @@
}
void AnimviewView::reset() {
- _bgSurface.empty();
+ _bgSurface.clear();
_soundDriverLoaded = false;
}
Modified: scummvm/trunk/engines/m4/viewmgr.cpp
===================================================================
--- scummvm/trunk/engines/m4/viewmgr.cpp 2008-06-18 19:46:50 UTC (rev 32732)
+++ scummvm/trunk/engines/m4/viewmgr.cpp 2008-06-18 21:02:52 UTC (rev 32733)
@@ -380,7 +380,7 @@
}
void ViewManager::refreshAll() {
- _vm->_screen->empty();
+ _vm->_screen->clear();
for (ListIterator i = _views.begin(); i != _views.end(); ++i) {
View *v = *i;
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