X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=8a6dd77e41a420c67283023e838c7e17ebc6f86d;hb=2e9b81c595b0150da80f8bf5ee56a74240fda6c1;hp=f569257ff91d00c30493830e839f14de0f3696d7;hpb=2455ce294b0108d3a848467ea9d30d049527a545;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index f569257f..8a6dd77e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -137,27 +137,26 @@ char *sound_name[NUM_SOUNDS] =
 };
 
 /* this is used to reduce memory usage of the different animation types */
-int anim_action_mapping[] =
+int graphics_action_mapping[] =
 {
-  0,		/* GFX_ACTION_UNKNOWN		(0)  */
-  0,		/* GFX_ACTION_DEFAULT		(1)  */
-  0,		/* GFX_ACTION_WAITING		(2)  */
-
-  1,		/* GFX_ACTION_FALLING		(3)  */
-  2,		/* GFX_ACTION_MOVING		(4)  */
-  3,		/* GFX_ACTION_DIGGING		(5)  */
-  4,		/* GFX_ACTION_SNAPPING		(6)  */
-  5,		/* GFX_ACTION_COLLECTING	(7)  */
-  6,		/* GFX_ACTION_PUSHING		(8)  */
-
-  7,		/* GFX_ACTION_PASSING		(9)  */
-  7,		/* GFX_ACTION_IMPACT		(10) */
-  7,		/* GFX_ACTION_CRACKING		(11) */
-  7,		/* GFX_ACTION_ACTIVATING	(12) */
-  7,		/* GFX_ACTION_EATING		(13) */
-  7,		/* GFX_ACTION_ATTACKING		(14) */
-  7,		/* GFX_ACTION_GROWING		(15) */
-  7		/* GFX_ACTION_OTHER		(14) */
+  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_ACTIVATING	(11) */
+  7,		/* GFX_ACTION_EATING		(12) */
+  7,		/* GFX_ACTION_ATTACKING		(13) */
+  7,		/* GFX_ACTION_GROWING		(14) */
+  7		/* GFX_ACTION_OTHER		(15) */
 };
 
 struct ConfigInfo image_config_suffix[] =
@@ -1033,6 +1032,10 @@ struct ConfigInfo image_config[] =
   { "spring.xpos",				"0"			},
   { "spring.ypos",				"5"			},
   { "spring.frames",				"1"			},
+  { "spring.moving",				"RocksMore.pcx"		},
+  { "spring.moving.xpos",			"0"			},
+  { "spring.moving.ypos",			"5"			},
+  { "spring.moving.frames",			"1"			},
 
   { "emc_steelwall1",				"RocksDC.pcx"		},
   { "emc_steelwall1.xpos",			"14"			},
@@ -1319,16 +1322,16 @@ struct ConfigInfo image_config[] =
   { "extra_time.ypos",				"0"			},
   { "extra_time.frames",			"6"			},
 
-  { "shield_deadly",				"RocksDC.pcx"		},
-  { "shield_deadly.xpos",			"8"			},
-  { "shield_deadly.ypos",			"1"			},
-  { "shield_deadly.frames",			"6"			},
-
   { "shield_normal",				"RocksDC.pcx"		},
   { "shield_normal.xpos",			"8"			},
   { "shield_normal.ypos",			"2"			},
   { "shield_normal.frames",			"6"			},
 
+  { "shield_deadly",				"RocksDC.pcx"		},
+  { "shield_deadly.xpos",			"8"			},
+  { "shield_deadly.ypos",			"1"			},
+  { "shield_deadly.frames",			"6"			},
+
   { "shield_normal.active",			"RocksHeroes.pcx"	},
   { "shield_normal.active.xpos",		"1"			},
   { "shield_normal.active.ypos",		"13"			},
@@ -2410,6 +2413,11 @@ struct ConfigInfo image_config[] =
   { "scrollbar_yellow.ypos",			"2"			},
   { "scrollbar_yellow.frames",			"1"			},
 
+  { "char_question",				"RocksFontEM.pcx"	},
+  { "char_question.xpos",			"15"			},
+  { "char_question.ypos",			"1"			},
+  { "char_question.frames",			"1"			},
+
   { NULL,					NULL			}
 };