X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=ce260d68a069fbebb7436a335fd38150b8ec7cc7;hb=8a1a91c0a10a37799dc95d423f9db8dc5ff7b965;hp=f4c3f6023c1ca303b93fa53b86de258f6c66145a;hpb=4530800e22022aaa7bb3172b3d23db69fc1661c5;p=lugaru.git diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index f4c3f60..ce260d6 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -36,6 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Animation.h" #include "Awards.h" +#include + using namespace std; // Added more evilness needed for MSVC @@ -301,7 +303,7 @@ static void ch_save(Game *game, const char *args){ player[0].rotation, player[0].targetrotation, player[0].num_weapons); if(player[0].num_weapons>0&&player[0].num_weapons<5) for(int j=0;j= 0 && which <= 15){ char buf[32]; - snprintf(buf, 32, "map%d", which + 1); + snprintf(buf, 32, "map%d", which + 1); // challenges Loadlevel(buf); }else Loadlevel("mapsave"); } void Game::Loadlevel(const char *name){ - static int oldlevel; int templength; float lamefloat; - int lameint; static const char *pfx = ":Data:Maps:"; char *buf; @@ -1453,8 +1448,6 @@ void Game::Loadlevel(const char *name){ tutorialmaxtime=1; } loadingstuff=1; - if(!firstload) - oldlevel=50; pause_sound(whooshsound); pause_sound(stream_firesound); @@ -1533,7 +1526,7 @@ void Game::Loadlevel(const char *name){ if(console){ emit_sound_np(consolesuccesssound); freeze=0; - console=0; + console=false; } if(!stealthloading){ @@ -1556,7 +1549,7 @@ void Game::Loadlevel(const char *name){ LoadingScreen(); } - weapons.numweapons=0; + weapons.clear(); funpackf(tfile, "Bi", &mapvers); if(mapvers>=15) @@ -1599,10 +1592,10 @@ void Game::Loadlevel(const char *name){ player[0].originalcoords=player[0].coords; if(player[0].num_weapons>0&&player[0].num_weapons<5) for(int j=0;j128||templength<=0) templength=128; @@ -1724,11 +1715,11 @@ void Game::Loadlevel(const char *name){ float maxdistance=0; float tempdist; - int whichclosest; + //~ int whichclosest; for(int i=0;imaxdistance){ - whichclosest=i; + //~ whichclosest=i; maxdistance=tempdist; } } @@ -1774,10 +1765,10 @@ void Game::Loadlevel(const char *name){ if(!removeanother){ if(player[i-howmanyremoved].num_weapons>0&&player[i-howmanyremoved].num_weapons<5){ for(int j=0;jmaxplayers-1) numplayers=maxplayers-1; for(int i=0;i unused -18 stereo configuration -*/ - -void Game::MenuTick(){ - //menu buttons - switch(mainmenu){ - case 1: - case 2: - if(Input::MouseClicked()&&selected==1){ - if(gameon) { - //resume - mainmenu=0; - pause_sound(stream_menutheme); - resume_stream(leveltheme); - } else { - fireSound(firestartsound); - flash(); - //new game - mainmenu=(accountactive?5:7); - selected=-1; - } - } - - if(Input::MouseClicked()&&selected==2){ - fireSound(); - flash(); - //options - mainmenu=3; - if(newdetail>2) newdetail=detail; - if(newdetail<0) newdetail=detail; - if(newscreenwidth>3000) newscreenwidth=screenwidth; - if(newscreenwidth<0) newscreenwidth=screenwidth; - if(newscreenheight>3000) newscreenheight=screenheight; - if(newscreenheight<0) newscreenheight=screenheight; - } - - if(Input::MouseClicked()&&selected==3){ - fireSound(); - flash(); - if(gameon){ - //end game - gameon=0; - mainmenu=1; - }else{ - //quit - tryquit=1; - pause_sound(stream_menutheme); - } - } - break; - case 3: - if(Input::MouseClicked()){ - - if(selected!=-1) - fireSound(); - - switch(selected){ - case 0: { - extern SDL_Rect **resolutions; - bool isCustomResolution = true; - bool found = false; - for(int i = 0; (!found) && (resolutions[i]); i++){ - if((resolutions[i]->w == screenwidth) && (resolutions[i]->h == screenwidth)) - isCustomResolution = false; - - if((resolutions[i]->w == newscreenwidth) && (resolutions[i]->h == newscreenheight)){ - i++; - if(resolutions[i] != NULL){ - newscreenwidth = (int) resolutions[i]->w; - newscreenheight = (int) resolutions[i]->h; - }else if(isCustomResolution){ - if((screenwidth == newscreenwidth) && (screenheight == newscreenheight)){ - newscreenwidth = (int) resolutions[0]->w; - newscreenheight = (int) resolutions[0]->h; - }else{ - newscreenwidth = screenwidth; - newscreenheight = screenheight; - } - }else{ - newscreenwidth = (int) resolutions[0]->w; - newscreenheight = (int) resolutions[0]->h; - } - found = true; - } - } - - if(!found){ - newscreenwidth = (int) resolutions[0]->w; - newscreenheight = (int) resolutions[0]->h; - } - } break; - case 1: - newdetail++; - if(newdetail>2)newdetail=0; - break; - case 2: - bloodtoggle++; - if(bloodtoggle>2)bloodtoggle=0; - break; - case 3: - difficulty++; - if(difficulty>2)difficulty=0; - break; - case 4: - ismotionblur=1-ismotionblur; - break; - case 5: - decals=1-decals; - break; - case 6: - musictoggle=1-musictoggle; - - if(!musictoggle){ - pause_sound(leveltheme); - pause_sound(stream_fighttheme); - pause_sound(stream_menutheme); - - for(int i=0;i<4;i++){ - oldmusicvolume[i]=0; - musicvolume[i]=0; - } - } - - if(musictoggle) - emit_stream_np(stream_menutheme); - break; - case 7: - flash(); - //options - mainmenu=4; - selected=-1; - keyselect=-1; - break; - case 8: - flash(); - - if(newdetail>2)newdetail=detail; - if(newdetail<0)newdetail=detail; - if(newscreenwidth<0)newscreenwidth=screenwidth; - if(newscreenheight<0)newscreenheight=screenheight; - - SaveSettings(*this); - mainmenu=gameon?2:1; - break; - case 9: - invertmouse=1-invertmouse; - break; - case 10: - usermousesensitivity+=.2; - if(usermousesensitivity>2)usermousesensitivity=.2; - break; - case 11: - volume+=.1f; - if(volume>1.0001f)volume=0; - OPENAL_SetSFXMasterVolume((int)(volume*255)); - break; - case 12: - flash(); - - newstereomode = stereomode; - mainmenu=18; - keyselect=-1; - break; - case 13: - showdamagebar=!showdamagebar; - break; - } - } - break; - case 4: - if(Input::MouseClicked()&&selected!=-1&&!waiting){ - fireSound(); - if(selected<9&&keyselect==-1) - keyselect=selected; - if(keyselect!=-1) - setKeySelected(); - if(selected==9){ - flash(); - - mainmenu=3; - - if(newdetail>2)newdetail=detail; - if(newdetail<0)newdetail=detail; - if(newscreenwidth>3000)newscreenwidth=screenwidth; - if(newscreenwidth<0)newscreenwidth=screenwidth; - if(newscreenheight>3000)newscreenheight=screenheight; - if(newscreenheight<0)newscreenheight=screenheight; - } - } - break; - case 5: - if(endgame==2){ - accountactive->endGame(); - endgame=0; - } - - if(Input::MouseClicked()){ - if((selected-7>=accountactive->getCampaignChoicesMade())){ - fireSound(); - flash(); - startbonustotal=0; - - loading=2; - loadtime=0; - targetlevel=7; - if(firstload) TickOnceAfter(); - else LoadStuff(); - whichchoice=selected-7-accountactive->getCampaignChoicesMade(); - visibleloading=1; - stillloading=1; - Loadlevel(campaignmapname[campaignchoicewhich[selected-7-accountactive->getCampaignChoicesMade()]]); - //Loadlevel(campaignmapname[levelorder[selected-7]]); - campaign=1; - mainmenu=0; - gameon=1; - pause_sound(stream_menutheme); - } - if(selected>=1 && selected<=5){ - fireSound(); - flash(); - } - switch(selected){ - case 1: - startbonustotal=0; - - loading=2; - loadtime=0; - targetlevel=-1; - if(firstload)TickOnceAfter(); - if(!firstload)LoadStuff(); - else { - Loadlevel(-1); - } - - mainmenu=0; - gameon=1; - pause_sound(stream_menutheme); - break; - case 2: - mainmenu=9; - break; - case 3: - mainmenu=6; - break; - case 4: - mainmenu=gameon?2:1; - break; - case 5: - mainmenu=7; - break; - } - } - break; - case 6: - if(Input::MouseClicked()) { - if(selected>-1){ - fireSound(); - if(selected==1) { - flash(); - accountactive = Account::destroy(accountactive); - mainmenu=7; - } else if(selected==2) { - flash(); - mainmenu=5; - } - } - } - break; - case 7: - if(Input::MouseClicked()) { - if(selected!=-1){ - fireSound(); - if(selected==0&&Account::getNbAccounts()<8){ - entername=1; - } else if (selected-1){ - fireSound(); - flash(); - if(selected<=2) - accountactive->setDifficulty(selected); - mainmenu=5; - } - break; - case 9: - if(Input::MouseClicked()&&selected=0&&selected<=accountactive->getProgress()){ - fireSound(); - flash(); - - startbonustotal=0; - - loading=2; - loadtime=0; - targetlevel=selected; - if(firstload)TickOnceAfter(); - if(!firstload)LoadStuff(); - else Loadlevel(selected); - campaign=0; - - mainmenu=0; - gameon=1; - pause_sound(stream_menutheme); - } - if(Input::MouseClicked()&&selected==numchallengelevels){ - fireSound(); - flash(); - mainmenu=5; - } - break; - case 10: - endgame=2; - if(Input::MouseClicked()&&selected==3){ - fireSound(); - flash(); - mainmenu=5; - } - break; - case 18: - if(Input::isKeyPressed(MOUSEBUTTON1)&&selected==1) - stereoseparation+=0.001; - else if(Input::isKeyPressed(MOUSEBUTTON2)&&selected==1) - stereoseparation-=0.001; - else if(Input::MouseClicked()&&selected>-1){ - fireSound(); - if(selected==0){ - newstereomode = (StereoMode)(newstereomode + 1); - while(!CanInitStereo(newstereomode)){ - printf("Failed to initialize mode %s (%i)\n", StereoModeName(newstereomode), newstereomode); - newstereomode = (StereoMode)(newstereomode + 1); - if(newstereomode >= stereoCount) - newstereomode = stereoNone; - } - } - if(selected==2) - stereoreverse =! stereoreverse; - if(selected==3){ - flash(); - mainmenu=3; - - stereomode = newstereomode; - InitStereo(stereomode); - } - } - break; - } - - if(Input::isKeyDown(SDLK_q)&&Input::isKeyDown(SDLK_LMETA)){ - tryquit=1; - if(mainmenu==3){ - if(newdetail>2)newdetail=detail; - if(newdetail<0)newdetail=detail; - if(newscreenwidth<0)newscreenwidth=screenwidth; - if(newscreenheight<0)newscreenheight=screenheight; - - SaveSettings(*this); - } - } - - if(mainmenu==1||mainmenu==2){ - if(loaddistrib>4)transition+=multiplier/8; - if(transition>1){ - transition=0; - anim++; - if(anim>4)anim=0; - loaddistrib=0; - } - } - OPENAL_SetFrequency(channels[stream_menutheme], 22050); - - if(entername) { - inputText(displaytext[0],&displayselected,&displaychars[0]); - if(!waiting) { // the input as finished - if(displaychars[0]){ // with enter - accountactive = Account::add(string(displaytext[0])); - - mainmenu=8; - - flash(); - - fireSound(firestartsound); - - for(int i=0;i<255;i++){ - displaytext[0][i]=0; - } - displaychars[0]=0; - - displayselected=0; - } - entername=0; - } - - displayblinkdelay-=multiplier; - if(displayblinkdelay<=0){ - displayblinkdelay=.3; - displayblink=1-displayblink; - } - } -} - void Game::doTutorial(){ if(tutorialstagetime>tutorialmaxtime){ tutorialstage++; @@ -2704,25 +2239,19 @@ void Game::doTutorial(){ temp2.y=75; temp2.z=447; + Weapon w(knife,-1); + w.position=(temp+temp2)/2; + w.tippoint=(temp+temp2)/2; + + w.velocity=0.1; + w.tipvelocity=0.1; + w.missed=1; + w.hitsomething=0; + w.freetime=0; + w.firstfree=1; + w.physics=1; - weapons.owner[weapons.numweapons]=-1; - weapons.type[weapons.numweapons]=knife; - weapons.damage[weapons.numweapons]=0; - weapons.mass[weapons.numweapons]=1; - weapons.tipmass[weapons.numweapons]=1.2; - weapons.length[weapons.numweapons]=.25; - weapons.position[weapons.numweapons]=(temp+temp2)/2; - weapons.tippoint[weapons.numweapons]=(temp+temp2)/2; - - weapons.velocity[weapons.numweapons]=0.1; - weapons.tipvelocity[weapons.numweapons]=0.1; - weapons.missed[weapons.numweapons]=1; - weapons.hitsomething[weapons.numweapons]=0; - weapons.freetime[weapons.numweapons]=0; - weapons.firstfree[weapons.numweapons]=1; - weapons.physics[weapons.numweapons]=1; - - weapons.numweapons++; + weapons.push_back(w); } break; case 40: tutorialmaxtime=300; @@ -2733,7 +2262,7 @@ void Game::doTutorial(){ break; case 43: tutorialmaxtime=300; break; case 44: - weapons.owner[0]=1; + weapons[0].owner=1; player[0].weaponactive=-1; player[0].num_weapons=0; player[1].weaponactive=0; @@ -2746,7 +2275,7 @@ void Game::doTutorial(){ tutorialmaxtime=300; break; case 45: - weapons.owner[0]=1; + weapons[0].owner=1; player[0].weaponactive=-1; player[0].num_weapons=0; player[1].weaponactive=0; @@ -2755,14 +2284,14 @@ void Game::doTutorial(){ tutorialmaxtime=300; break; case 46: - weapons.owner[0]=1; + weapons[0].owner=1; player[0].weaponactive=-1; player[0].num_weapons=0; player[1].weaponactive=0; player[1].num_weapons=1; player[1].weaponids[0]=0; - weapons.type[0]=sword; + weapons[0].setType(sword); tutorialmaxtime=300; break; case 47: { @@ -2777,25 +2306,22 @@ void Game::doTutorial(){ temp2.y=75; temp2.z=447; - weapons.owner[weapons.numweapons]=-1; - weapons.type[weapons.numweapons]=sword; - weapons.damage[weapons.numweapons]=0; - weapons.mass[weapons.numweapons]=1; - weapons.tipmass[weapons.numweapons]=1.2; - weapons.length[weapons.numweapons]=.25; - weapons.position[weapons.numweapons]=(temp+temp2)/2; - weapons.tippoint[weapons.numweapons]=(temp+temp2)/2; - - weapons.velocity[weapons.numweapons]=0.1; - weapons.tipvelocity[weapons.numweapons]=0.1; - weapons.missed[weapons.numweapons]=1; - weapons.hitsomething[weapons.numweapons]=0; - weapons.freetime[weapons.numweapons]=0; - weapons.firstfree[weapons.numweapons]=1; - weapons.physics[weapons.numweapons]=1; - - weapons.owner[0]=1; - weapons.owner[1]=0; + Weapon w(sword,-1); + w.position=(temp+temp2)/2; + w.tippoint=(temp+temp2)/2; + + w.velocity=0.1; + w.tipvelocity=0.1; + w.missed=1; + w.hitsomething=0; + w.freetime=0; + w.firstfree=1; + w.physics=1; + + weapons.push_back(w); + + weapons[0].owner=1; + weapons[1].owner=0; player[0].weaponactive=0; player[0].num_weapons=1; player[0].weaponids[0]=1; @@ -2803,7 +2329,6 @@ void Game::doTutorial(){ player[1].num_weapons=1; player[1].weaponids[0]=0; - weapons.numweapons++; } break; case 48: canattack=0; @@ -2812,8 +2337,8 @@ void Game::doTutorial(){ tutorialmaxtime=15; - weapons.owner[0]=1; - weapons.owner[1]=0; + weapons[0].owner=1; + weapons[1].owner=0; player[0].weaponactive=0; player[0].num_weapons=1; player[0].weaponids[0]=1; @@ -2821,10 +2346,12 @@ void Game::doTutorial(){ player[1].num_weapons=1; player[1].weaponids[0]=0; - if(player[0].weaponactive!=-1)weapons.type[player[0].weaponids[player[0].weaponactive]]=staff; - else weapons.type[0]=staff; + if(player[0].weaponactive!=-1) + weapons[player[0].weaponids[player[0].weaponactive]].setType(staff); + else + weapons[0].setType(staff); - weapons.numweapons++; + //~ weapons.size()++; break; case 49: canattack=0; cananger=0; @@ -2832,20 +2359,20 @@ void Game::doTutorial(){ tutorialmaxtime=200; - weapons.position[1]=1000; - weapons.tippoint[1]=1000; + weapons[1].position=1000; + weapons[1].tippoint=1000; - weapons.numweapons=1; - weapons.owner[0]=0; + //~ weapons.size()=1; + weapons[0].setType(knife); + + //~ weapons.size()++; + weapons[0].owner=0; player[1].weaponactive=-1; player[1].num_weapons=0; player[0].weaponactive=0; player[0].num_weapons=1; player[0].weaponids[0]=0; - weapons.type[0]=knife; - - weapons.numweapons++; break; case 50: { tutorialmaxtime=8; @@ -2866,16 +2393,7 @@ void Game::doTutorial(){ player[1].weaponstuck=-1; player[1].weaponactive=-1; - weapons.numweapons=0; - - weapons.owner[0]=-1; - weapons.velocity[0]=0.1; - weapons.tipvelocity[0]=-0.1; - weapons.missed[0]=1; - weapons.hitsomething[0]=0; - weapons.freetime[0]=0; - weapons.firstfree[0]=1; - weapons.physics[0]=1; + weapons.clear(); } break; case 51: tutorialmaxtime=80000; @@ -2952,8 +2470,6 @@ void Game::doTutorial(){ } } - - void Game::doDebugKeys(){ float headprop,bodyprop,armprop,legprop; if(debugmode){ @@ -2978,25 +2494,12 @@ void Game::doDebugKeys(){ if(Input::isKeyPressed(SDLK_x)&&!Input::isKeyDown(SDLK_LSHIFT)){ if(player[0].num_weapons>0){ - if(weapons.type[player[0].weaponids[0]]==sword)weapons.type[player[0].weaponids[0]]=staff; - else if(weapons.type[player[0].weaponids[0]]==staff)weapons.type[player[0].weaponids[0]]=knife; - else weapons.type[player[0].weaponids[0]]=sword; - if(weapons.type[player[0].weaponids[0]]==sword){ - weapons.mass[player[0].weaponids[0]]=1.5; - weapons.tipmass[player[0].weaponids[0]]=1; - weapons.length[player[0].weaponids[0]]=.8; - } - if(weapons.type[player[0].weaponids[0]]==staff){ - weapons.mass[player[0].weaponids[0]]=2; - weapons.tipmass[player[0].weaponids[0]]=1; - weapons.length[player[0].weaponids[0]]=1.5; - } - - if(weapons.type[player[0].weaponids[0]]==knife){ - weapons.mass[player[0].weaponids[0]]=1; - weapons.tipmass[player[0].weaponids[0]]=1.2; - weapons.length[player[0].weaponids[0]]=.25; - } + if(weapons[player[0].weaponids[0]].getType()==sword) + weapons[player[0].weaponids[0]].setType(staff); + else if(weapons[player[0].weaponids[0]].getType()==staff) + weapons[player[0].weaponids[0]].setType(knife); + else + weapons[player[0].weaponids[0]].setType(sword); } } @@ -3014,44 +2517,19 @@ void Game::doDebugKeys(){ } if(closest!=-1){ if(player[closest].num_weapons){ - if(weapons.type[player[closest].weaponids[0]]==sword) - weapons.type[player[closest].weaponids[0]]=staff; - else if(weapons.type[player[closest].weaponids[0]]==staff) - weapons.type[player[closest].weaponids[0]]=knife; - else weapons.type[player[closest].weaponids[0]]=sword; - if(weapons.type[player[closest].weaponids[0]]==sword){ - weapons.mass[player[closest].weaponids[0]]=1.5; - weapons.tipmass[player[closest].weaponids[0]]=1; - weapons.length[player[closest].weaponids[0]]=.8; - } - if(weapons.type[player[0].weaponids[0]]==staff){ - weapons.mass[player[0].weaponids[0]]=2; - weapons.tipmass[player[0].weaponids[0]]=1; - weapons.length[player[0].weaponids[0]]=1.5; - } - if(weapons.type[player[closest].weaponids[0]]==knife){ - weapons.mass[player[closest].weaponids[0]]=1; - weapons.tipmass[player[closest].weaponids[0]]=1.2; - weapons.length[player[closest].weaponids[0]]=.25; - } + if(weapons[player[closest].weaponids[0]].getType()==sword) + weapons[player[closest].weaponids[0]].setType(staff); + else if(weapons[player[closest].weaponids[0]].getType()==staff) + weapons[player[closest].weaponids[0]].setType(knife); + else + weapons[player[closest].weaponids[0]].setType(sword); } if(!player[closest].num_weapons){ - player[closest].weaponids[0]=weapons.numweapons; - weapons.owner[weapons.numweapons]=closest; - weapons.type[weapons.numweapons]=knife; - weapons.damage[weapons.numweapons]=0; - weapons.numweapons++; + player[closest].weaponids[0]=weapons.size(); + + weapons.push_back(Weapon(knife,closest)); + player[closest].num_weapons=1; - if(weapons.type[player[closest].weaponids[0]]==sword){ - weapons.mass[player[closest].weaponids[0]]=1.5; - weapons.tipmass[player[closest].weaponids[0]]=1; - weapons.length[player[closest].weaponids[0]]=.8; - } - if(weapons.type[player[closest].weaponids[0]]==knife){ - weapons.mass[player[closest].weaponids[0]]=1; - weapons.tipmass[player[closest].weaponids[0]]=1.2; - weapons.length[player[closest].weaponids[0]]=.25; - } } } } @@ -3373,9 +2851,6 @@ void Game::doDebugKeys(){ } if(Input::isKeyPressed(SDLK_n)&&Input::isKeyDown(SDLK_LCTRL)){ - int closest=-1; - float closestdist=-1; - float distance; for(int i=0;i1) @@ -4957,8 +4430,6 @@ void Game::doPlayerCollisions(){ } } - - void Game::doAI(int i){ static bool connected; if(player[i].aitype!=playercontrolled&&indialogue==-1){ @@ -5245,10 +4716,10 @@ void Game::doAI(int i){ if(j==0||(player[j].dead&&player[j].bloodloss>0)){ float smelldistance=50; if(j==0&&player[j].num_weapons>0){ - if(weapons.bloody[player[j].weaponids[0]]) + if(weapons[player[j].weaponids[0]].bloody) smelldistance=100; if(player[j].num_weapons==2) - if(weapons.bloody[player[j].weaponids[1]]) + if(weapons[player[j].weaponids[1]].bloody) smelldistance=100; } if(j!=0) @@ -5551,9 +5022,9 @@ void Game::doAI(int i){ if(player[i].ally<0){ int closest=-1; float closestdist=-1; - for(int k=0;k=0){ - if(weapons.owner[player[i].ally]!=-1|| - findDistancefast(&player[i].coords,&weapons.position[player[i].ally])>16){ + if(weapons[player[i].ally].owner!=-1|| + findDistancefast(&player[i].coords,&weapons[player[i].ally].position)>16){ player[i].aitype=attacktypecutoff; player[i].lastseentime=1; } //TODO: factor these out as moveToward() - player[i].targetrotation=roughDirectionTo(player[i].coords,weapons.position[player[i].ally]); + player[i].targetrotation=roughDirectionTo(player[i].coords,weapons[player[i].ally].position); player[i].lookrotation=player[i].targetrotation; player[i].aiupdatedelay=.05; player[i].forwardkeydown=1; @@ -5636,7 +5107,7 @@ void Game::doAI(int i){ if(player[i].isIdle()) player[i].crouchkeydown=1; if(player[0].targetanimation!=rabbitkickanim&&player[0].weaponactive!=-1){ - if(weapons.type[player[0].weaponids[0]]==knife){ + if(weapons[player[0].weaponids[0]].getType()==knife){ if(player[i].isIdle()||player[i].isCrouch()||player[i].isRun()||player[i].isFlip()){ if(abs(Random()%2==0)) setAnimation(i,backhandspringanim); @@ -5663,14 +5134,14 @@ void Game::doAI(int i){ } //go for weapon on the ground if(player[i].wentforweapon<3) - for(int k=0;k unused +18 stereo configuration +*/ + +void Game::MenuTick(){ + //menu buttons + + // some specific case where we do something even if the left mouse button is not pressed. + if((mainmenu==5) && (endgame==2)) { + accountactive->endGame(); + endgame=0; + } + if(mainmenu==10) + endgame=2; + if( (mainmenu==18) && Input::isKeyPressed(MOUSEBUTTON2) && (selected==1) ) + stereoseparation-=0.001; + + if(Input::MouseClicked() && (selected >= 0)) { // handling of the left mouse clic in menus + switch(mainmenu) { + case 1: + case 2: + switch(selected) { + case 1: + if(gameon) { //resume + mainmenu=0; + pause_sound(stream_menutheme); + resume_stream(leveltheme); + } else { //new game + fireSound(firestartsound); + flash(); + mainmenu=(accountactive?5:7); + selected=-1; + } + break; + case 2: //options + fireSound(); + flash(); + mainmenu=3; + if(newdetail>2) newdetail=detail; + if(newdetail<0) newdetail=detail; + if(newscreenwidth>3000) newscreenwidth=screenwidth; + if(newscreenwidth<0) newscreenwidth=screenwidth; + if(newscreenheight>3000) newscreenheight=screenheight; + if(newscreenheight<0) newscreenheight=screenheight; + break; + case 3: + fireSound(); + flash(); + if(gameon){ //end game + gameon=0; + mainmenu=1; + } else { //quit + tryquit=1; + pause_sound(stream_menutheme); + } + break; + } + break; + case 3: + fireSound(); + bool isCustomResolution,found; + switch(selected){ + case 0: + extern SDL_Rect **resolutions; + isCustomResolution = true; + found = false; + for(int i = 0; (!found) && (resolutions[i]); i++) { + if((resolutions[i]->w == screenwidth) && (resolutions[i]->h == screenwidth)) + isCustomResolution = false; + + if((resolutions[i]->w == newscreenwidth) && (resolutions[i]->h == newscreenheight)) { + i++; + if(resolutions[i] != NULL) { + newscreenwidth = (int) resolutions[i]->w; + newscreenheight = (int) resolutions[i]->h; + } else if(isCustomResolution){ + if((screenwidth == newscreenwidth) && (screenheight == newscreenheight)) { + newscreenwidth = (int) resolutions[0]->w; + newscreenheight = (int) resolutions[0]->h; + } else { + newscreenwidth = screenwidth; + newscreenheight = screenheight; + } + } else { + newscreenwidth = (int) resolutions[0]->w; + newscreenheight = (int) resolutions[0]->h; + } + found = true; + } + } + + if(!found) { + newscreenwidth = (int) resolutions[0]->w; + newscreenheight = (int) resolutions[0]->h; + } + break; + case 1: + newdetail++; + if(newdetail>2) newdetail=0; + break; + case 2: + bloodtoggle++; + if(bloodtoggle>2) bloodtoggle=0; + break; + case 3: + difficulty++; + if(difficulty>2) difficulty=0; + break; + case 4: + ismotionblur = !ismotionblur; + break; + case 5: + decals = !decals; + break; + case 6: + musictoggle = !musictoggle; + + if(musictoggle) { + emit_stream_np(stream_menutheme); + } else { + pause_sound(leveltheme); + pause_sound(stream_fighttheme); + pause_sound(stream_menutheme); + + for(int i=0;i<4;i++){ + oldmusicvolume[i]=0; + musicvolume[i]=0; + } + } + + break; + case 7: // controls + flash(); + mainmenu=4; + selected=-1; + keyselect=-1; + break; + case 8: + flash(); + + SaveSettings(*this); + mainmenu=gameon?2:1; + break; + case 9: + invertmouse = !invertmouse; + break; + case 10: + usermousesensitivity+=.2; + if(usermousesensitivity>2) usermousesensitivity=.2; + break; + case 11: + volume+=.1f; + if(volume>1.0001f) volume=0; + OPENAL_SetSFXMasterVolume((int)(volume*255)); + break; + case 12: + flash(); + + newstereomode = stereomode; + mainmenu=18; + keyselect=-1; + break; + case 13: + showdamagebar = !showdamagebar; + break; + } + break; + case 4: + if(!waiting) { + fireSound(); + if(selected<9 && keyselect==-1) + keyselect=selected; + if(keyselect!=-1) + setKeySelected(); + if(selected==9){ + flash(); + + mainmenu=3; + } + } + break; + case 5: + fireSound(); + flash(); + if((selected-NB_CAMPAIGN_MENU_ITEM-1 >= accountactive->getCampaignChoicesMade())) { + startbonustotal=0; + + loading=2; + loadtime=0; + targetlevel=7; + if(firstload) + TickOnceAfter(); + else + LoadStuff(); + whichchoice=selected-NB_CAMPAIGN_MENU_ITEM-1-accountactive->getCampaignChoicesMade(); + visibleloading=1; + stillloading=1; + Loadlevel(campaignmapname[campaignchoicewhich[whichchoice]]); + campaign=1; + mainmenu=0; + gameon=1; + pause_sound(stream_menutheme); + } + switch(selected){ + case 1: + startbonustotal=0; + + loading=2; + loadtime=0; + targetlevel=-1; + if(firstload) { + TickOnceAfter(); + Loadlevel(-1); + } else + LoadStuff(); + + mainmenu=0; + gameon=1; + pause_sound(stream_menutheme); + break; + case 2: + mainmenu=9; + break; + case 3: + mainmenu=6; + break; + case 4: + mainmenu=(gameon?2:1); + break; + case 5: + mainmenu=7; + break; + case 6: + vector campaigns = ListCampaigns(); + vector::iterator c; + if ((c = find(campaigns.begin(),campaigns.end(),accountactive->getCurrentCampaign()))==campaigns.end()) { + if(!campaigns.empty()) + accountactive->setCurrentCampaign(campaigns.front()); + } else { + c++; + if(c==campaigns.end()) + c=campaigns.begin(); + accountactive->setCurrentCampaign(*c); + } + if(Mainmenuitems[7]) + glDeleteTextures(1,&Mainmenuitems[7]); // we delete the world texture so load campaign will reload it + Mainmenuitems[7] = 0; + LoadCampaign(); + break; + } + break; + case 6: + fireSound(); + if(selected==1) { + flash(); + accountactive = Account::destroy(accountactive); + mainmenu=7; + } else if(selected==2) { + flash(); + mainmenu=5; + } + break; + case 7: + fireSound(); + if(selected==0 && Account::getNbAccounts()<8){ + entername=1; + } else if (selected < Account::getNbAccounts()+1) { + flash(); + mainmenu=5; + accountactive=Account::get(selected-1); + } else if (selected == Account::getNbAccounts()+1) { + flash(); + mainmenu=5; + for(int j=0;j<255;j++){ + displaytext[0][j]=0; + } + displaychars[0]=0; + displayselected=0; + entername=0; + } + break; + case 8: + fireSound(); + flash(); + if(selected<=2) + accountactive->setDifficulty(selected); + mainmenu=5; + break; + case 9: + if(selectedgetProgress()){ + fireSound(); + flash(); + + startbonustotal=0; + + loading=2; + loadtime=0; + targetlevel=selected; + if(firstload)TickOnceAfter(); + if(!firstload)LoadStuff(); + else Loadlevel(selected); + campaign=0; + + mainmenu=0; + gameon=1; + pause_sound(stream_menutheme); + } + if(selected==numchallengelevels){ + fireSound(); + flash(); + mainmenu=5; + } + break; + case 10: + if(selected==3){ + fireSound(); + flash(); + mainmenu=5; + } + break; + case 18: + if(selected==1) + stereoseparation+=0.001; + else { + fireSound(); + if(selected==0){ + newstereomode = (StereoMode)(newstereomode + 1); + while(!CanInitStereo(newstereomode)){ + printf("Failed to initialize mode %s (%i)\n", StereoModeName(newstereomode), newstereomode); + newstereomode = (StereoMode)(newstereomode + 1); + if(newstereomode >= stereoCount) + newstereomode = stereoNone; + } + } else if(selected==2) { + stereoreverse = !stereoreverse; + } else if(selected==3) { + flash(); + mainmenu=3; + + stereomode = newstereomode; + InitStereo(stereomode); + } + } + break; + } + } + + if(Input::isKeyDown(SDLK_q) && Input::isKeyDown(SDLK_LMETA)){ + tryquit=1; + if(mainmenu==3) { + SaveSettings(*this); + } + } + + OPENAL_SetFrequency(channels[stream_menutheme], 22050); + + if(entername) { + inputText(displaytext[0],&displayselected,&displaychars[0]); + if(!waiting) { // the input as finished + if(displaychars[0]){ // with enter + accountactive = Account::add(string(displaytext[0])); + + mainmenu=8; + flash(); + + fireSound(firestartsound); + + for(int i=0;i<255;i++){ + displaytext[0][i]=0; + } + displaychars[0]=0; + + displayselected=0; + } + entername=0; + } + + displayblinkdelay-=multiplier; + if(displayblinkdelay<=0){ + displayblinkdelay=.3; + displayblink=1-displayblink; + } + } +} void Game::Tick(){ static XYZ facing,flatfacing; static int target; - int templength; - for(int i=0;i<15;i++){ displaytime[i]+=multiplier; } - keyboardfrozen=0; + keyboardfrozen=false; Input::Tick(); if(Input::isKeyPressed(SDLK_F6)){ @@ -6000,25 +5865,36 @@ void Game::Tick(){ 18 stereo configuration */ - if(!console){ + if(!console) { //campaign over? if(mainmenu&&endgame==1) mainmenu=10; + //go to level select after completing a campaign level + if(campaign&&winfreeze&&mainmenu==0&&campaignchoosenext[campaignchoicewhich[whichchoice]]==1) { + mainmenu=5; + gameon=0; + winfreeze=0; + fireSound(); + flash(); + if(musictoggle){ + OPENAL_SetFrequency(OPENAL_ALL, 0.001); + emit_stream_np(stream_menutheme); + pause_sound(leveltheme); + } + LoadCampaign(); + } //escape key pressed //TODO: there must be code somewhere else that handles clicking the Back button, merge it with this if(Input::isKeyPressed(SDLK_ESCAPE)&& - (gameon||mainmenu==0||(mainmenu>=3&&mainmenu!=8&&!(mainmenu==7&&entername)))){ + (gameon||mainmenu==0||(mainmenu>=3&&mainmenu!=8&&!(mainmenu==7&&entername)))) { selected=-1; if(mainmenu==0&&!winfreeze) mainmenu=2; //pause - else if(mainmenu==0&&winfreeze&&campaignchoosenext[campaignchoicewhich[whichchoice]]==1){ - mainmenu=100; - gameon=0; - winfreeze=0; - }else if(mainmenu==1||mainmenu==2) + else if(mainmenu==1||mainmenu==2){ mainmenu=0; //unpause + } //play menu theme - if(musictoggle&&(mainmenu==1||mainmenu==2||mainmenu==100)){ + if(musictoggle&&(mainmenu==1||mainmenu==2)){ OPENAL_SetFrequency(OPENAL_ALL, 0.001); emit_stream_np(stream_menutheme); pause_sound(leveltheme); @@ -6030,14 +5906,6 @@ void Game::Tick(){ } //finished with settings menu if(mainmenu==3){ - if(newdetail>2) - newdetail=detail; - if(newdetail<0) - newdetail=detail; - if(newscreenwidth<0) - newscreenwidth=screenwidth; - if(newscreenheight<0) - newscreenheight=screenheight; SaveSettings(*this); } //effects @@ -6051,17 +5919,17 @@ void Game::Tick(){ mainmenu=gameon?2:1; break; case 4: case 18: mainmenu=3; break; - case 6: case 7: case 9: case 10: case 100: + case 6: case 7: case 9: case 10: mainmenu=5; break; } } } - if(mainmenu){ + if(mainmenu) { MenuTick(); } - if(!mainmenu){ + if(!mainmenu) { if(hostile==1)hostiletime+=multiplier; else hostiletime=0; if(!winfreeze)leveltime+=multiplier; @@ -6096,10 +5964,10 @@ void Game::Tick(){ } } if(chatting) - keyboardfrozen=1; + keyboardfrozen=true; if(Input::isKeyPressed(SDLK_BACKQUOTE)&&debugmode){ - console=1-console; + console=!console; if(console){ OPENAL_SetFrequency(OPENAL_ALL, 0.001); } else { @@ -6140,12 +6008,7 @@ void Game::Tick(){ if(Input::isKeyDown(SDLK_q)&&Input::isKeyDown(SDLK_LMETA)){ tryquit=1; - if(mainmenu==3){ - if(newdetail>2)newdetail=detail; - if(newdetail<0)newdetail=detail; - if(newscreenwidth<0)newscreenwidth=screenwidth; - if(newscreenheight<0)newscreenheight=screenheight; - + if(mainmenu==3) { SaveSettings(*this); } } @@ -6165,9 +6028,9 @@ void Game::Tick(){ winfreeze=0; if((Input::isKeyDown(SDLK_ESCAPE))&&!campaign&&gameon){ if(console){ - console=0; + console=false; freeze=0; - }else if(winfreeze){ + } else if(winfreeze) { mainmenu=9; gameon=0; } @@ -6525,8 +6388,6 @@ void Game::Tick(){ } } - static float keyrefreshdelay=0,bigrefreshdelay=0; - if(!player[0].jumpkeydown){ player[0].jumptogglekeydown=0; } @@ -6549,8 +6410,6 @@ void Game::Tick(){ hawkcalldelay=16+abs(Random()%8); } - static float temptexdetail; - doDebugKeys(); @@ -6664,8 +6523,6 @@ void Game::Tick(){ player[i].targetheadrotation2=pitch(participantfacing[whichdialogue][indialogue][i]); } - bool pause; - if(leveltime<.5) numenvsounds=0; @@ -6771,13 +6628,13 @@ void Game::Tick(){ player[i].isFlip()|| player[i].isFlip()|| player[i].aitype!=playercontrolled)){ - for(int j=0;jid) - if(findDistancefastflat(&player[i].coords,&weapons.position[j])<2&&player[i].weaponactive==-1) - if(findDistancefast(&player[i].coords,&weapons.position[j])<1||player[i].victim){ - if(weapons.type[j]!=staff) + weapons[j].owner==player[i].victim->id) + if(findDistancefastflat(&player[i].coords,&weapons[j].position)<2&&player[i].weaponactive==-1) + if(findDistancefast(&player[i].coords,&weapons[j].position)<1||player[i].victim){ + if(weapons[j].getType()!=staff) emit_sound_at(knifedrawsound, player[i].coords, 128.); player[i].weaponactive=0; - weapons.owner[j]=player[i].id; + weapons[j].owner=player[i].id; if(player[i].num_weapons>0) player[i].weaponids[player[i].num_weapons]=player[i].weaponids[0]; player[i].num_weapons++; @@ -6813,31 +6670,31 @@ void Game::Tick(){ }else if((player[i].isIdle()|| player[i].isFlip()|| player[i].aitype!=playercontrolled)&& - findDistancefast(&player[i].coords,&weapons.position[j])<5&& - player[i].coords.yid) - if(findDistancefastflat(&player[i].coords,&weapons.position[k])<3&& + weapons[k].owner==player[i].victim->id) + if(findDistancefastflat(&player[i].coords,&weapons[k].position)<3&& player[i].weaponactive==-1){ - if(weapons.type[k]!=staff) + if(weapons[k].getType()!=staff) emit_sound_at(knifedrawsound, player[i].coords, 128.); player[i].weaponactive=0; - weapons.owner[k]=player[i].id; + weapons[k].owner=player[i].id; if(player[i].num_weapons>0) player[i].weaponids[player[i].num_weapons]=player[i].weaponids[0]; player[i].num_weapons++; @@ -6887,14 +6744,14 @@ void Game::Tick(){ } } if(!fleshstuck){ - if(weapons.type[k]!=staff) + if(weapons[k].getType()!=staff) emit_sound_at(knifedrawsound, player[i].coords, 128.); } if(fleshstuck) emit_sound_at(fleshstabremovesound, player[i].coords, 128.); player[i].weaponactive=0; - if(weapons.owner[k]!=-1){ + if(weapons[k].owner!=-1){ if(player[i].victim->num_weapons==1)player[i].victim->num_weapons=0; else player[i].victim->num_weapons=1; @@ -6913,12 +6770,12 @@ void Game::Tick(){ Normalise(&relative); XYZ footvel,footpoint; footvel=0; - footpoint=weapons.position[k]; + footpoint=weapons[k].position; if(player[i].victim->weaponstuck!=-1){ if(player[i].victim->weaponids[player[i].victim->weaponstuck]==k){ if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3); - weapons.bloody[k]=2; - weapons.blooddrip[k]=5; + weapons[k].bloody=2; + weapons[k].blooddrip=5; player[i].victim->weaponstuck=-1; player[i].victim->bloodloss+=2000; player[i].victim->DoDamage(2000); @@ -6937,7 +6794,7 @@ void Game::Tick(){ playerJoint(player[i].victim,rightshoulder).velocity+=relative*6; playerJoint(player[i].victim,leftshoulder).velocity+=relative*6; } - weapons.owner[k]=i; + weapons[k].owner=i; if(player[i].num_weapons>0){ player[i].weaponids[player[i].num_weapons]=player[i].weaponids[0]; } @@ -6950,7 +6807,7 @@ void Game::Tick(){ } } if(player[i].weaponactive!=-1&&player[i].aitype==playercontrolled){ - if(weapons.type[player[i].weaponids[0]]==knife){ + if(weapons[player[i].weaponids[0]].getType()==knife){ if(player[i].isIdle()|| player[i].isRun()|| player[i].isCrouch()|| @@ -6978,18 +6835,18 @@ void Game::Tick(){ player[i].throwtogglekeydown=1; player[i].victim=&player[j]; XYZ aim; - weapons.owner[player[i].weaponids[0]]=-1; + weapons[player[i].weaponids[0]].owner=-1; aim=player[i].victim->coords+DoRotation(playerJoint(player[i].victim,abdomen).position,0,player[i].victim->rotation,0)*player[i].victim->scale+player[i].victim->velocity*findDistance(&player[i].victim->coords,&player[i].coords)/50-(player[i].coords+DoRotation(playerJoint(i,righthand).position,0,player[i].rotation,0)*player[i].scale); Normalise(&aim); aim=DoRotation(aim,(float)abs(Random()%30)-15,(float)abs(Random()%30)-15,0); - weapons.velocity[player[i].weaponids[0]]=aim*50; - weapons.tipvelocity[player[i].weaponids[0]]=aim*50; - weapons.missed[player[i].weaponids[0]]=0; - weapons.freetime[player[i].weaponids[0]]=0; - weapons.firstfree[player[i].weaponids[0]]=1; - weapons.physics[player[i].weaponids[0]]=0; + weapons[player[i].weaponids[0]].velocity=aim*50; + weapons[player[i].weaponids[0]].tipvelocity=aim*50; + weapons[player[i].weaponids[0]].missed=0; + weapons[player[i].weaponids[0]].freetime=0; + weapons[player[i].weaponids[0]].firstfree=1; + weapons[player[i].weaponids[0]].physics=0; player[i].num_weapons--; if(player[i].num_weapons){ player[i].weaponids[0]=player[i].weaponids[player[i].num_weapons]; @@ -7004,14 +6861,14 @@ void Game::Tick(){ if(player[i].weaponactive!=-1&&player[i].aitype==playercontrolled){ if(player[i].isCrouch()||player[i].targetanimation==sneakanim){ player[i].throwtogglekeydown=1; - weapons.owner[player[i].weaponids[0]]=-1; - weapons.velocity[player[i].weaponids[0]]=player[i].velocity*.2; - if(weapons.velocity[player[i].weaponids[0]].x==0)weapons.velocity[player[i].weaponids[0]].x=.1; - weapons.tipvelocity[player[i].weaponids[0]]=weapons.velocity[player[i].weaponids[0]]; - weapons.missed[player[i].weaponids[0]]=1; - weapons.freetime[player[i].weaponids[0]]=0; - weapons.firstfree[player[i].weaponids[0]]=1; - weapons.physics[player[i].weaponids[0]]=1; + weapons[player[i].weaponids[0]].owner=-1; + weapons[player[i].weaponids[0]].velocity=player[i].velocity*.2; + if(weapons[player[i].weaponids[0]].velocity.x==0)weapons[player[i].weaponids[0]].velocity.x=.1; + weapons[player[i].weaponids[0]].tipvelocity=weapons[player[i].weaponids[0]].velocity; + weapons[player[i].weaponids[0]].missed=1; + weapons[player[i].weaponids[0]].freetime=0; + weapons[player[i].weaponids[0]].firstfree=1; + weapons[player[i].weaponids[0]].physics=1; player[i].num_weapons--; if(player[i].num_weapons){ player[i].weaponids[0]=player[i].weaponids[player[i].num_weapons]; @@ -7038,10 +6895,10 @@ void Game::Tick(){ i!=0){ bool isgood=1; if(player[i].weaponactive!=-1) - if(weapons.type[player[i].weaponids[player[i].weaponactive]]==staff) + if(weapons[player[i].weaponids[player[i].weaponactive]].getType()==staff) isgood=0; if(isgood&&player[i].creature!=wolftype){ - if(player[i].isIdle()&&player[i].num_weapons&&weapons.type[player[i].weaponids[0]]==knife){ + if(player[i].isIdle()&&player[i].num_weapons&&weapons[player[i].weaponids[0]].getType()==knife){ setAnimation(i,drawrightanim); player[i].drawtogglekeydown=1; } @@ -7050,11 +6907,11 @@ void Game::Tick(){ player[0].weaponactive!=-1&& player[i].isRun()))&& player[i].num_weapons&& - weapons.type[player[i].weaponids[0]]==sword){ + weapons[player[i].weaponids[0]].getType()==sword){ setAnimation(i,drawleftanim); player[i].drawtogglekeydown=1; } - if(player[i].isCrouch()&&player[i].num_weapons&&weapons.type[player[i].weaponids[0]]==knife){ + if(player[i].isCrouch()&&player[i].num_weapons&&weapons[player[i].weaponids[0]].getType()==knife){ setAnimation(i,crouchdrawrightanim); player[i].drawtogglekeydown=1; } @@ -7062,22 +6919,18 @@ void Game::Tick(){ } //clean weapon if(player[i].isCrouch()&& - weapons.bloody[player[i].weaponids[player[i].weaponactive]]&& + weapons[player[i].weaponids[player[i].weaponactive]].bloody&& bloodtoggle&& player[i].onterrain&& player[i].num_weapons&& player[i].weaponactive!=-1&& - player[i].attackkeydown){ - if(weapons.bloody[player[i].weaponids[player[i].weaponactive]]&& - player[i].onterrain&& - bloodtoggle&&musictype!=stream_fighttheme){ - if(weapons.type[player[i].weaponids[player[i].weaponactive]]==knife) + player[i].attackkeydown&& + bloodtoggle&&musictype!=stream_fighttheme) { + if(weapons[player[i].weaponids[player[i].weaponactive]].getType()==knife) setAnimation(i,crouchstabanim); - if(weapons.type[player[i].weaponids[player[i].weaponactive]]==sword) + if(weapons[player[i].weaponids[player[i].weaponactive]].getType()==sword) setAnimation(i,swordgroundstabanim); player[i].hasvictim=0; - //player[i].attacktogglekeydown=1; - } } if(!player[i].drawkeydown) @@ -7601,9 +7454,7 @@ void Game::Tick(){ Screenshot(); } - - -void Game::TickOnce(){ +void Game::TickOnce(){ if(mainmenu) rotation+=multiplier*5; else @@ -7620,12 +7471,11 @@ void Game::TickOnce(){ } } -void Game::TickOnceAfter(){ +void Game::TickOnceAfter(){ static XYZ colviewer; static XYZ coltarget; static XYZ target; static XYZ col; - static float brotate; static XYZ facing; static float changedelay; static bool alldead; @@ -7796,12 +7646,12 @@ void Game::TickOnceAfter(){ if(targetlevel>numchallengelevels-1)targetlevel=0; } - if(changedelay>0&&!player[0].dead&&!won){ + if(changedelay>0&&!player[0].dead&&!won) { //high scores, awards, win - if(campaign){ + if(campaign) { accountactive->winCampaignLevel(whichchoice, bonustotal, leveltime); scoreadded=1; - }else{ + } else { accountactive->winLevel(whichlevel,bonustotal-startbonustotal,leveltime); } won=1; @@ -7818,7 +7668,7 @@ void Game::TickOnceAfter(){ killhotspot=0; } - if(!editorenabled&&gameon&&!mainmenu){ + if(!editorenabled&&gameon&&!mainmenu) { if(changedelay!=-999) changedelay-=multiplier/7; if(player[0].dead) @@ -7857,17 +7707,16 @@ void Game::TickOnceAfter(){ (player[0].dead|| (alldead&&maptype==mapkilleveryone)|| (winhotspot)|| - (killhotspot))&& - !winfreeze) + (killhotspot))) loading=1; if((player[0].dead|| (alldead&&maptype==mapkilleveryone)|| (winhotspot)|| (windialogue)|| (killhotspot))&& - changedelay<=0){ - if(whichlevel!=-2&&!loading&&!player[0].dead){ - winfreeze=1; + changedelay<=0) { + if(whichlevel!=-2&&!loading&&!player[0].dead) { + winfreeze=true; changedelay=-999; } if(player[0].dead) @@ -7875,19 +7724,18 @@ void Game::TickOnceAfter(){ } } - if(campaign) - if(mainmenu==0&&winfreeze&&(campaignchoosenext[campaignchoicewhich[whichchoice]])==1) + if(campaign) { + // campaignchoosenext determines what to do when the level is complete: + // 0 = load next level + // 1 = go back to level select screen + // 2 = stealthload next level + if(mainmenu==0&&winfreeze&&(campaignchoosenext[campaignchoicewhich[whichchoice]])==1){ if(campaignnumnext[campaignchoicewhich[whichchoice]]==0) endgame=1; - else if(mainmenu==0&&winfreeze){ - if(campaignchoosenext[campaignchoicewhich[whichchoice]]==2) - stealthloading=1; - else - stealthloading=0; + } else if(mainmenu==0&&winfreeze) { + stealthloading = (campaignchoosenext[campaignchoicewhich[whichchoice]]==2); if(!stealthloading){ - float gLoc[3]={0,0,0}; - float vel[3]={0,0,0}; fireSound(firestartsound); flash(); @@ -7895,72 +7743,13 @@ void Game::TickOnceAfter(){ startbonustotal=0; - ifstream ipstream(ConvertFileName(":Data:Campaigns:main.txt")); - ipstream.ignore(256,':'); - ipstream >> campaignnumlevels; - for(int i=0;i> campaignmapname[i]; - ipstream.ignore(256,':'); - ipstream >> campaigndescription[i]; - for(int j=0;j<256;j++){ - if(campaigndescription[i][j]=='_')campaigndescription[i][j]=' '; - } - ipstream.ignore(256,':'); - ipstream >> campaignchoosenext[i]; - ipstream.ignore(256,':'); - ipstream >> campaignnumnext[i]; - for(int j=0;j> campaignnextlevel[i][j]; - campaignnextlevel[i][j]-=1; - } - ipstream.ignore(256,':'); - ipstream >> campaignlocationx[i]; - ipstream.ignore(256,':'); - ipstream >> campaignlocationy[i]; - } - ipstream.close(); - - for(int i=0;igetCampaignChoicesMade();i++){ - levelorder[i+1]=campaignnextlevel[levelorder[i]][accountactive->getCampaignChoice(i)]; - levelvisible[levelorder[i+1]]=1; - } - int whichlevelstart; - whichlevelstart=accountactive->getCampaignChoicesMade()-1; - if(whichlevelstart<0){ - campaignchoicenum=1; - campaignchoicewhich[0]=0; - } - else - { - campaignchoicenum=campaignnumnext[levelorder[whichlevelstart]]; - for(int i=0;i