Difference for server/build_map.c from version 1.4 to 1.5

version 1.4 version 1.5
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_build_map =   * static char *rcsid_build_map =
  *   "$Id: build_map.c,v 1.4 2005/07/19 20:59:34 ryo_saeba Exp $";   *   "$Id: build_map.c,v 1.5 2005/08/16 05:23:13 qal21 Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 32
 
Line 32
 #include <tod.h>  #include <tod.h>
 #include <sproto.h>  #include <sproto.h>
   
   static object* get_connection_rune( object* pl, short x, short y );
   static object* get_msg_book( object* pl, short x, short y );
   static int adjust_sign_msg( object* pl, short x, short y, object* tmp );
   
   /**
    *  Check if objects on a square interfere with building
    */
   int can_build_over( struct mapdef* map, object* tmp, short x, short y)
       {
       object* ob;
      
       ob = GET_MAP_OB( map, x, y );
       while ( ob )
           {
    /* if ob is not a marking rune or floor, then check special cases */
    if ( strcmp( ob->arch->name, "rune_mark" ) && ob->type != FLOOR )
        {
               switch ( tmp->type )
                   {
            case SIGN:
            case MAGIC_EAR:
        /* Allow signs and magic ears to be built on books */
                if ( ob->type != BOOK ) {
            return 0; }
                       break;
                   default:
                       return 0;
                   }
               }
           ob = ob->above;
    }
       return 1;
       }
   
 /**  /**
  *  Erases marking runes at specified location   *  Erases marking runes at specified location
  */   */
Line 95
 
Line 129
     object* force;      object* force;
     int connected;      int connected;
   
     rune = GET_MAP_OB( pl->map, x, y );      rune = get_connection_rune( pl, x, y );
     while ( rune && ( ( rune->type != SIGN ) || ( strcmp( rune->arch->name, "rune_mark" ) ) ) )  
         rune = rune->above;  
   
     if ( !rune )      if ( !rune )
         {          {
Line 137
 
Line 169
     }      }
   
 /**  /**
    * Returns the marking rune on the square, for purposes of building connections
    */
   static object* get_connection_rune( object* pl, short x, short y )
       {
       object* rune;
      
       rune = GET_MAP_OB( pl->map, x, y );
       while ( rune && ( ( rune->type != SIGN ) || ( strcmp( rune->arch->name, "rune_mark" ) ) ) )
           rune = rune->above;
       return rune;
       }
      
   /**
    * Returns the book/scroll on the current square, for purposes of building
    */
   static object* get_msg_book( object* pl, short x, short y )
       {
       object* book;
      
       book = GET_MAP_OB( pl->map, x, y );
       while ( book && ( book->type != BOOK ) )
           book = book->above;
       return book;
       }
   
   /**
  * Returns first item of type WALL.   * Returns first item of type WALL.
  */   */
 object* get_wall( struct mapdef* map, int x, int y )  object* get_wall( struct mapdef* map, int x, int y )
Line 500
 
Line 558
         new_draw_info( NDI_UNIQUE, 0, pl, "This square has no floor, you can't build here." );          new_draw_info( NDI_UNIQUE, 0, pl, "This square has no floor, you can't build here." );
         return;          return;
         }          }
   
     if ( ( floor->above ) && ( strcmp( floor->above->arch->name, "rune_mark" ) ) )  
         /* Floor has something on top, and it isn't a marking rune */  
         {  
         new_draw_info( NDI_UNIQUE, 0, pl, "You can't build here." );  
         return;  
         }  
   
     /* Create item, set flag, insert in map */      /* Create item, set flag, insert in map */
     arch = find_archetype( item->slaying );      arch = find_archetype( item->slaying );
     if ( !arch )      if ( !arch )
         return;          return;
   
     tmp = arch_to_object( arch );      tmp = arch_to_object( arch );
      
       if ( ( floor->above ) && ( !can_build_over(pl->map, tmp, x, y) ) )
           /* Floor has something on top that interferes with building */
           {
           new_draw_info( NDI_UNIQUE, 0, pl, "You can't build here." );
           return;
           }
      
     SET_FLAG( tmp, FLAG_IS_BUILDABLE );      SET_FLAG( tmp, FLAG_IS_BUILDABLE );
     SET_FLAG( tmp, FLAG_NO_PICK );      SET_FLAG( tmp, FLAG_NO_PICK );
    
Line 524
 
Line 582
     insert_flag = INS_ABOVE_FLOOR_ONLY;      insert_flag = INS_ABOVE_FLOOR_ONLY;
   
     connected = 0;      connected = 0;
   
     switch( tmp->type )      switch( tmp->type )
         {          {
         case DOOR:          case DOOR:
Line 534
 
Line 591
         case TIMED_GATE:          case TIMED_GATE:
         case PEDESTAL:          case PEDESTAL:
         case CF_HANDLE:          case CF_HANDLE:
             /* Those items require a valid connection */   case MAGIC_EAR:
    case SIGN:
        /* Signs don't need a connection, but but magic mouths do. */
        if (get_connection_rune( pl, x, y ) && (tmp->type != SIGN ||
        !strcmp( tmp->arch->name, "magic_mouth" )))
            {
             connected = find_or_create_connection_for_map( pl, x, y );              connected = find_or_create_connection_for_map( pl, x, y );
             if ( connected == -1 )              if ( connected == -1 )
                 {                  {
Line 545
 
Line 607
             /* Remove marking rune */              /* Remove marking rune */
             remove_marking_runes( pl->map, x, y );              remove_marking_runes( pl->map, x, y );
         }          }
           }
   
       /* For magic mouths/ears, and signs, take the msg from a book of scroll */
       if ((tmp->type == SIGN) || (tmp->type == MAGIC_EAR))
           {
    if (adjust_sign_msg( pl, x, y, tmp ) == -1)
        {
               free_object( tmp );
               return;
        }
    }
   
     insert_ob_in_map_at( tmp, pl->map, floor, insert_flag, x, y );      insert_ob_in_map_at( tmp, pl->map, floor, insert_flag, x, y );
     if ( connected != 0 )      if ( connected != 0 )
Line 600
 
Line 673
         case DETECTOR:          case DETECTOR:
         case PEDESTAL:          case PEDESTAL:
         case CF_HANDLE:          case CF_HANDLE:
           case MAGIC_EAR:
           case SIGN:
             /* Special case: must unconnect */              /* Special case: must unconnect */
        if (QUERY_FLAG(item,FLAG_IS_LINKED))
             remove_button_link( item );              remove_button_link( item );
   
             /* Fall through */              /* Fall through */
Line 623
 
Line 699
     {      {
     object* builder;      object* builder;
     object* tmp;      object* tmp;
       object* tmp2;
     short x, y;      short x, y;
   
     if ( !pl->type == PLAYER )      if ( !pl->type == PLAYER )
Line 664
 
Line 741
         new_draw_info( NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird." );          new_draw_info( NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird." );
         return;          return;
         }          }
       tmp2 = find_marked_object( pl );
     while ( tmp )      while ( tmp )
         {          {
         if ( !QUERY_FLAG( tmp, FLAG_IS_BUILDABLE ) && ( ( tmp->type != SIGN ) || ( strcmp( tmp->arch->name, "rune_mark" ) ) ) )          if ( !QUERY_FLAG( tmp, FLAG_IS_BUILDABLE ) && ( ( tmp->type != SIGN )
    || ( strcmp( tmp->arch->name, "rune_mark" ) ) ) )
               {
            /* The item building function already has it's own special
    * checks for this
    */
            if ((!tmp2) || (tmp2->subtype != ST_MAT_ITEM ))
             {              {
          new_draw_info( NDI_UNIQUE, 0, pl, "You can't build here." );           new_draw_info( NDI_UNIQUE, 0, pl, "You can't build here." );
          return;           return;
             }              }
               }
         tmp = tmp->above;          tmp = tmp->above;
         }          }
   
Line 691
 
Line 775
          * Find marked item to build, call specific function           * Find marked item to build, call specific function
          */           */
         {          {
         tmp = find_marked_object( pl );          tmp = tmp2;
         if ( !tmp )          if ( !tmp )
             {              {
          new_draw_info( NDI_UNIQUE, 0, pl, "You need to mark raw materials to use." );           new_draw_info( NDI_UNIQUE, 0, pl, "You need to mark raw materials to use." );
Line 729
 
Line 813
     new_draw_info( NDI_UNIQUE, 0, pl, "Don't know how to apply this tool, sorry." );      new_draw_info( NDI_UNIQUE, 0, pl, "Don't know how to apply this tool, sorry." );
     LOG( llevError, "apply_map_builder: invalid builder subtype %d\n", builder->subtype );      LOG( llevError, "apply_map_builder: invalid builder subtype %d\n", builder->subtype );
     }      }
      
   /**
    * Make the built object inherit the msg of books that are used with it.
    * For objects already invisible (i.e. magic mouths & ears), also make it
    * it inherit the face and the name with "talking " prepended.
    */
   static int adjust_sign_msg( object* pl, short x, short y, object* tmp )
       {
       object* book;
       char buf[MAX_BUF];
       int namelen;
   
       book = get_msg_book( pl, x, y );
       if ( !book )
           {
    new_draw_info( NDI_UNIQUE, 0, pl, "You need to put a book or scroll with the message." );
    return -1;
    }
   
       tmp->msg = book->msg;
       add_refcount( tmp->msg );
      
       if (tmp->invisible)
           {
    if(book->custom_name != NULL)
        {
        snprintf(buf, sizeof(buf), "talking %s", book->custom_name);
        } else {
        snprintf(buf, sizeof(buf), "talking %s", book->name);
        }
    if ( tmp->name )
        free_string( tmp->name );
    tmp->name = add_string( buf );
   
    tmp->face = book->face;
    tmp->invisible = 0;
           }
       remove_ob( book );
       free_object( book );
       return 0;
       }

Legend:
line(s) removed in v.1.4 
line(s) changed
 line(s) added in v.1.5
File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:26