projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060802-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index e264863ce7ab334e8b6d58aeb9d1fdfd1b443dec..a663bbcfd14ddc22d1a7a11018b1c635f7a54d68 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-20,7
+20,9
@@
#include "events.h"
#include "config.h"
#include "events.h"
#include "config.h"
-Bitmap *bitmap_db_field, *bitmap_db_door;
+Bitmap *bitmap_db_title;
+Bitmap *bitmap_db_field;
+Bitmap *bitmap_db_door;
DrawBuffer *fieldbuffer;
DrawBuffer *drawto_field;
DrawBuffer *fieldbuffer;
DrawBuffer *drawto_field;
@@
-197,7
+199,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"steelwall",
},
{
"steelwall",
- "wall",
+ "
steel
wall",
"steel wall"
},
{
"steel wall"
},
{
@@
-248,7
+250,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"amoeba_wet",
"amoeba",
{
"amoeba_wet",
"amoeba",
- "dropping amoeba"
+ "dropping amoeba
(EM style)
"
},
{
"amoeba_dry",
},
{
"amoeba_dry",
@@
-408,7
+410,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"expandable_wall",
"wall",
{
"expandable_wall",
"wall",
- "growing wall"
+ "growing wall
(horizontal, visible)
"
},
{
"bd_diamond",
},
{
"bd_diamond",
@@
-442,7
+444,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"invisible_steelwall",
},
{
"invisible_steelwall",
- "wall",
+ "
steel
wall",
"invisible steel wall"
},
{
"invisible steel wall"
},
{
@@
-1701,7
+1703,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"steelwall_slippery",
},
{
"steelwall_slippery",
- "wall",
+ "
steel
wall",
"slippery steel wall"
},
{
"slippery steel wall"
},
{
@@
-1786,22
+1788,22
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"emc_steelwall_1",
},
{
"emc_steelwall_1",
- "wall",
+ "
steel
wall",
"steel wall"
},
{
"emc_steelwall_2",
"steel wall"
},
{
"emc_steelwall_2",
- "wall",
+ "
steel
wall",
"steel wall"
},
{
"emc_steelwall_3",
"steel wall"
},
{
"emc_steelwall_3",
- "wall",
+ "
steel
wall",
"steel wall"
},
{
"emc_steelwall_4",
"steel wall"
},
{
"emc_steelwall_4",
- "wall",
+ "
steel
wall",
"steel wall"
},
{
"steel wall"
},
{
@@
-3689,6
+3691,11
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"yamyam",
"yam yam (starts moving down)"
},
"yamyam",
"yam yam (starts moving down)"
},
+ {
+ "bd_expandable_wall",
+ "wall",
+ "growing wall (horizontal, BD style)"
+ },
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
@@
-3751,7
+3758,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"invisible_steelwall.active",
},
{
"invisible_steelwall.active",
- "wall",
+ "
steel
wall",
"-"
},
{
"-"
},
{
@@
-4366,24
+4373,24
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"hide group elements"
},
{
"hide group elements"
},
{
- "internal_cascade_
user
",
+ "internal_cascade_
ref
",
"internal",
"internal",
- "show
user defined
elements"
+ "show
reference
elements"
},
{
},
{
- "internal_cascade_
user
.active",
+ "internal_cascade_
ref
.active",
"internal",
"internal",
- "hide
user defined
elements"
+ "hide
reference
elements"
},
{
},
{
- "internal_cascade_
generic
",
+ "internal_cascade_
user
",
"internal",
"internal",
- "show elements"
+ "show
user defined
elements"
},
{
},
{
- "internal_cascade_
generic
.active",
+ "internal_cascade_
user
.active",
"internal",
"internal",
- "hide elements"
+ "hide
user defined
elements"
},
{
"internal_cascade_dynamic",
},
{
"internal_cascade_dynamic",
@@
-4521,6
+4528,7
@@
struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS_FULL + 1] =
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{
{ ".[DEFAULT]", GAME_MODE_DEFAULT, },
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{
{ ".[DEFAULT]", GAME_MODE_DEFAULT, },
+ { ".TITLE", GAME_MODE_TITLE, },
{ ".MAIN", GAME_MODE_MAIN, },
{ ".LEVELS", GAME_MODE_LEVELS },
{ ".SCORES", GAME_MODE_SCORES, },
{ ".MAIN", GAME_MODE_MAIN, },
{ ".LEVELS", GAME_MODE_LEVELS },
{ ".SCORES", GAME_MODE_SCORES, },
@@
-4622,6
+4630,7
@@
struct FontInfo font_info[NUM_FONTS + 1] =
{ "font.value_1" },
{ "font.value_2" },
{ "font.value_old" },
{ "font.value_1" },
{ "font.value_2" },
{ "font.value_old" },
+ { "font.level_number.active" },
{ "font.level_number" },
{ "font.tape_recorder" },
{ "font.game_info" },
{ "font.level_number" },
{ "font.tape_recorder" },
{ "font.game_info" },
@@
-4679,7
+4688,7
@@
static void print_usage()
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- InitProgramInfo(argv[0], USERDATA_DIRECTORY,
+ InitProgramInfo(argv[0], USERDATA_DIRECTORY,
USERDATA_DIRECTORY_UNIX,
PROGRAM_TITLE_STRING, getWindowTitleString(),
ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
MSDOS_POINTER_FILENAME,
PROGRAM_TITLE_STRING, getWindowTitleString(),
ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
MSDOS_POINTER_FILENAME,