summaryrefslogtreecommitdiff
path: root/src/game/GameView.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-14 14:35:03 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-14 14:35:03 (GMT)
commit8604b3054858fbeed30b82120bb1f401c50fe542 (patch)
tree8a8bf9623fbc9a1e458add2f8d157d4788ed07cc /src/game/GameView.cpp
parent02696b1cbeaa718eb29f2552992d68b1915c81b5 (diff)
downloadpowder-8604b3054858fbeed30b82120bb1f401c50fe542.zip
powder-8604b3054858fbeed30b82120bb1f401c50fe542.tar.gz
Stamp selection and placements works through the zoom window, #104
Diffstat (limited to 'src/game/GameView.cpp')
-rw-r--r--src/game/GameView.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 8b553b9..435e277 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -951,9 +951,9 @@ void GameView::OnMouseMove(int x, int y, int dx, int dy)
if(selectMode!=SelectNone)
{
if(selectMode==PlaceSave)
- selectPoint1 = ui::Point(x, y);
+ selectPoint1 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y)));
if(selectPoint1.X!=-1)
- selectPoint2 = c->NormaliseBlockCoord(ui::Point(x, y));
+ selectPoint2 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y)));
return;
}
currentMouse = ui::Point(x, y);
@@ -970,7 +970,7 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
{
if(button==BUTTON_LEFT)
{
- selectPoint1 = c->NormaliseBlockCoord(ui::Point(x, y));
+ selectPoint1 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y)));
selectPoint2 = selectPoint1;
}
return;
@@ -1770,6 +1770,8 @@ void GameView::OnDraw()
thumbPos.Y = YRES-tempThumb->Size.Y;
g->draw_image(tempThumb->Data, thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y, 128);
+
+ g->xor_rect(thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y);
}
}
else