X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=b5d32eabfc06162d75afdd5509f95490a0e19c2f;hb=be1c10e7863850eba871b2c0da9d635313b2bc01;hp=49dca0a7271981c746a4e9f41e97ab43fca69cc8;hpb=7992b03de18aad8527835dfa03375f3a30a7e673;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 49dca0a7..b5d32eab 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -418,6 +418,10 @@ struct ConfigInfo image_config[] =
   { "sp_murphy.sleeping.right.frames",		"3"			},
   { "sp_murphy.sleeping.right.delay",		"100"			},
   { "sp_murphy.sleeping.right.anim_mode",	"linear"		},
+  { "sp_murphy.shrinking",			"RocksSP.pcx"		},
+  { "sp_murphy.shrinking.xpos",			"8"			},
+  { "sp_murphy.shrinking.ypos",			"14"			},
+  { "sp_murphy.shrinking.frames",		"8"			},
 
   { "sp_murphy_clone",				"RocksSP.pcx"		},
   { "sp_murphy_clone.xpos",			"3"			},
@@ -431,6 +435,16 @@ struct ConfigInfo image_config[] =
   { "sp_infotron.EDITOR",			"RocksSP.pcx"		},
   { "sp_infotron.EDITOR.xpos",			"8"			},
   { "sp_infotron.EDITOR.ypos",			"11"			},
+  { "sp_infotron.moving.left",			"RocksSP.pcx"		},
+  { "sp_infotron.moving.left.xpos",		"8"			},
+  { "sp_infotron.moving.left.ypos",		"13"			},
+  { "sp_infotron.moving.left.frames",		"8"			},
+  { "sp_infotron.moving.right",			"RocksSP.pcx"		},
+  { "sp_infotron.moving.right.xpos",		"8"			},
+  { "sp_infotron.moving.right.ypos",		"13"			},
+  { "sp_infotron.moving.right.frames",		"8"			},
+  { "sp_infotron.moving.right.start_frame",	"6"			},
+  { "sp_infotron.moving.right.anim_mode",	"reverse"		},
   { "sp_infotron.collecting",			"RocksSP.pcx"		},
   { "sp_infotron.collecting.xpos",		"8"			},
   { "sp_infotron.collecting.ypos",		"7"			},
@@ -553,85 +567,85 @@ struct ConfigInfo image_config[] =
   { "sp_gravity_port_right.ypos",		"1"			},
   { "sp_gravity_port_right.frames",		"1"			},
   { "sp_gravity_port_right.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_port_right.EDITOR.xpos",	"5"			},
-  { "sp_gravity_port_right.EDITOR.ypos",	"1"			},
+  { "sp_gravity_port_right.EDITOR.xpos",	"0"			},
+  { "sp_gravity_port_right.EDITOR.ypos",	"14"			},
   { "sp_gravity_port_down",			"RocksSP.pcx"		},
   { "sp_gravity_port_down.xpos",		"2"			},
   { "sp_gravity_port_down.ypos",		"1"			},
   { "sp_gravity_port_down.frames",		"1"			},
   { "sp_gravity_port_down.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_port_down.EDITOR.xpos",		"6"			},
-  { "sp_gravity_port_down.EDITOR.ypos",		"1"			},
+  { "sp_gravity_port_down.EDITOR.xpos",		"1"			},
+  { "sp_gravity_port_down.EDITOR.ypos",		"14"			},
   { "sp_gravity_port_left",			"RocksSP.pcx"		},
   { "sp_gravity_port_left.xpos",		"3"			},
   { "sp_gravity_port_left.ypos",		"1"			},
   { "sp_gravity_port_left.frames",		"1"			},
   { "sp_gravity_port_left.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_port_left.EDITOR.xpos",		"7"			},
-  { "sp_gravity_port_left.EDITOR.ypos",		"1"			},
+  { "sp_gravity_port_left.EDITOR.xpos",		"2"			},
+  { "sp_gravity_port_left.EDITOR.ypos",		"14"			},
   { "sp_gravity_port_up",			"RocksSP.pcx"		},
   { "sp_gravity_port_up.xpos",			"4"			},
   { "sp_gravity_port_up.ypos",			"1"			},
   { "sp_gravity_port_up.frames",		"1"			},
   { "sp_gravity_port_up.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_port_up.EDITOR.xpos",		"0"			},
-  { "sp_gravity_port_up.EDITOR.ypos",		"2"			},
+  { "sp_gravity_port_up.EDITOR.xpos",		"3"			},
+  { "sp_gravity_port_up.EDITOR.ypos",		"14"			},
   { "sp_gravity_on_port_right",			"RocksSP.pcx"		},
   { "sp_gravity_on_port_right.xpos",		"1"			},
   { "sp_gravity_on_port_right.ypos",		"1"			},
   { "sp_gravity_on_port_right.frames",		"1"			},
   { "sp_gravity_on_port_right.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_on_port_right.EDITOR.xpos",	"5"			},
-  { "sp_gravity_on_port_right.EDITOR.ypos",	"1"			},
+  { "sp_gravity_on_port_right.EDITOR.xpos",	"0"			},
+  { "sp_gravity_on_port_right.EDITOR.ypos",	"13"			},
   { "sp_gravity_on_port_down",			"RocksSP.pcx"		},
   { "sp_gravity_on_port_down.xpos",		"2"			},
   { "sp_gravity_on_port_down.ypos",		"1"			},
   { "sp_gravity_on_port_down.frames",		"1"			},
   { "sp_gravity_on_port_down.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_on_port_down.EDITOR.xpos",	"6"			},
-  { "sp_gravity_on_port_down.EDITOR.ypos",	"1"			},
+  { "sp_gravity_on_port_down.EDITOR.xpos",	"1"			},
+  { "sp_gravity_on_port_down.EDITOR.ypos",	"13"			},
   { "sp_gravity_on_port_left",			"RocksSP.pcx"		},
   { "sp_gravity_on_port_left.xpos",		"3"			},
   { "sp_gravity_on_port_left.ypos",		"1"			},
   { "sp_gravity_on_port_left.frames",		"1"			},
   { "sp_gravity_on_port_left.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_on_port_left.EDITOR.xpos",	"7"			},
-  { "sp_gravity_on_port_left.EDITOR.ypos",	"1"			},
+  { "sp_gravity_on_port_left.EDITOR.xpos",	"2"			},
+  { "sp_gravity_on_port_left.EDITOR.ypos",	"13"			},
   { "sp_gravity_on_port_up",			"RocksSP.pcx"		},
   { "sp_gravity_on_port_up.xpos",		"4"			},
   { "sp_gravity_on_port_up.ypos",		"1"			},
   { "sp_gravity_on_port_up.frames",		"1"			},
   { "sp_gravity_on_port_up.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_on_port_up.EDITOR.xpos",	"0"			},
-  { "sp_gravity_on_port_up.EDITOR.ypos",	"2"			},
+  { "sp_gravity_on_port_up.EDITOR.xpos",	"3"			},
+  { "sp_gravity_on_port_up.EDITOR.ypos",	"13"			},
   { "sp_gravity_off_port_right",		"RocksSP.pcx"		},
   { "sp_gravity_off_port_right.xpos",		"1"			},
   { "sp_gravity_off_port_right.ypos",		"1"			},
   { "sp_gravity_off_port_right.frames",		"1"			},
   { "sp_gravity_off_port_right.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_off_port_right.EDITOR.xpos",	"5"			},
-  { "sp_gravity_off_port_right.EDITOR.ypos",	"1"			},
+  { "sp_gravity_off_port_right.EDITOR.xpos",	"4"			},
+  { "sp_gravity_off_port_right.EDITOR.ypos",	"13"			},
   { "sp_gravity_off_port_down",			"RocksSP.pcx"		},
   { "sp_gravity_off_port_down.xpos",		"2"			},
   { "sp_gravity_off_port_down.ypos",		"1"			},
   { "sp_gravity_off_port_down.frames",		"1"			},
   { "sp_gravity_off_port_down.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_off_port_down.EDITOR.xpos",	"6"			},
-  { "sp_gravity_off_port_down.EDITOR.ypos",	"1"			},
+  { "sp_gravity_off_port_down.EDITOR.xpos",	"5"			},
+  { "sp_gravity_off_port_down.EDITOR.ypos",	"13"			},
   { "sp_gravity_off_port_left",			"RocksSP.pcx"		},
   { "sp_gravity_off_port_left.xpos",		"3"			},
   { "sp_gravity_off_port_left.ypos",		"1"			},
   { "sp_gravity_off_port_left.frames",		"1"			},
   { "sp_gravity_off_port_left.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_off_port_left.EDITOR.xpos",	"7"			},
-  { "sp_gravity_off_port_left.EDITOR.ypos",	"1"			},
+  { "sp_gravity_off_port_left.EDITOR.xpos",	"6"			},
+  { "sp_gravity_off_port_left.EDITOR.ypos",	"13"			},
   { "sp_gravity_off_port_up",			"RocksSP.pcx"		},
   { "sp_gravity_off_port_up.xpos",		"4"			},
   { "sp_gravity_off_port_up.ypos",		"1"			},
   { "sp_gravity_off_port_up.frames",		"1"			},
   { "sp_gravity_off_port_up.EDITOR",		"RocksSP.pcx"		},
-  { "sp_gravity_off_port_up.EDITOR.xpos",	"0"			},
-  { "sp_gravity_off_port_up.EDITOR.ypos",	"2"			},
+  { "sp_gravity_off_port_up.EDITOR.xpos",	"7"			},
+  { "sp_gravity_off_port_up.EDITOR.ypos",	"13"			},
 
   { "sp_sniksnak",				"RocksSP.pcx"		},
   { "sp_sniksnak.xpos",				"1"			},
@@ -4336,6 +4350,10 @@ struct ConfigInfo image_config[] =
   /* images not associated to game elements (used for menu screens etc.) */
   /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */
 
+#if 1
+  { "sp_objects",				"sp_objects.pcx"	},
+#endif
+
 #if 1
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
@@ -6344,6 +6362,8 @@ struct ConfigInfo image_config[] =
 
   { "game.forced_scroll_delay_value",		"-1"			},
   { "game.use_native_emc_graphics_engine",	"false"			},
+  { "game.use_native_sp_graphics_engine",	"true"			},
+  { "game.use_masked_pushing",			"false"			},
 
   { "[player].boring_delay_fixed",		"1000"			},
   { "[player].boring_delay_random",		"1000"			},