Changeset 496 for abuse/trunk/src/chars.cpp
- Timestamp:
- Apr 17, 2011, 11:56:55 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
abuse/trunk/src/chars.cpp
r494 r496 340 340 PtrRef r5(ab); 341 341 if (!NILP(ab)) 342 abil[i]=lnumber_value( eval(lcar(lcdr(ab))));342 abil[i]=lnumber_value(lcar(lcdr(ab))->Eval()); 343 343 } 344 344 } else if (f==l_funs) … … 361 361 Cell *ab=assoc(LSymbol::FindOrCreate(cflag_names[i]),l); 362 362 PtrRef r5(ab); 363 if (!NILP(ab) && eval(lcar(lcdr(ab))))363 if (!NILP(ab) && lcar(lcdr(ab))->Eval()) 364 364 cflags|=(1<<i); 365 365 } … … 373 373 } else if (f==l_range) 374 374 { 375 rangex=lnumber_value( eval(lcar(lcdr(lcar(field)))));376 rangey=lnumber_value( eval(lcar(lcdr(lcdr(lcar(field))))));375 rangex=lnumber_value(lcar(lcdr(lcar(field)))->Eval()); 376 rangey=lnumber_value(lcar(lcdr(lcdr(lcar(field))))->Eval()); 377 377 } else if (f==l_draw_range) 378 378 { 379 draw_rangex=lnumber_value( eval(lcar(lcdr(lcar(field)))));380 draw_rangey=lnumber_value( eval(lcar(lcdr(lcdr(lcar(field))))));379 draw_rangex=lnumber_value(lcar(lcdr(lcar(field)))->Eval()); 380 draw_rangey=lnumber_value(lcar(lcdr(lcdr(lcar(field))))->Eval()); 381 381 } else if (f==l_states) 382 382 { … … 384 384 PtrRef r4(l); 385 385 char fn[100]; 386 strcpy(fn,lstring_value( eval(CAR(l)))); l=CDR(l);386 strcpy(fn,lstring_value(CAR(l)->Eval())); l=CDR(l); 387 387 while (l) 388 388 { … … 391 391 sequence *mem; 392 392 index = add_state(CAR((CAR(l)))); 393 e = eval(CAR(CDR(CAR(l))));393 e = CAR(CDR(CAR(l)))->Eval(); 394 394 mem = new sequence(fn,e,NULL); 395 395 seq[index]=mem; … … 402 402 while (!NILP(mf)) 403 403 { 404 char *real=lstring_value( eval(lcar(lcar(mf))));405 char *fake=lstring_value( eval(lcar(lcdr(lcar(mf)))));404 char *real=lstring_value(lcar(lcar(mf))->Eval()); 405 char *fake=lstring_value(lcar(lcdr(lcar(mf)))->Eval()); 406 406 if (!isa_var_name(real)) 407 407 { … … 418 418 } else if (f==l_logo) 419 419 { 420 char *fn=lstring_value( eval(CAR(CDR(CAR(field)))));421 char *o=lstring_value( eval(CAR(CDR(CDR(CAR(field))))));420 char *fn=lstring_value(CAR(CDR(CAR(field)))->Eval()); 421 char *o=lstring_value(CAR(CDR(CDR(CAR(field))))->Eval()); 422 422 logo=cache.reg(fn,o,SPEC_IMAGE,1); 423 423 } else if (f==l_vars)
Note: See TracChangeset
for help on using the changeset viewer.