|
 |
978b477 |
--- ./main.cpp.gege 2002-10-11 23:21:02.000000000 +0200
|
|
|
978b477 |
+++ ./main.cpp 2003-04-25 12:42:28.000000000 +0200
|
|
|
978b477 |
@@ -228,9 +228,11 @@
|
|
|
978b477 |
if (game==1 && GLvar->delay>100) {
|
|
|
978b477 |
game=0;
|
|
|
978b477 |
#ifdef HAVE_LIBSDL_MIXER
|
|
|
978b477 |
+ if (mixerok) {
|
|
|
978b477 |
Mix_FreeMusic(GLvar->module1);
|
|
|
978b477 |
GLvar->module2 = Mix_LoadMUS(GLvar->getFullPath("samples/glax3.xm"));
|
|
|
978b477 |
Mix_PlayMusic(GLvar->module2,-1);
|
|
|
978b477 |
+ }
|
|
|
978b477 |
#endif
|
|
|
978b477 |
} else if (game==0) {
|
|
|
978b477 |
glEnable(GL_BLEND);
|
|
|
978b477 |
@@ -258,9 +260,11 @@
|
|
|
978b477 |
scene->globalList->Add(GLvar->mySpaceShip);
|
|
|
978b477 |
cheatCode=0;
|
|
|
978b477 |
#ifdef HAVE_LIBSDL_MIXER
|
|
|
978b477 |
+ if (mixerok) {
|
|
|
978b477 |
Mix_FreeMusic(GLvar->module2);
|
|
|
978b477 |
GLvar->module1 = Mix_LoadMUS(GLvar->getFullPath("samples/glax.xm"));
|
|
|
978b477 |
Mix_PlayMusic(GLvar->module1,-1);
|
|
|
978b477 |
+ }
|
|
|
978b477 |
#endif
|
|
|
978b477 |
}
|
|
|
978b477 |
}
|
|
|
978b477 |
--- ./sprite.cpp.gege 2002-10-04 20:05:22.000000000 +0200
|
|
|
978b477 |
+++ ./sprite.cpp 2003-04-25 12:42:55.000000000 +0200
|
|
|
978b477 |
@@ -58,17 +58,21 @@
|
|
|
978b477 |
|
|
|
978b477 |
#ifdef HAVE_LIBSDL_MIXER
|
|
|
978b477 |
void Sprite::SpritePlaySample(type_samples sampleToPlay,int volume) {
|
|
|
978b477 |
+ if (mixerok) {
|
|
|
978b477 |
if (z_<63) {
|
|
|
978b477 |
int v=Mix_PlayChannel(-1,GLvar->samples[sampleToPlay], 0);
|
|
|
978b477 |
Mix_Volume(v, (int)((63-z_)*2)*volume/128);
|
|
|
978b477 |
}
|
|
|
978b477 |
+ }
|
|
|
978b477 |
}
|
|
|
978b477 |
void Sprite::PlaySample(type_samples sampleToPlay,int volume) {
|
|
|
978b477 |
+ if (mixerok) {
|
|
|
978b477 |
if (GLvar->samples[sampleToPlay])
|
|
|
978b477 |
{
|
|
|
978b477 |
int v=Mix_PlayChannel(-1,GLvar->samples[sampleToPlay], 0);
|
|
|
978b477 |
Mix_Volume(v, volume);
|
|
|
978b477 |
}
|
|
|
978b477 |
+ }
|
|
|
978b477 |
}
|
|
|
978b477 |
#else
|
|
|
978b477 |
/* must exist because it has one or two parameters...
|
|
|
978b477 |
--- ./variables.cpp.gege 2002-10-17 23:53:00.000000000 +0200
|
|
|
978b477 |
+++ ./variables.cpp 2003-04-25 12:44:16.000000000 +0200
|
|
|
978b477 |
@@ -330,6 +330,7 @@
|
|
|
978b477 |
}
|
|
|
978b477 |
|
|
|
978b477 |
|
|
|
978b477 |
+int mixerok;
|
|
|
978b477 |
|
|
|
978b477 |
#ifdef HAVE_LIBSDL_MIXER
|
|
|
978b477 |
void GlaxiumVariables::initSound()
|
|
|
978b477 |
@@ -347,8 +348,10 @@
|
|
|
978b477 |
/* Open the audio device */
|
|
|
978b477 |
if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) < 0) {
|
|
|
978b477 |
fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
|
|
|
978b477 |
- exit(2);
|
|
|
978b477 |
+ mixerok = 0;
|
|
|
978b477 |
+ return;
|
|
|
978b477 |
} else {
|
|
|
978b477 |
+ mixerok = 1;
|
|
|
978b477 |
Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
|
|
|
978b477 |
printf("Opened audio at %d Hz %d bit %s, %d bytes audio buffer\n", audio_rate,
|
|
|
978b477 |
(audio_format&0xFF),
|
|
|
978b477 |
--- ./variables.hpp.gege 2002-10-10 17:15:16.000000000 +0200
|
|
|
978b477 |
+++ ./variables.hpp 2003-04-25 12:44:05.000000000 +0200
|
|
|
978b477 |
@@ -42,6 +42,7 @@
|
|
|
978b477 |
#include "mikmod.h"
|
|
|
978b477 |
#endif
|
|
|
978b477 |
|
|
|
978b477 |
+extern int mixerok;
|
|
|
978b477 |
|
|
|
978b477 |
#define SCALE .12
|
|
|
978b477 |
|