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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.66 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.67 by root, Mon Apr 21 23:35:24 2008 UTC

101 op = tmp; 101 op = tmp;
102 return true; 102 return true;
103 } 103 }
104 else 104 else
105 { 105 {
106 if (op->nrof > 1)
106 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %ss.", op->number_of (), &op->name); 107 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
108 else
109 new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
110
107 return false; 111 return false;
108 } 112 }
109} 113}
110 114
111int 115int
287 } 291 }
288 292
289 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 293 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
290 return; 294 return;
291 295
292 if (nrof > tmp_nrof || nrof == 0) 296 if (nrof > tmp_nrof || nrof <= 0)
293 nrof = tmp_nrof; 297 nrof = tmp_nrof;
294 298
295 /* Figure out how much weight this object will add to the player */ 299 /* Figure out how much weight this object will add to the player */
296 weight = tmp->weight * nrof; 300 weight = tmp->weight * nrof;
297 if (tmp->inv) 301 if (tmp->inv)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines