rnd-20020921-8-src

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 5ab9b5a9eedabbe4291a01be612679e23f129039..74d003cdbf7b2bdc65d71b8b43024ebc00a3824f 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -3030,7 +3030,6 @@ int el2gfx_OLD(int element)
     case EL_EXIT_OPENING:              return GFX_AUSGANG_ACT;
     case EL_EXIT_OPEN:                 return GFX_AUSGANG_AUF;
     case EL_SP_EXIT_OPEN:              return GFX_SP_EXIT;
-    case EL_PLAYER:                    return GFX_SPIELFIGUR;
     case EL_PLAYER1:                   return GFX_SPIELER1;
     case EL_PLAYER2:                   return GFX_SPIELER2;
     case EL_PLAYER3:                   return GFX_SPIELER3;
@@ -3133,10 +3132,10 @@ int el2gfx_OLD(int element)
     case EL_BD_MAGIC_WALL_EMPTYING:    return GFX_MAGIC_WALL_BD_EMPTY;
     case EL_BD_MAGIC_WALL_FULL:                return GFX_MAGIC_WALL_BD_FULL;
     case EL_BD_MAGIC_WALL_DEAD:                return GFX_MAGIC_WALL_BD_DEAD;
-    case EL_DYNABOMB_ACTIVE_1:         return GFX_DYNABOMB;
-    case EL_DYNABOMB_ACTIVE_2:         return GFX_DYNABOMB;
-    case EL_DYNABOMB_ACTIVE_3:         return GFX_DYNABOMB;
-    case EL_DYNABOMB_ACTIVE_4:         return GFX_DYNABOMB;
+    case EL_DYNABOMB_PLAYER1_ACTIVE:   return GFX_DYNABOMB;
+    case EL_DYNABOMB_PLAYER2_ACTIVE:   return GFX_DYNABOMB;
+    case EL_DYNABOMB_PLAYER3_ACTIVE:   return GFX_DYNABOMB;
+    case EL_DYNABOMB_PLAYER4_ACTIVE:   return GFX_DYNABOMB;
     case EL_DYNABOMB_NR:               return GFX_DYNABOMB_NR;
     case EL_DYNABOMB_SZ:               return GFX_DYNABOMB_SZ;
     case EL_DYNABOMB_XL:               return GFX_DYNABOMB_XL;
@@ -3315,6 +3314,12 @@ int el2gfx_OLD(int element)
 
 int el2gfx(int element)
 {
+#if 1
+  int graphic_OLD = el2gfx_OLD(element);
+
+  return graphic_OLD;
+#else
+
   int graphic_NEW = element_info[element].graphic[GFX_ACTION_DEFAULT];
 
 #if DEBUG
@@ -3333,10 +3338,17 @@ int el2gfx(int element)
 #endif
 
   return graphic_NEW;
+#endif
 }
 
 int el2img(int element)
 {
+#if 1
+  int graphic_NEW = element_info[element].graphic[GFX_ACTION_DEFAULT];
+
+  return graphic_NEW;
+#else
+
   switch(element)
   {
     case EL_BD_BUTTERFLY:      return IMG_BD_BUTTERFLY;
@@ -3348,16 +3360,31 @@ int el2img(int element)
   }
 
   return IMG_EMPTY_SPACE;
+#endif
 }
 
 int el_dir2img(int element, int direction)
 {
-  if (element_info[element].has_direction_graphic[GFX_ACTION_DEFAULT])
+  int action = GFX_ACTION_DEFAULT;
+
+  if (element_info[element].has_direction_graphic[action])
   {
-    int i = LOG_MV_DIR(direction);
+    int direction = MV_DIR_BIT(direction);
 
-    return element_info[element].direction_graphic[GFX_ACTION_DEFAULT][i];
+    return element_info[element].direction_graphic[action][direction];
   }
   else
     return el2img(element);
 }
+
+int el_dir_act2img(int element, int direction, int action)
+{
+  if (element_info[element].has_direction_graphic[action])
+  {
+    int direction = MV_DIR_BIT(direction);
+
+    return element_info[element].direction_graphic[action][direction];
+  }
+  else
+    return el_dir2img(element, direction);
+}