[ViewVC] Diff of: cvs/deliantra/server/common/button.C

Comparing deliantra/server/common/button.C (file contents):
Revision 1.57 by root, Mon Oct 12 21:27:54 2009 UTC vs.
Revision 1.59 by root, Wed Oct 21 00:44:39 2009 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
                     }
               }
             any_down = any_down || tmp->value;
           }
+        else if (tmp->type == T_MATCH)
+          {
+            tmp->value = 0;
+            for (object *ab = tmp->above; ab; ab = ab->above)
+              {
+                object *head = ab->head_ ();
+                /* Same note regarding move_type for buttons above apply here. */
+                if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
+                  if (match (tmp->slaying, head, tmp, originator))
+                    {
+                      tmp->value = 1;
+                      break;
+                    }
+              }
+            any_down = any_down || tmp->value;
+          }
       }
   if (any_down)                 /* If any other buttons were down, force this to remain down */
     op->value = 1;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines