… | |
… | |
180 | |
180 | |
181 | players.insert (this); |
181 | players.insert (this); |
182 | ob->remove (); |
182 | ob->remove (); |
183 | ob->map = 0; |
183 | ob->map = 0; |
184 | ob->activate_recursive (); |
184 | ob->activate_recursive (); |
|
|
185 | CLEAR_FLAG (ob, FLAG_FRIENDLY); |
|
|
186 | add_friendly_object (ob); |
185 | enter_map (); |
187 | enter_map (); |
186 | } |
188 | } |
187 | |
189 | |
188 | void |
190 | void |
189 | player::deactivate () |
191 | player::deactivate () |
190 | { |
192 | { |
191 | if (!active) |
193 | if (!active) |
192 | return; |
194 | return; |
193 | |
195 | |
194 | terminate_all_pets (ob); |
196 | terminate_all_pets (ob); |
|
|
197 | remove_friendly_object (ob); |
195 | ob->deactivate_recursive (); |
198 | ob->deactivate_recursive (); |
196 | ob->remove (); |
199 | ob->remove (); |
197 | ob->map = 0; |
200 | ob->map = 0; |
|
|
201 | |
|
|
202 | // for weird reasons, this is often "ob", keeping a circular reference |
|
|
203 | ranges [range_skill] = 0; |
198 | |
204 | |
199 | players.erase (this); |
205 | players.erase (this); |
200 | } |
206 | } |
201 | |
207 | |
202 | // connect the player with a specific client |
208 | // connect the player with a specific client |
… | |
… | |
205 | player::connect (client *ns) |
211 | player::connect (client *ns) |
206 | { |
212 | { |
207 | this->ns = ns; |
213 | this->ns = ns; |
208 | ns->pl = this; |
214 | ns->pl = this; |
209 | |
215 | |
|
|
216 | run_on = 0; |
|
|
217 | fire_on = 0; |
|
|
218 | |
210 | ns->update_look = 0; |
219 | ns->update_look = 0; |
211 | ns->look_position = 0; |
220 | ns->look_position = 0; |
212 | |
221 | |
213 | clear_los (ob); |
222 | clear_los (ob); |
|
|
223 | |
|
|
224 | ns->reset_stats (); |
214 | |
225 | |
215 | /* make sure he's a player -- needed because of class change. */ |
226 | /* make sure he's a player -- needed because of class change. */ |
216 | ob->type = PLAYER; // we are paranoid |
227 | ob->type = PLAYER; // we are paranoid |
217 | ob->race = ob->arch->clone.race; |
228 | ob->race = ob->arch->clone.race; |
218 | |
229 | |
… | |
… | |
252 | skin = tmp; |
263 | skin = tmp; |
253 | |
264 | |
254 | set_dragon_name (ob, abil, skin); |
265 | set_dragon_name (ob, abil, skin); |
255 | } |
266 | } |
256 | |
267 | |
257 | CLEAR_FLAG (ob, FLAG_FRIENDLY); |
|
|
258 | add_friendly_object (ob); |
|
|
259 | |
|
|
260 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
268 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
261 | |
269 | |
262 | esrv_new_player (this, ob->weight + ob->carrying); |
270 | esrv_new_player (this, ob->weight + ob->carrying); |
263 | |
271 | |
264 | ob->update_stats (); |
272 | ob->update_stats (); |
… | |
… | |
321 | unapply = unapply_nochoice; |
329 | unapply = unapply_nochoice; |
322 | |
330 | |
323 | savebed_map = first_map_path; /* Init. respawn position */ |
331 | savebed_map = first_map_path; /* Init. respawn position */ |
324 | |
332 | |
325 | gen_sp_armour = 10; |
333 | gen_sp_armour = 10; |
326 | last_speed = -1; |
|
|
327 | shoottype = range_none; |
334 | shoottype = range_none; |
328 | bowtype = bow_normal; |
335 | bowtype = bow_normal; |
329 | petmode = pet_normal; |
336 | petmode = pet_normal; |
330 | listening = 10; |
337 | listening = 10; |
331 | usekeys = containers; |
338 | usekeys = containers; |
332 | last_weapon_sp = -1; |
|
|
333 | peaceful = 1; /* default peaceful */ |
339 | peaceful = 1; /* default peaceful */ |
334 | do_los = 1; |
340 | do_los = 1; |
335 | |
|
|
336 | /* we need to clear these to -1 and not zero - otherwise, |
|
|
337 | * if a player quits and starts a new character, we wont |
|
|
338 | * send new values to the client, as things like exp start |
|
|
339 | * at zero. |
|
|
340 | */ |
|
|
341 | for (int i = 0; i < NUM_SKILLS; i++) |
|
|
342 | last_skill_exp[i] = -1; |
|
|
343 | |
|
|
344 | for (int i = 0; i < NROFATTACKS; i++) |
|
|
345 | last_resist[i] = -1; |
|
|
346 | |
|
|
347 | last_stats.exp = -1; |
|
|
348 | last_weight = (uint32) - 1; |
|
|
349 | } |
341 | } |
350 | |
342 | |
351 | void |
343 | void |
352 | player::do_destroy () |
344 | player::do_destroy () |
353 | { |
345 | { |
… | |
… | |
417 | object *op = NULL; |
409 | object *op = NULL; |
418 | objectlink *ol; |
410 | objectlink *ol; |
419 | unsigned lastdist; |
411 | unsigned lastdist; |
420 | rv_vector rv; |
412 | rv_vector rv; |
421 | |
413 | |
422 | for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) |
414 | for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) |
423 | { |
415 | { |
424 | /* We should not find free objects on this friendly list, but it |
416 | /* We should not find free objects on this friendly list, but it |
425 | * does periodically happen. Given that, lets deal with it. |
417 | * does periodically happen. Given that, lets deal with it. |
426 | * While unlikely, it is possible the next object on the friendly |
418 | * While unlikely, it is possible the next object on the friendly |
427 | * list is also free, so encapsulate this in a while loop. |
419 | * list is also free, so encapsulate this in a while loop. |
… | |
… | |
431 | object *tmp = ol->ob; |
423 | object *tmp = ol->ob; |
432 | |
424 | |
433 | /* Can't do much more other than log the fact, because the object |
425 | /* Can't do much more other than log the fact, because the object |
434 | * itself will have been cleared. |
426 | * itself will have been cleared. |
435 | */ |
427 | */ |
436 | LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); |
428 | LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n", |
|
|
429 | tmp->debug_desc ()); |
437 | ol = ol->next; |
430 | ol = ol->next; |
438 | remove_friendly_object (tmp); |
431 | remove_friendly_object (tmp); |
439 | if (!ol) |
432 | if (!ol) |
440 | return op; |
433 | return op; |
441 | } |
434 | } |
… | |
… | |
899 | * to save here. |
892 | * to save here. |
900 | */ |
893 | */ |
901 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
894 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
902 | make_path_to_file (buf); |
895 | make_path_to_file (buf); |
903 | |
896 | |
904 | #ifdef AUTOSAVE |
|
|
905 | op->contr->last_save_tick = pticks; |
|
|
906 | #endif |
|
|
907 | start_info (op); |
897 | start_info (op); |
908 | CLEAR_FLAG (op, FLAG_WIZ); |
898 | CLEAR_FLAG (op, FLAG_WIZ); |
909 | give_initial_items (op, op->randomitems); |
899 | give_initial_items (op, op->randomitems); |
910 | link_player_skills (op); |
900 | link_player_skills (op); |
911 | esrv_send_inventory (op, op); |
901 | esrv_send_inventory (op, op); |
… | |
… | |
1859 | { |
1849 | { |
1860 | if (op->type == PLAYER) |
1850 | if (op->type == PLAYER) |
1861 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
1851 | new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); |
1862 | return; |
1852 | return; |
1863 | } |
1853 | } |
|
|
1854 | |
1864 | (void) do_skill (op, op, op->chosen_skill, dir, NULL); |
1855 | do_skill (op, op, op->chosen_skill, dir, NULL); |
1865 | return; |
1856 | return; |
1866 | case range_builder: |
1857 | case range_builder: |
1867 | apply_map_builder (op, dir); |
1858 | apply_map_builder (op, dir); |
1868 | return; |
1859 | return; |
1869 | default: |
1860 | default: |
… | |
… | |
3531 | * not readied. |
3522 | * not readied. |
3532 | */ |
3523 | */ |
3533 | void |
3524 | void |
3534 | player_unready_range_ob (player *pl, object *ob) |
3525 | player_unready_range_ob (player *pl, object *ob) |
3535 | { |
3526 | { |
3536 | rangetype i; |
|
|
3537 | |
|
|
3538 | for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3527 | for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3539 | { |
|
|
3540 | if (pl->ranges[i] == ob) |
3528 | if (pl->ranges[i] == ob) |
3541 | { |
3529 | { |
3542 | pl->ranges[i] = NULL; |
3530 | pl->ranges[i] = 0; |
3543 | if (pl->shoottype == i) |
3531 | if (pl->shoottype == i) |
3544 | { |
|
|
3545 | pl->shoottype = range_none; |
3532 | pl->shoottype = range_none; |
3546 | } |
|
|
3547 | } |
3533 | } |
3548 | } |
|
|
3549 | } |
3534 | } |