Difference for common/init.c from version 1.14 to 1.15


version 1.14 version 1.15
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_init_c =   * static char *rcsid_init_c =
  *   "$Id: init.c,v 1.14 2002/01/01 23:37:54 garbled Exp $";   *   "$Id: init.c,v 1.15 2002/06/15 07:47:36 mwedel Exp $";
  */   */
   
 /*  /*
Line 62
 
Line 62
 "",  "",
 0,  0,
 "",  "",
 0,0,0,0,0,0,0  /* worldmap settings*/  0,0,0,0,0,0,0,  /* worldmap settings*/
   EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y
 };  };
   
   
   /* This loads the emergency map information from a
    * .emergency file in the map directory.  Doing this makes
    * it easier to switch between map distributions (don't need
    * to recompile.  Note that there is no reason I see that
    * this could not be re-loaded during play, but it seems
    * like there should be little reason to do that.
    */
   static void init_emergency_mappath()
   {
       char filename[MAX_BUF], tmpbuf[MAX_BUF];
       FILE    *fp;
       int online=0;
   
       /* If this file doesn't exist, not a big deal */
       sprintf(filename,"%s/%s/.emergency",settings.datadir, settings.mapdir);
       if ((fp = fopen(filename, "r"))!=NULL) {
    while (fgets(tmpbuf, MAX_BUF-1, fp)) {
        if (tmpbuf[0] == '#') continue; /* ignore comments */
       
        if (online == 0) {
    tmpbuf[strlen(tmpbuf)-1] = 0; /* kill newline */
    settings.emergency_mapname = strdup_local(tmpbuf);
        }
        else if (online == 1) {
    settings.emergency_x = atoi(tmpbuf);
        }
   
        else if (online == 2) {
    settings.emergency_y = atoi(tmpbuf);
        }
        online++;
        if (online>2) break;
    }
    fclose(fp);
    if (online<=2)
        LOG(llevError,"Online read partial data from %s\n", filename);
    LOG(llevDebug,"Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname,
        settings.emergency_x, settings.emergency_y);
       }
   }
      
   
 /*  /*
  * It is vital that init_library() is called by any functions   * It is vital that init_library() is called by any functions
  * using this library.   * using this library.
Line 89
 
Line 132
     init_dynamic ();      init_dynamic ();
     init_attackmess();      init_attackmess();
     init_clocks();      init_clocks();
       init_emergency_mappath();
 }  }
   
   
 /* init_environ initializes values from the environmental variables.  /* init_environ initializes values from the environmental variables.
  * it needs to be called very early, since command line options should   * it needs to be called very early, since command line options should
  * overwrite these if specified.   * overwrite these if specified.


Legend:
line(s) removed in v.1.14 
line(s) changed
 line(s) added in v.1.15

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