aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-07-14 02:16:11 +0000
committerGravatar chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb> 2014-07-14 02:16:11 +0000
commit4b221a977fcff61db744b422920d203e2773e787 (patch)
tree99933b8fe6ceca0460803349b9249789bdca4f46 /main.cpp
parent32a2523dd5c51b31b31f5e43a7cebdb16e7f5e84 (diff)
downloadbullet-lab-remix-4b221a977fcff61db744b422920d203e2773e787.tar.xz
Rev. 99! WTF?
THIS IS THE FINAL RELEASE CANDIDATE!!! Everything is frozen, that means no more new features will be added and no big changes will be made after this revision. Only bug fixes will be provided. //Again, "frozen" is a term borrowed from the Debian project and //is completely unrelated to Cirno! Tweak bullet9, shrink its removal border. Change Multpo texture, add spawning effect. Fix stubbed rankings. Update sprite sheet. Store assessment total elapsed time in the score file. Score files from older revisions shouldn't cause any errors but you may get "Time elapsed 0.00" in highscore details. If you've got any sort of OCD (Obsessive-compulsive disorder), just remove it. Document!!!
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index 033b4a8..0680e72 100644
--- a/main.cpp
+++ b/main.cpp
@@ -302,7 +302,7 @@ void CallLevels()
{
//Use this to call level procedures.
if((mode==1)&&coll!=0){deathMenu.Init(-200);return;}
- if((mode==2)&&coll!=0){assetime=0;++part;coll=0;IfCallLevel=IfShowTip=true;return;}
+ if((mode==2)&&coll!=0){asts+=assetime;assetime=0;++part;coll=0;IfCallLevel=IfShowTip=true;return;}
if(!IfCallLevel) return;
if(mode==2)assetime+=hge->Timer_GetDelta();
//Check Complete here
@@ -693,7 +693,7 @@ bool FrameFunc()
case 1:
playerpos.x=400,playerpos.y=400,playerrot=0;
frameleft=ThirtySeconds;infofade=0xFF;Dis8ref=t8special=false;
- level=-2,part=0;frms=0,averfps=0.0;bsscale=1;assetime=0;
+ level=-2,part=0;frms=0,averfps=0.0;bsscale=1;assetime=asts=0;
if(bullet){free(bullet);bullet=NULL;}
towcnt=bulcnt=0;whrcnt=12;skyactive=false;PlayerSplit=false;
score=0;Mult_Init();Music_Init("./Resources/Music/CanonTechno.ogg");
@@ -1238,6 +1238,8 @@ int main(int argc,char *argv[])
snd=hge->Effect_Load("./Resources/tap.ogg");
menuin=hge->Effect_Load("./Resources/menuin.ogg");
menuout=hge->Effect_Load("./Resources/menuout.ogg");
+ if(!quad.tex||!SprSheet||!TexTitle||!TexCredits)
+ Error("Error Loading Resources!",true);
titlespr=new hgeSprite(TexTitle,0,0,640,320);
playerspr=new hgeSprite(SprSheet,0,24,24,24);
playerspr->SetHotSpot(12,12);
@@ -1245,8 +1247,6 @@ int main(int argc,char *argv[])
ATarg.Init(-0.001,vector2d(400,300));
BTarg.Init(-0.001,vector2d(400,300));
BTarg.targspr->SetColor(0xFFC00000);
- if(!quad.tex||!SprSheet||!TexTitle||!TexCredits)
- Error("Error Loading Resources!",true);
quad.blend=BLEND_ALPHABLEND | BLEND_COLORMUL | BLEND_NOZWRITE;
DBGColor=0xFFFFFFFF;
for(int i=0;i<4;i++)