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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.3 by elmex, Tue Aug 29 17:29:27 2006 UTC vs.
Revision 1.4 by elmex, Wed Aug 30 12:42:56 2006 UTC

 /*
  * static char *rcsid_button_c =
- *   "$Id: button.C,v 1.3 2006/08/29 17:29:27 elmex Exp $";
+ *   "$Id: button.C,v 1.4 2006/08/30 12:42:56 elmex Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
  */
 void push_button (object *op)
 {
   oblinkpt *obp = get_button_links (op);
+  if (!obp)
+    return;
   if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64(obp->value), ARG_INT(op->value)))
     return;
-  if (obp && obp->link)
-    activate_connection_link (obp->link, op->value, op);
+  activate_connection_link (obp->link, op->value, op);
 }
 /*
  * elmex:
  * This activates a connection, similar to push_button (object *op) but it takes
 {
   if (INVOKE_MAP (TRIGGER, map, ARG_INT64(connection), ARG_INT(state)))
     return;
   oblinkpt *obp = get_connection_links (map, connection);
-  if (obp && obp->link)
+  if (obp)
     activate_connection_link (obp->link, state);
 }
 /*
  * Updates everything connected with the button op.

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