From a6b1e38eab0fe9e96975834d26b68cfc70294b5e Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sun, 29 Aug 2021 14:12:14 +0200 Subject: [PATCH] Don't use comma where there is no need to. --- apps/openmw/mwgui/bookpage.cpp | 7 +++++-- apps/openmw/mwgui/mapwindow.cpp | 6 ++++-- apps/openmw/mwrender/terrainstorage.cpp | 5 ++++- apps/openmw/mwworld/store.cpp | 6 ++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp index 2bfec8105b..874d1d866b 100644 --- a/apps/openmw/mwgui/bookpage.cpp +++ b/apps/openmw/mwgui/bookpage.cpp @@ -491,7 +491,8 @@ struct TypesetBookImpl::Typesetter : BookTypesetter { add_partial_text(); stream.consume (); - mLine = nullptr, mRun = nullptr; + mLine = nullptr; + mRun = nullptr; continue; } @@ -551,7 +552,9 @@ struct TypesetBookImpl::Typesetter : BookTypesetter if (left + space_width + word_width > mPageWidth) { - mLine = nullptr, mRun = nullptr, left = 0; + mLine = nullptr; + mRun = nullptr; + left = 0; } else { diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp index e42808776c..388bbc7d48 100644 --- a/apps/openmw/mwgui/mapwindow.cpp +++ b/apps/openmw/mwgui/mapwindow.cpp @@ -988,7 +988,8 @@ namespace MWGui if (mInterior) { auto pos = MWBase::Environment::get().getWorld()->getPlayer().getLastKnownExteriorPosition(); - x = pos.x(), y = pos.y(); + x = pos.x(); + y = pos.y(); } setGlobalMapPlayerPosition(x, y); @@ -1160,7 +1161,8 @@ namespace MWGui void MapWindow::worldPosToGlobalMapImageSpace(float x, float y, float& imageX, float& imageY) const { mGlobalMapRender->worldPosToImageSpace(x, y, imageX, imageY); - imageX *= mGlobalMapZoom, imageY *= mGlobalMapZoom; + imageX *= mGlobalMapZoom; + imageY *= mGlobalMapZoom; } void MapWindow::updateCustomMarkers() diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp index 528ce70ea3..879a2ef68b 100644 --- a/apps/openmw/mwrender/terrainstorage.cpp +++ b/apps/openmw/mwrender/terrainstorage.cpp @@ -33,7 +33,10 @@ namespace MWRender void TerrainStorage::getBounds(float& minX, float& maxX, float& minY, float& maxY) { - minX = 0, minY = 0, maxX = 0, maxY = 0; + minX = 0; + minY = 0; + maxX = 0; + maxY = 0; const MWWorld::ESMStore &esmStore = MWBase::Environment::get().getWorld()->getStore(); diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp index f6de1d485b..718cebd790 100644 --- a/apps/openmw/mwworld/store.cpp +++ b/apps/openmw/mwworld/store.cpp @@ -520,7 +520,8 @@ namespace MWWorld const ESM::Cell *Store::search(int x, int y) const { ESM::Cell cell; - cell.mData.mX = x, cell.mData.mY = y; + cell.mData.mX = x; + cell.mData.mY = y; std::pair key(x, y); DynamicExt::const_iterator it = mExt.find(key); @@ -538,7 +539,8 @@ namespace MWWorld const ESM::Cell *Store::searchStatic(int x, int y) const { ESM::Cell cell; - cell.mData.mX = x, cell.mData.mY = y; + cell.mData.mX = x; + cell.mData.mY = y; std::pair key(x, y); DynamicExt::const_iterator it = mExt.find(key);