projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100204-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index a86ed44786697fa199b13b2a539126caa2ba3103..5ad230da024586744008c01df19c16be51358905 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-75,6
+75,7
@@
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 ActiveElement[MAX_NUM_ELEMENTS];
int ActiveButton[NUM_IMAGE_FILES];
@@
-1261,23
+1262,23
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"sp_gravity_port_right",
},
{
"sp_gravity_port_right",
- "sp_port",
- "gravity port (leading right)"
+ "sp_
gravity_
port",
+ "gravity
-on/off
port (leading right)"
},
{
"sp_gravity_port_down",
},
{
"sp_gravity_port_down",
- "sp_port",
- "gravity port (leading down)"
+ "sp_
gravity_
port",
+ "gravity
-on/off
port (leading down)"
},
{
"sp_gravity_port_left",
},
{
"sp_gravity_port_left",
- "sp_port",
- "gravity port (leading left)"
+ "sp_
gravity_
port",
+ "gravity
-on/off
port (leading left)"
},
{
"sp_gravity_port_up",
},
{
"sp_gravity_port_up",
- "sp_port",
- "gravity port (leading up)"
+ "sp_
gravity_
port",
+ "gravity
-on/off
port (leading up)"
},
{
"sp_sniksnak",
},
{
"sp_sniksnak",
@@
-3441,43
+3442,43
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"sp_gravity_on_port_right",
},
{
"sp_gravity_on_port_right",
- "sp_port",
- "gravity
on port (leading right)"
+ "sp_
gravity_on_
port",
+ "gravity
-
on port (leading right)"
},
{
"sp_gravity_on_port_down",
},
{
"sp_gravity_on_port_down",
- "sp_port",
- "gravity
on port (leading down)"
+ "sp_
gravity_on_
port",
+ "gravity
-
on port (leading down)"
},
{
"sp_gravity_on_port_left",
},
{
"sp_gravity_on_port_left",
- "sp_port",
- "gravity
on port (leading left)"
+ "sp_
gravity_on_
port",
+ "gravity
-
on port (leading left)"
},
{
"sp_gravity_on_port_up",
},
{
"sp_gravity_on_port_up",
- "sp_port",
- "gravity
on port (leading up)"
+ "sp_
gravity_on_
port",
+ "gravity
-
on port (leading up)"
},
{
"sp_gravity_off_port_right",
},
{
"sp_gravity_off_port_right",
- "sp_port",
- "gravity
off port (leading right)"
+ "sp_
gravity_off_
port",
+ "gravity
-
off port (leading right)"
},
{
"sp_gravity_off_port_down",
},
{
"sp_gravity_off_port_down",
- "sp_port",
- "gravity
off port (leading down)"
+ "sp_
gravity_off_
port",
+ "gravity
-
off port (leading down)"
},
{
"sp_gravity_off_port_left",
},
{
"sp_gravity_off_port_left",
- "sp_port",
- "gravity
off port (leading left)"
+ "sp_
gravity_off_
port",
+ "gravity
-
off port (leading left)"
},
{
"sp_gravity_off_port_up",
},
{
"sp_gravity_off_port_up",
- "sp_port",
- "gravity
off port (leading up)"
+ "sp_
gravity_off_
port",
+ "gravity
-
off port (leading up)"
},
{
"balloon_switch_none",
},
{
"balloon_switch_none",
@@
-4459,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 */
@@
-5524,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"
@@
-5537,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);
}