projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 947d0ef0d4c1aec6d10836a1b4fc26b39e9932a7..c129a676540638525f22d3e1c38facde79b61573 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-915,9
+915,8
@@
static void InitGraphicInfo()
int src_x, src_y;
int first_frame, last_frame;
int src_x, src_y;
int first_frame, last_frame;
-#if 1
- if (strcmp(image->token, "dynamite.EDITOR") == 0)
- printf("::: image: '%s' [%d]\n", image->token, i);
+#if 0
+ printf("::: image: '%s' [%d]\n", image->token, i);
#endif
#if 0
#endif
#if 0
@@
-930,11
+929,6
@@
static void InitGraphicInfo()
/* now check if no animation frames are outside of the loaded image */
/* now check if no animation frames are outside of the loaded image */
-#if 1
- if (graphic_info[i].bitmap == NULL)
- printf("::: graphic_info['%s'].bitmap == NULL\n", image->token);
-#endif
-
if (graphic_info[i].bitmap == NULL)
continue; /* skip check for optional images that are undefined */
if (graphic_info[i].bitmap == NULL)
continue; /* skip check for optional images that are undefined */
@@
-3247,7
+3241,7
@@
void InitLevelArtworkInfo()
static void InitImages()
{
static void InitImages()
{
-#if
0
+#if
1
setLevelArtworkDir(artwork.gfx_first);
#endif
setLevelArtworkDir(artwork.gfx_first);
#endif
@@
-3273,7
+3267,7
@@
static void InitSound(char *identifier)
if (identifier == NULL)
identifier = artwork.snd_current->identifier;
if (identifier == NULL)
identifier = artwork.snd_current->identifier;
-#if
0
+#if
1
/* set artwork path to send it to the sound server process */
setLevelArtworkDir(artwork.snd_first);
#endif
/* set artwork path to send it to the sound server process */
setLevelArtworkDir(artwork.snd_first);
#endif
@@
-3287,7
+3281,7
@@
static void InitMusic(char *identifier)
if (identifier == NULL)
identifier = artwork.mus_current->identifier;
if (identifier == NULL)
identifier = artwork.mus_current->identifier;
-#if
0
+#if
1
/* set artwork path to send it to the sound server process */
setLevelArtworkDir(artwork.mus_first);
#endif
/* set artwork path to send it to the sound server process */
setLevelArtworkDir(artwork.mus_first);
#endif