Difference for random_maps/reader.c from version 1.4 to 1.5

version 1.4 version 1.5
Line 18
 
Line 18
 /* A lexical scanner generated by flex */  /* A lexical scanner generated by flex */
   
 /* Scanner skeleton version:  /* Scanner skeleton version:
  * $Header: /cvsroot/crossfire/crossfire/random_maps/reader.c,v 1.4 2000/06/02 08:42:56 cvs Exp $   * $Header: /cvsroot/crossfire/crossfire/random_maps/reader.c,v 1.5 2000/12/15 03:09:19 peterm Exp $
  */   */
   
 #define FLEX_SCANNER  #define FLEX_SCANNER
Line 570
 
Line 570
 #line 2 "reader.l"  #line 2 "reader.l"
 /*  /*
  * static char *reader_l =   * static char *reader_l =
  *   "$Id: reader.c,v 1.4 2000/06/02 08:42:56 cvs Exp $";   *   "$Id: reader.c,v 1.5 2000/12/15 03:09:19 peterm Exp $";
  */   */
   
 /*  /*
Line 615
 
Line 615
  * that can be set in crossedit for various objects.   * that can be set in crossedit for various objects.
  */   */
   
 #define YY_DECL int rmap_lex_read()  #define YY_DECL int rmap_lex_read(RMParms *RP)
   
 static char *rmap_yval();  static char *rmap_yval();
   
Line 882
 
Line 882
 case 1:  case 1:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 86 "reader.l"  #line 86 "reader.l"
 strcpy(wallstyle,rmap_yval());  strcpy(RP->wallstyle,rmap_yval());
  YY_BREAK   YY_BREAK
 case 2:  case 2:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 87 "reader.l"  #line 87 "reader.l"
 strcpy(floorstyle,rmap_yval());  strcpy(RP->floorstyle,rmap_yval());
  YY_BREAK   YY_BREAK
 case 3:  case 3:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 88 "reader.l"  #line 88 "reader.l"
 strcpy(monsterstyle,rmap_yval());  strcpy(RP->monsterstyle,rmap_yval());
  YY_BREAK   YY_BREAK
 case 4:  case 4:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 89 "reader.l"  #line 89 "reader.l"
 strcpy(treasurestyle,rmap_yval());  strcpy(RP->treasurestyle,rmap_yval());
  YY_BREAK   YY_BREAK
 case 5:  case 5:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 90 "reader.l"  #line 90 "reader.l"
 strcpy(layoutstyle,rmap_yval());  strcpy(RP->layoutstyle,rmap_yval());
  YY_BREAK   YY_BREAK
 case 6:  case 6:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 91 "reader.l"  #line 91 "reader.l"
 strcpy(doorstyle,rmap_yval());  strcpy(RP->doorstyle,rmap_yval());
  YY_BREAK   YY_BREAK
 case 7:  case 7:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 92 "reader.l"  #line 92 "reader.l"
 strcpy(decorstyle,rmap_yval());  strcpy(RP->decorstyle,rmap_yval());
  YY_BREAK   YY_BREAK
 case 8:  case 8:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 93 "reader.l"  #line 93 "reader.l"
 Xsize = IVAL;  RP->Xsize = IVAL;
  YY_BREAK   YY_BREAK
 case 9:  case 9:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 94 "reader.l"  #line 94 "reader.l"
 Ysize = IVAL;  RP->Ysize = IVAL;
  YY_BREAK   YY_BREAK
 case 10:  case 10:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 95 "reader.l"  #line 95 "reader.l"
 layoutoptions1 = IVAL;  RP->layoutoptions1 = IVAL;
  YY_BREAK   YY_BREAK
 case 11:  case 11:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 96 "reader.l"  #line 96 "reader.l"
 layoutoptions2 = IVAL;  RP->layoutoptions2 = IVAL;
  YY_BREAK   YY_BREAK
 case 12:  case 12:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 97 "reader.l"  #line 97 "reader.l"
 layoutoptions3 = IVAL;  RP->layoutoptions3 = IVAL;
  YY_BREAK   YY_BREAK
 case 13:  case 13:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 98 "reader.l"  #line 98 "reader.l"
 symmetry = IVAL;  RP->symmetry = IVAL;
  YY_BREAK   YY_BREAK
 case 14:  case 14:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 99 "reader.l"  #line 99 "reader.l"
 difficulty = IVAL;  RP->difficulty = IVAL;
  YY_BREAK   YY_BREAK
 case 15:  case 15:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 100 "reader.l"  #line 100 "reader.l"
 decoroptions = IVAL;  RP->decoroptions = IVAL;
  YY_BREAK   YY_BREAK
 case 16:  case 16:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 101 "reader.l"  #line 101 "reader.l"
 strcpy(exitstyle,rmap_yval());  strcpy(RP->exitstyle,rmap_yval());
  YY_BREAK   YY_BREAK
 case 17:  case 17:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 102 "reader.l"  #line 102 "reader.l"
 dungeon_level = IVAL;  RP->dungeon_level = IVAL;
  YY_BREAK   YY_BREAK
 case 18:  case 18:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 103 "reader.l"  #line 103 "reader.l"
 dungeon_depth = IVAL;  RP->dungeon_depth = IVAL;
  YY_BREAK   YY_BREAK
 case 19:  case 19:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 104 "reader.l"  #line 104 "reader.l"
 strcpy(final_map,rmap_yval());  strcpy(RP->final_map,rmap_yval());
  YY_BREAK   YY_BREAK
 case 20:  case 20:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 105 "reader.l"  #line 105 "reader.l"
 orientation = IVAL;  RP-> orientation = IVAL;
  YY_BREAK   YY_BREAK
 case 21:  case 21:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 106 "reader.l"  #line 106 "reader.l"
 origin_x = IVAL;  RP->origin_x = IVAL;
  YY_BREAK   YY_BREAK
 case 22:  case 22:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 107 "reader.l"  #line 107 "reader.l"
 origin_y = IVAL;  RP-> origin_y = IVAL;
  YY_BREAK   YY_BREAK
 case 23:  case 23:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 108 "reader.l"  #line 108 "reader.l"
 strcpy(origin_map,rmap_yval());  strcpy(RP->origin_map,rmap_yval());
  YY_BREAK   YY_BREAK
 case 24:  case 24:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 109 "reader.l"  #line 109 "reader.l"
 random_seed = IVAL;  RP->random_seed = IVAL;
  YY_BREAK   YY_BREAK
 case 25:  case 25:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 110 "reader.l"  #line 110 "reader.l"
 treasureoptions = IVAL;  RP->treasureoptions = IVAL;
  YY_BREAK   YY_BREAK
 case 26:  case 26:
 YY_RULE_SETUP  YY_RULE_SETUP
 #line 111 "reader.l"  #line 111 "reader.l"
 generate_treasure_now = IVAL;  RP->generate_treasure_now = IVAL;
  YY_BREAK   YY_BREAK
 case 27:  case 27:
 YY_RULE_SETUP  YY_RULE_SETUP
Line 1947
 
Line 1947
   
   
   
 int load_parameters(FILE *fp, int bufstate) {  int load_parameters(FILE *fp, int bufstate,RMParms *RP) {
     int retval;      int retval;
     char inbuf[MAX_BUF];      char inbuf[MAX_BUF];
   
Line 1960
 
Line 1960
         YY_BUFFER_STATE  yybufstate;          YY_BUFFER_STATE  yybufstate;
         while (fgets(inbuf, MAX_BUF-3, fp)) {          while (fgets(inbuf, MAX_BUF-3, fp)) {
             yybufstate=yy_scan_string(inbuf);              yybufstate=yy_scan_string(inbuf);
             retval=rmap_lex_read();              retval=rmap_lex_read(RP);
             yy_delete_buffer(yybufstate);              yy_delete_buffer(yybufstate);
             if (retval==LL_NORMAL) return retval;              if (retval==LL_NORMAL) return retval;
         }          }
         return LL_EOF;          return LL_EOF;
     }      }
   
     retval=rmap_lex_read();      retval=rmap_lex_read(RP);
 /*    LOG(llevDebug," load completed, object=%s\n",op->name);*/  /*    LOG(llevDebug," load completed, object=%s\n",op->name);*/
     return retval;      return retval;
 }  }

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:56