--- deliantra/server/include/define.h	2006/12/20 03:57:01	1.21
+++ deliantra/server/include/define.h	2006/12/20 14:11:42	1.26
@@ -127,7 +127,7 @@
 /*#define FBULLET                         10 */
 /*#define FBALL                           11 */
 
-#define LIGHTNING                         12
+/*#define LIGHTNING                       12 */ // elmex: implemented by type 102 subtype 4
 #define ARROW                             13
 #define BOW                               14
 #define WEAPON                            15
@@ -163,10 +163,12 @@
 #define TELEPORTER                        41
 #define CREATOR                           42
 #define SKILL                             43 /* also see SKILL_TOOL (74) below */
-#define EXPERIENCE                        44 /* This is basically obsolete now.  It used to contain
-                                              * experience for broad skill categories.  This value
-                                              * is now automatically converteed at load time.
-                                              */
+
+/*#define EXPERIENCE                      44*//* This is basically obsolete now.  It used to contain
+                                               * experience for broad skill categories.  This value
+                                               * is now automatically converteed at load time.
+                                               */
+
 #define EARTHWALL                         45
 #define GOLEM                             46
 
@@ -196,7 +198,7 @@
                                               */
 #define GEM                               60
 
-/*#define FIRECHEST                    61*/ /* FIRECHEST folded into FIREWALL */
+/*#define FIRECHEST                       61*/ /* FIRECHEST folded into FIREWALL */
 
 #define FIREWALL                          62
 #define ANVIL                             63
@@ -219,21 +221,31 @@
 #define SKILL_TOOL                        74 /* Allows the use of a skill */
 #define LIGHTER                           75
 
-/* The trap_part, wall, light_source, misc_object, monster, and spawn_generator
- * types are not used in any archetypes, and should perhaps be removed.
+/* random crossfire developer: The trap_part, wall, light_source,
+ *                             misc_object, monster, and spawn_generator
+ *                             types are not used in any archetypes,
+ *                             and should perhaps be removed.
+ *
+ * Wed Dec 20 13:35:24 CET 2006:
+ * elmex: haha, removed TRAP_PART, LIGHT_SOURCE, MONSTER and SPAWN_GENERATOR now.
+ *        monsters are marked by FLAG_MONSTER and generator with FLAG_GENERATOR.
+ *        renamed WALL to BUILDABLE_WALL.
  */
 
-#define TRAP_PART                         76  /* Needed by set traps skill -b.t. */
+//#define TRAP_PART                       76 /* Needed by set traps skill -b.t. */
+
+#define BUILDABLE_WALL                    77 /* this is a buildable wall */
+
+//#define LIGHT_SOURCE                    78 /* torches, lamps, etc. */
 
-#define WALL                              77  /* this is a wall. put it always in layer 1 if not set is_floor */
-#define LIGHT_SOURCE                      78  /* torches, lamps, etc. */
 #define MISC_OBJECT                       79  /* misc. objects are for objects without a function
                                                  in the engine. Like statues, clocks, chairs,...
                                                  If perhaps we create a function where we can sit
                                                  on chairs, we create a new type and remove all
                                                  chairs from here. */
-#define MONSTER                           80 /* yes, thats a real, living creature */
-#define SPAWN_GENERATOR                   81 /* a spawn point or monster generator object */
+//#define MONSTER                         80 /* yes, thats a real, living creature */
+//#define SPAWN_GENERATOR                 81 /* a spawn point or monster generator object */
+
 #define LAMP                              82  /* a lamp */
 #define DUPLICATOR                        83  /* duplicator/multiplier object */
 #define TOOL                              84  /* a tool for building objects */
@@ -263,8 +275,10 @@
 #define BRACERS                          104
 #define POISONING                        105
 #define SAVEBED                          106
-#define POISONCLOUD                      107
-#define FIREHOLES                        108
+
+// #define POISONCLOUD                      107
+// #define FIREHOLES                        108
+
 #define WAND                             109
 
 /*#define ABILITY                        110*/
@@ -308,7 +322,9 @@
 
 /* #define GPS                           162 Ground positionning system, moved to Python plugin */
 #define ITEM_TRANSFORMER                 163 /* Transforming one item with another */
-#define QUEST                            164 /* See below for subtypes */
+
+/*#define QUEST                          164 */ /* See below for subtypes */
+
 #define SAFE_GROUND                      165 /* This is a safe ground, means that neither bombs,
                                                 potions, alchemy, or magic works here (elmex) */