mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-26 09:35:28 +00:00
Issue #225: Initialize members in class constructor.
This commit is contained in:
parent
be94da1527
commit
fa4c4b8f21
@ -182,7 +182,9 @@ void HUD::setPlayerPos(const float x, const float y)
|
|||||||
}
|
}
|
||||||
|
|
||||||
MapWindow::MapWindow()
|
MapWindow::MapWindow()
|
||||||
: Layout("openmw_map_window_layout.xml"), mGlobal(false)
|
: Layout("openmw_map_window_layout.xml")
|
||||||
|
, mGlobal(false)
|
||||||
|
, mVisible(false)
|
||||||
{
|
{
|
||||||
setCoord(500,0,320,300);
|
setCoord(500,0,320,300);
|
||||||
setText("WorldButton", "World");
|
setText("WorldButton", "World");
|
||||||
@ -272,6 +274,17 @@ void MapWindow::onWorldButtonClicked(MyGUI::Widget* _sender)
|
|||||||
mButton->setCaption( mGlobal ? "Local" : "World" );
|
mButton->setCaption( mGlobal ? "Local" : "World" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LocalMapBase::LocalMapBase()
|
||||||
|
: mCurX(0)
|
||||||
|
, mCurY(0)
|
||||||
|
, mInterior(false)
|
||||||
|
, mLocalMap(NULL)
|
||||||
|
, mPrefix()
|
||||||
|
, mChanged(false)
|
||||||
|
, mLayout(NULL)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void LocalMapBase::init(MyGUI::ScrollView* widget, OEngine::GUI::Layout* layout)
|
void LocalMapBase::init(MyGUI::ScrollView* widget, OEngine::GUI::Layout* layout)
|
||||||
{
|
{
|
||||||
mLocalMap = widget;
|
mLocalMap = widget;
|
||||||
|
@ -34,6 +34,7 @@ namespace MWGui
|
|||||||
class LocalMapBase
|
class LocalMapBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
LocalMapBase();
|
||||||
void init(MyGUI::ScrollView* widget, OEngine::GUI::Layout* layout);
|
void init(MyGUI::ScrollView* widget, OEngine::GUI::Layout* layout);
|
||||||
|
|
||||||
void setCellPrefix(const std::string& prefix);
|
void setCellPrefix(const std::string& prefix);
|
||||||
@ -85,6 +86,7 @@ namespace MWGui
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MapWindow();
|
MapWindow();
|
||||||
|
virtual ~MapWindow(){}
|
||||||
|
|
||||||
void setVisible(bool b);
|
void setVisible(bool b);
|
||||||
void setPlayerPos(const float x, const float y);
|
void setPlayerPos(const float x, const float y);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user