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.48 by root, Mon May 14 19:56:45 2007 UTC vs.
Revision 1.58 by root, Sun Jul 1 05:00:20 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copryight (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/* Created July 95 to separate skill utilities from actual skills -b.t. */ 24/* Created July 95 to separate skill utilities from actual skills -b.t. */
26 25
27/* Reconfigured skills code to allow linking of skills to experience 26/* Reconfigured skills code to allow linking of skills to experience
… …
61 * subtypes. 60 * subtypes.
62 */ 61 */
63void 62void
64init_skills (void) 63init_skills (void)
65{ 64{
66 for (archetype *at = first_archetype; at; at = at->next) 65 for_all_archetypes (at)
67 if (at->clone.type == SKILL) 66 if (at->type == SKILL)
68 { 67 {
69 if (skill_names[at->clone.subtype]) 68 if (skill_names[at->subtype])
70 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n", 69 LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",
71 at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill); 70 at->subtype, &skill_names[at->subtype], &at->skill);
72 else 71 else
73 skill_names[at->clone.subtype] = at->clone.skill; 72 skill_names[at->subtype] = at->skill;
74 } 73 }
75 74
76 /* This isn't really an error if there is no skill subtype set, but 75 /* This isn't really an error if there is no skill subtype set, but
77 * checking for this may catch some user errors. 76 * checking for this may catch some user errors.
78 */ 77 */
… …
105 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go 104 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go
106 } 105 }
107 } 106 }
108} 107}
109 108
109static object *
110find_skill (object *who, const shstr &sh)
111{
112 for (object *tmp = who->inv; tmp; tmp = tmp->below)
113 if (tmp->skill == sh && tmp->type == SKILL)
114 return tmp;
115
116 return 0;
117}
118
110/* This returns the skill pointer of the given name (the 119/* This returns the skill pointer of the given name (the
111 * one that accumlates exp, has the level, etc). 120 * one that accumulates exp, has the level, etc).
112 * 121 *
113 * It is presumed that the player will be needing to actually 122 * It is presumed that the player will be needing to actually
114 * use the skill, so thus if use of the skill requires a skill 123 * use the skill, so thus if use of the skill requires a skill
115 * tool, this code will equip it. 124 * tool, this code will equip it.
116 */ 125 */
117object * 126object *
118find_skill_by_name (object *who, const char *name) 127find_skill_by_name (object *who, const shstr &sh)
119{ 128{
120 if (!name) 129 object *skill_tool = 0;
130
131 for (object *tmp = who->inv; tmp; tmp = tmp->below)
132 if (tmp->skill == sh)
133 {
134 if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] || tmp->flag [FLAG_APPLIED]))
135 /* If this is a skill that can be used without applying tool, return it */
136 return splay (tmp);
137 /* Try to find appropriate skilltool. If the player has one already
138 * applied, we try to keep using that one.
139 */
140 else if (tmp->type == SKILL_TOOL && !skill_tool)
141 skill_tool = tmp;
142 }
143
144 if (!skill_tool)
121 return 0; 145 return 0;
122
123 object *skill = 0, *skill_tool = 0;
124
125 /* We make sure the length of the string in the object is greater
126 * in length than the passed string. Eg, if we have a skill called
127 * 'hi', we don't want to match if the user passed 'high'
128 */
129 for (object *tmp = who->inv; tmp; tmp = tmp->below)
130 {
131 if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name))
132 skill = tmp;
133
134 /* Try to find appropriate skilltool. If the player has one already
135 * applied, we try to keep using that one.
136 */
137 else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name))
138 {
139 if (QUERY_FLAG (tmp, FLAG_APPLIED))
140 skill_tool = tmp;
141 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
142 skill_tool = tmp;
143 }
144 }
145
146 /* If this is a skill that can be used without a tool, return it */
147 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
148 return skill;
149 146
150 /* Player has a tool to use the skill. If not applied, apply it - 147 /* Player has a tool to use the skill. If not applied, apply it -
151 * if not successful, return null. If they do have the skill tool 148 * if not successful, return null. If they do have the skill tool
152 * but not the skill itself, give it to them. 149 * but not the skill itself, give it to them.
153 */ 150 */
154 if (skill_tool) 151 object *skill = find_skill (who, skill_tool->skill);
155 { 152
156 if (!skill) 153 if (!skill)
157 { 154 {
158 skill = give_skill_by_name (who, skill_tool->skill); 155 skill = give_skill_by_name (who, skill_tool->skill);
159 link_player_skills (who); 156 link_player_skills (who);
160 } 157 }
161 158
162 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED)) 159 if (!skill_tool->flag [FLAG_APPLIED])
163 if (apply_special (who, skill_tool, 0)) 160 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY))
164 return 0; 161 return 0;
165 162
163 return splay (skill);
164}
165
166object *
167find_skill_by_name (object *who, const char *name)
168{
169 if (!name)
170 return 0;
171
172 for (object *tmp = who->inv; tmp; tmp = tmp->below)
173 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
174 && tmp->skill.begins_with (name))
175 if (object *skop = find_skill_by_name (who, tmp->skill))
166 return skill; 176 return skop;
167 }
168 177
169 return 0; 178 return 0;
170} 179}
171 180
172/* This returns the skill pointer of the given name (the 181/* This returns the skill pointer of the given name (the
173 * one that accumlates exp, has the level, etc). 182 * one that accumulates exp, has the level, etc).
174 * 183 *
175 * It is presumed that the player will be needing to actually 184 * It is presumed that the player will be needing to actually
176 * use the skill, so thus if use of the skill requires a skill 185 * use the skill, so thus if use of the skill requires a skill
177 * tool, this code will equip it. 186 * tool, this code will equip it.
178 * 187 *
… …
181 * this replaces find_skill. 190 * this replaces find_skill.
182 */ 191 */
183object * 192object *
184find_skill_by_number (object *who, int skillno) 193find_skill_by_number (object *who, int skillno)
185{ 194{
186 if (!IN_RANGE_EXC (skillno, 1, NUM_SKILLS)) 195 for (object *tmp = who->inv; tmp; tmp = tmp->below)
196 if (tmp->type == SKILL && tmp->subtype == skillno)
197 if (object *skop = find_skill_by_name (who, tmp->skill))
198 return skop;
199
200 return 0;
201}
202
203/* This changes the objects chosen_skill to new_skill.
204 * return 1 on success, 0 on error
205 */
206bool
207object::change_skill (object *new_skill)
208{
209 if (type != PLAYER)
187 return 0; 210 return 0;
188 211
189 object *skill = NULL, *skill_tool = NULL;
190
191 for (object *tmp = who->inv; tmp; tmp = tmp->below)
192 {
193 if (tmp->type == SKILL && tmp->subtype == skillno)
194 skill = tmp;
195
196 /* Try to find appropriate skilltool. If the player has one already
197 * applied, we try to keep using that one.
198 */
199 //TODO: afaics, skill tools have subtype 0 always
200 else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
201 {
202 if (QUERY_FLAG (tmp, FLAG_APPLIED))
203 skill_tool = tmp;
204 else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED))
205 skill_tool = tmp;
206 }
207 }
208
209 /* If this is a skill that can be used without a tool, return it */
210 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
211 return skill;
212
213 /* Player has a tool to use the skill. If not applied, apply it -
214 * if not successful, return null. If they do have the skill tool
215 * but not the skill itself, give it to them.
216 */
217 if (skill_tool)
218 {
219 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
220 {
221 if (apply_special (who, skill_tool, 0))
222 return NULL;
223 }
224
225 if (!skill)
226 {
227 skill = give_skill_by_name (who, skill_tool->skill);
228 link_player_skills (who);
229 }
230
231 return skill;
232 }
233
234 return NULL;
235}
236
237/* This changes the objects skill to new_skill.
238 * note that this function doesn't always need to get used -
239 * you can now add skill exp to the player without the chosen_skill being
240 * set. This function is of most interest to players to update
241 * the various range information.
242 * return 1 on success, 0 on error
243 */
244int
245change_skill (object *who, object *new_skill, int flag)
246{
247 if (who->type != PLAYER)
248 return 0;
249
250#if 0
251 // optimise this supposedly common case 212 // optimise this supposedly common case
252 if (new_skill == who->chosen_skill) 213 if (new_skill == chosen_skill)
253 return 1; 214 return 1;
254#endif
255 215
256 if (!new_skill) 216 if (chosen_skill)
257 {
258 LOG (llevError | logBacktrace, "change_skill called on %s with NULL skill\n",
259 who->debug_desc ());
260 return 0;
261 } 217 {
218 chosen_skill->flag [FLAG_APPLIED] = false;
219 change_abil (this, chosen_skill);
220 }
262 221
263 // the skill could be readied already because it is used by a weapon. 222 chosen_skill = new_skill;
264 who->change_weapon (0);
265 new_skill->inv_splay ();
266 223
267 if (apply_special (who, new_skill, AP_APPLY)) 224 if (chosen_skill)
268 return 0; 225 {
226 chosen_skill->flag [FLAG_APPLIED] = true;
227 change_abil (this, chosen_skill);
228 }
269 229
230 // always clear current weapon, as the selected skill could
231 // conflict with the current weapon skill, which would go
232 // undetected and exp would be given to the wrong skill.
233 current_weapon = 0;
234
235 update_stats ();
270 return 1; 236 return 1;
271}
272
273/* This function just clears the chosen_skill and range_skill values
274 * in the player.
275 */
276void
277clear_skill (object *who)
278{
279 who->chosen_skill = 0;
280 CLEAR_FLAG (who, FLAG_READY_SKILL);
281
282 if (player *pl = who->contr)
283 if (pl->ranged_ob && pl->ranged_ob->type == SKILL)
284 pl->ranged_ob = 0;
285} 237}
286 238
287/* do_skill() - Main skills use function-similar in scope to cast_spell(). 239/* do_skill() - Main skills use function-similar in scope to cast_spell().
288 * We handle all requests for skill use outside of some combat here. 240 * We handle all requests for skill use outside of some combat here.
289 * We require a separate routine outside of fire() so as to allow monsters 241 * We require a separate routine outside of fire() so as to allow monsters
… …
595 /* if skill really is a skill, then we can look at the skill archetype for 547 /* if skill really is a skill, then we can look at the skill archetype for
596 * bse reward value (exp) and level multiplier factor. 548 * bse reward value (exp) and level multiplier factor.
597 */ 549 */
598 if (skill->type == SKILL) 550 if (skill->type == SKILL)
599 { 551 {
600 base += skill->arch->clone.stats.exp; 552 base += skill->arch->stats.exp;
601 if (settings.simple_exp) 553 if (settings.simple_exp)
602 { 554 {
603 if (skill->arch->clone.level) 555 if (skill->arch->level)
604 lvl_mult = (float) skill->arch->clone.level / 100.0; 556 lvl_mult = (float) skill->arch->level / 100.0;
605 else 557 else
606 lvl_mult = 1.0; /* no adjustment */ 558 lvl_mult = 1.0; /* no adjustment */
607 } 559 }
608 else 560 else
609 { 561 {
610 if (skill->level) 562 if (skill->level)
611 lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0); 563 lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
612 else 564 else
613 lvl_mult = 1.0; 565 lvl_mult = 1.0;
614 } 566 }
615 } 567 }
616 else 568 else
… …
641 * player learns the skill, 2 otherwise. 593 * player learns the skill, 2 otherwise.
642 */ 594 */
643int 595int
644learn_skill (object *pl, object *scroll) 596learn_skill (object *pl, object *scroll)
645{ 597{
646 object *tmp;
647
648 if (!scroll->skill) 598 if (!scroll->skill)
649 { 599 {
650 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name); 600 LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
651 return 2; 601 return 2;
652 } 602 }
653 603
654 /* can't use find_skill_by_name because we want skills the player knows 604 object *tmp = find_skill (pl, scroll->skill);
655 * but can't use natively.
656 */
657
658 for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
659 if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
660 break;
661 605
662 /* player already knows it */ 606 /* player already knows it */
663 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 607 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
664 return 0; 608 return 0;
665 609
… …
712 * Note this function is a bit more complicated becauase we 656 * Note this function is a bit more complicated becauase we
713 * we want ot sort the skills before printing them. If we 657 * we want ot sort the skills before printing them. If we
714 * just dumped this as we found it, this would be a bit 658 * just dumped this as we found it, this would be a bit
715 * simpler. 659 * simpler.
716 */ 660 */
717 661//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
718void 662void
719show_skills (object *op, const char *search) 663show_skills (object *op, const char *search)
720{ 664{
721 object *tmp = NULL; 665 object *tmp = NULL;
722 char buf[MAX_BUF]; 666 char buf[MAX_BUF];
… …
724 int i, num_skills_found = 0; 668 int i, num_skills_found = 0;
725 static const char *const periods = "........................................"; 669 static const char *const periods = "........................................";
726 670
727 /* Need to have a pointer and use strdup for qsort to work properly */ 671 /* Need to have a pointer and use strdup for qsort to work properly */
728 char skills[NUM_SKILLS][MAX_BUF]; 672 char skills[NUM_SKILLS][MAX_BUF];
729
730 673
731 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 674 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
732 { 675 {
733 if (tmp->type == SKILL) 676 if (tmp->type == SKILL)
734 { 677 {
… …
737 /* Basically want to fill this out to 40 spaces with periods */ 680 /* Basically want to fill this out to 40 spaces with periods */
738 sprintf (buf, "%s%s", &tmp->name, periods); 681 sprintf (buf, "%s%s", &tmp->name, periods);
739 buf[40] = 0; 682 buf[40] = 0;
740 683
741 if (settings.permanent_exp_ratio) 684 if (settings.permanent_exp_ratio)
742 {
743 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", 685 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
744 buf, tmp->level, tmp->stats.exp, 686 buf, tmp->level, tmp->stats.exp,
745 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp)); 687 level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
746 }
747 else 688 else
748 {
749 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", 689 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
750 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul)); 690 buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
751 } 691
752 /* I don't know why some characters get a bunch of skills, but 692 /* I don't know why some characters get a bunch of skills, but
753 * it sometimes happens (maybe a leftover from bugier earlier code 693 * it sometimes happens (maybe a leftover from bugier earlier code
754 * and those character are still about). In any case, lets handle 694 * and those character are still about). In any case, lets handle
755 * it so it doesn't crash the server - otherwise, one character may 695 * it so it doesn't crash the server - otherwise, one character may
756 * crash the server numerous times. 696 * crash the server numerous times.
… …
762 break; 702 break;
763 } 703 }
764 } 704 }
765 } 705 }
766 706
767 clear_win_info (op);
768 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 707 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");
769 if (num_skills_found > 1) 708 if (num_skills_found > 1)
770 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp); 709 qsort (skills, num_skills_found, MAX_BUF, (int (*)(const void *, const void *)) std::strcmp);
771 710
772 for (i = 0; i < num_skills_found; i++) 711 for (i = 0; i < num_skills_found; i++)
… …
794 size_t len; 733 size_t len;
795 734
796 if (!string) 735 if (!string)
797 return 0; 736 return 0;
798 737
799 for (skop = op->inv; skop != NULL; skop = skop->below) 738 for (skop = op->inv; skop; skop = skop->below)
800 { 739 {
740 if (skop->type == SKILL
801 if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) && 741 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
802 !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 742 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
803 break; 743 break;
744 else if (skop->type == SKILL_TOOL
804 else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 745 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
805 break; 746 break;
806 } 747 }
748
807 if (!skop) 749 if (!skop)
808 { 750 {
809 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 751 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);
810 return 0; 752 return 0;
811 } 753 }
… …
816 * options given to the skill. Its pretty simple - if there 758 * options given to the skill. Its pretty simple - if there
817 * are extra parameters (as deteremined by string length), we 759 * are extra parameters (as deteremined by string length), we
818 * want to skip over any leading spaces. 760 * want to skip over any leading spaces.
819 */ 761 */
820 if (len >= strlen (string)) 762 if (len >= strlen (string))
821 {
822 string = NULL; 763 string = NULL;
823 }
824 else 764 else
825 { 765 {
826 string += len; 766 string += len;
827 while (*string == 0x20) 767 while (*string == 0x20)
828 string++; 768 string++;
769
829 if (strlen (string) == 0) 770 if (strlen (string) == 0)
830 string = NULL; 771 string = NULL;
831 } 772 }
832 773
833#ifdef SKILL_UTIL_DEBUG 774#ifdef SKILL_UTIL_DEBUG
834 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none"); 775 LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
835#endif 776#endif
836 777
837 /* Change to the new skill, then execute it. */
838 if (do_skill (op, op, skop, op->facing, string)) 778 if (do_skill (op, op, skop, op->facing, string))
839 return 1; 779 return 1;
840 780
841 return 0; 781 return 0;
842} 782}
… …
889 for (tmp = op->inv; tmp; tmp = tmp->below) 829 for (tmp = op->inv; tmp; tmp = tmp->below)
890 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) 830 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
891 break; 831 break;
892 832
893 if (!tmp) 833 if (!tmp)
894 {
895 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 834 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
896 return 0;
897 }
898 835
899 change_skill (op, find_skill_by_name (op, tmp->skill), 1); 836 pl->combat_ob = tmp;
900 } 837 }
901 else 838
839 if (!pl->combat_ob)
902 { 840 {
903 if (!skill) 841 if (!skill)
904 { 842 {
905 /* See if the players chosen skill is a combat skill, and use 843 /* See if the players chosen skill is a combat skill, and use
906 * it if appropriate. 844 * it if appropriate.
… …
910 else 848 else
911 { 849 {
912 skill = find_player_hth_skill (op); 850 skill = find_player_hth_skill (op);
913 851
914 if (!skill) 852 if (!skill)
915 {
916 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 853 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
917 return 0;
918 }
919 } 854 }
920 } 855 }
921 856
922 /* now try to ready the new skill */ 857 if (skill)
923 if (!change_skill (op, skill, 0)) 858 {
924 { /* oh oh, trouble! */ 859 op->change_skill (0);
925 new_draw_info_format (NDI_UNIQUE, 0, op, "Couldn't change to skill %s", &skill->name); 860 apply_special (op, skill, AP_APPLY);
926 return 0;
927 } 861 }
928 } 862 }
929 863
930 if (!pl->combat_ob) 864 if (!pl->combat_ob)
931 { 865 {
… …
1077 1011
1078 return 0; 1012 return 0;
1079 } 1013 }
1080 1014
1081 return skill_attack (NULL, op, dir, string, skill); 1015 return skill_attack (NULL, op, dir, string, skill);
1082
1083} 1016}
1017

Diff Legend

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