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.65 by root, Wed Dec 31 17:35:37 2008 UTC vs.
Revision 1.67 by root, Thu Jan 1 16:05:13 2009 UTC

… …
451 { 451 {
452 art = find_artifactlist (at->type)->items; 452 art = find_artifactlist (at->type)->items;
453 453
454 while (art) 454 while (art)
455 { 455 {
456 if (!strcmp (art->item->name, cp)) 456 if (!strcmp (&art->item->name, cp))
457 break; 457 break;
458 458
459 art = art->next; 459 art = art->next;
460 } 460 }
461 461
… …
889 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 889 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
890 return 1; 890 return 1;
891 } 891 }
892 892
893 for_all_players (pl) 893 for_all_players (pl)
894 if (!strcmp (pl->ob->name, thing)) 894 if (!strcmp (&pl->ob->name, thing))
895 { 895 {
896 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 896 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
897 new_draw_info (NDI_UNIQUE, 0, op, buf); 897 new_draw_info (NDI_UNIQUE, 0, op, buf);
898 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 898 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
899 new_draw_info (NDI_UNIQUE, 0, op, buf); 899 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
942 return 1; 942 return 1;
943 } 943 }
944 944
945 for_all_players (pl) 945 for_all_players (pl)
946 { 946 {
947 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (&pl->ob->name, thing))
948 { 948 {
949 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 949 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
950 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 950 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
951 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 951 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
952 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 952 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
… …
1101 * Used for wizard's learn spell/prayer. 1101 * Used for wizard's learn spell/prayer.
1102 * 1102 *
1103 * op is the player issuing the command. 1103 * op is the player issuing the command.
1104 */ 1104 */
1105static object * 1105static object *
1106get_spell_by_name (object *op, const char *spell_name) 1106get_spell_by_name (object *op, shstr_cmp spell_name)
1107{ 1107{
1108 archetype *at; 1108 archetype *at;
1109 archetype *found; 1109 archetype *found;
1110 int conflict_found; 1110 int conflict_found;
1111 size_t spell_name_length; 1111 size_t spell_name_length;
… …
1116 for_all_archetypes (at) 1116 for_all_archetypes (at)
1117 { 1117 {
1118 if (at->type != SPELL) 1118 if (at->type != SPELL)
1119 continue; 1119 continue;
1120 1120
1121 if (strcmp (at->object::name, spell_name) != 0) 1121 if (at->object::name != spell_name)
1122 continue; 1122 continue;
1123 1123
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