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 5acf09fe627d151743b3beb5362c25cde2ce455d..5ad230da024586744008c01df19c16be51358905 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1262,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",
@@
-3442,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",
@@
-4460,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 */
@@
-5509,16
+5514,6
@@
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
/* main() */
/* ========================================================================= */
/* main() */
/* ========================================================================= */
-static unsigned long get_cmd_switch(char *switch_string)
-{
- unsigned long switch_value = 0;
-
- if (strEqual(switch_string, "load_xsb_to_ces"))
- switch_value = CMD_SWITCH_LOAD_XSB_TO_CES;
-
- return switch_value;
-}
-
static void print_usage()
{
printf("\n"
static void print_usage()
{
printf("\n"
@@
-5567,7
+5562,7
@@
int main(int argc, char *argv[])
InitExitFunction(CloseAllAndExit);
InitPlatformDependentStuff();
InitExitFunction(CloseAllAndExit);
InitPlatformDependentStuff();
- GetOptions(argv, print_usage
, get_cmd_switch
);
+ GetOptions(argv, print_usage);
OpenAll();
EventLoop();
OpenAll();
EventLoop();