I think finished structures

and some changes in loading
and changes in map class
we have 2 TODO now

base_types.h

@@ -37,7 +37,8 @@ struct srcAlienType
 struct TowerType
 {
 	int src;
-	int AlienId; // aim alien
+	int aim; // aim alien Id
+	int oldAim;
 	int PlayerId; // tower's owner
 	int imgType;
 	QPoint pos; // not QPointF because tower fixed on grid
@@ -100,7 +101,6 @@ struct SplashType
 	int imgType;
 	int src;
 	QPoint TowerId; // parent tower (-1;-1) for null parent
-	int PlayerId;
 	int AlienId; // aim alien (different from tower.AlienId)
 	QPointF destination;
 	int life; // in ticks
@@ -109,13 +109,13 @@ struct SplashType
 };
 
 
-struct Wave
+struct WaveType
 {
 	int Id;
 	QList <int> types; // some types of aliens (e.g. 2 fly and 3 grount in one wave)
 	QList <int> counts; // count aliens of each type
-	int wait_time; // time in ticks
-	unsigned int gold;
+	unsigned int timeout; // time in ticks
+	unsigned int prise;
 };