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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.164 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.165 by root, Tue Jul 15 00:00:37 2008 UTC

1260 * Handles applying a sign. 1260 * Handles applying a sign.
1261 */ 1261 */
1262static void 1262static void
1263apply_sign (object *op, object *sign, int autoapply) 1263apply_sign (object *op, object *sign, int autoapply)
1264{ 1264{
1265 readable_message_type *msgType; 1265 if (sign->has_dialogue ())
1266 {
1267 op->statusmsg (form ("Maybe you should I<talk> to the %s instead?", &sign->name));
1268 return;
1269 }
1266 1270
1267 if (!sign->msg) 1271 if (!sign->msg)
1268 { 1272 {
1269 op->statusmsg ("Nothing is written on it."); 1273 op->statusmsg ("Nothing is written on it.");
1270 return; 1274 return;
1305 1309
1306 if (ns->can_msg) 1310 if (ns->can_msg)
1307 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1311 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
1308 else 1312 else
1309 { 1313 {
1310 msgType = get_readable_message_type (sign); 1314 readable_message_type *msgType = get_readable_message_type (sign);
1311 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg); 1315 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1312 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg); 1316 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1313 } 1317 }
1314 } 1318 }
1315} 1319}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines