[Scummvm-git-logs] scummvm master -> c0b5932d72d4aa60d6bd84fd56ad0beb2dcaee8b
aquadran
noreply at scummvm.org
Mon Sep 8 13:44:59 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:
c0b5932d72 WINTERMUTE: Formatting
Commit: c0b5932d72d4aa60d6bd84fd56ad0beb2dcaee8b
https://github.com/scummvm/scummvm/commit/c0b5932d72d4aa60d6bd84fd56ad0beb2dcaee8b
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-08T15:44:52+02:00
Commit Message:
WINTERMUTE: Formatting
Changed paths:
engines/wintermute/base/base_active_rect.cpp
engines/wintermute/base/base_game.cpp
engines/wintermute/base/base_object.cpp
engines/wintermute/base/base_object.h
engines/wintermute/base/base_parser.cpp
engines/wintermute/base/base_parser.h
engines/wintermute/base/base_script_holder.cpp
engines/wintermute/base/base_sub_frame.cpp
engines/wintermute/base/base_sub_frame.h
engines/wintermute/base/base_surface_storage.cpp
engines/wintermute/base/base_transition_manager.cpp
engines/wintermute/ui/ui_button.cpp
engines/wintermute/ui/ui_entity.cpp
engines/wintermute/ui/ui_window.cpp
diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp
index d521fd89728..41282389737 100644
--- a/engines/wintermute/base/base_active_rect.cpp
+++ b/engines/wintermute/base/base_active_rect.cpp
@@ -128,8 +128,8 @@ void BaseActiveRect::clipRect() {
if (rc.left > _rect.left) {
_offsetX = rc.left - _rect.left;
}
- if (rc.top > _rect.top) {
- _offsetY = rc.top - _rect.top;
+ if (rc.top > _rect.top) {
+ _offsetY = rc.top - _rect.top;
}
BasePlatform::intersectRect(&_rect, &_rect, &rc);
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index f7abf639280..e5664a9af59 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -4465,7 +4465,7 @@ bool BaseGame::loadSettings(const char *filename) {
char *origBuffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (origBuffer == nullptr) {
- BaseEngine::LOG(0, "BaseGame::LoadSettings failed for file '%s'", filename);
+ BaseEngine::LOG(0, "BaseGame::loadSettings failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -4887,10 +4887,12 @@ bool BaseGame::getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *
*verMinor = DCGF_VER_MINOR;
}
- if (extMajor)
+ if (extMajor) {
*extMajor = 0;
- if (extMinor)
+ }
+ if (extMinor) {
*extMinor = 0;
+ }
return STATUS_OK;
}
@@ -4900,8 +4902,9 @@ void BaseGame::setWindowTitle() {
if (_renderer) {
char title[512];
Common::strlcpy(title, _caption[0], 512);
- if (title[0] != '\0')
+ if (title[0] != '\0') {
Common::strlcat(title, " - ", 512);
+ }
Common::strlcat(title, "Wintermute Engine", 512);
// ignoring setting window title
@@ -5009,8 +5012,9 @@ bool BaseGame::pushViewport(BaseViewport *viewport) {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::popViewport() {
_viewportSP--;
- if (_viewportSP < -1)
+ if (_viewportSP < -1) {
_game->LOG(0, "Fatal: Viewport stack underflow!");
+ }
if (_viewportSP >= 0 && _viewportSP < _viewportStack.getSize())
_renderer->setViewport(_viewportStack[_viewportSP]->getRect());
@@ -5055,10 +5059,12 @@ bool BaseGame::getCurrentViewportOffset(int *offsetX, int *offsetY) const {
if (offsetY)
*offsetY = _viewportStack[_viewportSP]->_offsetY;
} else {
- if (offsetX)
+ if (offsetX) {
*offsetX = 0;
- if (offsetY)
+ }
+ if (offsetY) {
*offsetY = 0;
+ }
}
return STATUS_OK;
@@ -5077,8 +5083,9 @@ bool BaseGame::windowScriptMethodHook(UIWindow *win, ScScript *script, ScStack *
//////////////////////////////////////////////////////////////////////////
void BaseGame::setInteractive(bool state) {
_interactive = state;
- if (_transMgr)
+ if (_transMgr) {
_transMgr->_origInteractive = state;
+ }
}
//////////////////////////////////////////////////////////////////////////
@@ -5356,8 +5363,9 @@ bool BaseGame::onMouseLeftDown() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onMouseLeftUp() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_activeObject) {
_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT);
@@ -5378,8 +5386,9 @@ bool BaseGame::onMouseLeftUp() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onMouseLeftDblClick() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_state == GAME_RUNNING && !_interactive) {
return STATUS_OK;
@@ -5400,8 +5409,9 @@ bool BaseGame::onMouseLeftDblClick() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onMouseRightDblClick() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_state == GAME_RUNNING && !_interactive) {
return STATUS_OK;
@@ -5422,8 +5432,9 @@ bool BaseGame::onMouseRightDblClick() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onMouseRightDown() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_activeObject) {
_activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT);
@@ -5440,8 +5451,9 @@ bool BaseGame::onMouseRightDown() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onMouseRightUp() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_activeObject) {
_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT);
@@ -5458,8 +5470,9 @@ bool BaseGame::onMouseRightUp() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onMouseMiddleDown() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_state == GAME_RUNNING && !_interactive) {
return STATUS_OK;
@@ -5480,8 +5493,9 @@ bool BaseGame::onMouseMiddleDown() {
//////////////////////////////////////////////////////////////////////////
bool BaseGame::onMouseMiddleUp() {
- if (isVideoPlaying())
+ if (isVideoPlaying()) {
return STATUS_OK;
+ }
if (_activeObject) {
_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_MIDDLE);
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index 807bf6a36ac..3d06dea8438 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -72,7 +72,7 @@ BaseObject::BaseObject(BaseGame *inGame) : BaseScriptHolder(inGame) {
_soundEvent = nullptr;
- _iD = _game->getSequence();
+ _id = _game->getSequence();
BasePlatform::setRectEmpty(&_rect);
_rectSet = false;
@@ -188,12 +188,14 @@ void BaseObject::setCaption(const char *caption, int caseVal) {
//////////////////////////////////////////////////////////////////////////
const char *BaseObject::getCaption(int caseVal) {
- if (caseVal == 0)
+ if (caseVal == 0) {
caseVal = 1;
- if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == nullptr)
+ }
+ if (caseVal < 1 || caseVal > 7 || _caption[caseVal - 1] == nullptr) {
return "";
- else
+ } else {
return _caption[caseVal - 1];
+ }
}
@@ -1071,7 +1073,7 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferBool(TMEMBER(_editorAlwaysRegister));
persistMgr->transferBool(TMEMBER(_editorOnly));
persistMgr->transferBool(TMEMBER(_editorSelected));
- persistMgr->transferSint32(TMEMBER(_iD));
+ persistMgr->transferSint32(TMEMBER(_id));
persistMgr->transferBool(TMEMBER(_is3D));
persistMgr->transferBool(TMEMBER(_movable));
persistMgr->transferSint32(TMEMBER(_posX));
diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h
index c3d167c63cf..0b199b90525 100644
--- a/engines/wintermute/base/base_object.h
+++ b/engines/wintermute/base/base_object.h
@@ -114,7 +114,7 @@ public:
bool _shadowable;
Common::Rect32 _rect;
bool _rectSet;
- int32 _iD;
+ int32 _id;
bool _movable;
BaseObject(BaseGame *inGame);
~BaseObject() override;
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp
index 374d8ba521c..de6efc283f9 100644
--- a/engines/wintermute/base/base_parser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -216,11 +216,11 @@ char *BaseParser::getToken(char **buf) {
while (*b && (*b == ' ' || *b == '\n' || *b == 13 || *b == 10 || *b == '\t')) {
b++;
}
- if (*b == ';')
+ if (*b == ';') {
while (*b && *b != '\n' && *b != 13 && *b != 10) {
b++;
}
- else {
+ } else {
break;
}
}
diff --git a/engines/wintermute/base/base_parser.h b/engines/wintermute/base/base_parser.h
index df2a60bab62..16366ba5029 100644
--- a/engines/wintermute/base/base_parser.h
+++ b/engines/wintermute/base/base_parser.h
@@ -30,8 +30,7 @@
#define TOKEN_DEF_START \
- enum \
- { \
+ enum { \
TOKEN_NONE = 0,
#define TOKEN_DEF(name) \
TOKEN_ ## name,
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index 9657d87b048..7eb2f6340a1 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -306,7 +306,7 @@ bool BaseScriptHolder::addScript(const char *filename) {
}
}
- ScScript *scr = _game->_scEngine->runScript(filename, this);
+ ScScript *scr = _game->_scEngine->runScript(filename, this);
if (!scr) {
if (_game->_editorForceScripts) {
// editor hack
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index 521fff314f0..bd4c68decc2 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -57,8 +57,8 @@ BaseSubFrame::BaseSubFrame(BaseGame *inGame) : BaseScriptable(inGame, true) {
_editorSelected = false;
_surfaceFilename = nullptr;
- _cKDefault = true;
- _cKRed = _cKBlue = _cKGreen = 0;
+ _ckDefault = true;
+ _ckRed = _ckBlue = _ckGreen = 0;
_lifeTime = -1;
_keepLoaded = false;
@@ -385,10 +385,10 @@ bool BaseSubFrame::persist(BasePersistenceManager *persistMgr) {
persistMgr->transferBool(TMEMBER(_wantsDefaultRect));
persistMgr->transferCharPtr(TMEMBER(_surfaceFilename));
- persistMgr->transferBool(TMEMBER(_cKDefault));
- persistMgr->transferByte(TMEMBER(_cKRed));
- persistMgr->transferByte(TMEMBER(_cKGreen));
- persistMgr->transferByte(TMEMBER(_cKBlue));
+ persistMgr->transferBool(TMEMBER(_ckDefault));
+ persistMgr->transferByte(TMEMBER(_ckRed));
+ persistMgr->transferByte(TMEMBER(_ckGreen));
+ persistMgr->transferByte(TMEMBER(_ckBlue));
persistMgr->transferSint32(TMEMBER(_lifeTime));
persistMgr->transferBool(TMEMBER(_keepLoaded));
@@ -693,10 +693,10 @@ bool BaseSubFrame::setSurface(const char *filename, bool defaultCK, byte ckRed,
_surfaceFilename = new char[filenameSize];
Common::strcpy_s(_surfaceFilename, filenameSize, filename);
- _cKDefault = defaultCK;
- _cKRed = ckRed;
- _cKGreen = ckGreen;
- _cKBlue = ckBlue;
+ _ckDefault = defaultCK;
+ _ckRed = ckRed;
+ _ckGreen = ckGreen;
+ _ckBlue = ckBlue;
_lifeTime = lifeTime;
_keepLoaded = keepLoaded;
@@ -713,7 +713,7 @@ bool BaseSubFrame::setSurfaceSimple() {
_surface = nullptr;
return STATUS_OK;
}
- _surface = _game->_surfaceStorage->addSurface(_surfaceFilename, _cKDefault, _cKRed, _cKGreen, _cKBlue, _lifeTime, _keepLoaded);
+ _surface = _game->_surfaceStorage->addSurface(_surfaceFilename, _ckDefault, _ckRed, _ckGreen, _ckBlue, _lifeTime, _keepLoaded);
if (_surface) {
return STATUS_OK;
} else {
diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h
index b35a358b18d..2a405d380a8 100644
--- a/engines/wintermute/base/base_sub_frame.h
+++ b/engines/wintermute/base/base_sub_frame.h
@@ -66,10 +66,10 @@ private:
bool _wantsDefaultRect;
Common::Rect32 _rect;
public:
- bool _cKDefault;
- byte _cKRed;
- byte _cKGreen;
- byte _cKBlue;
+ bool _ckDefault;
+ byte _ckRed;
+ byte _ckGreen;
+ byte _ckBlue;
int32 _lifeTime;
bool _keepLoaded;
char *_surfaceFilename;
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index 3b5b726af24..cec7388bf47 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -76,7 +76,7 @@ bool BaseSurfaceStorage::initLoop() {
}
if (_surfaces[i]->_lifeTime > 0 && _surfaces[i]->_valid && (int)(_game->_liveTimer - _surfaces[i]->_lastUsedTime) >= _surfaces[i]->_lifeTime) {
- //_game->QuickMessageForm("Invalidating: %s", _surfaces[i]->_filename);
+ //_game->quickMessageForm("Invalidating: %s", _surfaces[i]->_filename);
_surfaces[i]->invalidate();
}
}
@@ -111,7 +111,7 @@ BaseSurface *BaseSurfaceStorage::addSurface(const char *filename, bool defaultCK
}
if (!BaseFileManager::getEngineInstance()->hasFile(filename)) {
- if (!filename) {
+ if (filename) {
BaseEngine::LOG(0, "Missing image: '%s'", filename);
}
if (_game->_debugMode) {
@@ -184,25 +184,26 @@ int BaseSurfaceStorage::surfaceSortCB(const void *arg1, const void *arg2) {
BaseSurface *s2 = *((BaseSurface **)o2);
// sort by life time
- if (s1->_lifeTime <= 0 && s2->_lifeTime > 0)
+ if (s1->_lifeTime <= 0 && s2->_lifeTime > 0) {
return 1;
- else if (s1->_lifeTime > 0 && s2->_lifeTime <= 0)
+ } else if (s1->_lifeTime > 0 && s2->_lifeTime <= 0) {
return -1;
-
+ }
// sort by validity
- if (s1->_valid && !s2->_valid)
+ if (s1->_valid && !s2->_valid) {
return -1;
- else if (!s1->_valid && s2->_valid)
+ } else if (!s1->_valid && s2->_valid) {
return 1;
// sort by time
- else if (s1->_lastUsedTime > s2->_lastUsedTime)
+ } else if (s1->_lastUsedTime > s2->_lastUsedTime) {
return 1;
- else if (s1->_lastUsedTime < s2->_lastUsedTime)
+ } else if (s1->_lastUsedTime < s2->_lastUsedTime) {
return -1;
- else
+ } else {
return 0;
+ }
}
} // End of namespace Wintermute
diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp
index 2ab89cb53a4..f27818ac5b2 100644
--- a/engines/wintermute/base/base_transition_manager.cpp
+++ b/engines/wintermute/base/base_transition_manager.cpp
@@ -71,8 +71,9 @@ bool BaseTransitionMgr::start(TTransitionType type, bool nonInteractive) {
_preserveInteractive = true;
_origInteractive = _game->_interactive;
_game->_interactive = false;
- } /*else _preserveInteractive */;
-
+ } else {
+ //_preserveInteractive;
+ }
_type = type;
_state = TRANS_MGR_RUNNING;
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index c66ea0c3128..2492bc47eb5 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -646,7 +646,7 @@ bool UIButton::display(int offsetX, int offsetY) {
BaseFont *font = 0;
//RECT rect;
- //rect.setRect(OffsetX + _posX, OffsetY + _posY, OffsetX+_posX+_width, OffsetY+_posY+_height);
+ //BasePlatform::setRect(&rect, offsetX + _posX, offsetY + _posY, offsetX+_posX+_width, offsetY+_posY+_height);
//_hover = (!_disable && BasePlatform::ptInRect(&rect, _game->_mousePos)!=FALSE);
_hover = (!_disable && _game->_activeObject == this && (_game->_interactive || _game->_state == GAME_SEMI_FROZEN));
diff --git a/engines/wintermute/ui/ui_entity.cpp b/engines/wintermute/ui/ui_entity.cpp
index 16141f7446e..4b35e9a9675 100644
--- a/engines/wintermute/ui/ui_entity.cpp
+++ b/engines/wintermute/ui/ui_entity.cpp
@@ -60,7 +60,7 @@ UIEntity::~UIEntity() {
bool UIEntity::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "UIEntity::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "UIEntity::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index cab4784ecf6..2d2c54a2a28 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -236,7 +236,7 @@ bool UIWindow::display(int offsetX, int offsetY) {
bool UIWindow::loadFile(const char *filename) {
char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == nullptr) {
- _game->LOG(0, "UIWindow::LoadFile failed for file '%s'", filename);
+ _game->LOG(0, "UIWindow::loadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -374,7 +374,7 @@ bool UIWindow::loadBuffer(char *buffer, bool complete) {
break;
case TOKEN_BACK_INACTIVE:
- delete _backInactive;
+ SAFE_DELETE(_backInactive);
_backInactive = new UITiledImage(_game);
if (!_backInactive || DID_FAIL(_backInactive->loadFile(params))) {
SAFE_DELETE(_backInactive);
More information about the Scummvm-git-logs
mailing list