rnd-20021027-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 18547e320a43309b986593bf3f49da729555702b..9158955f55dc894389bfe1d0776d61836aed095b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -167,9 +167,7 @@ struct ConfigInfo image_config_suffix[] =
   { ".offset",                         "32"                    },
   { ".vertical",                       "0"                     },
   { ".frames",                         "1"                     },
-#if 0
   { ".start_frame",                    "-1"                    },
-#endif
   { ".delay",                          "1"                     },
   { ".mode_loop",                      "0"                     },
   { ".mode_linear",                    "0"                     },
@@ -208,12 +206,13 @@ struct ConfigInfo image_config[] =
   { "bd_rock.moving_left.ypos",                        "2"                     },
   { "bd_rock.moving_left.frames",              "4"                     },
   { "bd_rock.moving_left.delay",               "2"                     },
+  { "bd_rock.moving_left.mode_reverse",                "1"                     },
   { "bd_rock.moving_right",                    "RocksMore.pcx"         },
   { "bd_rock.moving_right.xpos",               "4"                     },
   { "bd_rock.moving_right.ypos",               "2"                     },
   { "bd_rock.moving_right.frames",             "4"                     },
+  { "bd_rock.moving_right.start_frame",                "1"                     },
   { "bd_rock.moving_right.delay",              "2"                     },
-  { "bd_rock.moving_right.mode_reverse",       "1"                     },
 
   { "bd_diamond",                              "RocksElements.pcx"     },
   { "bd_diamond.xpos",                         "0"                     },
@@ -358,12 +357,13 @@ struct ConfigInfo image_config[] =
   { "sp_zonk.moving_left.ypos",                        "6"                     },
   { "sp_zonk.moving_left.frames",              "4"                     },
   { "sp_zonk.moving_left.delay",               "2"                     },
+  { "sp_zonk.moving_left.mode_reverse",                "1"                     },
   { "sp_zonk.moving_right",                    "RocksSP.pcx"           },
   { "sp_zonk.moving_right.xpos",               "0"                     },
   { "sp_zonk.moving_right.ypos",               "6"                     },
   { "sp_zonk.moving_right.frames",             "4"                     },
+  { "sp_zonk.moving_right.start_frame",                "1"                     },
   { "sp_zonk.moving_right.delay",              "2"                     },
-  { "sp_zonk.moving_right.mode_reverse",       "1"                     },
 
   { "sp_base",                                 "RocksSP.pcx"           },
   { "sp_base.xpos",                            "2"                     },
@@ -729,12 +729,13 @@ struct ConfigInfo image_config[] =
   { "rock.moving_left.ypos",                   "0"                     },
   { "rock.moving_left.frames",                 "4"                     },
   { "rock.moving_left.delay",                  "2"                     },
+  { "rock.moving_left.mode_reverse",           "1"                     },
   { "rock.moving_right",                       "RocksElements.pcx"     },
   { "rock.moving_right.xpos",                  "12"                    },
   { "rock.moving_right.ypos",                  "0"                     },
   { "rock.moving_right.frames",                        "4"                     },
+  { "rock.moving_right.start_frame",           "1"                     },
   { "rock.moving_right.delay",                 "2"                     },
-  { "rock.moving_right.mode_reverse",          "1"                     },
 
   { "emerald",                                 "RocksElements.pcx"     },
   { "emerald.xpos",                            "8"                     },
@@ -2178,14 +2179,17 @@ struct ConfigInfo image_config[] =
   { "player1_down.moving.xpos",                        "0"                     },
   { "player1_down.moving.ypos",                        "0"                     },
   { "player1_down.moving.frames",              "4"                     },
+  { "player1_down.moving.start_frame",         "1"                     },
+  { "player1_down.moving.delay",               "4"                     },
   { "player1_down.digging",                    "RocksHeroes.pcx"       },
   { "player1_down.digging.xpos",               "0"                     },
   { "player1_down.digging.ypos",               "0"                     },
   { "player1_down.digging.frames",             "4"                     },
   { "player1_down.pushing",                    "RocksHeroes.pcx"       },
   { "player1_down.pushing.xpos",               "0"                     },
-  { "player1_down.pushing.ypos",               "2"                     },
+  { "player1_down.pushing.ypos",               "0"                     },
   { "player1_down.pushing.frames",             "4"                     },
+  { "player1_down.pushing.delay",              "2"                     },
   { "player1_down.snapping",                   "RocksHeroes.pcx"       },
   { "player1_down.snapping.xpos",              "0"                     },
   { "player1_down.snapping.ypos",              "0"                     },
@@ -2198,6 +2202,8 @@ struct ConfigInfo image_config[] =
   { "player1_up.moving.xpos",                  "4"                     },
   { "player1_up.moving.ypos",                  "0"                     },
   { "player1_up.moving.frames",                        "4"                     },
+  { "player1_up.moving.start_frame",           "1"                     },
+  { "player1_up.moving.delay",                 "4"                     },
   { "player1_up.digging",                      "RocksHeroes.pcx"       },
   { "player1_up.digging.xpos",                 "4"                     },
   { "player1_up.digging.ypos",                 "0"                     },
@@ -2206,6 +2212,7 @@ struct ConfigInfo image_config[] =
   { "player1_up.pushing.xpos",                 "4"                     },
   { "player1_up.pushing.ypos",                 "0"                     },
   { "player1_up.pushing.frames",               "4"                     },
+  { "player1_up.pushing.delay",                        "2"                     },
   { "player1_up.snapping",                     "RocksHeroes.pcx"       },
   { "player1_up.snapping.xpos",                        "4"                     },
   { "player1_up.snapping.ypos",                        "0"                     },
@@ -2218,6 +2225,8 @@ struct ConfigInfo image_config[] =
   { "player1_left.moving.xpos",                        "0"                     },
   { "player1_left.moving.ypos",                        "1"                     },
   { "player1_left.moving.frames",              "4"                     },
+  { "player1_left.moving.start_frame",         "1"                     },
+  { "player1_left.moving.delay",               "4"                     },
   { "player1_left.digging",                    "RocksHeroes.pcx"       },
   { "player1_left.digging.xpos",               "0"                     },
   { "player1_left.digging.ypos",               "1"                     },
@@ -2226,6 +2235,7 @@ struct ConfigInfo image_config[] =
   { "player1_left.pushing.xpos",               "4"                     },
   { "player1_left.pushing.ypos",               "2"                     },
   { "player1_left.pushing.frames",             "4"                     },
+  { "player1_left.pushing.delay",              "2"                     },
   { "player1_left.snapping",                   "RocksHeroes.pcx"       },
   { "player1_left.snapping.xpos",              "0"                     },
   { "player1_left.snapping.ypos",              "1"                     },
@@ -2238,6 +2248,8 @@ struct ConfigInfo image_config[] =
   { "player1_right.moving.xpos",               "4"                     },
   { "player1_right.moving.ypos",               "1"                     },
   { "player1_right.moving.frames",             "4"                     },
+  { "player1_right.moving.delay",              "4"                     },
+  { "player1_right.moving.start_frame",                "1"                     },
   { "player1_right.digging",                   "RocksHeroes.pcx"       },
   { "player1_right.digging.xpos",              "4"                     },
   { "player1_right.digging.ypos",              "1"                     },
@@ -2246,6 +2258,7 @@ struct ConfigInfo image_config[] =
   { "player1_right.pushing.xpos",              "0"                     },
   { "player1_right.pushing.ypos",              "2"                     },
   { "player1_right.pushing.frames",            "4"                     },
+  { "player1_right.pushing.delay",             "2"                     },
   { "player1_right.snapping",                  "RocksHeroes.pcx"       },
   { "player1_right.snapping.xpos",             "4"                     },
   { "player1_right.snapping.ypos",             "1"                     },
@@ -2269,7 +2282,7 @@ struct ConfigInfo image_config[] =
   { "player2_down.digging.frames",             "4"                     },
   { "player2_down.pushing",                    "RocksHeroes.pcx"       },
   { "player2_down.pushing.xpos",               "0"                     },
-  { "player2_down.pushing.ypos",               "5"                     },
+  { "player2_down.pushing.ypos",               "3"                     },
   { "player2_down.pushing.frames",             "4"                     },
   { "player2_down.snapping",                   "RocksHeroes.pcx"       },
   { "player2_down.snapping.xpos",              "0"                     },
@@ -2354,7 +2367,7 @@ struct ConfigInfo image_config[] =
   { "player3_down.digging.frames",             "4"                     },
   { "player3_down.pushing",                    "RocksHeroes.pcx"       },
   { "player3_down.pushing.xpos",               "0"                     },
-  { "player3_down.pushing.ypos",               "8"                     },
+  { "player3_down.pushing.ypos",               "6"                     },
   { "player3_down.pushing.frames",             "4"                     },
   { "player3_down.snapping",                   "RocksHeroes.pcx"       },
   { "player3_down.snapping.xpos",              "0"                     },
@@ -2439,7 +2452,7 @@ struct ConfigInfo image_config[] =
   { "player4_down.digging.frames",             "4"                     },
   { "player4_down.pushing",                    "RocksHeroes.pcx"       },
   { "player4_down.pushing.xpos",               "0"                     },
-  { "player4_down.pushing.ypos",               "11"                    },
+  { "player4_down.pushing.ypos",               "9"                     },
   { "player4_down.pushing.frames",             "4"                     },
   { "player4_down.snapping",                   "RocksHeroes.pcx"       },
   { "player4_down.snapping.xpos",              "0"                     },