correct core module with new types

towers.h

@@ -1,8 +1,6 @@
 #ifndef TOWERS_H
 #define TOWERS_H
 
-#include <QObject>
-
 #include "game_data.h"
 
 class Towers : public QObject
@@ -13,18 +11,12 @@ public:
 	bool AddTower(int playerId, int srcId, QPoint pos);
 	void DelTower(QPoint pos);
 	void update();
-	int size() const {return gameData->curTowers.size();}
 signals:
-	void shot(srcSplashType src, TowerType tw);
+	void shot(srcSplashType src, int index, TowerType tw);
 public slots:
 
 private:
 	Game_Data * gameData;
 };
 
-inline uint qHash(const QPoint &pos)
-{
-	return qHash(pos.x()) + (qHash(pos.y()) << 16);
-}
-
 #endif // TOWERS_H