Changeset 486
- Timestamp:
- Apr 17, 2011, 10:28:28 AM (11 years ago)
- Location:
- abuse/trunk/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
abuse/trunk/src/ant.cpp
r482 r486 113 113 p_ref r1(call_list); 114 114 push_onto_list(new_lisp_pointer(b),call_list); 115 push_onto_list( new_lisp_number(angle),call_list);116 push_onto_list( new_lisp_number(firey),call_list);117 push_onto_list( new_lisp_number(firex),call_list);118 push_onto_list( new_lisp_number(o->aitype()),call_list);115 push_onto_list(LispNumber::Create(angle),call_list); 116 push_onto_list(LispNumber::Create(firey),call_list); 117 push_onto_list(LispNumber::Create(firex),call_list); 118 push_onto_list(LispNumber::Create(o->aitype()),call_list); 119 119 push_onto_list(new_lisp_pointer(o),call_list); 120 120 eval_user_fun((LispSymbol *)l_fire_object,call_list); -
abuse/trunk/src/cache.cpp
r482 r486 384 384 385 385 void *call_with=NULL; 386 push_onto_list( new_lisp_number(type),call_with);386 push_onto_list(LispNumber::Create(type),call_with); 387 387 388 388 void *CacheList=eval_function((LispSymbol *)cache_fun,call_with); -
abuse/trunk/src/chars.cpp
r484 r486 173 173 return 0; 174 174 } 175 return new_lisp_number(current_object->lvars[t->var_index[number]]);175 return LispNumber::Create(current_object->lvars[t->var_index[number]]); 176 176 } 177 177 -
abuse/trunk/src/clisp.cpp
r484 r486 782 782 figures[total_objects]=new character_type(CDR(args),sym); 783 783 total_objects++; 784 return new_lisp_number(total_objects-1);784 return LispNumber::Create(total_objects-1); 785 785 } break; 786 786 case 24 : … … 792 792 current_level->foreground_intersect(x1,y1,x2,y2); 793 793 void *ret=NULL; 794 push_onto_list( new_lisp_number(y2),ret);795 push_onto_list( new_lisp_number(x2),ret);794 push_onto_list(LispNumber::Create(y2),ret); 795 push_onto_list(LispNumber::Create(x2),ret); 796 796 return ret; 797 797 } break; … … 878 878 void *ret=NULL; 879 879 p_ref r1(ret); 880 push_onto_list( new_lisp_number(b3),ret);881 push_onto_list( new_lisp_number(b2),ret);882 push_onto_list( new_lisp_number(b1),ret);883 push_onto_list( new_lisp_number(yv),ret);884 push_onto_list( new_lisp_number(xv),ret);880 push_onto_list(LispNumber::Create(b3),ret); 881 push_onto_list(LispNumber::Create(b2),ret); 882 push_onto_list(LispNumber::Create(b1),ret); 883 push_onto_list(LispNumber::Create(yv),ret); 884 push_onto_list(LispNumber::Create(xv),ret); 885 885 return ret; 886 886 } break; … … 890 890 { 891 891 p_ref r1(ret); 892 push_onto_list( new_lisp_number((last_demo_mbut&4)==4),ret);893 push_onto_list( new_lisp_number((last_demo_mbut&2)==2),ret);894 push_onto_list( new_lisp_number((last_demo_mbut&1)==1),ret);895 push_onto_list( new_lisp_number(last_demo_my),ret);896 push_onto_list( new_lisp_number(last_demo_mx),ret);892 push_onto_list(LispNumber::Create((last_demo_mbut&4)==4),ret); 893 push_onto_list(LispNumber::Create((last_demo_mbut&2)==2),ret); 894 push_onto_list(LispNumber::Create((last_demo_mbut&1)==1),ret); 895 push_onto_list(LispNumber::Create(last_demo_my),ret); 896 push_onto_list(LispNumber::Create(last_demo_mx),ret); 897 897 } 898 898 return ret; … … 908 908 { 909 909 p_ref r1(ret); 910 push_onto_list( new_lisp_number(ry),ret);911 push_onto_list( new_lisp_number(rx),ret);910 push_onto_list(LispNumber::Create(ry),ret); 911 push_onto_list(LispNumber::Create(rx),ret); 912 912 } 913 913 return ret; … … 923 923 { 924 924 p_ref r1(ret); 925 push_onto_list( new_lisp_number(ry),ret);926 push_onto_list( new_lisp_number(rx),ret);925 push_onto_list(LispNumber::Create(ry),ret); 926 push_onto_list(LispNumber::Create(rx),ret); 927 927 } 928 928 return ret; -
abuse/trunk/src/cop.cpp
r484 r486 228 228 p_ref r1(list); 229 229 push_onto_list(new_lisp_pointer(target),list); 230 push_onto_list( new_lisp_number(angle),list);231 push_onto_list( new_lisp_number(y2),list);232 push_onto_list( new_lisp_number(x2),list);233 push_onto_list( new_lisp_number(type),list);230 push_onto_list(LispNumber::Create(angle),list); 231 push_onto_list(LispNumber::Create(y2),list); 232 push_onto_list(LispNumber::Create(x2),list); 233 push_onto_list(LispNumber::Create(type),list); 234 234 push_onto_list(new_lisp_pointer(o->get_object(0)),list); 235 235 eval_function((LispSymbol *)l_fire_object,list); … … 260 260 o->lvars[fire_delay1]=3; 261 261 if (player_fire_weapon(o,SHOTGUN,NULL,o->lvars[point_angle],small_fire_off)) 262 ret= new_lisp_number(-1);263 else ret= new_lisp_number(0);262 ret=LispNumber::Create(-1); 263 else ret=LispNumber::Create(0); 264 264 } else 265 265 { 266 266 o->lvars[fire_delay1]=5; // no ammo, set large fire delay for next shot 267 267 player_fire_weapon(o,SHOTGUN,NULL,o->lvars[point_angle],small_fire_off); 268 ret= new_lisp_number(0);268 ret=LispNumber::Create(0); 269 269 } 270 } else ret= new_lisp_number(0); // can't fire yet, return 0 ammo subtract270 } else ret=LispNumber::Create(0); // can't fire yet, return 0 ammo subtract 271 271 } 272 272 return ret; … … 303 303 if (player_fire_weapon(o,ammo_type(o->otype),NULL,o->lvars[point_angle], 304 304 o->otype==DFRIS ? large_fire_off : small_fire_off )) 305 ret= new_lisp_number(-1);306 else ret= new_lisp_number(0);307 } else ret= new_lisp_number(0);308 } else ret= new_lisp_number(0); // can't fire yet, return 0 ammo subtract305 ret=LispNumber::Create(-1); 306 else ret=LispNumber::Create(0); 307 } else ret=LispNumber::Create(0); 308 } else ret=LispNumber::Create(0); // can't fire yet, return 0 ammo subtract 309 309 } 310 310 return ret; … … 329 329 o->lvars[fire_delay1]=2; 330 330 if (player_fire_weapon(o,PLASMA,NULL,o->lvars[point_angle],small_fire_off)) 331 ret= new_lisp_number(-1);332 else ret= new_lisp_number(0);333 } else ret= new_lisp_number(0);334 } else ret= new_lisp_number(0); // can't fire yet, return 0 ammo subtract331 ret=LispNumber::Create(-1); 332 else ret=LispNumber::Create(0); 333 } else ret=LispNumber::Create(0); 334 } else ret=LispNumber::Create(0); // can't fire yet, return 0 ammo subtract 335 335 } 336 336 return ret; … … 354 354 if (player_fire_weapon(o,LSABER,NULL,o->lvars[point_angle]+(current_level->tick_counter()&7)-8, 355 355 small_fire_off)) 356 ret= new_lisp_number(-1);357 else ret= new_lisp_number(0);358 } else ret= new_lisp_number(0);359 } else ret= new_lisp_number(0); // can't fire yet, return 0 ammo subtract356 ret=LispNumber::Create(-1); 357 else ret=LispNumber::Create(0); 358 } else ret=LispNumber::Create(0); 359 } else ret=LispNumber::Create(0); // can't fire yet, return 0 ammo subtract 360 360 } 361 361 return ret; … … 403 403 } 404 404 if (player_fire_weapon(o,ROCKET,target,o->lvars[point_angle],large_fire_off)) 405 ret= new_lisp_number(-1);406 else ret= new_lisp_number(0);407 408 } else ret= new_lisp_number(0);409 } else ret= new_lisp_number(0); // can't fire yet, return 0 ammo subtract405 ret=LispNumber::Create(-1); 406 else ret=LispNumber::Create(0); 407 408 } else ret=LispNumber::Create(0); 409 } else ret=LispNumber::Create(0); // can't fire yet, return 0 ammo subtract 410 410 } 411 411 return ret; … … 658 658 view *v=o->controller(); 659 659 660 push_onto_list( new_lisp_number(v->weapon_total(v->current_weapon)),args);660 push_onto_list(LispNumber::Create(v->weapon_total(v->current_weapon)),args); 661 661 push_onto_list(l_FIRE,args); 662 662 … … 681 681 } 682 682 683 return new_lisp_number(ret);683 return LispNumber::Create(ret); 684 684 } 685 685 … … 755 755 p_ref r1(ret); 756 756 757 push_onto_list( new_lisp_number(bot->get_tint()),ret);757 push_onto_list(LispNumber::Create(bot->get_tint()),ret); 758 758 759 759 if (bot->lvars[special_power]==SNEAKY_POWER) -
abuse/trunk/src/lcache.cpp
r482 r486 103 103 { 104 104 case L_NUMBER : 105 { return new_lisp_number(fp->read_uint32()); } break;105 { return LispNumber::Create(fp->read_uint32()); } break; 106 106 case L_CHARACTER : 107 107 { return new_lisp_character(fp->read_uint16()); } break; -
abuse/trunk/src/lisp/lisp.cpp
r485 r486 442 442 } 443 443 444 LispNumber * new_lisp_number(long num)445 { 446 LispNumber *s=(LispNumber *)lmalloc(sizeof(LispNumber), current_space);447 s->type=L_NUMBER;448 s->num=num;449 return s;444 LispNumber *LispNumber::Create(long num) 445 { 446 LispNumber *s = (LispNumber *)lmalloc(sizeof(LispNumber), current_space); 447 s->type = L_NUMBER; 448 s->num = num; 449 return s; 450 450 } 451 451 … … 1212 1212 else if (isdigit(n[0]) || (n[0]=='-' && isdigit(n[1]))) 1213 1213 { 1214 LispNumber *num =new_lisp_number(0);1214 LispNumber *num = LispNumber::Create(0); 1215 1215 sscanf(n, "%ld", &num->num); 1216 1216 ret=num; … … 1525 1525 } 1526 1526 if(t == L_C_FUNCTION) 1527 ret =new_lisp_number(c_caller( ((LispSysFunction *)fun)->fun_number, first));1527 ret = LispNumber::Create(c_caller( ((LispSysFunction *)fun)->fun_number, first)); 1528 1528 else if (c_caller( ((LispSysFunction *)fun)->fun_number, first)) 1529 1529 ret=true_symbol; … … 1812 1812 switch (item_type(v)) 1813 1813 { 1814 case L_STRING : ret =new_lisp_number(strlen(lstring_value(v))); break;1815 case L_CONS_CELL : ret =new_lisp_number(list_length(v)); break;1814 case L_STRING : ret = LispNumber::Create(strlen(lstring_value(v))); break; 1815 case L_CONS_CELL : ret = LispNumber::Create(list_length(v)); break; 1816 1816 default : 1817 1817 { lprint(v); … … 1869 1869 arg_list=CDR(arg_list); 1870 1870 } 1871 ret =new_lisp_number(sum);1871 ret = LispNumber::Create(sum); 1872 1872 } 1873 1873 break; … … 1896 1896 if (arg_list) first=eval(CAR(arg_list)); 1897 1897 } while (arg_list); 1898 ret =new_lisp_number(sum);1898 ret = LispNumber::Create(sum); 1899 1899 } 1900 1900 } … … 1920 1920 arg_list=CDR(arg_list); 1921 1921 } 1922 ret =new_lisp_number(sum);1922 ret = LispNumber::Create(sum); 1923 1923 } 1924 1924 break; … … 1931 1931 arg_list=CDR(arg_list); 1932 1932 } 1933 ret =new_lisp_number(x);1933 ret = LispNumber::Create(x); 1934 1934 } 1935 1935 break; … … 2183 2183 { 2184 2184 case L_CHARACTER : 2185 { ret =new_lisp_number(((LispChar *)i)->ch); } break;2185 { ret = LispNumber::Create(((LispChar *)i)->ch); } break; 2186 2186 case L_STRING : 2187 { ret =new_lisp_number(*lstring_value(i)); } break;2187 { ret = LispNumber::Create(*lstring_value(i)); } break; 2188 2188 default : 2189 2189 { … … 2412 2412 } break; 2413 2413 case SYS_FUNC_ABS: 2414 ret =new_lisp_number(abs(lnumber_value(eval(CAR(arg_list))))); break;2414 ret = LispNumber::Create(abs(lnumber_value(eval(CAR(arg_list))))); break; 2415 2415 case SYS_FUNC_MIN: 2416 2416 { 2417 2417 int x=lnumber_value(eval(CAR(arg_list))), y=lnumber_value(eval(CAR(CDR(arg_list)))); 2418 if (x<y) ret=new_lisp_number(x); else ret=new_lisp_number(y);2418 ret = LispNumber::Create(x < y ? x : y); 2419 2419 } break; 2420 2420 case SYS_FUNC_MAX: 2421 2421 { 2422 2422 int x=lnumber_value(eval(CAR(arg_list))), y=lnumber_value(eval(CAR(CDR(arg_list)))); 2423 if (x>y) ret=new_lisp_number(x); else ret=new_lisp_number(y);2423 ret = LispNumber::Create(x > y ? x : y); 2424 2424 } break; 2425 2425 case SYS_FUNC_BACKQUOTE: … … 2451 2451 long y=(lnumber_value(eval(CAR(arg_list)))); arg_list=CDR(arg_list); 2452 2452 long x=(lnumber_value(eval(CAR(arg_list)))); 2453 ret =new_lisp_number(lisp_atan2(y, x));2453 ret = LispNumber::Create(lisp_atan2(y, x)); 2454 2454 } break; 2455 2455 case SYS_FUNC_ENUM: … … 2465 2465 { 2466 2466 case L_SYMBOL : 2467 { ((LispSymbol *)sym)->value =new_lisp_number(x); } break;2467 { ((LispSymbol *)sym)->value = LispNumber::Create(x); } break; 2468 2468 case L_CONS_CELL : 2469 2469 { … … 2478 2478 #endif 2479 2479 x=lnumber_value(eval(CAR(CDR(sym)))); 2480 ((LispSymbol *)sym)->value =new_lisp_number(x);2480 ((LispSymbol *)sym)->value = LispNumber::Create(x); 2481 2481 } break; 2482 2482 default : … … 2506 2506 long y=lnumber_value(eval(CAR(arg_list))); 2507 2507 if (y==0) { lbreak("mod : division by zero\n"); y=1; } 2508 ret =new_lisp_number(x%y);2508 ret = LispNumber::Create(x%y); 2509 2509 } break; 2510 2510 /* case SYS_FUNC_WRITE_PROFILE: … … 2585 2585 arg_list=CDR(arg_list); 2586 2586 } 2587 ret =new_lisp_number(first);2587 ret = LispNumber::Create(first); 2588 2588 } break; 2589 2589 case SYS_FUNC_BIT_OR: … … 2595 2595 arg_list=CDR(arg_list); 2596 2596 } 2597 ret =new_lisp_number(first);2597 ret = LispNumber::Create(first); 2598 2598 } break; 2599 2599 case SYS_FUNC_BIT_XOR: … … 2605 2605 arg_list=CDR(arg_list); 2606 2606 } 2607 ret =new_lisp_number(first);2607 ret = LispNumber::Create(first); 2608 2608 } break; 2609 2609 case SYS_FUNC_MAKE_ARRAY: … … 2666 2666 char *find=strstr(haystack, needle); 2667 2667 if (find) 2668 ret =new_lisp_number(find-haystack);2668 ret = LispNumber::Create(find-haystack); 2669 2669 else ret=NULL; 2670 2670 } break; … … 3153 3153 ((LispNumber *)value)->num = num; 3154 3154 else 3155 value = new_lisp_number(num);3155 value = LispNumber::Create(num); 3156 3156 } 3157 3157 -
abuse/trunk/src/lisp/lisp.h
r485 r486 63 63 struct LispNumber : LispObject 64 64 { 65 static LispNumber *Create(long num); 66 65 67 long num; 66 68 }; … … 180 182 181 183 182 LispNumber *new_lisp_number(long num);183 184 LispPointer *new_lisp_pointer(void *addr); 184 185 LispChar *new_lisp_character(uint16_t ch); -
abuse/trunk/src/lisp/lisp_gc.cpp
r484 r486 135 135 break; 136 136 case L_NUMBER: 137 ret = new_lisp_number(((LispNumber *)x)->num);137 ret = LispNumber::Create(((LispNumber *)x)->num); 138 138 break; 139 139 case L_SYS_FUNCTION: -
abuse/trunk/src/objects.cpp
r484 r486 492 492 l_ptr_stack.push(&am); 493 493 494 ((LispList *)am)->car= new_lisp_number(amount);494 ((LispList *)am)->car=LispNumber::Create(amount); 495 495 496 496 frm=new_cons_cell(); … … 502 502 l_ptr_stack.push(&hx); 503 503 504 ((LispList *)hx)->car= new_lisp_number(hitx);504 ((LispList *)hx)->car=LispNumber::Create(hitx); 505 505 506 506 hy=new_cons_cell(); 507 507 l_ptr_stack.push(&hy); 508 ((LispList *)hy)->car= new_lisp_number(hity);508 ((LispList *)hy)->car=LispNumber::Create(hity); 509 509 510 510 px=new_cons_cell(); 511 511 l_ptr_stack.push(&px); 512 ((LispList *)px)->car= new_lisp_number(push_xvel);512 ((LispList *)px)->car=LispNumber::Create(push_xvel); 513 513 514 514 py=new_cons_cell(); 515 515 l_ptr_stack.push(&py); 516 ((LispList *)py)->car= new_lisp_number(push_yvel);516 ((LispList *)py)->car=LispNumber::Create(push_yvel); 517 517 518 518 … … 910 910 } else 911 911 { 912 push_onto_list( new_lisp_number(ly),rlist);913 push_onto_list( new_lisp_number(lx),rlist);912 push_onto_list(LispNumber::Create(ly),rlist); 913 push_onto_list(LispNumber::Create(lx),rlist); 914 914 push_onto_list(l_tile,rlist); 915 915 } 916 push_onto_list( new_lisp_number(ret),rlist);916 push_onto_list(LispNumber::Create(ret),rlist); 917 917 918 918 return rlist; … … 1223 1223 lcx=new_cons_cell(); 1224 1224 l_ptr_stack.push(&lcx); 1225 ((LispList *)lcx)->car= new_lisp_number(cx);1225 ((LispList *)lcx)->car=LispNumber::Create(cx); 1226 1226 1227 1227 lcy=new_cons_cell(); 1228 1228 l_ptr_stack.push(&lcy); 1229 ((LispList *)lcy)->car= new_lisp_number(cy);1229 ((LispList *)lcy)->car=LispNumber::Create(cy); 1230 1230 1231 1231 lb=new_cons_cell(); 1232 1232 l_ptr_stack.push(&lb); 1233 ((LispList *)lb)->car= new_lisp_number(button);1233 ((LispList *)lb)->car=LispNumber::Create(button); 1234 1234 1235 1235
Note: See TracChangeset
for help on using the changeset viewer.