Difference for server/main.c from version 1.98 to 1.99


version 1.98 version 1.99
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_main_c =   * static char *rcsid_main_c =
  *    "$Id: main.c,v 1.98 2005/10/07 19:38:49 akirschbaum Exp $";   *    "$Id: main.c,v 1.99 2005/10/16 22:51:21 qal21 Exp $";
  */   */
   
 /*  /*
Line 542
 
Line 542
     }      }
 }  }
   
   /* The player is trying to enter a randomly generated template map.  In this
    * case, generate the map as needed.
    */
   
   static void enter_random_template_map(object *pl, object *exit_ob)
   {
       mapstruct *new_map;
       char *cp;
       const char *new_map_name;
       static int reference_number = 0;
       RMParms rp;
       new_map_name = create_template_pathname(clean_path((const char*)(EXIT_PATH(exit_ob))+3));
   
       new_map = ready_map_name(new_map_name, MAP_PLAYER_UNIQUE);
       if (!new_map) {
    memset(&rp, 0, sizeof(RMParms));
    rp.Xsize=-1;
    rp.Ysize=-1;
    rp.region=get_region_by_map(exit_ob->map);
    if (exit_ob->msg) set_random_map_variable(&rp,exit_ob->msg);
    rp.origin_x = exit_ob->x;
    rp.origin_y = exit_ob->y;
    strcpy(rp.origin_map, pl->map->path);
   
    /* now to generate the actual map. */
    new_map=(mapstruct *)generate_random_map(new_map_name,&rp);
       }
   
   
       /* Update the exit_ob so it now points directly at the newly created
        * random maps.  Not that it is likely to happen, but it does mean that a
        * exit in a unique map leading to a random map will not work properly.
        * It also means that if the created random map gets reset before
        * the exit leading to it, that the exit will no longer work.
        */
       if(new_map) {
    int x, y;
    x=EXIT_X(exit_ob) = MAP_ENTER_X(new_map);
    y=EXIT_Y(exit_ob) = MAP_ENTER_Y(new_map);
    new_map->template = 1;
    enter_map(pl, new_map, x, y);
       }
   }
   
   
 /* Code to enter/detect a character entering a unique map.  /* Code to enter/detect a character entering a unique map.
  */   */
Line 637
 
Line 681
     if (exit_ob){       if (exit_ob){
   
  /* check to see if we make a randomly generated map */   /* check to see if we make a randomly generated map */
  if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='!') {   if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='@' && EXIT_PATH(exit_ob)[2]=='!') {
        enter_random_template_map(op, exit_ob);
    }
    else if(EXIT_PATH(exit_ob)&&EXIT_PATH(exit_ob)[1]=='!') {
      enter_random_map(op, exit_ob);       enter_random_map(op, exit_ob);
  }   }
  else if (QUERY_FLAG(exit_ob, FLAG_UNIQUE)) {   else if (QUERY_FLAG(exit_ob, FLAG_UNIQUE)) {


Legend:
line(s) removed in v.1.98 
line(s) changed
 line(s) added in v.1.99

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:35