rnd-20030118-3-src

diff --git a/src/conftime.h b/src/conftime.h
index e8274fb940455014dffd3761d855a21fe58c213f..75512089a10bff8d06c40367da69e11961979443 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-01-18 12:18]"
+#define COMPILE_DATE_STRING "[2003-01-18 12:46]"

diff --git a/src/init.c b/src/init.c
index 2d8cec3204aab21796d42d9327075187c2ea9ff8..b720f5764cc04d3933085ad76a98ca0ebf413a97 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -692,7 +692,7 @@ void InitElementInfo()
   /* set values to -1 to identify later as "uninitialized" values */
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
+    for (act=0; act<NUM_GFX_ACTIONS; act++)
     {
       element_info[i].graphic[act] = -1;
 
@@ -717,9 +717,7 @@ void InitElementInfo()
     int action    = element_to_graphic[i].action;
     int graphic   = element_to_graphic[i].graphic;
 
-    if (action > -1)
-      action = graphics_action_mapping[action];
-    else
+    if (action < 0)
       action = GFX_ACTION_DEFAULT;
 
     if (direction > -1)
@@ -752,7 +750,7 @@ void InitElementInfo()
        default_action_direction_graphic[dir] = default_action_graphic;
     }
 
-    for (act=0; act<NUM_GFX_ACTIONS_MAPPED; act++)
+    for (act=0; act<NUM_GFX_ACTIONS; act++)
     {
       for (dir=0; dir<NUM_MV_DIRECTIONS; dir++)
       {

diff --git a/src/main.c b/src/main.c
index 09ff42d4b095e14bf96a0bf568d72ea0f09fbf4d..5a47e63390dec7f2a52e87435e546772346507f3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -84,37 +84,8 @@ struct TapeInfo              tape;
 struct SetupInfo       setup;
 struct GameInfo                game;
 struct GlobalInfo      global;
-
-
-/* this is used to reduce memory usage of the different animation types */
-int graphics_action_mapping[] =
-{
-  0,           /* GFX_ACTION_DEFAULT           (0)  */
-  0,           /* GFX_ACTION_WAITING           (1)  */
-
-  1,           /* GFX_ACTION_FALLING           (2)  */
-  2,           /* GFX_ACTION_MOVING            (3)  */
-  3,           /* GFX_ACTION_DIGGING           (4)  */
-  4,           /* GFX_ACTION_SNAPPING          (5)  */
-  5,           /* GFX_ACTION_COLLECTING        (6)  */
-  6,           /* GFX_ACTION_PUSHING           (7)  */
-
-  7,           /* GFX_ACTION_PASSING           (8)  */
-  7,           /* GFX_ACTION_IMPACT            (9)  */
-  7,           /* GFX_ACTION_CRACKING          (10) */
-  7,           /* GFX_ACTION_BREAKING          (11) */
-  7,           /* GFX_ACTION_ACTIVATING        (12) */
-  7,           /* GFX_ACTION_OPENING           (13) */
-  7,           /* GFX_ACTION_CLOSING           (14) */
-  7,           /* GFX_ACTION_EATING            (15) */
-  7,           /* GFX_ACTION_ATTACKING         (16) */
-  7,           /* GFX_ACTION_GROWING           (17) */
-  7,           /* GFX_ACTION_SHRINKING         (18) */
-  7            /* GFX_ACTION_OTHER             (19) */
-};
-
-struct FileInfo *image_files;
-struct FileInfo *sound_files;
+struct FileInfo               *image_files;
+struct FileInfo               *sound_files;
 
 struct ElementInfo element_info[MAX_NUM_ELEMENTS] =
 {

diff --git a/src/main.h b/src/main.h
index 7f92ca8fcbbb66dec41ce38529ffe5c5c384daa5..a96668871dc942d820d77797fccb5ef33d3c6e1f 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -780,7 +780,6 @@
 #define GFX_ACTION_OTHER               19
 
 #define NUM_GFX_ACTIONS                        20
-#define NUM_GFX_ACTIONS_MAPPED         8
 
 
 /* values for image configuration suffixes */
@@ -1031,10 +1030,10 @@ struct ElementInfo
   char *editor_description;    /* short description for level editor */
 
                                /* default graphics for several actions */
-  int graphic[NUM_GFX_ACTIONS_MAPPED];
+  int graphic[NUM_GFX_ACTIONS];
 
                                /* special graphics for left/right/up/down */
-  int direction_graphic[NUM_GFX_ACTIONS_MAPPED][NUM_MV_DIRECTIONS];
+  int direction_graphic[NUM_GFX_ACTIONS][NUM_MV_DIRECTIONS];
 };
 
 struct GraphicInfo

diff --git a/src/tools.c b/src/tools.c
index bf001ff0757e69f5bd83f07716688d06d33eea42..c61cc5a3494c69c51db38a00ce6483fb0234079c 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -2516,7 +2516,6 @@ int el_dir_act2img(int element, int direction, int action)
   }
 #endif
 
-  action = graphics_action_mapping[action];
   direction = MV_DIR_BIT(direction);
 
   return element_info[element].direction_graphic[action][direction];