X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=383052eedb45b72dbeb79c6377b10059082dade9;hb=f1f55db0495129376cff147ade264b4294f9bdc7;hp=49ea5d2c275bad70c6ee6a41932ef86d1ad07eb6;hpb=291ea8c0692472bcf99ccd089b6de45610be85b9;p=lugaru.git diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index 49ea5d2..383052e 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -49,7 +49,6 @@ extern XYZ viewer; extern int environment; extern float texscale; extern Terrain terrain; -extern int channels[100]; extern int kTextureSize; extern float screenwidth,screenheight; extern float gravity; @@ -158,28 +157,6 @@ extern int hostile; extern bool stillloading; extern bool winfreeze; -extern int numdialogues; -extern int numdialogueboxes[max_dialogues]; -extern int dialoguetype[max_dialogues]; -extern int dialogueboxlocation[max_dialogues][max_dialoguelength]; -extern float dialogueboxcolor[max_dialogues][max_dialoguelength][3]; -extern int dialogueboxsound[max_dialogues][max_dialoguelength]; -extern char dialoguetext[max_dialogues][max_dialoguelength][128]; -extern char dialoguename[max_dialogues][max_dialoguelength][64]; -extern XYZ dialoguecamera[max_dialogues][max_dialoguelength]; -extern XYZ participantlocation[max_dialogues][10]; -extern int participantfocus[max_dialogues][max_dialoguelength]; -extern int participantaction[max_dialogues][max_dialoguelength]; -extern float participantrotation[max_dialogues][10]; -extern XYZ participantfacing[max_dialogues][max_dialoguelength][10]; -extern float dialoguecamerarotation[max_dialogues][max_dialoguelength]; -extern float dialoguecamerarotation2[max_dialogues][max_dialoguelength]; -extern int indialogue; -extern int whichdialogue; -extern int directing; -extern float dialoguetime; -extern int dialoguegonethrough[20]; - extern bool campaign; extern float oldgamespeed; @@ -1315,18 +1292,12 @@ void Game::Setenvironment(int which) float temptexdetail; environment=which; -/* - OPENAL_SetPaused(channels[music1snow], true); - OPENAL_SetPaused(channels[music1grass], true); - OPENAL_SetPaused(channels[music1desert], true); - OPENAL_SetPaused(channels[wind], true); - OPENAL_SetPaused(channels[desertambient], true); -*/ - OPENAL_SetPaused(channels[stream_music1snow], true); - OPENAL_SetPaused(channels[stream_music1grass], true); - OPENAL_SetPaused(channels[stream_music1desert], true); - OPENAL_SetPaused(channels[stream_wind], true); - OPENAL_SetPaused(channels[stream_desertambient], true); + + pause_sound(stream_music1snow); + pause_sound(stream_music1grass); + pause_sound(stream_music1desert); + pause_sound(stream_wind); + pause_sound(stream_desertambient); if(environment==snowyenvironment){ @@ -1517,8 +1488,8 @@ void Game::Loadlevel(char *name){ if(!firstload){ oldlevel=50; } - OPENAL_SetPaused(channels[whooshsound], true); - OPENAL_SetPaused(channels[stream_firesound], true); + pause_sound(whooshsound); + pause_sound(stream_firesound); // Change the map filename into something that is os specific char *FixedFN = ConvertFileName(name); @@ -1528,7 +1499,7 @@ void Game::Loadlevel(char *name){ tfile=fopen( FixedFN, "rb" ); if(tfile) { - OPENAL_SetPaused(channels[stream_firesound], true); + pause_sound(stream_firesound); scoreadded=0; @@ -1693,21 +1664,6 @@ void Game::Loadlevel(char *name){ player[0].creature=rabbittype; } - for(i=0;i64||templength<=0)templength=64; @@ -1753,6 +1710,7 @@ void Game::Loadlevel(char *name){ break; } } + dialoguename[k][l][m] = 0; funpackf(tfile, "Bf Bf Bf", &dialoguecamera[k][l].x, &dialoguecamera[k][l].y, &dialoguecamera[k][l].z); funpackf(tfile, "Bi", &participantfocus[k][l]); funpackf(tfile, "Bi", &participantaction[k][l]); @@ -2309,11 +2267,11 @@ void Game::Tick() if(mainmenu==1||mainmenu==2||mainmenu==100){ OPENAL_SetFrequency(OPENAL_ALL, 0.001); emit_stream_np(stream_music3); - OPENAL_SetPaused(channels[music1], true); + pause_sound(music1); } } if(!mainmenu){ - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(stream_music3); resume_stream(music1); } } @@ -2387,7 +2345,7 @@ void Game::Tick() { //resume mainmenu=0; - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(stream_music3); resume_stream(music1); } } @@ -2417,7 +2375,7 @@ void Game::Tick() if(!gameon){ //quit tryquit=1; - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(stream_music3); } else{ //end game @@ -2500,9 +2458,9 @@ void Game::Tick() musictoggle=1-musictoggle; if(!musictoggle){ - OPENAL_SetPaused(channels[music1], true); - OPENAL_SetPaused(channels[stream_music2], true); - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(music1); + pause_sound(stream_music2); + pause_sound(stream_music3); for(i=0;i<4;i++){ oldmusicvolume[i]=0; @@ -2609,7 +2567,7 @@ void Game::Tick() mainmenu=0; gameon=1; - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(stream_music3); } if(Input::Button()&&!oldbutton&&(selected-7>=accountactive->getCampaignChoicesMade())){ fireSound(); @@ -2646,7 +2604,7 @@ void Game::Tick() campaign=1; mainmenu=0; gameon=1; - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(stream_music3); } if(Input::Button()&&!oldbutton&&selected==4){ fireSound(); @@ -2698,7 +2656,7 @@ void Game::Tick() mainmenu=0; gameon=1; - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(stream_music3); } if(Input::Button()&&!oldbutton&&selected==numchallengelevels){ fireSound(); @@ -3679,7 +3637,7 @@ void Game::Tick() player[k].targetanimation=walljumpleftanim; player[k].targetframe=0; emit_sound_at(movewhooshsound, player[k].coords); - if(k==0)OPENAL_SetPaused(channels[whooshsound], true); + if(k==0)pause_sound(whooshsound); lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0); player[k].rotation=-asin(0-lowpointtarget.x); @@ -3699,7 +3657,7 @@ void Game::Tick() player[k].targetanimation=walljumprightanim; player[k].targetframe=0; emit_sound_at(movewhooshsound, player[k].coords); - if(k==0)OPENAL_SetPaused(channels[whooshsound], true); + if(k==0)pause_sound(whooshsound); lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0); player[k].rotation=-asin(0-lowpointtarget.x); @@ -3719,7 +3677,7 @@ void Game::Tick() player[k].targetanimation=walljumpbackanim; player[k].targetframe=0; emit_sound_at(movewhooshsound, player[k].coords); - if(k==0)OPENAL_SetPaused(channels[whooshsound], true); + if(k==0)pause_sound(whooshsound); lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0); player[k].rotation=-asin(0-lowpointtarget.x); @@ -3739,7 +3697,7 @@ void Game::Tick() player[k].targetanimation=walljumpfrontanim; player[k].targetframe=0; emit_sound_at(movewhooshsound, player[k].coords); - if(k==0)OPENAL_SetPaused(channels[whooshsound], true); + if(k==0)pause_sound(whooshsound); lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0); player[k].rotation=-asin(0-lowpointtarget.x); @@ -3774,7 +3732,7 @@ void Game::Tick() player[k].onterrain=1; if(player[k].id==0){ - OPENAL_SetPaused(channels[whooshsound], true); + pause_sound(whooshsound); OPENAL_SetVolume(channels[whooshsound], 0); } @@ -3879,7 +3837,7 @@ void Game::Tick() if(j>10||!player[k].isRun()){ if(player[k].targetanimation==jumpdownanim||player[k].targetanimation==jumpupanim){ - if(k==0)OPENAL_SetPaused(channels[whooshsound], true); + if(k==0)pause_sound(whooshsound); } emit_sound_at(jumpsound, player[k].coords, 128.); @@ -4089,7 +4047,7 @@ void Game::Tick() } } if(!directing){ - OPENAL_SetPaused(channels[whooshsound], true); + pause_sound(whooshsound); viewer=dialoguecamera[whichdialogue][indialogue]; if(viewer.y0&&oldmusicvolume[2]<=0) emit_stream_np(stream_music3, musicvolume[2]); if(musicvolume[0]<=0&&oldmusicvolume[0]>0){ - OPENAL_SetPaused(channels[music1], true); + pause_sound(music1); } if(musicvolume[1]<=0&&oldmusicvolume[1]>0){ - OPENAL_SetPaused(channels[stream_music2], true); + pause_sound(stream_music2); } if(musicvolume[2]<=0&&oldmusicvolume[2]>0){ - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(stream_music3); } if(musicvolume[0]!=oldmusicvolume[0]){ @@ -7506,9 +7463,9 @@ void Game::TickOnceAfter(){ oldmusicvolume[i]=musicvolume[i]; } } else { - OPENAL_SetPaused(channels[music1], true); - OPENAL_SetPaused(channels[stream_music2], true); - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(music1); + pause_sound(stream_music2); + pause_sound(stream_music3); for(i=0;i<4;i++){ oldmusicvolume[i]=0; @@ -7765,7 +7722,7 @@ void Game::TickOnceAfter(){ campaign=1; mainmenu=0; gameon=1; - OPENAL_SetPaused(channels[stream_music3], true); + pause_sound(stream_music3); stealthloading=0; }