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.65 by root, Mon Sep 22 05:45:55 2008 UTC vs.
Revision 1.95 by root, Tue Apr 13 03:44:21 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* Created July 95 to separate skill utilities from actual skills -b.t. */ 25/* Created July 95 to separate skill utilities from actual skills -b.t. */
… …
58/* init_skills basically just sets up the skill_names table 59/* init_skills basically just sets up the skill_names table
59 * above. The index into the array is set up by the 60 * above. The index into the array is set up by the
60 * subtypes. 61 * subtypes.
61 */ 62 */
62void 63void
63init_skills (void) 64init_skills ()
64{ 65{
65 for_all_archetypes (at) 66 for_all_archetypes (at)
66 if (at->type == SKILL) 67 if (at->type == SKILL)
67 { 68 {
68 if (skill_names[at->subtype]) 69 if (skill_names[at->subtype])
… …
84 * up the last_skills[] array in the player object. 85 * up the last_skills[] array in the player object.
85 * the last_skills[] is used to more quickly lookup skills - 86 * the last_skills[] is used to more quickly lookup skills -
86 * mostly used for sending exp. 87 * mostly used for sending exp.
87 */ 88 */
88void 89void
89link_player_skills (object *op) 90player::link_skills ()
90{ 91{
92 for (int i = 0; i < NUM_SKILLS; ++i)
93 last_skill_ob [i] = 0;
94
91 for (object *tmp = op->inv; tmp; tmp = tmp->below) 95 for (object *tmp = ob->inv; tmp; tmp = tmp->below)
92 if (tmp->type == SKILL) 96 if (tmp->type == SKILL)
93 { 97 {
94 /* This is really a warning, hence no else below */ 98 assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS));
95 if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp)
96 LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
97 &op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill);
98 99
99 if (tmp->subtype >= NUM_SKILLS) 100 if (last_skill_ob [tmp->subtype] != tmp)
100 LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);
101 else
102 { 101 {
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
103 op->contr->last_skill_ob[tmp->subtype] = tmp; 107 last_skill_ob [tmp->subtype] = tmp;
104 op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go 108 if (ns)
109 ns->last_skill_exp [tmp->subtype] = -1;
105 } 110 }
106 } 111 }
107} 112}
108 113
109static object * 114static object *
110find_skill (object *who, const shstr &sh) 115find_skill (object *who, shstr_cmp name)
111{ 116{
117 if (who->chosen_skill
118 && who->chosen_skill->skill == name
119 && who->chosen_skill->type == SKILL)
120 return who->chosen_skill;
121
112 for (object *tmp = who->inv; tmp; tmp = tmp->below) 122 for (object *tmp = who->inv; tmp; tmp = tmp->below)
113 if (tmp->skill == sh && tmp->type == SKILL) 123 if (tmp->skill == name && tmp->type == SKILL)
114 return tmp; 124 return splay (tmp);
115 125
116 return 0; 126 return 0;
127}
128
129object *
130player::find_skill (shstr_cmp name) const
131{
132 // might want to use last_skill_obj at one point, or maybe not
133 return ::find_skill (ob, name);
117} 134}
118 135
119/* This returns the skill pointer of the given name (the 136/* This returns the skill pointer of the given name (the
120 * one that accumulates exp, has the level, etc). 137 * one that accumulates exp, has the level, etc).
121 * 138 *
122 * It is presumed that the player will be needing to actually 139 * It is presumed that the player will be needing to actually
123 * use the skill, so thus if use of the skill requires a skill 140 * use the skill, so thus if use of the skill requires a skill
124 * tool, this code will equip it. 141 * tool, this code will equip it.
125 */ 142 */
126object * 143object *
127find_skill_by_name (object *who, const shstr &sh) 144find_skill_by_name (object *who, shstr_cmp sh)
128{ 145{
129 object *skill_tool = 0; 146 object *skill_tool = 0;
130 147
131 for (object *tmp = who->inv; tmp; tmp = tmp->below) 148 for (object *tmp = who->inv; tmp; tmp = tmp->below)
132 if (tmp->skill == sh) 149 if (tmp->skill == sh)
… …
146 163
147 /* Player has a tool to use the skill. If not applied, apply it - 164 /* Player has a tool to use the skill. If not applied, apply it -
148 * if not successful, return null. If they do have the skill tool 165 * if not successful, return null. If they do have the skill tool
149 * but not the skill itself, give it to them. 166 * but not the skill itself, give it to them.
150 */ 167 */
151 object *skill = find_skill (who, skill_tool->skill); 168 object *skill = who->give_skill (skill_tool->skill);
152
153 if (!skill)
154 {
155 skill = give_skill_by_name (who, skill_tool->skill);
156 link_player_skills (who);
157 }
158 169
159 if (!skill_tool->flag [FLAG_APPLIED]) 170 if (!skill_tool->flag [FLAG_APPLIED])
160 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY)) 171 if (!who->apply (splay (skill_tool)))
161 return 0; 172 return 0;
162 173
163 return splay (skill); 174 return splay (skill);
164} 175}
165 176
166object * 177object *
167find_skill_by_name (object *who, const char *name) 178find_skill_by_name_fuzzy (object *who, const char *name)
168{ 179{
169 if (!name) 180 if (name)
170 return 0;
171
172 for (object *tmp = who->inv; tmp; tmp = tmp->below) 181 for (object *tmp = who->inv; tmp; tmp = tmp->below)
173 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) 182 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
174 && tmp->skill.begins_with (name)) 183 && tmp->skill.starts_with (name))
175 if (object *skop = find_skill_by_name (who, tmp->skill)) 184 if (object *skop = find_skill_by_name (who, tmp->skill))
176 return skop; 185 return skop;
177 186
178 return 0; 187 return 0;
179} 188}
180 189
181/* This returns the skill pointer of the given name (the 190/* This returns the skill pointer of the given name (the
… …
198 return skop; 207 return skop;
199 208
200 return 0; 209 return 0;
201} 210}
202 211
203/* This changes the objects chosen_skill to new_skill. 212object *
204 * return 1 on success, 0 on error 213object::give_skill (shstr_cmp name, bool can_use)
205 */
206bool
207object::change_skill (object *new_skill)
208{ 214{
209 if (type != PLAYER) 215 object *skill = find_skill (this, name);
210 return 0;
211 216
212 // optimise this supposedly common case
213 if (new_skill == chosen_skill)
214 return 1;
215
216 if (chosen_skill) 217 if (!skill)
217 { 218 skill = give_skill_by_name (this, name);
218 chosen_skill->flag [FLAG_APPLIED] = false;
219 change_abil (this, chosen_skill);
220 }
221 219
222 chosen_skill = new_skill; 220 if (skill && can_use)
221 skill->flag [FLAG_CAN_USE_SKILL] = true;
223 222
224 if (chosen_skill)
225 {
226 chosen_skill->flag [FLAG_APPLIED] = true;
227 change_abil (this, chosen_skill);
228 }
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 ();
236 return 1; 223 return skill;
237} 224}
238 225
239/* do_skill() - Main skills use function-similar in scope to cast_spell(). 226/* do_skill() - Main skills use function-similar in scope to cast_spell().
240 * We handle all requests for skill use outside of some combat here. 227 * We handle all requests for skill use outside of some combat here.
241 * We require a separate routine outside of fire() so as to allow monsters 228 * We require a separate routine outside of fire() so as to allow monsters
… …
248 */ 235 */
249int 236int
250do_skill (object *op, object *part, object *skill, int dir, const char *string) 237do_skill (object *op, object *part, object *skill, int dir, const char *string)
251{ 238{
252 int success = 0, exp = 0; 239 int success = 0, exp = 0;
253 int did_alc = 0;
254 240
255 if (!skill) 241 if (!skill)
256 return 0; 242 return 0;
257 243
258 /* The code below presumes that the skill points to the object that 244 /* The code below presumes that the skill points to the object that
… …
283 /* Not 100% sure if this will work with new movement code - 269 /* Not 100% sure if this will work with new movement code -
284 * the levitation skill has move_type for flying, so when 270 * the levitation skill has move_type for flying, so when
285 * equipped, that should transfer to player, when not, 271 * equipped, that should transfer to player, when not,
286 * shouldn't. 272 * shouldn't.
287 */ 273 */
288 if (QUERY_FLAG (skill, FLAG_APPLIED)) 274 if (skill->flag [FLAG_APPLIED])
289 { 275 {
290 CLEAR_FLAG (skill, FLAG_APPLIED); 276 skill->clr_flag (FLAG_APPLIED);
291 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 277 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
292 } 278 }
293 else 279 else
294 { 280 {
295 SET_FLAG (skill, FLAG_APPLIED); 281 skill->set_flag (FLAG_APPLIED);
296 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); 282 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
297 } 283 }
298 284
299 op->update_stats (); 285 op->update_stats ();
300 success = 1; 286 success = 1;
… …
383 case SK_LITERACY: 369 case SK_LITERACY:
384 case SK_WOODSMAN: 370 case SK_WOODSMAN:
385 /* first, we try to find a cauldron, and do the alchemy thing. 371 /* first, we try to find a cauldron, and do the alchemy thing.
386 * failing that, we go and identify stuff. 372 * failing that, we go and identify stuff.
387 */ 373 */
374 {
375 bool found_cauldron = false;
376
388 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) 377 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
389 { 378 {
390 next = tmp->above; 379 next = tmp->above;
391 380
392 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 381 if (tmp->flag [FLAG_IS_CAULDRON])
393 { 382 {
383 found_cauldron = true;
384
385 if (tmp->skill != skill->skill)
386 {
387 op->failmsgf ("You can't use the %s with the %s skill!",
388 query_name (tmp),
389 query_name (skill));
390 break;
391 }
392
394 attempt_do_alchemy (op, tmp); 393 attempt_do_alchemy (op, tmp, skill);
395 394
396 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 395 if (tmp->flag [FLAG_APPLIED])
397 esrv_send_inventory (op, tmp); 396 esrv_send_inventory (op, tmp);
398
399 did_alc = 1;
400 } 397 }
401 } 398 }
402 399
403 if (did_alc == 0) 400 if (!found_cauldron)
404 exp = success = skill_ident (op, skill); 401 exp = success = skill_ident (op, skill);
405 402 }
406 break; 403 break;
407 404
408 case SK_DET_MAGIC: 405 case SK_DET_MAGIC:
409 case SK_DET_CURSE: 406 case SK_DET_CURSE:
410 exp = success = skill_ident (op, skill); 407 exp = success = skill_ident (op, skill);
… …
439 case SK_EVOCATION: 436 case SK_EVOCATION:
440 case SK_PYROMANCY: 437 case SK_PYROMANCY:
441 case SK_SUMMONING: 438 case SK_SUMMONING:
442 case SK_CLIMBING: 439 case SK_CLIMBING:
443 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 440 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
441 break;
442
443 case SK_MINING:
444 success = skill_mining (op, part, skill, dir, string);
445 break;
446
447 case SK_FISHING:
448 success = skill_fishing (op, part, skill, dir, string);
444 break; 449 break;
445 450
446 default: 451 default:
447 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 452 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
448 break; 453 break;
… …
524 } 529 }
525 else 530 else
526 { /* all other items/living creatures */ 531 { /* all other items/living creatures */
527 op_exp = op->stats.exp; 532 op_exp = op->stats.exp;
528 op_lvl = op->level; 533 op_lvl = op->level;
529 if (!QUERY_FLAG (op, FLAG_ALIVE)) 534 if (!op->flag [FLAG_ALIVE])
530 op_lvl += 5 * abs (op->magic); /* for ident/make items */ 535 op_lvl += 5 * abs (op->magic); /* for ident/make items */
531 } 536 }
532 537
533 if (op_lvl < 1) 538 if (op_lvl < 1)
534 op_lvl = 1; 539 op_lvl = 1;
… …
598 } 603 }
599 604
600 object *tmp = find_skill (pl, scroll->skill); 605 object *tmp = find_skill (pl, scroll->skill);
601 606
602 /* player already knows it */ 607 /* player already knows it */
603 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 608 if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
604 return 0; 609 return 0;
605 610
606 /* now a random change to learn, based on player Int. 611 /* now a random change to learn, based on player Int.
607 * give bonus based on level - otherwise stupid characters 612 * give bonus based on level - otherwise stupid characters
608 * might never be able to learn anything. 613 * might never be able to learn anything.
… …
617 { 622 {
618 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 623 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
619 return 2; 624 return 2;
620 } 625 }
621 626
622 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 627 tmp->set_flag (FLAG_CAN_USE_SKILL);
623 link_player_skills (pl); 628
624 return 1; 629 return 1;
625} 630}
626 631
627/* Gives a percentage clipped to 0% -> 100% of a/b. */ 632/* Gives a percentage clipped to 0% -> 100% of a/b. */
628/* Probably belongs in some global utils-type file? */ 633/* Probably belongs in some global utils-type file? */
… …
654 * just dumped this as we found it, this would be a bit 659 * just dumped this as we found it, this would be a bit
655 * simpler. 660 * simpler.
656 */ 661 */
657//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo. 662//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
658void 663void
659show_skills (object *op, const char *search) 664show_skills (object *pl, const char *search)
660{ 665{
661 const char *cp; 666 const char *cp;
662 int i, num_skills_found = 0; 667 int i, num_skills_found = 0;
663 const char *const periods = ".............................."; // 30 668 const char *const periods = ".............................."; // 30
664 669
665 /* Need to have a pointer and use strdup for qsort to work properly */ 670 /* Need to have a pointer and use strdup for qsort to work properly */
666 char skills[NUM_SKILLS][128]; // d'oh 671 char skills[NUM_SKILLS][128]; // d'oh
667 672
673 object *op = pl->contr->ob;
674
668 for (object *tmp = op->inv; tmp; tmp = tmp->below) 675 for (object *tmp = op->inv; tmp; tmp = tmp->below)
669 { 676 {
670 if (tmp->type == SKILL) 677 if (tmp->type == SKILL)
671 { 678 {
672 if (search && !strstr (tmp->name, search)) 679 if (search && !tmp->name.contains (search))
673 continue; 680 continue;
674 681
675 char buf[30]; 682 char buf[30];
676 683
677 /* Basically want to fill this out to 30 spaces with periods */ 684 /* Basically want to fill this out to 30 spaces with periods */
… …
691 * it so it doesn't crash the server - otherwise, one character may 698 * it so it doesn't crash the server - otherwise, one character may
692 * crash the server numerous times. 699 * crash the server numerous times.
693 */ 700 */
694 if (num_skills_found >= NUM_SKILLS) 701 if (num_skills_found >= NUM_SKILLS)
695 { 702 {
696 new_draw_info (NDI_RED, 0, op, "Your character has too many skills."); 703 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills.");
697 new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin"); 704 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
698 break; 705 break;
699 } 706 }
700 } 707 }
701 } 708 }
702 709
703 dynbuf_text msg (4096, 1024); 710 dynbuf_text &msg = msg_dynbuf; msg.clear ();
704 711
705 msg << "T<Player skills:>\n\n"; 712 msg << "T<Player skills:>\n\n";
706 if (num_skills_found > 1) 713 if (num_skills_found > 1)
707 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp); 714 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
708 715
… …
716 723
717 msg << "Your equipped item power is " << (int)op->contr->item_power 724 msg << "Your equipped item power is " << (int)op->contr->item_power
718 << " out of " << int (op->level * settings.item_power_factor) 725 << " out of " << int (op->level * settings.item_power_factor)
719 << ".\n"; 726 << ".\n";
720 727
721 op->contr->infobox (MSG_CHANNEL ("skills"), msg); 728 pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
722} 729}
723 730
724/* use_skill() - similar to invoke command, it executes the skill in the 731/* use_skill() - similar to invoke command, it executes the skill in the
725 * direction that the user is facing. Returns false if we are unable to 732 * direction that the user is facing. Returns false if we are unable to
726 * change to the requested skill, or were unable to use the skill properly. 733 * change to the requested skill, or were unable to use the skill properly.
… …
735 742
736 if (!string) 743 if (!string)
737 return 0; 744 return 0;
738 745
739 for (skop = op->inv; skop; skop = skop->below) 746 for (skop = op->inv; skop; skop = skop->below)
740 { 747 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
741 if (skop->type == SKILL
742 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
743 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill)))) 748 && !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
749 {
750 skop = find_skill_by_name (op, skop->skill);
744 break; 751 break;
745 else if (skop->type == SKILL_TOOL
746 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
747 break;
748 } 752 }
749 753
750 if (!skop) 754 if (!skop)
751 { 755 {
752 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string); 756 op->failmsgf ("Unable to find skill %s.", string);
757 return 0;
758 }
759
760 if (!(skill_flags [skop->subtype] & SF_USE))
761 {
762 op->failmsgf (
763 "You feel as if you wanted to do something funny, but you can't remember what. "
764 "H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
765 "use it with some item, or it's always active.>",
766 &skop->skill
767 );
753 return 0; 768 return 0;
754 } 769 }
755 770
756 len = strlen (skop->skill); 771 len = strlen (skop->skill);
757 772
… …
783} 798}
784 799
785static bool 800static bool
786hth_skill_p (object *skill) 801hth_skill_p (object *skill)
787{ 802{
788 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; 803 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT;
789} 804}
790 805
791/* This finds the first unarmed skill the player has, and returns it. 806/* This finds the first unarmed skill the player has, and returns it.
792 */ 807 */
793static object * 808static object *
794find_player_hth_skill (object *op) 809find_player_hth_skill (object *op)
795{ 810{
796 for (object *tmp = op->inv; tmp; tmp = tmp->below) 811 for (object *tmp = op->inv; tmp; tmp = tmp->below)
797 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) 812 if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
798 return tmp; 813 return tmp;
799 814
800 return 0; 815 return 0;
801} 816}
802 817
… …
822 * through that code if skill is set to change to the skill. 837 * through that code if skill is set to change to the skill.
823 */ 838 */
824 if (player *pl = op->contr) 839 if (player *pl = op->contr)
825 { 840 {
826 if (skill) 841 if (skill)
827 op->change_skill (skill); 842 {
843 if (!op->apply (skill))
844 return 0;
845 }
828 else 846 else
829 { 847 {
830 if (!pl->combat_ob) 848 if (!pl->combat_ob)
831 { 849 {
832 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 850 if (op->flag [FLAG_READY_WEAPON])
833 { 851 {
834 for (tmp = op->inv; tmp; tmp = tmp->below) 852 for (tmp = op->inv; tmp; tmp = tmp->below)
835 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) 853 if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
836 break; 854 break;
837 855
838 if (!tmp) 856 if (!tmp)
839 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 857 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
840 858
… …
854 872
855 if (!skill) 873 if (!skill)
856 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 874 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
857 } 875 }
858 876
859 if (skill) 877 op->apply (skill);
860 {
861 op->change_skill (0);
862 apply_special (op, skill, AP_APPLY);
863 }
864 } 878 }
865 879
866 if (!pl->combat_ob) 880 if (!pl->combat_ob)
867 { 881 {
868 LOG (llevError, "Could not find anything to attack on %s\n", &op->name); 882 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
869 return 0; 883 return 0;
870 } 884 }
871 } 885 }
872 886
873 if (!op->change_weapon (pl->combat_ob)) 887 if (!op->apply (pl->combat_ob))
874 return 0; 888 return 0;
875 } 889 }
876 890
877 /* lose invisiblity/hiding status for running attacks */ 891 /* lose invisiblity/hiding status for running attacks */
878 if (pl->tmp_invis) 892 if (pl->tmp_invis)
879 { 893 {
880 pl->tmp_invis = 0; 894 pl->tmp_invis = 0;
881 op->invisible = 0; 895 op->invisible = 0;
882 op->hide = 0; 896 op->flag [FLAG_HIDDEN] = 0;
883 update_object (op, UP_OBJ_CHANGE); 897 update_object (op, UP_OBJ_CHANGE);
884 } 898 }
885 } 899 }
886 900
887 int success = attack_ob (tmp, op); 901 int success = attack_ob (tmp, op);
888 902
889 /* print appropriate messages to the player */ 903 /* print appropriate messages to the player */
890 904
891 if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 905 if (success && string && tmp && !tmp->flag [FLAG_FREED])
892 { 906 {
893 if (op->type == PLAYER) 907 if (op->type == PLAYER)
894 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 908 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
895 else if (tmp->type == PLAYER) 909 else if (tmp->type == PLAYER)
896 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 910 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
… …
939 /* space must be blocked for there to be anything interesting to do */ 953 /* space must be blocked for there to be anything interesting to do */
940 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) 954 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
941 return 0; 955 return 0;
942 956
943 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) 957 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
944 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 958 if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR)
945 { 959 {
946 /* Don't attack party members */ 960 /* Don't attack party members */
947 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 961 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
948 return 0; 962 return 0;
949 963
… …
971static int 985static int
972attack_hth (object *pl, int dir, const char *string, object *skill) 986attack_hth (object *pl, int dir, const char *string, object *skill)
973{ 987{
974 object *enemy = NULL, *weapon; 988 object *enemy = NULL, *weapon;
975 989
976 if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) 990 if (pl->flag [FLAG_READY_WEAPON])
977 for (weapon = pl->inv; weapon; weapon = weapon->below) 991 for (weapon = pl->inv; weapon; weapon = weapon->below)
978 { 992 {
979 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 993 if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
980 { 994 {
981 CLEAR_FLAG (weapon, FLAG_APPLIED); 995 weapon->clr_flag (FLAG_APPLIED);
982 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 996 pl->clr_flag (FLAG_READY_WEAPON);
983 pl->update_stats (); 997 pl->update_stats ();
984 if (pl->type == PLAYER) 998 if (pl->type == PLAYER)
985 { 999 {
986 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 1000 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
987 esrv_update_item (UPD_FLAGS, pl, weapon); 1001 esrv_update_item (UPD_FLAGS, pl, weapon);
… …
1005 */ 1019 */
1006static int 1020static int
1007attack_melee_weapon (object *op, int dir, const char *string, object *skill) 1021attack_melee_weapon (object *op, int dir, const char *string, object *skill)
1008{ 1022{
1009 1023
1010 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 1024 if (!op->flag [FLAG_READY_WEAPON])
1011 { 1025 {
1012 if (op->type == PLAYER) 1026 if (op->type == PLAYER)
1013 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); 1027 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1014 1028
1015 return 0; 1029 return 0;

Diff Legend

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