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.74 by root, Tue May 6 21:04:37 2008 UTC vs.
Revision 1.75 by root, Mon Jul 14 23:57:46 2008 UTC

1148 buf << "This is a buildable item.\n"; 1148 buf << "This is a buildable item.\n";
1149 1149
1150 /* Does the object have a message? Don't show message for all object 1150 /* Does the object have a message? Don't show message for all object
1151 * types - especially if the first entry is a match 1151 * types - especially if the first entry is a match
1152 */ 1152 */
1153 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@') 1153 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1154 { 1154 {
1155 /* This is just a hack so when identifying the items, we print 1155 /* This is just a hack so when identifying the items, we print
1156 * out the extra message 1156 * out the extra message
1157 */ 1157 */
1158 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1158 if (need_identify (this) && flag [FLAG_IDENTIFIED])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines