From: Holger Schemel <info@artsoft.org>
Date: Sat, 18 Jan 2003 11:47:40 +0000 (+0100)
Subject: rnd-20030118-3-src
X-Git-Tag: 3.0.0^2~173
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=384e7be695fc44634c08002e3eeccd9c45369645

rnd-20030118-3-src
---

diff --git a/src/conftime.h b/src/conftime.h
index e8274fb9..75512089 100644
--- 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 2d8cec32..b720f576 100644
--- 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 09ff42d4..5a47e633 100644
--- 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 7f92ca8f..a9666887 100644
--- 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 bf001ff0..c61cc5a3 100644
--- 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];