--- deliantra/server/common/button.C	2007/01/09 16:38:23	1.24
+++ deliantra/server/common/button.C	2007/01/15 21:06:18	1.27
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ */
 
 #include <global.h>
 #include <funcpoint.h>
@@ -830,29 +830,40 @@
  *    away, and then leaves the inventory checker. That would've caused an always-enabled
  *    state in the inventory checker. This won't happen anymore now.
  *
+ * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check
+ * whether op is on this mapspace or not, because the value (1|0) depends
+ * on this information. also make sure to only push_button if op has 
+ * a matching item (because when we do a push_button with value=0 timed gates
+ * will still open)! (i hope i got the semantics right this time)
+ *
  */
 void
 check_inv (object *op, object *trig)
 {
-  sint32 prev_state = trig->value;
   trig->value = 0; // deactivate if none of the following conditions apply
 
-  if (object *pl = trig->ms ().player ())
-    {
-      object *match = check_inv_recursive (pl, trig);
+  object *pl    = trig->ms ().player ();
+  object *match = check_inv_recursive (op, trig);
 
-      if (match && trig->last_sp) // match == having
-        {
-          if (trig->last_heal)
-            decrease_ob (match);
+  // elmex: a note about (pl == op):
+  // if pl == 0 then the player has left this space
+  // if pl != 0 then a player is on this mapspace, but then
+  // we still have to check whether it's the player that triggered
+  // this inv-checker, because if not, then the op left this inv-checker
+  // and we have to set the value to 0
 
-          trig->value = 1;
-        }
-      else if (!match && !trig->last_sp) // match == not having
-        trig->value = 1;
-    }
+  if (match && trig->last_sp) // match == having
+    {
+      if (trig->last_heal)
+        decrease_ob (match);
 
-  if (prev_state != trig->value)
-    push_button (trig);
+      trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
+      push_button (trig);
+    }
+  else if (!match && !trig->last_sp) // match == not having
+    {
+      trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
+      push_button (trig);
+    }
 }