projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed redrawing previous player name when aborting typing player name
[rocksndiamonds.git]
/
src
/
conf_gfx.c
diff --git
a/src/conf_gfx.c
b/src/conf_gfx.c
index a607b377908db46b56316ed92ece1ee4b839870b..009d28327c6a11125fd0470ea6f90d4cc0a65960 100644
(file)
--- a/
src/conf_gfx.c
+++ b/
src/conf_gfx.c
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// conf_gfx.c
// ============================================================================
// ----------------------------------------------------------------------------
// conf_gfx.c
// ============================================================================
@@
-1764,6
+1764,11
@@
struct ConfigInfo image_config[] =
{ "spring.ypos", "13" },
{ "spring.frames", "1" },
{ "spring.ypos", "13" },
{ "spring.frames", "1" },
+ { "spring.left", UNDEFINED_FILENAME },
+ { "spring.left.clone_from", "spring" },
+ { "spring.right", UNDEFINED_FILENAME },
+ { "spring.right.clone_from", "spring" },
+
{ "emc_steelwall_1", "RocksDC.png" },
{ "emc_steelwall_1.xpos", "14" },
{ "emc_steelwall_1.ypos", "0" },
{ "emc_steelwall_1", "RocksDC.png" },
{ "emc_steelwall_1.xpos", "14" },
{ "emc_steelwall_1.ypos", "0" },
@@
-6039,6
+6044,9
@@
struct ConfigInfo image_config[] =
{ "menu.button_play_solution", UNDEFINED_FILENAME },
{ "menu.button_play_solution.active", UNDEFINED_FILENAME },
{ "menu.button_play_solution", UNDEFINED_FILENAME },
{ "menu.button_play_solution.active", UNDEFINED_FILENAME },
+ { "menu.button_switch_ecs_aga", UNDEFINED_FILENAME },
+ { "menu.button_switch_ecs_aga.active", UNDEFINED_FILENAME },
+
{ "menu.button_touch_back", "RocksTouch.png" },
{ "menu.button_touch_back.x", "210" },
{ "menu.button_touch_back.y", "180" },
{ "menu.button_touch_back", "RocksTouch.png" },
{ "menu.button_touch_back.x", "210" },
{ "menu.button_touch_back.y", "180" },
@@
-6449,6
+6457,8
@@
struct ConfigInfo image_config[] =
{ "font.text_1.LEVELNR.clone_from", "font.text_1.LEVELS" },
{ "font.text_1.SETUP", UNDEFINED_FILENAME },
{ "font.text_1.SETUP.clone_from", "font.text_1.LEVELS" },
{ "font.text_1.LEVELNR.clone_from", "font.text_1.LEVELS" },
{ "font.text_1.SETUP", UNDEFINED_FILENAME },
{ "font.text_1.SETUP.clone_from", "font.text_1.LEVELS" },
+ { "font.text_1.NAMES", UNDEFINED_FILENAME },
+ { "font.text_1.NAMES.clone_from", "font.input_1.MAIN" },
{ "font.text_1.PREVIEW", "RocksFontEM.png" },
{ "font.text_1.PREVIEW.x", "0" },
{ "font.text_1.PREVIEW.y", "160" },
{ "font.text_1.PREVIEW", "RocksFontEM.png" },
{ "font.text_1.PREVIEW.x", "0" },
{ "font.text_1.PREVIEW.y", "160" },
@@
-6484,6
+6494,8
@@
struct ConfigInfo image_config[] =
{ "font.text_2.LEVELNR.clone_from", "font.text_2.LEVELS" },
{ "font.text_2.SETUP", UNDEFINED_FILENAME },
{ "font.text_2.SETUP.clone_from", "font.text_2.LEVELS" },
{ "font.text_2.LEVELNR.clone_from", "font.text_2.LEVELS" },
{ "font.text_2.SETUP", UNDEFINED_FILENAME },
{ "font.text_2.SETUP.clone_from", "font.text_2.LEVELS" },
+ { "font.text_2.NAMES", UNDEFINED_FILENAME },
+ { "font.text_2.NAMES.clone_from", "font.option_off" },
{ "font.text_2.PREVIEW", "RocksFontEM.png" },
{ "font.text_2.PREVIEW.x", "0" },
{ "font.text_2.PREVIEW.y", "160" },
{ "font.text_2.PREVIEW", "RocksFontEM.png" },
{ "font.text_2.PREVIEW.x", "0" },
{ "font.text_2.PREVIEW.y", "160" },
@@
-6513,6
+6525,8
@@
struct ConfigInfo image_config[] =
{ "font.text_3.LEVELNR.clone_from", "font.text_3.LEVELS" },
{ "font.text_3.SETUP", UNDEFINED_FILENAME },
{ "font.text_3.SETUP.clone_from", "font.text_3.LEVELS" },
{ "font.text_3.LEVELNR.clone_from", "font.text_3.LEVELS" },
{ "font.text_3.SETUP", UNDEFINED_FILENAME },
{ "font.text_3.SETUP.clone_from", "font.text_3.LEVELS" },
+ { "font.text_3.NAMES", UNDEFINED_FILENAME },
+ { "font.text_3.NAMES.clone_from", "font.menu_1" },
{ "font.text_3.PREVIEW", "RocksFontEM.png" },
{ "font.text_3.PREVIEW.x", "0" },
{ "font.text_3.PREVIEW.y", "160" },
{ "font.text_3.PREVIEW", "RocksFontEM.png" },
{ "font.text_3.PREVIEW.x", "0" },
{ "font.text_3.PREVIEW.y", "160" },
@@
-6544,6
+6558,8
@@
struct ConfigInfo image_config[] =
{ "font.text_4.LEVELNR.clone_from", "font.text_4.LEVELS" },
{ "font.text_4.SETUP", UNDEFINED_FILENAME },
{ "font.text_4.SETUP.clone_from", "font.text_4.LEVELS" },
{ "font.text_4.LEVELNR.clone_from", "font.text_4.LEVELS" },
{ "font.text_4.SETUP", UNDEFINED_FILENAME },
{ "font.text_4.SETUP.clone_from", "font.text_4.LEVELS" },
+ { "font.text_4.NAMES", UNDEFINED_FILENAME },
+ { "font.text_4.NAMES.clone_from", "font.menu_1.active" },
{ "font.text_4.SCORES", "RocksFontMedium.png" },
{ "font.text_4.SCORES.x", "0" },
{ "font.text_4.SCORES.y", "480" },
{ "font.text_4.SCORES", "RocksFontMedium.png" },
{ "font.text_4.SCORES.x", "0" },
{ "font.text_4.SCORES.y", "480" },
@@
-6592,6
+6608,8
@@
struct ConfigInfo image_config[] =
{ "font.input_1.MAIN.y", "0" },
{ "font.input_1.MAIN.width", "32" },
{ "font.input_1.MAIN.height", "32" },
{ "font.input_1.MAIN.y", "0" },
{ "font.input_1.MAIN.width", "32" },
{ "font.input_1.MAIN.height", "32" },
+ { "font.input_1.NAMES", UNDEFINED_FILENAME },
+ { "font.input_1.NAMES.clone_from", "font.input_1.MAIN" },
{ "font.input_1.active", "RocksFontSmall.png" },
{ "font.input_1.active.x", "0" },
{ "font.input_1.active.y", "210" },
{ "font.input_1.active", "RocksFontSmall.png" },
{ "font.input_1.active.x", "0" },
{ "font.input_1.active.y", "210" },
@@
-6602,6
+6620,8
@@
struct ConfigInfo image_config[] =
{ "font.input_1.active.MAIN.y", "480" },
{ "font.input_1.active.MAIN.width", "32" },
{ "font.input_1.active.MAIN.height", "32" },
{ "font.input_1.active.MAIN.y", "480" },
{ "font.input_1.active.MAIN.width", "32" },
{ "font.input_1.active.MAIN.height", "32" },
+ { "font.input_1.active.NAMES", UNDEFINED_FILENAME },
+ { "font.input_1.active.NAMES.clone_from", "font.input_1.active.MAIN" },
{ "font.input_1.active.SETUP", "RocksFontBig.png" },
{ "font.input_1.active.SETUP.x", "0" },
{ "font.input_1.active.SETUP.y", "0" },
{ "font.input_1.active.SETUP", "RocksFontBig.png" },
{ "font.input_1.active.SETUP.x", "0" },
{ "font.input_1.active.SETUP.y", "0" },
@@
-7170,6
+7190,7
@@
struct ConfigInfo image_config[] =
{ "background.TITLE_INITIAL", UNDEFINED_FILENAME },
{ "background.TITLE", UNDEFINED_FILENAME },
{ "background.MAIN", UNDEFINED_FILENAME },
{ "background.TITLE_INITIAL", UNDEFINED_FILENAME },
{ "background.TITLE", UNDEFINED_FILENAME },
{ "background.MAIN", UNDEFINED_FILENAME },
+ { "background.NAMES", UNDEFINED_FILENAME },
{ "background.LEVELS", UNDEFINED_FILENAME },
{ "background.LEVELNR", UNDEFINED_FILENAME },
{ "background.SCORES", UNDEFINED_FILENAME },
{ "background.LEVELS", UNDEFINED_FILENAME },
{ "background.LEVELNR", UNDEFINED_FILENAME },
{ "background.SCORES", UNDEFINED_FILENAME },
@@
-7693,6
+7714,7
@@
struct ConfigInfo image_config[] =
{ "border.draw_masked.TITLE", "false" },
{ "border.draw_masked.MAIN", "false" },
{ "border.draw_masked.TITLE", "false" },
{ "border.draw_masked.MAIN", "false" },
+ { "border.draw_masked.NAMES", "false" },
{ "border.draw_masked.LEVELS", "false" },
{ "border.draw_masked.LEVELNR", "false" },
{ "border.draw_masked.SCORES", "false" },
{ "border.draw_masked.LEVELS", "false" },
{ "border.draw_masked.LEVELNR", "false" },
{ "border.draw_masked.SCORES", "false" },
@@
-7771,6
+7793,8
@@
struct ConfigInfo image_config[] =
{ "menu.draw_yoffset", "0" },
{ "menu.draw_xoffset.MAIN", "0" },
{ "menu.draw_yoffset.MAIN", "0" },
{ "menu.draw_yoffset", "0" },
{ "menu.draw_xoffset.MAIN", "0" },
{ "menu.draw_yoffset.MAIN", "0" },
+ { "menu.draw_xoffset.NAMES", "0" },
+ { "menu.draw_yoffset.NAMES", "0" },
{ "menu.draw_xoffset.LEVELS", "0" },
{ "menu.draw_yoffset.LEVELS", "0" },
{ "menu.draw_xoffset.LEVELNR", "0" },
{ "menu.draw_xoffset.LEVELS", "0" },
{ "menu.draw_yoffset.LEVELS", "0" },
{ "menu.draw_xoffset.LEVELNR", "0" },
@@
-7799,6
+7823,8
@@
struct ConfigInfo image_config[] =
{ "menu.draw_yoffset.SETUP", "0" },
{ "menu.draw_xoffset.SETUP[GAME]", "0" },
{ "menu.draw_yoffset.SETUP[GAME]", "0" },
{ "menu.draw_yoffset.SETUP", "0" },
{ "menu.draw_xoffset.SETUP[GAME]", "0" },
{ "menu.draw_yoffset.SETUP[GAME]", "0" },
+ { "menu.draw_xoffset.SETUP[ENGINES]", "0" },
+ { "menu.draw_yoffset.SETUP[ENGINES]", "0" },
{ "menu.draw_xoffset.SETUP[EDITOR]", "0" },
{ "menu.draw_yoffset.SETUP[EDITOR]", "0" },
{ "menu.draw_xoffset.SETUP[GRAPHICS]", "0" },
{ "menu.draw_xoffset.SETUP[EDITOR]", "0" },
{ "menu.draw_yoffset.SETUP[EDITOR]", "0" },
{ "menu.draw_xoffset.SETUP[GRAPHICS]", "0" },
@@
-7834,6
+7860,7
@@
struct ConfigInfo image_config[] =
{ "menu.list.SETUP[CHOOSE_OTHER].valign", "top" },
{ "menu.list_size", "-1" },
{ "menu.list.SETUP[CHOOSE_OTHER].valign", "top" },
{ "menu.list_size", "-1" },
+ { "menu.list_size.NAMES", "-1" },
{ "menu.list_size.LEVELS", "-1" },
{ "menu.list_size.LEVELNR", "-1" },
{ "menu.list_size.SCORES", "-1" },
{ "menu.list_size.LEVELS", "-1" },
{ "menu.list_size.LEVELNR", "-1" },
{ "menu.list_size.SCORES", "-1" },
@@
-7887,7
+7914,7
@@
struct ConfigInfo image_config[] =
{ "menu.paragraph_spacing.INFO[MUSIC]", "-3" },
{ "menu.paragraph_spacing.INFO[CREDITS]", "-3" },
{ "menu.paragraph_spacing.INFO[PROGRAM]", "-3" },
{ "menu.paragraph_spacing.INFO[MUSIC]", "-3" },
{ "menu.paragraph_spacing.INFO[CREDITS]", "-3" },
{ "menu.paragraph_spacing.INFO[PROGRAM]", "-3" },
- { "menu.paragraph_spacing.INFO[VERSION]", "-
3
" },
+ { "menu.paragraph_spacing.INFO[VERSION]", "-
2
" },
{ "menu.paragraph_spacing.INFO[LEVELSET]", "-3" },
{ "menu.paragraph_spacing.SETUP[INPUT]", "-1" },
{ "menu.paragraph_spacing.INFO[LEVELSET]", "-3" },
{ "menu.paragraph_spacing.SETUP[INPUT]", "-1" },
@@
-7965,6
+7992,9
@@
struct ConfigInfo image_config[] =
{ "main.button.play_solution.x", "-1" },
{ "main.button.play_solution.y", "-1" },
{ "main.button.play_solution.x", "-1" },
{ "main.button.play_solution.y", "-1" },
+ { "main.button.switch_ecs_aga.x", "-1" },
+ { "main.button.switch_ecs_aga.y", "-1" },
+
{ "main.text.name.x", "-1" },
{ "main.text.name.y", "-1" },
{ "main.text.name.width", "-1" },
{ "main.text.name.x", "-1" },
{ "main.text.name.y", "-1" },
{ "main.text.name.width", "-1" },