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

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.66 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.67 by root, Thu Jan 1 16:05:13 2009 UTC

… …
1124 if (found) 1124 if (found)
1125 { 1125 {
1126 if (!conflict_found) 1126 if (!conflict_found)
1127 { 1127 {
1128 conflict_found = 1; 1128 conflict_found = 1;
1129 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1129 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", &spell_name);
1130 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname); 1130 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->archname);
1131 } 1131 }
1132 1132
1133 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname); 1133 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->archname);
1134 continue; 1134 continue;
… …
1163 if (found != NULL) 1163 if (found != NULL)
1164 { 1164 {
1165 if (!conflict_found) 1165 if (!conflict_found)
1166 { 1166 {
1167 conflict_found = 1; 1167 conflict_found = 1;
1168 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1168 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", &spell_name);
1169 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name); 1169 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->object::name);
1170 } 1170 }
1171 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name); 1171 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &at->object::name);
1172 continue; 1172 continue;
1173 } 1173 }
… …
1182 /* Return if exactly one archetype matches. */ 1182 /* Return if exactly one archetype matches. */
1183 if (found != NULL) 1183 if (found != NULL)
1184 return arch_to_object (found); 1184 return arch_to_object (found);
1185 1185
1186 /* No spell found: just print an error message. */ 1186 /* No spell found: just print an error message. */
1187 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name); 1187 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", &spell_name);
1188 return NULL; 1188 return NULL;
1189} 1189}
1190 1190
1191static int 1191static int
1192command_learn_spell_or_prayer (object *op, char *params, int special_prayer) 1192command_learn_spell_or_prayer (object *op, char *params, int special_prayer)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines