ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.196 by root, Mon May 5 15:54:39 2008 UTC vs.
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC

… …
122 continue; 122 continue;
123 123
124 if (*buf == '%') 124 if (*buf == '%')
125 { /* send one news */ 125 { /* send one news */
126 if (size > 0) 126 if (size > 0)
127 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 */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
128 131
129 strcpy (subject, buf + 1); 132 strcpy (subject, buf + 1);
130 strip_endline (subject); 133 strip_endline (subject);
131 size = 0; 134 size = 0;
132 news[0] = '\0'; 135 news[0] = '\0';
… …
216 /* make sure he's a player -- needed because of class change. */ 219 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 220 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->race; 221 ob->race = ob->arch->race;
219 222
220 ob->update_weight (); 223 ob->update_weight ();
221 link_player_skills (ob); 224 link_skills ();
222 225
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 226 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224 227
225 assign (title, ob->arch->object::name); 228 assign (title, ob->arch->object::name);
226 229
… …
321 combat_ob = op; 324 combat_ob = op;
322 break; 325 break;
323 } 326 }
324 327
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326 ob->deactivate (); // change_Weapon activates, fix this better 329 ob->deactivate (); // change_weapon activates, fix this better
327} 330}
328 331
329void 332void
330player::set_observe (object *op) 333player::set_observe (object *op)
331{ 334{
… …
345 savebed_map = first_map_path; /* Init. respawn position */ 348 savebed_map = first_map_path; /* Init. respawn position */
346 349
347 gen_sp_armour = 10; 350 gen_sp_armour = 10;
348 bowtype = bow_normal; 351 bowtype = bow_normal;
349 petmode = pet_normal; 352 petmode = pet_normal;
350 listening = 10;
351 usekeys = containers; 353 usekeys = containers;
352 peaceful = 1; /* default peaceful */ 354 peaceful = 1; /* default peaceful */
353 do_los = 1; 355 do_los = 1;
354 356
355 weapon_sp = 1.0f; 357 weapon_sp = 1.0f;
… …
364 attachable::do_destroy (); 366 attachable::do_destroy ();
365 367
366 if (ob) 368 if (ob)
367 { 369 {
368 ob->destroy_inv (false); 370 ob->destroy_inv (false);
369 ob->destroy (); 371 ob->destroy (true);
370 } 372 }
371 373
372 ob = observe = 0; 374 ob = observe = 0;
373} 375}
374 376
… …
666 || op->type == CLOAK || op->type == HELMET 668 || op->type == CLOAK || op->type == HELMET
667 || op->type == SHIELD || op->type == GLOVES 669 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE)) 670 || op->type == BRACERS || op->type == GIRDLE))
669 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 671 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
670 { 672 {
671 op->destroy (); 673 op->destroy (true);
672 continue; 674 continue;
673 } 675 }
674 } 676 }
675 677
676 /* This really needs to be better - we should really give 678 /* This really needs to be better - we should really give
… …
687 if (tmp->type == op->type && tmp->name == op->name) 689 if (tmp->type == op->type && tmp->name == op->name)
688 break; 690 break;
689 691
690 if (tmp) 692 if (tmp)
691 { 693 {
692 op->destroy (); 694 op->destroy (true);
693 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 695 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
694 continue; 696 continue;
695 } 697 }
696 698
697 if (op->nrof > 1) 699 if (op->nrof > 1)
… …
712 CLEAR_FLAG (op, FLAG_DAMNED); 714 CLEAR_FLAG (op, FLAG_DAMNED);
713 } 715 }
714 716
715 if (op->type == SPELL) 717 if (op->type == SPELL)
716 { 718 {
717 op->destroy (); 719 op->destroy (true);
718 continue; 720 continue;
719 } 721 }
720 else if (op->type == SKILL) 722 else if (op->type == SKILL)
721 { 723 {
722 SET_FLAG (op, FLAG_CAN_USE_SKILL); 724 SET_FLAG (op, FLAG_CAN_USE_SKILL);
… …
726 else /* lock all 'normal items by default */ 728 else /* lock all 'normal items by default */
727 SET_FLAG (op, FLAG_INV_LOCKED); 729 SET_FLAG (op, FLAG_INV_LOCKED);
728 } /* for loop of objects in player inv */ 730 } /* for loop of objects in player inv */
729 731
730 /* Need to set up the skill pointers */ 732 /* Need to set up the skill pointers */
731 link_player_skills (pl); 733 pl->contr->link_skills ();
732} 734}
733 735
734void 736void
735get_party_password (object *op, partylist *party) 737get_party_password (object *op, partylist *party)
736{ 738{
… …
865 ob->contr->ns->state = ST_PLAYING; 867 ob->contr->ns->state = ST_PLAYING;
866 868
867 if (ob->msg) 869 if (ob->msg)
868 ob->msg = 0; 870 ob->msg = 0;
869 871
870 /* We create this now because some of the unique maps will need it
871 * to save here.
872 */
873 {
874 char buf[MAX_BUF];
875 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
876 make_path_to_file (buf);
877 }
878
879 start_info (ob); 872 start_info (ob);
880 CLEAR_FLAG (ob, FLAG_WIZ); 873 CLEAR_FLAG (ob, FLAG_WIZ);
881 give_initial_items (ob, ob->randomitems); 874 give_initial_items (ob, ob->randomitems);
882 link_player_skills (ob);
883 esrv_send_inventory (ob, ob); 875 esrv_send_inventory (ob, ob);
884 ob->update_stats (); 876 ob->update_stats ();
885 877
886 /* This moves the player to a different start map, if there 878 /* This moves the player to a different start map, if there
887 * is one for this race 879 * is one for this race
888 */ 880 */
889 if (*first_map_ext_path) 881 if (*first_map_ext_path)
890 { 882 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
891 object *tmp;
892 char mapname[MAX_BUF];
893
894 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
895 tmp = object::create ();
896 EXIT_PATH (tmp) = mapname;
897 EXIT_X (tmp) = ob->x;
898 EXIT_Y (tmp) = ob->y;
899 ob->enter_exit (tmp); /* we don't really care if it succeeded;
900 * if the map isn't there, then stay on the
901 * default initial map */
902 tmp->destroy ();
903 }
904 else 883 else
905 LOG (llevDebug, "first_map_ext_path not set\n"); 884 LOG (llevDebug, "first_map_ext_path not set\n");
906} 885}
907 886
908void 887void
… …
1327 if (op->contr->mode & PU_RATIO) 1306 if (op->contr->mode & PU_RATIO)
1328 { 1307 {
1329 /* use value density to decide what else to grab */ 1308 /* use value density to decide what else to grab */
1330 /* >=7 was >= op->contr->mode */ 1309 /* >=7 was >= op->contr->mode */
1331 /* >=7 is the old standard setting. Now we take the last 4 bits 1310 /* >=7 is the old standard setting. Now we take the last 4 bits
1332 * and multiply them by 5, giving 0..15*5== 5..75 */ 1311 */
1333 wvratio = (op->contr->mode & PU_RATIO) * 5; 1312 wvratio = op->contr->mode & PU_RATIO;
1334 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1313 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1335 { 1314 {
1336 CHK_PICK_PICKUP; 1315 CHK_PICK_PICKUP;
1337#if 0 1316#if 0
1338 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1317 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1339 if (tmp->name != NULL) 1318 if (tmp->name != NULL)
… …
1599 } 1578 }
1600 1579
1601 /* this should not happen, but sometimes does */ 1580 /* this should not happen, but sometimes does */
1602 if (arrow->nrof == 0) 1581 if (arrow->nrof == 0)
1603 { 1582 {
1583 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1604 arrow->destroy (); 1584 arrow->destroy (true);
1605 return 0; 1585 return 0;
1606 } 1586 }
1607 1587
1608 left = arrow; /* these are arrows left to the player */ 1588 left = arrow; /* these are arrows left to the player */
1609 arrow = arrow->split (); 1589 arrow = arrow->split ();
… …
2273 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2253 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2274 { 2254 {
2275 op->play_sound (sound_find ("ob_evaporate")); 2255 op->play_sound (sound_find ("ob_evaporate"));
2276 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2256 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2277 2257
2278 tmp->destroy (); 2258 tmp->destroy (true);
2279 CLEAR_FLAG (op, FLAG_LIFESAVE); 2259 CLEAR_FLAG (op, FLAG_LIFESAVE);
2280 2260
2281 if (op->stats.hp < 0) 2261 if (op->stats.hp < 0)
2282 op->stats.hp = op->stats.maxhp; 2262 op->stats.hp = op->stats.maxhp;
2283 2263
… …
2332const char * 2312const char *
2333gravestone_text (object *op) 2313gravestone_text (object *op)
2334{ 2314{
2335 static dynbuf_text buf; 2315 static dynbuf_text buf;
2336 2316
2337 buf << "---- R.I.P. ----\n\n"; 2317 buf << "---- R.I.P. ----\n\n"
2338 op->name; 2318 << op->name;
2339 2319
2340 if (op->type == PLAYER) 2320 if (op->type == PLAYER)
2341 buf << " the " << op->contr->title; 2321 buf << " the " << op->contr->title;
2342 2322
2343 buf << "\n\n"; 2323 buf << "\n\n";
… …
2585 2565
2586 if (op->stats.food < 0) 2566 if (op->stats.food < 0)
2587 { 2567 {
2588 op->stats.hp += op->stats.food; 2568 op->stats.hp += op->stats.food;
2589 op->stats.food = 0; 2569 op->stats.food = 0;
2570
2571 if (op->stats.hp < 0)
2572 {
2573 op->contr->killer = archetype::get ("killer_starvation");
2574 op->contr->killer->destroy (true);
2590 } 2575 }
2576 }
2591 2577
2578 /* killer should be set here already */
2592 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2579 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2593 kill_player (op); 2580 kill_player (op);
2594 } 2581 }
2595} 2582}
2596 2583
… …
2623 2610
2624 /* restore player */ 2611 /* restore player */
2625 at = archetype::find ("poisoning"); 2612 at = archetype::find ("poisoning");
2626 if (object *tmp = present_arch_in_ob (at, op)) 2613 if (object *tmp = present_arch_in_ob (at, op))
2627 { 2614 {
2628 tmp->destroy (); 2615 tmp->destroy (true);
2629 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2616 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2630 } 2617 }
2631 2618
2632 at = archetype::find ("confusion"); 2619 at = archetype::find ("confusion");
2633 if (object *tmp = present_arch_in_ob (at, op)) 2620 if (object *tmp = present_arch_in_ob (at, op))
2634 { 2621 {
2635 tmp->destroy (); 2622 tmp->destroy (true);
2636 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2623 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2637 } 2624 }
2638 2625
2639 cure_disease (op, 0, 0); /* remove any disease */ 2626 cure_disease (op, 0, 0); /* remove any disease */
2640 op->stats.hp = op->stats.maxhp; 2627 op->stats.hp = op->stats.maxhp;
… …
2664 } 2651 }
2665 2652
2666 INVOKE_PLAYER (DEATH, op->contr); 2653 INVOKE_PLAYER (DEATH, op->contr);
2667 2654
2668 command_kill_pets (op, 0); 2655 command_kill_pets (op, 0);
2669
2670 if (op->stats.food < 0)
2671 {
2672 op->contr->killer = archetype::get ("killer_starvation");
2673 op->contr->killer->destroy ();
2674 }
2675 2656
2676 op->contr->play_sound (sound_find ("player_dies")); 2657 op->contr->play_sound (sound_find ("player_dies"));
2677 2658
2678 /* save the map location for corpse, gravestone */ 2659 /* save the map location for corpse, gravestone */
2679 x = op->x; 2660 x = op->x;
… …
2811 * exp loss on the stone. 2792 * exp loss on the stone.
2812 */ 2793 */
2813 tmp = arch_to_object (archetype::find ("gravestone")); 2794 tmp = arch_to_object (archetype::find ("gravestone"));
2814 tmp->name = format ("%s's gravestone", &op->name); 2795 tmp->name = format ("%s's gravestone", &op->name);
2815 tmp->name_pl = format ("%s's gravestones", &op->name); 2796 tmp->name_pl = format ("%s's gravestones", &op->name);
2816 tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ()); 2797 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2798 &op->name, op->contr->title, op->contr->killer_name ());
2817 tmp->x = op->x, tmp->y = op->y; 2799 tmp->x = op->x, tmp->y = op->y;
2818 insert_ob_in_map (tmp, op->map, NULL, 0); 2800 insert_ob_in_map (tmp, op->map, NULL, 0);
2819 2801
2820 /**************************************/ 2802 /**************************************/
2821 /* */ 2803 /* */
… …
2830 at = archetype::find ("poisoning"); 2812 at = archetype::find ("poisoning");
2831 tmp = present_arch_in_ob (at, op); 2813 tmp = present_arch_in_ob (at, op);
2832 2814
2833 if (tmp) 2815 if (tmp)
2834 { 2816 {
2835 tmp->destroy (); 2817 tmp->destroy (true);
2836 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2818 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2837 } 2819 }
2838 2820
2839 at = archetype::find ("confusion"); 2821 at = archetype::find ("confusion");
2840 tmp = present_arch_in_ob (at, op); 2822 tmp = present_arch_in_ob (at, op);
2841 if (tmp) 2823 if (tmp)
2842 { 2824 {
2843 tmp->destroy (); 2825 tmp->destroy (true);
2844 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2826 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2845 } 2827 }
2846 2828
2847 cure_disease (op, 0, 0); /* remove any disease */ 2829 cure_disease (op, 0, 0); /* remove any disease */
2848 2830
… …
2851 for (object *item = op->inv; item; ) 2833 for (object *item = op->inv; item; )
2852 { 2834 {
2853 object *next = item->below; 2835 object *next = item->below;
2854 2836
2855 if (item->type == SPELL_EFFECT && item->active) 2837 if (item->type == SPELL_EFFECT && item->active)
2856 item->destroy (); 2838 item->destroy (true);
2857 2839
2858 item = next; 2840 item = next;
2859 } 2841 }
2860 2842
2861 /*add_exp(op, (op->stats.exp * -0.20)); */ 2843 /*add_exp(op, (op->stats.exp * -0.20)); */
… …
2909 if (will_kill_again & (1 << at)) 2891 if (will_kill_again & (1 << at))
2910 force->resist[at] = 100; 2892 force->resist[at] = 100;
2911 2893
2912 insert_ob_in_ob (force, op); 2894 insert_ob_in_ob (force, op);
2913 op->update_stats (); 2895 op->update_stats ();
2914
2915 } 2896 }
2916 2897
2917 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2898 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2918} 2899}
2919 2900
… …
2943 { 2924 {
2944 tmp->decrease (rndm (1, tmp->nrof - 1)); 2925 tmp->decrease (rndm (1, tmp->nrof - 1));
2945 insert_ob_in_map (tmp, op->map, NULL, 0); 2926 insert_ob_in_map (tmp, op->map, NULL, 0);
2946 } 2927 }
2947 else 2928 else
2948 tmp->destroy (); 2929 tmp->destroy (true);
2949 } 2930 }
2950 else 2931 else
2951 insert_ob_in_map (tmp, op->map, NULL, 0); 2932 insert_ob_in_map (tmp, op->map, NULL, 0);
2952 } 2933 }
2953} 2934}
… …
3014 if (op->type == PLAYER) 2995 if (op->type == PLAYER)
3015 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name); 2996 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3016 2997
3017 cast_spell (op, throw_ob, dir, spob, NULL); 2998 cast_spell (op, throw_ob, dir, spob, NULL);
3018 2999
3019 throw_ob->destroy (); 3000 throw_ob->destroy (true);
3020} 3001}
3021 3002
3022void 3003void
3023make_visible (object *op) 3004make_visible (object *op)
3024{ 3005{

Diff Legend

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