projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981216-1
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 4ff449d904886b55daa253e80a5d2325308292f8..f2e48bf0b82f5a66d5e173892df1067721b8ddb7 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-17,6
+17,7
@@
#include "misc.h"
#include "sound.h"
#include "screens.h"
#include "misc.h"
#include "sound.h"
#include "screens.h"
+#include "editor.h"
#include "tools.h"
#include "files.h"
#include "joystick.h"
#include "tools.h"
#include "files.h"
#include "joystick.h"
@@
-66,6
+67,7
@@
void OpenAll(int argc, char *argv[])
InitSoundServer();
InitJoysticks();
InitRND(NEW_RANDOMIZE);
InitSoundServer();
InitJoysticks();
InitRND(NEW_RANDOMIZE);
+ InitLevelEditorGadgets();
signal(SIGINT, CloseAllAndExit);
signal(SIGTERM, CloseAllAndExit);
signal(SIGINT, CloseAllAndExit);
signal(SIGTERM, CloseAllAndExit);
@@
-160,20
+162,21
@@
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++)
{
#ifdef MSDOS
for(i=0; i<NUM_SOUNDS; i++)
{
#ifdef MSDOS
-
sprintf(sound_name[i], "%d", i+
1);
+
sprintf(sound_name[i], "%d", i +
1);
#endif
#endif
+
Sound[i].name = sound_name[i];
if (!LoadSound(&Sound[i]))
{
Sound[i].name = sound_name[i];
if (!LoadSound(&Sound[i]))
{
@@
-189,6
+192,7
@@
void InitSoundServer()
return;
#ifndef MSDOS
return;
#ifndef MSDOS
+
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,12
@@
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
+
+#else /* MSDOS */
+
SoundServer();
SoundServer();
-#endif
+
+#endif /* MSDOS */
}
void InitJoysticks()
}
void InitJoysticks()
@@
-255,7
+262,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
+541,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
+667,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
+680,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 */