From 68784b7e9e1bb29b9fd0e2619b065f0a4ee77e44 Mon Sep 17 00:00:00 2001
From: buull <wapmobil@gmail.com>
Date: Mon, 23 Aug 2010 14:43:58 +0300
Subject: [PATCH] same as previous (fixed build errors)

---
 adcore.cpp   | 2 +-
 splashes.cpp | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/adcore.cpp b/adcore.cpp
index 974e21d..f13ea13 100644
--- a/adcore.cpp
+++ b/adcore.cpp
@@ -6,7 +6,7 @@ adCore::adCore(QObject *parent) :
 	step = 0;
 	//admap = new Map(1);
 	//addata = new Game_Data(admap);
-	adload = new Loader();
+	adloader = new Loader();
 	//admap->load();
 	//adload->create();
 	//adload->readAliens();
diff --git a/splashes.cpp b/splashes.cpp
index deaa424..86b6dbd 100644
--- a/splashes.cpp
+++ b/splashes.cpp
@@ -58,14 +58,14 @@ void Splashes::AddSplash(srcSplashType src, int index, TowerType tw)
 		spl.AlienId = -1;
 	spl.destination = gameData->curAliens.value(tw.aim).pos;
 	spl.angle = tw.angle;
-	spl.pos = tw.pos; // FIXME: pos not in center/left angle of tower
+	spl.pos = tw.pos; // FIXME: pos not in center or left-angle of tower
 	spl.imgType = src.imgType;
 	spl.life = 0;
 	spl.src = index;
 	TriggerType trig;
 	for(int i; i<src.triggerIndexes.size(); i++)
 	{
-		trig.timer = gameData->players.at(tw.PlayerId)->srcTowers.at(tw.src).triggers.at(src.triggerIndexes.at(i));
+		trig.timer = gameData->players.at(tw.PlayerId)->srcTowers.at(tw.src).triggers.at(src.triggerIndexes.at(i)).timer;
 		trig.src = src.triggerIndexes.at(i);
 		spl.triggers.push_back(trig);
 	}
@@ -97,6 +97,5 @@ void Splashes::update()
 			src = gameData->srcSplashes.at(spl.src);
 		// TODO: calculate new angle and pos....
 		// TODO: activate trigger and more...
-		}
 	}
 }