X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=30fea5358e60e5be97d035300457c07345c284f8;hb=ab9b68feafe2cf6012533e5ad0581e6b9d423959;hp=33b276bb0f74832aef7e19dba45b011f82ed9942;hpb=b96c3dc500494652748c24f0aa48a8201ea202dd;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 33b276bb..30fea535 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,7 @@
 #include "joystick.h"
 #include "misc.h"
 
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
 #include <fcntl.h>
 #endif
 
@@ -35,9 +35,8 @@ Pixmap		clipmask[NUM_BITMAPS], tile_clipmask[NUM_TILES];
 DrawBuffer	drawto, drawto_field, backbuffer, fieldbuffer;
 Colormap	cmap;
 
-int		sound_pipe[2];
-int		sound_device;
 char	       *sound_device_name = SOUND_DEVICE;
+
 int		joystick_device = 0;
 char	       *joystick_device_name[MAX_PLAYERS] =
 {
@@ -57,8 +56,6 @@ boolean		motion_status = FALSE;
 int		key_joystick_mapping = 0;
 int	    	global_joystick_status = JOYSTICK_STATUS;
 int	    	joystick_status = JOYSTICK_STATUS;
-int	    	sound_status = SOUND_STATUS;
-boolean		sound_loops_allowed = FALSE;
 boolean		fullscreen_available = FULLSCREEN_STATUS;
 boolean		fullscreen_enabled = FALSE;
 
@@ -105,11 +102,12 @@ struct LevelDirInfo    *leveldir_first = NULL, *leveldir_current = NULL;
 struct LevelInfo	level;
 struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
-struct SoundInfo	Sound[NUM_SOUNDS];
+struct SampleInfo	Sound[NUM_SOUNDS];
 struct TapeInfo		tape;
 struct OptionInfo	options;
 struct SetupInfo	setup;
 struct GameInfo		game;
+struct AudioSystemInfo	audio;
 struct GlobalInfo	global;
 
 /* data needed for playing sounds */
@@ -569,7 +567,7 @@ int num_element_info = sizeof(element_info)/sizeof(char *);
 /* | SDL TEST STUFF                                                        | */
 /* +-----------------------------------------------------------------------+ */
 
-#ifdef	USE_SDL_JOYSTICK
+#if defined(TARGET_SDL)
 
 SDL_Surface *sdl_screen, *sdl_image_tmp, *sdl_image, *sdl_image_masked;
 SDL_Surface *sdl_image2_tmp, *sdl_image2, *sdl_image2_masked;
@@ -933,7 +931,7 @@ void TEST_SDL_JOYSTICK()
   SDL_QuitSubSystem(SDL_INIT_VIDEO|SDL_INIT_JOYSTICK);
 }
 
-#endif	/* USE_SDL_JOYSTICK */
+#endif	/* TARGET_SDL */
 
 /* +-----------------------------------------------------------------------+ */
 /* | SDL TEST STUFF                                                        | */
@@ -945,7 +943,7 @@ int main(int argc, char *argv[])
 {
   program_name = (strrchr(argv[0],'/') ? strrchr(argv[0],'/') + 1 : argv[0]);
 
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
   _fmode = O_BINARY;
 #endif
 
@@ -955,7 +953,7 @@ int main(int argc, char *argv[])
 #endif
 
 #if 0
-#ifdef USE_SDL_JOYSTICK
+#ifdef TARGET_SDL
   /*
   TEST_SDL_BLIT_RECT((WIN_XSIZE - TILEX)/2, (WIN_YSIZE - TILEY)/2);
   TEST_SDL_EVENT_LOOP();