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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.67 by root, Tue Nov 10 04:38:45 2009 UTC vs.
Revision 1.70 by elmex, Sat Mar 20 00:42:08 2010 UTC

763 /* Note that the resolution this provides for players really isn't 763 /* Note that the resolution this provides for players really isn't
764 * very good. Any player with a speed greater than .67 will 764 * very good. Any player with a speed greater than .67 will
765 * fall into the 'lightning fast movement' category. 765 * fall into the 'lightning fast movement' category.
766 */ 766 */
767 if (op->has_active_speed ()) 767 if (op->has_active_speed ())
768 switch ((int)((fabs (op->speed)) * 15.)) 768 switch ((int)(op->speed * 15.))
769 { 769 {
770 case 0: 770 case 0:
771 buf << "(very slow movement)"; 771 buf << "(very slow movement)";
772 break; 772 break;
773 case 1: 773 case 1:
843 if (op->stats.luck) 843 if (op->stats.luck)
844 buf.printf ("(luck%+d)", op->stats.luck); 844 buf.printf ("(luck%+d)", op->stats.luck);
845 } 845 }
846 846
847 /* describe attacktypes */ 847 /* describe attacktypes */
848 if (is_dragon_pl (op)) 848 if (op->is_dragon ())
849 { 849 {
850 /* for dragon players display the attacktypes from clawing skill 850 /* for dragon players display the attacktypes from clawing skill
851 * Break apart the for loop - move the comparison checking down - 851 * Break apart the for loop - move the comparison checking down -
852 * this makes it more readable. 852 * this makes it more readable.
853 */ 853 */
1152 1152
1153 buf.add_abilities ("Attacks", op->attacktype); 1153 buf.add_abilities ("Attacks", op->attacktype);
1154 /* resistance on flesh is only visible for quetzals. If 1154 /* resistance on flesh is only visible for quetzals. If
1155 * non flesh, everyone can see its resistances 1155 * non flesh, everyone can see its resistances
1156 */ 1156 */
1157 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1157 if (op->type != FLESH || (owner && owner->is_dragon ()))
1158 buf << describe_resistance (op, 0); 1158 buf << describe_resistance (op, 0);
1159 1159
1160 buf.add_paths ("Attuned", op->path_attuned); 1160 buf.add_paths ("Attuned", op->path_attuned);
1161 buf.add_paths ("Repelled", op->path_repelled); 1161 buf.add_paths ("Repelled", op->path_repelled);
1162 buf.add_paths ("Denied", op->path_denied); 1162 buf.add_paths ("Denied", op->path_denied);
1189{ 1189{
1190 static dynbuf_text buf; buf.clear (); 1190 static dynbuf_text buf; buf.clear ();
1191 1191
1192 for (object *tmp = inv; tmp; tmp = tmp->below) 1192 for (object *tmp = inv; tmp; tmp = tmp->below)
1193 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1193 if (who && QUERY_FLAG (who, FLAG_WIZ))
1194 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ()); 1194 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1195 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1195 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1196 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ()); 1196 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1197 1197
1198 if (buf.size ()) 1198 if (buf.size ())
1199 buf.printf ("%s(total weight: %s)\n", indent, query_weight ()); 1199 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines