diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-30 15:26:05 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-30 15:26:05 (GMT) |
| commit | 68a32aa37607333d3d9a4ddb202a73cc01993000 (patch) | |
| tree | 378d0c20bbf77b95007d8508e04c0dd308b72b86 /src/game/GameView.cpp | |
| parent | 70174bff47432a3b63335b8205623757361d3191 (diff) | |
| download | powder-68a32aa37607333d3d9a4ddb202a73cc01993000.zip powder-68a32aa37607333d3d9a4ddb202a73cc01993000.tar.gz | |
Pass points by value for drawing tools
Diffstat (limited to 'src/game/GameView.cpp')
| -rw-r--r-- | src/game/GameView.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index af9eaaa..d952d5f 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -146,7 +146,7 @@ public: GameView::GameView(): ui::Window(ui::Point(0, 0), ui::Point(XRES+BARSIZE, YRES+MENUSIZE)), - pointQueue(queue<ui::Point*>()), + pointQueue(queue<ui::Point>()), isMouseDown(false), ren(NULL), activeBrush(NULL), @@ -926,8 +926,8 @@ void GameView::OnMouseMove(int x, int y, int dx, int dy) currentMouse = ui::Point(x, y); if(isMouseDown && drawMode == DrawPoints) { - pointQueue.push(new ui::Point(c->PointTranslate(ui::Point(x-dx, y-dy)))); - pointQueue.push(new ui::Point(c->PointTranslate(ui::Point(x, y)))); + pointQueue.push(ui::Point(c->PointTranslate(ui::Point(x-dx, y-dy)))); + pointQueue.push(ui::Point(c->PointTranslate(ui::Point(x, y)))); } } @@ -961,7 +961,7 @@ void GameView::OnMouseDown(int x, int y, unsigned button) } if(drawMode == DrawPoints) { - pointQueue.push(new ui::Point(c->PointTranslate(ui::Point(x, y)))); + pointQueue.push(ui::Point(c->PointTranslate(ui::Point(x, y)))); } } } @@ -1050,7 +1050,7 @@ void GameView::OnMouseUp(int x, int y, unsigned button) if(drawMode == DrawPoints) { c->ToolClick(toolIndex, c->PointTranslate(ui::Point(x, y))); - //pointQueue.push(new ui::Point(x, y)); + //pointQueue.push(ui::Point(x, y)); } if(drawModeReset) { @@ -1117,7 +1117,7 @@ void GameView::OnMouseWheel(int x, int y, int d) c->AdjustBrushSize(d, false, shiftBehaviour, ctrlBehaviour); if(isMouseDown) { - pointQueue.push(new ui::Point(c->PointTranslate(ui::Point(x, y)))); + pointQueue.push(ui::Point(c->PointTranslate(ui::Point(x, y)))); } } } @@ -1405,7 +1405,7 @@ void GameView::OnTick(float dt) { if(isMouseDown) { - pointQueue.push(new ui::Point(c->PointTranslate(currentMouse))); + pointQueue.push(ui::Point(c->PointTranslate(currentMouse))); } if(!pointQueue.empty()) { |