| version 1.38 | | version 1.39 |
|---|
| | |
| %{ | | %{ |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: loader.l,v 1.38 2003/02/12 06:30:25 mwedel Exp $"; | | * "$Id: loader.l,v 1.39 2003/02/14 05:50:29 garbled Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| /* objects now have a materialname. try to patch it in */ | | /* objects now have a materialname. try to patch it in */ |
| if (!(IS_WEAPON(op) && op->level > 0)) { | | if (!(IS_WEAPON(op) && op->level > 0)) { |
| if (op->map != NULL) | | if (op->map != NULL) |
| set_materialname(op, op->map->difficulty); | | set_materialname(op, op->map->difficulty, NULL); |
| else | | else |
| set_materialname(op, 5); | | set_materialname(op, 5, NULL); |
| } | | } |
| /* back out the materialname from op->name very limited subset of obs */ | | /* back out the materialname from op->name very limited subset of obs */ |
| if ((IS_WEAPON(op) || IS_ARMOR(op)) && op->name && op->materialname) { | | if ((IS_WEAPON(op) || IS_ARMOR(op)) && op->name && op->materialname) { |
| | |
| ^can_cut{S} { /* just ignore for now */ } | | ^can_cut{S} { /* just ignore for now */ } |
| ^can_dam_armour{S} { } | | ^can_dam_armour{S} { } |
| ^weapontype{S} op->weapontype = IVAL; | | ^weapontype{S} op->weapontype = IVAL; |
| | | ^tooltype{S} op->tooltype = IVAL; |
| ^casting_speed{S} op->casting_speed = FVAL; | | ^casting_speed{S} op->casting_speed = FVAL; |
| ^elevation{S} op->elevation = IVAL; | | ^elevation{S} op->elevation = IVAL; |
| ^client_type{S} op->client_type = IVAL; | | ^client_type{S} op->client_type = IVAL; |
| | |
| sprintf(buf2,"weapontype %d\n",op->weapontype); | | sprintf(buf2,"weapontype %d\n",op->weapontype); |
| strcat(buf,buf2); | | strcat(buf,buf2); |
| } | | } |
| | | if(op->tooltype && op->tooltype!=op2->tooltype) { |
| | | sprintf(buf2,"tooltype %d\n",op->tooltype); |
| | | strcat(buf,buf2); |
| | | } |
| if (op->elevation && op->elevation != op2->elevation) { | | if (op->elevation && op->elevation != op2->elevation) { |
| sprintf(buf2,"elevation %d\n", op->elevation); | | sprintf(buf2,"elevation %d\n", op->elevation); |
| strcat(buf,buf2); | | strcat(buf,buf2); |