[Scummvm-git-logs] scummvm master -> af7dc339001bb55358e838ff699dba29aea7ec16
aquadran
noreply at scummvm.org
Wed Sep 3 17:20:18 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
af7dc33900 WINTERMUTE: More variable renames
Commit: af7dc339001bb55358e838ff699dba29aea7ec16
https://github.com/scummvm/scummvm/commit/af7dc339001bb55358e838ff699dba29aea7ec16
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-03T19:20:14+02:00
Commit Message:
WINTERMUTE: More variable renames
Changed paths:
engines/wintermute/base/base_persistence_manager.cpp
engines/wintermute/base/base_persistence_manager.h
engines/wintermute/base/gfx/base_surface.cpp
engines/wintermute/base/save_thumb_helper.cpp
engines/wintermute/base/save_thumb_helper.h
engines/wintermute/platform_osystem.cpp
engines/wintermute/video/subtitle_card.cpp
engines/wintermute/video/subtitle_card.h
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 6e48f4e070f..188b98a576f 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -61,9 +61,9 @@ BasePersistenceManager::BasePersistenceManager(const Common::String &savePrefix,
_loadStream = nullptr;
_deleteSingleton = deleteSingleton;
if (BaseEngine::instance().getGameRef()) {
- _gameRef = BaseEngine::instance().getGameRef();
+ _game = BaseEngine::instance().getGameRef();
} else {
- _gameRef = nullptr;
+ _game = nullptr;
}
_richBuffer = nullptr;
@@ -91,8 +91,8 @@ BasePersistenceManager::BasePersistenceManager(const Common::String &savePrefix,
_thumbnailData = nullptr;
if (savePrefix != "") {
_savePrefix = savePrefix;
- } else if (_gameRef) {
- _savePrefix = _gameRef->_targetName.c_str();
+ } else if (_game) {
+ _savePrefix = _game->_targetName.c_str();
} else {
_savePrefix = "wmesav";
}
@@ -229,11 +229,11 @@ bool BasePersistenceManager::initSave(const Common::String &desc) {
if (_saveStream) {
// get thumbnails
- if (!_gameRef->_cachedThumbnail) {
- _gameRef->_cachedThumbnail = new SaveThumbHelper(_gameRef);
- if (DID_FAIL(_gameRef->_cachedThumbnail->storeThumbnail(true))) {
- delete _gameRef->_cachedThumbnail;
- _gameRef->_cachedThumbnail = nullptr;
+ if (!_game->_cachedThumbnail) {
+ _game->_cachedThumbnail = new SaveThumbHelper(_game);
+ if (DID_FAIL(_game->_cachedThumbnail->storeThumbnail(true))) {
+ delete _game->_cachedThumbnail;
+ _game->_cachedThumbnail = nullptr;
}
}
@@ -244,7 +244,7 @@ bool BasePersistenceManager::initSave(const Common::String &desc) {
putDWORD(magic);
byte verMajor, verMinor, extMajor, extMinor;
- _gameRef->getVersion(&verMajor, &verMinor, &extMajor, &extMinor);
+ _game->getVersion(&verMajor, &verMinor, &extMajor, &extMinor);
_saveStream->writeByte(verMajor);
_saveStream->writeByte(verMinor);
_saveStream->writeByte(extMajor);
@@ -252,15 +252,15 @@ bool BasePersistenceManager::initSave(const Common::String &desc) {
// new in ver 2
putDWORD((uint32)DCGF_VER_BUILD);
- putString(_gameRef->_name);
+ putString(_game->_name);
// thumbnail data size
bool thumbnailOK = false;
- if (_gameRef->_cachedThumbnail) {
- if (_gameRef->_cachedThumbnail->_thumbnail) {
+ if (_game->_cachedThumbnail) {
+ if (_game->_cachedThumbnail->_thumbnail) {
Common::MemoryWriteStreamDynamic thumbStream(DisposeAfterUse::YES);
- if (_gameRef->_cachedThumbnail->_thumbnail->writeBMPToStream(&thumbStream)) {
+ if (_game->_cachedThumbnail->_thumbnail->writeBMPToStream(&thumbStream)) {
_saveStream->writeUint32LE(thumbStream.size());
_saveStream->write(thumbStream.getData(), thumbStream.size());
} else {
@@ -275,10 +275,10 @@ bool BasePersistenceManager::initSave(const Common::String &desc) {
}
thumbnailOK = false;
// Again for the ScummVM-thumb:
- if (_gameRef->_cachedThumbnail) {
- if (_gameRef->_cachedThumbnail->_scummVMThumb) {
+ if (_game->_cachedThumbnail) {
+ if (_game->_cachedThumbnail->_scummVMThumb) {
Common::MemoryWriteStreamDynamic scummVMthumbStream(DisposeAfterUse::YES);
- if (_gameRef->_cachedThumbnail->_scummVMThumb->writeBMPToStream(&scummVMthumbStream)) {
+ if (_game->_cachedThumbnail->_scummVMThumb->writeBMPToStream(&scummVMthumbStream)) {
_saveStream->writeUint32LE(scummVMthumbStream.size());
_saveStream->write(scummVMthumbStream.getData(), scummVMthumbStream.size());
} else {
@@ -294,7 +294,7 @@ bool BasePersistenceManager::initSave(const Common::String &desc) {
// in any case, destroy the cached thumbnail once used
- SAFE_DELETE(_gameRef->_cachedThumbnail);
+ SAFE_DELETE(_game->_cachedThumbnail);
uint32 dataOffset = _offset +
sizeof(uint32) + // data offset
@@ -382,7 +382,7 @@ bool BasePersistenceManager::initLoad(const Common::String &filename) {
}
_saving = false;
- if (_savedName == "" || scumm_stricmp(_savedName.c_str(), _gameRef->_name) != 0) {
+ if (_savedName == "" || scumm_stricmp(_savedName.c_str(), _game->_name) != 0) {
debugC(kWintermuteDebugSaveGame, "ERROR: Saved game name doesn't match current game");
cleanup();
return STATUS_FAILED;
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index 1df75b5484d..c2c8fda05ed 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -124,8 +124,7 @@ private:
byte _savedExtMajor;
byte _savedExtMinor;
bool _saving;
- // Separate from Base, as this class can do SOME operations without a _gameRef.
- BaseGame *_gameRef;
+ BaseGame *_game;
};
} // End of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp
index 1bc461e52d0..3677d2dfe3f 100644
--- a/engines/wintermute/base/gfx/base_surface.cpp
+++ b/engines/wintermute/base/gfx/base_surface.cpp
@@ -88,7 +88,7 @@ bool BaseSurface::prepareToDraw() {
_lastUsedTime = _game->getLiveTimer()->getTime();
if (!_valid) {
- //_gameRef->LOG(0, "Reviving: %s", _filename);
+ //_game->LOG(0, "Reviving: %s", _filename);
return create(_filename.c_str(), _ckDefault, _ckRed, _ckGreen, _ckBlue, _lifeTime, _keepLoaded);
} else {
return STATUS_OK;
diff --git a/engines/wintermute/base/save_thumb_helper.cpp b/engines/wintermute/base/save_thumb_helper.cpp
index 8ebe1b4fdc0..aa5919cbb07 100644
--- a/engines/wintermute/base/save_thumb_helper.cpp
+++ b/engines/wintermute/base/save_thumb_helper.cpp
@@ -34,7 +34,7 @@
namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
-SaveThumbHelper::SaveThumbHelper(BaseGame *inGame) : _gameRef(inGame) {
+SaveThumbHelper::SaveThumbHelper(BaseGame *inGame) : _game(inGame) {
_thumbnail = nullptr;
_scummVMThumb = nullptr;
}
@@ -48,19 +48,19 @@ SaveThumbHelper::~SaveThumbHelper() {
}
BaseImage *SaveThumbHelper::storeThumb(bool doFlip, int width, int height) {
- if (_gameRef->_thumbnailWidth > 0 && _gameRef->_thumbnailHeight > 0) {
+ if (_game->_thumbnailWidth > 0 && _game->_thumbnailHeight > 0) {
if (doFlip) {
// when using opengl on windows it seems to be necessary to do this twice
// works normally for direct3d
- _gameRef->displayContent(false);
- _gameRef->_renderer->flip();
+ _game->displayContent(false);
+ _game->_renderer->flip();
- _gameRef->displayContent(false);
- _gameRef->_renderer->flip();
+ _game->displayContent(false);
+ _game->_renderer->flip();
}
// normal thumbnail
- return _gameRef->_renderer->takeScreenshot(width, height);
+ return _game->_renderer->takeScreenshot(width, height);
}
return nullptr;
}
@@ -70,9 +70,9 @@ bool SaveThumbHelper::storeThumbnail(bool doFlip) {
delete _thumbnail;
_thumbnail = nullptr;
- if (_gameRef->_thumbnailWidth > 0 && _gameRef->_thumbnailHeight > 0) {
+ if (_game->_thumbnailWidth > 0 && _game->_thumbnailHeight > 0) {
- _thumbnail = storeThumb(doFlip, _gameRef->_thumbnailWidth, _gameRef->_thumbnailHeight);
+ _thumbnail = storeThumb(doFlip, _game->_thumbnailWidth, _game->_thumbnailHeight);
if (!_thumbnail) {
return STATUS_FAILED;
}
diff --git a/engines/wintermute/base/save_thumb_helper.h b/engines/wintermute/base/save_thumb_helper.h
index f7c3f07b63d..d7801bb87ad 100644
--- a/engines/wintermute/base/save_thumb_helper.h
+++ b/engines/wintermute/base/save_thumb_helper.h
@@ -43,7 +43,7 @@ public:
BaseImage *_scummVMThumb;
private:
BaseImage *storeThumb(bool doFlip, int width, int height);
- BaseGame *_gameRef;
+ BaseGame *_game;
};
} // End of namespace Wintermute
diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp
index cb91da25514..3b8699d6147 100644
--- a/engines/wintermute/platform_osystem.cpp
+++ b/engines/wintermute/platform_osystem.cpp
@@ -161,8 +161,8 @@ bool BasePlatform::getCursorPos(Common::Point32 *lpPoint) {
// this seems to give the right results
// actually, BaseRenderer has no functions pointFromScreen/pointToScreen anyways
#ifndef ENABLE_WME3D
- if (!_gameRef->_useD3D) {
- BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_gameRef->_renderer);
+ if (!_game->_useD3D) {
+ BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_game->_renderer);
renderer->pointFromScreen(lpPoint);
}
#endif
@@ -180,8 +180,8 @@ bool BasePlatform::setCursorPos(int x, int y) {
// this seems to give the right results
// actually, BaseRenderer has no functions pointFromScreen/pointToScreen anyways
#ifndef ENABLE_WME3D
- if (!_gameRef->_useD3D) {
- BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_gameRef->_renderer);
+ if (!_game->_useD3D) {
+ BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_game->_renderer);
renderer->pointToScreen(&p);
}
#endif
diff --git a/engines/wintermute/video/subtitle_card.cpp b/engines/wintermute/video/subtitle_card.cpp
index 591d835efa9..47ffefe4d0c 100644
--- a/engines/wintermute/video/subtitle_card.cpp
+++ b/engines/wintermute/video/subtitle_card.cpp
@@ -34,11 +34,11 @@ SubtitleCard::SubtitleCard(BaseGame *inGame,
const Common::String &text,
const uint &startFrame,
const uint &endFrame) :
- _gameRef(inGame),
+ _game(inGame),
_startFrame(startFrame),
_endFrame(endFrame) {
_text = text;
- _gameRef->expandStringByStringTable(_text);
+ _game->expandStringByStringTable(_text);
}
uint32 SubtitleCard::getStartFrame() const {
diff --git a/engines/wintermute/video/subtitle_card.h b/engines/wintermute/video/subtitle_card.h
index cfebc96330b..7947fd5f4ac 100644
--- a/engines/wintermute/video/subtitle_card.h
+++ b/engines/wintermute/video/subtitle_card.h
@@ -41,7 +41,7 @@ public:
uint32 getStartFrame() const;
Common::String getText() const;
private:
- BaseGame *_gameRef;
+ BaseGame *_game;
uint32 _endFrame;
uint32 _startFrame;
Common::String _text;
More information about the Scummvm-git-logs
mailing list