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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.85 by root, Sat Apr 3 03:35:33 2010 UTC vs.
Revision 1.101 by root, Tue Feb 8 01:03:47 2011 UTC

… …
51# define def(uc, flags) flags, 51# define def(uc, flags) flags,
52# include "skillinc.h" 52# include "skillinc.h"
53# undef def 53# undef def
54}; 54};
55 55
56vector<object_ptr> skillvec;
57
56static int attack_hth (object *pl, int dir, const char *string, object *skill); 58static int attack_hth (object *pl, int dir, const char *string, object *skill);
57static int attack_melee_weapon (object *op, int dir, const char *string, object *skill); 59static int attack_melee_weapon (object *op, int dir, const char *string, object *skill);
58 60
59/* init_skills basically just sets up the skill_names table 61/* init_skills basically just sets up the skill_names table
60 * above. The index into the array is set up by the 62 * above. The index into the array is set up by the
61 * subtypes. 63 * subtypes.
62 */ 64 */
63void 65void
64init_skills () 66init_skills ()
65{ 67{
66 for_all_archetypes (at) 68 // nop
67 if (at->type == SKILL) 69}
70
71void
72add_skill_archetype (object *o)
73{
74 assert (("skill name must equal skill skill", o->name == o->skill));
75
76 for (vector<object_ptr>::iterator i = skillvec.begin (); i != skillvec.end (); ++i)
77 if ((*i)->name == o->name)
68 { 78 {
69 if (skill_names[at->subtype]) 79 // replace existing entry
70 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", 80 SKILL_INDEX (o) = i - skillvec.begin ();
71 at->subtype, &skill_names[at->subtype], &at->skill); 81 *i = o;
72 else 82 return;
73 skill_names[at->subtype] = at->skill;
74 } 83 }
75 84
76 /* This isn't really an error if there is no skill subtype set, but 85 // add new entry
77 * checking for this may catch some user errors. 86 assert (("only CS_NUM_SKILLS skills supported by client protocol", skillvec.size () < CS_NUM_SKILLS));
78 */ 87 SKILL_INDEX (o) = skillvec.size ();
79 for (int i = 1; i < NUM_SKILLS; i++) 88 skillvec.push_back (o);
80 if (!skill_names[i])
81 LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
82} 89}
83 90
84/* This function goes through the player inventory and sets 91/* This function goes through the player inventory and sets
85 * up the last_skills[] array in the player object. 92 * up the last_skills[] array in the player object.
86 * the last_skills[] is used to more quickly lookup skills - 93 * the last_skills[] is used to more quickly lookup skills -
87 * mostly used for sending exp. 94 * mostly used for sending exp.
88 */ 95 */
89void 96void
90player::link_skills () 97player::link_skills ()
91{ 98{
92 for (int i = 0; i < NUM_SKILLS; ++i) 99 for (int i = 0; i < CS_NUM_SKILLS; ++i)
93 last_skill_ob [i] = 0; 100 last_skill_ob [i] = 0;
94 101
95 for (object *tmp = ob->inv; tmp; tmp = tmp->below) 102 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
96 if (tmp->type == SKILL) 103 if (tmp->type == SKILL)
97 { 104 {
105 int idx = SKILL_INDEX (tmp);
106
98 assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS)); 107 assert (IN_RANGE_EXC (idx, 0, CS_NUM_SKILLS));
99 108
100 if (last_skill_ob [tmp->subtype] != tmp) 109 if (last_skill_ob [idx] != tmp)
101 { 110 {
102 /* This is really a warning, hence no else below */
103 if (last_skill_ob [tmp->subtype])
104 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
105 &last_skill_ob [tmp->subtype]->skill, &tmp->skill);
106
107 last_skill_ob [tmp->subtype] = tmp; 111 last_skill_ob [idx] = tmp;
108 if (ns) 112 if (ns)
109 ns->last_skill_exp [tmp->subtype] = -1; 113 ns->last_skill_exp [idx] = -1;
110 } 114 }
111 } 115 }
112} 116}
113 117
114static object * 118static object *
… …
124 return splay (tmp); 128 return splay (tmp);
125 129
126 return 0; 130 return 0;
127} 131}
128 132
133object *
129object *player::find_skill (shstr_cmp name) const 134player::find_skill (shstr_cmp name) const
130{ 135{
131 // might want to use last_skill_obj at one point, or maybe not 136 // might want to use last_skill_obj at one point, or maybe not
132 return ::find_skill (ob, name); 137 return ::find_skill (ob, name);
133} 138}
134 139
… …
162 167
163 /* Player has a tool to use the skill. If not applied, apply it - 168 /* Player has a tool to use the skill. If not applied, apply it -
164 * if not successful, return null. If they do have the skill tool 169 * if not successful, return null. If they do have the skill tool
165 * but not the skill itself, give it to them. 170 * but not the skill itself, give it to them.
166 */ 171 */
167 object *skill = find_skill (who, skill_tool->skill); 172 object *skill = who->give_skill (skill_tool->skill);
168
169 if (!skill)
170 skill = give_skill_by_name (who, skill_tool->skill);
171 173
172 if (!skill_tool->flag [FLAG_APPLIED]) 174 if (!skill_tool->flag [FLAG_APPLIED])
173 if (apply_special (who, splay (skill_tool), AP_APPLY)) 175 if (!who->apply (splay (skill_tool)))
174 return 0; 176 return 0;
175 177
176 return splay (skill); 178 return splay (skill);
177} 179}
178 180
179object * 181object *
180find_skill_by_name_fuzzy (object *who, const char *name) 182find_skill_by_name_fuzzy (object *who, const char *name)
181{ 183{
182 if (!name) 184 if (name)
183 return 0;
184
185 for (object *tmp = who->inv; tmp; tmp = tmp->below) 185 for (object *tmp = who->inv; tmp; tmp = tmp->below)
186 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) 186 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
187 && tmp->skill.starts_with (name)) 187 && tmp->skill.starts_with (name))
188 if (object *skop = find_skill_by_name (who, tmp->skill)) 188 if (object *skop = find_skill_by_name (who, tmp->skill))
189 return skop; 189 return skop;
190 190
191 return 0; 191 return 0;
192} 192}
193 193
194/* This returns the skill pointer of the given name (the 194/* This returns the skill pointer of the given name (the
… …
199 * tool, this code will equip it. 199 * tool, this code will equip it.
200 * 200 *
201 * This code is basically the same as find_skill_by_name() above, 201 * This code is basically the same as find_skill_by_name() above,
202 * but instead a skill name, we search by matching number. 202 * but instead a skill name, we search by matching number.
203 * this replaces find_skill. 203 * this replaces find_skill.
204 *
205 * MUST NOT BE USED IN NEW CODE! (schmorp)
204 */ 206 */
205object * 207object *
206find_skill_by_number (object *who, int skillno) 208find_skill_by_number (object *who, int skillno)
207{ 209{
208 for (object *tmp = who->inv; tmp; tmp = tmp->below) 210 for (object *tmp = who->inv; tmp; tmp = tmp->below)
… …
211 return skop; 213 return skop;
212 214
213 return 0; 215 return 0;
214} 216}
215 217
216/* This changes the objects chosen_skill to new_skill. 218object *
217 * return 1 on success, 0 on error 219object::give_skill (shstr_cmp name, bool can_use)
218 */
219bool
220object::change_skill (object *new_skill)
221{ 220{
222 if (type != PLAYER) 221 object *skill = find_skill (this, name);
223 return 0;
224 222
225 // optimise this supposedly common case
226 if (new_skill == chosen_skill)
227 return 1;
228
229 if (chosen_skill) 223 if (!skill)
230 { 224 skill = give_skill_by_name (this, name);
231 chosen_skill->flag [FLAG_APPLIED] = false;
232 change_abil (this, chosen_skill);
233 }
234 225
235 chosen_skill = new_skill; 226 if (skill && can_use)
227 skill->flag [FLAG_CAN_USE_SKILL] = true;
236 228
237 if (chosen_skill)
238 {
239 chosen_skill->flag [FLAG_APPLIED] = true;
240 change_abil (this, chosen_skill);
241 }
242
243 // always clear current weapon, as the selected skill could
244 // conflict with the current weapon skill, which would go
245 // undetected and exp would be given to the wrong skill.
246 current_weapon = 0;
247
248 update_stats ();
249 return 1; 229 return skill;
250} 230}
251 231
252/* do_skill() - Main skills use function-similar in scope to cast_spell(). 232/* do_skill() - Main skills use function-similar in scope to cast_spell().
253 * We handle all requests for skill use outside of some combat here. 233 * We handle all requests for skill use outside of some combat here.
254 * We require a separate routine outside of fire() so as to allow monsters 234 * We require a separate routine outside of fire() so as to allow monsters
… …
295 /* Not 100% sure if this will work with new movement code - 275 /* Not 100% sure if this will work with new movement code -
296 * the levitation skill has move_type for flying, so when 276 * the levitation skill has move_type for flying, so when
297 * equipped, that should transfer to player, when not, 277 * equipped, that should transfer to player, when not,
298 * shouldn't. 278 * shouldn't.
299 */ 279 */
300 if (QUERY_FLAG (skill, FLAG_APPLIED)) 280 if (skill->flag [FLAG_APPLIED])
301 { 281 {
302 CLEAR_FLAG (skill, FLAG_APPLIED); 282 skill->clr_flag (FLAG_APPLIED);
303 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 283 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
304 } 284 }
305 else 285 else
306 { 286 {
307 SET_FLAG (skill, FLAG_APPLIED); 287 skill->set_flag (FLAG_APPLIED);
308 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); 288 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
309 } 289 }
310 290
311 op->update_stats (); 291 op->update_stats ();
312 success = 1; 292 success = 1;
… …
402 382
403 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) 383 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
404 { 384 {
405 next = tmp->above; 385 next = tmp->above;
406 386
407 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 387 if (tmp->flag [FLAG_IS_CAULDRON])
408 { 388 {
409 found_cauldron = true; 389 found_cauldron = true;
410 390
411 if (tmp->skill != skill->skill) 391 if (tmp->skill != skill->skill)
412 { 392 {
413 op->failmsg (format ("You can't use the %s with the %s skill!", 393 op->failmsgf ("You can't use the %s with the %s skill!",
414 query_name (tmp), 394 query_name (tmp),
415 query_name (skill))); 395 query_name (skill));
416 break; 396 break;
417 } 397 }
418 398
419 attempt_do_alchemy (op, tmp, skill); 399 attempt_do_alchemy (op, tmp, skill);
420 400
421 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 401 if (tmp->flag [FLAG_APPLIED])
422 esrv_send_inventory (op, tmp); 402 esrv_send_inventory (op, tmp);
423 } 403 }
424 } 404 }
425 405
426 if (!found_cauldron) 406 if (!found_cauldron)
… …
462 case SK_EVOCATION: 442 case SK_EVOCATION:
463 case SK_PYROMANCY: 443 case SK_PYROMANCY:
464 case SK_SUMMONING: 444 case SK_SUMMONING:
465 case SK_CLIMBING: 445 case SK_CLIMBING:
466 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 446 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
447 break;
448
449 case SK_MINING:
450 success = skill_mining (op, part, skill, dir, string);
467 break; 451 break;
468 452
469 default: 453 default:
470 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 454 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
471 break; 455 break;
… …
547 } 531 }
548 else 532 else
549 { /* all other items/living creatures */ 533 { /* all other items/living creatures */
550 op_exp = op->stats.exp; 534 op_exp = op->stats.exp;
551 op_lvl = op->level; 535 op_lvl = op->level;
552 if (!QUERY_FLAG (op, FLAG_ALIVE)) 536 if (!op->flag [FLAG_ALIVE])
553 op_lvl += 5 * abs (op->magic); /* for ident/make items */ 537 op_lvl += 5 * abs (op->magic); /* for ident/make items */
554 } 538 }
555 539
556 if (op_lvl < 1) 540 if (op_lvl < 1)
557 op_lvl = 1; 541 op_lvl = 1;
… …
621 } 605 }
622 606
623 object *tmp = find_skill (pl, scroll->skill); 607 object *tmp = find_skill (pl, scroll->skill);
624 608
625 /* player already knows it */ 609 /* player already knows it */
626 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 610 if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
627 return 0; 611 return 0;
628 612
629 /* now a random change to learn, based on player Int. 613 /* now a random change to learn, based on player Int.
630 * give bonus based on level - otherwise stupid characters 614 * give bonus based on level - otherwise stupid characters
631 * might never be able to learn anything. 615 * might never be able to learn anything.
… …
640 { 624 {
641 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 625 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
642 return 2; 626 return 2;
643 } 627 }
644 628
645 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 629 tmp->set_flag (FLAG_CAN_USE_SKILL);
646 630
647 return 1; 631 return 1;
648} 632}
649 633
650/* Gives a percentage clipped to 0% -> 100% of a/b. */ 634/* Gives a percentage clipped to 0% -> 100% of a/b. */
… …
663 return 0; 647 return 0;
664 else if (rv > 100) 648 else if (rv > 100)
665 return 100; 649 return 100;
666 650
667 return rv; 651 return rv;
652}
653
654static int
655cmp_skillp (const void *sk1, const void *sk2)
656{
657 return strcmp (&((*(const object **) sk1)->name),
658 &((*(const object **) sk2)->name));
668} 659}
669 660
670/* show_skills() - Meant to allow players to examine 661/* show_skills() - Meant to allow players to examine
671 * their current skill list. 662 * their current skill list.
672 * This shows the amount of exp they have in the skills. 663 * This shows the amount of exp they have in the skills.
… …
675 * Note this function is a bit more complicated becauase we 666 * Note this function is a bit more complicated becauase we
676 * we want ot sort the skills before printing them. If we 667 * we want ot sort the skills before printing them. If we
677 * just dumped this as we found it, this would be a bit 668 * just dumped this as we found it, this would be a bit
678 * simpler. 669 * simpler.
679 */ 670 */
680//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
681void 671void
682show_skills (object *pl, const char *search) 672show_skills (object *pl, const char *search)
683{ 673{
684 const char *cp; 674 const char *cp;
685 int i, num_skills_found = 0; 675 int i, num_skills_found = 0;
686 const char *const periods = ".............................."; // 30 676 object *skills[CS_NUM_SKILLS];
687
688 /* Need to have a pointer and use strdup for qsort to work properly */
689 char skills[NUM_SKILLS][128]; // d'oh
690
691 object *op = pl->contr->ob; 677 object *op = pl->contr->ob;
692 678
679 /* find the skills */
693 for (object *tmp = op->inv; tmp; tmp = tmp->below) 680 for (object *tmp = op->inv; tmp; tmp = tmp->below)
694 { 681 {
695 if (tmp->type == SKILL) 682 if (tmp->type == SKILL)
696 { 683 {
697 if (search && !tmp->name.contains (search)) 684 if (search && !tmp->name.contains (search))
698 continue; 685 continue;
699 686
700 char buf[30]; 687 skills[num_skills_found++] = tmp;
701
702 /* Basically want to fill this out to 30 spaces with periods */
703 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
704
705 if (settings.permanent_exp_ratio)
706 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
707 buf, tmp->level, tmp->stats.exp,
708 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
709 else
710 snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
711 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
712 688
713 /* I don't know why some characters get a bunch of skills, but 689 /* I don't know why some characters get a bunch of skills, but
714 * it sometimes happens (maybe a leftover from bugier earlier code 690 * it sometimes happens (maybe a leftover from bugier earlier code
715 * and those character are still about). In any case, lets handle 691 * and those character are still about). In any case, lets handle
716 * it so it doesn't crash the server - otherwise, one character may 692 * it so it doesn't crash the server - otherwise, one character may
717 * crash the server numerous times. 693 * crash the server numerous times.
718 */ 694 */
719 if (num_skills_found >= NUM_SKILLS) 695 if (num_skills_found >= CS_NUM_SKILLS)
720 { 696 {
721 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills."); 697 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills.");
722 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin"); 698 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
723 break; 699 break;
724 } 700 }
… …
727 703
728 dynbuf_text &msg = msg_dynbuf; msg.clear (); 704 dynbuf_text &msg = msg_dynbuf; msg.clear ();
729 705
730 msg << "T<Player skills:>\n\n"; 706 msg << "T<Player skills:>\n\n";
731 if (num_skills_found > 1) 707 if (num_skills_found > 1)
732 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp); 708 qsort (skills, num_skills_found, sizeof (skills [0]), cmp_skillp);
733 709
710 char buf[31]; /* +1 for '\0' */
711 const char *const periods = ".............................."; // 30
712
734 for (i = 0; i < num_skills_found; i++) 713 for (i = 0; i < num_skills_found; i++) {
735 msg << " C<" << skills [i] << ">\n"; 714 object *tmp = skills[i];
715
716 /* Basically want to fill this out to 30 spaces with periods */
717 snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
718
719 msg << " C<";
720
721 if (settings.permanent_exp_ratio)
722 msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
723 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul),
724 clipped_percent (tmp->perm_exp, tmp->stats.exp));
725 else
726 msg.printf ("%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
727 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
728
729 msg << ">\n";
730 }
736 731
737 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r"; 732 msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
738 733
739 cp = determine_god (op); 734 cp = determine_god (op);
740 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r"; 735 msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
… …
760 755
761 if (!string) 756 if (!string)
762 return 0; 757 return 0;
763 758
764 for (skop = op->inv; skop; skop = skop->below) 759 for (skop = op->inv; skop; skop = skop->below)
765 { 760 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
766 if (skop->type == SKILL
767 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
768 && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill)))) 761 && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
762 {
763 skop = find_skill_by_name (op, skop->skill);
769 break; 764 break;
770 else if (skop->type == SKILL_TOOL
771 && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill))))
772 break;
773 } 765 }
774 766
775 if (!skop) 767 if (!skop)
776 { 768 {
777 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 769 op->failmsgf ("Unable to find skill %s.", string);
770 return 0;
771 }
772
773 if (!(skill_flags [skop->subtype] & SF_USE))
774 {
775 op->failmsgf (
776 "You feel as if you wanted to do something funny, but you can't remember what. "
777 "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
778 "use it with some item, or it's always active.>",
779 &skop->skill
780 );
778 return 0; 781 return 0;
779 } 782 }
780 783
781 len = strlen (skop->skill); 784 len = strlen (skop->skill);
782 785
… …
817 */ 820 */
818static object * 821static object *
819find_player_hth_skill (object *op) 822find_player_hth_skill (object *op)
820{ 823{
821 for (object *tmp = op->inv; tmp; tmp = tmp->below) 824 for (object *tmp = op->inv; tmp; tmp = tmp->below)
822 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) 825 if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
823 return tmp; 826 return tmp;
824 827
825 return 0; 828 return 0;
826} 829}
827 830
… …
847 * through that code if skill is set to change to the skill. 850 * through that code if skill is set to change to the skill.
848 */ 851 */
849 if (player *pl = op->contr) 852 if (player *pl = op->contr)
850 { 853 {
851 if (skill) 854 if (skill)
852 op->change_skill (skill); 855 {
856 if (!op->apply (skill))
857 return 0;
858 }
853 else 859 else
854 { 860 {
855 if (!pl->combat_ob) 861 if (!pl->combat_ob)
856 { 862 {
857 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 863 if (op->flag [FLAG_READY_WEAPON])
858 { 864 {
859 for (tmp = op->inv; tmp; tmp = tmp->below) 865 for (tmp = op->inv; tmp; tmp = tmp->below)
860 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) 866 if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
861 break; 867 break;
862 868
863 if (!tmp) 869 if (!tmp)
864 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 870 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
865 871
… …
891 } 897 }
892 } 898 }
893 899
894 if (!op->apply (pl->combat_ob)) 900 if (!op->apply (pl->combat_ob))
895 return 0; 901 return 0;
902
903 if (!op->chosen_skill)
904 {
905 LOG (llevError, "do_skill_attack: weapon has no skill (%s)", pl->combat_ob->debug_desc ());
906 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "You hit a bug in the server, please contact an admin!");
907 return 0;
908 }
896 } 909 }
897 910
898 /* lose invisiblity/hiding status for running attacks */ 911 /* lose invisiblity/hiding status for running attacks */
899 if (pl->tmp_invis) 912 if (pl->tmp_invis)
900 { 913 {
… …
907 920
908 int success = attack_ob (tmp, op); 921 int success = attack_ob (tmp, op);
909 922
910 /* print appropriate messages to the player */ 923 /* print appropriate messages to the player */
911 924
912 if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 925 if (success && string && tmp && !tmp->flag [FLAG_FREED])
913 { 926 {
914 if (op->type == PLAYER) 927 if (op->type == PLAYER)
915 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 928 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
916 else if (tmp->type == PLAYER) 929 else if (tmp->type == PLAYER)
917 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 930 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
… …
960 /* space must be blocked for there to be anything interesting to do */ 973 /* space must be blocked for there to be anything interesting to do */
961 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) 974 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
962 return 0; 975 return 0;
963 976
964 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) 977 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
965 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 978 if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR)
966 { 979 {
967 /* Don't attack party members */ 980 /* Don't attack party members */
968 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 981 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
969 return 0; 982 return 0;
970 983
… …
992static int 1005static int
993attack_hth (object *pl, int dir, const char *string, object *skill) 1006attack_hth (object *pl, int dir, const char *string, object *skill)
994{ 1007{
995 object *enemy = NULL, *weapon; 1008 object *enemy = NULL, *weapon;
996 1009
997 if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) 1010 if (pl->flag [FLAG_READY_WEAPON])
998 for (weapon = pl->inv; weapon; weapon = weapon->below) 1011 for (weapon = pl->inv; weapon; weapon = weapon->below)
999 { 1012 {
1000 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 1013 if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
1001 { 1014 {
1002 CLEAR_FLAG (weapon, FLAG_APPLIED); 1015 weapon->clr_flag (FLAG_APPLIED);
1003 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 1016 pl->clr_flag (FLAG_READY_WEAPON);
1004 pl->update_stats (); 1017 pl->update_stats ();
1005 if (pl->type == PLAYER) 1018 if (pl->type == PLAYER)
1006 { 1019 {
1007 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 1020 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1008 esrv_update_item (UPD_FLAGS, pl, weapon); 1021 esrv_update_item (UPD_FLAGS, pl, weapon);
… …
1026 */ 1039 */
1027static int 1040static int
1028attack_melee_weapon (object *op, int dir, const char *string, object *skill) 1041attack_melee_weapon (object *op, int dir, const char *string, object *skill)
1029{ 1042{
1030 1043
1031 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 1044 if (!op->flag [FLAG_READY_WEAPON])
1032 { 1045 {
1033 if (op->type == PLAYER) 1046 if (op->type == PLAYER)
1034 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); 1047 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1035 1048
1036 return 0; 1049 return 0;

Diff Legend

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