some improve game ui and bugfixes

This commit is contained in:
2011-09-11 01:26:06 +04:00
committed by unknown
parent 9f90c1e676
commit 714154a6fd
19 changed files with 363 additions and 392 deletions

View File

@@ -421,6 +421,12 @@ Game_Data * Loader::loadlevel(int id)
sst.compositionMode = tbs.compositionMode;
sst.keepOnAlien = tbs.keepOnAlien;
stt.splashes.append(sst);
stt.isRoot=true;
for (QMultiHash<int,tbMorph>::iterator m = morphs.begin();
m != morphs.end(); ++m)
{
if (tbt.id == (*m).toId) stt.isRoot=false;
}
int recursiveCheck = 1;
fillTowerChains(&animIds,&chlist,&trigIds,&stt,
tbt.splashId,0,&recursiveCheck);
@@ -440,10 +446,13 @@ Game_Data * Loader::loadlevel(int id)
break;
}
}
m.cost = tmh.cost;
m.expRequired = tmh.expRequired;
m.morph = (srcTowerType*)tollist.indexOf(j);
if (contain) morph_indexes[i].append(m);
if (contain)
{
m.cost = tmh.cost;
m.expRequired = tmh.expRequired;
m.morph = (srcTowerType*)tollist.indexOf(j);
morph_indexes[i].append(m);
}
}
for (int k=0; k<map->maxPlayers(); ++k)
gd->players[k]->srcTowers.append(stt);
@@ -464,7 +473,8 @@ Game_Data * Loader::loadlevel(int id)
QString morphtree;
foreach (srcTowerType i, gd->players[0]->srcTowers)
{
printMorphs(&i,morphtree,"");
if (i.isRoot)
printMorphs(&i,morphtree,"");
}
qDebug() << morphtree + "\n";