summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-29 03:35:50 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-03-29 03:35:50 +0000
commit942d51394f85ba5c0d3a62338f9c4fbe19c194b6 (patch)
tree91ce88792b4fca495e7402b5d234915f5a703926
parentd37c7c7d2a6f4126eef87f3164b3f688f2db34e5 (diff)
downloadbullet-lab-remix-942d51394f85ba5c0d3a62338f9c4fbe19c194b6.tar.xz
New level, bump version.
-rwxr-xr-xCHANGELOG.TXT4
-rwxr-xr-xVERSION.TXT2
-rw-r--r--global.h2
-rw-r--r--levels.h43
-rw-r--r--main.cpp2
5 files changed, 46 insertions, 7 deletions
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 2907fac..9979d66 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -8,6 +8,10 @@ Random segmentation fault in "Hyper-threading".(seen only once,
can not reproduce now...)
Pre-Released versions:
+0.9.0-1_PR (b79)
+Bump version!
+New assessment level...
+
0.9.0-0_PR (b78)
First two assessment levels.
Two more assessment levels...
diff --git a/VERSION.TXT b/VERSION.TXT
index e56652f..92d025c 100755
--- a/VERSION.TXT
+++ b/VERSION.TXT
@@ -1 +1 @@
-0.9.0-0_PR (b78) \ No newline at end of file
+0.9.0-1_PR (b79) \ No newline at end of file
diff --git a/global.h b/global.h
index 3016e62..1c3eb7b 100644
--- a/global.h
+++ b/global.h
@@ -289,7 +289,7 @@ fFristStartUp,fFast;
int startLvl,startPrt,fFullScreen;
char alterLog[64];
//static const char* GLOBAL_H_FN="global.h";
-static const char* BLRVERSION="0.9.0-0_PR (b78)";
+static const char* BLRVERSION="0.9.0-1_PR (b79)";
void Throw(char *Filename,char *Info)
{
diff --git a/levels.h b/levels.h
index 774527c..c8abcc8 100644
--- a/levels.h
+++ b/levels.h
@@ -3825,10 +3825,6 @@ void Levelm2Part13()
if (towcnt!=0)return ClearAll(false);
if(Current_Position==1)
{
- for(int i=0;i<200;++i)
- if (asscircles[i].GetRange()>1e-7&&asscircles[i].GetRange()<800)
- asscircles[i].circ2pnt();
- memset(asscircles,0,sizeof(asscircles));
++part;tbrk=asssrd1=avacurbrk=0;
}
}
@@ -3864,9 +3860,46 @@ void Levelm2Part14()
if(assetime>120)
{
avacurbrk+=hge->Timer_GetDelta();
- if(avacurbrk>2)
+ if(avacurbrk>1)
CreateBullet6(re.NextDouble(0,800),re.NextDouble(0,600),2,0,1,12,true),
avacurbrk=0;
}
}
}
+int resvpos;
+void Levelm2Part15()
+{
+ frameleft=Infinity;
+ DisableAllTower=false;
+ if (IfShowTip)
+ {
+ IfShowTip=false;
+ FadeTip=false;
+ Current_Position=2;
+ ShowTip("Test 8 - Density test");
+ All2pnt();
+ return;
+ }
+ if (towcnt!=0)return ClearAll(false);
+ if(Current_Position==1)
+ {
+ ++part;tbrk=asssrd1=avacurbrk=0;resvpos=re.NextInt(0,49);
+ }
+}
+void Levelm2Part16()
+{
+ frameleft=Infinity;
+ tbrk-=hge->Timer_GetDelta();
+ if(tbrk<0)
+ {
+ tbrk=0.1-0.05*(assetime/120.0f);if(tbrk<0.05)tbrk=0.05;
+ for(int i=0;i<50;++i)
+ {
+ if(abs(i-resvpos)>2)
+ CreateBullet2(810,12*i,1+3*assetime/180.0f,0,true);
+ }
+ if(resvpos==0)resvpos+=re.NextInt(0,1);
+ else if(resvpos==49)resvpos+=re.NextInt(-1,0);
+ else resvpos+=re.NextInt(-1,1);
+ }
+}
diff --git a/main.cpp b/main.cpp
index 0a55988..38f474c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -537,6 +537,8 @@ void CallLevels()
if (level==-2&&part==12)Levelm2Part12();
if (level==-2&&part==13)Levelm2Part13();
if (level==-2&&part==14)Levelm2Part14();
+ if (level==-2&&part==15)Levelm2Part15();
+ if (level==-2&&part==16)Levelm2Part16();
if (level==1&&part==5)level=2,part=0;
if (level==2&&part==10)