[Scummvm-git-logs] scummvm master -> 8a69a783a5c29f619acabdc16978ac85d29fc548
sev-
noreply at scummvm.org
Fri Apr 17 00:10:08 UTC 2026
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
d42aeebe38 GUI: Clarify code to avoid potential side effect. CID 1639945
5aec749981 MM: MM1: Use safer string copy. CID 1502727
9cbeba576b TITANIC: Fix copy-paste error. CID 1551957
cf7f14c9a3 WAGE: Remove unused variable
1959a7bec6 WAGE: Fix potential negative array index. CID 1644519
8a69a783a5 CINE: Initialize class variables. CID 1003412
Commit: d42aeebe38b5c4001364969f055d9b7af93be56e
https://github.com/scummvm/scummvm/commit/d42aeebe38b5c4001364969f055d9b7af93be56e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-17T02:09:46+02:00
Commit Message:
GUI: Clarify code to avoid potential side effect. CID 1639945
Changed paths:
gui/widget.cpp
diff --git a/gui/widget.cpp b/gui/widget.cpp
index c5f3a116f37..6b4d7c76d18 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -213,7 +213,8 @@ bool Widget::isEnabled() const {
}
void Widget::setVisible(bool e) {
- if (!(_flags & WIDGET_INVISIBLE) != e) {
+ bool currentlyVisible = !(_flags & WIDGET_INVISIBLE);
+ if (currentlyVisible != e) {
if (e) {
clearFlags(WIDGET_INVISIBLE);
markAsDirty();
Commit: 5aec749981254dcca0ef9cd2836c977e02c6c30b
https://github.com/scummvm/scummvm/commit/5aec749981254dcca0ef9cd2836c977e02c6c30b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-17T02:09:50+02:00
Commit Message:
MM: MM1: Use safer string copy. CID 1502727
Changed paths:
engines/mm/mm1/views/character_manage.cpp
diff --git a/engines/mm/mm1/views/character_manage.cpp b/engines/mm/mm1/views/character_manage.cpp
index 3fc45a4ba7c..6e03f4c4752 100644
--- a/engines/mm/mm1/views/character_manage.cpp
+++ b/engines/mm/mm1/views/character_manage.cpp
@@ -69,7 +69,7 @@ bool CharacterManage::msgKeypress(const KeypressMessage &msg) {
redraw();
}
if (msg.keycode == Common::KEYCODE_RETURN || _newName.size() == 15) {
- strncpy(g_globals->_currCharacter->_name, _newName.c_str(), 16);
+ Common::strlcpy(g_globals->_currCharacter->_name, _newName.c_str(), 16);
_state = DISPLAY;
redraw();
} else if (msg.keycode == Common::KEYCODE_BACKSPACE &&
Commit: 9cbeba576b2b0146eae4fe639158f14f594bf0cc
https://github.com/scummvm/scummvm/commit/9cbeba576b2b0146eae4fe639158f14f594bf0cc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-17T02:09:50+02:00
Commit Message:
TITANIC: Fix copy-paste error. CID 1551957
Changed paths:
engines/titanic/true_talk/doorbot_script.cpp
diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp
index 6a602ed2347..1a1e1f2481f 100644
--- a/engines/titanic/true_talk/doorbot_script.cpp
+++ b/engines/titanic/true_talk/doorbot_script.cpp
@@ -959,7 +959,7 @@ int DoorbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
if (!sentence->localWord("earth")) {
if (g_language == Common::EN_ANY && !sentence->contains("earth"))
return 1;
- if (g_language == Common::EN_ANY && !sentence->contains("erde"))
+ if (g_language == Common::DE_DEU && !sentence->contains("erde"))
return 1;
}
break;
Commit: cf7f14c9a3a96b294139690fb7456b2eeabdda7f
https://github.com/scummvm/scummvm/commit/cf7f14c9a3a96b294139690fb7456b2eeabdda7f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-17T02:09:51+02:00
Commit Message:
WAGE: Remove unused variable
Changed paths:
engines/wage/design.cpp
engines/wage/design.h
diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index f3769a6178c..0f20a150748 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -421,7 +421,7 @@ void Design::drawRoundRect(Graphics::ManagedSurface *surface, Common::ReadStream
if (y1 > y2)
SWAP(y1, y2);
- if (_boundsCalculationMode)
+ if (_boundsCalculationMode)
_lastOpString = Common::String::format("roundRect %d, %d, %d, %d", x1, y1, x2, y2);
if (_surface) {
diff --git a/engines/wage/design.h b/engines/wage/design.h
index a45823aa7b0..dd2423da246 100644
--- a/engines/wage/design.h
+++ b/engines/wage/design.h
@@ -64,7 +64,6 @@ struct DrawOp {
int fillType;
int borderThickness;
int borderFillType;
- int lineSize;
};
class Design {
Commit: 1959a7bec661b35ab062b111e8df500e3bc8183e
https://github.com/scummvm/scummvm/commit/1959a7bec661b35ab062b111e8df500e3bc8183e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-17T02:09:51+02:00
Commit Message:
WAGE: Fix potential negative array index. CID 1644519
Changed paths:
engines/wage/combat.cpp
diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp
index 7e2c449bb19..6ac199379cd 100644
--- a/engines/wage/combat.cpp
+++ b/engines/wage/combat.cpp
@@ -437,11 +437,11 @@ void WageEngine::performMagic(Chr *attacker, Chr *victim, Obj *magicalObject) {
int chance = _rnd->getRandomNumber(255);
// pass -1 to indicate a non physical hit
- if (chance < magicAcc)
+ if (chance < magicAcc)
attackHit(attacker, victim, magicalObject, -1);
- else if (attacker->_playerCharacter)
+ else if (attacker->_playerCharacter)
appendText("The spell has no effect.");
- else
+ else
appendText("A miss!");
decrementUses(magicalObject);
@@ -539,9 +539,12 @@ void WageEngine::performMove(Chr *chr, int validMoves) {
// The enemy always runs to the next room first.
Scene *currentScene = chr->_currentScene;
- int destX = currentScene->_worldX + directionsX[dir];
- int destY = currentScene->_worldY + directionsY[dir];
- Scene *destScene = _world->getSceneAt(destX, destY);
+ Scene *destScene = NULL;
+ if (dir != -1) {
+ int destX = currentScene->_worldX + directionsX[dir];
+ int destY = currentScene->_worldY + directionsY[dir];
+ destScene = _world->getSceneAt(destX, destY);
+ }
if (destScene != NULL) {
char buf[256];
Commit: 8a69a783a5c29f619acabdc16978ac85d29fc548
https://github.com/scummvm/scummvm/commit/8a69a783a5c29f619acabdc16978ac85d29fc548
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-17T02:09:51+02:00
Commit Message:
CINE: Initialize class variables. CID 1003412
Changed paths:
engines/cine/cine.cpp
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index b10e3fc1bb1..d3464f34c9c 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -197,6 +197,12 @@ CineEngine::CineEngine(OSystem *syst, const CINEGameDescription *gameDesc)
_restartRequested = false;
_preLoad = false;
setDefaultGameSpeed();
+
+ _ttsLanguage = kEnglish;
+ _copyProtectionTextScreen = false;
+ _copyProtectionColorScreen = false;
+ _saveInputMenuOpen = false;
+ _scriptInfo = nullptr;
}
CineEngine::~CineEngine() {
More information about the Scummvm-git-logs
mailing list