--- deliantra/server/common/button.C	2006/09/13 23:42:23	1.9
+++ deliantra/server/common/button.C	2006/09/16 22:24:12	1.11
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_button_c =
- *   "$Id: button.C,v 1.9 2006/09/13 23:42:23 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -24,7 +18,7 @@
     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-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 #include <global.h>
@@ -195,7 +189,7 @@
  *
  */
 void
-activate_connection (mapstruct *map, long connection, bool state)
+activate_connection (maptile *map, long connection, bool state)
 {
   if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))
     return;
@@ -289,7 +283,7 @@
  */
 
 void
-update_buttons (mapstruct *m)
+update_buttons (maptile *m)
 {
   objectlink *ol;
   oblinkpt *obp;
@@ -603,7 +597,7 @@
 }
 
 void
-add_button_link (object *button, mapstruct *map, int connected)
+add_button_link (object *button, maptile *map, int connected)
 {
   oblinkpt *obp;
   objectlink *ol = get_objectlink ();
@@ -683,7 +677,7 @@
  * Gets the objectlink for this connection from the map.
  */
 oblinkpt *
-get_connection_links (mapstruct *map, long connection)
+get_connection_links (maptile *map, long connection)
 {
   for (oblinkpt * obp = map->buttons; obp; obp = obp->next)
     if (obp->value == connection)
@@ -879,7 +873,7 @@
  * matches what the object has.
  */
 void
-verify_button_links (const mapstruct *map)
+verify_button_links (const maptile *map)
 {
   oblinkpt *obp;
   objectlink *ol;