X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=ba87b736d14d52ccc3597453adabbab86e0abee4;hb=fa2a77aa4b53bb786e67f35d6c46f759ebe7823d;hp=72ef847bd145d5dca58d393d5158cd57696bfb9c;hpb=75ebfce89c39bc740367807c4c16f469135ba6d5;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 72ef847b..ba87b736 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,9 @@
 #include "events.h"
 
 GC		tile_clip_gc;
+#if 0
 Bitmap	       *pix[NUM_BITMAPS];
+#endif
 Bitmap	       *bitmap_db_field, *bitmap_db_door;
 Pixmap		tile_clipmask[NUM_TILES];
 DrawBuffer     *fieldbuffer;
@@ -192,14 +194,14 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { "bomb",			"bomb"				},
   { "magic_wall",		"magic wall"			},     /* 20 */
   { "speed_pill",		"speed pill"			},
-  { "acid",			"acid pool"			},
+  { "acid",			"acid"				},
   { "amoeba",			"dropping amoeba"		},
   { "amoeba",			"normal amoeba"			},
   { "nut",			"nut with emerald"		},
   { "gameoflife",		"Conway's wall of life"		},
   { "biomaze",			"biomaze"			},
   { "dynamite",			"burning dynamite"		},
-  { NULL,			"unknown"			},
+  { "wall",			"wall"				},
   { "robot_wheel",		"magic wheel"			},     /* 30 */
   { "robot_wheel",		"magic wheel (running)"		},
   { "key",			"red key"			},
@@ -233,7 +235,9 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { "dark_yamyam",		"dark yam yam"			},     /* 60 */
   { "bd_magic_wall",		"magic wall (BD style)"		},
   { "wall",			"invisible steel wall"		},
-  { NULL,			"-"				},
+
+  { NULL,			"(not used)"			},
+
   { "dynabomb_nr",		"increases number of bombs"	},
   { "dynabomb_sz",		"increases explosion size"	},
   { "dynabomb_xl",		"increases power of explosion"	},
@@ -270,12 +274,12 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { "emerald",			"purple emerald"		},
   { "wall",			"wall with red emerald"		},
   { "wall",			"wall with purple emerald"	},
-  { NULL,			"unknown"			},    /* 100 */
-  { NULL,			"unknown"			},
-  { NULL,			"unknown"			},
-  { NULL,			"unknown"			},
-  { NULL,			"unknown"			},
-  { NULL,			"normal wall (BD style)"	},
+  { "wall",			"acid pool (top left)"		},    /* 100 */
+  { "wall",			"acid pool (top right)"		},
+  { "wall",			"acid pool (bottom left)"	},
+  { "wall",			"acid pool (bottom)"		},
+  { "wall",			"acid pool (bottom right)"	},
+  { "wall",			"normal wall (BD style)"	},
   { "bd_rock",			"rock (BD style)"		},
   { "exit",			"open exit"			},
   { NULL,			"black orb bomb"		},
@@ -424,8 +428,9 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { "gate",			"gray door (EM style, yellow key)"},
   { "gate",			"gray door (EM style, green key)"},
   { "gate",			"gray door (EM style, blue key)"},
-  { NULL,			"unknown"			},
-  { NULL,			"unknown"			},
+
+  { NULL,			"(not used)"			},
+  { NULL,			"(not used)"			},
 
   /* 256 */
 
@@ -490,10 +495,13 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { "mole",			"mole (starts moving down)"	},
   { "wall",			"steel wall (slanted)"		},
   { "sand",			"invisible sand"		},
-  { NULL,			"dx unknown 15"			},
-  { NULL,			"dx unknown 42"			},
-  { NULL,			"-"				},
-  { NULL,			"-"				},    /* 320 */
+
+  { NULL,			"dx unknown element 15"		},
+  { NULL,			"dx unknown element 42"		},
+
+  { NULL,			"(not used)"			},
+  { NULL,			"(not used)"			},    /* 320 */
+
   { "shield_deadly",		"shield (deadly, kills enemies)"},
   { "timegate",			"time gate (open)"		},
   { "timegate",			"time gate (closed)"		},
@@ -531,6 +539,41 @@ struct ElementInfo element_info[MAX_ELEMENTS] =
   { "spring",			"spring"			},
   { "trap",			"trap"				},
   { "dx_bomb",			"stable bomb (DX style)"	},
+  { NULL,			"-"				},
+  { NULL,			"-"				},
+  { "generic",			"generic element 0"		},
+  { "generic",			"generic element 1"		},
+  { "generic",			"generic element 2"		},
+  { "generic",			"generic element 3"		},
+  { "generic",			"generic element 4"		},
+  { "generic",			"generic element 5"		},
+  { "generic",			"generic element 6"		},
+  { "generic",			"generic element 7"		},
+  { "generic",			"generic element 8"		},
+  { "generic",			"generic element 9"		},
+  { "generic",			"generic element 10"		},
+  { "generic",			"generic element 11"		},
+  { "generic",			"generic element 12"		},
+  { "generic",			"generic element 13"		},
+  { "generic",			"generic element 14"		},
+  { "generic",			"generic element 15"		},
+  { "generic",			"generic element 16"		},
+  { "generic",			"generic element 17"		},
+  { "generic",			"generic element 18"		},
+  { "generic",			"generic element 19"		},
+  { "generic",			"generic element 20"		},
+  { "generic",			"generic element 21"		},
+  { "generic",			"generic element 22"		},
+  { "generic",			"generic element 23"		},
+  { "generic",			"generic element 24"		},
+  { "generic",			"generic element 25"		},
+  { "generic",			"generic element 26"		},
+  { "generic",			"generic element 27"		},
+  { "generic",			"generic element 28"		},
+  { "generic",			"generic element 29"		},
+  { "generic",			"generic element 30"		},
+  { "generic",			"generic element 31"		},
+
   { NULL,			"-"				}
 
   /*