summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-14 08:13:15 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-14 08:13:15 +0000
commitf2ce3ddfcb72fc3026ba85bd41849fa1886877e4 (patch)
treedb8394827401d08d770a018e72dd83fc1faa2b91
parentf9be9921e9c345549f7d506262dfde19bcc72088 (diff)
downloadbullet-lab-remix-f2ce3ddfcb72fc3026ba85bd41849fa1886877e4.tar.xz
Extend the wiki page, finish the new level.
-rw-r--r--levels.h4
-rw-r--r--towernbullet.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/levels.h b/levels.h
index f54dd1f..86b78cd 100644
--- a/levels.h
+++ b/levels.h
@@ -3304,9 +3304,9 @@ void Levelm1Part16()
if(!fyg[i].isActive())
{
if(frameleft>AMinute)
- fyg[i].Init(12,2.25-1.25*(frameleft/(double)(AMinute+ThirtySeconds)));
+ fyg[i].Init(12,2.5-1.5*(frameleft/(double)(AMinute+ThirtySeconds)));
else
- fyg[i].Init(18,2.25-1.25*(frameleft/(double)(AMinute+ThirtySeconds)));
+ fyg[i].Init(36,2.5-1.5*(frameleft/(double)(AMinute+ThirtySeconds)));
break;
}
}
diff --git a/towernbullet.h b/towernbullet.h
index 7331f9d..5bf3226 100644
--- a/towernbullet.h
+++ b/towernbullet.h
@@ -2612,9 +2612,9 @@ public:
bool done=true;
for (int i=0;i<100;++i)
{
- if(ylw[i]&&ylw[i]->lifetime>2&&!dirdone[i])
+ if(ylw[i]&&ylw[i]->lifetime>2&&!dirdone[i]&&ylw[i]->alterColor==yellow)
ylw[i]->redir(playerpos),dirdone[i]=true;
- if(ylw[i]&&ylw[i]->lifetime>5)
+ if(ylw[i]&&ylw[i]->lifetime>5&&ylw[i]->alterColor==yellow)
{
int cc=re.NextInt(0,5);
for(int j=0;j<cc;++j)