aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-31 13:56:42 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-31 13:56:42 +0000
commit61046ec4750a84f4651a247456cc9271e4f57757 (patch)
tree7cfdcbbac424175a5d7cccb47732bf5f76dc6eb4
parent6f6d2d2b4612869aa3b9be0af9a8e1d76182a8dc (diff)
downloadbullet-lab-remix-61046ec4750a84f4651a247456cc9271e4f57757.tar.xz
A new level... draft.
-rwxr-xr-xCHANGELOG.TXT1
-rw-r--r--global.h2
-rw-r--r--levels.h38
-rw-r--r--main.cpp2
4 files changed, 41 insertions, 2 deletions
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 94242b2..d0d8133 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -12,6 +12,7 @@ Pre-Released versions:
Bump version!
New assessment level "density test"...
New assessment level "pinball"...
+New assessment level "Road blocks"...
Improve density test.
Add screen shot. Press S for a screen shot.
Fix the upside down screen shot output.
diff --git a/global.h b/global.h
index 1c3eb7b..e04a36d 100644
--- a/global.h
+++ b/global.h
@@ -272,7 +272,7 @@ int multbrk,multbat;
int frms;double averfps;
int plrspd,plrslospd;
int TenSeconds=10000,TwentySeconds=20000,ThirtySeconds=30000,AMinute=60000;
-int Infinity=999999999;
+int Infinity=1000000000;
int effskp=0;
hgeSprite *Credits,*CreditsRail;
int creditsp;double creditfly,creditacc,credbrk;
diff --git a/levels.h b/levels.h
index 58f0344..f2691bf 100644
--- a/levels.h
+++ b/levels.h
@@ -3531,7 +3531,7 @@ Good luck and go for the highest score!\
if (Current_Position==1)
{
if((DBGColor=ColorTransfer(DBGColor,0xFF1B2065))!=0xFF1B2065)frameleft=10;
- else{++part;bulcnt=0;return;}
+ else{++part;IfShowTip=true;bulcnt=0;return;}
}
}
Tower* dbtows[200];
@@ -3935,6 +3935,7 @@ void Levelm2Part17()
}
void Levelm2Part18()
{
+ frameleft=Infinity;
tbrk-=hge->Timer_GetDelta();
if(tbrk<0)
{
@@ -3952,3 +3953,38 @@ void Levelm2Part18()
for(int i=0;i<200;++i)
if(pinballs[i].Getlifetime()>0&&pinballs[i].Getlifetime()<10)pinballs[i].Update();
}
+void Levelm2Part19()
+{
+ frameleft=Infinity;
+ DisableAllTower=false;
+ if (IfShowTip)
+ {
+ IfShowTip=false;
+ FadeTip=false;
+ Current_Position=2;
+ ShowTip("Test 10 - Road blocks");
+ All2pnt();
+ return;
+ }
+ if (towcnt!=0)return ClearAll(false);
+ if(Current_Position==1)
+ {
+ ++part;tbrk=0;memset(pinballs,0,sizeof(pinballs));
+ }
+}
+void Levelm2Part20()
+{
+ frameleft=Infinity;
+ tbrk-=hge->Timer_GetDelta();
+ if(tbrk<0)
+ {
+ tbrk=1-0.25*(assetime/120.0f);if(tbrk<0.05)tbrk=0.05;
+ delx=re.NextDouble(300,600);
+ resvpos=re.NextInt(0,49);
+ for(int i=0;i<50;++i)
+ {
+ int pnt=CreateBullet2(810,12*i,1+2*assetime/180.0f,0,true);
+ if(abs(i-resvpos)<=3)bullet[pnt].limpos=vector2d(delx,12*i);
+ }
+ }
+}
diff --git a/main.cpp b/main.cpp
index 5c351f3..351a450 100644
--- a/main.cpp
+++ b/main.cpp
@@ -541,6 +541,8 @@ void CallLevels()
if (level==-2&&part==16)Levelm2Part16();
if (level==-2&&part==17)Levelm2Part17();
if (level==-2&&part==18)Levelm2Part18();
+ if (level==-2&&part==19)Levelm2Part19();
+ if (level==-2&&part==20)Levelm2Part20();
if (level==1&&part==5)level=2,part=0;
if (level==2&&part==10)