| version 1.59 | | version 1.60 |
|---|
| | |
| %{ | | %{ |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: loader.l,v 1.59 2004/08/18 06:29:24 mwedel Exp $"; | | * "$Id: loader.l,v 1.60 2004/10/15 07:09:38 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| strcpy(msgbuf, ""); | | strcpy(msgbuf, ""); |
| strcpy(lorebuf, ""); | | strcpy(lorebuf, ""); |
| lex_load(tmp, map_flags); | | lex_load(tmp, map_flags); |
| | | if (tmp->arch) { |
| insert_ob_in_ob(tmp,op); | | insert_ob_in_ob(tmp,op); |
| } | | } |
| | | else { |
| | | LOG(llevDebug,"Discarding object without arch: %s\n", tmp->name?tmp->name:"(null)"); |
| | | free_object(tmp); |
| | | } |
| | | } |
| /* This is the actual archetype definition then */ | | /* This is the actual archetype definition then */ |
| else { | | else { |
| op->arch=find_archetype(yval()); | | char *yv=yval(); |
| | | |
| | | op->arch=find_archetype(yv); |
| if (op->arch!=NULL) copy_object(&op->arch->clone,op); | | if (op->arch!=NULL) copy_object(&op->arch->clone,op); |
| | | else if (!arch_init) { |
| | | if (op->name) free_string(op->name); |
| | | /* record the name of the broken object */ |
| | | op->name = add_string(yv); |
| | | } |
| } | | } |
| } | | } |
| | | |