changes in arhitecture, some improvments, much optimising and simplify,

many bagfixes and new graphics engine

aliens.h

@@ -1,26 +1,39 @@
 #ifndef ALIENS_H
 #define ALIENS_H
 
-#include "game_data.h"
+#include "base_types.h"
+#include "map.h"
 
+#include <QGraphicsScene>
+#include <QGraphicsItemGroup>
 
 class Aliens : public QObject
 {
 Q_OBJECT
 public:
-	explicit Aliens(Game_Data * gd, QObject *parent = 0);
+	explicit Aliens(Map * map, QObject *parent = 0);
 	void addAlien(int srcId);
 	void update();
+	void setScene(QGraphicsScene * scene_) {scene = scene_;}
+	QList <srcAlienType> srcAliens;
+	QHash <int,AlienType> curAliens;
+	int missingAliens() {return m_missingAliens;}
+
 signals:
 
 public slots:
-	void delAlien(int Id);
+	void delAlien(int id, bool missed = false);
 	void retrace(bool * OK);
+
 private:
-	Game_Data * gameData;
+	Map * map;
+	QGraphicsScene * scene;
+
 	QPointF globStart;
 	QPointF globFinish;
 	int nextId;
+	int m_missingAliens;
+
 };
 
 #endif // ALIENS_H