projects / rocksndiamonds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rnd-20100325-1-src
[rocksndiamonds.git] / src / conf_gfx.c
diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index b282959b7016309a673dad36dffc40ccc25d0be5..913a3728888f4e97ec53c0d3ad59c9a82b57403d 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -67,6 +67,8 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".align",                          ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".valign",                         ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".sort_priority",                  ARG_UNDEFINED,  TYPE_INTEGER    },
+  { ".class",                          ARG_UNDEFINED,  TYPE_STRING     },
+  { ".style",                          ARG_UNDEFINED,  TYPE_STRING     },
 
   { NULL,                              NULL,           0               }
 };
@@ -281,7 +283,7 @@ struct ConfigInfo image_config[] =
   { "[sp_default].exploding.xpos",             "8"                     },
   { "[sp_default].exploding.ypos",             "3"                     },
   { "[sp_default].exploding.frames",           "8"                     },
-  { "[sp_default].exploding.delay",            "3"                     },
+  { "[sp_default].exploding.delay",            "4"                     },
   { "[sp_default].exploding.anim_mode",                "linear"                },
 
   { "sp_zonk",                                 "RocksSP.pcx"           },
@@ -292,26 +294,26 @@ struct ConfigInfo image_config[] =
   { "sp_zonk.moving.left.xpos",                        "0"                     },
   { "sp_zonk.moving.left.ypos",                        "6"                     },
   { "sp_zonk.moving.left.frames",              "4"                     },
-  { "sp_zonk.moving.left.delay",               "2"                     },
+  { "sp_zonk.moving.left.delay",               "1"                     },
   { "sp_zonk.moving.left.anim_mode",           "reverse"               },
   { "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.delay",              "1"                     },
   { "sp_zonk.pushing.left",                    "RocksSP.pcx"           },
   { "sp_zonk.pushing.left.xpos",               "0"                     },
   { "sp_zonk.pushing.left.ypos",               "6"                     },
   { "sp_zonk.pushing.left.frames",             "4"                     },
-  { "sp_zonk.pushing.left.delay",              "2"                     },
+  { "sp_zonk.pushing.left.delay",              "1"                     },
   { "sp_zonk.pushing.left.anim_mode",          "reverse"               },
   { "sp_zonk.pushing.right",                   "RocksSP.pcx"           },
   { "sp_zonk.pushing.right.xpos",              "0"                     },
   { "sp_zonk.pushing.right.ypos",              "6"                     },
   { "sp_zonk.pushing.right.frames",            "4"                     },
   { "sp_zonk.pushing.right.start_frame",       "1"                     },
-  { "sp_zonk.pushing.right.delay",             "2"                     },
+  { "sp_zonk.pushing.right.delay",             "1"                     },
 
   { "sp_base",                                 "RocksSP.pcx"           },
   { "sp_base.xpos",                            "2"                     },
@@ -338,36 +340,42 @@ struct ConfigInfo image_config[] =
   { "sp_murphy.moving.left.frames",            "3"                     },
   { "sp_murphy.moving.left.anim_mode",         "pingpong"              },
   { "sp_murphy.moving.left.delay",             "2"                     },
+  { "sp_murphy.moving.left.start_frame",       "1"                     },
   { "sp_murphy.moving.right",                  "RocksSP.pcx"           },
   { "sp_murphy.moving.right.xpos",             "11"                    },
   { "sp_murphy.moving.right.ypos",             "0"                     },
   { "sp_murphy.moving.right.frames",           "3"                     },
   { "sp_murphy.moving.right.anim_mode",                "pingpong"              },
   { "sp_murphy.moving.right.delay",            "2"                     },
+  { "sp_murphy.moving.right.start_frame",      "1"                     },
   { "sp_murphy.digging.left",                  "RocksSP.pcx"           },
   { "sp_murphy.digging.left.xpos",             "8"                     },
   { "sp_murphy.digging.left.ypos",             "0"                     },
   { "sp_murphy.digging.left.frames",           "3"                     },
   { "sp_murphy.digging.left.anim_mode",                "pingpong"              },
   { "sp_murphy.digging.left.delay",            "2"                     },
+  { "sp_murphy.digging.left.start_frame",      "1"                     },
   { "sp_murphy.digging.right",                 "RocksSP.pcx"           },
   { "sp_murphy.digging.right.xpos",            "11"                    },
   { "sp_murphy.digging.right.ypos",            "0"                     },
   { "sp_murphy.digging.right.frames",          "3"                     },
   { "sp_murphy.digging.right.anim_mode",       "pingpong"              },
   { "sp_murphy.digging.right.delay",           "2"                     },
+  { "sp_murphy.digging.right.start_frame",     "1"                     },
   { "sp_murphy.collecting.left",               "RocksSP.pcx"           },
   { "sp_murphy.collecting.left.xpos",          "8"                     },
   { "sp_murphy.collecting.left.ypos",          "0"                     },
   { "sp_murphy.collecting.left.frames",                "3"                     },
   { "sp_murphy.collecting.left.anim_mode",     "pingpong"              },
   { "sp_murphy.collecting.left.delay",         "2"                     },
+  { "sp_murphy.collecting.left.start_frame",   "1"                     },
   { "sp_murphy.collecting.right",              "RocksSP.pcx"           },
   { "sp_murphy.collecting.right.xpos",         "11"                    },
   { "sp_murphy.collecting.right.ypos",         "0"                     },
   { "sp_murphy.collecting.right.frames",       "3"                     },
   { "sp_murphy.collecting.right.anim_mode",    "pingpong"              },
   { "sp_murphy.collecting.right.delay",                "2"                     },
+  { "sp_murphy.collecting.right.start_frame",  "1"                     },
   { "sp_murphy.pushing.left",                  "RocksSP.pcx"           },
   { "sp_murphy.pushing.left.xpos",             "11"                    },
   { "sp_murphy.pushing.left.ypos",             "1"                     },
@@ -418,6 +426,16 @@ struct ConfigInfo image_config[] =
   { "sp_murphy.sleeping.right.frames",         "3"                     },
   { "sp_murphy.sleeping.right.delay",          "100"                   },
   { "sp_murphy.sleeping.right.anim_mode",      "linear"                },
+  { "sp_murphy.dropping",                      "RocksSP.pcx"           },
+  { "sp_murphy.dropping.xpos",                 "11"                    },
+  { "sp_murphy.dropping.ypos",                 "12"                    },
+  { "sp_murphy.dropping.frames",               "1"                     },
+  { "sp_murphy.shrinking",                     "RocksSP.pcx"           },
+  { "sp_murphy.shrinking.xpos",                        "8"                     },
+  { "sp_murphy.shrinking.ypos",                        "14"                    },
+  { "sp_murphy.shrinking.frames",              "8"                     },
+  { "sp_murphy.shrinking.delay",               "4"                     },
+  { "sp_murphy.shrinking.anim_mode",           "linear"                },
 
   { "sp_murphy_clone",                         "RocksSP.pcx"           },
   { "sp_murphy_clone.xpos",                    "3"                     },
@@ -521,9 +539,9 @@ struct ConfigInfo image_config[] =
   { "sp_disk_red.ypos",                                "2"                     },
   { "sp_disk_red.frames",                      "1"                     },
   { "sp_disk_red.collecting",                  "RocksSP.pcx"           },
-  { "sp_disk_red.collecting.xpos",             "8"                     },
+  { "sp_disk_red.collecting.xpos",             "9"                     },
   { "sp_disk_red.collecting.ypos",             "5"                     },
-  { "sp_disk_red.collecting.frames",           "8"                     },
+  { "sp_disk_red.collecting.frames",           "7"                     },
   { "sp_disk_red.collecting.anim_mode",                "linear"                },
   { "sp_disk_red.active",                      "RocksSP.pcx"           },
   { "sp_disk_red.active.xpos",                 "4"                     },
@@ -737,7 +755,7 @@ struct ConfigInfo image_config[] =
   { "sp_electron.exploding.xpos",              "8"                     },
   { "sp_electron.exploding.ypos",              "4"                     },
   { "sp_electron.exploding.frames",            "8"                     },
-  { "sp_electron.exploding.delay",             "3"                     },
+  { "sp_electron.exploding.delay",             "4"                     },
   { "sp_electron.exploding.anim_mode",         "linear"                },
 
   { "sp_terminal",                             "RocksSP.pcx"           },
@@ -769,7 +787,8 @@ struct ConfigInfo image_config[] =
   { "sp_buggy_base.active.xpos",               "8"                     },
   { "sp_buggy_base.active.ypos",               "6"                     },
   { "sp_buggy_base.active.frames",             "4"                     },
-  { "sp_buggy_base.active.anim_mode",          "random"                },
+  { "sp_buggy_base.active.delay",              "4"                     },
+  { "sp_buggy_base.active.anim_mode",          "pingpong"              },
 
   { "sp_hardware_base_1",                      "RocksSP.pcx"           },
   { "sp_hardware_base_1.xpos",                 "4"                     },
@@ -4346,10 +4365,6 @@ struct ConfigInfo image_config[] =
   /* images not associated to game elements (used for menu screens etc.) */
   /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */
 
-#if 1
-  { "sp_objects",                              "sp_objects.pcx"        },
-#endif
-
 #if 1
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
@@ -4366,6 +4381,16 @@ struct ConfigInfo image_config[] =
 #endif
 #endif
 
+  { "sp_frame_horizontal",                     "RocksSP.pcx"           },
+  { "sp_frame_horizontal.xpos",                        "7"                     },
+  { "sp_frame_horizontal.ypos",                        "14"                    },
+  { "sp_frame_vertical",                       "RocksSP.pcx"           },
+  { "sp_frame_vertical.xpos",                  "6"                     },
+  { "sp_frame_vertical.ypos",                  "14"                    },
+  { "sp_frame_corner",                         "RocksSP.pcx"           },
+  { "sp_frame_corner.xpos",                    "5"                     },
+  { "sp_frame_corner.ypos",                    "14"                    },
+
   { "toon_1",                                  "RocksToons.pcx"        },
   { "toon_1.x",                                        "2"                     },
   { "toon_1.y",                                        "72"                    },
@@ -5384,10 +5409,16 @@ struct ConfigInfo image_config[] =
   { "menu.draw_yoffset.SETUP[ARTWORK]",                "0"                     },
   { "menu.draw_xoffset.SETUP[INPUT]",          "0"                     },
   { "menu.draw_yoffset.SETUP[INPUT]",          "0"                     },
+  { "menu.draw_xoffset.SETUP[SHORTCUTS]",      "0"                     },
+  { "menu.draw_yoffset.SETUP[SHORTCUTS]",      "0"                     },
   { "menu.draw_xoffset.SETUP[SHORTCUTS_1]",    "0"                     },
   { "menu.draw_yoffset.SETUP[SHORTCUTS_1]",    "0"                     },
   { "menu.draw_xoffset.SETUP[SHORTCUTS_2]",    "0"                     },
   { "menu.draw_yoffset.SETUP[SHORTCUTS_2]",    "0"                     },
+  { "menu.draw_xoffset.SETUP[SHORTCUTS_3]",    "0"                     },
+  { "menu.draw_yoffset.SETUP[SHORTCUTS_3]",    "0"                     },
+  { "menu.draw_xoffset.SETUP[SHORTCUTS_4]",    "0"                     },
+  { "menu.draw_yoffset.SETUP[SHORTCUTS_4]",    "0"                     },
   { "menu.draw_xoffset.SETUP[CHOOSE_ARTWORK]", "0"                     },
   { "menu.draw_yoffset.SETUP[CHOOSE_ARTWORK]", "0"                     },
   { "menu.draw_xoffset.SETUP[CHOOSE_OTHER]",   "0"                     },
@@ -6358,6 +6389,7 @@ struct ConfigInfo image_config[] =
 
   { "game.forced_scroll_delay_value",          "-1"                    },
   { "game.use_native_emc_graphics_engine",     "false"                 },
+  { "game.use_native_sp_graphics_engine",      "true"                  },
   { "game.use_masked_pushing",                 "false"                 },
 
   { "[player].boring_delay_fixed",             "1000"                  },
Rocks'n'Diamonds