mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-23 21:41:29 +00:00
Code Issues Releases Wiki Activity

Remove unused argument

Browse source
This commit is contained in:
scrawl 2016-01-07 00:45:12 +01:00
parent 4690fd3f22
commit ca4e859f61
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/mapwindow.cpp
View file

@ -269,8 +269,6 @@ namespace MWGui
// normalized cell coordinates // normalized cell coordinates
float nX,nY; float nX,nY;
markerPos.interior = mInterior;
if (!mInterior) if (!mInterior)
{ {
int cellX, cellY; int cellX, cellY;
@ -1078,7 +1076,7 @@ namespace MWGui
{ {
if (!mLocalMapRender) if (!mLocalMapRender)
return true; return true;
return mLocalMapRender->isPositionExplored(nX, nY, cellX, cellY, interior); return mLocalMapRender->isPositionExplored(nX, nY, cellX, cellY);
} }
} }

2
apps/openmw/mwgui/mapwindow.hpp
View file

@ -78,7 +78,6 @@ namespace MWGui
{ {
MarkerUserData(MWRender::LocalMap* map) MarkerUserData(MWRender::LocalMap* map)
: mLocalMapRender(map) : mLocalMapRender(map)
, interior(false)
, cellX(0) , cellX(0)
, cellY(0) , cellY(0)
, nX(0.f) , nX(0.f)
@ -89,7 +88,6 @@ namespace MWGui
bool isPositionExplored() const; bool isPositionExplored() const;
MWRender::LocalMap* mLocalMapRender; MWRender::LocalMap* mLocalMapRender;
bool interior;
int cellX; int cellX;
int cellY; int cellY;
float nX; float nX;

2
apps/openmw/mwrender/localmap.cpp
View file

@ -478,7 +478,7 @@ osg::Vec2f LocalMap::interiorMapToWorldPosition (float nX, float nY, int x, int
return pos; return pos;
} }
bool LocalMap::isPositionExplored (float nX, float nY, int x, int y, bool interior) bool LocalMap::isPositionExplored (float nX, float nY, int x, int y)
{ {
const MapSegment& segment = mSegments[std::make_pair(x, y)]; const MapSegment& segment = mSegments[std::make_pair(x, y)];
if (!segment.mFogOfWarImage) if (!segment.mFogOfWarImage)

2
apps/openmw/mwrender/localmap.hpp
View file

@ -99,7 +99,7 @@ namespace MWRender
/** /**
* Check if a given position is explored by the player (i.e. not obscured by fog of war) * Check if a given position is explored by the player (i.e. not obscured by fog of war)
*/ */
bool isPositionExplored (float nX, float nY, int x, int y, bool interior); bool isPositionExplored (float nX, float nY, int x, int y);
osg::Group* getRoot(); osg::Group* getRoot();