mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-25 16:43:33 +00:00
Code Issues Projects Releases Wiki Activity

Don't use comma where there is no need to.

Browse Source
This commit is contained in:
jvoisin 2021-08-29 14:12:14 +02:00
parent 4f99c060c3
commit a6b1e38eab
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/openmw/mwgui/bookpage.cpp
View File

@ -491,7 +491,8 @@ struct TypesetBookImpl::Typesetter : BookTypesetter
{ {
add_partial_text(); add_partial_text();
stream.consume (); stream.consume ();
mLine = nullptr, mRun = nullptr; mLine = nullptr;
mRun = nullptr;
continue; continue;
} }
@ -551,7 +552,9 @@ struct TypesetBookImpl::Typesetter : BookTypesetter
if (left + space_width + word_width > mPageWidth) if (left + space_width + word_width > mPageWidth)
{ {
mLine = nullptr, mRun = nullptr, left = 0; mLine = nullptr;
mRun = nullptr;
left = 0;
} }
else else
{ {

6
apps/openmw/mwgui/mapwindow.cpp
View File

@ -988,7 +988,8 @@ namespace MWGui
if (mInterior) if (mInterior)
{ {
auto pos = MWBase::Environment::get().getWorld()->getPlayer().getLastKnownExteriorPosition(); auto pos = MWBase::Environment::get().getWorld()->getPlayer().getLastKnownExteriorPosition();
x = pos.x(), y = pos.y(); x = pos.x();
y = pos.y();
} }
setGlobalMapPlayerPosition(x, y); setGlobalMapPlayerPosition(x, y);
@ -1160,7 +1161,8 @@ namespace MWGui
void MapWindow::worldPosToGlobalMapImageSpace(float x, float y, float& imageX, float& imageY) const void MapWindow::worldPosToGlobalMapImageSpace(float x, float y, float& imageX, float& imageY) const
{ {
mGlobalMapRender->worldPosToImageSpace(x, y, imageX, imageY); mGlobalMapRender->worldPosToImageSpace(x, y, imageX, imageY);
imageX *= mGlobalMapZoom, imageY *= mGlobalMapZoom; imageX *= mGlobalMapZoom;
imageY *= mGlobalMapZoom;
} }
void MapWindow::updateCustomMarkers() void MapWindow::updateCustomMarkers()

5
apps/openmw/mwrender/terrainstorage.cpp
View File

@ -33,7 +33,10 @@ namespace MWRender
void TerrainStorage::getBounds(float& minX, float& maxX, float& minY, float& maxY) 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 = const MWWorld::ESMStore &esmStore =
MWBase::Environment::get().getWorld()->getStore(); MWBase::Environment::get().getWorld()->getStore();

6
apps/openmw/mwworld/store.cpp
View File

@ -520,7 +520,8 @@ namespace MWWorld
const ESM::Cell *Store<ESM::Cell>::search(int x, int y) const const ESM::Cell *Store<ESM::Cell>::search(int x, int y) const
{ {
ESM::Cell cell; ESM::Cell cell;
cell.mData.mX = x, cell.mData.mY = y; cell.mData.mX = x;
cell.mData.mY = y;
std::pair<int, int> key(x, y); std::pair<int, int> key(x, y);
DynamicExt::const_iterator it = mExt.find(key); DynamicExt::const_iterator it = mExt.find(key);
@ -538,7 +539,8 @@ namespace MWWorld
const ESM::Cell *Store<ESM::Cell>::searchStatic(int x, int y) const const ESM::Cell *Store<ESM::Cell>::searchStatic(int x, int y) const
{ {
ESM::Cell cell; ESM::Cell cell;
cell.mData.mX = x, cell.mData.mY = y; cell.mData.mX = x;
cell.mData.mY = y;
std::pair<int, int> key(x, y); std::pair<int, int> key(x, y);
DynamicExt::const_iterator it = mExt.find(key); DynamicExt::const_iterator it = mExt.find(key);