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.42 by root, Sat May 12 08:36:35 2007 UTC vs.
Revision 1.59 by root, Thu Nov 8 19:43:28 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
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 {
156 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
157 if (apply_special (who, skill_tool, 0))
158 return 0;
159 152
160 if (!skill) 153 if (!skill)
161 { 154 {
162 skill = give_skill_by_name (who, skill_tool->skill); 155 skill = give_skill_by_name (who, skill_tool->skill);
163 link_player_skills (who); 156 link_player_skills (who);
164 } 157 }
165 158
159 if (!skill_tool->flag [FLAG_APPLIED])
160 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY))
166 return skill; 161 return 0;
167 } 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))
176 return skop;
168 177
169 return 0; 178 return 0;
170} 179}
171 180
172
173/* This returns the skill pointer of the given name (the 181/* This returns the skill pointer of the given name (the
174 * one that accumlates exp, has the level, etc). 182 * one that accumulates exp, has the level, etc).
175 * 183 *
176 * It is presumed that the player will be needing to actually 184 * It is presumed that the player will be needing to actually
177 * 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
178 * tool, this code will equip it. 186 * tool, this code will equip it.
179 * 187 *
… …
182 * this replaces find_skill. 190 * this replaces find_skill.
183 */ 191 */
184object * 192object *
185find_skill_by_number (object *who, int skillno) 193find_skill_by_number (object *who, int skillno)
186{ 194{
187 object *skill = NULL, *skill_tool = NULL, *tmp;
188
189 if (skillno < 1 || skillno >= NUM_SKILLS)
190 return NULL;
191
192 for (tmp = who->inv; tmp != NULL; tmp = tmp->below) 195 for (object *tmp = who->inv; tmp; tmp = tmp->below)
193 {
194 if (tmp->type == SKILL && tmp->subtype == skillno) 196 if (tmp->type == SKILL && tmp->subtype == skillno)
195 skill = tmp; 197 if (object *skop = find_skill_by_name (who, tmp->skill))
196
197 /* Try to find appropriate skilltool. If the player has one already
198 * applied, we try to keep using that one.
199 */
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 /* If this is a skill that can be used without a tool, return it */
209 if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
210 return skill;
211
212 /* Player has a tool to use the skill. IF not applied, apply it -
213 * if not successful, return null. If they do have the skill tool
214 * but not the skill itself, give it to them.
215 */
216 if (skill_tool)
217 {
218 if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
219 {
220 if (apply_special (who, skill_tool, 0))
221 return NULL;
222 }
223
224 if (!skill)
225 {
226 skill = give_skill_by_name (who, skill_tool->skill);
227 link_player_skills (who);
228 }
229
230 return skill; 198 return skop;
231 }
232 199
233 return NULL; 200 return 0;
234} 201}
235 202
236/* This changes the objects skill to new_skill. 203/* This changes the objects chosen_skill to new_skill.
237 * note that this function doesn't always need to get used -
238 * you can now add skill exp to the player without the chosen_skill being
239 * set. This function is of most interest to players to update
240 * the various range information.
241 * return 1 on success, 0 on error 204 * return 1 on success, 0 on error
242 */ 205 */
243int 206bool
244change_skill (object *who, object *new_skill, int flag) 207object::change_skill (object *new_skill)
245{ 208{
246 if (who->type != PLAYER) 209 if (type != PLAYER)
247 return 0; 210 return 0;
248 211
249 // optimise this supposedly common case 212 // optimise this supposedly common case
250 if (new_skill == who->chosen_skill) 213 if (new_skill == chosen_skill)
251 return 1; 214 return 1;
252 215
253 if (who->chosen_skill) 216 if (chosen_skill)
254 {
255 apply_special (who, who->chosen_skill, AP_UNAPPLY);
256 who->chosen_skill = 0;//D verify wether necessary
257 } 217 {
258 218 chosen_skill->flag [FLAG_APPLIED] = false;
259 if (!new_skill) 219 change_abil (this, chosen_skill);
260 { 220 }
261 LOG (llevError | logBacktrace, "change_skill called on %s with NULL skill\n", 221
262 who->debug_desc ()); 222 chosen_skill = new_skill;
263 return 0; 223
224 if (chosen_skill)
264 } 225 {
226 chosen_skill->flag [FLAG_APPLIED] = true;
227 change_abil (this, chosen_skill);
228 }
265 229
266 player *pl = who->contr; 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;
267 234
268 // move skill to front, so it will be prefered next time 235 update_stats ();
269 new_skill->remove ();
270 who->insert (new_skill);
271
272 if (apply_special (who, new_skill, AP_APPLY))
273 return 0;
274
275 return 1; 236 return 1;
276}
277
278/* This function just clears the chosen_skill and range_skill values
279 * in the player.
280 */
281void
282clear_skill (object *who)
283{
284 who->chosen_skill = 0;
285 CLEAR_FLAG (who, FLAG_READY_SKILL);
286
287 if (who->type == PLAYER)
288 if (who->contr->ranged_ob && who->contr->ranged_ob->type == SKILL)
289 who->contr->ranged_ob = 0;
290} 237}
291 238
292/* 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().
293 * 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.
294 * 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
… …
302int 249int
303do_skill (object *op, object *part, object *skill, int dir, const char *string) 250do_skill (object *op, object *part, object *skill, int dir, const char *string)
304{ 251{
305 int success = 0, exp = 0; 252 int success = 0, exp = 0;
306 int did_alc = 0; 253 int did_alc = 0;
307 object *tmp, *next;
308 254
309 if (!skill) 255 if (!skill)
310 return 0; 256 return 0;
311 257
312 /* The code below presumes that the skill points to the object that 258 /* The code below presumes that the skill points to the object that
… …
314 * go and try to find the actual real skill pointer, and if the 260 * go and try to find the actual real skill pointer, and if the
315 * the player doesn't have a bucket for that, create one. 261 * the player doesn't have a bucket for that, create one.
316 */ 262 */
317 if (skill->type != SKILL && op->type == PLAYER) 263 if (skill->type != SKILL && op->type == PLAYER)
318 { 264 {
319 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 265 for (object *tmp = op->inv; tmp; tmp = tmp->below)
320 if (tmp->type == SKILL && tmp->skill == skill->skill) 266 if (tmp->type == SKILL && tmp->skill == skill->skill)
321 break; 267 {
268 skill = tmp;
269 goto found;
270 }
322 271
323 if (!tmp)
324 tmp = give_skill_by_name (op, skill->skill); 272 skill = give_skill_by_name (op, skill->skill);
325 273found: ;
326 skill = tmp;
327 } 274 }
328 275
329 // skill, by_whom, on_which_object, which direction, skill_argument 276 // skill, by_whom, on_which_object, which direction, skill_argument
330 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string))) 277 if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
331 return 0; 278 return 0;
… …
436 case SK_LITERACY: 383 case SK_LITERACY:
437 case SK_WOODSMAN: 384 case SK_WOODSMAN:
438 /* first, we try to find a cauldron, and do the alchemy thing. 385 /* first, we try to find a cauldron, and do the alchemy thing.
439 * failing that, we go and identify stuff. 386 * failing that, we go and identify stuff.
440 */ 387 */
441 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next) 388 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
442 { 389 {
443 next = tmp->above; 390 next = tmp->above;
444 391
445 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 392 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
446 { 393 {
… …
507 * If certain skills should take more/less time, that should be 454 * If certain skills should take more/less time, that should be
508 * in the code for the skill itself. 455 * in the code for the skill itself.
509 */ 456 */
510 457
511 if (op->type == PLAYER) 458 if (op->type == PLAYER)
512 op->speed_left -= 1.0; 459 op->speed_left -= 1.f;
513 460
514 /* this is a good place to add experience for successfull use of skills. 461 /* this is a good place to add experience for successfull use of skills.
515 * Note that add_exp() will figure out player/monster experience 462 * Note that add_exp() will figure out player/monster experience
516 * gain problems. 463 * gain problems.
517 */ 464 */
… …
600 /* 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
601 * bse reward value (exp) and level multiplier factor. 548 * bse reward value (exp) and level multiplier factor.
602 */ 549 */
603 if (skill->type == SKILL) 550 if (skill->type == SKILL)
604 { 551 {
605 base += skill->arch->clone.stats.exp; 552 base += skill->arch->stats.exp;
606 if (settings.simple_exp) 553 if (settings.simple_exp)
607 { 554 {
608 if (skill->arch->clone.level) 555 if (skill->arch->level)
609 lvl_mult = (float) skill->arch->clone.level / 100.0; 556 lvl_mult = (float) skill->arch->level / 100.0;
610 else 557 else
611 lvl_mult = 1.0; /* no adjustment */ 558 lvl_mult = 1.0; /* no adjustment */
612 } 559 }
613 else 560 else
614 { 561 {
615 if (skill->level) 562 if (skill->level)
616 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);
617 else 564 else
618 lvl_mult = 1.0; 565 lvl_mult = 1.0;
619 } 566 }
620 } 567 }
621 else 568 else
… …
646 * player learns the skill, 2 otherwise. 593 * player learns the skill, 2 otherwise.
647 */ 594 */
648int 595int
649learn_skill (object *pl, object *scroll) 596learn_skill (object *pl, object *scroll)
650{ 597{
651 object *tmp;
652
653 if (!scroll->skill) 598 if (!scroll->skill)
654 { 599 {
655 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);
656 return 2; 601 return 2;
657 } 602 }
658 603
659 /* can't use find_skill_by_name because we want skills the player knows 604 object *tmp = find_skill (pl, scroll->skill);
660 * but can't use natively.
661 */
662
663 for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
664 if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
665 break;
666 605
667 /* player already knows it */ 606 /* player already knows it */
668 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 607 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
669 return 0; 608 return 0;
670 609
… …
717 * Note this function is a bit more complicated becauase we 656 * Note this function is a bit more complicated becauase we
718 * we want ot sort the skills before printing them. If we 657 * we want ot sort the skills before printing them. If we
719 * 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
720 * simpler. 659 * simpler.
721 */ 660 */
722 661//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
723void 662void
724show_skills (object *op, const char *search) 663show_skills (object *op, const char *search)
725{ 664{
726 object *tmp = NULL; 665 object *tmp = NULL;
727 char buf[MAX_BUF]; 666 char buf[MAX_BUF];
… …
729 int i, num_skills_found = 0; 668 int i, num_skills_found = 0;
730 static const char *const periods = "........................................"; 669 static const char *const periods = "........................................";
731 670
732 /* 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 */
733 char skills[NUM_SKILLS][MAX_BUF]; 672 char skills[NUM_SKILLS][MAX_BUF];
734
735 673
736 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 674 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
737 { 675 {
738 if (tmp->type == SKILL) 676 if (tmp->type == SKILL)
739 { 677 {
… …
742 /* Basically want to fill this out to 40 spaces with periods */ 680 /* Basically want to fill this out to 40 spaces with periods */
743 sprintf (buf, "%s%s", &tmp->name, periods); 681 sprintf (buf, "%s%s", &tmp->name, periods);
744 buf[40] = 0; 682 buf[40] = 0;
745 683
746 if (settings.permanent_exp_ratio) 684 if (settings.permanent_exp_ratio)
747 {
748 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)", 685 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
749 buf, tmp->level, tmp->stats.exp, 686 buf, tmp->level, tmp->stats.exp,
750 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));
751 }
752 else 688 else
753 {
754 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")", 689 sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
755 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));
756 } 691
757 /* 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
758 * it sometimes happens (maybe a leftover from bugier earlier code 693 * it sometimes happens (maybe a leftover from bugier earlier code
759 * and those character are still about). In any case, lets handle 694 * and those character are still about). In any case, lets handle
760 * 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
761 * crash the server numerous times. 696 * crash the server numerous times.
… …
767 break; 702 break;
768 } 703 }
769 } 704 }
770 } 705 }
771 706
772 clear_win_info (op);
773 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:"); 707 new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");
774 if (num_skills_found > 1) 708 if (num_skills_found > 1)
775 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);
776 710
777 for (i = 0; i < num_skills_found; i++) 711 for (i = 0; i < num_skills_found; i++)
… …
799 size_t len; 733 size_t len;
800 734
801 if (!string) 735 if (!string)
802 return 0; 736 return 0;
803 737
804 for (skop = op->inv; skop != NULL; skop = skop->below) 738 for (skop = op->inv; skop; skop = skop->below)
805 { 739 {
740 if (skop->type == SKILL
806 if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) && 741 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
807 !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))))
808 break; 743 break;
744 else if (skop->type == SKILL_TOOL
809 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))))
810 break; 746 break;
811 } 747 }
748
812 if (!skop) 749 if (!skop)
813 { 750 {
814 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);
815 return 0; 752 return 0;
816 } 753 }
… …
821 * options given to the skill. Its pretty simple - if there 758 * options given to the skill. Its pretty simple - if there
822 * are extra parameters (as deteremined by string length), we 759 * are extra parameters (as deteremined by string length), we
823 * want to skip over any leading spaces. 760 * want to skip over any leading spaces.
824 */ 761 */
825 if (len >= strlen (string)) 762 if (len >= strlen (string))
826 {
827 string = NULL; 763 string = NULL;
828 }
829 else 764 else
830 { 765 {
831 string += len; 766 string += len;
832 while (*string == 0x20) 767 while (*string == 0x20)
833 string++; 768 string++;
769
834 if (strlen (string) == 0) 770 if (strlen (string) == 0)
835 string = NULL; 771 string = NULL;
836 } 772 }
837 773
838#ifdef SKILL_UTIL_DEBUG 774#ifdef SKILL_UTIL_DEBUG
839 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");
840#endif 776#endif
841 777
842 /* Change to the new skill, then execute it. */
843 if (do_skill (op, op, skop, op->facing, string)) 778 if (do_skill (op, op, skop, op->facing, string))
844 return 1; 779 return 1;
845 780
846 return 0; 781 return 0;
847} 782}
… …
894 for (tmp = op->inv; tmp; tmp = tmp->below) 829 for (tmp = op->inv; tmp; tmp = tmp->below)
895 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) 830 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
896 break; 831 break;
897 832
898 if (!tmp) 833 if (!tmp)
899 {
900 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);
901 return 0;
902 }
903 835
904 change_skill (op, find_skill_by_name (op, tmp->skill), 1); 836 pl->combat_ob = tmp;
905 } 837 }
906 else 838
839 if (!pl->combat_ob)
907 { 840 {
908 if (!skill) 841 if (!skill)
909 { 842 {
910 /* 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
911 * it if appropriate. 844 * it if appropriate.
… …
915 else 848 else
916 { 849 {
917 skill = find_player_hth_skill (op); 850 skill = find_player_hth_skill (op);
918 851
919 if (!skill) 852 if (!skill)
920 {
921 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!");
922 return 0;
923 }
924 } 854 }
925 } 855 }
926 856
927 /* now try to ready the new skill */ 857 if (skill)
928 if (!change_skill (op, skill, 0)) 858 {
929 { /* oh oh, trouble! */ 859 op->change_skill (0);
930 new_draw_info_format (NDI_UNIQUE, 0, op, "Couldn't change to skill %s", &skill->name); 860 apply_special (op, skill, AP_APPLY);
931 return 0;
932 } 861 }
933 } 862 }
934 863
935 if (!pl->combat_ob) 864 if (!pl->combat_ob)
936 { 865 {
937 LOG (llevError, "Could not find anything to attack on %s\n", &op->name); 866 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
938 return 0; 867 return 0;
939 } 868 }
940 } 869 }
941 870
942 op->set_weapon (pl->combat_ob); 871 if (!op->change_weapon (pl->combat_ob))
872 return 0;
943 873
944 /* lose invisiblity/hiding status for running attacks */ 874 /* lose invisiblity/hiding status for running attacks */
945 if (pl->tmp_invis) 875 if (pl->tmp_invis)
946 { 876 {
947 pl->tmp_invis = 0; 877 pl->tmp_invis = 0;
… …
1081 1011
1082 return 0; 1012 return 0;
1083 } 1013 }
1084 1014
1085 return skill_attack (NULL, op, dir, string, skill); 1015 return skill_attack (NULL, op, dir, string, skill);
1086
1087} 1016}
1017

Diff Legend

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