summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-02-27 23:19:43 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-02-27 23:19:43 +0000
commit56a12849b23672dff8a8bc8178cc62959bd99a54 (patch)
tree74a73be4b0b8ad6c9aacc08e5e0ae65f844b0480
parent17276fa13b40614cb682c2afb83717ae06e75e0e (diff)
downloadbullet-lab-remix-56a12849b23672dff8a8bc8178cc62959bd99a54.tar.xz
r20! This is a bug fix revision, fixing a bug in Level3.
-rwxr-xr-xCHANGELOG.TXT2
-rw-r--r--levels.h16
2 files changed, 14 insertions, 4 deletions
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index f290a26..589d7ec 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -15,6 +15,8 @@ The real changelog is here:
New level "interference" (it's another small class "SimpleThing").
New level "diffraction" (yet another dull class).
New background interface, use background pictures easily.
+Fix a small glitch in Level3Part3-4. This level won't run correctly
+under Low FPS Mode.
Minor code cleanups.
Removed more useless comments, my code is still hard to comprehend,
though.
diff --git a/levels.h b/levels.h
index 311030f..a300fcd 100644
--- a/levels.h
+++ b/levels.h
@@ -488,7 +488,7 @@ public:
}
void stage1()
{
- ++cf;
+ cf+=(LOWFPS?17:1);
rad1=srad+dtrad*cf;rad2=srad-dtrad2*cf;
for (int i=0;i<cnt;++i)
if (Bul[i]->bullettype==8)
@@ -500,10 +500,18 @@ public:
}
if (cf>delay)
{
+ cf=delay;
+ rad1=srad+dtrad*cf;rad2=srad-dtrad2*cf;
for (int i=0;i<cnt;++i)
if (Bul[i]->bullettype==8)
- Bul[i]->bulletspeed=2,Bul[i]->redir(vector2d(400,300)),
- Bul[i]->bulletdir=vector2d(-Bul[i]->bulletdir.x,-Bul[i]->bulletdir.y);
+ {
+ if (i&1)
+ Bul[i]->bulletpos=vector2d(400+(drange+(cnt-i)*dtrange)*cos(rad1-pi),300+(drange+(cnt-i)*dtrange)*sin(rad1-pi));
+ else
+ Bul[i]->bulletpos=vector2d(400+(drange+(cnt-i)*dtrange)*cos(rad2-pi),300+(drange+(cnt-i)*dtrange)*sin(rad2-pi));
+ Bul[i]->bulletspeed=2,Bul[i]->redir(vector2d(400,300)),
+ Bul[i]->bulletdir=vector2d(-Bul[i]->bulletdir.x,-Bul[i]->bulletdir.y);
+ }
stage=2;
}
}
@@ -599,7 +607,7 @@ void Level3Part5()
IfShowTip=false;
FadeTip=false;
Current_Position=2;
- All2pnt();
+ All2pnt();BTarg.TargHide();
ShowTip("Well, here is a...");
return;
}