mirror of
https://github.com/stevenhowes/CTheEscape.git
synced 2026-05-27 00:03:27 +01:00
Sounds for hail and tractor beam. Also sound sample for combadge. Todo un-loading/checking load of sound files.
This commit is contained in:
Binary file not shown.
+14
-1
@@ -95,7 +95,8 @@ struct Player_s Player;
|
|||||||
extern void game_respawn_npc(int id);
|
extern void game_respawn_npc(int id);
|
||||||
extern int tick;
|
extern int tick;
|
||||||
extern int lasttick;
|
extern int lasttick;
|
||||||
|
unsigned char tractorstart = 0;
|
||||||
|
unsigned char hailstart = 0;
|
||||||
enum debugs_e{dbbase,dbhitbox,dbweapons,dbinput,dbperformance,dbnpcs,dbprojectiles,dbmax};
|
enum debugs_e{dbbase,dbhitbox,dbweapons,dbinput,dbperformance,dbnpcs,dbprojectiles,dbmax};
|
||||||
int debugs[dbmax];
|
int debugs[dbmax];
|
||||||
|
|
||||||
@@ -803,6 +804,8 @@ void game_setup_audio()
|
|||||||
sound_pcm_loadsample(PCMSAMPLE_DURNOTORPEDO,"sounds.torpedo");
|
sound_pcm_loadsample(PCMSAMPLE_DURNOTORPEDO,"sounds.torpedo");
|
||||||
sound_pcm_loadsample(PCMSAMPLE_PHASER,"sounds.phaser");
|
sound_pcm_loadsample(PCMSAMPLE_PHASER,"sounds.phaser");
|
||||||
sound_pcm_loadsample(PCMSAMPLE_SHIPEXPLODE,"sounds.shpexp");
|
sound_pcm_loadsample(PCMSAMPLE_SHIPEXPLODE,"sounds.shpexp");
|
||||||
|
sound_pcm_loadsample(PCMSAMPLE_TRACTOR,"sounds.tractor");
|
||||||
|
sound_pcm_loadsample(PCMSAMPLE_HAIL,"sounds.hail");
|
||||||
}
|
}
|
||||||
void game_draw_hud()
|
void game_draw_hud()
|
||||||
{
|
{
|
||||||
@@ -1031,6 +1034,11 @@ int game1_tick()
|
|||||||
if(Player.remainingdistance <= 80000)
|
if(Player.remainingdistance <= 80000)
|
||||||
{
|
{
|
||||||
PROFILE(game_draw_tractor());
|
PROFILE(game_draw_tractor());
|
||||||
|
if(!tractorstart)
|
||||||
|
{
|
||||||
|
tractorstart = 1;
|
||||||
|
sound_pcm_playsample(PCMCHANNEL_AMBIENT,PCMSAMPLE_TRACTOR);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
game_tick_endingcentre();
|
game_tick_endingcentre();
|
||||||
@@ -1043,6 +1051,11 @@ int game1_tick()
|
|||||||
PROFILE(game_draw_player());
|
PROFILE(game_draw_player());
|
||||||
PROFILE(game_draw_npcs());
|
PROFILE(game_draw_npcs());
|
||||||
PROFILE(game_draw_projectiles());
|
PROFILE(game_draw_projectiles());
|
||||||
|
if(!hailstart)
|
||||||
|
{
|
||||||
|
hailstart = 1;
|
||||||
|
sound_pcm_playsample(PCMCHANNEL_AMBIENT,PCMSAMPLE_HAIL);
|
||||||
|
}
|
||||||
game_draw_comms("shuttlepod phoebe - this is the USS Archimedes.\npower down your engines and stand by for\nimmediate tractor beam recovery.");
|
game_draw_comms("shuttlepod phoebe - this is the USS Archimedes.\npower down your engines and stand by for\nimmediate tractor beam recovery.");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -255,7 +255,7 @@ void sound_pcm_loadsample(enum pcmsample_e sample, char* filename)
|
|||||||
// Length will be in R4 if it exists
|
// Length will be in R4 if it exists
|
||||||
length = outreg.r[4];
|
length = outreg.r[4];
|
||||||
|
|
||||||
if(length > 100000)
|
if(length > 96000)
|
||||||
{
|
{
|
||||||
screen_nobuffer();
|
screen_nobuffer();
|
||||||
while (1)
|
while (1)
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ enum pcmchannel_e{
|
|||||||
PCMCHANNEL_NPC2 = 7,
|
PCMCHANNEL_NPC2 = 7,
|
||||||
PCMCHANNEL_AMBIENT = 8
|
PCMCHANNEL_AMBIENT = 8
|
||||||
};
|
};
|
||||||
enum pcmsample_e{PCMSAMPLE_DURNOTORPEDO, PCMSAMPLE_PHASER, PCMSAMPLE_SHIPEXPLODE, PCMSAMPLE_MAX};
|
enum pcmsample_e{PCMSAMPLE_DURNOTORPEDO, PCMSAMPLE_PHASER, PCMSAMPLE_SHIPEXPLODE, PCMSAMPLE_TRACTOR, PCMSAMPLE_HAIL, PCMSAMPLE_MAX};
|
||||||
|
|
||||||
struct CompositionElement {
|
struct CompositionElement {
|
||||||
signed short int Start;
|
signed short int Start;
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
€€€€€€€€��€€�€~†…€`”�|†}†|•|}{‰~~�w‡pŠ€‡�|~}�{~�{x…|�„|€~~„~~€{�{�‚}�‚~‚|�~€~�€�~�~�€€€~€~€~€~€€€€€�€€€€€€€€€€��€~�€�€€~€~€€€€€€€€€€€€€€€~€€€€€€€€€�€~€€€€€€€€€€€€€€€€€€€€€€€�€€€€~€€€€€€~€€€€€~€€€€€€€€€€€~��€€€€€€€�€~€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€�€€€€�~�}‚}‚|�|�|„{„|�|‚‚|‡mĄPšn�s‚…kšbťe›k“u‡�{ŠtŽrŽrŚu�{�}‚|�y…{‚€~‚€|„~}‚€}�…y‚�~}…~{†z€„y‚…€y…‚x~„x…†{†�x€…yy��zy�{{‰|…‚†vŚ~‹tŽ}ŠwŠ„�‚}ŽwŽršl–lťl•rŹ�{�h§Z§R§]“r�€oŽg”f“eŤk—sŽzv�j}yŠk“f…€…�…~‡uŤ}Ťu‡u„}|~…x~z‚x‰x…{„}€€‚|�|�€}�~~€~�~€}‚|…x‰w‡v‰uŠ{„‚~Šv“o�mšl™o�}~‘k�g–i—i‰x€z�‚x�wŠpŹrŤx…}}‡w‰{„}��w†y�|‚y�|…wŠx‡~�~€‚{‡uŠw†z…|�~�z‚|�|�|�|�€~�}��}‚|‚€~�}‚y†z�{�}‚|„}‚~‚€€~€€€}�|�~��|�~�~�}�€€~€€~�~€~‚}�~�~€~�~‚}�~€€�~‚~�~€€�~€�€����~€€�~‚~�~€�~�~€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€�€€€€€€€€€€€€~€€€€€€€€€€€€�~€~…€�€~}|�€��€�~~~�€€€�~�|‚„€�}~€‚‚†€}}‰€v‚|~’���}„wvŚ��Śx~z„�~€‚~~~‚�}~~�‚}}���}}�€}Śu‚zs„x……‚†�z~{‚€‚€€€~€�€€€€�~€€€€€€€€€€€€€€~€€‚�~�‚€€~�}‚~€€€�~‚}‚}‚}�~�€€|�q‰y„|†{€€}�{„y…x†|�}~{�€�‚}}‚~�{~……{|~�…‚€‚~‚w…{~�}��z€€„€~€{…~}�~€~�}�„}€„{€}�€}�€|€�|~~�~€„}‚�‚{‚€€~€€�|‚|�{…y…w‡y…z�€�z�v‰z�y‡z�€€€€€}�}�€�€�€�}�|‚~‚}‚~‚~‚~�~�~�~�}‚}‚€~‚}�~�~€~€�~‚}‚~�~�~�~‚}�}�~€�€€~‚~�}„|…|…}…}„~‚�~†z�{„|†z…€�€�€€‚|„{„z…z�}€~‚{�|�|�}�~�~€€~‚�~‚~‚}‚€€€€€�~‚~�€�€€~�~€€~�~€€€€‚~�~����~�~�~€€~�~�€€€€€€€€€€€€€€€€€€€€€€€€~�~€€€€€�€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user