Merge branch 'reorganisation' of github.com:FacialTurd/The-Powder-Toy

15 files changed, 27 insertions, 27 deletions

diff --git a/src/cat/CommandInterface.cpp b/src/cat/CommandInterface.cpp
index 992ce74..6b22488 100644
--- a/src/cat/CommandInterface.cpp
+++ b/src/cat/CommandInterface.cpp
@@ -5,8 +5,8 @@
 #include <strings.h>
 #endif
 #include "CommandInterface.h"
-#include "game/GameModel.h"
-#include "game/GameController.h"
+#include "gui/game/GameModel.h"
+#include "gui/game/GameController.h"
 
 CommandInterface::CommandInterface(GameController * c, GameModel * m) {
 	this->m = m;
diff --git a/src/cat/CommandInterface.h b/src/cat/CommandInterface.h
index 192e1f9..2e1a1df 100644
--- a/src/cat/CommandInterface.h
+++ b/src/cat/CommandInterface.h
@@ -2,7 +2,7 @@
 #define COMMANDINTERFACE_H_
 
 #include <string>
-#include "interface/Engine.h"
+#include "gui/interface/Engine.h"
 //#include "game/GameModel.h"
 
 class GameModel;
diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp
index 5df660c..df019fa 100644
--- a/src/cat/LegacyLuaAPI.cpp
+++ b/src/cat/LegacyLuaAPI.cpp
@@ -9,12 +9,12 @@
 #include "LuaScriptInterface.h"
 #include "LuaScriptHelper.h"
 
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/TextPrompt.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/TextPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/game/GameModel.h"
 #include "simulation/Simulation.h"
-#include "game/GameModel.h"
 
 #include <time.h>
 
diff --git a/src/cat/LuaButton.cpp b/src/cat/LuaButton.cpp
index 01ca875..013adac 100644
--- a/src/cat/LuaButton.cpp
+++ b/src/cat/LuaButton.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaButton.h"
 #include "LuaScriptInterface.h"
-#include "interface/Button.h"
+#include "gui/interface/Button.h"
 
 const char LuaButton::className[] = "Button";
 
diff --git a/src/cat/LuaCheckbox.cpp b/src/cat/LuaCheckbox.cpp
index 8256730..bac5c4e 100644
--- a/src/cat/LuaCheckbox.cpp
+++ b/src/cat/LuaCheckbox.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaCheckbox.h"
 #include "LuaScriptInterface.h"
-#include "interface/Checkbox.h"
+#include "gui/interface/Checkbox.h"
 
 const char LuaCheckbox::className[] = "Checkbox";
 
diff --git a/src/cat/LuaComponent.cpp b/src/cat/LuaComponent.cpp
index 8c2d3a4..75e7a21 100644
--- a/src/cat/LuaComponent.cpp
+++ b/src/cat/LuaComponent.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaComponent.h"
 #include "LuaScriptInterface.h"
-#include "interface/Component.h"
+#include "gui/interface/Component.h"
 
 
 LuaComponent::LuaComponent(lua_State * l)
diff --git a/src/cat/LuaLabel.cpp b/src/cat/LuaLabel.cpp
index 007e009..b08e687 100644
--- a/src/cat/LuaLabel.cpp
+++ b/src/cat/LuaLabel.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaScriptInterface.h"
 #include "LuaLabel.h"
-#include "interface/Label.h"
+#include "gui/interface/Label.h"
 
 const char LuaLabel::className[] = "Label";
 
diff --git a/src/cat/LuaProgressBar.cpp b/src/cat/LuaProgressBar.cpp
index 71b8f7b..08c88ca 100644
--- a/src/cat/LuaProgressBar.cpp
+++ b/src/cat/LuaProgressBar.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaProgressBar.h"
 #include "LuaScriptInterface.h"
-#include "interface/ProgressBar.h"
+#include "gui/interface/ProgressBar.h"
 
 const char LuaProgressBar::className[] = "ProgressBar";
 
diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp
index 6f8b30d..7719add 100644
--- a/src/cat/LuaScriptInterface.cpp
+++ b/src/cat/LuaScriptInterface.cpp
@@ -9,13 +9,13 @@
 #include "LuaLuna.h"
 #include "LuaScriptInterface.h"
 #include "TPTScriptInterface.h"
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/TextPrompt.h"
-#include "dialogues/ConfirmPrompt.h" 
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/TextPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h" 
 #include "simulation/Simulation.h"
-#include "game/GameModel.h"
-#include "game/Tool.h"
+#include "gui/game/GameModel.h"
+#include "gui/game/Tool.h"
 #include "LuaScriptHelper.h"
 #include "client/HTTP.h"
 #include "PowderToy.h"
diff --git a/src/cat/LuaSlider.cpp b/src/cat/LuaSlider.cpp
index 0fedbfb..ce07ebb 100644
--- a/src/cat/LuaSlider.cpp
+++ b/src/cat/LuaSlider.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaSlider.h"
 #include "LuaScriptInterface.h"
-#include "interface/Slider.h"
+#include "gui/interface/Slider.h"
 
 const char LuaSlider::className[] = "Slider";
 
diff --git a/src/cat/LuaTextbox.cpp b/src/cat/LuaTextbox.cpp
index 46285c8..5721525 100644
--- a/src/cat/LuaTextbox.cpp
+++ b/src/cat/LuaTextbox.cpp
@@ -8,7 +8,7 @@ extern "C"
 #include <iostream>
 #include "LuaScriptInterface.h"
 #include "LuaTextbox.h"
-#include "interface/Textbox.h"
+#include "gui/interface/Textbox.h"
 
 const char LuaTextbox::className[] = "Textbox";
 
diff --git a/src/cat/LuaWindow.cpp b/src/cat/LuaWindow.cpp
index 502c7f1..d765d68 100644
--- a/src/cat/LuaWindow.cpp
+++ b/src/cat/LuaWindow.cpp
@@ -14,9 +14,9 @@ extern "C"
 #include "LuaCheckbox.h"
 #include "LuaSlider.h"
 #include "LuaProgressBar.h"
-#include "interface/Button.h"
-#include "interface/Label.h"
-#include "interface/Window.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Window.h"
 
 const char LuaWindow::className[] = "Window";
 
diff --git a/src/cat/LuaWindow.h b/src/cat/LuaWindow.h
index d9d25e1..f48c5f9 100644
--- a/src/cat/LuaWindow.h
+++ b/src/cat/LuaWindow.h
@@ -8,7 +8,7 @@ extern "C" {
 
 #include "LuaLuna.h"
 
-#include "interface/Platform.h"
+#include "gui/interface/Platform.h"
 namespace ui
 {
 	class Window;
diff --git a/src/cat/TPTSTypes.h b/src/cat/TPTSTypes.h
index 6a2cec4..b9fa92b 100644
--- a/src/cat/TPTSTypes.h
+++ b/src/cat/TPTSTypes.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <typeinfo>
-#include "interface/Point.h"
+#include "gui/interface/Point.h"
 
 enum ValueType { TypeNumber, TypePoint, TypeString, TypeNull, TypeFunction };
 
diff --git a/src/cat/TPTScriptInterface.cpp b/src/cat/TPTScriptInterface.cpp
index 84f55ef..601c228 100644
--- a/src/cat/TPTScriptInterface.cpp
+++ b/src/cat/TPTScriptInterface.cpp
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "TPTScriptInterface.h"
-#include "game/GameModel.h"
+#include "gui/game/GameModel.h"
 #include "simulation/Air.h"
 
 TPTScriptInterface::TPTScriptInterface(GameController * c, GameModel * m): CommandInterface(c, m)