rnd-20030113-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index a10e8e6bf80ad5b0f277531c85fddf3ae54e2bad..29f59e295375df4880caf064ef3e918bdc9cd125 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -220,10 +220,8 @@ static void ReinitializeGraphics()
               new_graphic_info[IMG_FONT_SMALL].bitmap,
               new_graphic_info[IMG_FONT_EM].bitmap);
 
-  SetMainBackgroundBitmap(new_graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
-  SetDoorBackgroundBitmap(new_graphic_info[IMG_BACKGROUND_DOOR].bitmap ?
-                         new_graphic_info[IMG_BACKGROUND_DOOR].bitmap :
-                         new_graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
+  SetMainBackgroundImage(IMG_BACKGROUND_DEFAULT);
+  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
 
   InitGadgets();
   InitToons();
@@ -256,6 +254,7 @@ static void InitSound()
 
 static void InitTileClipmasks()
 {
+#if 0
 #if defined(TARGET_X11)
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
@@ -390,10 +389,12 @@ static void InitTileClipmasks()
 
 #endif /* TARGET_X11_NATIVE */
 #endif /* TARGET_X11 */
+#endif
 }
 
 void FreeTileClipmasks()
 {
+#if 0
 #if defined(TARGET_X11)
   int i;
 
@@ -422,6 +423,7 @@ void FreeTileClipmasks()
 #endif
 
 #endif /* TARGET_X11 */
+#endif
 }
 
 void InitGfx()
@@ -691,7 +693,7 @@ void InitElementInfo()
   int i, act, dir;
 
   /* set values to -1 to identify later as "uninitialized" values */
-  for (i=0; i<MAX_ELEMENTS; i++)
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
     for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
     {
@@ -736,7 +738,7 @@ void InitElementInfo()
   }
 
   /* now set all '-1' values to element specific default values */
-  for (i=0; i<MAX_ELEMENTS; i++)
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
     int default_action_graphic = element_info[i].graphic[GFX_ACTION_DEFAULT];
     int default_action_direction_graphic[NUM_MV_DIRECTIONS];
@@ -779,7 +781,6 @@ static void InitGraphicInfo()
 {
   static boolean clipmasks_initialized = FALSE;
   static int gfx_action[NUM_IMAGE_FILES];
-  Bitmap *src_bitmap;
   int src_x, src_y;
   int first_frame, last_frame;
   int i;
@@ -829,9 +830,12 @@ static void InitGraphicInfo()
 
   for (i=0; i<NUM_IMAGE_FILES; i++)
   {
+    Bitmap *src_bitmap = getBitmapFromImageID(i);
+    int num_xtiles = (src_bitmap ? src_bitmap->width          : TILEX) / TILEX;
+    int num_ytiles = (src_bitmap ? src_bitmap->height * 2 / 3 : TILEY) / TILEY;
     int *parameter = image_files[i].parameter;
 
-    new_graphic_info[i].bitmap = getBitmapFromImageID(i);
+    new_graphic_info[i].bitmap = src_bitmap;
 
     new_graphic_info[i].src_x = parameter[GFX_ARG_XPOS] * TILEX;
     new_graphic_info[i].src_y = parameter[GFX_ARG_YPOS] * TILEY;
@@ -851,7 +855,15 @@ static void InitGraphicInfo()
     if (parameter[GFX_ARG_YOFFSET] != GFX_ARG_UNDEFINED_VALUE)
       new_graphic_info[i].offset_y = parameter[GFX_ARG_YOFFSET];
 
-    new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+    /* automatically determine correct number of frames, if not defined */
+    if (parameter[GFX_ARG_FRAMES] != GFX_ARG_UNDEFINED_VALUE)
+      new_graphic_info[i].anim_frames = parameter[GFX_ARG_FRAMES];
+    else if (parameter[GFX_ARG_XPOS] == 0 && !parameter[GFX_ARG_VERTICAL])
+      new_graphic_info[i].anim_frames =        num_xtiles;
+    else if (parameter[GFX_ARG_YPOS] == 0 && parameter[GFX_ARG_VERTICAL])
+      new_graphic_info[i].anim_frames =        num_ytiles;
+    else
+      new_graphic_info[i].anim_frames = 1;
 
     new_graphic_info[i].anim_delay = parameter[GFX_ARG_DELAY];
     if (new_graphic_info[i].anim_delay == 0)   /* delay must be at least 1 */
@@ -866,7 +878,9 @@ static void InitGraphicInfo()
       new_graphic_info[i].anim_mode = ANIM_PINGPONG;
     else if (parameter[GFX_ARG_MODE_PINGPONG2])
       new_graphic_info[i].anim_mode = ANIM_PINGPONG2;
-    else if (parameter[GFX_ARG_FRAMES] > 1)
+    else if (parameter[GFX_ARG_MODE_RANDOM])
+      new_graphic_info[i].anim_mode = ANIM_RANDOM;
+    else if (new_graphic_info[i].anim_frames > 1)
       new_graphic_info[i].anim_mode = ANIM_LOOP;
     else
       new_graphic_info[i].anim_mode = ANIM_NONE;
@@ -932,8 +946,8 @@ static void InitGraphicInfo()
            getTokenFromImageID(i));
       Error(ERR_RETURN, "- image file: '%s'",
            src_bitmap->source_filename);
-      Error(ERR_EXIT, "error: last animation frame out of bounds (%d,%d)",
-           src_x, src_y);
+      Error(ERR_EXIT, "error: last animation frame (%d) out of bounds (%d,%d)",
+           last_frame, src_x, src_y);
     }
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
@@ -1866,6 +1880,7 @@ void InitElementProperties()
     EL_SAND,
     EL_SP_BASE,
     EL_SP_BUGGY_BASE,
+    EL_SP_BUGGY_BASE_ACTIVATING,
     EL_TRAP,
     EL_INVISIBLE_SAND,
     EL_INVISIBLE_SAND_ACTIVE
@@ -2178,21 +2193,21 @@ void InitElementProperties()
   static int num_properties1 = SIZEOF_ARRAY(ep1_num, int *);
   static int num_properties2 = SIZEOF_ARRAY(ep2_num, int *);
 
-  for (i=0; i<MAX_ELEMENTS; i++)
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    Elementeigenschaften1[i] = 0;
-    Elementeigenschaften2[i] = 0;
+    Properties1[i] = 0;
+    Properties2[i] = 0;
   }
 
   for (i=0; i<num_properties1; i++)
     for (j=0; j<*(ep1_num[i]); j++)
-      Elementeigenschaften1[(ep1_array[i])[j]] |= ep1_bit[i];
+      Properties1[(ep1_array[i])[j]] |= ep1_bit[i];
   for (i=0; i<num_properties2; i++)
     for (j=0; j<*(ep2_num[i]); j++)
-      Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
+      Properties2[(ep2_array[i])[j]] |= ep2_bit[i];
 
   for (i=EL_CHAR_START; i<=EL_CHAR_END; i++)
-    Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
+    Properties1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }
 
 void Execute_Command(char *command)
@@ -2245,6 +2260,18 @@ void Execute_Command(char *command)
 
     exit(0);
   }
+  else if (strncmp(command, "dump level ", 11) == 0)
+  {
+    char *filename = &command[11];
+
+    if (access(filename, F_OK) != 0)
+      Error(ERR_EXIT, "cannot open file '%s'", filename);
+
+    LoadLevelFromFilename(filename);
+    DumpLevel(&level);
+
+    exit(0);
+  }
   else if (strncmp(command, "dump tape ", 10) == 0)
   {
     char *filename = &command[10];