From: Holger Schemel <info@artsoft.org>
Date: Wed, 25 Mar 2015 20:27:08 +0000 (+0100)
Subject: moved new graphics to new image file for backward compatibility
X-Git-Tag: 4.0.0.0-rc1~225
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=eccf6b67a482ec5dd7040a245c189eed7f7646fe

moved new graphics to new image file for backward compatibility
---

diff --git a/graphics/gfx_classic/Makefile b/graphics/gfx_classic/Makefile
index f81b7f4f..041f3c8f 100644
--- a/graphics/gfx_classic/Makefile
+++ b/graphics/gfx_classic/Makefile
@@ -24,6 +24,7 @@ FILES = RocksBusy.$(EXT)	\
 	RocksDC.$(EXT)		\
 	RocksDC2.$(EXT)		\
 	RocksDoor.$(EXT)	\
+	RocksDoor2.$(EXT)	\
 	RocksEMC.$(EXT)		\
 	RocksElements.$(EXT)	\
 	RocksFontBig.$(EXT)	\
diff --git a/graphics/gfx_classic/RocksDoor.ilbm b/graphics/gfx_classic/RocksDoor.ilbm
index 13231581..82dd5788 100644
Binary files a/graphics/gfx_classic/RocksDoor.ilbm and b/graphics/gfx_classic/RocksDoor.ilbm differ
diff --git a/graphics/gfx_classic/RocksDoor2.ilbm b/graphics/gfx_classic/RocksDoor2.ilbm
new file mode 100644
index 00000000..0f169db3
Binary files /dev/null and b/graphics/gfx_classic/RocksDoor2.ilbm differ
diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index e749b222..1dc1c1b8 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4722,18 +4722,18 @@ struct ConfigInfo image_config[] =
   { "game.button.gfx.play.height",		"30"			},
   { "game.button.gfx.play.pressed_xoffset",	"-100"			},
 
-  { "game.button.gfx.undo",			"RocksDoor.png"		},
-  { "game.button.gfx.undo.x",			"405"			},
-  { "game.button.gfx.undo.y",			"215"			},
+  { "game.button.gfx.undo",			"RocksDoor2.png"	},
+  { "game.button.gfx.undo.x",			"105"			},
+  { "game.button.gfx.undo.y",			"20"			},
   { "game.button.gfx.undo.width",		"30"			},
   { "game.button.gfx.undo.height",		"30"			},
-  { "game.button.gfx.undo.pressed_yoffset",	"30"			},
-  { "game.button.gfx.redo",			"RocksDoor.png"		},
-  { "game.button.gfx.redo.x",			"465"			},
-  { "game.button.gfx.redo.y",			"215"			},
+  { "game.button.gfx.undo.pressed_xoffset",	"-100"			},
+  { "game.button.gfx.redo",			"RocksDoor2.png"	},
+  { "game.button.gfx.redo.x",			"165"			},
+  { "game.button.gfx.redo.y",			"20"			},
   { "game.button.gfx.redo.width",		"30"			},
   { "game.button.gfx.redo.height",		"30"			},
-  { "game.button.gfx.redo.pressed_yoffset",	"30"			},
+  { "game.button.gfx.redo.pressed_xoffset",	"-100"			},
 
   { "game.button.gfx.save",			UNDEFINED_FILENAME	},
   { "game.button.gfx.load",			UNDEFINED_FILENAME	},
@@ -5416,12 +5416,12 @@ struct ConfigInfo image_config[] =
   { "editor.button.gfx.next_level.height",	"16"			},
   { "editor.button.gfx.next_level.pressed_xoffset", "-16"		},
 
-  { "editor.button.gfx.properties",		"RocksDoor.png"		},
-  { "editor.button.gfx.properties.x",		"505"			},
-  { "editor.button.gfx.properties.y",		"110"			},
+  { "editor.button.gfx.properties",		"RocksDoor2.png"	},
+  { "editor.button.gfx.properties.x",		"105"			},
+  { "editor.button.gfx.properties.y",		"0"			},
   { "editor.button.gfx.properties.width",	"90"			},
   { "editor.button.gfx.properties.height",	"20"			},
-  { "editor.button.gfx.properties.pressed_yoffset", "-20"		},
+  { "editor.button.gfx.properties.pressed_xoffset", "-100"		},
 
   { "editor.no_toolbox_button",			"RocksDoor.png"		},
   { "editor.no_toolbox_button.x",		"506"			},
@@ -5509,13 +5509,13 @@ struct ConfigInfo image_config[] =
   { "editor.button.gfx.rotate_left.pressed_xoffset", "-100"		},
   { "editor.button.gfx.rotate_left.active_yoffset",  "-94"		},
 
-  { "editor.button.gfx.zoom_level",		"RocksDoor.png"		},
-  { "editor.button.gfx.zoom_level.x",		"750"			},
-  { "editor.button.gfx.zoom_level.y",		"286"			},
+  { "editor.button.gfx.zoom_level",		"RocksDoor2.png"	},
+  { "editor.button.gfx.zoom_level.x",		"350"			},
+  { "editor.button.gfx.zoom_level.y",		"22"			},
   { "editor.button.gfx.zoom_level.width",	"22"			},
   { "editor.button.gfx.zoom_level.height",	"22"			},
   { "editor.button.gfx.zoom_level.pressed_xoffset", "-100"		},
-  { "editor.button.gfx.zoom_level.active_yoffset",  "-94"		},
+  { "editor.button.gfx.zoom_level.active_yoffset",  "-22"		},
 
   { "editor.button.gfx.rotate_right",		"RocksDoor.png"		},
   { "editor.button.gfx.rotate_right.x",		"772"			},
@@ -5607,7 +5607,7 @@ struct ConfigInfo image_config[] =
   { "editor.button.gfx.cp_paste.y",		"70"			},
   { "editor.button.gfx.cp_paste.width",		"20"			},
   { "editor.button.gfx.cp_paste.height",	"20"			},
-  { "editor.button.gfx.cp_paste.pressed_xoffset", "-20"		},
+  { "editor.button.gfx.cp_paste.pressed_xoffset", "-20"			},
 
   { "editor.button.gfx.undo",			"RocksDoor.png"		},
   { "editor.button.gfx.undo.x",			"705"			},