summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-06-02 01:57:03 (GMT)
committer jacob1 <jfu614@gmail.com>2013-06-02 01:57:03 (GMT)
commit8d7ab7f5e27b9b5ba71b4ef13e4cbb9f7e5a4641 (patch)
treed3bf71c04abc24aa014dbc403421d1821a8c96be /src/gui
parentb16524292e2d8c640e0e4e0801d5cb4e512e4707 (diff)
downloadpowder-8d7ab7f5e27b9b5ba71b4ef13e4cbb9f7e5a4641.zip
powder-8d7ab7f5e27b9b5ba71b4ef13e4cbb9f7e5a4641.tar.gz
allow creating WIND lines from lua
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/game/PropertyTool.cpp2
-rw-r--r--src/gui/game/Tool.cpp2
-rw-r--r--src/gui/game/Tool.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp
index 90e70b3..a95d2c9 100644
--- a/src/gui/game/PropertyTool.cpp
+++ b/src/gui/game/PropertyTool.cpp
@@ -129,7 +129,7 @@ void PropertyWindow::SetProperty()
if(type != -1)
{
#ifdef DEBUG
- std::cout << "Got type from particle name" << std::endl;
+ std::cout << "Got type from particle name" << std::endl;
#endif
tempInt = type;
}
diff --git a/src/gui/game/Tool.cpp b/src/gui/game/Tool.cpp
index df99e57..2ff1a1b 100644
--- a/src/gui/game/Tool.cpp
+++ b/src/gui/game/Tool.cpp
@@ -47,7 +47,7 @@ void Tool::DrawLine(Simulation * sim, Brush * brush, ui::Point position1, ui::Po
void Tool::DrawRect(Simulation * sim, Brush * brush, ui::Point position1, ui::Point position2) {
sim->ToolBox(position1.X, position1.Y, position2.X, position2.Y, toolID, strength);
}
-void Tool::DrawFill(Simulation * sim, Brush * brush, ui::Point position) {};
+void Tool::DrawFill(Simulation * sim, Brush * brush, ui::Point position) {}
ElementTool::ElementTool(int id, string name, string description, int r, int g, int b, std::string identifier, VideoBuffer * (*textureGen)(int, int, int)):
diff --git a/src/gui/game/Tool.h b/src/gui/game/Tool.h
index df4e5cc..37b79e3 100644
--- a/src/gui/game/Tool.h
+++ b/src/gui/game/Tool.h
@@ -86,7 +86,7 @@ public:
}
virtual ~PropertyTool() {}
virtual void Click(Simulation * sim, Brush * brush, ui::Point position);
- virtual void Draw(Simulation * sim, Brush * brush, ui::Point position) {};
+ virtual void Draw(Simulation * sim, Brush * brush, ui::Point position) {}
virtual void DrawLine(Simulation * sim, Brush * brush, ui::Point position1, ui::Point position2, bool dragging = false) { }
virtual void DrawRect(Simulation * sim, Brush * brush, ui::Point position1, ui::Point position2) { }
virtual void DrawFill(Simulation * sim, Brush * brush, ui::Point position) { }