correct core module with new types

game_data.h

@@ -1,10 +1,9 @@
 #ifndef GAME_DATA_H
 #define GAME_DATA_H
 
-#include <QObject>
-#include <QHash>
-
 #include "player.h"
+#include "base_types.h"
+#include "map.h"
 
 class Game_Data : public QObject
 {
@@ -13,8 +12,10 @@ public:
 	explicit Game_Data(Map * map, QObject *parent = 0);
 	QList <srcAlienType> srcAliens;
 	QHash <int,AlienType> curAliens;
-	QHash <QPoint,TowerType> curTowers;
+	QList <srcSplashType> srcSplashes;
+	QList <srcTriggerType> srTriggers;
 	QHash <int,SplashType> curSplashes;
+	QHash <QPoint,TowerType> curTowers;
 	QList <WaveType> waves;
 	QList <Player *> players;
 	Map * map;