projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020906-3-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 183ba2b9a45862ff63d71ee25ca8666d2c405036..bb5dd45075a1945b90d2acf65df2a00fbda6c391 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-100,7
+100,6
@@
void OpenAll(void)
InitGfx();
InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
InitElementInfo();
InitGfx();
InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
InitElementInfo();
- InitGraphicInfo();
InitLevelInfo();
InitLevelArtworkInfo();
InitLevelInfo();
InitLevelArtworkInfo();
@@
-176,16
+175,37
@@
void InitNetworkServer()
static void InitImages()
{
static void InitImages()
{
- InitImageList(image_config, NUM_IMAGE_CONFIG_ENTRIES);
+ static char *suffix_list[] =
+ {
+ ".frame_xpos",
+ ".frame_ypos",
+ ".num_frames",
+ NULL
+ };
+
+ image_files =
+ getFileListFromConfigList(image_config, suffix_list, NUM_IMAGE_FILES);
+
+ InitImageList(image_files, NUM_IMAGE_FILES);
/* load custom images */
ReloadCustomImages();
/* load custom images */
ReloadCustomImages();
+ InitGraphicInfo();
}
static void InitMixer()
{
}
static void InitMixer()
{
+ static char *suffix_list[] =
+ {
+ NULL
+ };
+
OpenAudio();
OpenAudio();
- InitSoundList(sound_config, NUM_SOUND_CONFIG_ENTRIES);
+
+ sound_files =
+ getFileListFromConfigList(sound_config, suffix_list, NUM_SOUND_FILES);
+
+ InitSoundList(sound_files, NUM_SOUND_FILES);
StartMixer();
}
StartMixer();
}
@@
-310,11
+330,11
@@
static void InitTileClipmasks()
int tile = tile_needs_clipping[i].start + j;
int graphic = tile;
int src_x, src_y;
int tile = tile_needs_clipping[i].start + j;
int graphic = tile;
int src_x, src_y;
-
int pixmap_nr
;
+
Bitmap *src_bitmap
;
Pixmap src_pixmap;
Pixmap src_pixmap;
- getGraphicSource(graphic, &
pixmap_nr
, &src_x, &src_y);
- src_pixmap =
pix[pixmap_nr]
->clip_mask;
+ getGraphicSource(graphic, &
src_bitmap
, &src_x, &src_y);
+ src_pixmap =
src_bitmap
->clip_mask;
tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
TILEX, TILEY, 1);
tile_clipmask[tile] = XCreatePixmap(display, window->drawable,
TILEX, TILEY, 1);
@@
-497,6
+517,7
@@
void ReloadCustomArtwork()
}
ReloadCustomImages();
}
ReloadCustomImages();
+ InitGraphicInfo();
FreeTileClipmasks();
InitTileClipmasks();
FreeTileClipmasks();
InitTileClipmasks();
@@
-855,22
+876,15
@@
void InitGraphicInfo()
/* always start with reliable default values */
for(i=0; i<MAX_GRAPHICS; i++)
{
/* always start with reliable default values */
for(i=0; i<MAX_GRAPHICS; i++)
{
- graphic_info[i].bitmap =
pix[PIX_SP]; /* graphic that ... */
- graphic_info[i].src_x = 0;
/* ... contains ... */
- graphic_info[i].src_y = 0;
/* ... empty space. */
+ graphic_info[i].bitmap =
NULL;
+ graphic_info[i].src_x = 0;
+ graphic_info[i].src_y = 0;
graphic_info[i].anim_frames = 1;
graphic_info[i].anim_delay = 0;
graphic_info[i].anim_mode = ANIM_NORMAL;
graphic_info[i].anim_frames = 1;
graphic_info[i].anim_delay = 0;
graphic_info[i].anim_mode = ANIM_NORMAL;
- }
-
- for(i=0; i<MAX_GRAPHICS; i++)
- {
- int bitmap_nr;
- getGraphicSource(i, &
bitmap_nr
,
+ getGraphicSource(i, &
graphic_info[i].bitmap
,
&graphic_info[i].src_x, &graphic_info[i].src_y);
&graphic_info[i].src_x, &graphic_info[i].src_y);
-
- graphic_info[i].bitmap = pix[bitmap_nr];
}
}
}
}
@@
-2075,10
+2089,10
@@
void Execute_Debug_Command(char *command)
printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
printf("\n");
printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
printf("\n");
- for (i=0; i
<NUM_IMAGE_CONFIG_ENTRIES
; i++)
+ for (i=0; i
mage_config[i].token != NULL
; i++)
printf("# %s\n",
getFormattedSetupEntry(image_config[i].token,
printf("# %s\n",
getFormattedSetupEntry(image_config[i].token,
- image_config[i].
default_filenam
e));
+ image_config[i].
valu
e));
}
else if (strcmp(command, "create soundsinfo.conf") == 0)
{
}
else if (strcmp(command, "create soundsinfo.conf") == 0)
{
@@
-2092,10
+2106,10
@@
void Execute_Debug_Command(char *command)
printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
printf("\n");
printf("%s\n", getFormattedSetupEntry("sort_priority", "100"));
printf("\n");
- for (i=0;
i<NUM_SOUND_CONFIG_ENTRIES
; i++)
+ for (i=0;
sound_config[i].token != NULL
; i++)
printf("# %s\n",
getFormattedSetupEntry(sound_config[i].token,
printf("# %s\n",
getFormattedSetupEntry(sound_config[i].token,
- sound_config[i].
default_filenam
e));
+ sound_config[i].
valu
e));
}
else if (strcmp(command, "create musicinfo.conf") == 0)
{
}
else if (strcmp(command, "create musicinfo.conf") == 0)
{
@@
-2123,6
+2137,8
@@
void CloseAllAndExit(int exit_value)
FreeAllMusic();
CloseAudio(); /* called after freeing sounds (needed for SDL) */
FreeAllMusic();
CloseAudio(); /* called after freeing sounds (needed for SDL) */
+ FreeAllImages();
+
FreeTileClipmasks();
for(i=0; i<NUM_BITMAPS; i++)
FreeBitmap(pix[i]);
FreeTileClipmasks();
for(i=0; i<NUM_BITMAPS; i++)
FreeBitmap(pix[i]);