… | |
… | |
706 | } |
706 | } |
707 | |
707 | |
708 | if (op->type == PLAYER && op->contr->last_used == tmp) |
708 | if (op->type == PLAYER && op->contr->last_used == tmp) |
709 | op->contr->last_used = tmp->below ? tmp->below |
709 | op->contr->last_used = tmp->below ? tmp->below |
710 | : tmp->above ? tmp->above |
710 | : tmp->above ? tmp->above |
711 | : 0; |
711 | : (object *)0; |
712 | |
712 | |
713 | if (op->container) |
713 | if (op->container) |
714 | { |
714 | { |
715 | if (op->type == PLAYER) |
715 | if (op->type == PLAYER) |
716 | put_object_in_sack (op, op->container, tmp, op->contr->count); |
716 | put_object_in_sack (op, op->container, tmp, op->contr->count); |
… | |
… | |
1145 | buf.printf ("It has %d charges left.\r", stats.food); |
1145 | buf.printf ("It has %d charges left.\r", stats.food); |
1146 | break; |
1146 | break; |
1147 | } |
1147 | } |
1148 | |
1148 | |
1149 | if (materialname && !msg) |
1149 | if (materialname && !msg) |
1150 | buf.printf ("It is made of: %s.\r", &materialname); |
1150 | buf << (nrof > 1 ? "They are made of " : "It is made of ") |
|
|
1151 | << materialname |
|
|
1152 | << '\r'; |
1151 | |
1153 | |
1152 | if (who) |
1154 | if (who) |
1153 | /* Where to wear this item */ |
1155 | /* Where to wear this item */ |
1154 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1156 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1155 | if (slot[i].info) |
1157 | if (slot[i].info) |
… | |
… | |
1188 | /* Does the object have a message? Don't show message for all object |
1190 | /* Does the object have a message? Don't show message for all object |
1189 | * types - especially if the first entry is a match |
1191 | * types - especially if the first entry is a match |
1190 | */ |
1192 | */ |
1191 | if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ()) |
1193 | if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ()) |
1192 | { |
1194 | { |
|
|
1195 | buf << '\r'; |
|
|
1196 | |
1193 | /* This is just a hack so when identifying the items, we print |
1197 | /* This is just a hack so when identifying the items, we print |
1194 | * out the extra message |
1198 | * out the extra message |
1195 | */ |
1199 | */ |
1196 | if (need_identify (this) && flag [FLAG_IDENTIFIED]) |
1200 | if (need_identify (this) && flag [FLAG_IDENTIFIED]) |
1197 | buf << "The object has a story:\r"; |
1201 | buf << "The object has a story:\r"; |