libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-20 19:21:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed M4Surface::empty() to clear() (two reason: empty is not a verb, and in class String it is used for a bool property)

Browse Source 
svn-id: r32733
This commit is contained in:
Max Horn 2008-06-18 21:02:52 +00:00
parent 7bceafb3f2
commit 07bcb5179c
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/m4/converse.cpp
View File

@ -153,7 +153,7 @@ void ConversationView::setNode(int32 nodeIndex) {
void ConversationView::onRefresh(RectList *rects, M4Surface *destSurface) {
//if (!this->isVisible())
// return;
empty();
clear();
if (_entriesShown) {
// Write out the conversation options

6
engines/m4/graphics.cpp
View File

@ -320,7 +320,7 @@ byte *M4Surface::getBasePtr(int x, int y) {
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::loadBackgroundRiddle(const char *sceneName) {
}
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 @@ void M4Surface::madsLoadBackground(int roomNumber, RGBList **palData) {
//printf("Tile: %i, compressed size: %i\n", i, compressedTileDataSize);
newTile->empty();
newTile->clear();
byte *compressedTileData = new byte[compressedTileDataSize];

2
engines/m4/graphics.h
View File

@ -128,7 +128,7 @@ public:
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,

2
engines/m4/m4_views.cpp
View File

@ -331,7 +331,7 @@ bool GameInterfaceView::onEvent(M4EventType eventType, int param, int x, int y,
}
void GameInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
empty();
clear();
_statusText.onRefresh();
_inventory.onRefresh();

16
engines/m4/mads_anim.cpp
View File

@ -61,9 +61,9 @@ TextviewView::TextviewView(M4Engine *vm):
_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 @@ TextviewView::~TextviewView() {
}
void TextviewView::reset() {
_bgSurface.empty();
_textSurface.empty();
_bgSurface.clear();
_textSurface.clear();
_animating = false;
_panX = 0;
_panY = 0;
@ -456,8 +456,8 @@ AnimviewView::AnimviewView(M4Engine *vm):
// 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 @@ AnimviewView::~AnimviewView() {
}
void AnimviewView::reset() {
_bgSurface.empty();
_bgSurface.clear();
_soundDriverLoaded = false;
}

2
engines/m4/viewmgr.cpp
View File

@ -380,7 +380,7 @@ void ViewManager::updateState() {
}
void ViewManager::refreshAll() {
_vm->_screen->empty();
_vm->_screen->clear();
for (ListIterator i = _views.begin(); i != _views.end(); ++i) {
View *v = *i;