else
LoadStuff();
whichchoice=selected-NB_CAMPAIGN_MENU_ITEM-1-accountactive->getCampaignChoicesMade();
+ actuallevel=(accountactive->getCampaignChoicesMade()>0?campaignnextlevel[accountactive->getCampaignChoicesMade()-1][whichchoice]:0);
visibleloading=1;
stillloading=1;
- Loadlevel(campaignmapname[campaignchoicewhich[whichchoice]]);
+ Loadlevel(campaignmapname[actuallevel]);
campaign=1;
mainmenu=0;
gameon=1;
if(mainmenu&&endgame==1)
mainmenu=10;
//go to level select after completing a campaign level
- if(campaign&&winfreeze&&mainmenu==0&&campaignchoosenext[campaignchoicewhich[whichchoice]]==1) {
+ if(campaign&&winfreeze&&mainmenu==0&&campaignchoosenext[actuallevel]==1) {
mainmenu=5;
gameon=0;
winfreeze=0;
fireSound();
flash();
- if(musictoggle){
+ if(musictoggle) {
OPENAL_SetFrequency(OPENAL_ALL, 0.001);
emit_stream_np(stream_menutheme);
pause_sound(leveltheme);
player[i].drawtogglekeydown=0;
XYZ absflatfacing;
- if(i==0){
+ if(i==0) {
absflatfacing=0;
absflatfacing.z=-1;
absflatfacing=DoRotation(absflatfacing,0,-rotation,0);
- }
- else absflatfacing=flatfacing;
+ } else
+ absflatfacing=flatfacing;
if(indialogue!=-1){
player[i].forwardkeydown=0;
fireSound(firestartsound);
- Loadlevel(campaignmapname[levelorder[accountactive->getCampaignChoicesMade()]]);
+ Loadlevel(campaignmapname[accountactive->getCampaignChoicesMade()]);
fireSound();
// 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)
+ if(mainmenu==0&&winfreeze&&(campaignchoosenext[actuallevel])==1){
+ if(campaignnumnext[actuallevel]==0)
endgame=1;
} else if(mainmenu==0&&winfreeze) {
- stealthloading = (campaignchoosenext[campaignchoicewhich[whichchoice]]==2);
+ stealthloading = (campaignchoosenext[actuallevel]==2);
if(!stealthloading){
fireSound(firestartsound);
if(!firstload)
LoadStuff();
whichchoice=0;
+ actuallevel=campaignnextlevel[actuallevel][0];
visibleloading=1;
stillloading=1;
- Loadlevel(campaignmapname[campaignchoicewhich[0]]);
+ Loadlevel(campaignmapname[actuallevel]);
campaign=1;
mainmenu=0;
gameon=1;