summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-08 02:50:31 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-08 02:50:31 +0000
commit12698ba3f7e585a2bc6d55d718495094d754eca4 (patch)
tree2ec34930867c654a0a4fcb5b0957dcf35b0530df
parentdb8f7ba0fb38194f47b0091249d7966f37792962 (diff)
downloadbullet-lab-remix-12698ba3f7e585a2bc6d55d718495094d754eca4.tar.xz
Fix a small problem in level2.
-rwxr-xr-xCHANGELOG.TXT2
-rw-r--r--levels.h10
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 4868d8f..56b6c9f 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -11,6 +11,8 @@ This release contains level 1~7 (while level -1/-2 are still
Changes:
Compress several png files.
Merge code for Windows.
+Fixed compile problems of Windows version.
+Small fixes of level2.
This build will be short-lived.
0.7.2-2_PR (b72)
diff --git a/levels.h b/levels.h
index 810ece3..9959b01 100644
--- a/levels.h
+++ b/levels.h
@@ -196,7 +196,7 @@ void Level2Part1()
//=======
CreateTower3_fixeddir(183.49,425,300,3,-pi);
CreateTower3_fixeddir(183.49,424,300,3,2.0f/3.0f*pi);
- for (int i=0;i<6;++i)fakes[i]=&bullet[CreateBullet6(400,300,0,999999999,1,1,false)];
+ for (int i=0;i<6;++i)fakes[i]=&bullet[CreateBullet6(400,300,0,999999999,1,1,false)],fakes[i]->inv=true;
++part;
}
void Level2Part2()
@@ -220,7 +220,7 @@ void Level2Part3()
{
frameleft=AMinute;
for (int i=0;i<6;++i)fakes[i]->exist=false;
- for (int i=0;i<6;++i)fakes[i]=&bullet[CreateBullet7(400,300,0,999999999,false)];
+ for (int i=0;i<6;++i)fakes[i]=&bullet[CreateBullet7(400,300,0,999999999,false)],fakes[i]->inv=true;
whicnt=3;clockrot=deltarot=0;++part;
}
void Level2Part4()
@@ -262,7 +262,7 @@ void Level2Part6()
double base=Level2Circle.GetRad();
double r=(Level2Circle.GetRange()+Level2Circle2.GetRange())/2.0f;
for (int i=0;i<6;++i)
- fakes[i]->bulletpos=vector2d(400+r*cos(base+i*pi/3.0f),300+r*sin(base+i*pi/3.0f));
+ fakes[i]->bulletpos=vector2d(400+r*cos(base+i*pi/3.0f),300+r*sin(base+i*pi/3.0f)),fakes[i]->inv=true;
if (L2D>=5)
{
L2D=0;
@@ -281,7 +281,7 @@ void Level2Part7()
double base=Level2Circle.GetRad();
double r=(Level2Circle.GetRange()+Level2Circle2.GetRange())/2.0f;
for (int i=0;i<6;++i)
- fakes[i]->bulletpos=vector2d(400+r*cos(base+i*pi/3.0f),300+r*sin(base+i*pi/3.0f));
+ fakes[i]->bulletpos=vector2d(400+r*cos(base+i*pi/3.0f),300+r*sin(base+i*pi/3.0f)),fakes[i]->inv=true;
if (L2D>=5)
{
L2D=0;
@@ -295,7 +295,7 @@ void Level2Part8()
{
frameleft=ThirtySeconds;L2D1=0;
playerLockY=false;
- for (int i=6;i<12;++i)fakes[i]=&bullet[CreateBullet6(400,300,0,999999999,1,1,false)];
+ for (int i=6;i<12;++i)fakes[i]=&bullet[CreateBullet6(400,300,0,999999999,1,1,false)],fakes[i]->inv=true;
++part;
}
void Level2Part9()