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.86 by root, Sat Apr 3 22:30:21 2010 UTC vs.
Revision 1.93 by root, Sat Apr 10 05:12:57 2010 UTC

… …
168 168
169 if (!skill) 169 if (!skill)
170 skill = give_skill_by_name (who, skill_tool->skill); 170 skill = give_skill_by_name (who, skill_tool->skill);
171 171
172 if (!skill_tool->flag [FLAG_APPLIED]) 172 if (!skill_tool->flag [FLAG_APPLIED])
173 if (apply_special (who, splay (skill_tool), AP_APPLY)) 173 if (!who->apply (splay (skill_tool)))
174 return 0; 174 return 0;
175 175
176 return splay (skill); 176 return splay (skill);
177} 177}
178 178
179object * 179object *
180find_skill_by_name_fuzzy (object *who, const char *name) 180find_skill_by_name_fuzzy (object *who, const char *name)
181{ 181{
182 if (!name) 182 if (name)
183 return 0;
184
185 for (object *tmp = who->inv; tmp; tmp = tmp->below) 183 for (object *tmp = who->inv; tmp; tmp = tmp->below)
186 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) 184 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
187 && tmp->skill.starts_with (name)) 185 && tmp->skill.starts_with (name))
188 if (object *skop = find_skill_by_name (who, tmp->skill)) 186 if (object *skop = find_skill_by_name (who, tmp->skill))
189 return skop; 187 return skop;
190 188
191 return 0; 189 return 0;
192} 190}
193 191
194/* This returns the skill pointer of the given name (the 192/* This returns the skill pointer of the given name (the
… …
209 if (tmp->type == SKILL && tmp->subtype == skillno) 207 if (tmp->type == SKILL && tmp->subtype == skillno)
210 if (object *skop = find_skill_by_name (who, tmp->skill)) 208 if (object *skop = find_skill_by_name (who, tmp->skill))
211 return skop; 209 return skop;
212 210
213 return 0; 211 return 0;
214}
215
216/* This changes the objects chosen_skill to new_skill.
217 * return 1 on success, 0 on error
218 */
219bool
220object::change_skill (object *new_skill)
221{
222 if (type != PLAYER)
223 return 0;
224
225 // optimise this supposedly common case
226 if (new_skill == chosen_skill)
227 return 1;
228
229 if (chosen_skill)
230 {
231 chosen_skill->flag [FLAG_APPLIED] = false;
232 change_abil (this, chosen_skill);
233 }
234
235 chosen_skill = new_skill;
236
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;
250} 212}
251 213
252/* do_skill() - Main skills use function-similar in scope to cast_spell(). 214/* 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. 215 * 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 216 * We require a separate routine outside of fire() so as to allow monsters
… …
408 { 370 {
409 found_cauldron = true; 371 found_cauldron = true;
410 372
411 if (tmp->skill != skill->skill) 373 if (tmp->skill != skill->skill)
412 { 374 {
413 op->failmsg (format ("You can't use the %s with the %s skill!", 375 op->failmsgf ("You can't use the %s with the %s skill!",
414 query_name (tmp), 376 query_name (tmp),
415 query_name (skill))); 377 query_name (skill));
416 break; 378 break;
417 } 379 }
418 380
419 attempt_do_alchemy (op, tmp, skill); 381 attempt_do_alchemy (op, tmp, skill);
420 382
… …
768 730
769 if (!string) 731 if (!string)
770 return 0; 732 return 0;
771 733
772 for (skop = op->inv; skop; skop = skop->below) 734 for (skop = op->inv; skop; skop = skop->below)
773 { 735 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
774 if (skop->type == SKILL
775 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
776 && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill)))) 736 && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
737 {
738 skop = find_skill_by_name (op, skop->skill);
777 break; 739 break;
778 else if (skop->type == SKILL_TOOL
779 && !strncasecmp (string, skop->skill, min (strlen (string), (size_t) strlen (skop->skill))))
780 break;
781 } 740 }
782 741
783 if (!skop) 742 if (!skop)
784 { 743 {
785 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 744 op->failmsgf ("Unable to find skill %s.", string);
745 return 0;
746 }
747
748 if (!(skill_flags [skop->subtype] & SF_USE))
749 {
750 op->failmsgf (
751 "You feel as if you wanted to do something funny, but you can't remember what. "
752 "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
753 "use it with some item, or it's always active.>",
754 &skop->skill
755 );
786 return 0; 756 return 0;
787 } 757 }
788 758
789 len = strlen (skop->skill); 759 len = strlen (skop->skill);
790 760
… …
855 * through that code if skill is set to change to the skill. 825 * through that code if skill is set to change to the skill.
856 */ 826 */
857 if (player *pl = op->contr) 827 if (player *pl = op->contr)
858 { 828 {
859 if (skill) 829 if (skill)
860 op->change_skill (skill); 830 {
831 if (!op->apply (skill))
832 return 0;
833 }
861 else 834 else
862 { 835 {
863 if (!pl->combat_ob) 836 if (!pl->combat_ob)
864 { 837 {
865 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 838 if (QUERY_FLAG (op, FLAG_READY_WEAPON))

Diff Legend

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