rnd-20080115-1-src

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index b26add564164aa3468f02f09a5e8bb8c9cf2fff5..962a457ff83440fb04685d43b50556081b357416 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -503,6 +503,16 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
     return;
   }
 
+#if 0
+  printf("::: !!! FADING %d ... [%d] [%d]\n", fade_mode, fade_type,
+        fade_type_skip);
+#endif
+
+#if 1
+  fade_delay = fading.fade_delay;
+  post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0);
+#endif
+
   if (fade_type_skip != FADE_TYPE_NONE)
   {
 #if 0
@@ -513,7 +523,11 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
     if (fade_type & fade_type_skip)
       fade_type_skip = FADE_TYPE_NONE;
 
+#if 1
+    fade_delay = 0;
+#else
     return;
+#endif
   }
 
 #if 1
@@ -553,8 +567,10 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
     width  = FULL_SXSIZE;
     height = FULL_SYSIZE;
 
+#if 0
     fade_delay = fading.fade_delay;
     post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0);
+#endif
 
     if (border.draw_masked_when_fading)
       draw_border_function = DrawMaskedBorder_FIELD;   /* update when fading */
@@ -568,8 +584,10 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
     width  = WIN_XSIZE;
     height = WIN_YSIZE;
 
+#if 0
     fade_delay = fading.fade_delay;
     post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0);
+#endif
   }
 
 #if 1
@@ -6237,6 +6255,16 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em,
 
       GfxFrame[x][y]++;
 
+#if 0
+      /* !!! TEST !!! NEW !!! DOES NOT WORK RIGHT YET !!! */
+      if (g->double_movement && frame_em == 0)
+      {
+       GfxFrame[x][y] = 0;
+
+       // printf("::: resetting... [%d]\n", tile);
+      }
+#endif
+
       if (move_dir == MV_LEFT)
        GfxFrame[x - 1][y] = GfxFrame[x][y];
       else if (move_dir == MV_RIGHT)
@@ -6291,6 +6319,7 @@ void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em,
 {
   int action = object_mapping[tile].action;
   int direction = object_mapping[tile].direction;
+  boolean is_backside = object_mapping[tile].is_backside;
   int effective_element = get_effective_element_EM(tile, frame_em);
   int graphic = (direction == MV_NONE ?
                 el_act2img(effective_element, action) :
@@ -6330,8 +6359,13 @@ void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em,
                                g->anim_start_frame,
                                sync_frame);
 
+#if 0
+  getGraphicSourceExt(graphic, frame, &g_em->bitmap, &g_em->src_x, &g_em->src_y,
+                     g->double_movement && is_backside);
+#else
   getGraphicSourceExt(graphic, frame, &g_em->bitmap,
                      &g_em->src_x, &g_em->src_y, FALSE);
+#endif
 
   /* (updating the "crumbled" graphic definitions is probably not really needed,
      as animations for crumbled graphics can't be longer than one EMC cycle) */