projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981204-1
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 4ff449d904886b55daa253e80a5d2325308292f8..321875dc2aba3f1a5b042f160a56aee319b2fddf 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-160,14
+160,14
@@
void InitSound()
*/
#endif
*/
#endif
-#else
+#else
/* MSDOS */
sound_loops_allowed = TRUE;
/*
setup.sound_loops_on = TRUE;
*/
sound_loops_allowed = TRUE;
/*
setup.sound_loops_on = TRUE;
*/
-#endif
+#endif
/* MSDOS */
for(i=0; i<NUM_SOUNDS; i++)
{
for(i=0; i<NUM_SOUNDS; i++)
{
@@
-188,7
+188,11
@@
void InitSoundServer()
if (sound_status == SOUND_OFF)
return;
if (sound_status == SOUND_OFF)
return;
-#ifndef MSDOS
+#ifdef MSDOS
+ SoundServer();
+ return;
+#endif
+
if (pipe(sound_pipe)<0)
{
Error(ERR_WARN, "cannot create pipe - no sounds");
if (pipe(sound_pipe)<0)
{
Error(ERR_WARN, "cannot create pipe - no sounds");
@@
-212,9
+216,6
@@
void InitSoundServer()
}
else /* we are parent */
close(sound_pipe[0]); /* no reading from pipe needed */
}
else /* we are parent */
close(sound_pipe[0]); /* no reading from pipe needed */
-#else
- SoundServer();
-#endif
}
void InitJoysticks()
}
void InitJoysticks()
@@
-255,7
+256,8
@@
void InitJoysticks()
joystick_status = JOYSTICK_AVAILABLE;
}
joystick_status = JOYSTICK_AVAILABLE;
}
-#else
+
+#else /* MSDOS */
/* try to access two joysticks; if that fails, try to access just one */
if (install_joystick(JOY_TYPE_2PADS) == 0 ||
/* try to access two joysticks; if that fails, try to access just one */
if (install_joystick(JOY_TYPE_2PADS) == 0 ||
@@
-533,7
+535,7
@@
void InitGfx()
#ifdef MSDOS
DrawInitText("MSDOS version done by Guido Schulz",210,FC_BLUE);
rest(200);
#ifdef MSDOS
DrawInitText("MSDOS version done by Guido Schulz",210,FC_BLUE);
rest(200);
-#endif
MSDOS
+#endif
/* MSDOS */
DrawInitText("Loading graphics:",120,FC_GREEN);
for(i=0; i<NUM_PICTURES; i++)
DrawInitText("Loading graphics:",120,FC_GREEN);
for(i=0; i<NUM_PICTURES; i++)
@@
-659,13
+661,7
@@
void LoadGfx(int pos, struct PictureFileInfo *pic)
char *picturemask_ext = "Mask.xbm";
#else
int pcx_err;
char *picturemask_ext = "Mask.xbm";
#else
int pcx_err;
-
-#if 1
char *picture_ext = ".pcx";
char *picture_ext = ".pcx";
-#else
- char *picture_ext = ".gif";
-#endif
-
#endif
/* Grafik laden */
#endif
/* Grafik laden */
@@
-678,7
+674,7
@@
void LoadGfx(int pos, struct PictureFileInfo *pic)
#ifdef MSDOS
rest(100);
#ifdef MSDOS
rest(100);
-#endif
MSDOS
+#endif
/* MSDOS */
#if DEBUG_TIMING
debug_print_timestamp(1, NULL); /* initialize timestamp function */
#if DEBUG_TIMING
debug_print_timestamp(1, NULL); /* initialize timestamp function */