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

Comparing deliantra/server/common/material.C (file contents):
Revision 1.6 by root, Tue Nov 10 16:02:06 2009 UTC vs.
Revision 1.7 by root, Tue Nov 10 16:29:20 2009 UTC

110transmute_materialname (object *op, const object *change) 110transmute_materialname (object *op, const object *change)
111{ 111{
112 if (!op->is_armor ()) 112 if (!op->is_armor ())
113 return; 113 return;
114 114
115 if (op->material == &material_null) 115 if (op->material == MATERIAL_NULL)
116 return; 116 return;
117 117
118 if (op->material != change->material) 118 if (op->material != change->material)
119 return; 119 return;
120 120
132 132
133/* set the materialname and type for an item */ 133/* set the materialname and type for an item */
134void 134void
135select_material (object *op, int difficulty) 135select_material (object *op, int difficulty)
136{ 136{
137 if (op->material != &material_null || !op->materials) 137 if (op->material != MATERIAL_NULL || !op->materials)
138 return; 138 return;
139 139
140 materialtype_t *lmt = 0; 140 materialtype_t *lmt = 0;
141 141
142 //TODL: dead code? 142 //TODL: dead code?

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines