… | |
… | |
21 | * |
21 | * |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | #include <global.h> |
25 | #include <global.h> |
26 | #include <pwd.h> |
|
|
27 | #include <sproto.h> |
26 | #include <sproto.h> |
28 | #include <sounds.h> |
27 | #include <sounds.h> |
29 | #include <living.h> |
28 | #include <living.h> |
30 | #include <object.h> |
29 | #include <object.h> |
31 | #include <spells.h> |
30 | #include <spells.h> |
… | |
… | |
116 | |
115 | |
117 | news[0] = '\0'; |
116 | news[0] = '\0'; |
118 | subject[0] = '\0'; |
117 | subject[0] = '\0'; |
119 | size = 0; |
118 | size = 0; |
120 | |
119 | |
121 | while (fgets (buf, MAX_BUF, fp) != NULL) |
120 | while (fgets (buf, MAX_BUF, fp)) |
122 | { |
121 | { |
123 | if (*buf == '#') |
122 | if (*buf == '#') |
124 | continue; |
123 | continue; |
125 | |
124 | |
126 | if (*buf == '%') |
125 | if (*buf == '%') |
127 | { /* send one news */ |
126 | { /* send one news */ |
128 | if (size > 0) |
127 | if (size > 0) |
129 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ |
128 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */ |
130 | |
129 | |
131 | strcpy (subject, buf + 1); |
130 | strcpy (subject, buf + 1); |
132 | strip_endline (subject); |
131 | strip_endline (subject); |
133 | size = 0; |
132 | size = 0; |
134 | news[0] = '\0'; |
133 | news[0] = '\0'; |
… | |
… | |
144 | size += strlen (buf); |
143 | size += strlen (buf); |
145 | } |
144 | } |
146 | } |
145 | } |
147 | |
146 | |
148 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
147 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
149 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); |
148 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); |
150 | close_and_delete (fp, comp); |
149 | close_and_delete (fp, comp); |
151 | } |
150 | } |
152 | |
151 | |
153 | /* This loads the first map an puts the player on it. */ |
152 | /* This loads the first map an puts the player on it. */ |
154 | static void |
153 | static void |
… | |
… | |
194 | return; |
193 | return; |
195 | |
194 | |
196 | terminate_all_pets (ob); |
195 | terminate_all_pets (ob); |
197 | remove_friendly_object (ob); |
196 | remove_friendly_object (ob); |
198 | ob->deactivate_recursive (); |
197 | ob->deactivate_recursive (); |
|
|
198 | |
|
|
199 | if (ob->map) |
199 | maplevel = ob->map->path; |
200 | maplevel = ob->map->path; |
|
|
201 | |
200 | ob->remove (); |
202 | ob->remove (); |
201 | ob->map = 0; |
203 | ob->map = 0; |
|
|
204 | party = 0; |
202 | |
205 | |
203 | // for weird reasons, this is often "ob", keeping a circular reference |
206 | combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this |
204 | ranges [range_skill] = 0; |
|
|
205 | |
207 | |
206 | players.erase (this); |
208 | players.erase (this); |
207 | } |
209 | } |
208 | |
210 | |
209 | // connect the player with a specific client |
211 | // connect the player with a specific client |
210 | // also changed, rationalises, and fixes some incorrect settings |
212 | // also changes, rationalises, and fixes some incorrect settings |
211 | void |
213 | void |
212 | player::connect (client *ns) |
214 | player::connect (client *ns) |
213 | { |
215 | { |
214 | this->ns = ns; |
216 | this->ns = ns; |
215 | ns->pl = this; |
217 | ns->pl = this; |
216 | |
218 | |
217 | run_on = 0; |
219 | run_on = 0; |
218 | fire_on = 0; |
220 | fire_on = 0; |
219 | ob->container = 0; //TODO: client-specific |
221 | ob->close_container (); //TODO: client-specific |
220 | |
222 | |
221 | ns->update_look = 0; |
223 | ns->update_look = 0; |
222 | ns->look_position = 0; |
224 | ns->look_position = 0; |
223 | |
225 | |
224 | clear_los (ob); |
226 | clear_los (ob); |
… | |
… | |
227 | |
229 | |
228 | /* make sure he's a player -- needed because of class change. */ |
230 | /* make sure he's a player -- needed because of class change. */ |
229 | ob->type = PLAYER; // we are paranoid |
231 | ob->type = PLAYER; // we are paranoid |
230 | ob->race = ob->arch->clone.race; |
232 | ob->race = ob->arch->clone.race; |
231 | |
233 | |
232 | if (!legal_range (ob, shoottype)) |
|
|
233 | shoottype = range_none; |
|
|
234 | |
|
|
235 | ob->carrying = sum_weight (ob); |
234 | ob->carrying = sum_weight (ob); |
236 | link_player_skills (ob); |
235 | link_player_skills (ob); |
237 | |
236 | |
238 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
237 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
239 | |
238 | |
240 | assign (title, ob->arch->clone.name); |
239 | assign (title, ob->arch->clone.name); |
241 | |
|
|
242 | /* can_use_shield is a new flag. However, the can_use.. seems to largely come |
|
|
243 | * from the class, and not race. I don't see any way to get the class information |
|
|
244 | * to then update this. I don't think this will actually break anything - anyone |
|
|
245 | * that can use armour should be able to use a shield. What this may 'break' |
|
|
246 | * are features new characters get, eg, if someone starts up with a Q, they |
|
|
247 | * should be able to use a shield. However, old Q's won't get that advantage. |
|
|
248 | */ |
|
|
249 | if (QUERY_FLAG (ob, FLAG_USE_ARMOUR)) |
|
|
250 | SET_FLAG (ob, FLAG_USE_SHIELD); |
|
|
251 | |
240 | |
252 | /* if it's a dragon player, set the correct title here */ |
241 | /* if it's a dragon player, set the correct title here */ |
253 | if (is_dragon_pl (ob)) |
242 | if (is_dragon_pl (ob)) |
254 | { |
243 | { |
255 | object *tmp, *abil = 0, *skin = 0; |
244 | object *tmp, *abil = 0, *skin = 0; |
… | |
… | |
269 | |
258 | |
270 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
259 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
271 | |
260 | |
272 | esrv_new_player (this, ob->weight + ob->carrying); |
261 | esrv_new_player (this, ob->weight + ob->carrying); |
273 | |
262 | |
|
|
263 | for (object *op = ob->inv; op; op = op->below) |
|
|
264 | if (op->flag [FLAG_APPLIED]) |
|
|
265 | switch (op->type) |
|
|
266 | { |
|
|
267 | case WAND: |
|
|
268 | case ROD: |
|
|
269 | case HORN: |
|
|
270 | case BOW: |
|
|
271 | case SKILL: |
|
|
272 | case SKILL_TOOL: |
|
|
273 | case WEAPON: |
|
|
274 | fprintf (stderr, "applied<%s>\n", &op->name);//D |
|
|
275 | apply_special (ob, op, AP_UNAPPLY); |
|
|
276 | apply_special (ob, op, AP_APPLY); |
|
|
277 | break; |
|
|
278 | } |
|
|
279 | |
274 | ob->update_stats (); |
280 | ob->update_stats (); |
275 | ns->floorbox_update (); |
281 | ns->floorbox_update (); |
276 | |
282 | |
277 | esrv_send_inventory (ob, ob); |
283 | esrv_send_inventory (ob, ob); |
278 | esrv_add_spells (this, 0); |
284 | esrv_add_spells (this, 0); |
… | |
… | |
297 | |
303 | |
298 | INVOKE_PLAYER (DISCONNECT, this); |
304 | INVOKE_PLAYER (DISCONNECT, this); |
299 | |
305 | |
300 | ns->reset_stats (); |
306 | ns->reset_stats (); |
301 | ns->pl = 0; |
307 | ns->pl = 0; |
302 | this->ns = 0; |
308 | ns = 0; |
303 | } |
309 | } |
304 | |
310 | |
|
|
311 | if (ob) |
305 | ob->container = 0; //TODO: client-specific |
312 | ob->close_container (); //TODO: client-specific |
|
|
313 | |
306 | deactivate (); |
314 | deactivate (); |
307 | } |
315 | } |
308 | |
316 | |
309 | // the need for this function can be explained |
317 | // the need for this function can be explained |
310 | // by load_object not returning the object |
318 | // by load_object not returning the object |
311 | void |
319 | void |
312 | player::set_object (object *op) |
320 | player::set_object (object *op) |
313 | { |
321 | { |
314 | ob = op; |
322 | ob = op; |
315 | ob->contr = this; /* this aren't yet in archetype */ |
323 | ob->contr = this; /* this aren't yet in archetype */ |
316 | |
324 | |
317 | ob->speed_left = 0.5; |
325 | ob->speed_left = 0.5; |
318 | ob->speed = 1.0; |
326 | ob->speed = 1.0; |
319 | ob->direction = 5; /* So player faces south */ |
327 | ob->direction = 5; /* So player faces south */ |
320 | ob->stats.wc = 2; |
|
|
321 | ob->run_away = 25; /* Then we panick... */ |
|
|
322 | |
|
|
323 | ob->roll_stats (); |
|
|
324 | } |
328 | } |
325 | |
329 | |
326 | player::player () |
330 | player::player () |
327 | { |
331 | { |
328 | /* There are some elements we want initialised to non zero value - |
332 | /* There are some elements we want initialised to non zero value - |
329 | * we deal with that below this point. |
333 | * we deal with that below this point. |
330 | */ |
334 | */ |
331 | outputs_sync = 16; /* Every 2 seconds */ |
335 | outputs_sync = 4; |
332 | outputs_count = 8; /* Keeps present behaviour */ |
336 | outputs_count = 4; |
333 | unapply = unapply_nochoice; |
337 | unapply = unapply_nochoice; |
334 | |
338 | |
335 | savebed_map = first_map_path; /* Init. respawn position */ |
339 | savebed_map = first_map_path; /* Init. respawn position */ |
336 | |
340 | |
337 | gen_sp_armour = 10; |
341 | gen_sp_armour = 10; |
338 | shoottype = range_none; |
|
|
339 | bowtype = bow_normal; |
342 | bowtype = bow_normal; |
340 | petmode = pet_normal; |
343 | petmode = pet_normal; |
341 | listening = 10; |
344 | listening = 10; |
342 | usekeys = containers; |
345 | usekeys = containers; |
343 | peaceful = 1; /* default peaceful */ |
346 | peaceful = 1; /* default peaceful */ |
… | |
… | |
372 | player::create () |
375 | player::create () |
373 | { |
376 | { |
374 | player *pl = new player; |
377 | player *pl = new player; |
375 | |
378 | |
376 | pl->set_object (arch_to_object (get_player_archetype (0))); |
379 | pl->set_object (arch_to_object (get_player_archetype (0))); |
|
|
380 | |
|
|
381 | pl->ob->roll_stats (); |
|
|
382 | pl->ob->stats.wc = 2; |
|
|
383 | pl->ob->run_away = 25; /* Then we panick... */ |
|
|
384 | |
377 | set_first_map (pl->ob); |
385 | set_first_map (pl->ob); |
378 | |
386 | |
379 | return pl; |
387 | return pl; |
380 | } |
388 | } |
381 | |
389 | |
… | |
… | |
527 | x = mon->x; |
535 | x = mon->x; |
528 | y = mon->y; |
536 | y = mon->y; |
529 | m = mon->map; |
537 | m = mon->map; |
530 | dir = rv.direction; |
538 | dir = rv.direction; |
531 | lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ |
539 | lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ |
532 | diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); |
540 | diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); |
|
|
541 | |
533 | /* If we can't solve it within the search distance, return now. */ |
542 | /* If we can't solve it within the search distance, return now. */ |
534 | if (diff > max) |
543 | if (diff > max) |
535 | return 0; |
544 | return 0; |
|
|
545 | |
536 | while (diff > 1 && max > 0) |
546 | while (diff > 1 && max > 0) |
537 | { |
547 | { |
538 | lastx = x; |
548 | lastx = x; |
539 | lasty = y; |
549 | lasty = y; |
540 | lastmap = m; |
550 | lastmap = m; |
… | |
… | |
622 | max--; |
632 | max--; |
623 | lastdir = dir; |
633 | lastdir = dir; |
624 | if (!firstdir) |
634 | if (!firstdir) |
625 | firstdir = dir; |
635 | firstdir = dir; |
626 | } |
636 | } |
|
|
637 | |
627 | if (diff <= 1) |
638 | if (diff <= 1) |
628 | { |
639 | { |
629 | /* Recalculate diff (distance) because we may not have actually |
640 | /* Recalculate diff (distance) because we may not have actually |
630 | * headed toward player for entire distance. |
641 | * headed toward player for entire distance. |
631 | */ |
642 | */ |
632 | get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); |
643 | get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); |
633 | diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); |
644 | diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); |
634 | } |
645 | } |
|
|
646 | |
635 | if (diff > max) |
647 | if (diff > max) |
636 | return 0; |
648 | return 0; |
637 | } |
649 | } |
|
|
650 | |
638 | /* If we reached the max, didn't find a direction in time */ |
651 | /* If we reached the max, didn't find a direction in time */ |
639 | if (!max) |
652 | if (!max) |
640 | return 0; |
653 | return 0; |
641 | |
654 | |
642 | return firstdir; |
655 | return firstdir; |
… | |
… | |
866 | * appropriate action with it (change race, or other things). |
879 | * appropriate action with it (change race, or other things). |
867 | * The function name is for historical reasons - now we have |
880 | * The function name is for historical reasons - now we have |
868 | * separate race and class; this actually changes the RACE, |
881 | * separate race and class; this actually changes the RACE, |
869 | * not the class. |
882 | * not the class. |
870 | */ |
883 | */ |
871 | int |
884 | void |
872 | key_change_class (object *op, char key) |
885 | player::chargen_race_done () |
873 | { |
886 | { |
874 | int tmp_loop; |
|
|
875 | |
|
|
876 | if (key == 'd' || key == 'D') |
|
|
877 | { |
|
|
878 | char buf[MAX_BUF]; |
|
|
879 | |
|
|
880 | /* this must before then initial items are given */ |
887 | /* this must before then initial items are given */ |
881 | esrv_new_player (op->contr, op->weight + op->carrying); |
888 | esrv_new_player (ob->contr, ob->weight + ob->carrying); |
882 | |
889 | |
883 | treasurelist *tl = find_treasurelist ("starting_wealth"); |
890 | treasurelist *tl = treasurelist::find ("starting_wealth"); |
884 | if (tl) |
891 | if (tl) |
885 | create_treasure (tl, op, 0, 0, 0); |
892 | create_treasure (tl, ob, 0, 0, 0); |
886 | |
893 | |
887 | INVOKE_PLAYER (BIRTH, op->contr); |
894 | INVOKE_PLAYER (BIRTH, ob->contr); |
888 | INVOKE_PLAYER (LOGIN, op->contr); |
895 | INVOKE_PLAYER (LOGIN, ob->contr); |
889 | |
896 | |
890 | op->contr->ns->state = ST_PLAYING; |
897 | ob->contr->ns->state = ST_PLAYING; |
891 | |
898 | |
892 | if (op->msg) |
899 | if (ob->msg) |
893 | op->msg = NULL; |
900 | ob->msg = 0; |
894 | |
901 | |
895 | /* We create this now because some of the unique maps will need it |
902 | /* We create this now because some of the unique maps will need it |
896 | * to save here. |
903 | * to save here. |
897 | */ |
904 | */ |
|
|
905 | { |
|
|
906 | char buf[MAX_BUF]; |
898 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
907 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name); |
899 | make_path_to_file (buf); |
908 | make_path_to_file (buf); |
|
|
909 | } |
900 | |
910 | |
901 | start_info (op); |
911 | start_info (ob); |
902 | CLEAR_FLAG (op, FLAG_WIZ); |
912 | CLEAR_FLAG (ob, FLAG_WIZ); |
903 | give_initial_items (op, op->randomitems); |
913 | give_initial_items (ob, ob->randomitems); |
904 | link_player_skills (op); |
914 | link_player_skills (ob); |
905 | esrv_send_inventory (op, op); |
915 | esrv_send_inventory (ob, ob); |
906 | op->update_stats (); |
916 | ob->update_stats (); |
907 | |
917 | |
908 | /* This moves the player to a different start map, if there |
918 | /* This moves the player to a different start map, if there |
909 | * is one for this race |
919 | * is one for this race |
910 | */ |
920 | */ |
911 | if (*first_map_ext_path) |
921 | if (*first_map_ext_path) |
912 | { |
922 | { |
913 | object *tmp; |
923 | object *tmp; |
914 | char mapname[MAX_BUF]; |
924 | char mapname[MAX_BUF]; |
915 | |
925 | |
916 | snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); |
926 | snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name); |
917 | tmp = object::create (); |
927 | tmp = object::create (); |
918 | EXIT_PATH (tmp) = mapname; |
928 | EXIT_PATH (tmp) = mapname; |
919 | EXIT_X (tmp) = op->x; |
929 | EXIT_X (tmp) = ob->x; |
920 | EXIT_Y (tmp) = op->y; |
930 | EXIT_Y (tmp) = ob->y; |
921 | op->enter_exit (tmp); /* we don't really care if it succeeded; |
931 | ob->enter_exit (tmp); /* we don't really care if it succeeded; |
922 | * if the map isn't there, then stay on the |
932 | * if the map isn't there, then stay on the |
923 | * default initial map */ |
933 | * default initial map */ |
924 | tmp->destroy (); |
934 | tmp->destroy (); |
925 | } |
935 | } |
926 | else |
936 | else |
927 | LOG (llevDebug, "first_map_ext_path not set\n"); |
937 | LOG (llevDebug, "first_map_ext_path not set\n"); |
|
|
938 | } |
928 | |
939 | |
929 | return 0; |
940 | void |
930 | } |
941 | player::chargen_race_next () |
931 | |
942 | { |
932 | /* Following actually changes the race - this is the default command |
943 | /* Following actually changes the race - this is the default command |
933 | * if we don't match with one of the options above. |
944 | * if we don't match with one of the options above. |
934 | */ |
945 | */ |
935 | |
946 | |
936 | tmp_loop = 0; |
947 | do |
937 | while (!tmp_loop) |
|
|
938 | { |
948 | { |
939 | shstr name = op->name; |
949 | shstr name = ob->name; |
940 | int x = op->x, y = op->y; |
950 | int x = ob->x, y = ob->y; |
941 | |
951 | |
942 | op->remove_statbonus (); |
952 | ob->remove_statbonus (); |
943 | op->remove (); |
953 | ob->remove (); |
944 | op->arch = get_player_archetype (op->arch); |
954 | ob->arch = get_player_archetype (ob->arch); |
945 | op->arch->clone.copy_to (op); |
955 | ob->arch->clone.copy_to (ob); |
946 | op->instantiate (); |
956 | ob->instantiate (); |
947 | op->stats = op->contr->orig_stats; |
957 | ob->stats = ob->contr->orig_stats; |
948 | op->name = op->name_pl = name; |
958 | ob->name = ob->name_pl = name; |
949 | op->x = x; |
959 | ob->x = x; |
950 | op->y = y; |
960 | ob->y = y; |
951 | SET_ANIMATION (op, 2); /* So player faces south */ |
961 | SET_ANIMATION (ob, 2); /* So player faces south */ |
952 | insert_ob_in_map (op, op->map, op, 0); |
962 | insert_ob_in_map (ob, ob->map, ob, 0); |
953 | assign (op->contr->title, op->arch->clone.name); |
963 | assign (ob->contr->title, ob->arch->clone.name); |
954 | op->add_statbonus (); |
964 | ob->add_statbonus (); |
955 | tmp_loop = allowed_class (op); |
|
|
956 | } |
965 | } |
|
|
966 | while (!allowed_class (ob)); |
957 | |
967 | |
958 | update_object (op, UP_OBJ_FACE); |
968 | update_object (ob, UP_OBJ_FACE); |
959 | esrv_update_item (UPD_FACE, op, op); |
969 | esrv_update_item (UPD_FACE, ob, ob); |
960 | op->update_stats (); |
970 | ob->update_stats (); |
961 | op->stats.hp = op->stats.maxhp; |
971 | ob->stats.hp = ob->stats.maxhp; |
962 | op->stats.sp = op->stats.maxsp; |
972 | ob->stats.sp = ob->stats.maxsp; |
963 | op->stats.grace = 0; |
973 | ob->stats.grace = 0; |
964 | |
|
|
965 | if (op->msg) |
|
|
966 | new_draw_info (NDI_BLUE, 0, op, op->msg); |
|
|
967 | |
|
|
968 | send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); |
|
|
969 | return 0; |
|
|
970 | } |
974 | } |
971 | |
975 | |
972 | void |
976 | void |
973 | flee_player (object *op) |
977 | flee_player (object *op) |
974 | { |
978 | { |
… | |
… | |
1021 | /* Cornered, get rid of scared */ |
1025 | /* Cornered, get rid of scared */ |
1022 | CLEAR_FLAG (op, FLAG_SCARED); |
1026 | CLEAR_FLAG (op, FLAG_SCARED); |
1023 | op->enemy = NULL; |
1027 | op->enemy = NULL; |
1024 | } |
1028 | } |
1025 | |
1029 | |
1026 | |
|
|
1027 | /* check_pick sees if there is stuff to be picked up/picks up stuff. |
1030 | /* check_pick sees if there is stuff to be picked up/picks up stuff. |
1028 | * IT returns 1 if the player should keep on moving, 0 if he should |
1031 | * It returns 1 if the player should keep on moving, 0 if he should |
1029 | * stop. |
1032 | * stop. |
1030 | */ |
1033 | */ |
1031 | int |
1034 | int |
1032 | check_pick (object *op) |
1035 | check_pick (object *op) |
1033 | { |
1036 | { |
1034 | object *tmp, *next; |
1037 | object *tmp, *next; |
1035 | int stop = 0; |
1038 | int stop = 0; |
1036 | int j, k, wvratio; |
1039 | int wvratio; |
1037 | char putstring[128], tmpstr[16]; |
1040 | char putstring[128]; |
1038 | |
1041 | |
1039 | /* if you're flying, you cna't pick up anything */ |
1042 | /* if you're flying, you cna't pick up anything */ |
1040 | if (op->move_type & MOVE_FLYING) |
1043 | if (op->move_type & MOVE_FLYING) |
1041 | return 1; |
1044 | return 1; |
1042 | |
1045 | |
… | |
… | |
1379 | * found object is returned. |
1382 | * found object is returned. |
1380 | */ |
1383 | */ |
1381 | object * |
1384 | object * |
1382 | find_arrow (object *op, const char *type) |
1385 | find_arrow (object *op, const char *type) |
1383 | { |
1386 | { |
1384 | object *tmp = NULL; |
1387 | object *tmp = 0; |
1385 | |
1388 | |
1386 | for (op = op->inv; op; op = op->below) |
1389 | for (op = op->inv; op; op = op->below) |
1387 | if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) |
1390 | if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) |
1388 | tmp = find_arrow (op, type); |
1391 | tmp = find_arrow (op, type); |
1389 | else if (op->type == ARROW && op->race == type) |
1392 | else if (op->type == ARROW && op->race == type) |
1390 | return op; |
1393 | return op; |
|
|
1394 | |
1391 | return tmp; |
1395 | return tmp; |
1392 | } |
1396 | } |
1393 | |
1397 | |
1394 | /* |
1398 | /* |
1395 | * Similar to find_arrow, but looks for (roughly) the best arrow to use |
1399 | * Similar to find_arrow, but looks for (roughly) the best arrow to use |
1396 | * against the target. A full test is not performed, simply a basic test |
1400 | * against the target. A full test is not performed, simply a basic test |
1397 | * of resistances. The archer is making a quick guess at what he sees down |
1401 | * of resistances. The archer is making a quick guess at what he sees down |
1398 | * the hall. Failing that it does it's best to pick the highest plus arrow. |
1402 | * the hall. Failing that it does it's best to pick the highest plus arrow. |
1399 | */ |
1403 | */ |
1400 | |
|
|
1401 | object * |
1404 | object * |
1402 | find_better_arrow (object *op, object *target, const char *type, int *better) |
1405 | find_better_arrow (object *op, object *target, const char *type, int *better) |
1403 | { |
1406 | { |
1404 | object *tmp = NULL, *arrow, *ntmp; |
1407 | object *tmp = NULL, *arrow, *ntmp; |
1405 | int attacknum, attacktype, betterby = 0, i; |
1408 | int attacknum, attacktype, betterby = 0, i; |
… | |
… | |
1471 | * find_better_arrow to find a decent arrow to use. |
1474 | * find_better_arrow to find a decent arrow to use. |
1472 | * op = the shooter |
1475 | * op = the shooter |
1473 | * type = bow->race |
1476 | * type = bow->race |
1474 | * dir = fire direction |
1477 | * dir = fire direction |
1475 | */ |
1478 | */ |
1476 | |
|
|
1477 | object * |
1479 | object * |
1478 | pick_arrow_target (object *op, const char *type, int dir) |
1480 | pick_arrow_target (object *op, const char *type, int dir) |
1479 | { |
1481 | { |
1480 | object *tmp = NULL; |
1482 | object *tmp = NULL; |
1481 | maptile *m; |
1483 | maptile *m; |
… | |
… | |
1555 | { |
1557 | { |
1556 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1558 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1557 | return 0; |
1559 | return 0; |
1558 | } |
1560 | } |
1559 | |
1561 | |
1560 | if (op->type == PLAYER) |
1562 | if (player *pl = op->contr) |
1561 | bow = op->contr->ranges[range_bow]; |
1563 | { |
|
|
1564 | bow = pl->ranged_ob; |
|
|
1565 | op->set_weapon (bow); |
|
|
1566 | } |
1562 | else |
1567 | else |
1563 | { |
1568 | { |
1564 | for (bow = op->inv; bow; bow = bow->below) |
1569 | for (bow = op->inv; bow; bow = bow->below) |
1565 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1570 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1566 | * don't need to switch back and forth between bows and weapons. |
1571 | * don't need to switch back and forth between bows and weapons. |
… | |
… | |
1571 | if (!bow) |
1576 | if (!bow) |
1572 | { |
1577 | { |
1573 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1578 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1574 | return 0; |
1579 | return 0; |
1575 | } |
1580 | } |
|
|
1581 | |
|
|
1582 | // optimisation: move object to top so we will find it quickly again |
|
|
1583 | if (bow->below) |
|
|
1584 | { |
|
|
1585 | bow->remove (); |
|
|
1586 | op->insert (bow); |
|
|
1587 | } |
|
|
1588 | |
1576 | } |
1589 | } |
1577 | |
1590 | |
1578 | if (!bow->race || !bow->skill) |
1591 | if (!bow->race || !bow->skill) |
1579 | { |
1592 | { |
1580 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
1593 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
… | |
… | |
1597 | if (op->type == PLAYER) |
1610 | if (op->type == PLAYER) |
1598 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1611 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1599 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1612 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1600 | else |
1613 | else |
1601 | CLEAR_FLAG (op, FLAG_READY_BOW); |
1614 | CLEAR_FLAG (op, FLAG_READY_BOW); |
|
|
1615 | |
1602 | return 0; |
1616 | return 0; |
1603 | } |
1617 | } |
1604 | } |
1618 | } |
1605 | |
1619 | |
1606 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
1620 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
… | |
… | |
1637 | op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; |
1651 | op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; |
1638 | op->update_stats (); |
1652 | op->update_stats (); |
1639 | } |
1653 | } |
1640 | |
1654 | |
1641 | SET_ANIMATION (arrow, arrow->direction); |
1655 | SET_ANIMATION (arrow, arrow->direction); |
|
|
1656 | |
1642 | arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ |
1657 | arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ |
1643 | arrow->stats.hp = arrow->stats.dam; |
1658 | arrow->stats.hp = arrow->stats.dam; |
1644 | arrow->stats.grace = arrow->attacktype; |
1659 | arrow->stats.grace = arrow->attacktype; |
|
|
1660 | |
1645 | if (arrow->slaying != NULL) |
1661 | if (arrow->slaying) |
1646 | arrow->spellarg = strdup (arrow->slaying); |
1662 | arrow->spellarg = strdup (arrow->slaying); |
1647 | |
1663 | |
1648 | /* Note that this was different for monsters - they got their level |
1664 | arrow->stats.dam += op->stats.dam + arrow->magic; |
1649 | * added to the damage. I think the strength bonus is more proper. |
|
|
1650 | */ |
|
|
1651 | |
|
|
1652 | arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic; |
|
|
1653 | |
1665 | |
1654 | /* update the speed */ |
1666 | /* update the speed */ |
1655 | arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? |
1667 | arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? |
1656 | 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; |
1668 | 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; |
1657 | |
1669 | |
1658 | arrow->set_speed (max (arrow->speed, 1.0)); |
1670 | arrow->set_speed (max (arrow->speed, 1.0)); |
1659 | arrow->speed_left = 0; |
1671 | arrow->speed_left = 0; |
1660 | |
1672 | |
|
|
1673 | arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; |
|
|
1674 | |
1661 | if (op->type == PLAYER) |
1675 | if (op->type == PLAYER) |
1662 | { |
1676 | { |
1663 | arrow->stats.wc = 20 - bow->magic - arrow->magic - |
|
|
1664 | (op->chosen_skill ? op->chosen_skill->level : op->level) - |
|
|
1665 | dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod; |
|
|
1666 | |
|
|
1667 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
1677 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
|
|
1678 | arrow->stats.wc -= dex_bonus[op->stats.Dex]; |
|
|
1679 | |
|
|
1680 | if (!arrow->slaying) |
|
|
1681 | arrow->slaying = op->slaying; |
1668 | } |
1682 | } |
1669 | else |
1683 | else |
1670 | { |
1684 | { |
1671 | arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod; |
|
|
1672 | arrow->level = op->level; |
1685 | arrow->level = op->level; |
1673 | } |
1686 | arrow->stats.wc -= bow->magic; |
1674 | |
1687 | |
1675 | if (arrow->attacktype == AT_PHYSICAL) |
1688 | if (!arrow->slaying) |
|
|
1689 | arrow->slaying = bow->slaying; |
|
|
1690 | } |
|
|
1691 | |
|
|
1692 | arrow->stats.wc -= arrow->level; |
|
|
1693 | |
1676 | arrow->attacktype |= bow->attacktype; |
1694 | arrow->attacktype |= bow->attacktype; |
1677 | |
|
|
1678 | if (bow->slaying) |
|
|
1679 | arrow->slaying = bow->slaying; |
|
|
1680 | |
1695 | |
1681 | arrow->move_type = MOVE_FLY_LOW; |
1696 | arrow->move_type = MOVE_FLY_LOW; |
1682 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1697 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1683 | |
1698 | |
1684 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
1699 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
… | |
… | |
1710 | { |
1725 | { |
1711 | int ret = 0, wcmod = 0; |
1726 | int ret = 0, wcmod = 0; |
1712 | |
1727 | |
1713 | if (op->contr->bowtype == bow_bestarrow) |
1728 | if (op->contr->bowtype == bow_bestarrow) |
1714 | { |
1729 | { |
1715 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); |
1730 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); |
1716 | } |
1731 | } |
1717 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1732 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1718 | { |
1733 | { |
1719 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1734 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1720 | wcmod = -1; |
1735 | wcmod = -1; |
… | |
… | |
1730 | else if (op->contr->bowtype == bow_spreadshot) |
1745 | else if (op->contr->bowtype == bow_spreadshot) |
1731 | { |
1746 | { |
1732 | ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1747 | ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1733 | ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); |
1748 | ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); |
1734 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1749 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1735 | |
|
|
1736 | } |
1750 | } |
1737 | else |
1751 | else |
1738 | { |
1752 | { |
1739 | /* Simple case */ |
1753 | /* Simple case */ |
1740 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1754 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1741 | } |
1755 | } |
|
|
1756 | |
1742 | return ret; |
1757 | return ret; |
1743 | } |
1758 | } |
1744 | |
1759 | |
1745 | |
1760 | |
1746 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1761 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1747 | * Broken apart from 'fire' to keep it more readable. |
1762 | * Broken apart from 'fire' to keep it more readable. |
1748 | */ |
1763 | */ |
1749 | void |
1764 | void |
1750 | fire_misc_object (object *op, int dir) |
1765 | fire_misc_object (object *op, int dir) |
1751 | { |
1766 | { |
1752 | object *item; |
1767 | object *item = op->contr->ranged_ob; |
1753 | |
1768 | |
1754 | if (!op->contr->ranges[range_misc]) |
1769 | if (!item) |
1755 | { |
1770 | { |
1756 | new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); |
1771 | new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); |
1757 | return; |
1772 | return; |
1758 | } |
1773 | } |
1759 | |
1774 | |
1760 | item = op->contr->ranges[range_misc]; |
|
|
1761 | if (!item->inv) |
1775 | if (!item->inv) |
1762 | { |
1776 | { |
1763 | LOG (llevError, "Object %s lacks a spell\n", &item->name); |
1777 | LOG (llevError, "Object %s lacks a spell\n", &item->name); |
1764 | return; |
1778 | return; |
1765 | } |
1779 | } |
|
|
1780 | |
|
|
1781 | op->set_weapon (item); |
|
|
1782 | |
1766 | if (item->type == WAND) |
1783 | if (item->type == WAND) |
1767 | { |
1784 | { |
1768 | if (item->stats.food <= 0) |
1785 | if (item->stats.food <= 0) |
1769 | { |
1786 | { |
1770 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1787 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1771 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
1788 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
|
|
1789 | |
1772 | return; |
1790 | return; |
1773 | } |
1791 | } |
1774 | } |
1792 | } |
1775 | else if (item->type == ROD || item->type == HORN) |
1793 | else if (item->type == ROD || item->type == HORN) |
1776 | { |
1794 | { |
1777 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1795 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1778 | { |
1796 | { |
1779 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1797 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
|
|
1798 | |
1780 | if (item->type == ROD) |
1799 | if (item->type == ROD) |
1781 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1800 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1782 | else |
1801 | else |
1783 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
1802 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
|
|
1803 | |
1784 | return; |
1804 | return; |
1785 | } |
1805 | } |
1786 | } |
1806 | } |
1787 | |
1807 | |
1788 | if (cast_spell (op, item, dir, item->inv, NULL)) |
1808 | if (cast_spell (op, item, dir, item->inv, NULL)) |
… | |
… | |
1819 | |
1839 | |
1820 | /* check for loss of invisiblity/hide */ |
1840 | /* check for loss of invisiblity/hide */ |
1821 | if (action_makes_visible (op)) |
1841 | if (action_makes_visible (op)) |
1822 | make_visible (op); |
1842 | make_visible (op); |
1823 | |
1843 | |
1824 | switch (op->contr->shoottype) |
1844 | player *pl = op->contr; |
|
|
1845 | |
|
|
1846 | if (pl->golem) |
1825 | { |
1847 | { |
1826 | case range_none: |
1848 | control_golem (op->contr->golem, dir); |
1827 | return; |
1849 | return; |
|
|
1850 | } |
1828 | |
1851 | |
1829 | case range_bow: |
1852 | object *ob = pl->ranged_ob; |
|
|
1853 | |
|
|
1854 | if (!ob) |
|
|
1855 | return; |
|
|
1856 | |
|
|
1857 | switch (ob->type) |
|
|
1858 | { |
|
|
1859 | case BOW: |
1830 | player_fire_bow (op, dir); |
1860 | player_fire_bow (op, dir); |
1831 | return; |
1861 | break; |
1832 | |
1862 | |
1833 | case range_magic: /* Casting spells */ |
1863 | case SPELL: |
1834 | spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); |
1864 | spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); |
1835 | return; |
1865 | break; |
1836 | |
1866 | |
1837 | case range_misc: |
1867 | case BUILDER: |
|
|
1868 | apply_map_builder (op, dir); |
|
|
1869 | break; |
|
|
1870 | |
|
|
1871 | case SKILL: |
|
|
1872 | case SKILL_TOOL: |
|
|
1873 | do_skill (op, op, ob, dir, 0); |
|
|
1874 | break; |
|
|
1875 | |
|
|
1876 | default: |
1838 | fire_misc_object (op, dir); |
1877 | fire_misc_object (op, dir); |
1839 | return; |
1878 | break; |
1840 | |
|
|
1841 | case range_golem: /* Control summoned monsters from scrolls */ |
|
|
1842 | if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED)) |
|
|
1843 | { |
|
|
1844 | op->contr->ranges[range_golem] = 0; |
|
|
1845 | op->contr->shoottype = range_none; |
|
|
1846 | } |
|
|
1847 | else |
|
|
1848 | control_golem (op->contr->ranges[range_golem], dir); |
|
|
1849 | return; |
|
|
1850 | |
|
|
1851 | case range_skill: |
|
|
1852 | if (!op->chosen_skill) |
|
|
1853 | { |
|
|
1854 | if (op->type == PLAYER) |
|
|
1855 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
|
|
1856 | return; |
|
|
1857 | } |
|
|
1858 | |
|
|
1859 | do_skill (op, op, op->chosen_skill, dir, NULL); |
|
|
1860 | return; |
|
|
1861 | case range_builder: |
|
|
1862 | apply_map_builder (op, dir); |
|
|
1863 | return; |
|
|
1864 | default: |
|
|
1865 | new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); |
|
|
1866 | return; |
|
|
1867 | } |
1879 | } |
1868 | } |
1880 | } |
1869 | |
|
|
1870 | |
|
|
1871 | |
1881 | |
1872 | /* find_key |
1882 | /* find_key |
1873 | * We try to find a key for the door as passed. If we find a key |
1883 | * We try to find a key for the door as passed. If we find a key |
1874 | * and successfully use it, we return the key, otherwise NULL |
1884 | * and successfully use it, we return the key, otherwise NULL |
1875 | * This function merges both normal and locked door, since the logic |
1885 | * This function merges both normal and locked door, since the logic |
… | |
… | |
1877 | * pl is the player, |
1887 | * pl is the player, |
1878 | * inv is the objects inventory to searched |
1888 | * inv is the objects inventory to searched |
1879 | * door is the door we are trying to match against. |
1889 | * door is the door we are trying to match against. |
1880 | * This function can be called recursively to search containers. |
1890 | * This function can be called recursively to search containers. |
1881 | */ |
1891 | */ |
1882 | |
|
|
1883 | object * |
1892 | object * |
1884 | find_key (object *pl, object *container, object *door) |
1893 | find_key (object *pl, object *container, object *door) |
1885 | { |
1894 | { |
1886 | object *tmp, *key; |
1895 | object *tmp, *key; |
1887 | |
1896 | |
1888 | /* Should not happen, but sanity checking is never bad */ |
1897 | /* Should not happen, but sanity checking is never bad */ |
1889 | if (container->inv == NULL) |
1898 | if (!container->inv) |
1890 | return NULL; |
1899 | return 0; |
1891 | |
1900 | |
1892 | /* First, lets try to find a key in the top level inventory */ |
1901 | /* First, lets try to find a key in the top level inventory */ |
1893 | for (tmp = container->inv; tmp != NULL; tmp = tmp->below) |
1902 | for (tmp = container->inv; tmp; tmp = tmp->below) |
1894 | { |
1903 | { |
1895 | if (door->type == DOOR && tmp->type == KEY) |
1904 | if (door->type == DOOR && tmp->type == KEY) |
1896 | break; |
1905 | break; |
1897 | /* For sanity, we should really check door type, but other stuff |
1906 | /* For sanity, we should really check door type, but other stuff |
1898 | * (like containers) can be locked with special keys |
1907 | * (like containers) can be locked with special keys |
1899 | */ |
1908 | */ |
1900 | if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) |
1909 | if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) |
1901 | break; |
1910 | break; |
1902 | } |
1911 | } |
|
|
1912 | |
1903 | /* No key found - lets search inventories now */ |
1913 | /* No key found - lets search inventories now */ |
1904 | /* If we find and use a key in an inventory, return at that time. |
1914 | /* If we find and use a key in an inventory, return at that time. |
1905 | * otherwise, if we search all the inventories and still don't find |
1915 | * otherwise, if we search all the inventories and still don't find |
1906 | * a key, return |
1916 | * a key, return |
1907 | */ |
1917 | */ |
1908 | if (!tmp) |
1918 | if (!tmp) |
1909 | { |
1919 | { |
1910 | for (tmp = container->inv; tmp != NULL; tmp = tmp->below) |
1920 | for (tmp = container->inv; tmp; tmp = tmp->below) |
1911 | { |
1921 | { |
1912 | /* No reason to search empty containers */ |
1922 | /* No reason to search empty containers */ |
1913 | if (tmp->type == CONTAINER && tmp->inv) |
1923 | if (tmp->type == CONTAINER && tmp->inv) |
1914 | { |
1924 | { |
1915 | if ((key = find_key (pl, tmp, door)) != NULL) |
1925 | if ((key = find_key (pl, tmp, door))) |
1916 | return key; |
1926 | return key; |
1917 | } |
1927 | } |
1918 | } |
1928 | } |
|
|
1929 | |
1919 | if (!tmp) |
1930 | if (!tmp) |
1920 | return NULL; |
1931 | return NULL; |
1921 | } |
1932 | } |
|
|
1933 | |
1922 | /* We get down here if we have found a key. Now if its in a container, |
1934 | /* We get down here if we have found a key. Now if its in a container, |
1923 | * see if we actually want to use it |
1935 | * see if we actually want to use it |
1924 | */ |
1936 | */ |
1925 | if (pl != container) |
1937 | if (pl != container) |
1926 | { |
1938 | { |
… | |
… | |
1947 | new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, |
1959 | new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, |
1948 | "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); |
1960 | "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); |
1949 | return NULL; |
1961 | return NULL; |
1950 | } |
1962 | } |
1951 | } |
1963 | } |
|
|
1964 | |
1952 | return tmp; |
1965 | return tmp; |
1953 | } |
1966 | } |
1954 | |
1967 | |
1955 | /* moved door processing out of move_player_attack. |
1968 | /* moved door processing out of move_player_attack. |
1956 | * returns 1 if player has opened the door with a key |
1969 | * returns 1 if player has opened the door with a key |
… | |
… | |
1970 | if (key) |
1983 | if (key) |
1971 | { |
1984 | { |
1972 | object *container = key->env; |
1985 | object *container = key->env; |
1973 | |
1986 | |
1974 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
1987 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
|
|
1988 | |
1975 | if (action_makes_visible (op)) |
1989 | if (action_makes_visible (op)) |
1976 | make_visible (op); |
1990 | make_visible (op); |
|
|
1991 | |
1977 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1992 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1978 | spring_trap (door->inv, op); |
1993 | spring_trap (door->inv, op); |
|
|
1994 | |
1979 | if (door->type == DOOR) |
1995 | if (door->type == DOOR) |
1980 | { |
|
|
1981 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
1996 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
1982 | } |
|
|
1983 | else if (door->type == LOCKED_DOOR) |
1997 | else if (door->type == LOCKED_DOOR) |
1984 | { |
1998 | { |
1985 | new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); |
1999 | new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); |
1986 | remove_door2 (door); /* remove door without violence ;-) */ |
2000 | remove_door2 (door); /* remove door without violence ;-) */ |
1987 | } |
2001 | } |
|
|
2002 | |
1988 | /* Do this after we print the message */ |
2003 | /* Do this after we print the message */ |
1989 | decrease_ob (key); /* Use up one of the keys */ |
2004 | decrease_ob (key); /* Use up one of the keys */ |
1990 | /* Need to update the weight the container the key was in */ |
2005 | /* Need to update the weight the container the key was in */ |
1991 | if (container != op) |
2006 | if (container != op) |
1992 | esrv_update_item (UPD_WEIGHT, op, container); |
2007 | esrv_update_item (UPD_WEIGHT, op, container); |
|
|
2008 | |
1993 | return 1; /* Nothing more to do below */ |
2009 | return 1; /* Nothing more to do below */ |
1994 | } |
2010 | } |
1995 | else if (door->type == LOCKED_DOOR) |
2011 | else if (door->type == LOCKED_DOOR) |
1996 | { |
2012 | { |
1997 | /* Might as well return now - no other way to open this */ |
2013 | /* Might as well return now - no other way to open this */ |
1998 | new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); |
2014 | new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); |
1999 | return 1; |
2015 | return 1; |
2000 | } |
2016 | } |
|
|
2017 | |
2001 | return 0; |
2018 | return 0; |
2002 | } |
2019 | } |
2003 | |
2020 | |
2004 | /* This function is just part of a breakup from move_player. |
2021 | /* This function is just part of a breakup from move_player. |
2005 | * It should keep the code cleaner. |
2022 | * It should keep the code cleaner. |
… | |
… | |
2009 | */ |
2026 | */ |
2010 | void |
2027 | void |
2011 | move_player_attack (object *op, int dir) |
2028 | move_player_attack (object *op, int dir) |
2012 | { |
2029 | { |
2013 | object *tmp, *mon; |
2030 | object *tmp, *mon; |
2014 | sint16 nx, ny; |
|
|
2015 | int on_battleground; |
2031 | int on_battleground; |
2016 | maptile *m; |
2032 | maptile *m; |
2017 | |
2033 | |
2018 | nx = freearr_x[dir] + op->x; |
2034 | sint16 nx = freearr_x[dir] + op->x; |
2019 | ny = freearr_y[dir] + op->y; |
2035 | sint16 ny = freearr_y[dir] + op->y; |
2020 | |
2036 | |
2021 | on_battleground = op_on_battleground (op, 0, 0); |
2037 | on_battleground = op_on_battleground (op, 0, 0); |
2022 | |
2038 | |
2023 | /* If braced, or can't move to the square, and it is not out of the |
2039 | /* If braced, or can't move to the square, and it is not out of the |
2024 | * map, attack it. Note order of if statement is important - don't |
2040 | * map, attack it. Note order of if statement is important - don't |
… | |
… | |
2104 | /* If we're braced, we don't want to switch places with it */ |
2120 | /* If we're braced, we don't want to switch places with it */ |
2105 | if (op->contr->braced) |
2121 | if (op->contr->braced) |
2106 | return; |
2122 | return; |
2107 | |
2123 | |
2108 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2124 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2109 | (void) push_ob (mon, dir, op); |
2125 | push_ob (mon, dir, op); |
2110 | if (op->contr->tmp_invis || op->hide) |
2126 | if (op->contr->tmp_invis || op->hide) |
2111 | make_visible (op); |
2127 | make_visible (op); |
2112 | |
2128 | |
2113 | return; |
2129 | return; |
2114 | } |
2130 | } |
… | |
… | |
2254 | * Returns true if there are more actions we can do. |
2270 | * Returns true if there are more actions we can do. |
2255 | */ |
2271 | */ |
2256 | int |
2272 | int |
2257 | handle_newcs_player (object *op) |
2273 | handle_newcs_player (object *op) |
2258 | { |
2274 | { |
2259 | if (op->contr->hidden) |
|
|
2260 | { |
|
|
2261 | op->invisible = 1000; |
|
|
2262 | /* the socket code flashes the player visible/invisible |
|
|
2263 | * depending on the value of invisible, so we need to |
|
|
2264 | * alternate it here for it to work correctly. |
|
|
2265 | */ |
|
|
2266 | if (pticks & 2) |
|
|
2267 | op->invisible--; |
|
|
2268 | } |
|
|
2269 | else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) |
|
|
2270 | { |
|
|
2271 | op->invisible--; |
|
|
2272 | if (!op->invisible) |
|
|
2273 | { |
|
|
2274 | make_visible (op); |
|
|
2275 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
|
|
2276 | } |
|
|
2277 | } |
|
|
2278 | |
|
|
2279 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2275 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2280 | { |
2276 | { |
2281 | flee_player (op); |
2277 | flee_player (op); |
2282 | /* If player is still scared, that is his action for this tick */ |
2278 | /* If player is still scared, that is his action for this tick */ |
2283 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2279 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2284 | { |
2280 | { |
2285 | op->speed_left--; |
2281 | op->speed_left--; |
2286 | return 0; |
2282 | return 0; |
2287 | } |
2283 | } |
2288 | } |
2284 | } |
2289 | |
|
|
2290 | /* I've been seeing crashes where the golem has been destroyed, but |
|
|
2291 | * the player object still points to the defunct golem. The code that |
|
|
2292 | * destroys the golem looks correct, and it doesn't always happen, so |
|
|
2293 | * put this in a a workaround to clean up the golem pointer. |
|
|
2294 | */ |
|
|
2295 | if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED)) |
|
|
2296 | op->contr->ranges[range_golem] = 0; |
|
|
2297 | |
2285 | |
2298 | /* call this here - we also will call this in do_ericserver, but |
2286 | /* call this here - we also will call this in do_ericserver, but |
2299 | * the players time has been increased when doericserver has been |
2287 | * the players time has been increased when doericserver has been |
2300 | * called, so we recheck it here. |
2288 | * called, so we recheck it here. |
2301 | */ |
2289 | */ |
… | |
… | |
2362 | * from. |
2350 | * from. |
2363 | */ |
2351 | */ |
2364 | void |
2352 | void |
2365 | remove_unpaid_objects (object *op, object *env) |
2353 | remove_unpaid_objects (object *op, object *env) |
2366 | { |
2354 | { |
2367 | object *next; |
|
|
2368 | |
|
|
2369 | while (op) |
2355 | while (op) |
2370 | { |
2356 | { |
2371 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2357 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2372 | |
2358 | |
2373 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
2359 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
… | |
… | |
2439 | int rate_grace = 2000; |
2425 | int rate_grace = 2000; |
2440 | const int max_hp = 1; |
2426 | const int max_hp = 1; |
2441 | const int max_sp = 1; |
2427 | const int max_sp = 1; |
2442 | const int max_grace = 1; |
2428 | const int max_grace = 1; |
2443 | |
2429 | |
2444 | if (op->contr->outputs_sync) |
2430 | if (op->contr->hidden) |
|
|
2431 | { |
|
|
2432 | op->invisible = 1000; |
|
|
2433 | /* the socket code flashes the player visible/invisible |
|
|
2434 | * depending on the value of invisible, so we need to |
|
|
2435 | * alternate it here for it to work correctly. |
|
|
2436 | */ |
|
|
2437 | if (pticks & 2) |
|
|
2438 | op->invisible--; |
2445 | { |
2439 | } |
2446 | for (i = 0; i < NUM_OUTPUT_BUFS; i++) |
2440 | else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) |
2447 | if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) |
2441 | { |
2448 | flush_output_element (op, &op->contr->outputs[i]); |
2442 | if (!op->invisible--) |
|
|
2443 | { |
|
|
2444 | make_visible (op); |
|
|
2445 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
|
|
2446 | } |
2449 | } |
2447 | } |
2450 | |
2448 | |
2451 | if (op->contr->ns->state == ST_PLAYING) |
2449 | if (op->contr->ns->state == ST_PLAYING) |
2452 | { |
2450 | { |
2453 | /* these next three if clauses make it possible to SLOW DOWN |
2451 | /* these next three if clauses make it possible to SLOW DOWN |
… | |
… | |
2475 | gen_grace = op->stats.maxgrace; |
2473 | gen_grace = op->stats.maxgrace; |
2476 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2474 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2477 | } |
2475 | } |
2478 | |
2476 | |
2479 | /* Regenerate Spell Points */ |
2477 | /* Regenerate Spell Points */ |
2480 | if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) |
2478 | if (!op->contr->golem && --op->last_sp < 0) |
2481 | { |
2479 | { |
2482 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2480 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2483 | if (op->stats.sp < op->stats.maxsp) |
2481 | if (op->stats.sp < op->stats.maxsp) |
2484 | { |
2482 | { |
2485 | op->stats.sp++; |
2483 | op->stats.sp++; |
… | |
… | |
2703 | tmp->name = buf; |
2701 | tmp->name = buf; |
2704 | sprintf (buf, " This finger has been cut off %s\n" |
2702 | sprintf (buf, " This finger has been cut off %s\n" |
2705 | " the %s, when he was defeated at\n level %d by %s.\n", |
2703 | " the %s, when he was defeated at\n level %d by %s.\n", |
2706 | &op->name, op->contr->title, (int) (op->level), op->contr->killer); |
2704 | &op->name, op->contr->title, (int) (op->level), op->contr->killer); |
2707 | tmp->msg = buf; |
2705 | tmp->msg = buf; |
2708 | tmp->value = 0, tmp->material = 0, tmp->type = 0; |
2706 | tmp->value = 0, tmp->type = 0; |
2709 | tmp->materialname = NULL; |
2707 | tmp->materialname = "organics"; |
2710 | tmp->insert_at (op, tmp); |
2708 | tmp->insert_at (op, tmp); |
2711 | } |
2709 | } |
2712 | |
2710 | |
2713 | /* teleport defeated player to new destination */ |
2711 | /* teleport defeated player to new destination */ |
2714 | transfer_ob (op, x, y, 0, NULL); |
2712 | transfer_ob (op, x, y, 0, NULL); |
… | |
… | |
2910 | op->stats.hp = op->stats.maxhp; |
2908 | op->stats.hp = op->stats.maxhp; |
2911 | op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); |
2909 | op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); |
2912 | op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); |
2910 | op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); |
2913 | |
2911 | |
2914 | /* |
2912 | /* |
2915 | * Check to see if the player is in a shop. IF so, then check to see if |
|
|
2916 | * the player has any unpaid items. If so, remove them and put them back |
2913 | * Check to see if the player has any unpaid items. If so, remove them |
2917 | * in the map. |
2914 | * and put them back in the map. |
2918 | */ |
2915 | */ |
2919 | |
|
|
2920 | if (is_in_shop (op)) |
|
|
2921 | remove_unpaid_objects (op->inv, op); |
2916 | remove_unpaid_objects (op->inv, op); |
2922 | |
2917 | |
2923 | /****************************************/ |
2918 | /****************************************/ |
2924 | /* */ |
2919 | /* */ |
2925 | /* Move player to his current respawn- */ |
2920 | /* Move player to his current respawn- */ |
2926 | /* position (usually last savebed) */ |
2921 | /* position (usually last savebed) */ |
… | |
… | |
2966 | void |
2961 | void |
2967 | loot_object (object *op) |
2962 | loot_object (object *op) |
2968 | { /* Grab and destroy some treasure */ |
2963 | { /* Grab and destroy some treasure */ |
2969 | object *tmp, *tmp2, *next; |
2964 | object *tmp, *tmp2, *next; |
2970 | |
2965 | |
2971 | if (op->container) |
2966 | op->close_container (); /* close open sack first */ |
2972 | esrv_apply_container (op, op->container); /* close open sack first */ |
|
|
2973 | |
2967 | |
2974 | for (tmp = op->inv; tmp; tmp = next) |
2968 | for (tmp = op->inv; tmp; tmp = next) |
2975 | { |
2969 | { |
2976 | next = tmp->below; |
2970 | next = tmp->below; |
2977 | |
2971 | |
2978 | if (tmp->invisible) |
2972 | if (tmp->invisible) |
2979 | continue; |
2973 | continue; |
2980 | |
2974 | |
2981 | tmp->remove (); |
2975 | tmp->remove (); |
2982 | tmp->x = op->x, tmp->y = op->y; |
2976 | tmp->x = op->x, tmp->y = op->y; |
|
|
2977 | |
2983 | if (tmp->type == CONTAINER) |
2978 | if (tmp->type == CONTAINER) |
2984 | { /* empty container to ground */ |
2979 | loot_object (tmp); /* empty container to ground */ |
2985 | loot_object (tmp); |
2980 | |
2986 | } |
|
|
2987 | if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) |
2981 | if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) |
2988 | { |
2982 | { |
2989 | if (tmp->nrof > 1) |
2983 | if (tmp->nrof > 1) |
2990 | { |
2984 | { |
2991 | tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); |
2985 | tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); |
… | |
… | |
3003 | /* |
2997 | /* |
3004 | * fix_weight(): Check recursively the weight of all players, and fix |
2998 | * fix_weight(): Check recursively the weight of all players, and fix |
3005 | * what needs to be fixed. Refresh windows and fix speed if anything |
2999 | * what needs to be fixed. Refresh windows and fix speed if anything |
3006 | * was changed. |
3000 | * was changed. |
3007 | */ |
3001 | */ |
3008 | |
|
|
3009 | void |
3002 | void |
3010 | fix_weight (void) |
3003 | fix_weight (void) |
3011 | { |
3004 | { |
3012 | for_all_players (pl) |
3005 | for_all_players (pl) |
3013 | { |
3006 | { |
… | |
… | |
3073 | if (op->type == PLAYER) |
3066 | if (op->type == PLAYER) |
3074 | { |
3067 | { |
3075 | op->contr->tmp_invis = 0; |
3068 | op->contr->tmp_invis = 0; |
3076 | op->contr->invis_race = 0; |
3069 | op->contr->invis_race = 0; |
3077 | } |
3070 | } |
|
|
3071 | |
3078 | update_object (op, UP_OBJ_FACE); |
3072 | update_object (op, UP_OBJ_CHANGE); |
3079 | } |
3073 | } |
3080 | |
3074 | |
3081 | int |
3075 | int |
3082 | is_true_undead (object *op) |
3076 | is_true_undead (object *op) |
3083 | { |
3077 | { |
3084 | object *tmp = NULL; |
|
|
3085 | |
|
|
3086 | if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) |
3078 | if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) |
3087 | return 1; |
3079 | return 1; |
3088 | |
3080 | |
3089 | return 0; |
3081 | return 0; |
3090 | } |
3082 | } |
… | |
… | |
3378 | char buf[MAX_BUF]; /* tmp. string buffer */ |
3370 | char buf[MAX_BUF]; /* tmp. string buffer */ |
3379 | int i = 0, j = 0; |
3371 | int i = 0, j = 0; |
3380 | |
3372 | |
3381 | /* get the appropriate treasurelist */ |
3373 | /* get the appropriate treasurelist */ |
3382 | if (atnr == ATNR_FIRE) |
3374 | if (atnr == ATNR_FIRE) |
3383 | trlist = find_treasurelist ("dragon_ability_fire"); |
3375 | trlist = treasurelist::find ("dragon_ability_fire"); |
3384 | else if (atnr == ATNR_COLD) |
3376 | else if (atnr == ATNR_COLD) |
3385 | trlist = find_treasurelist ("dragon_ability_cold"); |
3377 | trlist = treasurelist::find ("dragon_ability_cold"); |
3386 | else if (atnr == ATNR_ELECTRICITY) |
3378 | else if (atnr == ATNR_ELECTRICITY) |
3387 | trlist = find_treasurelist ("dragon_ability_elec"); |
3379 | trlist = treasurelist::find ("dragon_ability_elec"); |
3388 | else if (atnr == ATNR_POISON) |
3380 | else if (atnr == ATNR_POISON) |
3389 | trlist = find_treasurelist ("dragon_ability_poison"); |
3381 | trlist = treasurelist::find ("dragon_ability_poison"); |
3390 | |
3382 | |
3391 | if (trlist == NULL || who->type != PLAYER) |
3383 | if (trlist == NULL || who->type != PLAYER) |
3392 | return; |
3384 | return; |
3393 | |
3385 | |
3394 | for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); |
3386 | for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); |
… | |
… | |
3526 | * not readied. |
3518 | * not readied. |
3527 | */ |
3519 | */ |
3528 | void |
3520 | void |
3529 | player_unready_range_ob (player *pl, object *ob) |
3521 | player_unready_range_ob (player *pl, object *ob) |
3530 | { |
3522 | { |
3531 | for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3523 | if (pl->ob->current_weapon == ob) |
|
|
3524 | pl->ob->current_weapon = 0; |
|
|
3525 | |
|
|
3526 | if (pl->combat_ob == ob) |
|
|
3527 | pl->combat_ob = 0; |
|
|
3528 | |
3532 | if (pl->ranges[i] == ob) |
3529 | if (pl->ranged_ob == ob) |
3533 | { |
|
|
3534 | pl->ranges[i] = 0; |
3530 | pl->ranged_ob = 0; |
3535 | if (pl->shoottype == i) |
|
|
3536 | pl->shoottype = range_none; |
|
|
3537 | } |
|
|
3538 | } |
3531 | } |
|
|
3532 | |
|
|
3533 | sint8 |
|
|
3534 | player::visibility_at (maptile *map, int x, int y) const |
|
|
3535 | { |
|
|
3536 | if (!ns) |
|
|
3537 | return 0; |
|
|
3538 | |
|
|
3539 | int dx, dy; |
|
|
3540 | if (!adjacent_map (map, ns->current_map, &dx, &dy)) |
|
|
3541 | return 0; |
|
|
3542 | |
|
|
3543 | x += dx - ns->current_x + ns->mapx / 2; |
|
|
3544 | y += dy - ns->current_y + ns->mapy / 2; |
|
|
3545 | |
|
|
3546 | if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) |
|
|
3547 | return 0; |
|
|
3548 | |
|
|
3549 | return 100 - blocked_los [x][y]; |
|
|
3550 | } |