comparison interp.c @ 32:9ee9adc696e7

Merged changes
author Mike Pavone <pavone@retrodev.com>
date Mon, 28 Sep 2009 19:49:06 -0400
parents fab5bb137cf9 914ad38f9b59
children 429b5f441381
comparison
equal deleted inserted replaced
31:fab5bb137cf9 32:9ee9adc696e7
2701 *room_index_ret = i; 2701 *room_index_ret = i;
2702 return set_comp_room(company, i, entry, prog); 2702 return set_comp_room(company, i, entry, prog);
2703 } 2703 }
2704 if(room_index_ret) 2704 if(room_index_ret)
2705 *room_index_ret = -1; 2705 *room_index_ret = -1;
2706 printf("Error: Can't set field %s on object with blueprint %s\n", name, company[0]->company);
2706 return -1; 2707 return -1;
2707 } 2708 }
2708 2709
2709 int get_comp_room(datum ** company, int room_index, queue_entry * entry, program * prog) 2710 int get_comp_room(datum ** company, int room_index, queue_entry * entry, program * prog)
2710 { 2711 {
2786 *room_index_ret = i; 2787 *room_index_ret = i;
2787 return get_comp_room(company, i, entry, prog); 2788 return get_comp_room(company, i, entry, prog);
2788 } 2789 }
2789 if(room_index_ret) 2790 if(room_index_ret)
2790 *room_index_ret = -1; 2791 *room_index_ret = -1;
2792 printf("Error: Can't get field %s from object with blueprint %s\n", name, company[0]->company);
2793 print_stack_trace(entry->instance);
2791 return -1; 2794 return -1;
2792 } 2795 }
2793 2796
2794 datum * literal_string(char * value, int len, program * prog) 2797 datum * literal_string(char * value, int len, program * prog)
2795 { 2798 {