more reorganization

src/CMakeLists.txt

@@ -17,11 +17,11 @@ SET(SRC_LIST
   levels/level4.c
   levels/level5.c
   levels/level6.c
-  levels/moonwalk.c
-  levels/dodger.c
-  levels/actions.c
-  levels/dodger/actions.c
-  levels/dodger/callbacks.c
+	levels/actions.c
+	levels/modules/moonwalk.c
+	levels/modules/dodger.c
+	levels/modules/dodger/actions.c
+	levels/modules/dodger/callbacks.c
 )
 
 find_package(Allegro5 REQUIRED)

src/levels/level1.c

@@ -20,9 +20,9 @@
  */
 #include <stdio.h>
 #include "../gamestates/level.h"
-#include "dodger.h"
 #include "actions.h"
-#include "dodger/actions.h"
+#include "modules/dodger.h"
+#include "modules/dodger/actions.h"
 
 void Level1_Load(struct Game *game) {
 	Dodger_Load(game);

src/levels/level2.c

@@ -20,7 +20,7 @@
  */
 #include <stdio.h>
 #include "../gamestates/level.h"
-#include "moonwalk.h"
+#include "modules/moonwalk.h"
 
 void Level2_Load(struct Game *game) {
 	Moonwalk_Load(game);

src/levels/level3.c

@@ -20,7 +20,7 @@
  */
 #include <stdio.h>
 #include "../gamestates/level.h"
-#include "moonwalk.h"
+#include "modules/moonwalk.h"
 
 void Level3_Load(struct Game *game) {
 	Moonwalk_Load(game);

src/levels/level4.c

@@ -20,7 +20,7 @@
  */
 #include <stdio.h>
 #include "../gamestates/level.h"
-#include "moonwalk.h"
+#include "modules/moonwalk.h"
 
 void Level4_Load(struct Game *game) {
 	Moonwalk_Load(game);

src/levels/level5.c

@@ -20,7 +20,7 @@
  */
 #include <stdio.h>
 #include "../gamestates/level.h"
-#include "moonwalk.h"
+#include "modules/moonwalk.h"
 
 void Level5_Load(struct Game *game) {
 	Moonwalk_Load(game);

src/levels/level6.c

@@ -20,7 +20,7 @@
  */
 #include <stdio.h>
 #include "../gamestates/level.h"
-#include "moonwalk.h"
+#include "modules/moonwalk.h"
 
 void Level6_Load(struct Game *game) {
 	Moonwalk_Load(game);

src/levels/modules/dodger.c

@@ -20,9 +20,9 @@
  */
 #include <stdio.h>
 #include <math.h>
-#include "../gamestates/level.h"
+#include "../../gamestates/level.h"
+#include "../actions.h"
 #include "dodger.h"
-#include "actions.h"
 #include "dodger/actions.h"
 
 void Dodger_Logic(struct Game *game) {

src/levels/modules/dodger.h

@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include "../main.h"
+#include "../../main.h"
 
 void Dodger_Draw(struct Game *game);
 void Dodger_Logic(struct Game *game);

src/levels/modules/dodger/actions.c

@@ -21,8 +21,8 @@
 
 #include "actions.h"
 #include "callbacks.h"
-#include "../actions.h"
-#include "../../gamestates/level.h"
+#include "../../actions.h"
+#include "../../../gamestates/level.h"
 
 
 bool Accelerate(struct Game *game, struct TM_Action *action, enum TM_ActionState state) {

src/levels/modules/dodger/actions.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "../../main.h"
-#include "../../timeline.h"
+#include "../../../main.h"
+#include "../../../timeline.h"
 
 /*! \brief Accelerate current speed game until threshold is reached  */
 bool Accelerate(struct Game *game, struct TM_Action *action, enum TM_ActionState state);

src/levels/modules/dodger/callbacks.h

@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "../../main.h"
+#include "../../../main.h"
 
 /*! \brief Move up or down until reaching the edge of the screen. After that - change direction. */
 void Obst_MoveUpDown(struct Game *game, struct Obstacle *obstacle);

src/levels/modules/moonwalk.c

@@ -20,7 +20,7 @@
  */
 #include <stdio.h>
 #include <math.h>
-#include "../gamestates/level.h"
+#include "../../gamestates/level.h"
 #include "moonwalk.h"
 
 void Moonwalk_Logic(struct Game *game) {

src/levels/modules/moonwalk.h

@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include "../main.h"
+#include "../../main.h"
 
 void Moonwalk_Draw(struct Game *game);
 void Moonwalk_Logic(struct Game *game);