rnd-20021117-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 9158955f55dc894389bfe1d0776d61836aed095b..364cedcde6db75c423e4279e78e9d073e432f336 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -151,13 +151,17 @@ int graphics_action_mapping[] =
   6,           /* GFX_ACTION_PUSHING           (7)  */
 
   7,           /* GFX_ACTION_PASSING           (8)  */
-  7,           /* GFX_ACTION_IMPACT            (9) */
+  7,           /* GFX_ACTION_IMPACT            (9)  */
   7,           /* GFX_ACTION_CRACKING          (10) */
-  7,           /* GFX_ACTION_ACTIVATING        (11) */
-  7,           /* GFX_ACTION_EATING            (12) */
-  7,           /* GFX_ACTION_ATTACKING         (13) */
-  7,           /* GFX_ACTION_GROWING           (14) */
-  7            /* GFX_ACTION_OTHER             (15) */
+  7,           /* GFX_ACTION_BREAKING          (11) */
+  7,           /* GFX_ACTION_ACTIVATING        (12) */
+  7,           /* GFX_ACTION_OPENING           (13) */
+  7,           /* GFX_ACTION_CLOSING           (14) */
+  7,           /* GFX_ACTION_EATING            (15) */
+  7,           /* GFX_ACTION_ATTACKING         (16) */
+  7,           /* GFX_ACTION_GROWING           (17) */
+  7,           /* GFX_ACTION_SHRINKING         (18) */
+  7            /* GFX_ACTION_OTHER             (19) */
 };
 
 struct ConfigInfo image_config_suffix[] =
@@ -174,7 +178,7 @@ struct ConfigInfo image_config_suffix[] =
   { ".mode_pingpong",                  "0"                     },
   { ".mode_pingpong2",                 "0"                     },
   { ".mode_reverse",                   "0"                     },
-  { ".global_sync",                    "0"                     },
+  { ".global_sync",                    "-1"                    },
 
   { NULL,                              NULL                    }
 };
@@ -220,10 +224,16 @@ struct ConfigInfo image_config[] =
   { "bd_diamond.frames",                       "4"                     },
   { "bd_diamond.delay",                                "4"                     },
   { "bd_diamond.mode_reverse",                 "1"                     },
+  { "bd_diamond.moving",                       "RocksElements.pcx"     },
+  { "bd_diamond.moving.xpos",                  "3"                     },
+  { "bd_diamond.moving.ypos",                  "10"                    },
+  { "bd_diamond.moving.frames",                        "2"                     },
+  { "bd_diamond.moving.delay",                 "4"                     },
   { "bd_diamond.falling",                      "RocksElements.pcx"     },
   { "bd_diamond.falling.xpos",                 "3"                     },
   { "bd_diamond.falling.ypos",                 "10"                    },
   { "bd_diamond.falling.frames",               "2"                     },
+  { "bd_diamond.falling.delay",                        "4"                     },
 
   { "bd_magic_wall",                           "RocksElements.pcx"     },
   { "bd_magic_wall.xpos",                      "12"                    },
@@ -613,7 +623,6 @@ struct ConfigInfo image_config[] =
   { "sp_electron.ypos",                                "10"                    },
   { "sp_electron.frames",                      "8"                     },
   { "sp_electron.delay",                       "2"                     },
-  { "sp_electron.global_sync",                 "1"                     },
 
   { "sp_terminal",                             "RocksSP.pcx"           },
   { "sp_terminal.xpos",                                "8"                     },
@@ -741,19 +750,31 @@ struct ConfigInfo image_config[] =
   { "emerald.xpos",                            "8"                     },
   { "emerald.ypos",                            "0"                     },
   { "emerald.frames",                          "1"                     },
+  { "emerald.moving",                          "RocksElements.pcx"     },
+  { "emerald.moving.xpos",                     "8"                     },
+  { "emerald.moving.ypos",                     "0"                     },
+  { "emerald.moving.frames",                   "2"                     },
+  { "emerald.moving.delay",                    "4"                     },
   { "emerald.falling",                         "RocksElements.pcx"     },
   { "emerald.falling.xpos",                    "8"                     },
   { "emerald.falling.ypos",                    "0"                     },
   { "emerald.falling.frames",                  "2"                     },
+  { "emerald.falling.delay",                   "4"                     },
 
   { "diamond",                                 "RocksElements.pcx"     },
   { "diamond.xpos",                            "10"                    },
   { "diamond.ypos",                            "0"                     },
   { "diamond.frames",                          "1"                     },
+  { "diamond.moving",                          "RocksElements.pcx"     },
+  { "diamond.moving.xpos",                     "10"                    },
+  { "diamond.moving.ypos",                     "0"                     },
+  { "diamond.moving.frames",                   "2"                     },
+  { "diamond.moving.delay",                    "4"                     },
   { "diamond.falling",                         "RocksElements.pcx"     },
   { "diamond.falling.xpos",                    "10"                    },
   { "diamond.falling.ypos",                    "0"                     },
   { "diamond.falling.frames",                  "2"                     },
+  { "diamond.falling.delay",                   "4"                     },
 
   { "bomb",                                    "RocksElements.pcx"     },
   { "bomb.xpos",                               "11"                    },
@@ -781,6 +802,7 @@ struct ConfigInfo image_config[] =
   { "dynamite.active.frames",                  "7"                     },
   { "dynamite.active.delay",                   "12"                    },
   { "dynamite.active.mode_linear",             "1"                     },
+  { "dynamite.active.global_sync",             "0"                     },
 
   { "wall_emerald",                            "RocksElements.pcx"     },
   { "wall_emerald.xpos",                       "4"                     },
@@ -849,6 +871,10 @@ struct ConfigInfo image_config[] =
   { "robot.ypos",                              "5"                     },
   { "robot.frames",                            "4"                     },
   { "robot.mode_pingpong2",                    "1"                     },
+  { "robot.moving",                            "RocksElements.pcx"     },
+  { "robot.moving.xpos",                       "4"                     },
+  { "robot.moving.ypos",                       "5"                     },
+  { "robot.moving.frames",                     "1"                     },
 
   { "robot_wheel",                             "RocksElements.pcx"     },
   { "robot_wheel.xpos",                                "0"                     },
@@ -941,11 +967,13 @@ struct ConfigInfo image_config[] =
   { "acid_splash_left.ypos",                   "10"                    },
   { "acid_splash_left.frames",                 "4"                     },
   { "acid_splash_left.delay",                  "2"                     },
+  { "acid_splash_left.global_sync",            "0"                     },
   { "acid_splash_right",                       "RocksHeroes.pcx"       },
   { "acid_splash_right.xpos",                  "12"                    },
   { "acid_splash_right.ypos",                  "10"                    },
   { "acid_splash_right.frames",                        "4"                     },
   { "acid_splash_right.delay",                 "2"                     },
+  { "acid_splash_right.global_sync",           "0"                     },
 
   { "amoeba_drop",                             "RocksElements.pcx"     },
   { "amoeba_drop.xpos",                                "5"                     },
@@ -1790,21 +1818,25 @@ struct ConfigInfo image_config[] =
   { "wall_growing_active_left.ypos",           "10"                    },
   { "wall_growing_active_left.frames",         "3"                     },
   { "wall_growing_active_left.delay",          "6"                     },
+  { "wall_growing_active_left.global_sync",    "0"                     },
   { "wall_growing_active_right",               "RocksElements.pcx"     },
   { "wall_growing_active_right.xpos",          "5"                     },
   { "wall_growing_active_right.ypos",          "10"                    },
   { "wall_growing_active_right.frames",                "3"                     },
   { "wall_growing_active_right.delay",         "6"                     },
+  { "wall_growing_active_right.global_sync",   "0"                     },
   { "wall_growing_active_up",                  "RocksHeroes.pcx"       },
   { "wall_growing_active_up.xpos",             "3"                     },
   { "wall_growing_active_up.ypos",             "12"                    },
   { "wall_growing_active_up.frames",           "3"                     },
   { "wall_growing_active_up.delay",            "6"                     },
+  { "wall_growing_active_up.global_sync",      "0"                     },
   { "wall_growing_active_down",                        "RocksHeroes.pcx"       },
   { "wall_growing_active_down.xpos",           "0"                     },
   { "wall_growing_active_down.ypos",           "12"                    },
   { "wall_growing_active_down.frames",         "3"                     },
   { "wall_growing_active_down.delay",          "6"                     },
+  { "wall_growing_active_down.global_sync",    "0"                     },
 
   { "black_orb",                               "RocksElements.pcx"     },
   { "black_orb.xpos",                          "13"                    },
@@ -2530,12 +2562,14 @@ struct ConfigInfo image_config[] =
   { "twinkle_blue.frames",                     "3"                     },
   { "twinkle_blue.delay",                      "2"                     },
   { "twinkle_blue.mode_pingpong",              "1"                     },
+  { "twinkle_blue.global_sync",                        "0"                     },
   { "twinkle_white",                           "RocksHeroes.pcx"       },
   { "twinkle_white.xpos",                      "13"                    },
   { "twinkle_white.ypos",                      "11"                    },
   { "twinkle_white.frames",                    "3"                     },
   { "twinkle_white.delay",                     "2"                     },
   { "twinkle_white.mode_pingpong",             "1"                     },
+  { "twinkle_white.global_sync",               "0"                     },
 
   { "steelwall_topleft",                       "RocksElements.pcx"     },
   { "steelwall_topleft.xpos",                  "0"                     },