Git and markdown sucks...

8 files changed, 96 insertions, 65 deletions

diff --git a/README.md b/README.md
index cf9196d..fb12047 100644
--- a/README.md
+++ b/README.md
@@ -15,16 +15,27 @@ Building is tested on debian sid and Arch Linux.
 Current working status:
 
 > the BLR Script VM:	90%
+>
 > VM functions:			40%
+>
 > the BLR js VM:		0%
+>
 > bullet system:		40%
+>
 > tower system:			0%
+>
 > laser system:			0%
+>
 > the player:			40%
+>
 > menus:				30%
+>
 > plugin system & api:	5%
+>
 > console:				0%
+>
 > score & record:		0%
+>
 > master:				60%
 
 If you are looking for older BLR releases, please
@@ -41,8 +52,11 @@ of the BSD license.
 
 ## About the releases
 BLR 1 - The Creature of Colour was completed in early 2014.
+
 BLR 2 - The Reunion of Rainbow was completed in late 2014.
+
 BLR 3 - Mind in Circuits was started in June 2015 and is now in active development.
+
 BLR 3.5 - Assessment Collection has been planned.
 
 Only the mainline will stay in the root directory of the repo,
diff --git a/src/core/bullet.cpp b/src/core/bullet.cpp
index 15cfef0..0bcf2d9 100644
--- a/src/core/bullet.cpp
+++ b/src/core/bullet.cpp
@@ -54,7 +54,6 @@ void bulletBonus::update()
 {
 	if(!exist)return;
 	vel=vel+acc;
-	if(vel.l()>velim&&velim>0)vel=velim*vel.getNormalized();
 	pos=pos-vel;
 	if((pos-player->pos).l()<9)exist=false;
 
diff --git a/src/core/vmrunner.cpp b/src/core/vmrunner.cpp
index 5569b1c..43fe1f5 100644
--- a/src/core/vmrunner.cpp
+++ b/src/core/vmrunner.cpp
@@ -95,7 +95,7 @@ int blrScriptVM::loadLSBFromMemory(const char *ptr,DWORD size)
 				if(!infunc)return 1;
 				infunc=0;
 			break;
-			case 0x0F:
+			case 0x0F: case 0x25: case 0x26:
 				if(!infunc)return 1;
 			break;
 			case 0x01: case 0x0C: case 0x0D:
@@ -108,7 +108,7 @@ int blrScriptVM::loadLSBFromMemory(const char *ptr,DWORD size)
 			case 0x03: case 0x04: case 0x05:
 			case 0x06: case 0x07: case 0x08:
 			case 0x09: case 0x0A: case 0x0B:
-			case 0x22: case 0x23:
+			case 0x22: case 0x23: case 0x24:
 				if(!infunc)return 1;
 				readPara(&inst[ic].para1);
 				readPara(&inst[ic].para2);
@@ -270,7 +270,24 @@ void blrScriptVM::vmRunFunction(const char *fncnym)
 				if(fetchData(inst[cur].para1).nez())
 					cur=fetchData(inst[cur].para2).i(),jmp=1;
 			break;
+			case 0x24:
+				if(fetchData(inst[cur].para1).nez())
+				{
+					lpjmp[lops]=cur;
+					lppos[lops++]=fetchData(inst[cur].para2);
+				}
+				else cur=fetchData(inst[cur].para2).i()+1,jmp=1;
+			break;
+			case 0x25:
+				if(!lops)throw;
+				cur=lppos[--lops]+1,jmp=1;
+			break;
+			case 0x26:
+				if(!lops)throw;
+				cur=lppos[--lops],jmp=1;
+			break;
 		}
+		if(cur==lppos[lops-1])cur=lpjmp[--lops],jmp=1;
 		if(!jmp)++cur;
 	}
 }
@@ -283,6 +300,7 @@ void blrScriptVM::vmInit(unsigned int seed)
 	for(int i=0;i<10000;++i)ra[i].type=1,ia[i].type=0;
 	re=new smRandomEngine;
 	re->setSeed(seed);
+	lops=0;
 }
 void blrScriptVM::vmDeinit()
 {
diff --git a/src/core/vmrunner.hpp b/src/core/vmrunner.hpp
index 502ac4a..75df767 100644
--- a/src/core/vmrunner.hpp
+++ b/src/core/vmrunner.hpp
@@ -28,7 +28,7 @@ private:
 	Idata ir[101],ia[10000];
 	Idata rr[103],ra[10000];
 	SInst inst[65537];
-	int ic,fncnt,pinst;
+	int ic,fncnt,pinst,lops,lppos[8],lpjmp[8];
 	fncEntry fncent[8];
 	const unsigned char *sbyte,*cbyte;
 	DWORD fsize;
@@ -37,7 +37,7 @@ private:
 	Idata& fetchData(SPara para,bool forcerw=false);
 public:
 	smRandomEngine* re;
-	blrScriptVM(){ic=fncnt=pinst=0;}
+	blrScriptVM(){ic=fncnt=pinst=lops=0;}
 	int loadLSBFromMemory(const char* ptr,DWORD size);
 	int getInstCount();
 	void vmRunFunction(const char *fncnym);
diff --git a/src/main.cpp b/src/main.cpp
index 3a5690d..e890911 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,7 +33,7 @@ int main(int argc,char **argv)
 	sm=smGetInterface(SMELT_APILEVEL);
 	sceneMgr=new sceneManager;
 	resourcesLoad();
-	sm->smVidMode(960,720,true);
+	sm->smVidMode(1280,720,true);
 	sm->smUpdateFunc(update);
 	sm->smFocFunc(foc);sm->smUnFocFunc(unfoc);
 	sm->smWinTitle("Bullet Lab Remix 3");
diff --git a/src/ui/menuframework/menuframework.hpp b/src/ui/menuframework/menuframework.hpp
index 1879686..61e246b 100644
--- a/src/ui/menuframework/menuframework.hpp
+++ b/src/ui/menuframework/menuframework.hpp
@@ -22,7 +22,7 @@ public:
 	menuCtrlLCD(int _id,int mw,smBMFont *font)
 	{
 		sm=smGetInterface(SMELT_APILEVEL);enabled=true;keyPressedf=NULL;
-		color=0xFFFFFFFF;id=_id;maxw=mw;fnt=font;skv=0;next=last=NULL;
+		color=0xFFFFFFFF;id=_id;maxw=mw;fnt=font;skv=skd=0;next=last=NULL;
 	}
 	virtual ~menuCtrlLCD(){sm->smRelease();}
 	void render(float x,float y);
diff --git a/tools/lsrc/junko.lsr b/tools/lsrc/junko.lsr
index df0f3ce..e66f4b3 100644
--- a/tools/lsrc/junko.lsr
+++ b/tools/lsrc/junko.lsr
@@ -11,18 +11,18 @@ add		i00		1		;++i00
 mov		i05		i00		;if(i00<=2560)
 sub		i05		2560
 elz		i05
-jnz		i05		40		;do not enter st4========================
+jnz		i05		+26		;do not enter st4========================
 add		i04		1		;++i04
 mov		i05		i04		;if(i04<8)
 sub		i05		8
 ltz		i05
-jnz		i05		40		;do not shoot st4 bullets================
+jnz		i05		+21		;do not shoot st4 bullets================
 mov		i04		0
 mov		i06		0		;for(i06=0;i06<25;++i06)
 mov		i07		i06
 sub		i07		25
 ltz		i07
-jez		i07		40		;========================================
+jez		i07		+15		;========================================
 mov		r00		i06
 mul		r00		0.251327412
 add		r00		1.570796327
@@ -36,17 +36,17 @@ push	3
 push	irt
 call	setBulletPropi
 add		i06		1
-jmp		22				;========================================
+jmp		-17				;========================================
 nop						;end of loop
 mov		i05		i00		;if(i00<=1536)
 sub		i05		1536
 elz		i05
-jnz		i05		138		;do not enter st3========================
+jnz		i05		+94		;do not enter st3========================
 add		i03		1		;++i03
 mov		i05		i03		;if(i03<64)
 sub		i05		64
 ltz		i05
-jnz		i05		138		;do not shoot st3 bullets================
+jnz		i05		+89		;do not shoot st3 bullets================
 mov		i03		0
 push	250.0			;get random source1
 push	150.0
@@ -64,7 +64,7 @@ mov		i06		0		;for(i06=0;i06<60;++i06)
 mov		i07		i06
 sub		i07		60
 ltz		i07
-jez		i07		94		;========================================
+jez		i07		+27		;========================================
 mov		r00		i06
 mul		r00		0.104719755
 sub		r00		r03
@@ -90,7 +90,7 @@ push	3
 push	irt
 call	setBulletPropi
 add		i06		1
-jmp		64				;========================================
+jmp		-29				;========================================
 nop						;end of loop1
 push	650.0			;get random source2
 push	550.0
@@ -108,7 +108,7 @@ mov		i06		0		;for(i06=0;i06<60;++i06)
 mov		i07		i06
 sub		i07		60
 ltz		i07
-jez		i07		138		;========================================
+jez		i07		+27		;========================================
 mov		r00		i06
 mul		r00		0.104719755
 sub		r00		r03
@@ -134,17 +134,17 @@ push	3
 push	irt
 call	setBulletPropi
 add		i06		1
-jmp		108				;========================================
+jmp		-29				;========================================
 nop						;end of loop2
 mov		i05		i00		;if(i00<=512)
 sub		i05		512
 elz		i05
-jnz		i05		236		;do not enter st2========================
+jnz		i05		+94		;do not enter st2========================
 add		i02		1		;++i02
 mov		i05		i02		;if(i02<32)
 sub		i05		32
 ltz		i05
-jnz		i05		236		;do not shoot st2 bullets================
+jnz		i05		+89		;do not shoot st2 bullets================
 mov		i02		0
 push	250.0			;get random source1
 push	150.0
@@ -162,7 +162,7 @@ mov		i06		0		;for(i06=0;i06<10;++i06)
 mov		i07		i06
 sub		i07		10
 ltz		i07
-jez		i07		192		;========================================
+jez		i07		+27		;========================================
 mov		r00		i06
 mul		r00		0.628318531
 sub		r00		r03
@@ -188,7 +188,7 @@ push	3
 push	irt
 call	setBulletPropi
 add		i06		1
-jmp		162				;========================================
+jmp		-29				;========================================
 nop						;end of loop1
 push	650.0			;get random source2
 push	550.0
@@ -206,7 +206,7 @@ mov		i06		0		;for(i06=0;i06<10;++i06)
 mov		i07		i06
 sub		i07		10
 ltz		i07
-jez		i07		236		;========================================
+jez		i07		+27		;========================================
 mov		r00		i06
 mul		r00		0.628318531
 sub		r00		r03
@@ -232,13 +232,13 @@ push	3
 push	irt
 call	setBulletPropi
 add		i06		1
-jmp		206				;========================================
+jmp		-29				;========================================
 nop						;end of loop2
 add		i01		1		;++i01,stage 1
 mov		i05		i01		;if(i01<16)
 sub		i05		16
 ltz		i05
-jnz		i05		286		;do not shoot st1 bullets================
+jnz		i05		+45		;do not shoot st1 bullets================
 mov		i01		0
 push	450.0			;get random source1
 push	350.0
@@ -256,7 +256,7 @@ mov		i06		0		;for(i06=0;i06<28;++i06)
 mov		i07		i06
 sub		i07		28
 ltz		i07
-jez		i07		286		;========================================
+jez		i07		+27		;========================================
 mov		r00		i06
 mul		r00		0.224399475
 sub		r00		r03
@@ -282,6 +282,6 @@ push	3
 push	irt
 call	setBulletPropi
 add		i06		1
-jmp		256				;========================================
+jmp		-29				;========================================
 nop						;end of loop
 ,
\ No newline at end of file
diff --git a/tools/lsrc/lsrc.cpp b/tools/lsrc/lsrc.cpp
index a31d248..56ffe96 100644
--- a/tools/lsrc/lsrc.cpp
+++ b/tools/lsrc/lsrc.cpp
@@ -5,7 +5,7 @@
  * 2. DO NOT USE STL!
  * 3. if you don't like the rules above, you can ignore them though...
  */
-//parser: prehistoric version.
+//parser: primitive version.
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -26,13 +26,13 @@
  * type=8 : function name
  */
 SInst result[65537];
-int infunc,lc;
+int infunc,lc,lops,lppos[8];
 char line[256],fst[16];
-void error(const char *szFormat, ...)
+void error(const char *szFormat,...)
 {
 	va_list ap;
-	va_start(ap, szFormat);
-	vfprintf(stderr, szFormat, ap);
+	va_start(ap,szFormat);
+	vfprintf(stderr,szFormat,ap);
 	va_end(ap);
 	fprintf(stderr,"\n");
 	exit(1);
@@ -44,9 +44,9 @@ int hexBit(char b)
 	if(b>='A'&&b<='F')return b-'A'+10;
 	return -1;
 }
-Udata parseNumber(char *l,char *r,int mode)//0:real, 1:int
+Udata parseNumber(char *l,char *r,int mode)//0:real, 1:int, 2:linenum
 {
-	int i=0,m=1;double d=0,mlt=0.1;Udata res;
+	int i=0,m=1,absln=1;double d=0,mlt=0.1;Udata res;
 	char *c=l;res.d=0LL;
 	if(*c=='x')
 	{
@@ -55,10 +55,12 @@ Udata parseNumber(char *l,char *r,int mode)//0:real, 1:int
 		if(c!=r){res.r=nan("");return res;}
 		res.i=m*i;return res;
 	}
-	if(*c=='-')m=-1,++c;
+	if(*c=='+')m=1,++c,absln=0;
+	if(*c=='-')m=-1,++c,absln=0;
 	for(;*c>='0'&&*c<='9'&&c!=r;++c)i*=10,i+=*c-'0';
-	if(c==r){res.i=m*i;return res;}
-	if(*c!='.'||mode==1){res.r=nan("");return res;}
+	if(c==r)
+	{mode==2?res.i=(absln?m*i:lc+m*i):mode==1?res.i=m*i:res.r=(double)m*i;return res;}
+	if(*c!='.'||mode!=0){res.r=nan("");return res;}
 	++c;
 	for(;*c>='0'&&*c<='9'&&c!=r;++c)d+=(*c-'0')*mlt,mlt*=0.1;
 	if(c!=r){res.r=nan("");return res;}
@@ -74,6 +76,7 @@ int parsePara(char *cont,char *contr,SPara *para,int mode)
  * 5:real only				<-shouldn't this accept all?...
  * 6:real register only
  * 7:function name
+ * 8:line number
  */
 {
 	para->type=-1;
@@ -155,7 +158,7 @@ int parsePara(char *cont,char *contr,SPara *para,int mode)
 		return 0;
 	}
 	if(mode==1||mode==4||mode==6)return 1;
-	Udata tryi=parseNumber(cont,contr,1);
+	Udata tryi=mode==8?parseNumber(cont,contr,2):parseNumber(cont,contr,1);
 	Udata tryr=parseNumber(cont,contr,0);
 	if(isnan(tryr.r))return 1;
 	if(isnan(tryi.r)&&mode==3)return 1;
@@ -181,7 +184,8 @@ int parseInstruction(char *line,SInst *inst)
 	bindInst("gtz",0x13);bindInst("egz",0x14);
 	bindInst("eqz",0x15);bindInst("nez",0x16);
 	bindInst("jmp",0x21);bindInst("jez",0x22);
-	bindInst("jnz",0x23);
+	bindInst("jnz",0x23);bindInst("for",0x24);
+	bindInst("brk",0x25);bindInst("cont",0x26);
 #undef bindInst
 	if(~r)inst->id=r;else return r=inst->id=0;
 	char second[16],third[16];
@@ -227,13 +231,21 @@ int parseInstruction(char *line,SInst *inst)
 			return parsePara(second,second+strlen(second),&inst->para1,1);
 		case 0x21:
 			sscanf(line,"%*s%s",second);
-			return parsePara(second,second+strlen(second),&inst->para1,2);//should be const int...
+			return parsePara(second,second+strlen(second),&inst->para1,8);
 		case 0x22:
 		case 0x23:
+		case 0x24:
 			sscanf(line,"%*s%s%s",second,third);
-			return
+			bool ret=
 			parsePara(second,second+strlen(second),&inst->para1,1)||
-			parsePara(third,third+strlen(third),&inst->para2,2);
+			parsePara(third,third+strlen(third),&inst->para2,8);
+			if(r==0x24)
+			{
+				lppos[lops++]=inst->para2.data.i;
+				if(lppos[lops-1]>lppos[lops-2])
+				error("intersecting loops?");
+			}
+			return ret;
 	}
 	return 0;
 }
@@ -250,9 +262,10 @@ void compile()
 		for(unsigned i=0;i<strlen(line);++i)
 		if(line[i]==';'||line[i]==0x0A){line[i]='\0';}
 		++lc;
+		if(lops>0&&lc==lppos[lops-1])--lops;
 		if(line[0]=='.')
 		{
-			if(infunc)error("error at line %d: no subroutine supported.",lc);
+			if(infunc)error("error at line %d: subroutine is not supported.",lc);
 			infunc=1;result[lc].id=0xFF;
 			result[lc].para1.type=8;
 			result[lc].para1.fnc=(char*)calloc(16,sizeof(char));
@@ -264,6 +277,9 @@ void compile()
 			infunc=0;result[lc].id=0xFE;
 		}else
 		if(parseInstruction(line,&result[lc]))error("error at line %d.",lc);
+		if(result[lc].id==0x25||result[lc].id==0x26)
+		if(!lops)error("%s is only allowed to be used within a loop.",
+		result[lc].id==0x25?"brk":"cont");
 		if(!infunc&&result[lc].id&&result[lc].id<0xFE)error("error at line %d:\
  no instrunctions except nops are allowed out of a function.",lc);
 	}
@@ -281,16 +297,16 @@ void writePara(SPara a)
 		c[i]=d&und;c[i]>>=shft;
 		und<<=8LL;shft+=8LL;
 	}
-	fprintf(stderr,"writtend lld: %lld=0x%llx\n0x",d,d);
-	for(int i=startbit;i<8;++i)fprintf(stderr,"%llx",c[i]);
-	fprintf(stderr,"\n");
+	//fprintf(stderr,"writtend lld: %lld=0x%llx\n0x",d,d);
+	//for(int i=startbit;i<8;++i)fprintf(stderr,"%llx",c[i]);
+	//fprintf(stderr,"\n");
 	for(int i=startbit;i<8;++i)fputc((int)c[i],stdout);
 }
 void writeResult()
 {
 	for(int i=1;i<=lc;++i)
 	{
-		fprintf(stderr,"InstID=0x%X\n",result[i].id);
+		//fprintf(stderr,"InstID=0x%X\n",result[i].id);
 		switch(result[i].id)
 		{
 			case 0xFF: case 0x02:
@@ -299,6 +315,7 @@ void writeResult()
 				fputs(result[i].para1.fnc,stdout);
 				break;
 			case 0x00: case 0x0F: case 0xFE:
+			case 0x25: case 0x26:
 				fputc(result[i].id,stdout);
 				break;
 			case 0x01: case 0x0C: case 0x0D:
@@ -311,7 +328,7 @@ void writeResult()
 			case 0x03: case 0x04: case 0x05:
 			case 0x06: case 0x07: case 0x08:
 			case 0x09: case 0x0A: case 0x0B:
-			case 0x22: case 0x23:
+			case 0x22: case 0x23: case 0x24:
 				fputc(result[i].id,stdout);
 				writePara(result[i].para1);
 				writePara(result[i].para2);
@@ -319,25 +336,8 @@ void writeResult()
 		}
 	}
 }
-int main(int argc,char** argv)//for test purpose...
+int main(int argc,char** argv)
 {
-	/*char *test;
-	test=(char*)"1234";
-	Udata d=parseNumber(test,test+strlen(test),0);
-	printf("%d %X %f\n",d.i,d.i,d.r);
-	test=(char*)"r12";
-	SPara a;
-	printf("result=%d\n",parsePara(test,test+strlen(test),&a,0));
-	printf("type=%d\n",a.type);
-	printf("data.i=%d\n",a.data.i);
-	printf("data.r=%f\n",a.data.r);
-	test=(char*)"call orz617274873";
-	SInst itest;
-	puts("Instruction cache test...");
-	printf("result=%d\n",CacheStatement(test,&itest));
-	printf("id=%d\n",itest.id);
-	printPara(itest.para1);
-	printPara(itest.para2);*/
 	if(argc<3)return puts("Usage: lsrc <input file> <output file>"),0;
 	freopen(argv[1],"r",stdin);
 	compile();