From: Holger Schemel Date: Sun, 8 Sep 2002 13:36:42 +0000 (+0200) Subject: rnd-20020908-3-src X-Git-Tag: 3.0.0^2~245 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=64048311a753e16e92c29112a8a223a866ac45ef;p=rocksndiamonds.git rnd-20020908-3-src --- diff --git a/src/conftime.h b/src/conftime.h index 0a421ef7..faff9ca7 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2002-09-08 14:51]" +#define COMPILE_DATE_STRING "[2002-09-08 15:35]" diff --git a/src/init.c b/src/init.c index 93e2958f..2f19f949 100644 --- a/src/init.c +++ b/src/init.c @@ -858,7 +858,8 @@ static void InitGraphicInfo() image_files = getCurrentImageList(); - printf("--> %d\n", image_files[0].parameter[2]); + printf("D> %d\n", image_files[GFX_BD_DIAMOND].parameter[GFXARG_NUM_FRAMES]); + printf("W> %d\n", image_files[GFX_ROBOT_WHEEL].parameter[GFXARG_NUM_FRAMES]); for(i=0; ifile_list; } +Bitmap *getBitmapFromImageID(int graphic) +{ + ImageInfo **img_info = (ImageInfo **)image_info->artwork_list; + + return img_info[graphic]->bitmap; +} + void InitImageList(struct ConfigInfo *config_list, struct ConfigInfo *config_suffix_list, int num_file_list_entries) diff --git a/src/libgame/image.h b/src/libgame/image.h index 9d001aae..342b2536 100644 --- a/src/libgame/image.h +++ b/src/libgame/image.h @@ -73,6 +73,7 @@ int Read_PCX_to_Pixmap(Display *, Window, GC, char *, Pixmap *, Pixmap *); struct FileInfo *getCurrentImageList(); +Bitmap *getBitmapFromImageID(int); void InitImageList(struct ConfigInfo *, struct ConfigInfo *, int); void ReloadCustomImages(); void FreeAllImages(); diff --git a/src/main.h b/src/main.h index 986b53a0..c8f30b68 100644 --- a/src/main.h +++ b/src/main.h @@ -1459,12 +1459,19 @@ extern struct FileInfo *image_files, *sound_files; #define NUM_SOUNDS 55 +/* values for image configuration suffixes */ +#define GFXARG_FRAME_XPOS 0 +#define GFXARG_FRAME_YPOS 1 +#define GFXARG_NUM_FRAMES 2 + /* values for image configuration */ #define GFX_BD_DIAMOND 0 #define GFX_ROBOT_WHEEL 1 #define NUM_IMAGE_FILES 2 +/* values for sound configuration suffixes */ +/* (currently none) */ /* values for sound configuration */ #define SND_BD_EMPTY_SPACE_DIGGING 0