Modify the new assessment level, add a new bullet attribute.

4 files changed, 10 insertions, 7 deletions

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 52255fd..f62d946 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -12,8 +12,10 @@ Pre-Released versions:
 First two assessment levels.
 Two more assessment levels...
 Tow _more_ assessment levels......
+Another assessment level...
 Modify player attribute.
 Allow bullet to kill itself at a certain point.
+Add extborder attribute.
 Finish assessment system framework.
 Add circ2pnt.
 
diff --git a/global.h b/global.h
index a4e1fa1..3016e62 100644
--- a/global.h
+++ b/global.h
@@ -88,7 +88,7 @@ public:
 	int whirem,whiskp,yelbrk;
 	int exp1,exp2;
 	double lifetime,rot;
-	bool scollable,collable;
+	bool scollable,collable,extborder;
 	double scale;int effbrk;
 	TColors alterColor,alterColor2;
 	void redir(vector2d targ)
diff --git a/levels.h b/levels.h
index 3ee9ed9..ce52a5f 100644
--- a/levels.h
+++ b/levels.h
@@ -3799,12 +3799,11 @@ void Levelm2Part12()
 	{
 		for(int i=0;i<6;++i)
 		{
-			int pnt=CreateBullet2(400+305*cos(assrad+i*pi/3),305+280*sin(assrad+i*pi/3),1.5,0);
-			double r2=275.0f*(assetime/120.0f);
-			r2=305-r2;double r3=r2;
-			if(r2<1)r2=1;
+			int pnt=CreateBullet2(400+500*cos(assrad+i*pi/3),300+500*sin(assrad+i*pi/3),1.5,0,true);
+			double r2=495.0f*(assetime/120.0f);r2=500-r2;
 			bullet[pnt].redir(vector2d(400+r2*cos(assrad+i*pi/3),300+r2*sin(assrad+i*pi/3)));
-			bullet[pnt].limpos=vector2d(400+r3*cos(assrad+i*pi/3),300+r3*sin(assrad+i*pi/3));
+			bullet[pnt].limpos=vector2d(400+r2*cos(assrad+i*pi/3),300+r2*sin(assrad+i*pi/3));
+			bullet[pnt].extborder=true;
 		}
 		tbrk=0;assrad+=pi/60;
 	}
diff --git a/towernbullet.h b/towernbullet.h
index 71de714..22c735b 100644
--- a/towernbullet.h
+++ b/towernbullet.h
@@ -67,6 +67,7 @@ int CreateBullet2(double x,double y,double bs,double rad,bool eff=false,bool inv
 	}
 	bullet[i].exist=true;
 	bullet[i].addblend=false;
+	bullet[i].extborder=false;
 	bullet[i].inv=invi;
 	bullet[i].bullettype=2;
 	bullet[i].bulletpos.x=x;
@@ -413,7 +414,8 @@ void ProcessBullet2(int i)
 	else
 	{
 		double dis=GetDist(bullet[i].bulletpos,playerpos);
-		if (bullet[i].bulletpos.x<=-25||bullet[i].bulletpos.x>=825||bullet[i].bulletpos.y<=-25||bullet[i].bulletpos.y>=625)
+		if ((!bullet[i].extborder&&(bullet[i].bulletpos.x<=-25||bullet[i].bulletpos.x>=825||bullet[i].bulletpos.y<=-25||bullet[i].bulletpos.y>=625))||
+			(bullet[i].extborder&&(bullet[i].bulletpos.x<=-225||bullet[i].bulletpos.x>=1025||bullet[i].bulletpos.y<=-225||bullet[i].bulletpos.y>=825)))
 		{
 			bullet[i].exist=false;
 			bullet[i].bulletpos.x=bullet[i].bulletpos.y=-999;