diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-24 12:24:17 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-24 12:24:17 (GMT) |
| commit | 9b5b85f9b01cbda7ef9a7ec2a15b2a35630a5b9d (patch) | |
| tree | ac7d040253b459ce102e476cb19ab59e3cfa90d7 /src/PowderToySDL.cpp | |
| parent | 6bf98ccdca39936a3c51367862eed7c49f8786ec (diff) | |
| parent | bdc69f31c0be94191015838886bdcc2bc67f1acb (diff) | |
| download | powder-9b5b85f9b01cbda7ef9a7ec2a15b2a35630a5b9d.zip powder-9b5b85f9b01cbda7ef9a7ec2a15b2a35630a5b9d.tar.gz | |
Merge branch 'reorganisation' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/PowderToySDL.cpp')
| -rw-r--r-- | src/PowderToySDL.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index 48a77b2..c57b3b9 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -25,13 +25,6 @@ #endif #include "Format.h" -#include "Style.h" -#include "interface/Engine.h" -#include "interface/Button.h" -#include "interface/Panel.h" -#include "interface/Point.h" -#include "interface/Label.h" -#include "interface/Keys.h" #include "client/GameSave.h" #include "client/SaveFile.h" @@ -39,10 +32,12 @@ #include "client/Client.h" #include "Misc.h" -#include "game/GameController.h" -#include "game/GameView.h" +#include "gui/game/GameController.h" +#include "gui/game/GameView.h" -#include "dialogues/ErrorMessage.h" +#include "gui/dialogues/ErrorMessage.h" +#include "gui/interface/Keys.h" +#include "gui/Style.h" #include "client/HTTP.h" |