diff options
| author | Einar Johan Trøan Sømåen | 2012-07-09 04:50:38 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-09 04:50:38 +0200 |
| commit | 0a43bba003c5e5cbf302a667e8515d4066d72407 (patch) | |
| tree | f47246629e29786bbc4239c286b19153dbb37e5d /engines/wintermute/Base/BSurfaceStorage.cpp | |
| parent | 0ef77c57b6f6889471c7c5d902999fcf34c47a89 (diff) | |
| download | scummvm-rg350-0a43bba003c5e5cbf302a667e8515d4066d72407.tar.gz scummvm-rg350-0a43bba003c5e5cbf302a667e8515d4066d72407.tar.bz2 scummvm-rg350-0a43bba003c5e5cbf302a667e8515d4066d72407.zip | |
WINTERMUTE: Rename FuncName->funcName in coll_templ.h
Diffstat (limited to 'engines/wintermute/Base/BSurfaceStorage.cpp')
| -rw-r--r-- | engines/wintermute/Base/BSurfaceStorage.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/wintermute/Base/BSurfaceStorage.cpp b/engines/wintermute/Base/BSurfaceStorage.cpp index eedfbca178..1c6bb33af3 100644 --- a/engines/wintermute/Base/BSurfaceStorage.cpp +++ b/engines/wintermute/Base/BSurfaceStorage.cpp @@ -52,11 +52,11 @@ CBSurfaceStorage::~CBSurfaceStorage() { //////////////////////////////////////////////////////////////////////////
ERRORCODE CBSurfaceStorage::cleanup(bool warn) {
- for (int i = 0; i < _surfaces.GetSize(); i++) {
+ for (int i = 0; i < _surfaces.getSize(); i++) {
if (warn) Game->LOG(0, "CBSurfaceStorage warning: purging surface '%s', usage:%d", _surfaces[i]->_filename, _surfaces[i]->_referenceCount);
delete _surfaces[i];
}
- _surfaces.RemoveAll();
+ _surfaces.removeAll();
return STATUS_OK;
}
@@ -67,7 +67,7 @@ ERRORCODE CBSurfaceStorage::initLoop() { if (Game->_smartCache && Game->_liveTimer - _lastCleanupTime >= Game->_surfaceGCCycleTime) {
_lastCleanupTime = Game->_liveTimer;
sortSurfaces();
- for (int i = 0; i < _surfaces.GetSize(); i++) {
+ for (int i = 0; i < _surfaces.getSize(); i++) {
if (_surfaces[i]->_lifeTime <= 0) break;
if (_surfaces[i]->_lifeTime > 0 && _surfaces[i]->_valid && Game->_liveTimer - _surfaces[i]->_lastUsedTime >= _surfaces[i]->_lifeTime) {
@@ -82,12 +82,12 @@ ERRORCODE CBSurfaceStorage::initLoop() { //////////////////////////////////////////////////////////////////////
ERRORCODE CBSurfaceStorage::removeSurface(CBSurface *surface) {
- for (int i = 0; i < _surfaces.GetSize(); i++) {
+ for (int i = 0; i < _surfaces.getSize(); i++) {
if (_surfaces[i] == surface) {
_surfaces[i]->_referenceCount--;
if (_surfaces[i]->_referenceCount <= 0) {
delete _surfaces[i];
- _surfaces.RemoveAt(i);
+ _surfaces.removeAt(i);
}
break;
}
@@ -98,7 +98,7 @@ ERRORCODE CBSurfaceStorage::removeSurface(CBSurface *surface) { //////////////////////////////////////////////////////////////////////
CBSurface *CBSurfaceStorage::addSurface(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
- for (int i = 0; i < _surfaces.GetSize(); i++) {
+ for (int i = 0; i < _surfaces.getSize(); i++) {
if (scumm_stricmp(_surfaces[i]->_filename, filename) == 0) {
_surfaces[i]->_referenceCount++;
return _surfaces[i];
@@ -123,7 +123,7 @@ CBSurface *CBSurfaceStorage::addSurface(const char *filename, bool defaultCK, by return NULL;
} else {
surface->_referenceCount = 1;
- _surfaces.Add(surface);
+ _surfaces.add(surface);
return surface;
}
}
@@ -132,7 +132,7 @@ CBSurface *CBSurfaceStorage::addSurface(const char *filename, bool defaultCK, by //////////////////////////////////////////////////////////////////////
ERRORCODE CBSurfaceStorage::restoreAll() {
ERRORCODE ret;
- for (int i = 0; i < _surfaces.GetSize(); i++) {
+ for (int i = 0; i < _surfaces.getSize(); i++) {
ret = _surfaces[i]->restore();
if (ret != STATUS_OK) {
Game->LOG(0, "CBSurfaceStorage::RestoreAll failed");
@@ -161,7 +161,7 @@ ERRORCODE CBSurfaceStorage::persist(CBPersistMgr *persistMgr) //////////////////////////////////////////////////////////////////////////
ERRORCODE CBSurfaceStorage::sortSurfaces() {
- qsort(_surfaces.GetData(), _surfaces.GetSize(), sizeof(CBSurface *), surfaceSortCB);
+ qsort(_surfaces.getData(), _surfaces.getSize(), sizeof(CBSurface *), surfaceSortCB);
return STATUS_OK;
}
|