projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20111007-1-src
[rocksndiamonds.git]
/
src
/
conf_gfx.c
diff --git
a/src/conf_gfx.c
b/src/conf_gfx.c
index 1e318e419adf0bb8089c0fd33c0cf22bd8bbd974..c7ea0459eb926df74bf3a3e9d9e423aa0e1caeb1 100644
(file)
--- a/
src/conf_gfx.c
+++ b/
src/conf_gfx.c
@@
-4929,6
+4929,8
@@
struct ConfigInfo image_config[] =
{ "font.text_1.LEVELS.y", "0" },
{ "font.text_1.LEVELS.width", "16" },
{ "font.text_1.LEVELS.height", "32" },
{ "font.text_1.LEVELS.y", "0" },
{ "font.text_1.LEVELS.width", "16" },
{ "font.text_1.LEVELS.height", "32" },
+ { "font.text_1.LEVELNR", UNDEFINED_FILENAME },
+ { "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.PREVIEW", "RocksFontEM.pcx" },
{ "font.text_1.SETUP", UNDEFINED_FILENAME },
{ "font.text_1.SETUP.clone_from", "font.text_1.LEVELS" },
{ "font.text_1.PREVIEW", "RocksFontEM.pcx" },
@@
-4962,6
+4964,8
@@
struct ConfigInfo image_config[] =
{ "font.text_2.LEVELS.y", "160" },
{ "font.text_2.LEVELS.width", "16" },
{ "font.text_2.LEVELS.height", "32" },
{ "font.text_2.LEVELS.y", "160" },
{ "font.text_2.LEVELS.width", "16" },
{ "font.text_2.LEVELS.height", "32" },
+ { "font.text_2.LEVELNR", UNDEFINED_FILENAME },
+ { "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.PREVIEW", "RocksFontEM.pcx" },
{ "font.text_2.SETUP", UNDEFINED_FILENAME },
{ "font.text_2.SETUP.clone_from", "font.text_2.LEVELS" },
{ "font.text_2.PREVIEW", "RocksFontEM.pcx" },
@@
-4989,6
+4993,8
@@
struct ConfigInfo image_config[] =
{ "font.text_3.LEVELS.y", "320" },
{ "font.text_3.LEVELS.width", "16" },
{ "font.text_3.LEVELS.height", "32" },
{ "font.text_3.LEVELS.y", "320" },
{ "font.text_3.LEVELS.width", "16" },
{ "font.text_3.LEVELS.height", "32" },
+ { "font.text_3.LEVELNR", UNDEFINED_FILENAME },
+ { "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.PREVIEW", "RocksFontEM.pcx" },
{ "font.text_3.SETUP", UNDEFINED_FILENAME },
{ "font.text_3.SETUP.clone_from", "font.text_3.LEVELS" },
{ "font.text_3.PREVIEW", "RocksFontEM.pcx" },
@@
-5018,6
+5024,8
@@
struct ConfigInfo image_config[] =
{ "font.text_4.LEVELS.y", "480" },
{ "font.text_4.LEVELS.width", "16" },
{ "font.text_4.LEVELS.height", "32" },
{ "font.text_4.LEVELS.y", "480" },
{ "font.text_4.LEVELS.width", "16" },
{ "font.text_4.LEVELS.height", "32" },
+ { "font.text_4.LEVELNR", UNDEFINED_FILENAME },
+ { "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.SCORES", "RocksFontMedium.pcx" },
{ "font.text_4.SETUP", UNDEFINED_FILENAME },
{ "font.text_4.SETUP.clone_from", "font.text_4.LEVELS" },
{ "font.text_4.SCORES", "RocksFontMedium.pcx" },
@@
-5152,21
+5160,21
@@
struct ConfigInfo image_config[] =
{ "global.busy.frames_per_line", "7" },
{ "global.busy.delay", "2" },
{ "global.busy.frames_per_line", "7" },
{ "global.busy.delay", "2" },
- { "editor.element_border", "Rocks
Elements.pcx"
},
- { "editor.element_border.x
",
"0" },
- { "editor.element_border.y
", "0
" },
+ { "editor.element_border", "Rocks
More.pcx"
},
+ { "editor.element_border.x
pos",
"0" },
+ { "editor.element_border.y
pos", "2
" },
- { "editor.element_border_input", "Rocks
Door
.pcx" },
- { "editor.element_border_input.x
", "740"
},
- { "editor.element_border_input.y
", "48"
},
+ { "editor.element_border_input", "Rocks
More
.pcx" },
+ { "editor.element_border_input.x
pos", "10"
},
+ { "editor.element_border_input.y
pos", "7"
},
- { "editor.cascade_list", "Rocks
Door
.pcx" },
- { "editor.cascade_list.x
", "708"
},
- { "editor.cascade_list.y
", "80"
},
+ { "editor.cascade_list", "Rocks
More
.pcx" },
+ { "editor.cascade_list.x
pos", "10"
},
+ { "editor.cascade_list.y
pos", "8"
},
{ "editor.cascade_list.frames", "1" },
{ "editor.cascade_list.frames", "1" },
- { "editor.cascade_list.active", "Rocks
Door
.pcx" },
- { "editor.cascade_list.active.x
", "740"
},
- { "editor.cascade_list.active.y
", "80"
},
+ { "editor.cascade_list.active", "Rocks
More
.pcx" },
+ { "editor.cascade_list.active.x
pos", "9"
},
+ { "editor.cascade_list.active.y
pos", "8"
},
{ "editor.cascade_list.active.frames", "1" },
{ "background", UNDEFINED_FILENAME },
{ "editor.cascade_list.active.frames", "1" },
{ "background", UNDEFINED_FILENAME },
@@
-5174,6
+5182,7
@@
struct ConfigInfo image_config[] =
{ "background.TITLE", UNDEFINED_FILENAME },
{ "background.MAIN", UNDEFINED_FILENAME },
{ "background.LEVELS", UNDEFINED_FILENAME },
{ "background.TITLE", UNDEFINED_FILENAME },
{ "background.MAIN", UNDEFINED_FILENAME },
{ "background.LEVELS", UNDEFINED_FILENAME },
+ { "background.LEVELNR", UNDEFINED_FILENAME },
{ "background.SCORES", UNDEFINED_FILENAME },
{ "background.EDITOR", UNDEFINED_FILENAME },
{ "background.INFO", UNDEFINED_FILENAME },
{ "background.SCORES", UNDEFINED_FILENAME },
{ "background.EDITOR", UNDEFINED_FILENAME },
{ "background.INFO", UNDEFINED_FILENAME },
@@
-5186,12
+5195,16
@@
struct ConfigInfo image_config[] =
{ "background.SETUP", UNDEFINED_FILENAME },
{ "background.PLAYING", UNDEFINED_FILENAME },
{ "background.DOOR", UNDEFINED_FILENAME },
{ "background.SETUP", UNDEFINED_FILENAME },
{ "background.PLAYING", UNDEFINED_FILENAME },
{ "background.DOOR", UNDEFINED_FILENAME },
- { "background.PANEL", UNDEFINED_FILENAME },
{ "background.TAPE", "RocksDoor.pcx" },
{ "background.TAPE.x", "200" },
{ "background.TAPE.y", "280" },
{ "background.TAPE.width", "100" },
{ "background.TAPE.height", "100" },
{ "background.TAPE", "RocksDoor.pcx" },
{ "background.TAPE.x", "200" },
{ "background.TAPE.y", "280" },
{ "background.TAPE.width", "100" },
{ "background.TAPE.height", "100" },
+ { "background.PANEL", "RocksDoor.pcx" },
+ { "background.PANEL.x", "400" },
+ { "background.PANEL.y", "0" },
+ { "background.PANEL.width", "100" },
+ { "background.PANEL.height", "280" },
{ "background.titlescreen_initial_1", UNDEFINED_FILENAME },
{ "background.titlescreen_initial_2", UNDEFINED_FILENAME },
{ "background.titlescreen_initial_1", UNDEFINED_FILENAME },
{ "background.titlescreen_initial_2", UNDEFINED_FILENAME },
@@
-5493,6
+5506,7
@@
struct ConfigInfo image_config[] =
{ "border.draw_masked.TITLE", "false" },
{ "border.draw_masked.MAIN", "false" },
{ "border.draw_masked.LEVELS", "false" },
{ "border.draw_masked.TITLE", "false" },
{ "border.draw_masked.MAIN", "false" },
{ "border.draw_masked.LEVELS", "false" },
+ { "border.draw_masked.LEVELNR", "false" },
{ "border.draw_masked.SCORES", "false" },
{ "border.draw_masked.EDITOR", "false" },
{ "border.draw_masked.INFO", "false" },
{ "border.draw_masked.SCORES", "false" },
{ "border.draw_masked.EDITOR", "false" },
{ "border.draw_masked.INFO", "false" },
@@
-5553,6
+5567,8
@@
struct ConfigInfo image_config[] =
{ "menu.draw_yoffset.MAIN", "0" },
{ "menu.draw_xoffset.LEVELS", "0" },
{ "menu.draw_yoffset.LEVELS", "0" },
{ "menu.draw_yoffset.MAIN", "0" },
{ "menu.draw_xoffset.LEVELS", "0" },
{ "menu.draw_yoffset.LEVELS", "0" },
+ { "menu.draw_xoffset.LEVELNR", "0" },
+ { "menu.draw_yoffset.LEVELNR", "0" },
{ "menu.draw_xoffset.SCORES", "0" },
{ "menu.draw_yoffset.SCORES", "0" },
{ "menu.draw_xoffset.EDITOR", "0" },
{ "menu.draw_xoffset.SCORES", "0" },
{ "menu.draw_yoffset.SCORES", "0" },
{ "menu.draw_xoffset.EDITOR", "0" },
@@
-5604,6
+5620,7
@@
struct ConfigInfo image_config[] =
{ "menu.list_size", "-1" },
{ "menu.list_size.LEVELS", "-1" },
{ "menu.list_size", "-1" },
{ "menu.list_size.LEVELS", "-1" },
+ { "menu.list_size.LEVELNR", "-1" },
{ "menu.list_size.SCORES", "-1" },
{ "menu.list_size.INFO", "-1" },
{ "menu.list_size.SETUP", "-1" },
{ "menu.list_size.SCORES", "-1" },
{ "menu.list_size.INFO", "-1" },
{ "menu.list_size.SETUP", "-1" },
@@
-6590,7
+6607,7
@@
struct ConfigInfo image_config[] =
{ "tape.symbol.pause.x", "40" },
{ "tape.symbol.pause.y", "41" },
{ "tape.symbol.record.x", "25" },
{ "tape.symbol.pause.x", "40" },
{ "tape.symbol.pause.y", "41" },
{ "tape.symbol.record.x", "25" },
- { "tape.symbol.record.y", "
5"
},
+ { "tape.symbol.record.y", "
41"
},
{ "tape.symbol.play.x", "57" },
{ "tape.symbol.play.y", "41" },
{ "tape.symbol.fast_forward.x", "39" },
{ "tape.symbol.play.x", "57" },
{ "tape.symbol.play.y", "41" },
{ "tape.symbol.fast_forward.x", "39" },
@@
-6611,13
+6628,13
@@
struct ConfigInfo image_config[] =
{ "tape.label.pause.x", "5" },
{ "tape.label.pause.y", "61" },
{ "tape.label.record.x", "5" },
{ "tape.label.pause.x", "5" },
{ "tape.label.pause.y", "61" },
{ "tape.label.record.x", "5" },
- { "tape.label.record.y", "
5"
},
+ { "tape.label.record.y", "
41"
},
{ "tape.label.play.x", "70" },
{ "tape.label.play.y", "41" },
{ "tape.label.fast_forward.x", "5" },
{ "tape.label.fast_forward.y", "42" },
{ "tape.label.play.x", "70" },
{ "tape.label.play.y", "41" },
{ "tape.label.fast_forward.x", "5" },
{ "tape.label.fast_forward.y", "42" },
- { "tape.label.warp_forward.x", "
5"
},
- { "tape.label.warp_forward.y", "
42
" },
+ { "tape.label.warp_forward.x", "
-1"
},
+ { "tape.label.warp_forward.y", "
-1
" },
{ "tape.label.warp_forward_blind.x", "5" },
{ "tape.label.warp_forward_blind.y", "42" },
{ "tape.label.pause_before_end.x", "5" },
{ "tape.label.warp_forward_blind.x", "5" },
{ "tape.label.warp_forward_blind.y", "42" },
{ "tape.label.pause_before_end.x", "5" },
@@
-6648,6
+6665,7
@@
struct ConfigInfo image_config[] =
{ "game.use_native_emc_graphics_engine", "false" },
{ "game.use_native_sp_graphics_engine", "true" },
{ "game.use_masked_pushing", "false" },
{ "game.use_native_emc_graphics_engine", "false" },
{ "game.use_native_sp_graphics_engine", "true" },
{ "game.use_masked_pushing", "false" },
+ { "game.tile_size", "32" },
{ "[player].boring_delay_fixed", "1000" },
{ "[player].boring_delay_random", "1000" },
{ "[player].boring_delay_fixed", "1000" },
{ "[player].boring_delay_random", "1000" },