ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.24 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.25 by root, Mon Dec 18 03:00:02 2006 UTC

279 279
280 if (!op->name_pl) 280 if (!op->name_pl)
281 op->name_pl = op->name; 281 op->name_pl = op->name;
282 282
283 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
284 if (!(IS_WEAPON (op) && op->level > 0)) 284 if (!(op->is_weapon () && op->level > 0))
285 { 285 {
286 if (op->map != NULL) 286 if (op->map != NULL)
287 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
288 else 288 else
289 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines