non relevant changes
This commit is contained in:
parent
fa3b9fd125
commit
b50cb35734
|
@ -24,3 +24,4 @@ UIGame
|
||||||
anchors.right: rightPanel.left
|
anchors.right: rightPanel.left
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.bottom: bottomPanel.top
|
anchors.bottom: bottomPanel.top
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,8 @@ bool UIMap::onMousePress(const Point& mousePos, Fw::MouseButton button)
|
||||||
Position tilePos = Position(1 + (int)tilePosF.x - Map::PLAYER_OFFSET_X, 1 + (int)tilePosF.y - Map::PLAYER_OFFSET_Y, 0) + g_map.getCentralPosition();
|
Position tilePos = Position(1 + (int)tilePosF.x - Map::PLAYER_OFFSET_X, 1 + (int)tilePosF.y - Map::PLAYER_OFFSET_Y, 0) + g_map.getCentralPosition();
|
||||||
|
|
||||||
TilePtr tile = g_map.getTile(tilePos);
|
TilePtr tile = g_map.getTile(tilePos);
|
||||||
tile->useItem();
|
if(tile)
|
||||||
|
tile->useItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
return UIWidget::onMousePress(mousePos, button);
|
return UIWidget::onMousePress(mousePos, button);
|
||||||
|
|
|
@ -34,7 +34,6 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void onStyleApply(const OTMLNodePtr& styleNode);
|
virtual void onStyleApply(const OTMLNodePtr& styleNode);
|
||||||
|
|
||||||
virtual bool onMousePress(const Point& mousePos, Fw::MouseButton button);
|
virtual bool onMousePress(const Point& mousePos, Fw::MouseButton button);
|
||||||
virtual void onGeometryUpdate(const Rect& oldRect, const Rect& newRect);
|
virtual void onGeometryUpdate(const Rect& oldRect, const Rect& newRect);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue