1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
5 | * Copryight (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copryight (C) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | * |
7 | * |
… | |
… | |
115 | * tool, this code will equip it. |
115 | * tool, this code will equip it. |
116 | */ |
116 | */ |
117 | object * |
117 | object * |
118 | find_skill_by_name (object *who, const char *name) |
118 | find_skill_by_name (object *who, const char *name) |
119 | { |
119 | { |
120 | object *skill = NULL, *skill_tool = NULL, *tmp; |
|
|
121 | |
|
|
122 | if (!name) |
120 | if (!name) |
123 | return NULL; |
121 | return 0; |
|
|
122 | |
|
|
123 | object *skill = 0, *skill_tool = 0; |
124 | |
124 | |
125 | /* We make sure the length of the string in the object is greater |
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 |
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' |
127 | * 'hi', we don't want to match if the user passed 'high' |
128 | */ |
128 | */ |
129 | for (tmp = who->inv; tmp != NULL; tmp = tmp->below) |
129 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
130 | { |
130 | { |
131 | if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) |
131 | if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name)) |
132 | skill = tmp; |
132 | skill = tmp; |
133 | |
133 | |
134 | /* Try to find appropriate skilltool. If the player has one already |
134 | /* Try to find appropriate skilltool. If the player has one already |
135 | * applied, we try to keep using that one. |
135 | * applied, we try to keep using that one. |
136 | */ |
136 | */ |
137 | else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name)) |
137 | else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name)) |
138 | { |
138 | { |
139 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
139 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
140 | skill_tool = tmp; |
140 | skill_tool = tmp; |
141 | else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
141 | else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
142 | skill_tool = tmp; |
142 | skill_tool = tmp; |
143 | } |
143 | } |
144 | } |
144 | } |
|
|
145 | |
145 | /* If this is a skill that can be used without a tool, return it */ |
146 | /* If this is a skill that can be used without a tool, return it */ |
146 | if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL)) |
147 | if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL)) |
147 | return skill; |
148 | return skill; |
148 | |
149 | |
149 | /* Player has a tool to use the skill. IF not applied, apply it - |
150 | /* Player has a tool to use the skill. If not applied, apply it - |
150 | * if not successful, return null. If they do have the skill tool |
151 | * if not successful, return null. If they do have the skill tool |
151 | * but not the skill itself, give it to them. |
152 | * but not the skill itself, give it to them. |
152 | */ |
153 | */ |
153 | if (skill_tool) |
154 | if (skill_tool) |
154 | { |
155 | { |
155 | if (!QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
|
|
156 | { |
|
|
157 | if (apply_special (who, skill_tool, 0)) |
|
|
158 | return NULL; |
|
|
159 | } |
|
|
160 | |
|
|
161 | if (!skill) |
156 | if (!skill) |
162 | { |
157 | { |
163 | skill = give_skill_by_name (who, skill_tool->skill); |
158 | skill = give_skill_by_name (who, skill_tool->skill); |
164 | link_player_skills (who); |
159 | link_player_skills (who); |
165 | } |
160 | } |
166 | |
161 | |
|
|
162 | if (!QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
|
|
163 | if (apply_special (who, skill_tool, 0)) |
|
|
164 | return 0; |
|
|
165 | |
167 | return skill; |
166 | return skill; |
168 | } |
167 | } |
169 | |
168 | |
170 | return NULL; |
169 | return 0; |
171 | } |
170 | } |
172 | |
|
|
173 | |
171 | |
174 | /* This returns the skill pointer of the given name (the |
172 | /* This returns the skill pointer of the given name (the |
175 | * one that accumlates exp, has the level, etc). |
173 | * one that accumlates exp, has the level, etc). |
176 | * |
174 | * |
177 | * It is presumed that the player will be needing to actually |
175 | * It is presumed that the player will be needing to actually |
… | |
… | |
183 | * this replaces find_skill. |
181 | * this replaces find_skill. |
184 | */ |
182 | */ |
185 | object * |
183 | object * |
186 | find_skill_by_number (object *who, int skillno) |
184 | find_skill_by_number (object *who, int skillno) |
187 | { |
185 | { |
|
|
186 | if (!IN_RANGE_EXC (skillno, 1, NUM_SKILLS)) |
|
|
187 | return 0; |
|
|
188 | |
188 | object *skill = NULL, *skill_tool = NULL, *tmp; |
189 | object *skill = NULL, *skill_tool = NULL; |
189 | |
190 | |
190 | if (skillno < 1 || skillno >= NUM_SKILLS) |
|
|
191 | return NULL; |
|
|
192 | |
|
|
193 | for (tmp = who->inv; tmp != NULL; tmp = tmp->below) |
191 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
194 | { |
192 | { |
195 | if (tmp->type == SKILL && tmp->subtype == skillno) |
193 | if (tmp->type == SKILL && tmp->subtype == skillno) |
196 | skill = tmp; |
194 | skill = tmp; |
197 | |
195 | |
198 | /* Try to find appropriate skilltool. If the player has one already |
196 | /* Try to find appropriate skilltool. If the player has one already |
199 | * applied, we try to keep using that one. |
197 | * applied, we try to keep using that one. |
200 | */ |
198 | */ |
|
|
199 | //TODO: afaics, skill tools have subtype 0 always |
201 | else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno) |
200 | else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno) |
202 | { |
201 | { |
203 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
202 | if (QUERY_FLAG (tmp, FLAG_APPLIED)) |
204 | skill_tool = tmp; |
203 | skill_tool = tmp; |
205 | else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
204 | else if (!skill_tool || !QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
206 | skill_tool = tmp; |
205 | skill_tool = tmp; |
207 | } |
206 | } |
208 | } |
207 | } |
|
|
208 | |
209 | /* If this is a skill that can be used without a tool, return it */ |
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)) |
210 | if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL)) |
211 | return skill; |
211 | return skill; |
212 | |
212 | |
213 | /* Player has a tool to use the skill. IF not applied, apply it - |
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 |
214 | * if not successful, return null. If they do have the skill tool |
215 | * but not the skill itself, give it to them. |
215 | * but not the skill itself, give it to them. |
216 | */ |
216 | */ |
217 | if (skill_tool) |
217 | if (skill_tool) |
218 | { |
218 | { |
219 | if (!QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
219 | if (!QUERY_FLAG (skill_tool, FLAG_APPLIED)) |
… | |
… | |
235 | } |
235 | } |
236 | |
236 | |
237 | /* This changes the objects skill to new_skill. |
237 | /* This changes the objects skill to new_skill. |
238 | * note that this function doesn't always need to get used - |
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 |
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 |
240 | * set. This function is of most interest to players to update |
241 | * the various range information. |
241 | * the various range information. |
242 | * if new_skill is null, this just unapplies the skill. |
|
|
243 | * flag has the current meaning: |
|
|
244 | * 0x1: If set, don't update the range pointer. This is useful when we |
|
|
245 | * need to ready a new skill, but don't want to clobber range. |
|
|
246 | * return 1 on success, 0 on error |
242 | * return 1 on success, 0 on error |
247 | */ |
243 | */ |
248 | int |
244 | int |
249 | change_skill (object *who, object *new_skill, int flag) |
245 | change_skill (object *who, object *new_skill, int flag) |
250 | { |
246 | { |
251 | int old_range; |
|
|
252 | |
|
|
253 | if (who->type != PLAYER) |
247 | if (who->type != PLAYER) |
254 | return 0; |
248 | return 0; |
255 | |
249 | |
256 | player *pl = who->contr; |
250 | #if 0 |
257 | |
251 | // optimise this supposedly common case |
258 | if (pl->ranged_skill && pl->ranged_skill == new_skill) |
252 | if (new_skill == who->chosen_skill) |
259 | return 1; |
253 | return 1; |
|
|
254 | #endif |
260 | |
255 | |
261 | if (!new_skill) |
256 | if (!new_skill) |
262 | { |
257 | { |
263 | if (pl->ranged_skill) |
258 | LOG (llevError | logBacktrace, "change_skill called on %s with NULL skill\n", |
264 | apply_special (who, pl->ranged_skill, AP_UNAPPLY); |
259 | who->debug_desc ()); |
265 | |
|
|
266 | /* Only goal in this case was to unapply a skill */ |
|
|
267 | return 0; |
260 | return 0; |
268 | } |
261 | } |
269 | |
262 | |
270 | // move skill to front, so it will be preferred next time |
263 | // the skill could be readied already because it is used by a weapon. |
271 | new_skill->remove (); |
264 | who->change_weapon (0); |
272 | who->insert (new_skill); |
265 | new_skill->inv_splay (); |
273 | |
266 | |
274 | if (apply_special (who, new_skill, AP_APPLY)) |
267 | if (apply_special (who, new_skill, AP_APPLY)) |
275 | return 0; |
268 | return 0; |
276 | |
269 | |
277 | return 1; |
270 | return 1; |
… | |
… | |
284 | clear_skill (object *who) |
277 | clear_skill (object *who) |
285 | { |
278 | { |
286 | who->chosen_skill = 0; |
279 | who->chosen_skill = 0; |
287 | CLEAR_FLAG (who, FLAG_READY_SKILL); |
280 | CLEAR_FLAG (who, FLAG_READY_SKILL); |
288 | |
281 | |
289 | if (who->type == PLAYER) |
282 | if (player *pl = who->contr) |
290 | { |
283 | if (pl->ranged_ob && pl->ranged_ob->type == SKILL) |
291 | if (who->contr->ranged_skill && who->contr->ranged_skill->type == SKILL) |
284 | pl->ranged_ob = 0; |
292 | { |
|
|
293 | who->contr->ranged_skill = 0; |
|
|
294 | who->contr->ranged_ob = 0; |
|
|
295 | } |
|
|
296 | } |
|
|
297 | } |
285 | } |
298 | |
286 | |
299 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
287 | /* do_skill() - Main skills use function-similar in scope to cast_spell(). |
300 | * We handle all requests for skill use outside of some combat here. |
288 | * We handle all requests for skill use outside of some combat here. |
301 | * We require a separate routine outside of fire() so as to allow monsters |
289 | * We require a separate routine outside of fire() so as to allow monsters |
… | |
… | |
309 | int |
297 | int |
310 | do_skill (object *op, object *part, object *skill, int dir, const char *string) |
298 | do_skill (object *op, object *part, object *skill, int dir, const char *string) |
311 | { |
299 | { |
312 | int success = 0, exp = 0; |
300 | int success = 0, exp = 0; |
313 | int did_alc = 0; |
301 | int did_alc = 0; |
314 | object *tmp, *next; |
|
|
315 | |
302 | |
316 | if (!skill) |
303 | if (!skill) |
317 | return 0; |
304 | return 0; |
318 | |
305 | |
319 | /* The code below presumes that the skill points to the object that |
306 | /* The code below presumes that the skill points to the object that |
… | |
… | |
321 | * go and try to find the actual real skill pointer, and if the |
308 | * go and try to find the actual real skill pointer, and if the |
322 | * the player doesn't have a bucket for that, create one. |
309 | * the player doesn't have a bucket for that, create one. |
323 | */ |
310 | */ |
324 | if (skill->type != SKILL && op->type == PLAYER) |
311 | if (skill->type != SKILL && op->type == PLAYER) |
325 | { |
312 | { |
326 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
313 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
327 | if (tmp->type == SKILL && tmp->skill == skill->skill) |
314 | if (tmp->type == SKILL && tmp->skill == skill->skill) |
328 | break; |
315 | { |
|
|
316 | skill = tmp; |
|
|
317 | goto found; |
|
|
318 | } |
329 | |
319 | |
330 | if (!tmp) |
|
|
331 | tmp = give_skill_by_name (op, skill->skill); |
320 | skill = give_skill_by_name (op, skill->skill); |
332 | |
321 | found: ; |
333 | skill = tmp; |
|
|
334 | } |
322 | } |
335 | |
323 | |
336 | // skill, by_whom, on_which_object, which direction, skill_argument |
324 | // skill, by_whom, on_which_object, which direction, skill_argument |
337 | if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string))) |
325 | if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string))) |
338 | return 0; |
326 | return 0; |
… | |
… | |
443 | case SK_LITERACY: |
431 | case SK_LITERACY: |
444 | case SK_WOODSMAN: |
432 | case SK_WOODSMAN: |
445 | /* first, we try to find a cauldron, and do the alchemy thing. |
433 | /* first, we try to find a cauldron, and do the alchemy thing. |
446 | * failing that, we go and identify stuff. |
434 | * failing that, we go and identify stuff. |
447 | */ |
435 | */ |
448 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next) |
436 | for (object *next, *tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next) |
449 | { |
437 | { |
450 | next = tmp->above; |
438 | next = tmp->above; |
451 | |
439 | |
452 | if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) |
440 | if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON)) |
453 | { |
441 | { |
… | |
… | |
514 | * If certain skills should take more/less time, that should be |
502 | * If certain skills should take more/less time, that should be |
515 | * in the code for the skill itself. |
503 | * in the code for the skill itself. |
516 | */ |
504 | */ |
517 | |
505 | |
518 | if (op->type == PLAYER) |
506 | if (op->type == PLAYER) |
519 | op->speed_left -= 1.0; |
507 | op->speed_left -= 1.f; |
520 | |
508 | |
521 | /* this is a good place to add experience for successfull use of skills. |
509 | /* this is a good place to add experience for successfull use of skills. |
522 | * Note that add_exp() will figure out player/monster experience |
510 | * Note that add_exp() will figure out player/monster experience |
523 | * gain problems. |
511 | * gain problems. |
524 | */ |
512 | */ |
… | |
… | |
695 | link_player_skills (pl); |
683 | link_player_skills (pl); |
696 | return 1; |
684 | return 1; |
697 | } |
685 | } |
698 | |
686 | |
699 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
687 | /* Gives a percentage clipped to 0% -> 100% of a/b. */ |
700 | |
|
|
701 | /* Probably belongs in some global utils-type file? */ |
688 | /* Probably belongs in some global utils-type file? */ |
702 | static int |
689 | static int |
703 | clipped_percent (sint64 a, sint64 b) |
690 | clipped_percent (sint64 a, sint64 b) |
704 | { |
691 | { |
705 | int rv; |
692 | int rv; |
… | |
… | |
798 | * direction that the user is facing. Returns false if we are unable to |
785 | * direction that the user is facing. Returns false if we are unable to |
799 | * change to the requested skill, or were unable to use the skill properly. |
786 | * change to the requested skill, or were unable to use the skill properly. |
800 | * This is tricky because skills can have spaces. We basically roll |
787 | * This is tricky because skills can have spaces. We basically roll |
801 | * our own find_skill_by_name so we can try to do better string matching. |
788 | * our own find_skill_by_name so we can try to do better string matching. |
802 | */ |
789 | */ |
803 | |
|
|
804 | int |
790 | int |
805 | use_skill (object *op, const char *string) |
791 | use_skill (object *op, const char *string) |
806 | { |
792 | { |
807 | object *skop; |
793 | object *skop; |
808 | size_t len; |
794 | size_t len; |
… | |
… | |
892 | * is readied either then try to find a skill for the player to use. |
878 | * is readied either then try to find a skill for the player to use. |
893 | * it is presumed that if skill is set, it is a valid attack skill (eg, |
879 | * it is presumed that if skill is set, it is a valid attack skill (eg, |
894 | * the caller should have set it appropriately). We still want to pass |
880 | * the caller should have set it appropriately). We still want to pass |
895 | * through that code if skill is set to change to the skill. |
881 | * through that code if skill is set to change to the skill. |
896 | */ |
882 | */ |
897 | if (op->type == PLAYER) |
883 | if (player *pl = op->contr) |
898 | { |
884 | { |
899 | if (!QUERY_FLAG (op, FLAG_READY_WEAPON)) |
885 | if (!pl->combat_ob) |
900 | { |
886 | { |
901 | if (!skill) |
887 | if (QUERY_FLAG (op, FLAG_READY_WEAPON)) |
902 | { |
888 | { |
903 | /* See if the players chosen skill is a combat skill, and use |
889 | for (tmp = op->inv; tmp; tmp = tmp->below) |
904 | * it if appropriate. |
890 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) |
905 | */ |
891 | break; |
906 | if (op->chosen_skill && hth_skill_p (op->chosen_skill)) |
892 | |
907 | skill = op->chosen_skill; |
893 | if (!tmp) |
908 | else |
|
|
909 | { |
894 | { |
910 | skill = find_player_hth_skill (op); |
895 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
|
|
896 | return 0; |
|
|
897 | } |
911 | |
898 | |
|
|
899 | change_skill (op, find_skill_by_name (op, tmp->skill), 1); |
|
|
900 | } |
|
|
901 | else |
|
|
902 | { |
912 | if (!skill) |
903 | if (!skill) |
|
|
904 | { |
|
|
905 | /* See if the players chosen skill is a combat skill, and use |
|
|
906 | * it if appropriate. |
|
|
907 | */ |
|
|
908 | if (op->chosen_skill && hth_skill_p (op->chosen_skill)) |
|
|
909 | skill = op->chosen_skill; |
|
|
910 | else |
913 | { |
911 | { |
|
|
912 | skill = find_player_hth_skill (op); |
|
|
913 | |
|
|
914 | if (!skill) |
|
|
915 | { |
914 | new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); |
916 | new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!"); |
915 | return 0; |
917 | return 0; |
|
|
918 | } |
916 | } |
919 | } |
917 | } |
920 | } |
|
|
921 | |
|
|
922 | /* now try to ready the new skill */ |
|
|
923 | if (!change_skill (op, skill, 0)) |
|
|
924 | { /* oh oh, trouble! */ |
|
|
925 | new_draw_info_format (NDI_UNIQUE, 0, op, "Couldn't change to skill %s", &skill->name); |
|
|
926 | return 0; |
|
|
927 | } |
918 | } |
928 | } |
919 | |
929 | |
920 | /* now try to ready the new skill */ |
930 | if (!pl->combat_ob) |
921 | if (!change_skill (op, skill, 0)) |
931 | { |
922 | { /* oh oh, trouble! */ |
932 | LOG (llevError, "Could not find anything to attack on %s\n", &op->name); |
923 | new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name); |
|
|
924 | return 0; |
933 | return 0; |
925 | } |
934 | } |
926 | } |
935 | } |
927 | else |
936 | |
|
|
937 | if (!op->change_weapon (pl->combat_ob)) |
|
|
938 | return 0; |
|
|
939 | |
|
|
940 | /* lose invisiblity/hiding status for running attacks */ |
|
|
941 | if (pl->tmp_invis) |
928 | { |
942 | { |
929 | /* Seen some crashes below where current_weapon is not set, |
943 | pl->tmp_invis = 0; |
930 | * even though the flag says it is. So if current weapon isn't set, |
944 | op->invisible = 0; |
931 | * do some work in trying to find the object to use. |
945 | op->hide = 0; |
932 | */ |
946 | update_object (op, UP_OBJ_CHANGE); |
933 | if (!op->current_weapon) |
|
|
934 | { |
|
|
935 | object *tmp; |
|
|
936 | |
|
|
937 | LOG (llevError, "Player %s does not have current weapon set but flag_ready_weapon is set\n", &op->name); |
|
|
938 | for (tmp = op->inv; tmp; tmp = tmp->below) |
|
|
939 | if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED)) |
|
|
940 | break; |
|
|
941 | |
|
|
942 | if (!tmp) |
|
|
943 | { |
|
|
944 | LOG (llevError, "Could not find applied weapon on %s\n", &op->name); |
|
|
945 | op->current_weapon = NULL; |
|
|
946 | return 0; |
|
|
947 | } |
|
|
948 | else |
|
|
949 | op->current_weapon = tmp; |
|
|
950 | } |
|
|
951 | |
|
|
952 | change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1); |
|
|
953 | } |
947 | } |
954 | } |
|
|
955 | |
|
|
956 | /* lose invisiblity/hiding status for running attacks */ |
|
|
957 | |
|
|
958 | if (op->type == PLAYER && op->contr->tmp_invis) |
|
|
959 | { |
|
|
960 | op->contr->tmp_invis = 0; |
|
|
961 | op->invisible = 0; |
|
|
962 | op->hide = 0; |
|
|
963 | update_object (op, UP_OBJ_CHANGE); |
|
|
964 | } |
948 | } |
965 | |
949 | |
966 | int success = attack_ob (tmp, op); |
950 | int success = attack_ob (tmp, op); |
967 | |
951 | |
968 | /* print appropriate messages to the player */ |
952 | /* print appropriate messages to the player */ |
… | |
… | |
1039 | } |
1023 | } |
1040 | |
1024 | |
1041 | return do_skill_attack (tmp, pl, string, skill); |
1025 | return do_skill_attack (tmp, pl, string, skill); |
1042 | } |
1026 | } |
1043 | |
1027 | |
1044 | |
|
|
1045 | /* attack_hth() - this handles all hand-to-hand attacks -b.t. */ |
1028 | /* attack_hth() - this handles all hand-to-hand attacks -b.t. */ |
1046 | |
1029 | |
1047 | /* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first |
1030 | /* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first |
1048 | * (attack_hth) we check for weapon use, etc in the second (the new |
1031 | * (attack_hth) we check for weapon use, etc in the second (the new |
1049 | * function skill_attack() we actually attack. |
1032 | * function skill_attack() we actually attack. |
1050 | */ |
1033 | */ |
1051 | |
|
|
1052 | static int |
1034 | static int |
1053 | attack_hth (object *pl, int dir, const char *string, object *skill) |
1035 | attack_hth (object *pl, int dir, const char *string, object *skill) |
1054 | { |
1036 | { |
1055 | object *enemy = NULL, *weapon; |
1037 | object *enemy = NULL, *weapon; |
1056 | |
1038 | |
… | |
… | |
1065 | if (pl->type == PLAYER) |
1047 | if (pl->type == PLAYER) |
1066 | { |
1048 | { |
1067 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
1049 | new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack."); |
1068 | esrv_update_item (UPD_FLAGS, pl, weapon); |
1050 | esrv_update_item (UPD_FLAGS, pl, weapon); |
1069 | } |
1051 | } |
|
|
1052 | |
1070 | break; |
1053 | break; |
1071 | } |
1054 | } |
1072 | } |
1055 | } |
1073 | |
1056 | |
1074 | return skill_attack (enemy, pl, dir, string, skill); |
1057 | return skill_attack (enemy, pl, dir, string, skill); |