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 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | |
7 | * |
8 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | (at your option) any later version. |
11 | * (at your 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 GNU General Public License |
19 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
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> |
26 | #include <pwd.h> |
27 | #include <sproto.h> |
27 | #include <sproto.h> |
28 | #include <sounds.h> |
28 | #include <sounds.h> |
… | |
… | |
32 | #include <skills.h> |
32 | #include <skills.h> |
33 | |
33 | |
34 | #include <algorithm> |
34 | #include <algorithm> |
35 | #include <functional> |
35 | #include <functional> |
36 | |
36 | |
37 | player * |
37 | playervec players; |
38 | find_player (const char *plname) |
|
|
39 | { |
|
|
40 | for_all_players (pl) |
|
|
41 | if (pl->ob && !strcmp (query_name (pl->ob), plname)) |
|
|
42 | return pl; |
|
|
43 | |
|
|
44 | return 0; |
|
|
45 | } |
|
|
46 | |
38 | |
47 | void |
39 | void |
48 | display_motd (const object *op) |
40 | display_motd (const object *op) |
49 | { |
41 | { |
50 | char buf[MAX_BUF]; |
42 | char buf[MAX_BUF]; |
… | |
… | |
133 | |
125 | |
134 | if (*buf == '%') |
126 | if (*buf == '%') |
135 | { /* send one news */ |
127 | { /* send one news */ |
136 | if (size > 0) |
128 | if (size > 0) |
137 | 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 */ |
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 */ |
|
|
130 | |
138 | strcpy (subject, buf + 1); |
131 | strcpy (subject, buf + 1); |
139 | strip_endline (subject); |
132 | strip_endline (subject); |
140 | size = 0; |
133 | size = 0; |
141 | news[0] = '\0'; |
134 | news[0] = '\0'; |
142 | } |
135 | } |
… | |
… | |
177 | ob->enter_exit (tmp); |
170 | ob->enter_exit (tmp); |
178 | |
171 | |
179 | tmp->destroy (); |
172 | tmp->destroy (); |
180 | } |
173 | } |
181 | |
174 | |
|
|
175 | void |
|
|
176 | player::activate () |
|
|
177 | { |
|
|
178 | if (active) |
|
|
179 | return; |
|
|
180 | |
|
|
181 | players.insert (this); |
|
|
182 | ob->remove (); |
|
|
183 | ob->map = 0; |
|
|
184 | ob->activate_recursive (); |
|
|
185 | CLEAR_FLAG (ob, FLAG_FRIENDLY); |
|
|
186 | add_friendly_object (ob); |
|
|
187 | enter_map (); |
|
|
188 | } |
|
|
189 | |
|
|
190 | void |
|
|
191 | player::deactivate () |
|
|
192 | { |
|
|
193 | if (!active) |
|
|
194 | return; |
|
|
195 | |
|
|
196 | terminate_all_pets (ob); |
|
|
197 | remove_friendly_object (ob); |
|
|
198 | ob->deactivate_recursive (); |
|
|
199 | maplevel = ob->map->path; |
|
|
200 | ob->remove (); |
|
|
201 | ob->map = 0; |
|
|
202 | |
|
|
203 | // for weird reasons, this is often "ob", keeping a circular reference |
|
|
204 | ranges [range_skill] = 0; |
|
|
205 | |
|
|
206 | players.erase (this); |
|
|
207 | } |
|
|
208 | |
182 | // connect the player with a specific client |
209 | // connect the player with a specific client |
183 | // also changed, rationalises, and fixes some incorrect settings |
210 | // also changed, rationalises, and fixes some incorrect settings |
184 | void |
211 | void |
185 | player::connect (client *ns) |
212 | player::connect (client *ns) |
186 | { |
213 | { |
187 | this->ns = ns; |
214 | this->ns = ns; |
188 | ns->pl = this; |
215 | ns->pl = this; |
189 | |
216 | |
190 | next = first_player; |
217 | run_on = 0; |
191 | first_player = this; |
218 | fire_on = 0; |
|
|
219 | ob->container = 0; //TODO: client-specific |
192 | |
220 | |
193 | ns->update_look = 0; |
221 | ns->update_look = 0; |
194 | ns->look_position = 0; |
222 | ns->look_position = 0; |
195 | |
223 | |
196 | clear_los (ob); |
224 | clear_los (ob); |
|
|
225 | |
|
|
226 | ns->reset_stats (); |
197 | |
227 | |
198 | /* make sure he's a player -- needed because of class change. */ |
228 | /* make sure he's a player -- needed because of class change. */ |
199 | ob->type = PLAYER; // we are paranoid |
229 | ob->type = PLAYER; // we are paranoid |
200 | ob->race = ob->arch->clone.race; |
230 | ob->race = ob->arch->clone.race; |
201 | |
231 | |
… | |
… | |
235 | skin = tmp; |
265 | skin = tmp; |
236 | |
266 | |
237 | set_dragon_name (ob, abil, skin); |
267 | set_dragon_name (ob, abil, skin); |
238 | } |
268 | } |
239 | |
269 | |
240 | CLEAR_FLAG (ob, FLAG_FRIENDLY); |
|
|
241 | add_friendly_object (ob); |
|
|
242 | |
|
|
243 | LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host); |
|
|
244 | |
|
|
245 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
270 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
246 | |
271 | |
247 | esrv_new_player (this, ob->weight + ob->carrying); |
272 | esrv_new_player (this, ob->weight + ob->carrying); |
248 | |
273 | |
249 | ob->update_stats (); |
274 | ob->update_stats (); |
250 | ns->floorbox_update (); |
275 | ns->floorbox_update (); |
251 | |
276 | |
252 | esrv_send_inventory (ob, ob); |
277 | esrv_send_inventory (ob, ob); |
253 | esrv_add_spells (this, 0); |
278 | esrv_add_spells (this, 0); |
254 | |
279 | |
255 | ob->activate_recursive (); |
280 | activate (); |
256 | enter_map (); |
|
|
257 | |
281 | |
258 | send_rules (ob); |
282 | send_rules (ob); |
259 | send_news (ob); |
283 | send_news (ob); |
260 | display_motd (ob); |
284 | display_motd (ob); |
261 | |
285 | |
… | |
… | |
264 | } |
288 | } |
265 | |
289 | |
266 | void |
290 | void |
267 | player::disconnect () |
291 | player::disconnect () |
268 | { |
292 | { |
269 | if (ob) |
|
|
270 | ob->deactivate_recursive (); |
|
|
271 | |
|
|
272 | //TODO: don't be so harsh and destroy :) |
|
|
273 | if (ns) |
293 | if (ns) |
274 | { |
294 | { |
275 | if (enable_save) |
295 | if (active) |
276 | { |
|
|
277 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
296 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
278 | save (true); |
|
|
279 | } |
|
|
280 | |
297 | |
281 | INVOKE_PLAYER (DISCONNECT, this); |
298 | INVOKE_PLAYER (DISCONNECT, this); |
282 | |
299 | |
283 | client *ns = this->ns; |
300 | ns->reset_stats (); |
284 | ns->send_packet ("goodbye"); |
|
|
285 | ns->flush (); |
|
|
286 | ns->pl = 0; |
301 | ns->pl = 0; |
287 | this->ns = 0; |
302 | this->ns = 0; |
288 | |
|
|
289 | ns->destroy (); |
|
|
290 | destroy (); |
|
|
291 | } |
303 | } |
|
|
304 | |
|
|
305 | ob->container = 0; //TODO: client-specific |
|
|
306 | deactivate (); |
292 | } |
307 | } |
293 | |
308 | |
294 | // the need for this function can be explained |
309 | // the need for this function can be explained |
295 | // by load_object not returning the object |
310 | // by load_object not returning the object |
296 | void |
311 | void |
… | |
… | |
318 | unapply = unapply_nochoice; |
333 | unapply = unapply_nochoice; |
319 | |
334 | |
320 | savebed_map = first_map_path; /* Init. respawn position */ |
335 | savebed_map = first_map_path; /* Init. respawn position */ |
321 | |
336 | |
322 | gen_sp_armour = 10; |
337 | gen_sp_armour = 10; |
323 | last_speed = -1; |
|
|
324 | shoottype = range_none; |
338 | shoottype = range_none; |
325 | bowtype = bow_normal; |
339 | bowtype = bow_normal; |
326 | petmode = pet_normal; |
340 | petmode = pet_normal; |
327 | listening = 10; |
341 | listening = 10; |
328 | usekeys = containers; |
342 | usekeys = containers; |
329 | last_weapon_sp = -1; |
|
|
330 | peaceful = 1; /* default peaceful */ |
343 | peaceful = 1; /* default peaceful */ |
331 | do_los = 1; |
344 | do_los = 1; |
332 | |
|
|
333 | /* we need to clear these to -1 and not zero - otherwise, |
|
|
334 | * if a player quits and starts a new character, we wont |
|
|
335 | * send new values to the client, as things like exp start |
|
|
336 | * at zero. |
|
|
337 | */ |
|
|
338 | for (int i = 0; i < NUM_SKILLS; i++) |
|
|
339 | last_skill_exp[i] = -1; |
|
|
340 | |
|
|
341 | for (int i = 0; i < NROFATTACKS; i++) |
|
|
342 | last_resist[i] = -1; |
|
|
343 | |
|
|
344 | last_stats.exp = -1; |
|
|
345 | last_weight = (uint32) - 1; |
|
|
346 | } |
345 | } |
347 | |
346 | |
348 | void |
347 | void |
349 | player::do_destroy () |
348 | player::do_destroy () |
350 | { |
349 | { |
351 | disconnect (); |
350 | disconnect (); |
352 | |
351 | |
353 | save (false); |
|
|
354 | enable_save = false; |
|
|
355 | |
|
|
356 | attachable::do_destroy (); |
352 | attachable::do_destroy (); |
357 | |
|
|
358 | terminate_all_pets (ob); |
|
|
359 | |
|
|
360 | if (first_player != this) |
|
|
361 | { |
|
|
362 | player *prev = first_player; |
|
|
363 | |
|
|
364 | while (prev && prev->next && prev->next != this) |
|
|
365 | prev = prev->next; |
|
|
366 | |
|
|
367 | if (prev->next != this) |
|
|
368 | { |
|
|
369 | LOG (llevError, "Free_player: Can't find previous player.\n"); |
|
|
370 | abort (); |
|
|
371 | } |
|
|
372 | |
|
|
373 | prev->next = next; |
|
|
374 | } |
|
|
375 | else |
|
|
376 | first_player = next; |
|
|
377 | |
353 | |
378 | if (ob) |
354 | if (ob) |
379 | { |
355 | { |
380 | ob->destroy_inv (false); |
356 | ob->destroy_inv (false); |
381 | ob->destroy (); |
357 | ob->destroy (); |
… | |
… | |
437 | object *op = NULL; |
413 | object *op = NULL; |
438 | objectlink *ol; |
414 | objectlink *ol; |
439 | unsigned lastdist; |
415 | unsigned lastdist; |
440 | rv_vector rv; |
416 | rv_vector rv; |
441 | |
417 | |
442 | for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) |
418 | for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) |
443 | { |
419 | { |
444 | /* We should not find free objects on this friendly list, but it |
420 | /* We should not find free objects on this friendly list, but it |
445 | * does periodically happen. Given that, lets deal with it. |
421 | * does periodically happen. Given that, lets deal with it. |
446 | * While unlikely, it is possible the next object on the friendly |
422 | * While unlikely, it is possible the next object on the friendly |
447 | * list is also free, so encapsulate this in a while loop. |
423 | * list is also free, so encapsulate this in a while loop. |
… | |
… | |
451 | object *tmp = ol->ob; |
427 | object *tmp = ol->ob; |
452 | |
428 | |
453 | /* Can't do much more other than log the fact, because the object |
429 | /* Can't do much more other than log the fact, because the object |
454 | * itself will have been cleared. |
430 | * itself will have been cleared. |
455 | */ |
431 | */ |
456 | LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); |
432 | LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n", |
|
|
433 | tmp->debug_desc ()); |
457 | ol = ol->next; |
434 | ol = ol->next; |
458 | remove_friendly_object (tmp); |
435 | remove_friendly_object (tmp); |
459 | if (!ol) |
436 | if (!ol) |
460 | return op; |
437 | return op; |
461 | } |
438 | } |
… | |
… | |
779 | roll_stat (void) |
756 | roll_stat (void) |
780 | { |
757 | { |
781 | int a[4], i, j, k; |
758 | int a[4], i, j, k; |
782 | |
759 | |
783 | for (i = 0; i < 4; i++) |
760 | for (i = 0; i < 4; i++) |
784 | a[i] = (int) RANDOM () % 6 + 1; |
761 | a[i] = (int) rndm (6) + 1; |
785 | |
762 | |
786 | for (i = 0, j = 0, k = 7; i < 4; i++) |
763 | for (i = 0, j = 0, k = 7; i < 4; i++) |
787 | if (a[i] < k) |
764 | if (a[i] < k) |
788 | k = a[i], j = i; |
765 | k = a[i], j = i; |
789 | |
766 | |
… | |
… | |
919 | * to save here. |
896 | * to save here. |
920 | */ |
897 | */ |
921 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
898 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
922 | make_path_to_file (buf); |
899 | make_path_to_file (buf); |
923 | |
900 | |
924 | #ifdef AUTOSAVE |
|
|
925 | op->contr->last_save_tick = pticks; |
|
|
926 | #endif |
|
|
927 | start_info (op); |
901 | start_info (op); |
928 | CLEAR_FLAG (op, FLAG_WIZ); |
902 | CLEAR_FLAG (op, FLAG_WIZ); |
929 | give_initial_items (op, op->randomitems); |
903 | give_initial_items (op, op->randomitems); |
930 | link_player_skills (op); |
904 | link_player_skills (op); |
931 | esrv_send_inventory (op, op); |
905 | esrv_send_inventory (op, op); |
… | |
… | |
991 | if (op->msg) |
965 | if (op->msg) |
992 | new_draw_info (NDI_BLUE, 0, op, op->msg); |
966 | new_draw_info (NDI_BLUE, 0, op, op->msg); |
993 | |
967 | |
994 | send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); |
968 | send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); |
995 | return 0; |
969 | return 0; |
996 | } |
|
|
997 | |
|
|
998 | int |
|
|
999 | key_confirm_quit (object *op, char key) |
|
|
1000 | { |
|
|
1001 | if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q') |
|
|
1002 | { |
|
|
1003 | op->contr->ns->state = ST_PLAYING; |
|
|
1004 | new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play."); |
|
|
1005 | return 1; |
|
|
1006 | } |
|
|
1007 | |
|
|
1008 | INVOKE_PLAYER (LOGOUT, op->contr); |
|
|
1009 | INVOKE_PLAYER (QUIT, op->contr); |
|
|
1010 | |
|
|
1011 | op->contr->enable_save = false; |
|
|
1012 | delete_character (op->name); |
|
|
1013 | |
|
|
1014 | terminate_all_pets (op); |
|
|
1015 | op->remove (); |
|
|
1016 | op->direction = 0; |
|
|
1017 | new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name); |
|
|
1018 | |
|
|
1019 | strcpy (op->contr->killer, "quit"); |
|
|
1020 | check_score (op); |
|
|
1021 | op->contr->party = 0; |
|
|
1022 | op->contr->own_title[0] = '\0'; |
|
|
1023 | op->contr->destroy (); |
|
|
1024 | |
|
|
1025 | return 1; |
|
|
1026 | } |
970 | } |
1027 | |
971 | |
1028 | void |
972 | void |
1029 | flee_player (object *op) |
973 | flee_player (object *op) |
1030 | { |
974 | { |
… | |
… | |
1909 | { |
1853 | { |
1910 | if (op->type == PLAYER) |
1854 | if (op->type == PLAYER) |
1911 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
1855 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
1912 | return; |
1856 | return; |
1913 | } |
1857 | } |
|
|
1858 | |
1914 | (void) do_skill (op, op, op->chosen_skill, dir, NULL); |
1859 | do_skill (op, op, op->chosen_skill, dir, NULL); |
1915 | return; |
1860 | return; |
1916 | case range_builder: |
1861 | case range_builder: |
1917 | apply_map_builder (op, dir); |
1862 | apply_map_builder (op, dir); |
1918 | return; |
1863 | return; |
1919 | default: |
1864 | default: |
… | |
… | |
2266 | return 0; |
2211 | return 0; |
2267 | } |
2212 | } |
2268 | |
2213 | |
2269 | /* peterm: added following line */ |
2214 | /* peterm: added following line */ |
2270 | if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) |
2215 | if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) |
2271 | dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); |
2216 | dir = absdir (dir + rndm (3) + rndm (3) - 2); |
2272 | |
2217 | |
2273 | op->facing = dir; |
2218 | op->facing = dir; |
2274 | |
2219 | |
2275 | if (op->hide) |
2220 | if (op->hide) |
2276 | do_hidden_move (op); |
2221 | do_hidden_move (op); |
… | |
… | |
2775 | |
2720 | |
2776 | command_kill_pets (op, 0); |
2721 | command_kill_pets (op, 0); |
2777 | |
2722 | |
2778 | if (op->stats.food < 0) |
2723 | if (op->stats.food < 0) |
2779 | { |
2724 | { |
2780 | if (op->contr->explore) |
|
|
2781 | { |
|
|
2782 | new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are"); |
|
|
2783 | new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); |
|
|
2784 | op->stats.food = 999; |
|
|
2785 | return; |
|
|
2786 | } |
|
|
2787 | sprintf (buf, "%s starved to death.", &op->name); |
2725 | sprintf (buf, "%s starved to death.", &op->name); |
2788 | strcpy (op->contr->killer, "starvation"); |
2726 | strcpy (op->contr->killer, "starvation"); |
2789 | } |
2727 | } |
2790 | else |
2728 | else |
2791 | { |
|
|
2792 | if (op->contr->explore) |
|
|
2793 | { |
|
|
2794 | new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are"); |
|
|
2795 | new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); |
|
|
2796 | op->stats.hp = op->stats.maxhp; |
|
|
2797 | return; |
|
|
2798 | } |
|
|
2799 | sprintf (buf, "%s died.", &op->name); |
2729 | sprintf (buf, "%s died.", &op->name); |
2800 | } |
|
|
2801 | |
2730 | |
2802 | play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); |
2731 | play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); |
2803 | |
2732 | |
2804 | /* save the map location for corpse, gravestone */ |
2733 | /* save the map location for corpse, gravestone */ |
2805 | x = op->x; |
2734 | x = op->x; |
… | |
… | |
2998 | /* */ |
2927 | /* */ |
2999 | /****************************************/ |
2928 | /****************************************/ |
3000 | |
2929 | |
3001 | enter_player_savebed (op); |
2930 | enter_player_savebed (op); |
3002 | |
2931 | |
3003 | /* Save the player before inserting the force to reduce |
|
|
3004 | * chance of abuse. |
|
|
3005 | */ |
|
|
3006 | op->contr->braced = 0; |
2932 | op->contr->braced = 0; |
3007 | op->contr->save (); |
|
|
3008 | |
2933 | |
3009 | /* it is possible that the player has blown something up |
2934 | /* it is possible that the player has blown something up |
3010 | * at his savebed location, and that can have long lasting |
2935 | * at his savebed location, and that can have long lasting |
3011 | * spell effects. So first see if there is a spell effect |
2936 | * spell effects. So first see if there is a spell effect |
3012 | * on the space that might harm the player. |
2937 | * on the space that might harm the player. |
… | |
… | |
3057 | tmp->x = op->x, tmp->y = op->y; |
2982 | tmp->x = op->x, tmp->y = op->y; |
3058 | if (tmp->type == CONTAINER) |
2983 | if (tmp->type == CONTAINER) |
3059 | { /* empty container to ground */ |
2984 | { /* empty container to ground */ |
3060 | loot_object (tmp); |
2985 | loot_object (tmp); |
3061 | } |
2986 | } |
3062 | if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) |
2987 | if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) |
3063 | { |
2988 | { |
3064 | if (tmp->nrof > 1) |
2989 | if (tmp->nrof > 1) |
3065 | { |
2990 | { |
3066 | tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); |
2991 | tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); |
3067 | tmp2->destroy (); |
2992 | tmp2->destroy (); |
… | |
… | |
3601 | * not readied. |
3526 | * not readied. |
3602 | */ |
3527 | */ |
3603 | void |
3528 | void |
3604 | player_unready_range_ob (player *pl, object *ob) |
3529 | player_unready_range_ob (player *pl, object *ob) |
3605 | { |
3530 | { |
3606 | rangetype i; |
|
|
3607 | |
|
|
3608 | for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3531 | for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3609 | { |
|
|
3610 | if (pl->ranges[i] == ob) |
3532 | if (pl->ranges[i] == ob) |
3611 | { |
3533 | { |
3612 | pl->ranges[i] = NULL; |
3534 | pl->ranges[i] = 0; |
3613 | if (pl->shoottype == i) |
3535 | if (pl->shoottype == i) |
3614 | { |
|
|
3615 | pl->shoottype = range_none; |
3536 | pl->shoottype = range_none; |
3616 | } |
|
|
3617 | } |
3537 | } |
3618 | } |
|
|
3619 | } |
3538 | } |