same as previous (fixed build errors)
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
@@ -98,5 +98,4 @@ void Splashes::update()
|
||||
// TODO: calculate new angle and pos....
|
||||
// TODO: activate trigger and more...
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user