--- deliantra/server/random_maps/standalone.C	2007/11/08 19:43:25	1.16
+++ deliantra/server/random_maps/standalone.C	2009/10/11 18:18:03	1.20
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -46,6 +46,7 @@
       printf ("\nUsage:  %s inputfile outputfile\n", argv[0]);
       exit (0);
     }
+
   strcpy (InFileName, argv[1]);
   strcpy (OutFileName, argv[2]);
 
@@ -79,7 +80,6 @@
 
 #include <global.h>
 
-
 /* some plagarized code from apply.c--I needed just these two functions
 without all the rest of the junk, so.... */
 int
@@ -96,9 +96,14 @@
         do
           {
             i = 10;             /* let's give it 10 tries */
-            while ((tmp = generate_treasure (op->randomitems, op->stats.exp ? op->stats.exp : 5)) == NULL && --i);
+
+            while (!(tmp = generate_treasure (op->randomitems, op->stats.exp ? op->stats.exp : 5))
+                   && --i)
+              ;
+
             if (tmp == NULL)
               return 0;
+
             if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
               {
                 tmp->destroy ();
@@ -119,7 +124,7 @@
           while ((op->stats.hp--) > 0)
             create_treasure (op->randomitems, op, GT_ENVIRONMENT,
                              op->stats.exp ? op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
-        op->remove ();
+
         op->destroy ();
         break;
     }
@@ -132,7 +137,6 @@
  * certain objects (most initialization of chests and creation of
  * treasures and stuff).  Calls auto_apply if appropriate.
  */
-
 void
 fix_auto_apply (maptile *m)
 {
@@ -169,7 +173,7 @@
     for (y = 0; y < m->height; y++)
       for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
         if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
-          check_trigger (tmp, tmp->above);
+          check_trigger (tmp, tmp->above, tmp->above);
 }
 
 /**
@@ -275,3 +279,4 @@
 trap_adjust (object *ob, int x)
 {
 }
+