rnd-20050807-1-src
[rocksndiamonds.git] / src / conf_gfx.c
index 4e8af67038111b67ce4b5b33a465453d24c51fc3..9aa3e6bbe9abb401875199a0d7964572eef92175 100644 (file)
@@ -1465,21 +1465,18 @@ struct ConfigInfo image_config[] =
   { "emc_steelwall_1.xpos",                    "14"                    },
   { "emc_steelwall_1.ypos",                    "0"                     },
   { "emc_steelwall_1.frames",                  "1"                     },
-  { "emc_steelwall_2",                         "emc_object.pcx"        },
-  { "emc_steelwall_2.xpos",                    "25"                    },
-  { "emc_steelwall_2.ypos",                    "20"                    },
+  { "emc_steelwall_2",                         "RocksEMC.pcx"          },
+  { "emc_steelwall_2.xpos",                    "9"                     },
+  { "emc_steelwall_2.ypos",                    "8"                     },
   { "emc_steelwall_2.frames",                  "1"                     },
-  { "emc_steelwall_2.scale_up_factor",         "2"                     },
-  { "emc_steelwall_3",                         "emc_object.pcx"        },
-  { "emc_steelwall_3.xpos",                    "25"                    },
-  { "emc_steelwall_3.ypos",                    "21"                    },
+  { "emc_steelwall_3",                         "RocksEMC.pcx"          },
+  { "emc_steelwall_3.xpos",                    "9"                     },
+  { "emc_steelwall_3.ypos",                    "9"                     },
   { "emc_steelwall_3.frames",                  "1"                     },
-  { "emc_steelwall_3.scale_up_factor",         "2"                     },
-  { "emc_steelwall_4",                         "emc_object.pcx"        },
-  { "emc_steelwall_4.xpos",                    "25"                    },
-  { "emc_steelwall_4.ypos",                    "22"                    },
+  { "emc_steelwall_4",                         "RocksEMC.pcx"          },
+  { "emc_steelwall_4.xpos",                    "9"                     },
+  { "emc_steelwall_4.ypos",                    "10"                    },
   { "emc_steelwall_4.frames",                  "1"                     },
-  { "emc_steelwall_4.scale_up_factor",         "2"                     },
 
   { "emc_wall_1",                              "RocksDC.pcx"           },
   { "emc_wall_1.xpos",                         "13"                    },
@@ -1509,11 +1506,10 @@ struct ConfigInfo image_config[] =
   { "emc_wall_7.xpos",                         "15"                    },
   { "emc_wall_7.ypos",                         "2"                     },
   { "emc_wall_7.frames",                       "1"                     },
-  { "emc_wall_8",                              "emc_object.pcx"        },
-  { "emc_wall_8.xpos",                         "25"                    },
-  { "emc_wall_8.ypos",                         "31"                    },
+  { "emc_wall_8",                              "RocksEMC.pcx"          },
+  { "emc_wall_8.xpos",                         "8"                     },
+  { "emc_wall_8.ypos",                         "7"                     },
   { "emc_wall_8.frames",                       "1"                     },
-  { "emc_wall_8.scale_up_factor",              "2"                     },
 
   /* images for Diamond Caves style elements and actions */
 
@@ -3401,12 +3397,10 @@ struct ConfigInfo image_config[] =
   { "emc_gate_8_gray.EDITOR.xpos",             "3"                     },
   { "emc_gate_8_gray.EDITOR.ypos",             "7"                     },
 
-  { "emc_android",                             "emc_object.pcx"        },
-  { "emc_android.xpos",                                "7"                     },
-  { "emc_android.ypos",                                "13"                    },
+  { "emc_android",                             "RocksEMC.pcx"          },
+  { "emc_android.xpos",                                "0"                     },
+  { "emc_android.ypos",                                "8"                     },
   { "emc_android.frames",                      "8"                     },
-  { "emc_android.vertical",                    "true"                  },
-  { "emc_android.scale_up_factor",             "2"                     },
 
   { "emc_grass",                               "RocksEMC.pcx"          },
   { "emc_grass.xpos",                          "0"                     },
@@ -3465,30 +3459,26 @@ struct ConfigInfo image_config[] =
   { "emc_grass.digging.down.CRUMBLED.delay",   "2"                     },
   { "emc_grass.digging.down.CRUMBLED.anim_mode","linear"               },
 
-  { "emc_magic_ball",                          "emc_object.pcx"        },
-  { "emc_magic_ball.xpos",                     "22"                    },
-  { "emc_magic_ball.ypos",                     "18"                    },
+  { "emc_magic_ball",                          "RocksEMC.pcx"          },
+  { "emc_magic_ball.xpos",                     "0"                     },
+  { "emc_magic_ball.ypos",                     "9"                     },
   { "emc_magic_ball.frames",                   "1"                     },
-  { "emc_magic_ball.scale_up_factor",          "2"                     },
 
-  { "emc_magic_ball.active",                   "emc_object.pcx"        },
-  { "emc_magic_ball.active.xpos",              "22"                    },
-  { "emc_magic_ball.active.ypos",              "18"                    },
+  { "emc_magic_ball.active",                   "RocksEMC.pcx"          },
+  { "emc_magic_ball.active.xpos",              "0"                     },
+  { "emc_magic_ball.active.ypos",              "9"                     },
   { "emc_magic_ball.active.frames",            "16"                    },
-  { "emc_magic_ball.active.vertical",          "true"                  },
-  { "emc_magic_ball.active.scale_up_factor",   "2"                     },
+  { "emc_magic_ball.active.frames_per_line",   "8"                     },
 
-  { "emc_magic_ball_switch",                   "emc_object.pcx"        },
-  { "emc_magic_ball_switch.xpos",              "25"                    },
+  { "emc_magic_ball_switch",                   "RocksEMC.pcx"          },
+  { "emc_magic_ball_switch.xpos",              "8"                     },
   { "emc_magic_ball_switch.ypos",              "10"                    },
   { "emc_magic_ball_switch.frames",            "1"                     },
-  { "emc_magic_ball_switch.scale_up_factor",   "2"                     },
 
-  { "emc_magic_ball_switch.active",            "emc_object.pcx"        },
-  { "emc_magic_ball_switch.active.xpos",       "25"                    },
+  { "emc_magic_ball_switch.active",            "RocksEMC.pcx"          },
+  { "emc_magic_ball_switch.active.xpos",       "8"                     },
   { "emc_magic_ball_switch.active.ypos",       "9"                     },
   { "emc_magic_ball_switch.active.frames",     "1"                     },
-  { "emc_magic_ball_switch.active.scale_up_factor", "2"                        },
 
   { "emc_spring_bumper",                       "RocksEMC.pcx"          },
   { "emc_spring_bumper.xpos",                  "8"                     },
@@ -3520,67 +3510,55 @@ struct ConfigInfo image_config[] =
   { "emc_magnifier.ypos",                      "4"                     },
   { "emc_magnifier.frames",                    "1"                     },
 
-  { "emc_wall_9",                              "emc_object.pcx"        },
-  { "emc_wall_9.xpos",                         "26"                    },
-  { "emc_wall_9.ypos",                         "4"                     },
+  { "emc_wall_9",                              "RocksEMC.pcx"          },
+  { "emc_wall_9.xpos",                         "10"                    },
+  { "emc_wall_9.ypos",                         "5"                     },
   { "emc_wall_9.frames",                       "1"                     },
-  { "emc_wall_9.scale_up_factor",              "2"                     },
-  { "emc_wall_10",                             "emc_object.pcx"        },
-  { "emc_wall_10.xpos",                                "26"                    },
-  { "emc_wall_10.ypos",                                "5"                     },
+  { "emc_wall_10",                             "RocksEMC.pcx"          },
+  { "emc_wall_10.xpos",                                "10"                    },
+  { "emc_wall_10.ypos",                                "6"                     },
   { "emc_wall_10.frames",                      "1"                     },
-  { "emc_wall_10.scale_up_factor",             "2"                     },
-  { "emc_wall_11",                             "emc_object.pcx"        },
-  { "emc_wall_11.xpos",                                "26"                    },
-  { "emc_wall_11.ypos",                                "9"                     },
+  { "emc_wall_11",                             "RocksEMC.pcx"          },
+  { "emc_wall_11.xpos",                                "11"                    },
+  { "emc_wall_11.ypos",                                "5"                     },
   { "emc_wall_11.frames",                      "1"                     },
-  { "emc_wall_11.scale_up_factor",             "2"                     },
-  { "emc_wall_12",                             "emc_object.pcx"        },
-  { "emc_wall_12.xpos",                                "26"                    },
-  { "emc_wall_12.ypos",                                "10"                    },
+  { "emc_wall_12",                             "RocksEMC.pcx"          },
+  { "emc_wall_12.xpos",                                "11"                    },
+  { "emc_wall_12.ypos",                                "6"                     },
   { "emc_wall_12.frames",                      "1"                     },
-  { "emc_wall_12.scale_up_factor",             "2"                     },
-  { "emc_wall_13",                             "emc_object.pcx"        },
-  { "emc_wall_13.xpos",                                "25"                    },
-  { "emc_wall_13.ypos",                                "23"                    },
+  { "emc_wall_13",                             "RocksEMC.pcx"          },
+  { "emc_wall_13.xpos",                                "10"                    },
+  { "emc_wall_13.ypos",                                "7"                     },
   { "emc_wall_13.frames",                      "1"                     },
-  { "emc_wall_13.scale_up_factor",             "2"                     },
-  { "emc_wall_14",                             "emc_object.pcx"        },
-  { "emc_wall_14.xpos",                                "25"                    },
-  { "emc_wall_14.ypos",                                "24"                    },
+  { "emc_wall_14",                             "RocksEMC.pcx"          },
+  { "emc_wall_14.xpos",                                "10"                    },
+  { "emc_wall_14.ypos",                                "8"                     },
   { "emc_wall_14.frames",                      "1"                     },
-  { "emc_wall_14.scale_up_factor",             "2"                     },
-  { "emc_wall_15",                             "emc_object.pcx"        },
-  { "emc_wall_15.xpos",                                "25"                    },
-  { "emc_wall_15.ypos",                                "25"                    },
+  { "emc_wall_15",                             "RocksEMC.pcx"          },
+  { "emc_wall_15.xpos",                                "10"                    },
+  { "emc_wall_15.ypos",                                "9"                     },
   { "emc_wall_15.frames",                      "1"                     },
-  { "emc_wall_15.scale_up_factor",             "2"                     },
-  { "emc_wall_16",                             "emc_object.pcx"        },
-  { "emc_wall_16.xpos",                                "25"                    },
-  { "emc_wall_16.ypos",                                "26"                    },
+  { "emc_wall_16",                             "RocksEMC.pcx"          },
+  { "emc_wall_16.xpos",                                "10"                    },
+  { "emc_wall_16.ypos",                                "10"                    },
   { "emc_wall_16.frames",                      "1"                     },
-  { "emc_wall_16.scale_up_factor",             "2"                     },
 
-  { "emc_wall_slippery_1",                     "emc_object.pcx"        },
-  { "emc_wall_slippery_1.xpos",                        "25"                    },
-  { "emc_wall_slippery_1.ypos",                        "27"                    },
+  { "emc_wall_slippery_1",                     "RocksEMC.pcx"          },
+  { "emc_wall_slippery_1.xpos",                        "11"                    },
+  { "emc_wall_slippery_1.ypos",                        "7"                     },
   { "emc_wall_slippery_1.frames",              "1"                     },
-  { "emc_wall_slippery_1.scale_up_factor",     "2"                     },
-  { "emc_wall_slippery_2",                     "emc_object.pcx"        },
-  { "emc_wall_slippery_2.xpos",                        "25"                    },
-  { "emc_wall_slippery_2.ypos",                        "28"                    },
+  { "emc_wall_slippery_2",                     "RocksEMC.pcx"          },
+  { "emc_wall_slippery_2.xpos",                        "11"                    },
+  { "emc_wall_slippery_2.ypos",                        "8"                     },
   { "emc_wall_slippery_2.frames",              "1"                     },
-  { "emc_wall_slippery_2.scale_up_factor",     "2"                     },
-  { "emc_wall_slippery_3",                     "emc_object.pcx"        },
-  { "emc_wall_slippery_3.xpos",                        "25"                    },
-  { "emc_wall_slippery_3.ypos",                        "29"                    },
+  { "emc_wall_slippery_3",                     "RocksEMC.pcx"          },
+  { "emc_wall_slippery_3.xpos",                        "11"                    },
+  { "emc_wall_slippery_3.ypos",                        "9"                     },
   { "emc_wall_slippery_3.frames",              "1"                     },
-  { "emc_wall_slippery_3.scale_up_factor",     "2"                     },
-  { "emc_wall_slippery_4",                     "emc_object.pcx"        },
-  { "emc_wall_slippery_4.xpos",                        "25"                    },
-  { "emc_wall_slippery_4.ypos",                        "30"                    },
+  { "emc_wall_slippery_4",                     "RocksEMC.pcx"          },
+  { "emc_wall_slippery_4.xpos",                        "11"                    },
+  { "emc_wall_slippery_4.ypos",                        "10"                    },
   { "emc_wall_slippery_4.frames",              "1"                     },
-  { "emc_wall_slippery_4.scale_up_factor",     "2"                     },
 
   { "emc_fake_grass",                          "RocksEMC.pcx"          },
   { "emc_fake_grass.xpos",                     "0"                     },
@@ -3610,15 +3588,13 @@ struct ConfigInfo image_config[] =
   { "emc_dripper.xpos",                                "0"                     },
   { "emc_dripper.ypos",                                "0"                     },
   { "emc_dripper.frames",                      "1"                     },
-  { "emc_dripper.EDITOR",                      "emc_object.pcx"        },
-  { "emc_dripper.EDITOR.xpos",                 "25"                    },
-  { "emc_dripper.EDITOR.ypos",                 "15"                    },
-  { "emc_dripper.EDITOR.scale_up_factor",      "2"                     },
-  { "emc_dripper.active",                      "emc_object.pcx"        },
-  { "emc_dripper.active.xpos",                 "25"                    },
-  { "emc_dripper.active.ypos",                 "15"                    },
+  { "emc_dripper.EDITOR",                      "RocksEMC.pcx"          },
+  { "emc_dripper.EDITOR.xpos",                 "8"                     },
+  { "emc_dripper.EDITOR.ypos",                 "8"                     },
+  { "emc_dripper.active",                      "RocksEMC.pcx"          },
+  { "emc_dripper.active.xpos",                 "8"                     },
+  { "emc_dripper.active.ypos",                 "8"                     },
   { "emc_dripper.active.frames",               "1"                     },
-  { "emc_dripper.active.scale_up_factor",      "2"                     },
 
 #include "conf_chr.c"  /* include auto-generated data structure definitions */
 #include "conf_cus.c"  /* include auto-generated data structure definitions */
@@ -3627,13 +3603,21 @@ 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
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
-  { "emc_object",                              "emc_object.pcx"        },
+  /* (for testing, change filename back to "emc_object dot pcx") */
+  { "emc_object",                              "RocksEMC.pcx"          },
+#if 0
   { "emc_object.scale_up_factor",              "2"                     },
+#endif
 
-  { "emc_sprite",                              "emc_sprite.pcx"        },
+  /* (for testing, change filename back to "emc_sprite dot pcx") */
+  { "emc_sprite",                              "RocksEMC.pcx"          },
+#if 0
   { "emc_sprite.scale_up_factor",              "2"                     },
+#endif
+#endif
 
   { "toon_1",                                  "RocksToons.pcx"        },
   { "toon_1.x",                                        "2"                     },