projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020510-8-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index eee87022ee3146e7e37a903467f5a88f41fec398..a8bac24c6a44865422a2c3e44d55389631f8fb96 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-45,6
+45,7
@@
static void InitPlayerInfo(void);
static void InitLevelInfo(void);
static void InitArtworkInfo(void);
static void InitNetworkServer(void);
static void InitLevelInfo(void);
static void InitArtworkInfo(void);
static void InitNetworkServer(void);
+static void InitMixer(void);
static void InitSound(void);
static void InitGfx(void);
static void InitGfxBackground(void);
static void InitSound(void);
static void InitGfx(void);
static void InitGfxBackground(void);
@@
-74,7
+75,7
@@
void OpenAll(void)
InitArtworkInfo(); /* needed before loading gfx, sound & music */
InitCounter();
InitArtworkInfo(); /* needed before loading gfx, sound & music */
InitCounter();
- Init
Sound
();
+ Init
Mixer
();
InitJoysticks();
InitRND(NEW_RANDOMIZE);
InitJoysticks();
InitRND(NEW_RANDOMIZE);
@@
-89,6
+90,7
@@
void OpenAll(void)
InitLevelInfo();
InitGadgets(); /* needs to know number of level series */
InitLevelInfo();
InitGadgets(); /* needs to know number of level series */
+ InitSound(); /* needs to know current level directory */
InitGfxBackground();
InitToons();
InitGfxBackground();
InitToons();
@@
-151,30
+153,29
@@
void InitNetworkServer()
#endif
}
#endif
}
-
void InitSound
()
+
static void InitMixer
()
{
{
- int i;
-
OpenAudio();
OpenAudio();
+ InitSoundList(sound_effects, NUM_SOUND_EFFECTS);
- InitSoundList(NUM_SOUNDS);
-
- for(i=0; i<NUM_SOUNDS; i++)
- LoadSoundToList(sound_name[i], i);
-
- LoadCustomMusic();
+ StartMixer();
+}
- StartSoundserver();
+static void InitSound()
+{
+ InitReloadSounds(artwork.snd_current->name);
+ InitReloadMusic(artwork.mus_current->name);
}
}
-void InitTileClipmasks()
+
static
void InitTileClipmasks()
{
#if defined(TARGET_X11)
{
#if defined(TARGET_X11)
- GC copy_clipmask_gc;
XGCValues clip_gc_values;
unsigned long clip_gc_valuemask;
#if defined(TARGET_X11_NATIVE)
XGCValues clip_gc_values;
unsigned long clip_gc_valuemask;
#if defined(TARGET_X11_NATIVE)
+ GC copy_clipmask_gc;
+
static struct
{
int start;
static struct
{
int start;
@@
-1593,9
+1594,9
@@
void CloseAllAndExit(int exit_value)
int i;
StopSounds();
int i;
StopSounds();
- CloseAudio();
FreeAllSounds();
FreeAllMusic();
FreeAllSounds();
FreeAllMusic();
+ CloseAudio(); /* called after freeing sounds (needed for SDL) */
FreeTileClipmasks();
for(i=0; i<NUM_BITMAPS; i++)
FreeTileClipmasks();
for(i=0; i<NUM_BITMAPS; i++)