[Scummvm-git-logs] scummvm master -> 0a0ade31b409b41111a7718d0f3d91ca3af41b88
eriktorbjorn
noreply at scummvm.org
Thu Aug 27 18:09:53 UTC 2026
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:
0a0ade31b4 JANITORIAL: Clean up double semi-colons
Commit: 0a0ade31b409b41111a7718d0f3d91ca3af41b88
https://github.com/scummvm/scummvm/commit/0a0ade31b409b41111a7718d0f3d91ca3af41b88
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2026-08-27T20:09:34+02:00
Commit Message:
JANITORIAL: Clean up double semi-colons
Changed paths:
backends/platform/android/options.cpp
backends/platform/sdl/amigaos/amigaos.cpp
engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp
engines/alcachofa/global-ui.cpp
engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
engines/bagel/hodjnpodj/mazedoom/mod.cpp
engines/bagel/hodjnpodj/metagame/frame/app.cpp
engines/bagel/spacebar/baglib/inv.cpp
engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
engines/gob/html_parser.cpp
engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp
engines/hpl1/engine/libraries/newton/core/dgPolyhedra.h
engines/private/private.cpp
engines/qdengine/debugger/debugtools.cpp
engines/qdengine/parser/qdscr_parser.cpp
engines/qdengine/qdcore/util/AIAStar.h
engines/sci/graphics/paint16.cpp
engines/watchmaker/3d/light.cpp
engines/watchmaker/renderer.cpp
graphics/mfc/libs/event_loop.cpp
graphics/tinygl/api.cpp
diff --git a/backends/platform/android/options.cpp b/backends/platform/android/options.cpp
index 8f77fe2a54c..e62b04bb3c1 100644
--- a/backends/platform/android/options.cpp
+++ b/backends/platform/android/options.cpp
@@ -132,7 +132,7 @@ enum {
AndroidOptionsWidget::AndroidOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
OptionsContainerWidget(boss, name, "AndroidOptionsDialog", domain), _enabled(true) {
- const bool inAppDomain = domain.equalsIgnoreCase(Common::ConfigManager::kApplicationDomain);;
+ const bool inAppDomain = domain.equalsIgnoreCase(Common::ConfigManager::kApplicationDomain);
_onscreenCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "AndroidOptionsDialog.OnScreenControl", _("Show On-screen control"));
_ignoreGameSafeAreaCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "AndroidOptionsDialog.IgnoreGameSafeArea", _("Ignore safe areas in-game"));
@@ -205,7 +205,7 @@ AndroidOptionsWidget::~AndroidOptionsWidget() {
}
void AndroidOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
- const bool inAppDomain = _domain.equalsIgnoreCase(Common::ConfigManager::kApplicationDomain);;
+ const bool inAppDomain = _domain.equalsIgnoreCase(Common::ConfigManager::kApplicationDomain);
layouts.addDialog(layoutName, overlayedLayout)
.addLayout(GUI::ThemeLayout::kLayoutVertical)
diff --git a/backends/platform/sdl/amigaos/amigaos.cpp b/backends/platform/sdl/amigaos/amigaos.cpp
index db01f3cb2a1..e847f9d9d09 100644
--- a/backends/platform/sdl/amigaos/amigaos.cpp
+++ b/backends/platform/sdl/amigaos/amigaos.cpp
@@ -82,7 +82,7 @@ void OSystem_AmigaOS::initBackend() {
if (ConfMan.hasKey("opengl_implementation")) {
Common::String implem = ConfMan.get("opengl_implementation");
if (implem == "gl") {
- force = 1;;
+ force = 1;
} else if (implem == "gles2") {
force = 2;
}
diff --git a/engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp b/engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp
index 58059b70ec8..4298d1d44a4 100644
--- a/engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp
+++ b/engines/ags/plugins/ags_sprite_font/variable_width_sprite_font.cpp
@@ -195,7 +195,7 @@ void VariableWidthSpriteFontRenderer::Draw(BITMAP *src, BITMAP *dest, int destx,
int starty = MAX(0, (-1 * desty));
- int srca, srcr, srcg, srcb, desta, destr, destg, destb, finalr, finalg, finalb, finala, col, col_r, col_g, col_b;;
+ int srca, srcr, srcg, srcb, desta, destr, destg, destb, finalr, finalg, finalb, finala, col, col_r, col_g, col_b;
col_r = getr32(colour);
col_g = getg32(colour);
col_b = getb32(colour);
diff --git a/engines/alcachofa/global-ui.cpp b/engines/alcachofa/global-ui.cpp
index 9e7c0383d5d..1134e84c411 100644
--- a/engines/alcachofa/global-ui.cpp
+++ b/engines/alcachofa/global-ui.cpp
@@ -196,7 +196,7 @@ void GlobalUIV3::drawChangingButton() {
bool GlobalUIV3::isHoveringInventoryExit() const {
int16 size = kInventoryTriggerSizeV3 * 1024 / g_system->getWidth();
- auto bounds = Rect(g_system->getWidth() - size, g_system->getHeight() - size, g_system->getWidth(), g_system->getHeight());;
+ auto bounds = Rect(g_system->getWidth() - size, g_system->getHeight() - size, g_system->getWidth(), g_system->getHeight());
return bounds.contains(g_engine->input().mousePos2D());
}
diff --git a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
index ce5e7ba26ac..58f4a83d01a 100644
--- a/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
+++ b/engines/bagel/hodjnpodj/garfunkle/garfunkle.cpp
@@ -1200,7 +1200,7 @@ void CALLBACK GetSubOptions(CWnd* pParentWind) {
OptionsDlg.m_nSpeed = tempSpeed;
if (OptionsDlg.DoModal() == IDOK) { // save values set in dialog box
- tempPlayGame = OptionsDlg.m_bPlayGame;; // get new time limit,
+ tempPlayGame = OptionsDlg.m_bPlayGame; // get new time limit,
tempNumButtons = OptionsDlg.m_nNumButtons; //...new rows, and cols
tempSpeed = OptionsDlg.m_nSpeed;
}
diff --git a/engines/bagel/hodjnpodj/mazedoom/mod.cpp b/engines/bagel/hodjnpodj/mazedoom/mod.cpp
index 3b07b628afb..c23fc3de2eb 100644
--- a/engines/bagel/hodjnpodj/mazedoom/mod.cpp
+++ b/engines/bagel/hodjnpodj/mazedoom/mod.cpp
@@ -830,7 +830,7 @@ void CMainWindow::NewGame() {
pDC = GetDC();
- _time = tempTime;; // get new time limit,
+ _time = tempTime; // get new time limit,
_difficulty = tempDifficulty; //...new Difficulty
if (_playerSprite != nullptr) // Refresh PLAYER
@@ -1905,7 +1905,7 @@ void CALLBACK GetSubOptions(CWnd* pParentWind) {
OptionsDlg._difficulty = _difficulty;
if (OptionsDlg.DoModal() == IDOK) { // save values set in dialog box
- tempTime = OptionsDlg._time;; // get new time limit,
+ tempTime = OptionsDlg._time; // get new time limit,
tempDifficulty = OptionsDlg._difficulty; //...new Difficulty
}
diff --git a/engines/bagel/hodjnpodj/metagame/frame/app.cpp b/engines/bagel/hodjnpodj/metagame/frame/app.cpp
index 423e468669f..167a5e3cbbe 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/app.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/app.cpp
@@ -98,7 +98,7 @@ int CTheApp::ExitInstance() {
}
void CTheApp::selectMinigame() {
- bool isMODDemo = false, isAPDemo = false;;
+ bool isMODDemo = false, isAPDemo = false;
const auto *game = Metagame::CMgStatic::cGameTable;
for (; game->m_iGameCode; ++game) {
diff --git a/engines/bagel/spacebar/baglib/inv.cpp b/engines/bagel/spacebar/baglib/inv.cpp
index fa34469b7c5..e20ea360c5d 100644
--- a/engines/bagel/spacebar/baglib/inv.cpp
+++ b/engines/bagel/spacebar/baglib/inv.cpp
@@ -112,7 +112,7 @@ ErrorCode CBagInv::deactivateLocalObject(const CBofString &objectName) {
}
}
- return CBagStorageDevBmp::deactivateLocalObject(objectName);;
+ return CBagStorageDevBmp::deactivateLocalObject(objectName);
}
} // namespace SpaceBar
diff --git a/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp b/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
index 48056929149..cac51422052 100644
--- a/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
+++ b/engines/director/lingo/xlibs/m/mapnavigatorxobj.cpp
@@ -234,7 +234,7 @@ void MapNavigatorXObj::m_new(int nargs) {
NavInstruction ii;
ii.instruction_type = in.readByte();
- ii.reserved = in.readByte();;
+ ii.reserved = in.readByte();
ii.text = in.readPascalString();
if (in.pos() % 2) // align to a word
diff --git a/engines/gob/html_parser.cpp b/engines/gob/html_parser.cpp
index ea6d0f3da38..d725549c7ee 100644
--- a/engines/gob/html_parser.cpp
+++ b/engines/gob/html_parser.cpp
@@ -512,7 +512,7 @@ void HtmlContext::nextKeyword(uint16 destVar, uint16 destVarTagType) {
if (text.empty()) {
_currentTagType = kHtmlTagType_Error;
} else {
- _htmlVariables[0] = substituteHtmlEntities(text.c_str());;
+ _htmlVariables[0] = substituteHtmlEntities(text.c_str());
}
}
diff --git a/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp b/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp
index 6278f382638..870c1475cf2 100644
--- a/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp
+++ b/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.cpp
@@ -1502,7 +1502,7 @@ dgInt32 dgPolyhedra::TriangleList(dgUnsigned32 outputBuffer[], dgInt32 maxSize__
vertexIndex.Insert(edge, edge->m_incidentVertex);
}
count = 0;
- cacheMiss = 0;;
+ cacheMiss = 0;
mark = IncLRU();
while (vertexIndex.GetCount()) {
@@ -1513,7 +1513,7 @@ dgInt32 dgPolyhedra::TriangleList(dgUnsigned32 outputBuffer[], dgInt32 maxSize__
for (iter.Begin(); iter;) {
node = iter.GetNode();
iter ++;
- ptr = node->GetInfo();;
+ ptr = node->GetInfo();
edge = ptr;
do {
diff --git a/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.h b/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.h
index 00a2c00b83c..627660eaf46 100644
--- a/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.h
+++ b/engines/hpl1/engine/libraries/newton/core/dgPolyhedra.h
@@ -280,7 +280,7 @@ inline dgInt32 dgPolyhedra::GetEdgeCount() const {
for (iter.Begin(); iter; iter ++) {
edgeCount ++;
}
- NEWTON_ASSERT(edgeCount == GetCount());;
+ NEWTON_ASSERT(edgeCount == GetCount());
#endif
return GetCount();
}
diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index f833cd17e73..76fe1b6e98b 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -2461,7 +2461,7 @@ bool PrivateEngine::consumeEvents() {
break;
default:
- break;;
+ break;
}
}
diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index 59ae5fd36ce..25a00ce382a 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -509,7 +509,7 @@ void onImGuiInit() {
0
};
- io.FontDefault = ImGui::addTTFFontFromArchive("LiberationSans-Regular.ttf", 16.0f, nullptr, cyrillic_ranges);;
+ io.FontDefault = ImGui::addTTFFontFromArchive("LiberationSans-Regular.ttf", 16.0f, nullptr, cyrillic_ranges);
ImFontConfig icons_config;
icons_config.MergeMode = true;
diff --git a/engines/qdengine/parser/qdscr_parser.cpp b/engines/qdengine/parser/qdscr_parser.cpp
index 444a98c9959..04b3e011d56 100644
--- a/engines/qdengine/parser/qdscr_parser.cpp
+++ b/engines/qdengine/parser/qdscr_parser.cpp
@@ -337,7 +337,7 @@ const char *qdscr_XML_string(const char *p) {
conv_str = p;
- uint32 pos = conv_str.find("&");;
+ uint32 pos = conv_str.find("&");
while (pos != Common::String::npos) {
conv_str.replace(pos, 1, "&");
pos = conv_str.find("&", pos + 1);
diff --git a/engines/qdengine/qdcore/util/AIAStar.h b/engines/qdengine/qdcore/util/AIAStar.h
index 24e3dcef636..a42d82f77c1 100644
--- a/engines/qdengine/qdcore/util/AIAStar.h
+++ b/engines/qdengine/qdcore/util/AIAStar.h
@@ -169,7 +169,7 @@ bool AIAStar<Heuristic, TypeH>::findPath(Vect2i from, Heuristic *hr, Std::vector
//ÑконÑтруировать путь
Vect2i vp;
while (parent) {
- vp = posBy(parent);;
+ vp = posBy(parent);
path.push_back(vp);
if (parent->parent) {
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index 2e901e8d9ed..bb4d91eedbb 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -307,7 +307,7 @@ void GfxPaint16::bitsShow(const Common::Rect &rect) {
// the engine would normally be unable to update the screen. We just have to offset the rect first, before clipping it,
// to make it work. Another solution would be to improve the script patches that implement the speech/text mode for
// better vertical placement of the portrait frames (inside the port rect).
- bool triggeredWorkaround = false;;
+ bool triggeredWorkaround = false;
if (rect.top < 0 && _hiresPortraitWorkaroundFlag) {
_ports->offsetRect(workerRect);
triggeredWorkaround = true;
diff --git a/engines/watchmaker/3d/light.cpp b/engines/watchmaker/3d/light.cpp
index d1e5a346cdd..5fbac61df6b 100644
--- a/engines/watchmaker/3d/light.cpp
+++ b/engines/watchmaker/3d/light.cpp
@@ -368,7 +368,7 @@ t3dLIGHT::t3dLIGHT(WGame &game, t3dBODY *b, WorkDirs &workDirs, Common::Seekable
if (hasFileExtension(name, "avi")) {
appo = workDirs._moviesDir + name; // altrimenti prende quello di default
} else {
- appo = workDirs._mapsDir + name;; // altrimenti prende quello di default
+ appo = workDirs._mapsDir + name; // altrimenti prende quello di default
}
#else
strcpy(Appo, WmMapsDir);
diff --git a/engines/watchmaker/renderer.cpp b/engines/watchmaker/renderer.cpp
index 5868213457c..5111e0e29c8 100644
--- a/engines/watchmaker/renderer.cpp
+++ b/engines/watchmaker/renderer.cpp
@@ -69,7 +69,7 @@ void Renderer::initGL() {
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
- auto perspectiveMatrix = Math::makePerspectiveMatrix(60.0, ratio, 1.0, 1024.0);;
+ auto perspectiveMatrix = Math::makePerspectiveMatrix(60.0, ratio, 1.0, 1024.0);
glLoadMatrixf(perspectiveMatrix.getData());
}
diff --git a/graphics/mfc/libs/event_loop.cpp b/graphics/mfc/libs/event_loop.cpp
index 53dc822fd5c..9c846067735 100644
--- a/graphics/mfc/libs/event_loop.cpp
+++ b/graphics/mfc/libs/event_loop.cpp
@@ -390,7 +390,7 @@ bool EventLoop::isMouseMsg(const Common::Event &ev) const {
ev.type == Common::EVENT_WHEELUP ||
ev.type == Common::EVENT_WHEELDOWN ||
ev.type == Common::EVENT_MBUTTONDOWN ||
- ev.type == Common::EVENT_MBUTTONUP;;
+ ev.type == Common::EVENT_MBUTTONUP;
}
bool EventLoop::isJoystickMsg(const Common::Event &ev) const {
diff --git a/graphics/tinygl/api.cpp b/graphics/tinygl/api.cpp
index 46bb8810644..a6670575294 100644
--- a/graphics/tinygl/api.cpp
+++ b/graphics/tinygl/api.cpp
@@ -207,7 +207,7 @@ void tglColorMask(TGLboolean r, TGLboolean g, TGLboolean b, TGLboolean a) {
p[1].i = r == TGL_TRUE ? 1 : 0;
p[2].i = g == TGL_TRUE ? 1 : 0;
p[3].i = b == TGL_TRUE ? 1 : 0;
- p[4].i = a == TGL_TRUE ? 1 : 0;;
+ p[4].i = a == TGL_TRUE ? 1 : 0;
c->gl_add_op(p);
}
More information about the Scummvm-git-logs
mailing list