projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100110-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index f49c8c6b776b602443fb303504a422ce96c34995..d3ecc942c253428a90bc2eea2c3698f416bd07a9 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-24,6
+24,7
@@
Bitmap *bitmap_db_cross;
Bitmap *bitmap_db_field;
Bitmap *bitmap_db_panel;
Bitmap *bitmap_db_door;
Bitmap *bitmap_db_field;
Bitmap *bitmap_db_panel;
Bitmap *bitmap_db_door;
+Bitmap *bitmap_db_toons;
DrawBuffer *fieldbuffer;
DrawBuffer *drawto_field;
DrawBuffer *fieldbuffer;
DrawBuffer *drawto_field;
@@
-74,6
+75,11
@@
int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int GfxRedraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+
+int ActiveElement[MAX_NUM_ELEMENTS];
+int ActiveButton[NUM_IMAGE_FILES];
+int ActiveFont[NUM_FONTS];
int lev_fieldx, lev_fieldy;
int scroll_x, scroll_y;
int lev_fieldx, lev_fieldy;
int scroll_x, scroll_y;
@@
-106,10
+112,15
@@
struct SetupInfo setup;
struct GameInfo game;
struct GlobalInfo global;
struct BorderInfo border;
struct GameInfo game;
struct GlobalInfo global;
struct BorderInfo border;
-struct TitleInfo title;
+struct TitleFadingInfo fading;
+struct TitleFadingInfo title_initial_default;
+struct TitleFadingInfo title_default;
+struct TitleMessageInfo titlemessage_initial_default;
struct TitleMessageInfo titlemessage_initial[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo titlemessage_initial[MAX_NUM_TITLE_MESSAGES];
+struct TitleMessageInfo titlemessage_default;
struct TitleMessageInfo titlemessage[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo readme;
struct TitleMessageInfo titlemessage[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo readme;
+struct InitInfo init;
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
struct PreviewInfo preview;
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
struct PreviewInfo preview;
@@
-119,6
+130,10
@@
struct MusicInfo *music_info = NULL;
struct MusicFileInfo *music_file_info = NULL;
struct HelpAnimInfo *helpanim_info = NULL;
SetupFileHash *helptext_info = NULL;
struct MusicFileInfo *music_file_info = NULL;
struct HelpAnimInfo *helpanim_info = NULL;
SetupFileHash *helptext_info = NULL;
+SetupFileHash *image_config_hash = NULL;
+SetupFileHash *element_token_hash = NULL;
+SetupFileHash *graphic_token_hash = NULL;
+SetupFileHash *font_token_hash = NULL;
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-1433,7
+1448,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"dc_gate_white",
"gate",
{
"dc_gate_white",
"gate",
- "white
gate
"
+ "white
door
"
},
{
"dc_gate_white_gray",
},
{
"dc_gate_white_gray",
@@
-4445,6
+4460,11
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"quicksand",
"fast quicksand (with rock)"
},
"quicksand",
"fast quicksand (with rock)"
},
+ {
+ "from_level_template",
+ "from_level_template",
+ "element taken from level template"
+ },
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
@@
-5066,6
+5086,46
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"sb_default",
"-"
},
"sb_default",
"-"
},
+ {
+ "graphic_1",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_2",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_3",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_4",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_5",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_6",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_7",
+ "graphic",
+ "-"
+ },
+ {
+ "graphic_8",
+ "graphic",
+ "-"
+ },
{
"internal_clipboard_custom",
"internal",
{
"internal_clipboard_custom",
"internal",
@@
-5362,10
+5422,9
@@
struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS_FULL + 1] =
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{
{ ".[DEFAULT]", GFX_SPECIAL_ARG_DEFAULT, },
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{
{ ".[DEFAULT]", GFX_SPECIAL_ARG_DEFAULT, },
+ { ".LOADING", GFX_SPECIAL_ARG_LOADING, },
{ ".TITLE_INITIAL", GFX_SPECIAL_ARG_TITLE_INITIAL, },
{ ".TITLE", GFX_SPECIAL_ARG_TITLE, },
{ ".TITLE_INITIAL", GFX_SPECIAL_ARG_TITLE_INITIAL, },
{ ".TITLE", GFX_SPECIAL_ARG_TITLE, },
- { ".MESSAGE_INITIAL", GFX_SPECIAL_ARG_MESSAGE_INITIAL, },
- { ".MESSAGE", GFX_SPECIAL_ARG_MESSAGE, },
{ ".MAIN", GFX_SPECIAL_ARG_MAIN, },
{ ".LEVELS", GFX_SPECIAL_ARG_LEVELS },
{ ".SCORES", GFX_SPECIAL_ARG_SCORES, },
{ ".MAIN", GFX_SPECIAL_ARG_MAIN, },
{ ".LEVELS", GFX_SPECIAL_ARG_LEVELS },
{ ".SCORES", GFX_SPECIAL_ARG_SCORES, },
@@
-5374,6
+5433,7
@@
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{ ".SETUP", GFX_SPECIAL_ARG_SETUP, },
{ ".PLAYING", GFX_SPECIAL_ARG_PLAYING, },
{ ".DOOR", GFX_SPECIAL_ARG_DOOR, },
{ ".SETUP", GFX_SPECIAL_ARG_SETUP, },
{ ".PLAYING", GFX_SPECIAL_ARG_PLAYING, },
{ ".DOOR", GFX_SPECIAL_ARG_DOOR, },
+ { ".PANEL", GFX_SPECIAL_ARG_PANEL, },
{ ".PREVIEW", GFX_SPECIAL_ARG_PREVIEW, },
{ ".CRUMBLED", GFX_SPECIAL_ARG_CRUMBLED, },
{ ".PREVIEW", GFX_SPECIAL_ARG_PREVIEW, },
{ ".CRUMBLED", GFX_SPECIAL_ARG_CRUMBLED, },
@@
-5433,6
+5493,8
@@
struct FontInfo font_info[NUM_FONTS + 1] =
{ "font.game_info" },
{ "font.info.elements" },
{ "font.info.levelset" },
{ "font.game_info" },
{ "font.info.elements" },
{ "font.info.levelset" },
+
+ { NULL }
};
};
@@
-5468,6
+5530,7
@@
static void print_usage()
" --serveronly only start network server\n"
" -v, --verbose verbose mode\n"
" --debug display debugging information\n"
" --serveronly only start network server\n"
" -v, --verbose verbose mode\n"
" --debug display debugging information\n"
+ " --debug-x11-sync enable X11 synchronous mode\n"
" -e, --execute COMMAND execute batch COMMAND\n"
"\n"
"Valid commands for '--execute' option:\n"
" -e, --execute COMMAND execute batch COMMAND\n"
"\n"
"Valid commands for '--execute' option:\n"
@@
-5481,6
+5544,7
@@
static void print_usage()
" \"dump tape FILE\" dump tape data from FILE\n"
" \"autoplay LEVELDIR [NR ...]\" play level tapes for LEVELDIR\n"
" \"convert LEVELDIR [NR]\" convert levels in LEVELDIR\n"
" \"dump tape FILE\" dump tape data from FILE\n"
" \"autoplay LEVELDIR [NR ...]\" play level tapes for LEVELDIR\n"
" \"convert LEVELDIR [NR]\" convert levels in LEVELDIR\n"
+ " \"create images DIRECTORY\" write BMP images to DIRECTORY\n"
"\n",
program.command_basename);
}
"\n",
program.command_basename);
}