X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=7d0c731ba252e532f0df5cf6ca38a648c8818fb0;hb=234748b5eb0bc4fe29a36fd25a1d25658f53858a;hp=66ce6f42545ebc318dfb113636a7f73a27322144;hpb=01295e7cfce6354e2fad160ba0ce2880546d7a60;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 66ce6f42..7d0c731b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -31,6 +31,15 @@
 
 static char *image_filename[NUM_PICTURES] =
 {
+#if 0
+  "RocksScreen.pcx",
+  "RocksDoor.pcx",
+  "RocksToons.pcx",
+  "RocksFontBig.pcx",
+  "RocksFontSmall.pcx",
+  "RocksFontMedium.pcx",
+  "RocksFontEM.pcx"
+#else
   "RocksScreen.pcx",
   "RocksElements.pcx",
   "RocksDoor.pcx",
@@ -43,6 +52,7 @@ static char *image_filename[NUM_PICTURES] =
   "RocksFontSmall.pcx",
   "RocksFontMedium.pcx",
   "RocksFontEM.pcx"
+#endif
 }; 
 
 static void InitSetup(void);
@@ -109,9 +119,9 @@ void OpenAll(void)
 
   InitLevelInfo();
   InitLevelArtworkInfo();
-  InitGadgets();		/* needs to know number of level series */
   InitImages();			/* needs to know current level directory */
   InitSound();			/* needs to know current level directory */
+  InitGadgets();		/* needs images + number of level series */
 
   InitGfxBackground();
   InitToons();
@@ -214,6 +224,8 @@ static void InitTileClipmasks()
   unsigned long clip_gc_valuemask;
 
 #if defined(TARGET_X11_NATIVE)
+
+#if 0
   GC copy_clipmask_gc;
 
   static struct
@@ -267,6 +279,8 @@ static void InitTileClipmasks()
     { GFX2_SHIELD_ACTIVE, 3 },
     { -1, 0 }
   };
+#endif
+
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
 
@@ -301,6 +315,7 @@ static void InitTileClipmasks()
 
 #if defined(TARGET_X11_NATIVE)
 
+#if 0
   /* create graphic context structures needed for clipping */
   clip_gc_values.graphics_exposures = False;
   clip_gc_valuemask = GCGraphicsExposures;
@@ -332,6 +347,7 @@ static void InitTileClipmasks()
   }
 
   XFreeGC(display, copy_clipmask_gc);
+#endif
 
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
@@ -937,10 +953,17 @@ void InitElementInfo()
     }
   }
 
+#if 0
   for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
     element_info[i].graphic[GFX_ACTION_DEFAULT] =
       GFX_CHAR_START + (i - EL_CHAR_START);
+#else
+  for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
+    element_info[i].graphic[GFX_ACTION_DEFAULT] =
+      IMG_CHAR_START + (i - EL_CHAR_START);
+#endif
 
+#if 0
   for (i=EL_SP_START; i<=EL_SP_END; i++)
   {
     int nr_element = i - EL_SP_START;
@@ -952,6 +975,7 @@ void InitElementInfo()
     element_info[i].graphic[GFX_ACTION_DEFAULT] =
       GFX_START_ROCKSSP + nr_graphic;
   }
+#endif
 
 #if 0
   /* this overrides some of the above default settings (GFX_SP_ZONK etc.) */
@@ -1017,7 +1041,7 @@ void InitElementInfo()
     int default_action_direction_graphic[NUM_MV_DIRECTIONS];
 
     if (default_action_graphic == -1)
-      default_action_graphic = EL_CHAR_QUESTION;
+      default_action_graphic = IMG_CHAR_QUESTION;
 
     for(dir=0; dir<NUM_MV_DIRECTIONS; dir++)
     {
@@ -1058,6 +1082,7 @@ static void InitGraphicInfo()
 
   image_files = getCurrentImageList();
 
+#if 0
   for(i=0; i<MAX_GRAPHICS; i++)
   {
     /* always start with reliable default values */
@@ -1068,6 +1093,7 @@ static void InitGraphicInfo()
     getGraphicSource(i, &graphic_info[i].bitmap,
 		     &graphic_info[i].src_x, &graphic_info[i].src_y);
   }
+#endif
 
   for(i=0; i<NUM_IMAGE_FILES; i++)
   {
@@ -1111,6 +1137,28 @@ static void InitGraphicInfo()
     if (parameter[GFX_ARG_MODE_REVERSE])
       new_graphic_info[i].anim_mode |= ANIM_REVERSE;
 
+#if 1
+    /* set first frame of animation after determining animation mode */
+    new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME];
+    if (new_graphic_info[i].anim_start_frame == -1)
+      new_graphic_info[i].anim_start_frame = 0;
+    else if (new_graphic_info[i].anim_mode & ANIM_REVERSE)
+      new_graphic_info[i].anim_start_frame =
+	new_graphic_info[i].anim_frames
+	- new_graphic_info[i].anim_start_frame - 1;
+#else
+    /* set first frame of animation after determining animation mode */
+    new_graphic_info[i].anim_start_frame = parameter[GFX_ARG_START_FRAME];
+    if (parameter[GFX_ARG_START_FRAME] == -1)	/* default: start with ... */
+    {
+      if (parameter[GFX_ARG_MODE_REVERSE])
+	new_graphic_info[i].anim_start_frame =
+	  new_graphic_info[i].anim_frames - 1;		/* ... last frame */
+      else
+	new_graphic_info[i].anim_start_frame = 0;	/* ... first frame */
+    }
+#endif
+
     /* animation synchronized with global frame counter, not move position */
     new_graphic_info[i].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
   }