X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=dee69a89c61169174073848ffec7e1b8254559bc;hb=9cb181e05e485435ef48586dd4f2811ba1e672b3;hp=5abc0ae1ffada1674d3440dc82f7da26289b5178;hpb=cb8b58732432cc7f3163446dedd54c63126b23c3;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 5abc0ae1..dee69a89 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5428,6 +5428,10 @@ struct TokenIntPtrInfo image_config_vars[] =
     &menu.draw_xoffset_info[GFX_SPECIAL_ARG_INFO_PROGRAM]		      },
   { "menu.draw_yoffset.INFO[PROGRAM]",
     &menu.draw_yoffset_info[GFX_SPECIAL_ARG_INFO_PROGRAM]		      },
+  { "menu.draw_xoffset.INFO[VERSION]",
+    &menu.draw_xoffset_info[GFX_SPECIAL_ARG_INFO_VERSION]		      },
+  { "menu.draw_yoffset.INFO[VERSION]",
+    &menu.draw_yoffset_info[GFX_SPECIAL_ARG_INFO_VERSION]		      },
   { "menu.draw_xoffset.INFO[LEVELSET]",
     &menu.draw_xoffset_info[GFX_SPECIAL_ARG_INFO_LEVELSET]		      },
   { "menu.draw_yoffset.INFO[LEVELSET]",
@@ -5442,68 +5446,68 @@ struct TokenIntPtrInfo image_config_vars[] =
   { "menu.list_size.SCORES",	&menu.list_size[GFX_SPECIAL_ARG_SCORES]	      },
   { "menu.list_size.INFO",	&menu.list_size[GFX_SPECIAL_ARG_INFO]	      },
 
-  { "main.button.name.x",	&menu.main.button.name.x		      },
-  { "main.button.name.y",	&menu.main.button.name.y		      },
-  { "main.button.levels.x",	&menu.main.button.levels.x		      },
-  { "main.button.levels.y",	&menu.main.button.levels.y		      },
-  { "main.button.scores.x",	&menu.main.button.scores.x		      },
-  { "main.button.scores.y",	&menu.main.button.scores.y		      },
-  { "main.button.editor.x",	&menu.main.button.editor.x		      },
-  { "main.button.editor.y",	&menu.main.button.editor.y		      },
-  { "main.button.info.x",	&menu.main.button.info.x		      },
-  { "main.button.info.y",	&menu.main.button.info.y		      },
-  { "main.button.game.x",	&menu.main.button.game.x		      },
-  { "main.button.game.y",	&menu.main.button.game.y		      },
-  { "main.button.setup.x",	&menu.main.button.setup.x		      },
-  { "main.button.setup.y",	&menu.main.button.setup.y		      },
-  { "main.button.quit.x",	&menu.main.button.quit.x		      },
-  { "main.button.quit.y",	&menu.main.button.quit.y		      },
+  { "main.button.name.x",		&menu.main.button.name.x	      },
+  { "main.button.name.y",		&menu.main.button.name.y	      },
+  { "main.button.levels.x",		&menu.main.button.levels.x	      },
+  { "main.button.levels.y",		&menu.main.button.levels.y	      },
+  { "main.button.scores.x",		&menu.main.button.scores.x	      },
+  { "main.button.scores.y",		&menu.main.button.scores.y	      },
+  { "main.button.editor.x",		&menu.main.button.editor.x	      },
+  { "main.button.editor.y",		&menu.main.button.editor.y	      },
+  { "main.button.info.x",		&menu.main.button.info.x	      },
+  { "main.button.info.y",		&menu.main.button.info.y	      },
+  { "main.button.game.x",		&menu.main.button.game.x	      },
+  { "main.button.game.y",		&menu.main.button.game.y	      },
+  { "main.button.setup.x",		&menu.main.button.setup.x	      },
+  { "main.button.setup.y",		&menu.main.button.setup.y	      },
+  { "main.button.quit.x",		&menu.main.button.quit.x	      },
+  { "main.button.quit.y",		&menu.main.button.quit.y	      },
 
-  { "main.button.prev_level.x",	&menu.main.button.prev_level.x		      },
-  { "main.button.prev_level.y",	&menu.main.button.prev_level.y		      },
-  { "main.button.next_level.x",	&menu.main.button.next_level.x		      },
-  { "main.button.next_level.y",	&menu.main.button.next_level.y		      },
+  { "main.button.prev_level.x",		&menu.main.button.prev_level.x	      },
+  { "main.button.prev_level.y",		&menu.main.button.prev_level.y	      },
+  { "main.button.next_level.x",		&menu.main.button.next_level.x	      },
+  { "main.button.next_level.y",		&menu.main.button.next_level.y	      },
 
-  { "main.text.name.x",		&menu.main.text.name.x			      },
-  { "main.text.name.y",		&menu.main.text.name.y			      },
-  { "main.text.name.width",	&menu.main.text.name.width		      },
-  { "main.text.name.height",	&menu.main.text.name.height		      },
-  { "main.text.name.align",	&menu.main.text.name.align		      },
-  { "main.text.levels.x",	&menu.main.text.levels.x		      },
-  { "main.text.levels.y",	&menu.main.text.levels.y		      },
-  { "main.text.levels.width",	&menu.main.text.levels.width		      },
-  { "main.text.levels.height",	&menu.main.text.levels.height		      },
-  { "main.text.levels.align",	&menu.main.text.levels.align		      },
-  { "main.text.scores.x",	&menu.main.text.scores.x		      },
-  { "main.text.scores.y",	&menu.main.text.scores.y		      },
-  { "main.text.scores.width",	&menu.main.text.scores.width		      },
-  { "main.text.scores.height",	&menu.main.text.scores.height		      },
-  { "main.text.scores.align",	&menu.main.text.scores.align		      },
-  { "main.text.editor.x",	&menu.main.text.editor.x		      },
-  { "main.text.editor.y",	&menu.main.text.editor.y		      },
-  { "main.text.editor.width",	&menu.main.text.editor.width		      },
-  { "main.text.editor.height",	&menu.main.text.editor.height		      },
-  { "main.text.editor.align",	&menu.main.text.editor.align		      },
-  { "main.text.info.x",		&menu.main.text.info.x			      },
-  { "main.text.info.y",		&menu.main.text.info.y			      },
-  { "main.text.info.width",	&menu.main.text.info.width		      },
-  { "main.text.info.height",	&menu.main.text.info.height		      },
-  { "main.text.info.align",	&menu.main.text.info.align		      },
-  { "main.text.game.x",		&menu.main.text.game.x			      },
-  { "main.text.game.y",		&menu.main.text.game.y			      },
-  { "main.text.game.width",	&menu.main.text.game.width		      },
-  { "main.text.game.height",	&menu.main.text.game.height		      },
-  { "main.text.game.align",	&menu.main.text.game.align		      },
-  { "main.text.setup.x",	&menu.main.text.setup.x			      },
-  { "main.text.setup.y",	&menu.main.text.setup.y			      },
-  { "main.text.setup.width",	&menu.main.text.setup.width		      },
-  { "main.text.setup.height",	&menu.main.text.setup.height		      },
-  { "main.text.setup.align",	&menu.main.text.setup.align		      },
-  { "main.text.quit.x",		&menu.main.text.quit.x			      },
-  { "main.text.quit.y",		&menu.main.text.quit.y			      },
-  { "main.text.quit.width",	&menu.main.text.quit.width		      },
-  { "main.text.quit.height",	&menu.main.text.quit.height		      },
-  { "main.text.quit.align",	&menu.main.text.quit.align		      },
+  { "main.text.name.x",			&menu.main.text.name.x		      },
+  { "main.text.name.y",			&menu.main.text.name.y		      },
+  { "main.text.name.width",		&menu.main.text.name.width	      },
+  { "main.text.name.height",		&menu.main.text.name.height	      },
+  { "main.text.name.align",		&menu.main.text.name.align	      },
+  { "main.text.levels.x",		&menu.main.text.levels.x	      },
+  { "main.text.levels.y",		&menu.main.text.levels.y	      },
+  { "main.text.levels.width",		&menu.main.text.levels.width	      },
+  { "main.text.levels.height",		&menu.main.text.levels.height	      },
+  { "main.text.levels.align",		&menu.main.text.levels.align	      },
+  { "main.text.scores.x",		&menu.main.text.scores.x	      },
+  { "main.text.scores.y",		&menu.main.text.scores.y	      },
+  { "main.text.scores.width",		&menu.main.text.scores.width	      },
+  { "main.text.scores.height",		&menu.main.text.scores.height	      },
+  { "main.text.scores.align",		&menu.main.text.scores.align	      },
+  { "main.text.editor.x",		&menu.main.text.editor.x	      },
+  { "main.text.editor.y",		&menu.main.text.editor.y	      },
+  { "main.text.editor.width",		&menu.main.text.editor.width	      },
+  { "main.text.editor.height",		&menu.main.text.editor.height	      },
+  { "main.text.editor.align",		&menu.main.text.editor.align	      },
+  { "main.text.info.x",			&menu.main.text.info.x		      },
+  { "main.text.info.y",			&menu.main.text.info.y		      },
+  { "main.text.info.width",		&menu.main.text.info.width	      },
+  { "main.text.info.height",		&menu.main.text.info.height	      },
+  { "main.text.info.align",		&menu.main.text.info.align	      },
+  { "main.text.game.x",			&menu.main.text.game.x		      },
+  { "main.text.game.y",			&menu.main.text.game.y		      },
+  { "main.text.game.width",		&menu.main.text.game.width	      },
+  { "main.text.game.height",		&menu.main.text.game.height	      },
+  { "main.text.game.align",		&menu.main.text.game.align	      },
+  { "main.text.setup.x",		&menu.main.text.setup.x		      },
+  { "main.text.setup.y",		&menu.main.text.setup.y		      },
+  { "main.text.setup.width",		&menu.main.text.setup.width	      },
+  { "main.text.setup.height",		&menu.main.text.setup.height	      },
+  { "main.text.setup.align",		&menu.main.text.setup.align	      },
+  { "main.text.quit.x",			&menu.main.text.quit.x		      },
+  { "main.text.quit.y",			&menu.main.text.quit.y		      },
+  { "main.text.quit.width",		&menu.main.text.quit.width	      },
+  { "main.text.quit.height",		&menu.main.text.quit.height	      },
+  { "main.text.quit.align",		&menu.main.text.quit.align	      },
 
   { "main.text.current_level.x",	&menu.main.text.current_level.x	      },
   { "main.text.current_level.y",	&menu.main.text.current_level.y	      },
@@ -5517,9 +5521,11 @@ struct TokenIntPtrInfo image_config_vars[] =
   { "main.text.level_info_1.x",		&menu.main.text.level_info_1.x	      },
   { "main.text.level_info_1.y",		&menu.main.text.level_info_1.y	      },
   { "main.text.level_info_1.align",	&menu.main.text.level_info_1.align    },
+  { "main.text.level_info_1.chars",	&menu.main.text.level_info_1.chars    },
   { "main.text.level_info_2.x",		&menu.main.text.level_info_2.x	      },
   { "main.text.level_info_2.y",		&menu.main.text.level_info_2.y	      },
   { "main.text.level_info_2.align",	&menu.main.text.level_info_2.align    },
+  { "main.text.level_info_2.chars",	&menu.main.text.level_info_2.chars    },
   { "main.text.title_1.x",		&menu.main.text.title_1.x	      },
   { "main.text.title_1.y",		&menu.main.text.title_1.y	      },
   { "main.text.title_1.align",		&menu.main.text.title_1.align	      },
@@ -5530,52 +5536,63 @@ struct TokenIntPtrInfo image_config_vars[] =
   { "main.text.title_3.y",		&menu.main.text.title_3.y	      },
   { "main.text.title_3.align",		&menu.main.text.title_3.align	      },
 
-  { "main.input.name.x",	&menu.main.input.name.x			      },
-  { "main.input.name.y",	&menu.main.input.name.y			      },
-  { "main.input.name.align",	&menu.main.input.name.align		      },
+  { "main.input.name.x",		&menu.main.input.name.x		      },
+  { "main.input.name.y",		&menu.main.input.name.y		      },
+  { "main.input.name.align",		&menu.main.input.name.align	      },
 
-  { "preview.x",		&preview.x				      },
-  { "preview.y",		&preview.y				      },
-  { "preview.align",		&preview.align				      },
-  { "preview.xsize",		&preview.xsize				      },
-  { "preview.ysize",		&preview.ysize				      },
-  { "preview.xoffset",		&preview.xoffset			      },
-  { "preview.yoffset",		&preview.yoffset			      },
-  { "preview.tile_size",	&preview.tile_size			      },
-  { "preview.step_offset",	&preview.step_offset			      },
-  { "preview.step_delay",	&preview.step_delay			      },
-  { "preview.anim_mode",	&preview.anim_mode			      },
+  { "preview.x",			&preview.x			      },
+  { "preview.y",			&preview.y			      },
+  { "preview.align",			&preview.align			      },
+  { "preview.xsize",			&preview.xsize			      },
+  { "preview.ysize",			&preview.ysize			      },
+  { "preview.xoffset",			&preview.xoffset		      },
+  { "preview.yoffset",			&preview.yoffset		      },
+  { "preview.tile_size",		&preview.tile_size		      },
+  { "preview.step_offset",		&preview.step_offset		      },
+  { "preview.step_delay",		&preview.step_delay		      },
+  { "preview.anim_mode",		&preview.anim_mode		      },
 
-  { "door_1.width",		&door_1.width				      },
-  { "door_1.height",		&door_1.height				      },
-  { "door_1.step_offset",	&door_1.step_offset			      },
-  { "door_1.step_delay",	&door_1.step_delay			      },
-  { "door_1.anim_mode",		&door_1.anim_mode			      },
-  { "door_2.width",		&door_2.width				      },
-  { "door_2.height",		&door_2.height				      },
-  { "door_2.step_offset",	&door_2.step_offset			      },
-  { "door_2.step_delay",	&door_2.step_delay			      },
-  { "door_2.anim_mode",		&door_2.anim_mode			      },
+  { "door_1.width",			&door_1.width			      },
+  { "door_1.height",			&door_1.height			      },
+  { "door_1.step_offset",		&door_1.step_offset		      },
+  { "door_1.step_delay",		&door_1.step_delay		      },
+  { "door_1.anim_mode",			&door_1.anim_mode		      },
+  { "door_2.width",			&door_2.width			      },
+  { "door_2.height",			&door_2.height			      },
+  { "door_2.step_offset",		&door_2.step_offset		      },
+  { "door_2.step_delay",		&door_2.step_delay		      },
+  { "door_2.anim_mode",			&door_2.anim_mode		      },
 
-  { "game.panel.level.x",	&game.panel.level.x			      },
-  { "game.panel.level.y",	&game.panel.level.y			      },
-  { "game.panel.gems.x",	&game.panel.gems.x			      },
-  { "game.panel.gems.y",	&game.panel.gems.y			      },
-  { "game.panel.inventory.x",	&game.panel.inventory.x			      },
-  { "game.panel.inventory.y",	&game.panel.inventory.y			      },
-  { "game.panel.keys.x",	&game.panel.keys.x			      },
-  { "game.panel.keys.y",	&game.panel.keys.y			      },
-  { "game.panel.score.x",	&game.panel.score.x			      },
-  { "game.panel.score.y",	&game.panel.score.y			      },
-  { "game.panel.time.x",	&game.panel.time.x			      },
-  { "game.panel.time.y",	&game.panel.time.y			      },
+  { "game.panel.level.x",		&game.panel.level.x		      },
+  { "game.panel.level.y",		&game.panel.level.y		      },
+  { "game.panel.level.align",		&game.panel.level.align		      },
+  { "game.panel.level.digits",		&game.panel.level.chars		      },
+  { "game.panel.gems.x",		&game.panel.gems.x		      },
+  { "game.panel.gems.y",		&game.panel.gems.y		      },
+  { "game.panel.gems.align",		&game.panel.gems.align		      },
+  { "game.panel.gems.digits",		&game.panel.gems.chars		      },
+  { "game.panel.inventory.x",		&game.panel.inventory.x		      },
+  { "game.panel.inventory.y",		&game.panel.inventory.y		      },
+  { "game.panel.inventory.align",	&game.panel.inventory.align	      },
+  { "game.panel.inventory.digits",	&game.panel.inventory.chars	      },
+  { "game.panel.keys.x",		&game.panel.keys.x		      },
+  { "game.panel.keys.y",		&game.panel.keys.y		      },
+  { "game.panel.keys.align",		&game.panel.keys.align		      },
+  { "game.panel.score.x",		&game.panel.score.x		      },
+  { "game.panel.score.y",		&game.panel.score.y		      },
+  { "game.panel.score.align",		&game.panel.score.align		      },
+  { "game.panel.score.digits",		&game.panel.score.chars		      },
+  { "game.panel.time.x",		&game.panel.time.x		      },
+  { "game.panel.time.y",		&game.panel.time.y		      },
+  { "game.panel.time.align",		&game.panel.time.align		      },
+  { "game.panel.time.digits",		&game.panel.time.chars		      },
 
   { "[player].boring_delay_fixed",	&game.player_boring_delay_fixed       },
   { "[player].boring_delay_random",	&game.player_boring_delay_random      },
   { "[player].sleeping_delay_fixed",	&game.player_sleeping_delay_fixed     },
   { "[player].sleeping_delay_random",	&game.player_sleeping_delay_random    },
 
-  { NULL,			NULL,					      }
+  { NULL,				NULL,				      }
 };
 
 
@@ -5624,6 +5641,8 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.level_number"		},
   { "font.tape_recorder"	},
   { "font.game_info"		},
+  { "font.info.elements"	},
+  { "font.info.levelset"	},
 };