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.146 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.198 by root, Sat May 17 00:17:02 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
… …
184 183
185 if (ob->map) 184 if (ob->map)
186 maplevel = ob->map->path; 185 maplevel = ob->map->path;
187 186
188 ob->remove (); 187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0; 189 ob->map = 0;
190 party = 0; 190 party = 0;
191 191
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193 193
… …
207 ob->close_container (); //TODO: client-specific 207 ob->close_container (); //TODO: client-specific
208 208
209 ns->update_look = 0; 209 ns->update_look = 0;
210 ns->look_position = 0; 210 ns->look_position = 0;
211 211
212 clear_los (ob); 212 clear_los (this);
213 213
214 ns->reset_stats (); 214 ns->reset_stats ();
215 215
216 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
219 219
220 ob->carrying = sum_weight (ob); 220 ob->update_weight ();
221 link_player_skills (ob); 221 link_player_skills (ob);
222 222
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224 224
225 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->object::name);
226 226
227 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
229 { 229 {
230 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
231 231
232 shstr_cmp dragon_ability_force ("dragon_ability_force");
233 shstr_cmp dragon_skin_force ("dragon_skin_force");
234
235 for (tmp = ob->inv; tmp; tmp = tmp->below) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
237 if (tmp->arch->name == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
238 abil = tmp; 235 abil = tmp;
239 else if (tmp->arch->name == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
240 skin = tmp; 237 skin = tmp;
241 238
242 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
243 } 240 }
244 241
245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246 243
247 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this);
245
246 ob->update_stats ();
247
248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob);
250 esrv_add_spells (this, 0);
251
252 activate ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
248 300
249 ob->flag [FLAG_READY_WEAPON] = false; 301 ob->flag [FLAG_READY_WEAPON] = false;
250 ob->flag [FLAG_READY_SKILL] = false; 302 ob->flag [FLAG_READY_SKILL] = false;
251 ob->flag [FLAG_READY_BOW] = false; 303 ob->flag [FLAG_READY_BOW] = false;
252 304
… …
269 combat_ob = op; 321 combat_ob = op;
270 break; 322 break;
271 } 323 }
272 324
273 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274 ob->update_stats (); 326 ob->deactivate (); // change_weapon activates, fix this better
275
276 ns->floorbox_update ();
277 esrv_send_inventory (ob, ob);
278 esrv_add_spells (this, 0);
279
280 activate ();
281
282 send_rules (ob);
283 send_news (ob);
284 display_motd (ob);
285
286 INVOKE_PLAYER (CONNECT, this);
287 INVOKE_PLAYER (LOGIN, this);
288}
289
290void
291player::disconnect ()
292{
293 if (ns)
294 {
295 if (active)
296 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297
298 INVOKE_PLAYER (DISCONNECT, this);
299
300 ns->reset_stats ();
301 ns->pl = 0;
302 ns = 0;
303 }
304
305 if (ob)
306 ob->close_container (); //TODO: client-specific
307
308 deactivate ();
309}
310
311// the need for this function can be explained
312// by load_object not returning the object
313void
314player::set_object (object *op)
315{
316 ob = observe = op;
317 ob->contr = this; /* this aren't yet in archetype */
318
319 ob->speed = 1.0f;
320 ob->speed_left = 0.5f;
321
322 ob->direction = 5; /* So player faces south */
323} 327}
324 328
325void 329void
326player::set_observe (object *op) 330player::set_observe (object *op)
327{ 331{
328 observe = op ? op : ob; 332 observe = op ? op : ob;
333 do_los = 1;
329} 334}
330 335
331player::player () 336player::player ()
332{ 337{
333 /* There are some elements we want initialised to non zero value - 338 /* There are some elements we want initialised to non zero value -
… …
361 if (ob) 366 if (ob)
362 { 367 {
363 ob->destroy_inv (false); 368 ob->destroy_inv (false);
364 ob->destroy (); 369 ob->destroy ();
365 } 370 }
371
372 ob = observe = 0;
366} 373}
367 374
368player::~player () 375player::~player ()
369{ 376{
370 /* Clear item stack */ 377 /* Clear item stack */
… …
397 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
398 */ 405 */
399archetype * 406archetype *
400get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
401{ 408{
402 archetype *start = at; 409 // archetypes could have been reloaded
410 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
411
412 if (!nat)
413 return at;
414
415 archvec::iterator i = archetypes.find (nat);
403 416
404 for (;;) 417 for (;;)
405 { 418 {
406 if (at == NULL || at->next == NULL) 419 if (++i == archetypes.end ())
407 at = first_archetype; 420 i = archetypes.begin ();
408 else 421 else if (*i == at)
409 at = at->next; 422 cleanup ("not a single player archetype found");
410 423
411 if (at->clone.type == PLAYER) 424 if ((*i)->type == PLAYER)
412 return at; 425 return *i;
413
414 if (at == start)
415 {
416 LOG (llevError, "No Player archetypes\n");
417 exit (-1);
418 }
419 } 426 }
420} 427}
421 428
422object * 429object *
423get_nearest_player (object *mon) 430get_nearest_player (object *mon)
… …
427 unsigned lastdist; 434 unsigned lastdist;
428 rv_vector rv; 435 rv_vector rv;
429 436
430 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 437 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
431 { 438 {
432 /* We should not find free objects on this friendly list, but it
433 * does periodically happen. Given that, lets deal with it.
434 * While unlikely, it is possible the next object on the friendly
435 * list is also free, so encapsulate this in a while loop.
436 */
437 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
438 {
439 object *tmp = ol->ob;
440
441 /* Can't do much more other than log the fact, because the object
442 * itself will have been cleared.
443 */
444 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
445 tmp->debug_desc ());
446 ol = ol->next;
447 remove_friendly_object (tmp);
448 if (!ol)
449 return op;
450 }
451
452 /* Remove special check for player from this. First, it looks to cause
453 * some crashes (ol->ob->contr not set properly?), but secondly, a more
454 * complicated method of state checking would be needed in any case -
455 * as it was, a clever player could type quit, and the function would
456 * skip them over while waiting for confirmation. Remove
457 * on_same_map check, as can_detect_enemy also does this
458 */
459 if (!can_detect_enemy (mon, ol->ob, &rv)) 439 if (!can_detect_enemy (mon, ol->ob, &rv))
460 continue; 440 continue;
461 441
462 if (lastdist > rv.distance) 442 if (lastdist > rv.distance)
463 { 443 {
… …
658 638
659 return firstdir; 639 return firstdir;
660} 640}
661 641
662void 642void
663give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
664{ 644{
665 object *op, *next = NULL;
666
667 if (pl->randomitems != NULL) 645 if (pl->randomitems)
668 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
669 647
670 for (op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
671 { 649 {
672 next = op->below; 650 next = op->below;
673 651
674 /* Forces get applied per default, unless they have the 652 /* Forces get applied per default, unless they have the
675 * flag "neutral" set. Sorry but I can't think of a better way 653 * flag "neutral" set. Sorry but I can't think of a better way
… …
680 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
681 * by this player due to race restrictions 659 * by this player due to race restrictions
682 */ 660 */
683 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
684 { 662 {
685 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
686 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
687 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
688 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
689 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 669 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
690 { 670 {
691 op->destroy (); 671 op->destroy ();
692 continue; 672 continue;
693 } 673 }
694 } 674 }
… …
717 if (op->nrof > 1) 697 if (op->nrof > 1)
718 op->nrof = 1; 698 op->nrof = 1;
719 } 699 }
720 700
721 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
722 {
723 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
724 }
725 703
726 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
727 * items. Just don't identify gold or silver, or it won't be 705 * items. Just don't identify gold or silver, or it won't be
728 * merged properly. 706 * merged properly.
729 */ 707 */
730 if (need_identify (op)) 708 if (need_identify (op))
731 { 709 {
732 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
733 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
734 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
735 } 713 }
714
736 if (op->type == SPELL) 715 if (op->type == SPELL)
737 { 716 {
738 op->destroy (); 717 op->destroy ();
739 continue; 718 continue;
740 } 719 }
… …
742 { 721 {
743 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
744 op->stats.exp = 0; 723 op->stats.exp = 0;
745 op->level = 1; 724 op->level = 1;
746 } 725 }
747 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
748 else
749 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
750 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
751 729
752 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
753 link_player_skills (pl); 731 link_player_skills (pl);
… …
859static void 837static void
860start_info (object *op) 838start_info (object *op)
861{ 839{
862 char buf[MAX_BUF]; 840 char buf[MAX_BUF];
863 841
864 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 842 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
865 new_draw_info (NDI_UNIQUE, 0, op, buf); 843 new_draw_info (NDI_UNIQUE, 0, op, buf);
866 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
867 //new_draw_info (NDI_UNIQUE, 0, op, " ");
868} 844}
869 845
870/* This function takes the key that is passed, and does the 846/* This function takes the key that is passed, and does the
871 * appropriate action with it (change race, or other things). 847 * appropriate action with it (change race, or other things).
872 * The function name is for historical reasons - now we have 848 * The function name is for historical reasons - now we have
… …
875 */ 851 */
876void 852void
877player::chargen_race_done () 853player::chargen_race_done ()
878{ 854{
879 /* this must before then initial items are given */ 855 /* this must before then initial items are given */
880 esrv_new_player (ob->contr, ob->weight + ob->carrying); 856 esrv_new_player (ob->contr);
881 857
882 treasurelist *tl = treasurelist::find ("starting_wealth"); 858 treasurelist *tl = treasurelist::find ("starting_wealth");
883 if (tl) 859 if (tl)
884 create_treasure (tl, ob, 0, 0, 0); 860 create_treasure (tl, ob, 0, 0, 0);
885 861
… …
888 864
889 ob->contr->ns->state = ST_PLAYING; 865 ob->contr->ns->state = ST_PLAYING;
890 866
891 if (ob->msg) 867 if (ob->msg)
892 ob->msg = 0; 868 ob->msg = 0;
893
894 /* We create this now because some of the unique maps will need it
895 * to save here.
896 */
897 {
898 char buf[MAX_BUF];
899 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
900 make_path_to_file (buf);
901 }
902 869
903 start_info (ob); 870 start_info (ob);
904 CLEAR_FLAG (ob, FLAG_WIZ); 871 CLEAR_FLAG (ob, FLAG_WIZ);
905 give_initial_items (ob, ob->randomitems); 872 give_initial_items (ob, ob->randomitems);
906 link_player_skills (ob); 873 link_player_skills (ob);
… …
909 876
910 /* This moves the player to a different start map, if there 877 /* This moves the player to a different start map, if there
911 * is one for this race 878 * is one for this race
912 */ 879 */
913 if (*first_map_ext_path) 880 if (*first_map_ext_path)
914 { 881 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
915 object *tmp;
916 char mapname[MAX_BUF];
917
918 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
919 tmp = object::create ();
920 EXIT_PATH (tmp) = mapname;
921 EXIT_X (tmp) = ob->x;
922 EXIT_Y (tmp) = ob->y;
923 ob->enter_exit (tmp); /* we don't really care if it succeeded;
924 * if the map isn't there, then stay on the
925 * default initial map */
926 tmp->destroy ();
927 }
928 else 882 else
929 LOG (llevDebug, "first_map_ext_path not set\n"); 883 LOG (llevDebug, "first_map_ext_path not set\n");
930} 884}
931 885
932void 886void
… …
942 int x = ob->x, y = ob->y; 896 int x = ob->x, y = ob->y;
943 897
944 ob->remove_statbonus (); 898 ob->remove_statbonus ();
945 ob->remove (); 899 ob->remove ();
946 ob->arch = get_player_archetype (ob->arch); 900 ob->arch = get_player_archetype (ob->arch);
947 ob->arch->clone.copy_to (ob); 901 ob->arch->copy_to (ob);
948 ob->instantiate (); 902 ob->instantiate ();
949 ob->stats = ob->contr->orig_stats; 903 ob->stats = ob->contr->orig_stats;
950 ob->name = ob->name_pl = name; 904 ob->name = ob->name_pl = name;
951 ob->x = x; 905 ob->x = x;
952 ob->y = y; 906 ob->y = y;
953 SET_ANIMATION (ob, 2); /* So player faces south */ 907 SET_ANIMATION (ob, 2); /* So player faces south */
954 insert_ob_in_map (ob, ob->map, ob, 0); 908 insert_ob_in_map (ob, ob->map, ob, 0);
955 assign (ob->contr->title, ob->arch->clone.name); 909 assign (ob->contr->title, ob->arch->object::name);
956 ob->add_statbonus (); 910 ob->add_statbonus ();
957 } 911 }
958 while (!allowed_class (ob)); 912 while (!allowed_class (ob));
959 913
960 update_object (ob, UP_OBJ_FACE); 914 update_object (ob, UP_OBJ_FACE);
… …
1035 if (op->move_type & MOVE_FLYING) 989 if (op->move_type & MOVE_FLYING)
1036 return 1; 990 return 1;
1037 991
1038 next = op->below; 992 next = op->below;
1039 993
994 int cnt = MAX_ITEM_PER_DROP;
995#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
996
1040 /* loop while there are items on the floor that are not marked as 997 /* loop while there are items on the floor that are not marked as
1041 * destroyed */ 998 * destroyed */
1042 while (next && !next->destroyed ()) 999 while (next && !next->destroyed ())
1043 { 1000 {
1044 tmp = next; 1001 tmp = next;
1045 next = tmp->below; 1002 next = tmp->below;
1046 1003
1004 if (cnt <= 0)
1005 {
1006 op->failmsg ("Couldn't pickup all items at once.");
1007 return 0;
1008 }
1009
1047 if (op->destroyed ()) 1010 if (op->destroyed ())
1048 return 0; 1011 return 0;
1049 1012
1050 if (!can_pick (op, tmp)) 1013 if (!can_pick (op, tmp))
1051 continue; 1014 continue;
1052 1015
1053 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1016 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1054 { 1017 {
1055 if (item_matched_string (op, tmp, op->contr->search_str)) 1018 if (item_matched_string (op, tmp, op->contr->search_str))
1056 pick_up (op, tmp); 1019 CHK_PICK_PICKUP;
1057 continue; 1020 continue;
1058 } 1021 }
1059 1022
1060 /* high not bit set? We're using the old autopickup model */ 1023 /* high not bit set? We're using the old autopickup model */
1061 if (!(op->contr->mode & PU_NEWMODE)) 1024 if (!(op->contr->mode & PU_NEWMODE))
… …
1063 switch (op->contr->mode) 1026 switch (op->contr->mode)
1064 { 1027 {
1065 case 0: 1028 case 0:
1066 return 1; /* don't pick up */ 1029 return 1; /* don't pick up */
1067 case 1: 1030 case 1:
1068 pick_up (op, tmp); 1031 CHK_PICK_PICKUP;
1069 return 1; 1032 return 1;
1070 case 2: 1033 case 2:
1071 pick_up (op, tmp); 1034 CHK_PICK_PICKUP;
1072 return 0; 1035 return 0;
1073 case 3: 1036 case 3:
1074 return 0; /* stop before pickup */ 1037 return 0; /* stop before pickup */
1075 case 4: 1038 case 4:
1076 pick_up (op, tmp); 1039 CHK_PICK_PICKUP;
1077 break; 1040 break;
1078 case 5: 1041 case 5:
1079 pick_up (op, tmp); 1042 CHK_PICK_PICKUP;
1080 stop = 1; 1043 stop = 1;
1081 break; 1044 break;
1082 case 6: 1045 case 6:
1083 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1046 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1084 pick_up (op, tmp); 1047 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1048 CHK_PICK_PICKUP;
1085 break; 1049 break;
1086 1050
1087 case 7: 1051 case 7:
1088 if (tmp->type == MONEY || tmp->type == GEM) 1052 if (tmp->type == MONEY || tmp->type == GEM)
1089 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1090 break; 1054 break;
1091 1055
1092 default: 1056 default:
1093 /* use value density */ 1057 /* use value density */
1094 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1058 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1095 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1059 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1096 pick_up (op, tmp); 1060 CHK_PICK_PICKUP;
1097 } 1061 }
1098 } 1062 }
1099 else 1063 else
1100 { /* old model */ 1064 { /* old model */
1101 /* NEW pickup handling */ 1065 /* NEW pickup handling */
… …
1105 if (tmp->name != NULL) 1069 if (tmp->name != NULL)
1106 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1070 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1107 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1071 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1108 else 1072 else
1109 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1073 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1110 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1074 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1111 1075
1112 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1076 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1113 } 1077 }
1114 1078
1115 /* philosophy: 1079 /* philosophy:
… …
1156 /* all food and drink if desired */ 1120 /* all food and drink if desired */
1157 /* question: don't pick up known-poisonous stuff? */ 1121 /* question: don't pick up known-poisonous stuff? */
1158 if (op->contr->mode & PU_FOOD) 1122 if (op->contr->mode & PU_FOOD)
1159 if (tmp->type == FOOD) 1123 if (tmp->type == FOOD)
1160 { 1124 {
1161 pick_up (op, tmp); 1125 CHK_PICK_PICKUP;
1162 continue; 1126 continue;
1163 } 1127 }
1164 1128
1165 if (op->contr->mode & PU_DRINK) 1129 if (op->contr->mode & PU_DRINK)
1166 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1130 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1167 { 1131 {
1168 pick_up (op, tmp); 1132 CHK_PICK_PICKUP;
1169 continue; 1133 continue;
1170 } 1134 }
1171 1135
1172 if (op->contr->mode & PU_POTION) 1136 if (op->contr->mode & PU_POTION)
1173 if (tmp->type == POTION) 1137 if (tmp->type == POTION)
1174 { 1138 {
1175 pick_up (op, tmp); 1139 CHK_PICK_PICKUP;
1176 continue; 1140 continue;
1177 } 1141 }
1178 1142
1179 /* spellbooks, skillscrolls and normal books/scrolls */ 1143 /* spellbooks, skillscrolls and normal books/scrolls */
1180 if (op->contr->mode & PU_SPELLBOOK) 1144 if (op->contr->mode & PU_SPELLBOOK)
1181 if (tmp->type == SPELLBOOK) 1145 if (tmp->type == SPELLBOOK)
1182 { 1146 {
1183 pick_up (op, tmp); 1147 CHK_PICK_PICKUP;
1184 continue; 1148 continue;
1185 } 1149 }
1186 1150
1187 if (op->contr->mode & PU_SKILLSCROLL) 1151 if (op->contr->mode & PU_SKILLSCROLL)
1188 if (tmp->type == SKILLSCROLL) 1152 if (tmp->type == SKILLSCROLL)
1189 { 1153 {
1190 pick_up (op, tmp); 1154 CHK_PICK_PICKUP;
1191 continue; 1155 continue;
1192 } 1156 }
1193 1157
1194 if (op->contr->mode & PU_READABLES) 1158 if (op->contr->mode & PU_READABLES)
1195 if (tmp->type == BOOK || tmp->type == SCROLL) 1159 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1196 { 1160 {
1197 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1198 continue; 1162 continue;
1199 } 1163 }
1200 1164
1201 /* wands/staves/rods/horns */ 1165 /* wands/staves/rods/horns */
1202 if (op->contr->mode & PU_MAGIC_DEVICE) 1166 if (op->contr->mode & PU_MAGIC_DEVICE)
1203 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1167 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1204 { 1168 {
1205 pick_up (op, tmp); 1169 CHK_PICK_PICKUP;
1206 continue; 1170 continue;
1207 } 1171 }
1208 1172
1209 /* pick up all magical items */ 1173 /* pick up all magical items */
1210 if (op->contr->mode & PU_MAGICAL) 1174 if (op->contr->mode & PU_MAGICAL)
1211 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1175 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1212 { 1176 {
1213 pick_up (op, tmp); 1177 CHK_PICK_PICKUP;
1214 continue; 1178 continue;
1215 } 1179 }
1216 1180
1217 if (op->contr->mode & PU_VALUABLES) 1181 if (op->contr->mode & PU_VALUABLES)
1218 { 1182 {
1219 if (tmp->type == MONEY || tmp->type == GEM) 1183 if (tmp->type == MONEY || tmp->type == GEM)
1220 { 1184 {
1221 pick_up (op, tmp); 1185 CHK_PICK_PICKUP;
1222 continue; 1186 continue;
1223 } 1187 }
1224 } 1188 }
1225 1189
1226 /* rings & amulets - talismans seems to be typed AMULET */ 1190 /* rings & amulets - talismans seems to be typed AMULET */
1227 if (op->contr->mode & PU_JEWELS) 1191 if (op->contr->mode & PU_JEWELS)
1228 if (tmp->type == RING || tmp->type == AMULET) 1192 if (tmp->type == RING || tmp->type == AMULET)
1229 { 1193 {
1230 pick_up (op, tmp); 1194 CHK_PICK_PICKUP;
1231 continue; 1195 continue;
1232 } 1196 }
1233 1197
1234 /* we don't forget dragon food */ 1198 /* we don't forget dragon food */
1235 if (op->contr->mode & PU_FLESH) 1199 if (op->contr->mode & PU_FLESH)
1236 if (tmp->type == FLESH) 1200 if (tmp->type == FLESH)
1237 { 1201 {
1238 pick_up (op, tmp); 1202 CHK_PICK_PICKUP;
1239 continue; 1203 continue;
1240 } 1204 }
1241 1205
1242 /* bows and arrows. Bows are good for selling! */ 1206 /* bows and arrows. Bows are good for selling! */
1243 if (op->contr->mode & PU_BOW) 1207 if (op->contr->mode & PU_BOW)
1244 if (tmp->type == BOW) 1208 if (tmp->type == BOW)
1245 { 1209 {
1246 pick_up (op, tmp); 1210 CHK_PICK_PICKUP;
1247 continue; 1211 continue;
1248 } 1212 }
1249 1213
1250 if (op->contr->mode & PU_ARROW) 1214 if (op->contr->mode & PU_ARROW)
1251 if (tmp->type == ARROW) 1215 if (tmp->type == ARROW)
1252 { 1216 {
1253 pick_up (op, tmp); 1217 CHK_PICK_PICKUP;
1254 continue; 1218 continue;
1255 } 1219 }
1256 1220
1257 /* all kinds of armor etc. */ 1221 /* all kinds of armor etc. */
1258 if (op->contr->mode & PU_ARMOUR) 1222 if (op->contr->mode & PU_ARMOUR)
1259 if (tmp->type == ARMOUR) 1223 if (tmp->type == ARMOUR)
1260 { 1224 {
1261 pick_up (op, tmp); 1225 CHK_PICK_PICKUP;
1262 continue; 1226 continue;
1263 } 1227 }
1264 1228
1265 if (op->contr->mode & PU_HELMET) 1229 if (op->contr->mode & PU_HELMET)
1266 if (tmp->type == HELMET) 1230 if (tmp->type == HELMET)
1267 { 1231 {
1268 pick_up (op, tmp); 1232 CHK_PICK_PICKUP;
1269 continue; 1233 continue;
1270 } 1234 }
1271 1235
1272 if (op->contr->mode & PU_SHIELD) 1236 if (op->contr->mode & PU_SHIELD)
1273 if (tmp->type == SHIELD) 1237 if (tmp->type == SHIELD)
1274 { 1238 {
1275 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1276 continue; 1240 continue;
1277 } 1241 }
1278 1242
1279 if (op->contr->mode & PU_BOOTS) 1243 if (op->contr->mode & PU_BOOTS)
1280 if (tmp->type == BOOTS) 1244 if (tmp->type == BOOTS)
1281 { 1245 {
1282 pick_up (op, tmp); 1246 CHK_PICK_PICKUP;
1283 continue; 1247 continue;
1284 } 1248 }
1285 1249
1286 if (op->contr->mode & PU_GLOVES) 1250 if (op->contr->mode & PU_GLOVES)
1287 if (tmp->type == GLOVES) 1251 if (tmp->type == GLOVES)
1288 { 1252 {
1289 pick_up (op, tmp); 1253 CHK_PICK_PICKUP;
1290 continue; 1254 continue;
1291 } 1255 }
1292 1256
1293 if (op->contr->mode & PU_CLOAK) 1257 if (op->contr->mode & PU_CLOAK)
1294 if (tmp->type == CLOAK) 1258 if (tmp->type == CLOAK)
1295 { 1259 {
1296 pick_up (op, tmp); 1260 CHK_PICK_PICKUP;
1297 continue; 1261 continue;
1298 } 1262 }
1299 1263
1300 /* hoping to catch throwing daggers here */ 1264 /* hoping to catch throwing daggers here */
1301 if (op->contr->mode & PU_MISSILEWEAPON) 1265 if (op->contr->mode & PU_MISSILEWEAPON)
1302 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1266 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1303 { 1267 {
1304 pick_up (op, tmp); 1268 CHK_PICK_PICKUP;
1305 continue; 1269 continue;
1306 } 1270 }
1307 1271
1308 /* careful: chairs and tables are weapons! */ 1272 /* careful: chairs and tables are weapons! */
1309 if (op->contr->mode & PU_ALLWEAPON) 1273 if (op->contr->mode & PU_ALLWEAPON)
1310 { 1274 {
1311 if (tmp->type == WEAPON && tmp->name != NULL) 1275 if (tmp->type == WEAPON && tmp->name != NULL)
1312 { 1276 {
1313 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1277 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1314 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1278 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1315 { 1279 {
1316 pick_up (op, tmp); 1280 CHK_PICK_PICKUP;
1317 continue; 1281 continue;
1318 } 1282 }
1319 } 1283 }
1320 1284
1321 if (tmp->type == WEAPON && tmp->name == NULL) 1285 if (tmp->type == WEAPON && tmp->name == NULL)
1322 { 1286 {
1323 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1287 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1324 { 1288 {
1325 pick_up (op, tmp); 1289 CHK_PICK_PICKUP;
1326 continue; 1290 continue;
1327 } 1291 }
1328 } 1292 }
1329 } 1293 }
1330 1294
1331 /* misc stuff that's useful */ 1295 /* misc stuff that's useful */
1332 if (op->contr->mode & PU_KEY) 1296 if (op->contr->mode & PU_KEY)
1333 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1297 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1334 { 1298 {
1335 pick_up (op, tmp); 1299 CHK_PICK_PICKUP;
1336 continue; 1300 continue;
1337 } 1301 }
1338 1302
1339 /* any of the last 4 bits set means we use the ratio for value 1303 /* any of the last 4 bits set means we use the ratio for value
1340 * pickups */ 1304 * pickups */
… …
1345 /* >=7 is the old standard setting. Now we take the last 4 bits 1309 /* >=7 is the old standard setting. Now we take the last 4 bits
1346 * and multiply them by 5, giving 0..15*5== 5..75 */ 1310 * and multiply them by 5, giving 0..15*5== 5..75 */
1347 wvratio = (op->contr->mode & PU_RATIO) * 5; 1311 wvratio = (op->contr->mode & PU_RATIO) * 5;
1348 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1312 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1349 { 1313 {
1350 pick_up (op, tmp); 1314 CHK_PICK_PICKUP;
1351#if 0 1315#if 0
1352 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1316 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1353 if (tmp->name != NULL) 1317 if (tmp->name != NULL)
1354 { 1318 {
1355 fprintf (stderr, "%s", tmp->name); 1319 fprintf (stderr, "%s", tmp->name);
1356 } 1320 }
1357 else 1321 else
1358 fprintf (stderr, "%s", tmp->arch->name); 1322 fprintf (stderr, "%s", tmp->arch->archname);
1359 fprintf (stderr, ",%d] = ", tmp->type); 1323 fprintf (stderr, ",%d] = ", tmp->type);
1360 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1324 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1361#endif 1325#endif
1362 continue; 1326 continue;
1363 } 1327 }
… …
1374 * found object is returned. 1338 * found object is returned.
1375 */ 1339 */
1376object * 1340object *
1377find_arrow (object *op, const char *type) 1341find_arrow (object *op, const char *type)
1378{ 1342{
1379 object *tmp = 0;
1380
1381 for (op = op->inv; op; op = op->below) 1343 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1382 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1383 tmp = find_arrow (op, type);
1384 else if (op->type == ARROW && op->race == type) 1344 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1345 return splay (tmp);
1346
1347 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1348 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1349 if (object *arrow = find_arrow (tmp, type))
1350 {
1351 splay (tmp);
1385 return op; 1352 return arrow;
1353 }
1386 1354
1387 return tmp; 1355 return 0;
1388} 1356}
1389 1357
1390/* 1358/*
1391 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1359 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1392 * against the target. A full test is not performed, simply a basic test 1360 * against the target. A full test is not performed, simply a basic test
… …
1415 } 1383 }
1416 } 1384 }
1417 else if (arrow->type == ARROW && arrow->race == type) 1385 else if (arrow->type == ARROW && arrow->race == type)
1418 { 1386 {
1419 /* allways prefer assasination/slaying */ 1387 /* allways prefer assasination/slaying */
1420 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1388 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1421 { 1389 {
1422 if (arrow->attacktype & AT_DEATH) 1390 if (arrow->attacktype & AT_DEATH)
1423 { 1391 {
1424 *better = 100; 1392 *better = 100;
1425 return arrow; 1393 return arrow;
… …
1433 else 1401 else
1434 { 1402 {
1435 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1403 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1436 { 1404 {
1437 attacktype = 1 << attacknum; 1405 attacktype = 1 << attacknum;
1438 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1406 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1439 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1407 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1440 { 1408 {
1441 tmp = arrow; 1409 tmp = arrow;
1442 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1410 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1443 } 1411 }
1444 } 1412 }
1445 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1413 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1446 { 1414 {
1447 tmp = arrow; 1415 tmp = arrow;
… …
1453 betterby = 1 + arrow->magic + arrow->stats.dam; 1421 betterby = 1 + arrow->magic + arrow->stats.dam;
1454 } 1422 }
1455 } 1423 }
1456 } 1424 }
1457 } 1425 }
1426
1458 if (tmp == NULL && arrow == NULL) 1427 if (tmp == NULL && arrow == NULL)
1459 return find_arrow (op, type); 1428 return find_arrow (op, type);
1460 1429
1461 *better = betterby; 1430 *better = betterby;
1462 return tmp; 1431 return tmp;
… …
1613 arrow->destroy (); 1582 arrow->destroy ();
1614 return 0; 1583 return 0;
1615 } 1584 }
1616 1585
1617 left = arrow; /* these are arrows left to the player */ 1586 left = arrow; /* these are arrows left to the player */
1618 arrow = get_split_ob (arrow, 1); 1587 arrow = arrow->split ();
1619 if (!arrow) 1588 if (!arrow)
1620 { 1589 {
1621 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1590 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1622 return 0; 1591 return 0;
1623 } 1592 }
… …
1685 1654
1686 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1655 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687 arrow->move_type = MOVE_FLY_LOW; 1656 arrow->move_type = MOVE_FLY_LOW;
1688 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1657 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1689 1658
1690 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1659 op->play_sound (sound_find ("fire_arrow"));
1691 m->insert (arrow, sx, sy, op); 1660 m->insert (arrow, sx, sy, op);
1692 1661
1693 if (!arrow->destroyed ()) 1662 if (!arrow->destroyed ())
1694 move_arrow (arrow); 1663 move_arrow (arrow);
1695
1696 if (op->type == PLAYER)
1697 {
1698 if (left->destroyed ())
1699 esrv_del_item (op->contr, left->count);
1700 else
1701 esrv_send_item (op, left);
1702 }
1703 1664
1704 return 1; 1665 return 1;
1705} 1666}
1706 1667
1707/* Special fire code for players - this takes into 1668/* Special fire code for players - this takes into
… …
1773 1734
1774 if (item->type == WAND) 1735 if (item->type == WAND)
1775 { 1736 {
1776 if (item->stats.food <= 0) 1737 if (item->stats.food <= 0)
1777 { 1738 {
1778 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1739 op->contr->play_sound (sound_find ("wand_poof"));
1779 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1740 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1780 1741
1781 return; 1742 return;
1782 } 1743 }
1783 } 1744 }
1784 else if (item->type == ROD || item->type == HORN) 1745 else if (item->type == ROD || item->type == HORN)
1785 { 1746 {
1786 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1747 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1748
1749 // using the maximum of the rods charge allows at least one spell cast
1750 // for a rod or horn, this fixes some broken rods.
1751 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1787 { 1752 {
1788 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1753 op->contr->play_sound (sound_find ("wand_poof"));
1789 1754
1790 if (item->type == ROD) 1755 if (item->type == ROD)
1791 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1756 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1792 else 1757 else
1793 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1758 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1806 object *tmp; 1771 object *tmp;
1807 1772
1808 if (item->arch) 1773 if (item->arch)
1809 { 1774 {
1810 CLEAR_FLAG (item, FLAG_ANIMATE); 1775 CLEAR_FLAG (item, FLAG_ANIMATE);
1811 item->face = item->arch->clone.face; 1776 item->face = item->arch->face;
1812 item->set_speed (0); 1777 item->set_speed (0);
1813 } 1778 }
1814 1779
1815 if ((tmp = item->in_player ())) 1780 if (object *pl = item->visible_to ())
1816 esrv_update_item (UPD_ANIM, tmp, item); 1781 esrv_update_item (UPD_ANIM, pl, item);
1817 } 1782 }
1818 } 1783 }
1819 else if (item->type == ROD || item->type == HORN) 1784 else if (item->type == ROD || item->type == HORN)
1820 drain_rod_charge (item); 1785 drain_rod_charge (item);
1821 } 1786 }
… …
1982 /* If we found a key, do some extra work */ 1947 /* If we found a key, do some extra work */
1983 if (key) 1948 if (key)
1984 { 1949 {
1985 object *container = key->env; 1950 object *container = key->env;
1986 1951
1987 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1988
1989 if (action_makes_visible (op)) 1952 if (action_makes_visible (op))
1990 make_visible (op); 1953 make_visible (op);
1991 1954
1992 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1955 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1993 spring_trap (door->inv, op); 1956 spring_trap (door->inv, op);
1994 1957
1995 if (door->type == DOOR) 1958 if (door->type == DOOR)
1996 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1959 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1997 else if (door->type == LOCKED_DOOR) 1960 else if (door->type == LOCKED_DOOR)
1998 { 1961 {
1999 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1962 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2000 remove_door2 (door); /* remove door without violence ;-) */ 1963 remove_door2 (door); /* remove door without violence ;-) */
2001 } 1964 }
2002 1965
2003 /* Do this after we print the message */ 1966 /* Do this after we print the message */
2004 decrease_ob (key); /* Use up one of the keys */ 1967 key->decrease (); /* Use up one of the keys */
2005 /* Need to update the weight the container the key was in */
2006 if (container != op)
2007 esrv_update_item (UPD_WEIGHT, op, container);
2008 1968
2009 return 1; /* Nothing more to do below */ 1969 return 1; /* Nothing more to do below */
2010 } 1970 }
2011 else if (door->type == LOCKED_DOOR) 1971 else if (door->type == LOCKED_DOOR)
2012 { 1972 {
2013 /* Might as well return now - no other way to open this */ 1973 /* Might as well return now - no other way to open this */
2014 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1974 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2015 return 1; 1975 return 1;
2016 } 1976 }
2017 1977
2018 return 0; 1978 return 0;
2019} 1979}
… …
2106 2066
2107 if (op->speed_left > 0.f) 2067 if (op->speed_left > 0.f)
2108 { 2068 {
2109 --op->speed_left; 2069 --op->speed_left;
2110 2070
2111 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2071 op->play_sound (sound_find ("push_player"));
2112 push_ob (mon, dir, op); 2072 push_ob (mon, dir, op);
2113 2073
2114 if (op->contr->tmp_invis || op->hide) 2074 if (op->contr->tmp_invis || op->hide)
2115 make_visible (op); 2075 make_visible (op);
2116 2076
… …
2135 { 2095 {
2136 --op->speed_left; 2096 --op->speed_left;
2137 2097
2138 if (!op->contr->braced) 2098 if (!op->contr->braced)
2139 { 2099 {
2140 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2100 op->play_sound (sound_find ("push_player"));
2141 push_ob (mon, dir, op); 2101 push_ob (mon, dir, op);
2142 } 2102 }
2143 else 2103 else
2144 new_draw_info (0, 0, op, "You withhold your attack"); 2104 op->statusmsg ("You withhold your attack");
2145 2105
2146 if (op->contr->tmp_invis || op->hide) 2106 if (op->contr->tmp_invis || op->hide)
2147 make_visible (op); 2107 make_visible (op);
2148 2108
2149 return true; 2109 return true;
… …
2193bool 2153bool
2194move_player (object *op, int dir) 2154move_player (object *op, int dir)
2195{ 2155{
2196 int pick; 2156 int pick;
2197 2157
2198 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2158 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2199 return 0; 2159 return 0;
2200 2160
2201 /* Sanity check: make sure dir is valid */ 2161 /* Sanity check: make sure dir is valid */
2202 if ((dir < 0) || (dir >= 9)) 2162 if ((dir < 0) || (dir >= 9))
2203 { 2163 {
… …
2288 return 0; 2248 return 0;
2289 2249
2290 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2250 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2291 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2251 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2292 { 2252 {
2293 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2253 op->play_sound (sound_find ("ob_evaporate"));
2294 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2254 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2295
2296 if (op->contr)
2297 esrv_del_item (op->contr, tmp->count);
2298 2255
2299 tmp->destroy (); 2256 tmp->destroy ();
2300 CLEAR_FLAG (op, FLAG_LIFESAVE); 2257 CLEAR_FLAG (op, FLAG_LIFESAVE);
2301 2258
2302 if (op->stats.hp < 0) 2259 if (op->stats.hp < 0)
… …
2315 return 0; 2272 return 0;
2316} 2273}
2317 2274
2318/* This goes throws the inventory and removes unpaid objects, and puts them 2275/* This goes throws the inventory and removes unpaid objects, and puts them
2319 * back in the map (location and map determined by values of env). This 2276 * back in the map (location and map determined by values of env). This
2320 * function will descend into containers. op is the object to start the search 2277 * function will descend into containers. op is the object to start the search
2321 * from. 2278 * from.
2322 */ 2279 */
2280static void
2281drop_unpaid_items (object *op, object *env)
2282{
2283 while (op)
2284 {
2285 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2286
2287 if (QUERY_FLAG (op, FLAG_UNPAID))
2288 op->insert_at (env);
2289 else if (op->inv)
2290 drop_unpaid_items (op->inv, env);
2291
2292 op = next;
2293 }
2294}
2295
2323void 2296void
2324remove_unpaid_objects (object *op, object *env) 2297object::drop_unpaid_items ()
2325{ 2298{
2326 while (op) 2299 if (!flag [FLAG_REMOVED])
2327 { 2300 ::drop_unpaid_items (inv, this);
2328 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2329
2330 if (QUERY_FLAG (op, FLAG_UNPAID))
2331 {
2332 if (env->type == PLAYER)
2333 esrv_del_item (env->contr, op->count);
2334
2335 op->insert_at (env);
2336 }
2337 else if (op->inv)
2338 remove_unpaid_objects (op->inv, env);
2339
2340 op = next;
2341 }
2342} 2301}
2343 2302
2344/* 2303/*
2345 * Returns pointer a static string containing gravestone text 2304 * Returns pointer a static string containing gravestone text
2346 * Moved from apply.c to player.c - player.c is what 2305 * Moved from apply.c to player.c - player.c is what
2347 * actually uses this function. player.c may not be quite the 2306 * actually uses this function. player.c may not be quite the
2348 * best, a misc file for object actions is probably better, 2307 * best, a misc file for object actions is probably better,
2349 * but there isn't one in the server directory. 2308 * but there isn't one in the server directory.
2350 */ 2309 */
2351char * 2310const char *
2352gravestone_text (object *op) 2311gravestone_text (object *op)
2353{ 2312{
2354 static char buf2[MAX_BUF]; 2313 static dynbuf_text buf;
2355 char buf[MAX_BUF];
2356 time_t now = time (NULL);
2357 2314
2358 strcpy (buf2, " R.I.P.\n\n"); 2315 buf << "---- R.I.P. ----\n\n";
2316 op->name;
2317
2359 if (op->type == PLAYER) 2318 if (op->type == PLAYER)
2360 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2319 buf << " the " << op->contr->title;
2361 else
2362 sprintf (buf, "%s\n", &op->name);
2363 2320
2364 strncat (buf2, " ", 20 - strlen (buf) / 2); 2321 buf << "\n\n";
2365 strcat (buf2, buf); 2322
2323 buf << "who was level ";
2324 buf << (sint32)op->level << "\n\n" // OO breakdown
2325 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2326
2366 if (op->type == PLAYER) 2327 if (op->type == PLAYER)
2367 sprintf (buf, "who was in level %d when killed\n", op->level); 2328 buf << "by " << op->contr->killer_name () << ".\n\n";
2368 else
2369 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2370 2329
2371 strncat (buf2, " ", 20 - strlen (buf) / 2);
2372 strcat (buf2, buf);
2373 if (op->type == PLAYER)
2374 { 2330 {
2375 sprintf (buf, "by %s.\n\n", op->contr->killer); 2331 static char buf2[128];
2376 strncat (buf2, " ", 21 - strlen (buf) / 2); 2332 time_t now = time (NULL);
2377 strcat (buf2, buf);
2378 }
2379
2380 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2333 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2381 strncat (buf2, " ", 20 - strlen (buf) / 2); 2334 buf << buf2;
2382 strcat (buf2, buf); 2335 }
2383 2336
2384 return buf2; 2337 return buf;
2385} 2338}
2386 2339
2387void 2340void
2388do_some_living (object *op) 2341do_some_living (object *op)
2389{ 2342{
… …
2441 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2394 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2442 else 2395 else
2443 { 2396 {
2444 gen_grace = op->stats.maxgrace; 2397 gen_grace = op->stats.maxgrace;
2445 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2398 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2446 }
2447
2448 /* Regenerate Spell Points */
2449 if (!op->contr->golem && --op->last_sp < 0)
2450 {
2451 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2452 if (op->stats.sp < op->stats.maxsp)
2453 {
2454 op->stats.sp++;
2455 /* dms do not consume food */
2456 if (!QUERY_FLAG (op, FLAG_WIZ))
2457 {
2458 op->stats.food--;
2459 if (op->contr->digestion < 0)
2460 op->stats.food += op->contr->digestion;
2461 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2462 op->stats.food = last_food;
2463 }
2464 }
2465
2466 if (max_sp > 1)
2467 {
2468 over_sp = (gen_sp + 10) / rate_sp;
2469 if (over_sp > 0)
2470 {
2471 if (op->stats.sp < op->stats.maxsp)
2472 {
2473 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2474
2475 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2476 op->stats.sp--;
2477
2478 if (op->stats.sp > op->stats.maxsp)
2479 op->stats.sp = op->stats.maxsp;
2480 }
2481 op->last_sp = 0;
2482 }
2483 else
2484 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2485 }
2486 else
2487 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2488 } 2399 }
2489 2400
2490 /* Regenerate Grace */ 2401 /* Regenerate Grace */
2491 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2402 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2492 if (--op->last_grace < 0) 2403 if (--op->last_grace < 0)
… …
2513 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2424 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2514 } 2425 }
2515 /* wearing stuff doesn't detract from grace generation. */ 2426 /* wearing stuff doesn't detract from grace generation. */
2516 } 2427 }
2517 2428
2429 if (op->stats.food > 0)
2430 {
2518 /* Regenerate Hit Points */ 2431 /* Regenerate Spell Points */
2519 if (--op->last_heal < 0) 2432 if (!op->contr->golem && --op->last_sp < 0)
2520 {
2521 if (op->stats.hp < op->stats.maxhp)
2522 { 2433 {
2523 op->stats.hp++; 2434 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2524 /* dms do not consume food */ 2435
2525 if (!QUERY_FLAG (op, FLAG_WIZ)) 2436 if (op->stats.sp < op->stats.maxsp)
2526 { 2437 {
2438 op->stats.sp++;
2439
2440 /* dms do not consume food */
2441 if (!QUERY_FLAG (op, FLAG_WIZ))
2442 {
2527 op->stats.food--; 2443 op->stats.food--;
2444
2528 if (op->contr->digestion < 0) 2445 if (op->contr->digestion < 0)
2529 op->stats.food += op->contr->digestion; 2446 op->stats.food += op->contr->digestion;
2530 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2447 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2531 op->stats.food = last_food; 2448 op->stats.food = last_food;
2449 }
2532 } 2450 }
2533 }
2534 2451
2535 if (max_hp > 1) 2452 if (max_sp > 1)
2536 {
2537 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2538 if (over_hp > 0)
2539 { 2453 {
2540 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2454 over_sp = (gen_sp + 10) / rate_sp;
2455 if (over_sp > 0)
2456 {
2457 if (op->stats.sp < op->stats.maxsp)
2458 {
2459 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2460
2461 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2462 op->stats.sp--;
2463
2464 if (op->stats.sp > op->stats.maxsp)
2465 op->stats.sp = op->stats.maxsp;
2466 }
2467
2541 op->last_heal = 0; 2468 op->last_sp = 0;
2469 }
2470 else
2471 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2542 } 2472 }
2543 else 2473 else
2474 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2475 }
2476
2477 /* Regenerate Hit Points */
2478 if (--op->last_heal < 0)
2479 {
2480 if (op->stats.hp < op->stats.maxhp)
2544 { 2481 {
2545 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2482 op->stats.hp++;
2483
2484 /* dms do not consume food */
2485 if (!QUERY_FLAG (op, FLAG_WIZ))
2486 {
2487 op->stats.food--;
2488
2489 if (op->contr->digestion < 0)
2490 op->stats.food += op->contr->digestion;
2491 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2492 op->stats.food = last_food;
2493 }
2546 } 2494 }
2495
2496 if (max_hp > 1)
2497 {
2498 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2499
2500 if (over_hp > 0)
2501 {
2502 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2503 op->last_heal = 0;
2504 }
2505 else
2506 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2547 } 2507 }
2548 else 2508 else
2549 {
2550 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2509 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2551 } 2510 }
2552 } 2511 }
2553 2512
2554 /* Digestion */ 2513 /* Digestion */
2555 if (--op->last_eat < 0) 2514 if (--op->last_eat < 0)
2556 { 2515 {
2557 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2516 int bonus = max (0, op->contr->digestion),
2517 penalty = max (0, -op->contr->digestion);
2558 2518
2559 if (op->contr->gen_hp > 0)
2560 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2519 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2561 else
2562 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2563 2520
2564 /* dms do not consume food */ 2521 /* dms do not consume food */
2565 if (!QUERY_FLAG (op, FLAG_WIZ)) 2522 if (!QUERY_FLAG (op, FLAG_WIZ))
2566 op->stats.food--; 2523 op->stats.food--;
2567 } 2524 }
2568 2525
2569 if (op->stats.food < 0 && op->stats.hp >= 0) 2526 if (op->stats.food < 0 && op->stats.hp >= 0)
2570 { 2527 {
2571 object *tmp, *flesh = 0; 2528 object *flesh = 0;
2572 2529
2573 for (tmp = op->inv; tmp; tmp = tmp->below) 2530 for_inv_removable (op, tmp)
2574 { 2531 {
2575 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2532 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2533 continue;
2534
2535 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2576 { 2536 {
2577 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2537 op->statusmsg ("You blindly grab for a bite of food. "
2578 { 2538 "H<To prevent you from starving, you ate some random item from your backpack.>");
2579 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2580 manual_apply (op, tmp, 0); 2539 manual_apply (op, tmp, 0);
2540
2581 if (op->stats.food >= 0 || op->stats.hp < 0) 2541 if (op->stats.food >= 0 || op->stats.hp < 0)
2582 break; 2542 break;
2583 } 2543 }
2584 else if (tmp->type == FLESH) 2544 else if (tmp->type == FLESH)
2585 flesh = tmp; 2545 flesh = tmp;
2586 } /* End if paid for object */ 2546 }
2587 } /* end of for loop */
2588 2547
2589 /* If player is still starving, it means they don't have any food, so 2548 /* If player is still starving, it means they don't have any food, so
2590 * eat flesh instead. 2549 * eat flesh instead.
2591 */ 2550 */
2592 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2551 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2593 { 2552 {
2594 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2553 op->statusmsg ("You blindly grab for a bite of food. "
2554 "H<To prevent you from starving, you ate some random item from your backpack.>");
2595 manual_apply (op, flesh, 0); 2555 manual_apply (op, flesh, 0);
2596 } 2556 }
2557
2558 // If player is still starving, alert him!
2559 if (op->stats.food < 0)
2560 op->failmsg ("You are starving! "
2561 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2562 }
2563
2564 if (op->stats.food < 0)
2597 } 2565 {
2598 2566 op->stats.hp += op->stats.food;
2599 while (op->stats.food < 0 && op->stats.hp >= 0) 2567 op->stats.food = 0;
2600 op->stats.food++, op->stats.hp--; 2568 }
2601 2569
2602 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2570 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2603 kill_player (op); 2571 kill_player (op);
2604 } 2572 }
2605} 2573}
… …
2610 * file. 2578 * file.
2611 */ 2579 */
2612void 2580void
2613kill_player (object *op) 2581kill_player (object *op)
2614{ 2582{
2583 int x, y;
2615 char buf[MAX_BUF]; 2584 char buf[MAX_BUF];
2616 int x, y;
2617
2618 //int i;
2619 maptile *map; /* this is for resurrection */ 2585 maptile *map; /* this is for resurrection */
2620
2621 /* int z;
2622 int num_stats_lose;
2623 int lost_a_stat;
2624 int lose_this_stat;
2625 int this_stat; */
2626 int will_kill_again; 2586 int will_kill_again;
2627 archetype *at; 2587 archetype *at;
2628 object *tmp; 2588 object *tmp;
2629 2589
2630 if (save_life (op)) 2590 if (save_life (op))
2631 return; 2591 return;
2632
2633 2592
2634 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2593 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2635 * in cities ONLY!!! It is very important that this doesn't get abused. 2594 * in cities ONLY!!! It is very important that this doesn't get abused.
2636 * Look at op_on_battleground() for more info --AndreasV 2595 * Look at op_on_battleground() for more info --AndreasV
2637 */ 2596 */
… …
2653 { 2612 {
2654 tmp->destroy (); 2613 tmp->destroy ();
2655 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2614 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2656 } 2615 }
2657 2616
2658 cure_disease (op, 0); /* remove any disease */ 2617 cure_disease (op, 0, 0); /* remove any disease */
2659 op->stats.hp = op->stats.maxhp; 2618 op->stats.hp = op->stats.maxhp;
2660 if (op->stats.food <= 0) 2619 if (op->stats.food <= 0)
2661 op->stats.food = 999; 2620 op->stats.food = 999;
2662 2621
2663 /* create a bodypart-trophy to make the winner happy */ 2622 /* create a bodypart-trophy to make the winner happy */
2664 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2623 if (object *tmp = arch_to_object (archetype::find ("finger")))
2665 { 2624 {
2666 sprintf (buf, "%s's finger", &op->name); 2625 tmp->name = format ("%s's finger" , &op->name);
2667 tmp->name = buf; 2626 tmp->name_pl = format ("%s's fingers", &op->name);
2668 sprintf (buf, " This finger has been cut off %s\n"
2669 " the %s, when he was defeated at\n level %d by %s.\n",
2670 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2671 tmp->msg = buf; 2627 tmp->msg = format (
2628 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2629 &op->name, op->contr->title,
2630 (int)op->level,
2631 op->contr->killer_name ()
2632 );
2672 tmp->value = 0, tmp->type = 0; 2633 tmp->value = 0, tmp->type = 0;
2673 tmp->materialname = "organics"; 2634 tmp->materialname = "organics";
2674 tmp->insert_at (op, tmp); 2635 tmp->insert_at (op, tmp);
2675 } 2636 }
2676 2637
… …
2684 2645
2685 command_kill_pets (op, 0); 2646 command_kill_pets (op, 0);
2686 2647
2687 if (op->stats.food < 0) 2648 if (op->stats.food < 0)
2688 { 2649 {
2689 sprintf (buf, "%s starved to death.", &op->name); 2650 op->contr->killer = archetype::get ("killer_starvation");
2690 strcpy (op->contr->killer, "starvation"); 2651 op->contr->killer->destroy ();
2691 } 2652 }
2692 else
2693 sprintf (buf, "%s died.", &op->name);
2694 2653
2695 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2654 op->contr->play_sound (sound_find ("player_dies"));
2696 2655
2697 /* save the map location for corpse, gravestone */ 2656 /* save the map location for corpse, gravestone */
2698 x = op->x; 2657 x = op->x;
2699 y = op->y; 2658 y = op->y;
2700 map = op->map; 2659 map = op->map;
… …
2807 lost_a_stat = 1; 2766 lost_a_stat = 1;
2808 } 2767 }
2809 } 2768 }
2810 } 2769 }
2811 } 2770 }
2771
2812 /* If no stat lost, tell the player. */ 2772 /* If no stat lost, tell the player. */
2813 if (!lost_a_stat) 2773 if (!lost_a_stat)
2814 { 2774 {
2815 /* determine_god() seems to not work sometimes... why is this? 2775 /* determine_god() seems to not work sometimes... why is this?
2816 Should I be using something else? GD */ 2776 Should I be using something else? GD */
… …
2820 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2780 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2821 else 2781 else
2822 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2782 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2823 } 2783 }
2824#else 2784#else
2825 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2785 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2826#endif 2786#endif
2827 2787
2828 /* Put a gravestone up where the character 'almost' died. List the 2788 /* Put a gravestone up where the character 'almost' died. List the
2829 * exp loss on the stone. 2789 * exp loss on the stone.
2830 */ 2790 */
2831 tmp = arch_to_object (archetype::find ("gravestone")); 2791 tmp = arch_to_object (archetype::find ("gravestone"));
2832 sprintf (buf, "%s's gravestone", &op->name); 2792 tmp->name = format ("%s's gravestone", &op->name);
2833 tmp->name = buf; 2793 tmp->name_pl = format ("%s's gravestones", &op->name);
2834 sprintf (buf, "%s's gravestones", &op->name);
2835 tmp->name_pl = buf;
2836 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer); 2794 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 ());
2837 tmp->msg = buf;
2838 tmp->x = op->x, tmp->y = op->y; 2795 tmp->x = op->x, tmp->y = op->y;
2839 insert_ob_in_map (tmp, op->map, NULL, 0); 2796 insert_ob_in_map (tmp, op->map, NULL, 0);
2840 2797
2841 /**************************************/ 2798 /**************************************/
2842 /* */ 2799 /* */
… …
2863 { 2820 {
2864 tmp->destroy (); 2821 tmp->destroy ();
2865 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2822 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2866 } 2823 }
2867 2824
2868 cure_disease (op, 0); /* remove any disease */ 2825 cure_disease (op, 0, 0); /* remove any disease */
2826
2827 // remove all spell effects that are active
2828 // to avoid long-term effects such as word-of-recall
2829 for (object *item = op->inv; item; )
2830 {
2831 object *next = item->below;
2832
2833 if (item->type == SPELL_EFFECT && item->active)
2834 item->destroy ();
2835
2836 item = next;
2837 }
2869 2838
2870 /*add_exp(op, (op->stats.exp * -0.20)); */ 2839 /*add_exp(op, (op->stats.exp * -0.20)); */
2871 apply_death_exp_penalty (op); 2840 apply_death_exp_penalty (op);
2841
2872 if (op->stats.food < 100) 2842 if (op->stats.food < 100)
2873 op->stats.food = 900; 2843 op->stats.food = 900;
2844
2874 op->stats.hp = op->stats.maxhp; 2845 op->stats.hp = op->stats.maxhp;
2875 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2876 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2877 2848
2878 /* 2849 /*
2879 * Check to see if the player has any unpaid items. If so, remove them 2850 * Check to see if the player has any unpaid items. If so, remove them
2880 * and put them back in the map. 2851 * and put them back in the map.
2881 */ 2852 */
2882 remove_unpaid_objects (op->inv, op); 2853 op->drop_unpaid_items ();
2883 2854
2884 /****************************************/ 2855 /****************************************/
2885 /* */ 2856 /* */
2886 /* Move player to his current respawn- */ 2857 /* Move player to his current respawn- */
2887 /* position (usually last savebed) */ 2858 /* position (usually last savebed) */
… …
2946 2917
2947 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2918 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2948 { 2919 {
2949 if (tmp->nrof > 1) 2920 if (tmp->nrof > 1)
2950 { 2921 {
2951 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2922 tmp->decrease (rndm (1, tmp->nrof - 1));
2952 tmp2->destroy ();
2953 insert_ob_in_map (tmp, op->map, NULL, 0); 2923 insert_ob_in_map (tmp, op->map, NULL, 0);
2954 } 2924 }
2955 else 2925 else
2956 tmp->destroy (); 2926 tmp->destroy ();
2957 } 2927 }
… …
2968void 2938void
2969fix_weight (void) 2939fix_weight (void)
2970{ 2940{
2971 for_all_players (pl) 2941 for_all_players (pl)
2972 { 2942 {
2973 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2943 sint32 old = pl->ob->carrying;
2974 2944
2975 if (old == sum) 2945 pl->ob->update_weight ();
2976 continue; 2946
2947 if (old != pl->ob->carrying)
2948 {
2977 pl->ob->update_stats (); 2949 pl->ob->update_stats ();
2978 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2950 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2951 }
2979 } 2952 }
2980} 2953}
2981 2954
2982void 2955void
2983fix_luck (void) 2956fix_luck (void)
… …
3027void 3000void
3028make_visible (object *op) 3001make_visible (object *op)
3029{ 3002{
3030 op->hide = 0; 3003 op->hide = 0;
3031 op->invisible = 0; 3004 op->invisible = 0;
3005
3032 if (op->type == PLAYER) 3006 if (op->type == PLAYER)
3033 { 3007 {
3034 op->contr->tmp_invis = 0; 3008 op->contr->tmp_invis = 0;
3035 op->contr->invis_race = 0; 3009 op->contr->invis_race = 0;
3036 } 3010 }
… …
3039} 3013}
3040 3014
3041int 3015int
3042is_true_undead (object *op) 3016is_true_undead (object *op)
3043{ 3017{
3044 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3018 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3045 return 1; 3019 return 1;
3046 3020
3047 return 0; 3021 return 0;
3048} 3022}
3049 3023
3050/* look at the surrounding terrain to determine 3024/* look at the surrounding terrain to determine
3051 * the hideability of this object. Positive levels 3025 * the hideability of this object. Positive levels
3052 * indicate greater hideability. 3026 * indicate greater hideability.
3053 */ 3027 */
3054
3055int 3028int
3056hideability (object *ob) 3029hideability (object *ob)
3057{ 3030{
3058 int i, level = 0, mflag; 3031 int i, level = 0, mflag;
3059 sint16 x, y; 3032 sint16 x, y;
… …
3069 * as bad as carrying a light on a pitch dark map */ 3042 * as bad as carrying a light on a pitch dark map */
3070 if (has_carried_lights (ob)) 3043 if (has_carried_lights (ob))
3071 level = -(10 + (2 * ob->map->darkness)); 3044 level = -(10 + (2 * ob->map->darkness));
3072 3045
3073 /* scan through all nearby squares for terrain to hide in */ 3046 /* scan through all nearby squares for terrain to hide in */
3074 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3047 for (i = 0, x = ob->x, y = ob->y;
3048 i <= SIZEOFFREE1;
3049 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3075 { 3050 {
3076 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3051 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3077 if (mflag & P_OUT_OF_MAP) 3052 if (mflag & P_OUT_OF_MAP)
3078 {
3079 continue; 3053 continue;
3080 } 3054
3081 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3055 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3082 level += 2; 3056 level += 2;
3083 else /* open terrain! */ 3057 else /* open terrain! */
3084 level -= 1; 3058 level -= 1;
3085 } 3059 }
… …
3096 * spot (surrounded by clear terrain in broad daylight). -b.t. 3070 * spot (surrounded by clear terrain in broad daylight). -b.t.
3097 */ 3071 */
3098void 3072void
3099do_hidden_move (object *op) 3073do_hidden_move (object *op)
3100{ 3074{
3101 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3075 int hide = 0;
3102 object *skop;
3103 3076
3104 if (!op || !op->map) 3077 if (!op || !op->map)
3105 return; 3078 return;
3106 3079
3107 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3080 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3081 int num = random_roll (0, 19, op, PREFER_LOW);
3108 3082
3109 /* its *extremely* hard to run and sneak/hide at the same time! */ 3083 /* its *extremely* hard to run and sneak/hide at the same time! */
3110 if (op->type == PLAYER && op->contr->run_on) 3084 if (op->type == PLAYER && op->contr->run_on)
3111 if (!skop || num >= skop->level) 3085 if (!skop || num >= skop->level)
3112 { 3086 {
… …
3122 num -= hide; 3096 num -= hide;
3123 3097
3124 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3098 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3125 { 3099 {
3126 make_visible (op); 3100 make_visible (op);
3101
3127 if (op->type == PLAYER) 3102 if (op->type == PLAYER)
3128 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3103 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3129 } 3104 }
3130 else if (op->type == PLAYER && skop) 3105 else if (op->type == PLAYER && skop)
3131 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3106 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3184 * object op. This function works fine for monsters, 3159 * object op. This function works fine for monsters,
3185 * but we dont worry if the object isnt the top one in 3160 * but we dont worry if the object isnt the top one in
3186 * a pile (say a coin under a table would return "viewable" 3161 * a pile (say a coin under a table would return "viewable"
3187 * by this routine). Another question, should we be 3162 * by this routine). Another question, should we be
3188 * concerned with the direction the player is looking 3163 * concerned with the direction the player is looking
3189 * in? Realistically, most of use cant see stuff behind 3164 * in? Realistically, most of us can't see stuff behind
3190 * our backs...on the other hand, does the "facing" direction 3165 * our backs...on the other hand, does the "facing" direction
3191 * imply the way your head, or body is facing? Its possible 3166 * imply the way your head, or body is facing? It's possible
3192 * for them to differ. Sigh, this fctn could get a bit more complex. 3167 * for them to differ. Sigh, this fctn could get a bit more complex.
3193 * -b.t. 3168 * -b.t.
3194 * This function is now map tiling safe. 3169 * This function is now map tiling safe.
3195 */ 3170 */
3196
3197int 3171int
3198player_can_view (object *pl, object *op) 3172player_can_view (object *pl, object *op)
3199{ 3173{
3200 rv_vector rv; 3174 rv_vector rv;
3201 int dx, dy; 3175 int dx, dy;
… …
3213 3187
3214 get_rangevector (pl, op, &rv, 0x1); 3188 get_rangevector (pl, op, &rv, 0x1);
3215 3189
3216 /* starting with the 'head' part, lets loop 3190 /* starting with the 'head' part, lets loop
3217 * through the object and find if it has any 3191 * through the object and find if it has any
3218 * part that is in the los array but isnt on 3192 * part that is in the los array but isn't on
3219 * a blocked los square. 3193 * a blocked los square.
3220 * we use the archetype to figure out offsets. 3194 * we use the archetype to figure out offsets.
3221 */ 3195 */
3222 while (op) 3196 while (op)
3223 { 3197 {
3224 dx = rv.distance_x + op->arch->clone.x; 3198 dx = rv.distance_x + op->arch->x;
3225 dy = rv.distance_y + op->arch->clone.y; 3199 dy = rv.distance_y + op->arch->y;
3226 3200
3227 /* only the viewable area the player sees is updated by LOS 3201 /* only the viewable area the player sees is updated by LOS
3228 * code, so we need to restrict ourselves to that range of values 3202 * code, so we need to restrict ourselves to that range of values
3229 * for any meaningful values. 3203 * for any meaningful values.
3230 */ 3204 */
3231 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3205 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3232 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3206 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3233 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3207 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3234 return 1; 3208 return 1;
3209
3235 op = op->more; 3210 op = op->more;
3236 } 3211 }
3212
3237 return 0; 3213 return 0;
3238} 3214}
3239 3215
3240/* routine for both players and monsters. We call this when 3216/* routine for both players and monsters. We call this when
3241 * there is a possibility for our action distrubing our hiding 3217 * there is a possibility for our action distrubing our hiding
… …
3244 * return 0. 3220 * return 0.
3245 */ 3221 */
3246int 3222int
3247action_makes_visible (object *op) 3223action_makes_visible (object *op)
3248{ 3224{
3249
3250 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3225 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3251 { 3226 {
3252 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3227 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3253 return 0; 3228 return 0;
3254 3229
… …
3260 { 3235 {
3261 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3236 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3262 return 1; 3237 return 1;
3263 } 3238 }
3264 } 3239 }
3240
3265 return 0; 3241 return 0;
3266} 3242}
3267 3243
3268/* op_on_battleground - checks if the given object op (usually 3244/* op_on_battleground - checks if the given object op (usually
3269 * a player) is standing on a valid battleground-tile, 3245 * a player) is standing on a valid battleground-tile,
… …
3274 * Default is to do the same as before, so only people wanting to have different points need worry about this 3250 * Default is to do the same as before, so only people wanting to have different points need worry about this
3275 */ 3251 */
3276int 3252int
3277op_on_battleground (object *op, int *x, int *y) 3253op_on_battleground (object *op, int *x, int *y)
3278{ 3254{
3279 object *tmp;
3280
3281 /* A battleground-tile needs the following attributes to be valid: 3255 /* A battleground-tile needs the following attributes to be valid:
3282 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3256 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3283 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3257 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3284 * and the exit-coordinates sp/hp must both be > 0. 3258 * and the exit-coordinates sp/hp must both be > 0.
3285 * => The intention here is to prevent abuse of the battleground- 3259 * => The intention here is to prevent abuse of the battleground-
3286 * feature (like pickable or hidden battleground tiles). */ 3260 * feature (like pickable or hidden battleground tiles). */
3287 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3261 for (object *tmp = op->below; tmp; tmp = tmp->below)
3288 { 3262 {
3289 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3263 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3290 { 3264 {
3291 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3265 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3292 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3266 && tmp->type == BATTLEGROUND
3267 && tmp->name == shstr_battleground
3268 && EXIT_X (tmp) && EXIT_Y (tmp))
3293 { 3269 {
3294 /*before we assign the exit, check if this is a teambattle */ 3270 /* before we assign the exit, check if this is a teambattle */
3295 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3271 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3296 { 3272 {
3297 object *invtmp;
3298
3299 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3273 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3300 { 3274 {
3301 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3275 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3302 { 3276 {
3303 if (x != NULL && y != NULL) 3277 if (x && y)
3304 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3278 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3279
3305 return 1; 3280 return 1;
3306 } 3281 }
3307 } 3282 }
3308 } 3283 }
3284
3309 if (x != NULL && y != NULL) 3285 if (x && y)
3310 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3286 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3287
3311 return 1; 3288 return 1;
3312 } 3289 }
3313 } 3290 }
3314 } 3291 }
3292
3315 /* If we got here, did not find a battleground */ 3293 /* If we got here, did not find a battleground */
3316 return 0; 3294 return 0;
3317} 3295}
3318 3296
3319/* 3297/*
… …
3335 char buf[MAX_BUF]; /* tmp. string buffer */ 3313 char buf[MAX_BUF]; /* tmp. string buffer */
3336 int i = 0, j = 0; 3314 int i = 0, j = 0;
3337 3315
3338 /* get the appropriate treasurelist */ 3316 /* get the appropriate treasurelist */
3339 if (atnr == ATNR_FIRE) 3317 if (atnr == ATNR_FIRE)
3340 trlist = treasurelist::find ("dragon_ability_fire"); 3318 trlist = treasurelist::find (shstr_dragon_ability_fire);
3341 else if (atnr == ATNR_COLD) 3319 else if (atnr == ATNR_COLD)
3342 trlist = treasurelist::find ("dragon_ability_cold"); 3320 trlist = treasurelist::find (shstr_dragon_ability_cold);
3343 else if (atnr == ATNR_ELECTRICITY) 3321 else if (atnr == ATNR_ELECTRICITY)
3344 trlist = treasurelist::find ("dragon_ability_elec"); 3322 trlist = treasurelist::find (shstr_dragon_ability_elec);
3345 else if (atnr == ATNR_POISON) 3323 else if (atnr == ATNR_POISON)
3346 trlist = treasurelist::find ("dragon_ability_poison"); 3324 trlist = treasurelist::find (shstr_dragon_ability_poison);
3347 3325
3348 if (trlist == NULL || who->type != PLAYER) 3326 if (trlist == NULL || who->type != PLAYER)
3349 return; 3327 return;
3350 3328
3351 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3329 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3355 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3333 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3356 return; 3334 return;
3357 } 3335 }
3358 3336
3359 /* everything seems okay - now bring on the gift: */ 3337 /* everything seems okay - now bring on the gift: */
3360 item = &(tr->item->clone); 3338 item = tr->item;
3361 3339
3362 if (item->type == SPELL) 3340 if (item->type == SPELL)
3363 { 3341 {
3364 if (check_spell_known (who, item->name)) 3342 if (check_spell_known (who, item->name))
3365 return; 3343 return;
… …
3424 { 3402 {
3425 /* forces in the treasurelist can alter the player's stats */ 3403 /* forces in the treasurelist can alter the player's stats */
3426 object *skin; 3404 object *skin;
3427 3405
3428 /* first get the dragon skin force */ 3406 /* first get the dragon skin force */
3429 shstr_cmp dragon_skin_force ("dragon_skin_force");
3430 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3407 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3431 ; 3408 ;
3432 3409
3433 if (!skin) 3410 if (!skin)
3434 return; 3411 return;
3435 3412
… …
3470 else 3447 else
3471 { 3448 {
3472 /* generate misc. treasure */ 3449 /* generate misc. treasure */
3473 tmp = arch_to_object (tr->item); 3450 tmp = arch_to_object (tr->item);
3474 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3451 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3475 tmp = insert_ob_in_ob (tmp, who); 3452 who->insert (tmp);
3476 if (who->type == PLAYER)
3477 esrv_send_item (who, tmp);
3478 } 3453 }
3479} 3454}
3480 3455
3481/** 3456/**
3482 * Unready an object for a player. This function does nothing if the object was 3457 * Unready an object for a player. This function does nothing if the object was
… …
3511 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) 3486 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3512 return 0; 3487 return 0;
3513 3488
3514 return 100 - blocked_los [x][y]; 3489 return 100 - blocked_los [x][y];
3515} 3490}
3491
3492void
3493player::infobox (const char *title, const char *msg, int color)
3494{
3495 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3496}
3497
3498void
3499player::statusmsg (const char *msg, int color)
3500{
3501 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3502}
3503
3504void
3505player::failmsg (const char *msg, int color)
3506{
3507 play_sound (sound_find ("generic_failure"));
3508 statusmsg (msg, color);
3509}
3510

Diff Legend

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