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.69 by root, Sun Nov 16 03:52:13 2008 UTC vs.
Revision 1.94 by root, Sun Apr 11 00:34:06 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])
… …
109 } 110 }
110 } 111 }
111} 112}
112 113
113static object * 114static object *
114find_skill (object *who, const shstr &name) 115find_skill (object *who, shstr_cmp name)
115{ 116{
116 if (who->chosen_skill 117 if (who->chosen_skill
117 && who->chosen_skill->skill == name 118 && who->chosen_skill->skill == name
118 && who->chosen_skill->type == SKILL) 119 && who->chosen_skill->type == SKILL)
119 return who->chosen_skill; 120 return who->chosen_skill;
… …
123 return splay (tmp); 124 return splay (tmp);
124 125
125 return 0; 126 return 0;
126} 127}
127 128
128object *player::find_skill (const shstr &name) const 129object *player::find_skill (shstr_cmp name) const
129{ 130{
130 // might want to use last_skill_obj at one point, or maybe not 131 // might want to use last_skill_obj at one point, or maybe not
131 return ::find_skill (ob, name); 132 return ::find_skill (ob, name);
132}
133
134object *player::find_skill (const char *name) const
135{
136 return find_skill (shstr (name));
137} 133}
138 134
139/* This returns the skill pointer of the given name (the 135/* This returns the skill pointer of the given name (the
140 * one that accumulates exp, has the level, etc). 136 * one that accumulates exp, has the level, etc).
141 * 137 *
142 * It is presumed that the player will be needing to actually 138 * It is presumed that the player will be needing to actually
143 * use the skill, so thus if use of the skill requires a skill 139 * use the skill, so thus if use of the skill requires a skill
144 * tool, this code will equip it. 140 * tool, this code will equip it.
145 */ 141 */
146object * 142object *
147find_skill_by_name (object *who, const shstr &sh) 143find_skill_by_name (object *who, shstr_cmp sh)
148{ 144{
149 object *skill_tool = 0; 145 object *skill_tool = 0;
150 146
151 for (object *tmp = who->inv; tmp; tmp = tmp->below) 147 for (object *tmp = who->inv; tmp; tmp = tmp->below)
152 if (tmp->skill == sh) 148 if (tmp->skill == sh)
… …
172 168
173 if (!skill) 169 if (!skill)
174 skill = give_skill_by_name (who, skill_tool->skill); 170 skill = give_skill_by_name (who, skill_tool->skill);
175 171
176 if (!skill_tool->flag [FLAG_APPLIED]) 172 if (!skill_tool->flag [FLAG_APPLIED])
177 if (apply_special (who, splay (skill_tool), AP_APPLY | AP_NO_READY)) 173 if (!who->apply (splay (skill_tool)))
178 return 0; 174 return 0;
179 175
180 return splay (skill); 176 return splay (skill);
181} 177}
182 178
183object * 179object *
184find_skill_by_name (object *who, const char *name) 180find_skill_by_name_fuzzy (object *who, const char *name)
185{ 181{
186 if (!name) 182 if (name)
187 return 0;
188
189 for (object *tmp = who->inv; tmp; tmp = tmp->below) 183 for (object *tmp = who->inv; tmp; tmp = tmp->below)
190 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL) 184 if ((tmp->type == SKILL || tmp->type == SKILL_TOOL)
191 && tmp->skill.begins_with (name)) 185 && tmp->skill.starts_with (name))
192 if (object *skop = find_skill_by_name (who, tmp->skill)) 186 if (object *skop = find_skill_by_name (who, tmp->skill))
193 return skop; 187 return skop;
194 188
195 return 0; 189 return 0;
196} 190}
197 191
198/* This returns the skill pointer of the given name (the 192/* This returns the skill pointer of the given name (the
… …
215 return skop; 209 return skop;
216 210
217 return 0; 211 return 0;
218} 212}
219 213
220/* This changes the objects chosen_skill to new_skill.
221 * return 1 on success, 0 on error
222 */
223bool
224object::change_skill (object *new_skill)
225{
226 if (type != PLAYER)
227 return 0;
228
229 // optimise this supposedly common case
230 if (new_skill == chosen_skill)
231 return 1;
232
233 if (chosen_skill)
234 {
235 chosen_skill->flag [FLAG_APPLIED] = false;
236 change_abil (this, chosen_skill);
237 }
238
239 chosen_skill = new_skill;
240
241 if (chosen_skill)
242 {
243 chosen_skill->flag [FLAG_APPLIED] = true;
244 change_abil (this, chosen_skill);
245 }
246
247 // always clear current weapon, as the selected skill could
248 // conflict with the current weapon skill, which would go
249 // undetected and exp would be given to the wrong skill.
250 current_weapon = 0;
251
252 update_stats ();
253 return 1;
254}
255
256/* 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().
257 * 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.
258 * 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
259 * to utilize skills. Returns 1 on use of skill, otherwise 0. 217 * to utilize skills. Returns 1 on use of skill, otherwise 0.
260 * This is changed (2002-11-30) from the old method that returned 218 * This is changed (2002-11-30) from the old method that returned
… …
265 */ 223 */
266int 224int
267do_skill (object *op, object *part, object *skill, int dir, const char *string) 225do_skill (object *op, object *part, object *skill, int dir, const char *string)
268{ 226{
269 int success = 0, exp = 0; 227 int success = 0, exp = 0;
270 int did_alc = 0;
271 228
272 if (!skill) 229 if (!skill)
273 return 0; 230 return 0;
274 231
275 /* The code below presumes that the skill points to the object that 232 /* The code below presumes that the skill points to the object that
… …
300 /* Not 100% sure if this will work with new movement code - 257 /* Not 100% sure if this will work with new movement code -
301 * the levitation skill has move_type for flying, so when 258 * the levitation skill has move_type for flying, so when
302 * equipped, that should transfer to player, when not, 259 * equipped, that should transfer to player, when not,
303 * shouldn't. 260 * shouldn't.
304 */ 261 */
305 if (QUERY_FLAG (skill, FLAG_APPLIED)) 262 if (skill->flag [FLAG_APPLIED])
306 { 263 {
307 CLEAR_FLAG (skill, FLAG_APPLIED); 264 skill->clr_flag (FLAG_APPLIED);
308 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth."); 265 new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
309 } 266 }
310 else 267 else
311 { 268 {
312 SET_FLAG (skill, FLAG_APPLIED); 269 skill->set_flag (FLAG_APPLIED);
313 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!"); 270 new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
314 } 271 }
315 272
316 op->update_stats (); 273 op->update_stats ();
317 success = 1; 274 success = 1;
… …
400 case SK_LITERACY: 357 case SK_LITERACY:
401 case SK_WOODSMAN: 358 case SK_WOODSMAN:
402 /* first, we try to find a cauldron, and do the alchemy thing. 359 /* first, we try to find a cauldron, and do the alchemy thing.
403 * failing that, we go and identify stuff. 360 * failing that, we go and identify stuff.
404 */ 361 */
362 {
363 bool found_cauldron = false;
364
405 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) 365 for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
406 { 366 {
407 next = tmp->above; 367 next = tmp->above;
408 368
409 if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) 369 if (tmp->flag [FLAG_IS_CAULDRON])
410 { 370 {
371 found_cauldron = true;
372
373 if (tmp->skill != skill->skill)
374 {
375 op->failmsgf ("You can't use the %s with the %s skill!",
376 query_name (tmp),
377 query_name (skill));
378 break;
379 }
380
411 attempt_do_alchemy (op, tmp); 381 attempt_do_alchemy (op, tmp, skill);
412 382
413 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 383 if (tmp->flag [FLAG_APPLIED])
414 esrv_send_inventory (op, tmp); 384 esrv_send_inventory (op, tmp);
415
416 did_alc = 1;
417 } 385 }
418 } 386 }
419 387
420 if (did_alc == 0) 388 if (!found_cauldron)
421 exp = success = skill_ident (op, skill); 389 exp = success = skill_ident (op, skill);
422 390 }
423 break; 391 break;
424 392
425 case SK_DET_MAGIC: 393 case SK_DET_MAGIC:
426 case SK_DET_CURSE: 394 case SK_DET_CURSE:
427 exp = success = skill_ident (op, skill); 395 exp = success = skill_ident (op, skill);
… …
456 case SK_EVOCATION: 424 case SK_EVOCATION:
457 case SK_PYROMANCY: 425 case SK_PYROMANCY:
458 case SK_SUMMONING: 426 case SK_SUMMONING:
459 case SK_CLIMBING: 427 case SK_CLIMBING:
460 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect."); 428 new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
429 break;
430
431 case SK_MINING:
432 success = skill_mining (op, part, skill, dir, string);
433 break;
434
435 case SK_FISHING:
436 success = skill_fishing (op, part, skill, dir, string);
461 break; 437 break;
462 438
463 default: 439 default:
464 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp); 440 LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
465 break; 441 break;
… …
541 } 517 }
542 else 518 else
543 { /* all other items/living creatures */ 519 { /* all other items/living creatures */
544 op_exp = op->stats.exp; 520 op_exp = op->stats.exp;
545 op_lvl = op->level; 521 op_lvl = op->level;
546 if (!QUERY_FLAG (op, FLAG_ALIVE)) 522 if (!op->flag [FLAG_ALIVE])
547 op_lvl += 5 * abs (op->magic); /* for ident/make items */ 523 op_lvl += 5 * abs (op->magic); /* for ident/make items */
548 } 524 }
549 525
550 if (op_lvl < 1) 526 if (op_lvl < 1)
551 op_lvl = 1; 527 op_lvl = 1;
… …
615 } 591 }
616 592
617 object *tmp = find_skill (pl, scroll->skill); 593 object *tmp = find_skill (pl, scroll->skill);
618 594
619 /* player already knows it */ 595 /* player already knows it */
620 if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL)) 596 if (tmp && tmp->flag [FLAG_CAN_USE_SKILL])
621 return 0; 597 return 0;
622 598
623 /* now a random change to learn, based on player Int. 599 /* now a random change to learn, based on player Int.
624 * give bonus based on level - otherwise stupid characters 600 * give bonus based on level - otherwise stupid characters
625 * might never be able to learn anything. 601 * might never be able to learn anything.
… …
634 { 610 {
635 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill); 611 LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
636 return 2; 612 return 2;
637 } 613 }
638 614
639 SET_FLAG (tmp, FLAG_CAN_USE_SKILL); 615 tmp->set_flag (FLAG_CAN_USE_SKILL);
640 616
641 return 1; 617 return 1;
642} 618}
643 619
644/* Gives a percentage clipped to 0% -> 100% of a/b. */ 620/* Gives a percentage clipped to 0% -> 100% of a/b. */
… …
686 662
687 for (object *tmp = op->inv; tmp; tmp = tmp->below) 663 for (object *tmp = op->inv; tmp; tmp = tmp->below)
688 { 664 {
689 if (tmp->type == SKILL) 665 if (tmp->type == SKILL)
690 { 666 {
691 if (search && !strstr (tmp->name, search)) 667 if (search && !tmp->name.contains (search))
692 continue; 668 continue;
693 669
694 char buf[30]; 670 char buf[30];
695 671
696 /* Basically want to fill this out to 30 spaces with periods */ 672 /* Basically want to fill this out to 30 spaces with periods */
… …
710 * it so it doesn't crash the server - otherwise, one character may 686 * it so it doesn't crash the server - otherwise, one character may
711 * crash the server numerous times. 687 * crash the server numerous times.
712 */ 688 */
713 if (num_skills_found >= NUM_SKILLS) 689 if (num_skills_found >= NUM_SKILLS)
714 { 690 {
715 new_draw_info (NDI_RED, 0, op, "Your character has too many skills."); 691 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Your character has too many skills.");
716 new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin"); 692 new_draw_info (NDI_RED | NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
717 break; 693 break;
718 } 694 }
719 } 695 }
720 } 696 }
721 697
722 dynbuf_text msg (4096, 1024); 698 dynbuf_text &msg = msg_dynbuf; msg.clear ();
723 699
724 msg << "T<Player skills:>\n\n"; 700 msg << "T<Player skills:>\n\n";
725 if (num_skills_found > 1) 701 if (num_skills_found > 1)
726 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp); 702 qsort (skills, num_skills_found, sizeof (skills [0]), (int (*)(const void *, const void *)) std::strcmp);
727 703
… …
754 730
755 if (!string) 731 if (!string)
756 return 0; 732 return 0;
757 733
758 for (skop = op->inv; skop; skop = skop->below) 734 for (skop = op->inv; skop; skop = skop->below)
759 { 735 if ((skop->type == SKILL || skop->type == SKILL_TOOL)
760 if (skop->type == SKILL
761 && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
762 && !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);
763 break; 739 break;
764 else if (skop->type == SKILL_TOOL
765 && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
766 break;
767 } 740 }
768 741
769 if (!skop) 742 if (!skop)
770 { 743 {
771 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 );
772 return 0; 756 return 0;
773 } 757 }
774 758
775 len = strlen (skop->skill); 759 len = strlen (skop->skill);
776 760
… …
802} 786}
803 787
804static bool 788static bool
805hth_skill_p (object *skill) 789hth_skill_p (object *skill)
806{ 790{
807 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_WEAPON)) == SF_COMBAT; 791 return (skill_flags [skill->subtype] & (SF_COMBAT | SF_NEED_ITEM)) == SF_COMBAT;
808} 792}
809 793
810/* This finds the first unarmed skill the player has, and returns it. 794/* This finds the first unarmed skill the player has, and returns it.
811 */ 795 */
812static object * 796static object *
813find_player_hth_skill (object *op) 797find_player_hth_skill (object *op)
814{ 798{
815 for (object *tmp = op->inv; tmp; tmp = tmp->below) 799 for (object *tmp = op->inv; tmp; tmp = tmp->below)
816 if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp)) 800 if (tmp->type == SKILL && tmp->flag [FLAG_CAN_USE_SKILL] && hth_skill_p (tmp))
817 return tmp; 801 return tmp;
818 802
819 return 0; 803 return 0;
820} 804}
821 805
… …
841 * 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.
842 */ 826 */
843 if (player *pl = op->contr) 827 if (player *pl = op->contr)
844 { 828 {
845 if (skill) 829 if (skill)
846 op->change_skill (skill); 830 {
831 if (!op->apply (skill))
832 return 0;
833 }
847 else 834 else
848 { 835 {
849 if (!pl->combat_ob) 836 if (!pl->combat_ob)
850 { 837 {
851 if (QUERY_FLAG (op, FLAG_READY_WEAPON)) 838 if (op->flag [FLAG_READY_WEAPON])
852 { 839 {
853 for (tmp = op->inv; tmp; tmp = tmp->below) 840 for (tmp = op->inv; tmp; tmp = tmp->below)
854 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) 841 if (tmp->type == WEAPON && tmp->flag [FLAG_APPLIED])
855 break; 842 break;
856 843
857 if (!tmp) 844 if (!tmp)
858 LOG (llevError, "Could not find applied weapon on %s\n", &op->name); 845 LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
859 846
… …
873 860
874 if (!skill) 861 if (!skill)
875 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); 862 new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
876 } 863 }
877 864
878 if (skill) 865 op->apply (skill);
879 {
880 op->change_skill (0);
881 apply_special (op, skill, AP_APPLY);
882 }
883 } 866 }
884 867
885 if (!pl->combat_ob) 868 if (!pl->combat_ob)
886 { 869 {
887 LOG (llevError, "Could not find anything to attack on %s\n", &op->name); 870 LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
888 return 0; 871 return 0;
889 } 872 }
890 } 873 }
891 874
892 if (!op->change_weapon (pl->combat_ob)) 875 if (!op->apply (pl->combat_ob))
893 return 0; 876 return 0;
894 } 877 }
895 878
896 /* lose invisiblity/hiding status for running attacks */ 879 /* lose invisiblity/hiding status for running attacks */
897 if (pl->tmp_invis) 880 if (pl->tmp_invis)
… …
905 888
906 int success = attack_ob (tmp, op); 889 int success = attack_ob (tmp, op);
907 890
908 /* print appropriate messages to the player */ 891 /* print appropriate messages to the player */
909 892
910 if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED)) 893 if (success && string && tmp && !tmp->flag [FLAG_FREED])
911 { 894 {
912 if (op->type == PLAYER) 895 if (op->type == PLAYER)
913 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp)); 896 new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
914 else if (tmp->type == PLAYER) 897 else if (tmp->type == PLAYER)
915 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string); 898 new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
… …
958 /* space must be blocked for there to be anything interesting to do */ 941 /* space must be blocked for there to be anything interesting to do */
959 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty))) 942 if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
960 return 0; 943 return 0;
961 944
962 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above) 945 for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
963 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || tmp->type == LOCKED_DOOR) 946 if ((tmp->flag [FLAG_ALIVE] && tmp->stats.hp >= 0) || tmp->flag [FLAG_CAN_ROLL] || tmp->type == LOCKED_DOOR)
964 { 947 {
965 /* Don't attack party members */ 948 /* Don't attack party members */
966 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party)) 949 if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
967 return 0; 950 return 0;
968 951
… …
990static int 973static int
991attack_hth (object *pl, int dir, const char *string, object *skill) 974attack_hth (object *pl, int dir, const char *string, object *skill)
992{ 975{
993 object *enemy = NULL, *weapon; 976 object *enemy = NULL, *weapon;
994 977
995 if (QUERY_FLAG (pl, FLAG_READY_WEAPON)) 978 if (pl->flag [FLAG_READY_WEAPON])
996 for (weapon = pl->inv; weapon; weapon = weapon->below) 979 for (weapon = pl->inv; weapon; weapon = weapon->below)
997 { 980 {
998 if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED)) 981 if (weapon->type == WEAPON && weapon->flag [FLAG_APPLIED])
999 { 982 {
1000 CLEAR_FLAG (weapon, FLAG_APPLIED); 983 weapon->clr_flag (FLAG_APPLIED);
1001 CLEAR_FLAG (pl, FLAG_READY_WEAPON); 984 pl->clr_flag (FLAG_READY_WEAPON);
1002 pl->update_stats (); 985 pl->update_stats ();
1003 if (pl->type == PLAYER) 986 if (pl->type == PLAYER)
1004 { 987 {
1005 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); 988 new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1006 esrv_update_item (UPD_FLAGS, pl, weapon); 989 esrv_update_item (UPD_FLAGS, pl, weapon);
… …
1024 */ 1007 */
1025static int 1008static int
1026attack_melee_weapon (object *op, int dir, const char *string, object *skill) 1009attack_melee_weapon (object *op, int dir, const char *string, object *skill)
1027{ 1010{
1028 1011
1029 if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) 1012 if (!op->flag [FLAG_READY_WEAPON])
1030 { 1013 {
1031 if (op->type == PLAYER) 1014 if (op->type == PLAYER)
1032 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!"); 1015 new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
1033 1016
1034 return 0; 1017 return 0;

Diff Legend

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