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.148 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.235 by root, Wed Nov 4 17:24:00 2009 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,2009 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 it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * 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 Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <sounds.h> 27#include <sounds.h>
… …
33#include <algorithm> 33#include <algorithm>
34#include <functional> 34#include <functional>
35 35
36playervec players; 36playervec players;
37 37
38void
39display_motd (const object *op)
40{
41 char buf[MAX_BUF];
42 char motd[HUGE_BUF];
43 FILE *fp;
44 int comp;
45 int size;
46
47 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
48 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
49 return;
50
51 motd[0] = '\0';
52 size = 0;
53
54 while (fgets (buf, MAX_BUF, fp))
55 {
56 if (*buf == '#')
57 continue;
58
59 strncat (motd + size, buf, HUGE_BUF - size);
60 size += strlen (buf);
61 }
62
63 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
64 close_and_delete (fp, comp);
65}
66
67void
68send_rules (const object *op)
69{
70 char buf[MAX_BUF];
71 char rules[HUGE_BUF];
72 FILE *fp;
73 int comp;
74 int size;
75
76 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
77 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
78 return;
79
80 rules[0] = '\0';
81 size = 0;
82
83 while (fgets (buf, MAX_BUF, fp))
84 {
85 if (*buf == '#')
86 continue;
87
88 if (size + strlen (buf) >= HUGE_BUF)
89 {
90 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
91 break;
92 }
93
94 strncat (rules + size, buf, HUGE_BUF - size);
95 size += strlen (buf);
96 }
97
98 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
99 close_and_delete (fp, comp);
100}
101
102void
103send_news (const object *op)
104{
105 char buf[MAX_BUF];
106 char news[HUGE_BUF];
107 char subject[MAX_BUF];
108 FILE *fp;
109 int comp;
110 int size;
111
112 sprintf (buf, "%s/%s", settings.confdir, settings.news);
113 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
114 return;
115
116 news[0] = '\0';
117 subject[0] = '\0';
118 size = 0;
119
120 while (fgets (buf, MAX_BUF, fp))
121 {
122 if (*buf == '#')
123 continue;
124
125 if (*buf == '%')
126 { /* send one news */
127 if (size > 0)
128 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
129
130 strcpy (subject, buf + 1);
131 strip_endline (subject);
132 size = 0;
133 news[0] = '\0';
134 }
135 else
136 {
137 if (size + strlen (buf) >= HUGE_BUF)
138 {
139 LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
140 break;
141 }
142 strncat (news + size, buf, HUGE_BUF - size);
143 size += strlen (buf);
144 }
145 }
146
147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149 close_and_delete (fp, comp);
150}
151
152/* This loads the first map an puts the player on it. */ 38/* This loads the first map an puts the player on it. */
153static void 39static void
154set_first_map (object *op) 40set_first_map (object *op)
155{ 41{
156 op->contr->maplevel = first_map_path; 42 op->contr->maplevel = first_map_path;
… …
184 70
185 if (ob->map) 71 if (ob->map)
186 maplevel = ob->map->path; 72 maplevel = ob->map->path;
187 73
188 ob->remove (); 74 ob->remove ();
75 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0; 76 ob->map = 0;
190 party = 0; 77 party = 0;
191 78
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 79 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193 80
… …
207 ob->close_container (); //TODO: client-specific 94 ob->close_container (); //TODO: client-specific
208 95
209 ns->update_look = 0; 96 ns->update_look = 0;
210 ns->look_position = 0; 97 ns->look_position = 0;
211 98
212 clear_los (this); 99 clear_los ();
213 100
214 ns->reset_stats (); 101 ns->reset_stats ();
215 102
216 /* make sure he's a player -- needed because of class change. */ 103 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 104 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->clone.race; 105 ob->race = ob->arch->race;
219 106
220 ob->carrying = sum_weight (ob); 107 ob->update_weight ();
221 link_player_skills (ob); 108 link_skills ();
222 109
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 110 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224 111
225 assign (title, ob->arch->clone.name); 112 assign (title, ob->arch->object::name);
226 113
227 /* if it's a dragon player, set the correct title here */ 114 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob)) 115 if (is_dragon_pl (ob))
229 { 116 {
230 object *tmp, *abil = 0, *skin = 0; 117 object *tmp, *abil = 0, *skin = 0;
231 118
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) 119 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE) 120 if (tmp->type == FORCE)
237 if (tmp->arch->archname == dragon_ability_force) 121 if (tmp->arch->archname == shstr_dragon_ability_force)
238 abil = tmp; 122 abil = tmp;
239 else if (tmp->arch->archname == dragon_skin_force) 123 else if (tmp->arch->archname == shstr_dragon_skin_force)
240 skin = tmp; 124 skin = tmp;
241 125
242 set_dragon_name (ob, abil, skin); 126 set_dragon_name (ob, abil, skin);
243 } 127 }
244 128
245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 129 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246 130
247 esrv_new_player (this, ob->weight + ob->carrying); 131 esrv_new_player (this);
132
133 ob->update_stats ();
134
135 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0);
138
139 activate ();
140
141 INVOKE_PLAYER (CONNECT, this);
142 INVOKE_PLAYER (LOGIN, this);
143}
144
145void
146player::disconnect ()
147{
148 if (ob)
149 {
150 ob->close_container (); //TODO: client-specific
151 ob->drop_unpaid_items ();
152 }
153
154 if (ns)
155 {
156 if (active)
157 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
158
159 INVOKE_PLAYER (DISCONNECT, this);
160
161 ns->reset_stats ();
162 ns->pl = 0;
163 ns = 0;
164 }
165
166 // this is important for the player scheduler to get the correct refcount
167 // when ns = 0
168 observe = viewpoint = ob;
169
170 deactivate ();
171}
172
173// the need for this function can be explained
174// by load_object not returning the object
175void
176player::set_object (object *op)
177{
178 ob = observe = viewpoint = op;
179 ob->contr = this; /* this aren't yet in archetype */
180
181 ob->speed = 1.0f;
182 ob->speed_left = 0.5f;
183
184 ob->direction = 5; /* So player faces south */
248 185
249 ob->flag [FLAG_READY_WEAPON] = false; 186 ob->flag [FLAG_READY_WEAPON] = false;
250 ob->flag [FLAG_READY_SKILL] = false; 187 ob->flag [FLAG_READY_SKILL] = false;
251 ob->flag [FLAG_READY_BOW] = false; 188 ob->flag [FLAG_READY_BOW] = false;
252 189
… …
269 combat_ob = op; 206 combat_ob = op;
270 break; 207 break;
271 } 208 }
272 209
273 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 210 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274 ob->update_stats (); 211 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} 212}
324 213
325void 214void
326player::set_observe (object *op) 215player::set_observe (object *op)
327{ 216{
328 observe = op ? op : ob; 217 observe = viewpoint = op ? op : ob;
218 do_los = 1;
219}
220
221void
222player::set_viewpoint (object *op)
223{
224 viewpoint = op ? op : (object *)observe;
329 do_los = 1; 225 do_los = 1;
330} 226}
331 227
332player::player () 228player::player ()
333{ 229{
… …
341 savebed_map = first_map_path; /* Init. respawn position */ 237 savebed_map = first_map_path; /* Init. respawn position */
342 238
343 gen_sp_armour = 10; 239 gen_sp_armour = 10;
344 bowtype = bow_normal; 240 bowtype = bow_normal;
345 petmode = pet_normal; 241 petmode = pet_normal;
346 listening = 10;
347 usekeys = containers; 242 usekeys = containers;
348 peaceful = 1; /* default peaceful */ 243 peaceful = 1; /* default peaceful */
349 do_los = 1; 244 do_los = 1;
350 245
351 weapon_sp = 1.0f; 246 weapon_sp = 1.0f;
… …
362 if (ob) 257 if (ob)
363 { 258 {
364 ob->destroy_inv (false); 259 ob->destroy_inv (false);
365 ob->destroy (); 260 ob->destroy ();
366 } 261 }
262
263 ob = observe = viewpoint = 0;
367} 264}
368 265
369player::~player () 266player::~player ()
370{ 267{
371 /* Clear item stack */ 268 /* Clear item stack */
… …
398 * Note: there MUST be at least one player archetype! 295 * Note: there MUST be at least one player archetype!
399 */ 296 */
400archetype * 297archetype *
401get_player_archetype (archetype *at) 298get_player_archetype (archetype *at)
402{ 299{
403 archetype *start = at; 300 // archetypes could have been reloaded
301 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
302
303 if (!nat)
304 return at;
305
306 archvec::iterator i = archetypes.find (nat);
404 307
405 for (;;) 308 for (;;)
406 { 309 {
407 if (at == NULL || at->next == NULL) 310 if (++i == archetypes.end ())
408 at = first_archetype; 311 i = archetypes.begin ();
409 else 312 else if (*i == at)
410 at = at->next; 313 cleanup ("not a single player archetype found");
411 314
412 if (at->clone.type == PLAYER) 315 if ((*i)->type == PLAYER)
413 return at; 316 return *i;
414
415 if (at == start)
416 {
417 LOG (llevError, "No Player archetypes\n");
418 exit (-1);
419 }
420 } 317 }
421} 318}
422 319
423object * 320object *
424get_nearest_player (object *mon) 321get_nearest_player (object *mon)
… …
428 unsigned lastdist; 325 unsigned lastdist;
429 rv_vector rv; 326 rv_vector rv;
430 327
431 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 328 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
432 { 329 {
433 /* We should not find free objects on this friendly list, but it
434 * does periodically happen. Given that, lets deal with it.
435 * While unlikely, it is possible the next object on the friendly
436 * list is also free, so encapsulate this in a while loop.
437 */
438 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
439 {
440 object *tmp = ol->ob;
441
442 /* Can't do much more other than log the fact, because the object
443 * itself will have been cleared.
444 */
445 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
446 tmp->debug_desc ());
447 ol = ol->next;
448 remove_friendly_object (tmp);
449 if (!ol)
450 return op;
451 }
452
453 /* Remove special check for player from this. First, it looks to cause
454 * some crashes (ol->ob->contr not set properly?), but secondly, a more
455 * complicated method of state checking would be needed in any case -
456 * as it was, a clever player could type quit, and the function would
457 * skip them over while waiting for confirmation. Remove
458 * on_same_map check, as can_detect_enemy also does this
459 */
460 if (!can_detect_enemy (mon, ol->ob, &rv)) 330 if (!can_detect_enemy (mon, ol->ob, &rv))
461 continue; 331 continue;
462 332
463 if (lastdist > rv.distance) 333 if (lastdist > rv.distance)
464 { 334 {
… …
659 529
660 return firstdir; 530 return firstdir;
661} 531}
662 532
663void 533void
664give_initial_items (object *pl, treasurelist * items) 534give_initial_items (object *pl, treasurelist *items)
665{ 535{
666 object *op, *next = NULL;
667
668 if (pl->randomitems != NULL) 536 if (pl->randomitems)
669 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 537 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
670 538
671 for (op = pl->inv; op; op = next) 539 for (object *next, *op = pl->inv; op; op = next)
672 { 540 {
673 next = op->below; 541 next = op->below;
674 542
675 /* Forces get applied per default, unless they have the 543 /* Forces get applied per default, unless they have the
676 * flag "neutral" set. Sorry but I can't think of a better way 544 * flag "neutral" set. Sorry but I can't think of a better way
… …
681 /* we never give weapons/armour if these cannot be used 549 /* we never give weapons/armour if these cannot be used
682 * by this player due to race restrictions 550 * by this player due to race restrictions
683 */ 551 */
684 if (pl->type == PLAYER) 552 if (pl->type == PLAYER)
685 { 553 {
686 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 554 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
555 &&
687 (op->type == ARMOUR || op->type == BOOTS || 556 (op->type == ARMOUR || op->type == BOOTS
688 op->type == CLOAK || op->type == HELMET || 557 || op->type == CLOAK || op->type == HELMET
689 op->type == SHIELD || op->type == GLOVES || 558 || op->type == SHIELD || op->type == GLOVES
559 || op->type == BRACERS || op->type == GIRDLE))
690 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 560 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
691 { 561 {
692 op->destroy (); 562 op->destroy ();
693 continue; 563 continue;
694 } 564 }
695 } 565 }
696 566
697 /* This really needs to be better - we should really give 567 /* Here we remove duplicated skills (as duplicated spell objects have
698 * a substitute spellbook. The problem is that we don't really 568 * _very_ confusing effects for players), which could for instance be
699 * have a good idea what to replace it with (need something like 569 * generated by bad treasurelists. - elmex
700 * a first level treasurelist for each skill.)
701 * remove duplicate skills also
702 */ 570 */
703 if (op->type == SPELLBOOK || op->type == SKILL) 571 if (op->type == SKILL)
704 { 572 {
705 object *tmp;
706
707 for (tmp = op->below; tmp; tmp = tmp->below) 573 for (object *tmp = op->below; tmp; tmp = tmp->below)
708 if (tmp->type == op->type && tmp->name == op->name) 574 if (tmp->type == op->type && tmp->name == op->name)
709 break;
710
711 if (tmp)
712 { 575 {
713 op->destroy (); 576 op->destroy ();
577 LOG (llevError,
714 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 578 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
715 continue; 579 break;
716 } 580 }
717 581
718 if (op->nrof > 1) 582 if (op->nrof > 1)
719 op->nrof = 1; 583 op->nrof = 1;
720 } 584 }
721 585
722 if (op->type == SPELLBOOK && op->inv) 586 if (op->type == SPELLBOOK && op->inv)
723 {
724 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 587 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
725 }
726 588
727 /* Give starting characters identified, uncursed, and undamned 589 /* Give starting characters identified, uncursed, and undamned
728 * items. Just don't identify gold or silver, or it won't be 590 * items. Just don't identify gold or silver, or it won't be
729 * merged properly. 591 * merged properly.
730 */ 592 */
731 if (need_identify (op)) 593 if (need_identify (op))
732 { 594 {
733 SET_FLAG (op, FLAG_IDENTIFIED); 595 SET_FLAG (op, FLAG_IDENTIFIED);
734 CLEAR_FLAG (op, FLAG_CURSED); 596 CLEAR_FLAG (op, FLAG_CURSED);
735 CLEAR_FLAG (op, FLAG_DAMNED); 597 CLEAR_FLAG (op, FLAG_DAMNED);
736 } 598 }
599
737 if (op->type == SPELL) 600 if (op->type == SPELL)
738 { 601 {
739 op->destroy (); 602 op->destroy ();
740 continue; 603 continue;
741 } 604 }
… …
743 { 606 {
744 SET_FLAG (op, FLAG_CAN_USE_SKILL); 607 SET_FLAG (op, FLAG_CAN_USE_SKILL);
745 op->stats.exp = 0; 608 op->stats.exp = 0;
746 op->level = 1; 609 op->level = 1;
747 } 610 }
748 /* lock all 'normal items by default */ 611 else /* lock all 'normal items by default */
749 else
750 SET_FLAG (op, FLAG_INV_LOCKED); 612 SET_FLAG (op, FLAG_INV_LOCKED);
751 } /* for loop of objects in player inv */ 613 } /* for loop of objects in player inv */
752 614
753 /* Need to set up the skill pointers */ 615 /* Need to set up the skill pointers */
754 link_player_skills (pl); 616 pl->contr->link_skills ();
755} 617}
756 618
757void 619void
758get_party_password (object *op, partylist *party) 620get_party_password (object *op, partylist *party)
759{ 621{
… …
860static void 722static void
861start_info (object *op) 723start_info (object *op)
862{ 724{
863 char buf[MAX_BUF]; 725 char buf[MAX_BUF];
864 726
865 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 727 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
866 new_draw_info (NDI_UNIQUE, 0, op, buf); 728 new_draw_info (NDI_UNIQUE, 0, op, buf);
867 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
868 //new_draw_info (NDI_UNIQUE, 0, op, " ");
869} 729}
870 730
871/* This function takes the key that is passed, and does the 731/* This function takes the key that is passed, and does the
872 * appropriate action with it (change race, or other things). 732 * appropriate action with it (change race, or other things).
873 * The function name is for historical reasons - now we have 733 * The function name is for historical reasons - now we have
… …
876 */ 736 */
877void 737void
878player::chargen_race_done () 738player::chargen_race_done ()
879{ 739{
880 /* this must before then initial items are given */ 740 /* this must before then initial items are given */
881 esrv_new_player (ob->contr, ob->weight + ob->carrying); 741 esrv_new_player (ob->contr);
882 742
883 treasurelist *tl = treasurelist::find ("starting_wealth"); 743 treasurelist *tl = treasurelist::find ("starting_wealth");
884 if (tl) 744 if (tl)
885 create_treasure (tl, ob, 0, 0, 0); 745 create_treasure (tl, ob, 0, 0, 0);
886 746
… …
890 ob->contr->ns->state = ST_PLAYING; 750 ob->contr->ns->state = ST_PLAYING;
891 751
892 if (ob->msg) 752 if (ob->msg)
893 ob->msg = 0; 753 ob->msg = 0;
894 754
895 /* We create this now because some of the unique maps will need it
896 * to save here.
897 */
898 {
899 char buf[MAX_BUF];
900 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
901 make_path_to_file (buf);
902 }
903
904 start_info (ob); 755 start_info (ob);
905 CLEAR_FLAG (ob, FLAG_WIZ); 756 CLEAR_FLAG (ob, FLAG_WIZ);
906 give_initial_items (ob, ob->randomitems); 757 give_initial_items (ob, ob->randomitems);
907 link_player_skills (ob);
908 esrv_send_inventory (ob, ob); 758 esrv_send_inventory (ob, ob);
909 ob->update_stats (); 759 ob->update_stats ();
910 760
911 /* This moves the player to a different start map, if there 761 /* This moves the player to a different start map, if there
912 * is one for this race 762 * is one for this race
913 */ 763 */
914 if (*first_map_ext_path) 764 if (*first_map_ext_path)
915 { 765 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
916 object *tmp;
917 char mapname[MAX_BUF];
918
919 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
920 tmp = object::create ();
921 EXIT_PATH (tmp) = mapname;
922 EXIT_X (tmp) = ob->x;
923 EXIT_Y (tmp) = ob->y;
924 ob->enter_exit (tmp); /* we don't really care if it succeeded;
925 * if the map isn't there, then stay on the
926 * default initial map */
927 tmp->destroy ();
928 }
929 else 766 else
930 LOG (llevDebug, "first_map_ext_path not set\n"); 767 LOG (llevDebug, "first_map_ext_path not set\n");
931} 768}
932 769
933void 770void
… …
943 int x = ob->x, y = ob->y; 780 int x = ob->x, y = ob->y;
944 781
945 ob->remove_statbonus (); 782 ob->remove_statbonus ();
946 ob->remove (); 783 ob->remove ();
947 ob->arch = get_player_archetype (ob->arch); 784 ob->arch = get_player_archetype (ob->arch);
948 ob->arch->clone.copy_to (ob); 785 ob->arch->copy_to (ob);
949 ob->instantiate (); 786 ob->instantiate ();
950 ob->stats = ob->contr->orig_stats; 787 ob->stats = ob->contr->orig_stats;
951 ob->name = ob->name_pl = name; 788 ob->name = ob->name_pl = name;
952 ob->x = x; 789 ob->x = x;
953 ob->y = y; 790 ob->y = y;
954 SET_ANIMATION (ob, 2); /* So player faces south */ 791 SET_ANIMATION (ob, 2); /* So player faces south */
955 insert_ob_in_map (ob, ob->map, ob, 0); 792 insert_ob_in_map (ob, ob->map, ob, 0);
956 assign (ob->contr->title, ob->arch->clone.name); 793 assign (ob->contr->title, ob->arch->object::name);
957 ob->add_statbonus (); 794 ob->add_statbonus ();
958 } 795 }
959 while (!allowed_class (ob)); 796 while (!allowed_class (ob));
960 797
961 update_object (ob, UP_OBJ_FACE); 798 update_object (ob, UP_OBJ_FACE);
… …
977 LOG (llevDebug, "Fleeing player is dead.\n"); 814 LOG (llevDebug, "Fleeing player is dead.\n");
978 CLEAR_FLAG (op, FLAG_SCARED); 815 CLEAR_FLAG (op, FLAG_SCARED);
979 return; 816 return;
980 } 817 }
981 818
982 if (op->enemy == NULL) 819 if (!op->enemy)
983 { 820 {
984 LOG (llevDebug, "Fleeing player had no enemy.\n"); 821 LOG (llevDebug, "Fleeing player had no enemy.\n");
985 CLEAR_FLAG (op, FLAG_SCARED); 822 CLEAR_FLAG (op, FLAG_SCARED);
986 return; 823 return;
987 } 824 }
988 825
989 /* Seen some crashes here. Since we don't store an
990 * op->enemy_count, it is possible that something destroys the
991 * actual enemy, and the object is recycled.
992 */
993 if (op->enemy->map == NULL)
994 {
995 CLEAR_FLAG (op, FLAG_SCARED);
996 op->enemy = NULL;
997 return;
998 }
999
1000 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 826 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
1001 { 827 {
1002 op->enemy = NULL; 828 op->enemy = NULL;
1003 CLEAR_FLAG (op, FLAG_SCARED); 829 CLEAR_FLAG (op, FLAG_SCARED);
1004 return; 830 return;
… …
1007 get_rangevector (op, op->enemy, &rv, 0); 833 get_rangevector (op, op->enemy, &rv, 0);
1008 834
1009 dir = absdir (4 + rv.direction); 835 dir = absdir (4 + rv.direction);
1010 for (diff = 0; diff < 3; diff++) 836 for (diff = 0; diff < 3; diff++)
1011 { 837 {
1012 int m = 1 - (RANDOM () & 2); 838 int m = 1 - rndm (2) * 2;
1013 839
1014 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 840 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1015 return; 841 return;
1016 } 842 }
1017 843
… …
1028check_pick (object *op) 854check_pick (object *op)
1029{ 855{
1030 object *tmp, *next; 856 object *tmp, *next;
1031 int stop = 0; 857 int stop = 0;
1032 int wvratio; 858 int wvratio;
1033 char putstring[128];
1034 859
1035 /* if you're flying, you cna't pick up anything */ 860 /* if you're flying, you cna't pick up anything */
1036 if (op->move_type & MOVE_FLYING) 861 if (op->move_type & MOVE_FLYING)
1037 return 1; 862 return 1;
1038 863
1039 next = op->below; 864 next = op->below;
1040 865
866 int cnt = MAX_ITEM_PER_DROP;
867#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
868
1041 /* loop while there are items on the floor that are not marked as 869 /* loop while there are items on the floor that are not marked as
1042 * destroyed */ 870 * destroyed */
1043 while (next && !next->destroyed ()) 871 while (next && !next->destroyed ())
1044 { 872 {
1045 tmp = next; 873 tmp = next;
1046 next = tmp->below; 874 next = tmp->below;
1047 875
876 if (cnt <= 0)
877 {
878 op->failmsg ("Couldn't pickup all items at once.");
879 return 0;
880 }
881
1048 if (op->destroyed ()) 882 if (op->destroyed ())
1049 return 0; 883 return 0;
1050 884
1051 if (!can_pick (op, tmp)) 885 if (!can_pick (op, tmp))
1052 continue; 886 continue;
1053 887
1054 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 888 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1055 { 889 {
1056 if (item_matched_string (op, tmp, op->contr->search_str)) 890 if (item_matched_string (op, tmp, op->contr->search_str))
1057 pick_up (op, tmp); 891 CHK_PICK_PICKUP;
892
1058 continue; 893 continue;
1059 } 894 }
1060 895
1061 /* high not bit set? We're using the old autopickup model */ 896 /* pickup handling */
897 if (op->contr->mode & PU_DEBUG)
898 {
899 /* some debugging code to figure out item information */
900 const char *str = tmp->name
901 ? format ("item name: %s item type: %d weight/value: %d",
902 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
903 : format ("item name: %s item type: %d weight/value: %d",
904 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
905
906 new_draw_info (NDI_UNIQUE, 0, op, str);
907 }
908
909 if (op->contr->mode & PU_INHIBIT)
910 return 1;
911
912 if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
913 return 1;
914
915 /* philosophy:
916 * It's easy to grab an item type from a pile, as long as it's
917 * generic. This takes no game-time. For more detailed pickups
918 * and selections, select-items should be used. This is a
919 * grab-as-you-run type mode that's really useful for arrows for
920 * example.
921 * The drawback: right now it has no frontend, so you need to
922 * stick the bits you want into a calculator in hex mode and then
923 * convert to decimal and then 'pickup <#>
924 */
925
926 /* the first two modes are exclusive: if NOTHING we return, if
927 * STOP then we stop. All the rest are applied sequentially,
928 * meaning if any test passes, the item gets picked up. */
929
930 /* if mode is set to pick nothing up, return */
931 if (op->contr->mode == PU_NOTHING)
932 return 1;
933
934 /* if mode is set to stop when encountering objects, return */
935 /* take STOP before INHIBIT since it doesn't actually pick
936 * anything up */
937 if (op->contr->mode & PU_STOP)
938 return 0;
939
940 /* useful for going into stores and not losing your settings... */
941 /* and for battles wher you don't want to get loaded down while
942 * fighting */
943 if (op->contr->mode & PU_INHIBIT)
944 return 1;
945
946 /* prevent us from turning into auto-thieves :) */
947 if (QUERY_FLAG (tmp, FLAG_UNPAID))
948 continue;
949
950 /* ignore known cursed objects */
951 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
952 continue;
953
954 /* all food and drink if desired */
955 /* question: don't pick up known-poisonous stuff? */
1062 if (!(op->contr->mode & PU_NEWMODE)) 956 if (op->contr->mode & PU_FOOD)
957 if (tmp->type == FOOD)
1063 { 958 {
1064 switch (op->contr->mode) 959 CHK_PICK_PICKUP;
960 continue;
961 }
962
963 if (op->contr->mode & PU_DRINK)
964 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
965 {
966 CHK_PICK_PICKUP;
967 continue;
968 }
969
970 if (op->contr->mode & PU_POTION)
971 if (tmp->type == POTION)
972 {
973 CHK_PICK_PICKUP;
974 continue;
975 }
976
977 /* spellbooks, skillscrolls and normal books/scrolls */
978 if (op->contr->mode & PU_SPELLBOOK)
979 if (tmp->type == SPELLBOOK)
980 {
981 CHK_PICK_PICKUP;
982 continue;
983 }
984
985 if (op->contr->mode & PU_SKILLSCROLL)
986 if (tmp->type == SKILLSCROLL)
987 {
988 CHK_PICK_PICKUP;
989 continue;
990 }
991
992 if (op->contr->mode & PU_READABLES)
993 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
994 {
995 CHK_PICK_PICKUP;
996 continue;
997 }
998
999 /* wands/staves/rods/horns */
1000 if (op->contr->mode & PU_MAGIC_DEVICE)
1001 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1002 {
1003 CHK_PICK_PICKUP;
1004 continue;
1005 }
1006
1007 /* pick up all magical items */
1008 if (op->contr->mode & PU_MAGICAL)
1009 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1010 {
1011 CHK_PICK_PICKUP;
1012 continue;
1013 }
1014
1015 if (op->contr->mode & PU_VALUABLES)
1016 {
1017 if (tmp->type == MONEY || tmp->type == GEM)
1065 { 1018 {
1066 case 0: 1019 CHK_PICK_PICKUP;
1067 return 1; /* don't pick up */ 1020 continue;
1068 case 1:
1069 pick_up (op, tmp);
1070 return 1;
1071 case 2:
1072 pick_up (op, tmp);
1073 return 0;
1074 case 3:
1075 return 0; /* stop before pickup */
1076 case 4:
1077 pick_up (op, tmp);
1078 break;
1079 case 5:
1080 pick_up (op, tmp);
1081 stop = 1;
1082 break;
1083 case 6:
1084 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1085 pick_up (op, tmp);
1086 break;
1087
1088 case 7:
1089 if (tmp->type == MONEY || tmp->type == GEM)
1090 pick_up (op, tmp);
1091 break;
1092
1093 default:
1094 /* use value density */
1095 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1096 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1097 pick_up (op, tmp);
1098 } 1021 }
1099 } 1022 }
1100 else 1023
1101 { /* old model */ 1024 /* rings & amulets - talismans seems to be typed AMULET */
1102 /* NEW pickup handling */
1103 if (op->contr->mode & PU_DEBUG) 1025 if (op->contr->mode & PU_JEWELS)
1026 if (tmp->type == RING || tmp->type == AMULET)
1104 { 1027 {
1105 /* some debugging code to figure out item information */ 1028 CHK_PICK_PICKUP;
1106 if (tmp->name != NULL)
1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109 else
1110 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112
1113 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1114 }
1115
1116 /* philosophy:
1117 * It's easy to grab an item type from a pile, as long as it's
1118 * generic. This takes no game-time. For more detailed pickups
1119 * and selections, select-items should be used. This is a
1120 * grab-as-you-run type mode that's really useful for arrows for
1121 * example.
1122 * The drawback: right now it has no frontend, so you need to
1123 * stick the bits you want into a calculator in hex mode and then
1124 * convert to decimal and then 'pickup <#>
1125 */
1126
1127 /* the first two modes are exclusive: if NOTHING we return, if
1128 * STOP then we stop. All the rest are applied sequentially,
1129 * meaning if any test passes, the item gets picked up. */
1130
1131 /* if mode is set to pick nothing up, return */
1132
1133 if (op->contr->mode & PU_NOTHING)
1134 return 1;
1135
1136 /* if mode is set to stop when encountering objects, return */
1137 /* take STOP before INHIBIT since it doesn't actually pick
1138 * anything up */
1139
1140 if (op->contr->mode & PU_STOP)
1141 return 0;
1142
1143 /* useful for going into stores and not losing your settings... */
1144 /* and for battles wher you don't want to get loaded down while
1145 * fighting */
1146 if (op->contr->mode & PU_INHIBIT)
1147 return 1;
1148
1149 /* prevent us from turning into auto-thieves :) */
1150 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1151 continue; 1029 continue;
1030 }
1152 1031
1153 /* ignore known cursed objects */ 1032 /* we don't forget dragon food */
1154 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 1033 if (op->contr->mode & PU_FLESH)
1034 if (tmp->type == FLESH)
1035 {
1036 CHK_PICK_PICKUP;
1155 continue; 1037 continue;
1038 }
1156 1039
1157 /* all food and drink if desired */ 1040 /* bows and arrows. Bows are good for selling! */
1158 /* question: don't pick up known-poisonous stuff? */ 1041 if (op->contr->mode & PU_BOW)
1042 if (tmp->type == BOW)
1043 {
1044 CHK_PICK_PICKUP;
1045 continue;
1046 }
1047
1048 if (op->contr->mode & PU_ARROW)
1049 if (tmp->type == ARROW)
1050 {
1051 CHK_PICK_PICKUP;
1052 continue;
1053 }
1054
1055 /* all kinds of armor etc. */
1056 if (op->contr->mode & PU_ARMOUR)
1057 if (tmp->type == ARMOUR)
1058 {
1059 CHK_PICK_PICKUP;
1060 continue;
1061 }
1062
1063 if (op->contr->mode & PU_HELMET)
1064 if (tmp->type == HELMET)
1065 {
1066 CHK_PICK_PICKUP;
1067 continue;
1068 }
1069
1070 if (op->contr->mode & PU_SHIELD)
1071 if (tmp->type == SHIELD)
1072 {
1073 CHK_PICK_PICKUP;
1074 continue;
1075 }
1076
1159 if (op->contr->mode & PU_FOOD) 1077 if (op->contr->mode & PU_BOOTS)
1160 if (tmp->type == FOOD) 1078 if (tmp->type == BOOTS)
1079 {
1080 CHK_PICK_PICKUP;
1081 continue;
1082 }
1083
1084 if (op->contr->mode & PU_GLOVES)
1085 if (tmp->type == GLOVES)
1086 {
1087 CHK_PICK_PICKUP;
1088 continue;
1089 }
1090
1091 if (op->contr->mode & PU_CLOAK)
1092 if (tmp->type == CLOAK)
1093 {
1094 CHK_PICK_PICKUP;
1095 continue;
1096 }
1097
1098 /* hoping to catch throwing daggers here */
1099 if (op->contr->mode & PU_MISSILEWEAPON)
1100 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1101 {
1102 CHK_PICK_PICKUP;
1103 continue;
1104 }
1105
1106 /* careful: chairs and tables are weapons! */
1107 if (op->contr->mode & PU_ALLWEAPON)
1108 {
1109 if (tmp->type == WEAPON)
1110 if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1161 { 1111 {
1162 pick_up (op, tmp); 1112 CHK_PICK_PICKUP;
1163 continue; 1113 continue;
1164 } 1114 }
1115 }
1165 1116
1117 /* misc stuff that's useful */
1166 if (op->contr->mode & PU_DRINK) 1118 if (op->contr->mode & PU_KEY)
1167 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1119 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1168 { 1120 {
1169 pick_up (op, tmp); 1121 CHK_PICK_PICKUP;
1170 continue; 1122 continue;
1171 } 1123 }
1172 1124
1125 /* any of the last 4 bits set means we use the ratio for value
1126 * pickups */
1173 if (op->contr->mode & PU_POTION) 1127 if (op->contr->mode & PU_RATIO)
1174 if (tmp->type == POTION) 1128 {
1129 /* use value density to decide what else to grab */
1130 /* >=7 was >= op->contr->mode */
1131 /* >=7 is the old standard setting. Now we take the last 4 bits
1175 { 1132 */
1176 pick_up (op, tmp);
1177 continue;
1178 }
1179
1180 /* spellbooks, skillscrolls and normal books/scrolls */
1181 if (op->contr->mode & PU_SPELLBOOK)
1182 if (tmp->type == SPELLBOOK)
1183 {
1184 pick_up (op, tmp);
1185 continue;
1186 }
1187
1188 if (op->contr->mode & PU_SKILLSCROLL)
1189 if (tmp->type == SKILLSCROLL)
1190 {
1191 pick_up (op, tmp);
1192 continue;
1193 }
1194
1195 if (op->contr->mode & PU_READABLES)
1196 if (tmp->type == BOOK || tmp->type == SCROLL)
1197 {
1198 pick_up (op, tmp);
1199 continue;
1200 }
1201
1202 /* wands/staves/rods/horns */
1203 if (op->contr->mode & PU_MAGIC_DEVICE)
1204 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1205 {
1206 pick_up (op, tmp);
1207 continue;
1208 }
1209
1210 /* pick up all magical items */
1211 if (op->contr->mode & PU_MAGICAL) 1133 wvratio = op->contr->mode & PU_RATIO;
1212 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1134 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1213 {
1214 pick_up (op, tmp);
1215 continue;
1216 }
1217
1218 if (op->contr->mode & PU_VALUABLES)
1219 { 1135 {
1220 if (tmp->type == MONEY || tmp->type == GEM) 1136#if 0
1137 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1138 if (tmp->name != NULL)
1221 { 1139 {
1222 pick_up (op, tmp); 1140 fprintf (stderr, "%s", tmp->name);
1223 continue;
1224 } 1141 }
1225 }
1226
1227 /* rings & amulets - talismans seems to be typed AMULET */
1228 if (op->contr->mode & PU_JEWELS)
1229 if (tmp->type == RING || tmp->type == AMULET)
1230 {
1231 pick_up (op, tmp);
1232 continue;
1233 }
1234
1235 /* we don't forget dragon food */
1236 if (op->contr->mode & PU_FLESH)
1237 if (tmp->type == FLESH)
1238 {
1239 pick_up (op, tmp);
1240 continue;
1241 }
1242
1243 /* bows and arrows. Bows are good for selling! */
1244 if (op->contr->mode & PU_BOW)
1245 if (tmp->type == BOW)
1246 {
1247 pick_up (op, tmp);
1248 continue;
1249 }
1250
1251 if (op->contr->mode & PU_ARROW)
1252 if (tmp->type == ARROW)
1253 {
1254 pick_up (op, tmp);
1255 continue;
1256 }
1257
1258 /* all kinds of armor etc. */
1259 if (op->contr->mode & PU_ARMOUR)
1260 if (tmp->type == ARMOUR)
1261 {
1262 pick_up (op, tmp);
1263 continue;
1264 }
1265
1266 if (op->contr->mode & PU_HELMET)
1267 if (tmp->type == HELMET)
1268 {
1269 pick_up (op, tmp);
1270 continue;
1271 }
1272
1273 if (op->contr->mode & PU_SHIELD)
1274 if (tmp->type == SHIELD)
1275 {
1276 pick_up (op, tmp);
1277 continue;
1278 }
1279
1280 if (op->contr->mode & PU_BOOTS)
1281 if (tmp->type == BOOTS)
1282 {
1283 pick_up (op, tmp);
1284 continue;
1285 }
1286
1287 if (op->contr->mode & PU_GLOVES)
1288 if (tmp->type == GLOVES)
1289 {
1290 pick_up (op, tmp);
1291 continue;
1292 }
1293
1294 if (op->contr->mode & PU_CLOAK)
1295 if (tmp->type == CLOAK)
1296 {
1297 pick_up (op, tmp);
1298 continue;
1299 }
1300
1301 /* hoping to catch throwing daggers here */
1302 if (op->contr->mode & PU_MISSILEWEAPON)
1303 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1304 {
1305 pick_up (op, tmp);
1306 continue;
1307 }
1308
1309 /* careful: chairs and tables are weapons! */
1310 if (op->contr->mode & PU_ALLWEAPON)
1311 {
1312 if (tmp->type == WEAPON && tmp->name != NULL)
1313 {
1314 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1315 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316 {
1317 pick_up (op, tmp);
1318 continue;
1319 }
1320 }
1321
1322 if (tmp->type == WEAPON && tmp->name == NULL)
1323 {
1324 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1325 {
1326 pick_up (op, tmp);
1327 continue;
1328 }
1329 }
1330 }
1331
1332 /* misc stuff that's useful */
1333 if (op->contr->mode & PU_KEY)
1334 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1335 {
1336 pick_up (op, tmp);
1337 continue;
1338 }
1339
1340 /* any of the last 4 bits set means we use the ratio for value
1341 * pickups */
1342 if (op->contr->mode & PU_RATIO)
1343 {
1344 /* use value density to decide what else to grab */
1345 /* >=7 was >= op->contr->mode */
1346 /* >=7 is the old standard setting. Now we take the last 4 bits
1347 * and multiply them by 5, giving 0..15*5== 5..75 */
1348 wvratio = (op->contr->mode & PU_RATIO) * 5;
1349 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1350 {
1351 pick_up (op, tmp);
1352#if 0
1353 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1354 if (tmp->name != NULL)
1355 {
1356 fprintf (stderr, "%s", tmp->name);
1357 }
1358 else 1142 else
1359 fprintf (stderr, "%s", tmp->arch->archname); 1143 fprintf (stderr, "%s", tmp->arch->archname);
1360 fprintf (stderr, ",%d] = ", tmp->type); 1144 fprintf (stderr, ",%d] = ", tmp->type);
1361 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1145 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1362#endif 1146#endif
1147 CHK_PICK_PICKUP;
1363 continue; 1148 continue;
1364 }
1365 } 1149 }
1366 } /* the new pickup model */ 1150 } /* the new pickup model */
1367 } 1151 }
1368 1152
1369 return !stop; 1153 return !stop;
… …
1375 * found object is returned. 1159 * found object is returned.
1376 */ 1160 */
1377object * 1161object *
1378find_arrow (object *op, const char *type) 1162find_arrow (object *op, const char *type)
1379{ 1163{
1380 object *tmp = 0;
1381
1382 for (op = op->inv; op; op = op->below) 1164 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1165 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1166 return splay (tmp);
1167
1168 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1169 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1170 if (object *arrow = find_arrow (tmp, type))
1171 {
1172 splay (tmp);
1386 return op; 1173 return arrow;
1174 }
1387 1175
1388 return tmp; 1176 return 0;
1389} 1177}
1390 1178
1391/* 1179/*
1392 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1180 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1393 * against the target. A full test is not performed, simply a basic test 1181 * against the target. A full test is not performed, simply a basic test
1394 * of resistances. The archer is making a quick guess at what he sees down 1182 * of resistances. The archer is making a quick guess at what he sees down
1395 * the hall. Failing that it does it's best to pick the highest plus arrow. 1183 * the hall. Failing that it does it's best to pick the highest plus arrow.
1396 */ 1184 */
1397object * 1185object *
1398find_better_arrow (object *op, object *target, const char *type, int *better) 1186find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1399{ 1187{
1400 object *tmp = NULL, *arrow, *ntmp; 1188 object *tmp = NULL, *arrow, *ntmp;
1401 int attacknum, attacktype, betterby = 0, i; 1189 int attacknum, attacktype, betterby = 0, i;
1402 1190
1403 if (!type) 1191 if (!type)
… …
1407 { 1195 {
1408 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1196 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1409 { 1197 {
1410 i = 0; 1198 i = 0;
1411 ntmp = find_better_arrow (arrow, target, type, &i); 1199 ntmp = find_better_arrow (arrow, target, type, &i);
1200
1412 if (i > betterby) 1201 if (i > betterby)
1413 { 1202 {
1414 tmp = ntmp; 1203 tmp = ntmp;
1415 betterby = i; 1204 betterby = i;
1416 } 1205 }
1417 } 1206 }
1418 else if (arrow->type == ARROW && arrow->race == type) 1207 else if (arrow->type == ARROW && arrow->race == type)
1419 { 1208 {
1420 /* allways prefer assasination/slaying */ 1209 /* allways prefer assasination/slaying */
1421 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1210 if (target->race && arrow->slaying.contains (target->race))
1422 { 1211 {
1423 if (arrow->attacktype & AT_DEATH) 1212 if (arrow->attacktype & AT_DEATH)
1424 { 1213 {
1425 *better = 100; 1214 *better = 100;
1426 return arrow; 1215 return arrow;
… …
1434 else 1223 else
1435 { 1224 {
1436 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1225 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437 { 1226 {
1438 attacktype = 1 << attacknum; 1227 attacktype = 1 << attacknum;
1439 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1228 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1229 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1441 { 1230 {
1442 tmp = arrow; 1231 tmp = arrow;
1443 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1232 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1444 } 1233 }
1445 } 1234 }
1235
1446 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1236 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447 { 1237 {
1448 tmp = arrow; 1238 tmp = arrow;
1449 betterby = 2 + arrow->magic + arrow->stats.dam; 1239 betterby = 2 + arrow->magic + arrow->stats.dam;
1450 } 1240 }
1241
1451 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) 1242 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1452 { 1243 {
1453 tmp = arrow; 1244 tmp = arrow;
1454 betterby = 1 + arrow->magic + arrow->stats.dam; 1245 betterby = 1 + arrow->magic + arrow->stats.dam;
1455 } 1246 }
1456 } 1247 }
1457 } 1248 }
1458 } 1249 }
1250
1459 if (tmp == NULL && arrow == NULL) 1251 if (tmp == NULL && arrow == NULL)
1460 return find_arrow (op, type); 1252 return find_arrow (op, type);
1461 1253
1462 *better = betterby; 1254 *better = betterby;
1463 return tmp; 1255 return tmp;
… …
1468 * op = the shooter 1260 * op = the shooter
1469 * type = bow->race 1261 * type = bow->race
1470 * dir = fire direction 1262 * dir = fire direction
1471 */ 1263 */
1472object * 1264object *
1473pick_arrow_target (object *op, const char *type, int dir) 1265pick_arrow_target (object *op, shstr_cmp type, int dir)
1474{ 1266{
1475 object *tmp = NULL; 1267 object *tmp = NULL;
1476 maptile *m; 1268 maptile *m;
1477 int i, mflags, found, number; 1269 int i, mflags, found, number;
1478 sint16 x, y; 1270 sint16 x, y;
… …
1493 for (i = 0, found = 0; i < 20; i++) 1285 for (i = 0, found = 0; i < 20; i++)
1494 { 1286 {
1495 x += freearr_x[dir]; 1287 x += freearr_x[dir];
1496 y += freearr_y[dir]; 1288 y += freearr_y[dir];
1497 mflags = get_map_flags (m, &m, x, y, &x, &y); 1289 mflags = get_map_flags (m, &m, x, y, &x, &y);
1290
1498 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) 1291 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1499 { 1292 {
1500 tmp = NULL; 1293 tmp = 0;
1501 break; 1294 break;
1502 } 1295 }
1503 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW) 1296 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1504 { 1297 {
1505 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1298 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1506 * perhaps a bad assumption. 1299 * perhaps a bad assumption.
1507 */ 1300 */
1508 tmp = NULL; 1301 tmp = 0;
1509 break; 1302 break;
1510 } 1303 }
1304
1511 if (mflags & P_IS_ALIVE) 1305 if (mflags & P_IS_ALIVE)
1512 {
1513 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1306 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1514 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1307 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1515 {
1516 found++;
1517 break;
1518 }
1519 if (found)
1520 break; 1308 break;
1521 }
1522 } 1309 }
1523 if (tmp == NULL) 1310
1311 if (!tmp)
1524 return find_arrow (op, type); 1312 return find_arrow (op, type);
1525 1313
1526 if (tmp->head) 1314 if (tmp->head)
1527 tmp = tmp->head; 1315 tmp = tmp->head;
1528 1316
… …
1568 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1356 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1569 return 0; 1357 return 0;
1570 } 1358 }
1571 1359
1572 // optimisation: move object to top so we will find it quickly again 1360 // optimisation: move object to top so we will find it quickly again
1573 if (bow->below) 1361 splay (bow);
1574 {
1575 bow->remove ();
1576 op->insert (bow);
1577 }
1578
1579 } 1362 }
1580 1363
1581 if (!bow->race || !bow->skill) 1364 if (!bow->race || !bow->skill)
1582 { 1365 {
1583 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1366 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1609 } 1392 }
1610 1393
1611 /* this should not happen, but sometimes does */ 1394 /* this should not happen, but sometimes does */
1612 if (arrow->nrof == 0) 1395 if (arrow->nrof == 0)
1613 { 1396 {
1397 LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1614 arrow->destroy (); 1398 arrow->destroy ();
1615 return 0; 1399 return 0;
1616 } 1400 }
1617 1401
1618 left = arrow; /* these are arrows left to the player */ 1402 left = arrow; /* these are arrows left to the player */
1619 arrow = get_split_ob (arrow, 1); 1403 arrow = arrow->split ();
1620 if (!arrow) 1404 if (!arrow)
1621 { 1405 {
1622 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1406 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1623 return 0; 1407 return 0;
1624 } 1408 }
… …
1628 arrow->direction = dir; 1412 arrow->direction = dir;
1629 1413
1630 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ 1414 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1631 arrow->stats.hp = arrow->stats.dam; 1415 arrow->stats.hp = arrow->stats.dam;
1632 arrow->stats.grace = arrow->attacktype; 1416 arrow->stats.grace = arrow->attacktype;
1633 1417 arrow->custom_name = arrow->slaying;
1634 if (arrow->slaying)
1635 arrow->spellarg = strdup (arrow->slaying);
1636 1418
1637#if 0 1419#if 0
1638 if (player *pl = op->contr) 1420 if (player *pl = op->contr)
1639 { 1421 {
1640 float speed = pl->weapon_sp; 1422 float speed = pl->weapon_sp;
… …
1686 1468
1687 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1469 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1688 arrow->move_type = MOVE_FLY_LOW; 1470 arrow->move_type = MOVE_FLY_LOW;
1689 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1471 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1690 1472
1691 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1473 op->play_sound (sound_find ("fire_arrow"));
1692 m->insert (arrow, sx, sy, op); 1474 m->insert (arrow, sx, sy, op);
1693 1475
1694 if (!arrow->destroyed ()) 1476 if (!arrow->destroyed ())
1695 move_arrow (arrow); 1477 move_arrow (arrow);
1696
1697 if (op->type == PLAYER)
1698 {
1699 if (left->destroyed ())
1700 esrv_del_item (op->contr, left->count);
1701 else
1702 esrv_send_item (op, left);
1703 }
1704 1478
1705 return 1; 1479 return 1;
1706} 1480}
1707 1481
1708/* Special fire code for players - this takes into 1482/* Special fire code for players - this takes into
… …
1713 * hence the function name. 1487 * hence the function name.
1714 */ 1488 */
1715int 1489int
1716player_fire_bow (object *op, int dir) 1490player_fire_bow (object *op, int dir)
1717{ 1491{
1718 int ret = 0, wcmod = 0; 1492 int ret;
1719 1493
1720 if (op->contr->bowtype == bow_bestarrow) 1494 if (op->contr->bowtype == bow_bestarrow)
1721 { 1495 {
1722 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); 1496 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1723 } 1497 }
1724 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1498 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1725 { 1499 {
1726 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1500 int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1727 wcmod = -1;
1728
1729 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1501 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1730 } 1502 }
1731 else if (op->contr->bowtype == bow_threewide) 1503 else if (op->contr->bowtype == bow_threewide)
1732 { 1504 {
1733 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1505 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1734 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]); 1506 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1735 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]); 1507 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1736 } 1508 }
1737 else if (op->contr->bowtype == bow_spreadshot) 1509 else if (op->contr->bowtype == bow_spreadshot)
1738 { 1510 {
1739 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1511 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1740 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1512 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1741 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1513 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1742 } 1514 }
1743 else 1515 else
1744 { 1516 {
… …
1774 1546
1775 if (item->type == WAND) 1547 if (item->type == WAND)
1776 { 1548 {
1777 if (item->stats.food <= 0) 1549 if (item->stats.food <= 0)
1778 { 1550 {
1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1551 op->contr->play_sound (sound_find ("wand_poof"));
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1552 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781 1553
1782 return; 1554 return;
1783 } 1555 }
1784 } 1556 }
1785 else if (item->type == ROD || item->type == HORN) 1557 else if (item->type == ROD || item->type == HORN)
1786 { 1558 {
1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1559 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1560
1561 // using the maximum of the rods charge allows at least one spell cast
1562 // for a rod or horn, this fixes some broken rods.
1563 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1788 { 1564 {
1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1565 op->contr->play_sound (sound_find ("wand_poof"));
1790 1566
1791 if (item->type == ROD) 1567 if (item->type == ROD)
1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1568 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1793 else 1569 else
1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1570 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1797 } 1573 }
1798 } 1574 }
1799 1575
1800 if (cast_spell (op, item, dir, item->inv, NULL)) 1576 if (cast_spell (op, item, dir, item->inv, NULL))
1801 { 1577 {
1802 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */ 1578 item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
1579
1803 if (item->type == WAND) 1580 if (item->type == WAND)
1804 { 1581 {
1805 if (!(--item->stats.food)) 1582 if (!(--item->stats.food))
1806 { 1583 {
1807 object *tmp; 1584 object *tmp;
1808 1585
1809 if (item->arch) 1586 if (item->arch)
1810 { 1587 {
1811 CLEAR_FLAG (item, FLAG_ANIMATE); 1588 CLEAR_FLAG (item, FLAG_ANIMATE);
1812 item->face = item->arch->clone.face; 1589 item->face = item->arch->face;
1813 item->set_speed (0); 1590 item->set_speed (0);
1814 } 1591 }
1815 1592
1816 if ((tmp = item->in_player ())) 1593 if (object *pl = item->visible_to ())
1817 esrv_update_item (UPD_ANIM, tmp, item); 1594 esrv_update_item (UPD_ANIM, pl, item);
1818 } 1595 }
1819 } 1596 }
1820 else if (item->type == ROD || item->type == HORN) 1597 else if (item->type == ROD || item->type == HORN)
1821 drain_rod_charge (item); 1598 drain_rod_charge (item);
1822 } 1599 }
… …
1827bool 1604bool
1828fire (object *op, int dir) 1605fire (object *op, int dir)
1829{ 1606{
1830 int spellcost = 0; 1607 int spellcost = 0;
1831 1608
1832 /* check for loss of invisiblity/hide */
1833 if (action_makes_visible (op))
1834 make_visible (op);
1835
1836 player *pl = op->contr; 1609 player *pl = op->contr;
1837 1610
1838 if (pl->golem) 1611 if (pl->golem)
1839 { 1612 {
1840 control_golem (op->contr->golem, dir); 1613 control_golem (op->contr->golem, dir);
… …
1842 } 1615 }
1843 1616
1844 object *ob = pl->ranged_ob; 1617 object *ob = pl->ranged_ob;
1845 1618
1846 if (!ob) 1619 if (!ob)
1847 return false;
1848
1849 if (!op->change_weapon (ob))
1850 return false; 1620 return false;
1851 1621
1852 if (op->speed_left > 0.f) 1622 if (op->speed_left > 0.f)
1853 --op->speed_left; 1623 --op->speed_left;
1854 else 1624 else
1855 return false; 1625 return false;
1856 1626
1627 if (!op->change_weapon (ob))
1628 return false;
1629
1630 /* check for loss of invisiblity/hide */
1631 if (action_makes_visible (op))
1632 make_visible (op);
1633
1857 switch (ob->type) 1634 switch (ob->type)
1858 { 1635 {
1859 case BOW: 1636 case BOW:
1860 player_fire_bow (op, dir); 1637 player_fire_bow (op, dir);
1861 break; 1638 break;
1862 1639
1863 case SPELL: 1640 case SPELL:
1864 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); 1641 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1865 break; 1642 break;
1866 1643
1867 case BUILDER: 1644 case BUILDER:
1868 apply_map_builder (op, dir); 1645 apply_map_builder (op, dir);
1869 break; 1646 break;
… …
1902 /* First, lets try to find a key in the top level inventory */ 1679 /* First, lets try to find a key in the top level inventory */
1903 for (tmp = container->inv; tmp; tmp = tmp->below) 1680 for (tmp = container->inv; tmp; tmp = tmp->below)
1904 { 1681 {
1905 if (door->type == DOOR && tmp->type == KEY) 1682 if (door->type == DOOR && tmp->type == KEY)
1906 break; 1683 break;
1684
1907 /* For sanity, we should really check door type, but other stuff 1685 /* For sanity, we should really check door type, but other stuff
1908 * (like containers) can be locked with special keys 1686 * (like containers) can be locked with special keys
1909 */ 1687 */
1910 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1688 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1911 break; 1689 break;
… …
1917 * a key, return 1695 * a key, return
1918 */ 1696 */
1919 if (!tmp) 1697 if (!tmp)
1920 { 1698 {
1921 for (tmp = container->inv; tmp; tmp = tmp->below) 1699 for (tmp = container->inv; tmp; tmp = tmp->below)
1922 {
1923 /* No reason to search empty containers */ 1700 /* No reason to search empty containers */
1924 if (tmp->type == CONTAINER && tmp->inv) 1701 if (tmp->type == CONTAINER && tmp->inv)
1925 {
1926 if ((key = find_key (pl, tmp, door))) 1702 if ((key = find_key (pl, tmp, door)))
1927 return key; 1703 return key;
1928 }
1929 }
1930 1704
1931 if (!tmp) 1705 if (!tmp)
1932 return NULL; 1706 return 0;
1933 } 1707 }
1934 1708
1935 /* We get down here if we have found a key. Now if its in a container, 1709 /* We get down here if we have found a key. Now if its in a container,
1936 * see if we actually want to use it 1710 * see if we actually want to use it
1937 */ 1711 */
1938 if (pl != container) 1712 if (pl != container)
1939 { 1713 {
1940 /* Only let players use keys in containers */ 1714 /* Only let players use keys in containers */
1941 if (!pl->contr) 1715 if (!pl->contr)
1942 return NULL; 1716 return 0;
1717
1943 /* cases where this fails: 1718 /* cases where this fails:
1944 * If we only search the player inventory, return now since we 1719 * If we only search the player inventory, return now since we
1945 * are not in the players inventory. 1720 * are not in the players inventory.
1946 * If the container is not active, return now since only active 1721 * If the container is not active, return now since only active
1947 * containers can be used. 1722 * containers can be used.
… …
1953 * Change the color so that the message doesn't disappear with 1728 * Change the color so that the message doesn't disappear with
1954 * all the others. 1729 * all the others.
1955 */ 1730 */
1956 if (pl->contr->usekeys == key_inventory || 1731 if (pl->contr->usekeys == key_inventory ||
1957 !QUERY_FLAG (container, FLAG_APPLIED) || 1732 !QUERY_FLAG (container, FLAG_APPLIED) ||
1958 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys")))) 1733 (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1959 { 1734 {
1960 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1735 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1961 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1736 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1962 return NULL; 1737 return NULL;
1963 } 1738 }
… …
1983 /* If we found a key, do some extra work */ 1758 /* If we found a key, do some extra work */
1984 if (key) 1759 if (key)
1985 { 1760 {
1986 object *container = key->env; 1761 object *container = key->env;
1987 1762
1988 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1989
1990 if (action_makes_visible (op)) 1763 if (action_makes_visible (op))
1991 make_visible (op); 1764 make_visible (op);
1992 1765
1993 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1766 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1994 spring_trap (door->inv, op); 1767 spring_trap (door->inv, op);
1995 1768
1996 if (door->type == DOOR) 1769 if (door->type == DOOR)
1997 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1770 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1998 else if (door->type == LOCKED_DOOR) 1771 else if (door->type == LOCKED_DOOR)
1999 { 1772 {
2000 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1773 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2001 remove_door2 (door); /* remove door without violence ;-) */ 1774 remove_door2 (door); /* remove door without violence ;-) */
2002 } 1775 }
2003 1776
2004 /* Do this after we print the message */ 1777 /* Do this after we print the message */
2005 decrease_ob (key); /* Use up one of the keys */ 1778 key->decrease (); /* Use up one of the keys */
2006 /* Need to update the weight the container the key was in */
2007 if (container != op)
2008 esrv_update_item (UPD_WEIGHT, op, container);
2009 1779
2010 return 1; /* Nothing more to do below */ 1780 return 1; /* Nothing more to do below */
2011 } 1781 }
2012 else if (door->type == LOCKED_DOOR) 1782 else if (door->type == LOCKED_DOOR)
2013 { 1783 {
2014 /* Might as well return now - no other way to open this */ 1784 /* Might as well return now - no other way to open this */
2015 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1785 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2016 return 1; 1786 return 1;
2017 } 1787 }
2018 1788
2019 return 0; 1789 return 0;
2020} 1790}
… …
2026 * going to try and move (not fire weapons). 1796 * going to try and move (not fire weapons).
2027 */ 1797 */
2028bool 1798bool
2029move_player_attack (object *op, int dir) 1799move_player_attack (object *op, int dir)
2030{ 1800{
1801 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1802 {
1803 --op->speed_left;
1804 return true;
1805 }
1806
2031 int on_battleground; 1807 int on_battleground;
2032 1808
2033 sint16 nx = freearr_x[dir] + op->x; 1809 sint16 nx = freearr_x[dir] + op->x;
2034 sint16 ny = freearr_y[dir] + op->y; 1810 sint16 ny = freearr_y[dir] + op->y;
2035 1811
2036 on_battleground = op_on_battleground (op, 0, 0); 1812 on_battleground = op_on_battleground (op, 0, 0);
2037 1813
2038 if (out_of_map (op->map, nx, ny)) 1814 if (out_of_map (op->map, nx, ny))
2039 return false; 1815 return false;
2040
2041 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2042 {
2043 --op->speed_left;
2044 return true;
2045 }
2046 1816
2047 /* If braced, or can't move to the square, and it is not out of the 1817 /* If braced, or can't move to the square, and it is not out of the
2048 * map, attack it. Note order of if statement is important - don't 1818 * map, attack it. Note order of if statement is important - don't
2049 * want to be calling move_ob if braced, because move_ob will move the 1819 * want to be calling move_ob if braced, because move_ob will move the
2050 * player. This is a pretty nasty hack, because if we could 1820 * player. This is a pretty nasty hack, because if we could
… …
2107 1877
2108 if (op->speed_left > 0.f) 1878 if (op->speed_left > 0.f)
2109 { 1879 {
2110 --op->speed_left; 1880 --op->speed_left;
2111 1881
2112 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 1882 op->play_sound (sound_find ("push_player"));
2113 push_ob (mon, dir, op); 1883 push_ob (mon, dir, op);
2114 1884
2115 if (op->contr->tmp_invis || op->hide) 1885 if (action_makes_visible (op))
2116 make_visible (op); 1886 make_visible (op);
2117 1887
2118 return true; 1888 return true;
2119 } 1889 }
2120 else 1890 else
… …
2136 { 1906 {
2137 --op->speed_left; 1907 --op->speed_left;
2138 1908
2139 if (!op->contr->braced) 1909 if (!op->contr->braced)
2140 { 1910 {
2141 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 1911 op->play_sound (sound_find ("push_player"));
2142 push_ob (mon, dir, op); 1912 push_ob (mon, dir, op);
2143 } 1913 }
2144 else 1914 else
2145 new_draw_info (0, 0, op, "You withhold your attack"); 1915 op->statusmsg ("You withhold your attack");
2146 1916
2147 if (op->contr->tmp_invis || op->hide) 1917 if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2148 make_visible (op); 1918 make_visible (op);
2149 1919
2150 return true; 1920 return true;
2151 } 1921 }
2152 } 1922 }
… …
2194bool 1964bool
2195move_player (object *op, int dir) 1965move_player (object *op, int dir)
2196{ 1966{
2197 int pick; 1967 int pick;
2198 1968
2199 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 1969 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2200 return 0; 1970 return 0;
2201 1971
2202 /* Sanity check: make sure dir is valid */ 1972 /* Sanity check: make sure dir is valid */
2203 if ((dir < 0) || (dir >= 9)) 1973 if ((dir < 0) || (dir >= 9))
2204 { 1974 {
… …
2210 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 1980 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2211 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1981 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2212 1982
2213 op->facing = dir; 1983 op->facing = dir;
2214 1984
2215 if (op->hide) 1985 if (op->flag [FLAG_HIDDEN])
2216 do_hidden_move (op); 1986 do_hidden_move (op);
2217 1987
2218 bool retval; 1988 bool retval;
2219 1989
2220 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 1990 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
… …
2289 return 0; 2059 return 0;
2290 2060
2291 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2061 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2292 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2062 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2293 { 2063 {
2294 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2064 op->play_sound (sound_find ("ob_evaporate"));
2295 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2065 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2296
2297 if (op->contr)
2298 esrv_del_item (op->contr, tmp->count);
2299 2066
2300 tmp->destroy (); 2067 tmp->destroy ();
2301 CLEAR_FLAG (op, FLAG_LIFESAVE); 2068 CLEAR_FLAG (op, FLAG_LIFESAVE);
2302 2069
2303 if (op->stats.hp < 0) 2070 if (op->stats.hp < 0)
… …
2316 return 0; 2083 return 0;
2317} 2084}
2318 2085
2319/* This goes throws the inventory and removes unpaid objects, and puts them 2086/* This goes throws the inventory and removes unpaid objects, and puts them
2320 * back in the map (location and map determined by values of env). This 2087 * back in the map (location and map determined by values of env). This
2321 * function will descend into containers. op is the object to start the search 2088 * function will descend into containers. op is the object to start the search
2322 * from. 2089 * from.
2323 */ 2090 */
2091static void
2092drop_unpaid_items (object *op, object *env)
2093{
2094 while (op)
2095 {
2096 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2097
2098 if (QUERY_FLAG (op, FLAG_UNPAID))
2099 op->insert_at (env);
2100 else if (op->inv)
2101 drop_unpaid_items (op->inv, env);
2102
2103 op = next;
2104 }
2105}
2106
2324void 2107void
2325remove_unpaid_objects (object *op, object *env) 2108object::drop_unpaid_items ()
2326{ 2109{
2327 while (op) 2110 if (!flag [FLAG_REMOVED])
2328 { 2111 ::drop_unpaid_items (inv, this);
2329 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2330
2331 if (QUERY_FLAG (op, FLAG_UNPAID))
2332 {
2333 if (env->type == PLAYER)
2334 esrv_del_item (env->contr, op->count);
2335
2336 op->insert_at (env);
2337 }
2338 else if (op->inv)
2339 remove_unpaid_objects (op->inv, env);
2340
2341 op = next;
2342 }
2343} 2112}
2344 2113
2345/* 2114/*
2346 * Returns pointer a static string containing gravestone text 2115 * Returns pointer a static string containing gravestone text
2347 * Moved from apply.c to player.c - player.c is what 2116 * Moved from apply.c to player.c - player.c is what
2348 * actually uses this function. player.c may not be quite the 2117 * actually uses this function. player.c may not be quite the
2349 * best, a misc file for object actions is probably better, 2118 * best, a misc file for object actions is probably better,
2350 * but there isn't one in the server directory. 2119 * but there isn't one in the server directory.
2351 */ 2120 */
2352char * 2121const char *
2353gravestone_text (object *op) 2122gravestone_text (object *op)
2354{ 2123{
2355 static char buf2[MAX_BUF]; 2124 static dynbuf_text buf;
2356 char buf[MAX_BUF];
2357 time_t now = time (NULL);
2358 2125
2359 strcpy (buf2, " R.I.P.\n\n"); 2126 buf << "---- R.I.P. ----\n\n"
2127 << op->name;
2128
2360 if (op->type == PLAYER) 2129 if (op->type == PLAYER)
2361 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2130 buf << " the " << op->contr->title;
2362 else
2363 sprintf (buf, "%s\n", &op->name);
2364 2131
2365 strncat (buf2, " ", 20 - strlen (buf) / 2); 2132 buf << "\n\n";
2366 strcat (buf2, buf); 2133
2134 buf << "who was level ";
2135 buf << (sint32)op->level << "\n\n" // OO breakdown
2136 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2137
2367 if (op->type == PLAYER) 2138 if (op->type == PLAYER)
2368 sprintf (buf, "who was in level %d when killed\n", op->level); 2139 buf << "by " << op->contr->killer_name () << ".\n\n";
2369 else
2370 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2371 2140
2372 strncat (buf2, " ", 20 - strlen (buf) / 2);
2373 strcat (buf2, buf);
2374 if (op->type == PLAYER)
2375 { 2141 {
2376 sprintf (buf, "by %s.\n\n", op->contr->killer); 2142 static char buf2[128];
2377 strncat (buf2, " ", 21 - strlen (buf) / 2); 2143 time_t now = time (NULL);
2378 strcat (buf2, buf);
2379 }
2380
2381 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2144 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2382 strncat (buf2, " ", 20 - strlen (buf) / 2); 2145 buf << buf2;
2383 strcat (buf2, buf); 2146 }
2384 2147
2385 return buf2; 2148 return buf;
2386} 2149}
2387 2150
2388void 2151void
2389do_some_living (object *op) 2152do_some_living (object *op)
2390{ 2153{
… …
2442 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2205 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2443 else 2206 else
2444 { 2207 {
2445 gen_grace = op->stats.maxgrace; 2208 gen_grace = op->stats.maxgrace;
2446 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2209 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2447 }
2448
2449 /* Regenerate Spell Points */
2450 if (!op->contr->golem && --op->last_sp < 0)
2451 {
2452 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2453 if (op->stats.sp < op->stats.maxsp)
2454 {
2455 op->stats.sp++;
2456 /* dms do not consume food */
2457 if (!QUERY_FLAG (op, FLAG_WIZ))
2458 {
2459 op->stats.food--;
2460 if (op->contr->digestion < 0)
2461 op->stats.food += op->contr->digestion;
2462 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2463 op->stats.food = last_food;
2464 }
2465 }
2466
2467 if (max_sp > 1)
2468 {
2469 over_sp = (gen_sp + 10) / rate_sp;
2470 if (over_sp > 0)
2471 {
2472 if (op->stats.sp < op->stats.maxsp)
2473 {
2474 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2475
2476 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2477 op->stats.sp--;
2478
2479 if (op->stats.sp > op->stats.maxsp)
2480 op->stats.sp = op->stats.maxsp;
2481 }
2482 op->last_sp = 0;
2483 }
2484 else
2485 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2486 }
2487 else
2488 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2489 } 2210 }
2490 2211
2491 /* Regenerate Grace */ 2212 /* Regenerate Grace */
2492 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2213 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2493 if (--op->last_grace < 0) 2214 if (--op->last_grace < 0)
… …
2514 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2235 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2515 } 2236 }
2516 /* wearing stuff doesn't detract from grace generation. */ 2237 /* wearing stuff doesn't detract from grace generation. */
2517 } 2238 }
2518 2239
2240 if (op->stats.food > 0)
2241 {
2519 /* Regenerate Hit Points */ 2242 /* Regenerate Spell Points */
2520 if (--op->last_heal < 0) 2243 if (!op->contr->golem && --op->last_sp < 0)
2521 {
2522 if (op->stats.hp < op->stats.maxhp)
2523 { 2244 {
2524 op->stats.hp++; 2245 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2525 /* dms do not consume food */ 2246
2526 if (!QUERY_FLAG (op, FLAG_WIZ)) 2247 if (op->stats.sp < op->stats.maxsp)
2527 { 2248 {
2249 op->stats.sp++;
2250
2251 /* dms do not consume food */
2252 if (!QUERY_FLAG (op, FLAG_WIZ))
2253 {
2528 op->stats.food--; 2254 op->stats.food--;
2255
2529 if (op->contr->digestion < 0) 2256 if (op->contr->digestion < 0)
2530 op->stats.food += op->contr->digestion; 2257 op->stats.food += op->contr->digestion;
2531 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2258 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2532 op->stats.food = last_food; 2259 op->stats.food = last_food;
2260 }
2533 } 2261 }
2534 }
2535 2262
2536 if (max_hp > 1) 2263 if (max_sp > 1)
2537 {
2538 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2539 if (over_hp > 0)
2540 { 2264 {
2541 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2265 over_sp = (gen_sp + 10) / rate_sp;
2266 if (over_sp > 0)
2267 {
2268 if (op->stats.sp < op->stats.maxsp)
2269 {
2270 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2271
2272 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2273 op->stats.sp--;
2274
2275 if (op->stats.sp > op->stats.maxsp)
2276 op->stats.sp = op->stats.maxsp;
2277 }
2278
2542 op->last_heal = 0; 2279 op->last_sp = 0;
2280 }
2281 else
2282 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2543 } 2283 }
2544 else 2284 else
2285 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2286 }
2287
2288 /* Regenerate Hit Points */
2289 if (--op->last_heal < 0)
2290 {
2291 if (op->stats.hp < op->stats.maxhp)
2545 { 2292 {
2546 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2293 op->stats.hp++;
2294
2295 /* dms do not consume food */
2296 if (!QUERY_FLAG (op, FLAG_WIZ))
2297 {
2298 op->stats.food--;
2299
2300 if (op->contr->digestion < 0)
2301 op->stats.food += op->contr->digestion;
2302 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2303 op->stats.food = last_food;
2304 }
2547 } 2305 }
2306
2307 if (max_hp > 1)
2308 {
2309 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2310
2311 if (over_hp > 0)
2312 {
2313 op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2314 op->last_heal = 0;
2315 }
2316 else
2317 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2548 } 2318 }
2549 else 2319 else
2550 {
2551 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2320 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2552 } 2321 }
2553 } 2322 }
2554 2323
2555 /* Digestion */ 2324 /* Digestion */
2556 if (--op->last_eat < 0) 2325 if (--op->last_eat < 0)
2557 { 2326 {
2558 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2327 int bonus = max (0, op->contr->digestion),
2328 penalty = max (0, -op->contr->digestion);
2559 2329
2560 if (op->contr->gen_hp > 0)
2561 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2330 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2562 else
2563 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2564 2331
2565 /* dms do not consume food */ 2332 /* dms do not consume food */
2566 if (!QUERY_FLAG (op, FLAG_WIZ)) 2333 if (!QUERY_FLAG (op, FLAG_WIZ))
2567 op->stats.food--; 2334 op->stats.food--;
2568 } 2335 }
2569 2336
2570 if (op->stats.food < 0 && op->stats.hp >= 0) 2337 if (op->stats.food < 0 && op->stats.hp >= 0)
2571 { 2338 {
2572 object *tmp, *flesh = 0; 2339 object *flesh = 0;
2573 2340
2574 for (tmp = op->inv; tmp; tmp = tmp->below) 2341 for_inv_removable (op, tmp)
2575 { 2342 {
2576 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2343 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2344 continue;
2345
2346 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2577 { 2347 {
2578 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2348 op->statusmsg ("You blindly grab for a bite of food. "
2579 { 2349 "H<To prevent you from starving, you ate some random item from your backpack.>");
2580 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2581 manual_apply (op, tmp, 0); 2350 manual_apply (op, tmp, 0);
2351
2582 if (op->stats.food >= 0 || op->stats.hp < 0) 2352 if (op->stats.food >= 0 || op->stats.hp < 0)
2583 break; 2353 break;
2584 } 2354 }
2585 else if (tmp->type == FLESH) 2355 else if (tmp->type == FLESH)
2586 flesh = tmp; 2356 flesh = tmp;
2587 } /* End if paid for object */ 2357 }
2588 } /* end of for loop */
2589 2358
2590 /* If player is still starving, it means they don't have any food, so 2359 /* If player is still starving, it means they don't have any food, so
2591 * eat flesh instead. 2360 * eat flesh instead.
2592 */ 2361 */
2593 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2362 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2594 { 2363 {
2595 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2364 op->statusmsg ("You blindly grab for a bite of food. "
2365 "H<To prevent you from starving, you ate some random item from your backpack.>");
2596 manual_apply (op, flesh, 0); 2366 manual_apply (op, flesh, 0);
2597 } 2367 }
2368
2369 // If player is still starving, alert him!
2370 if (op->stats.food < 0)
2371 op->failmsg ("You are starving! "
2372 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2373 }
2374
2375 if (op->stats.food < 0)
2598 } 2376 {
2377 op->stats.hp += op->stats.food;
2378 op->stats.food = 0;
2599 2379
2600 while (op->stats.food < 0 && op->stats.hp >= 0) 2380 if (op->stats.hp < 0)
2601 op->stats.food++, op->stats.hp--; 2381 {
2382 op->contr->killer = archetype::get ("killer_starvation");
2383 op->contr->killer->destroy ();
2384 }
2385 }
2602 2386
2387 /* killer should be set here already */
2603 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2388 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2604 kill_player (op); 2389 kill_player (op);
2605 } 2390 }
2606} 2391}
2607 2392
… …
2611 * file. 2396 * file.
2612 */ 2397 */
2613void 2398void
2614kill_player (object *op) 2399kill_player (object *op)
2615{ 2400{
2616 char buf[MAX_BUF];
2617 int x, y; 2401 int x, y;
2618
2619 //int i;
2620 maptile *map; /* this is for resurrection */ 2402 maptile *map; /* this is for resurrection */
2621
2622 /* int z;
2623 int num_stats_lose;
2624 int lost_a_stat;
2625 int lose_this_stat;
2626 int this_stat; */
2627 int will_kill_again; 2403 int will_kill_again;
2628 archetype *at; 2404 archetype *at;
2629 object *tmp; 2405 object *tmp;
2630 2406
2631 if (save_life (op)) 2407 if (save_life (op))
2632 return; 2408 return;
2633 2409
2410 dynbuf_text deathtab;
2411
2412 /* restore player */
2413 at = archetype::find ("poisoning");
2414 if (object *tmp = present_arch_in_ob (at, op))
2415 {
2416 tmp->destroy ();
2417 deathtab << "Your body feels cleansed...\r";
2418 }
2419
2420 at = archetype::find ("confusion");
2421 if (object *tmp = present_arch_in_ob (at, op))
2422 {
2423 tmp->destroy ();
2424 deathtab << "Your mind feels clearer...\r";
2425 }
2426
2427 cure_disease (op, 0, 0); /* remove any disease */
2428
2429 max_it (op->stats.hp , op->stats.maxhp);
2430 max_it (op->stats.sp , op->stats.maxsp);
2431 max_it (op->stats.grace, op->stats.maxgrace);
2432
2433 if (op->stats.food <= 0)
2434 op->stats.food = 999;
2435
2436 // remove all spell effects that are active
2437 // to avoid long-term effects such as word-of-recall
2438 for (object *item = op->inv; item; )
2439 {
2440 object *next = item->below;
2441
2442 if (item->type == SPELL_EFFECT && item->active)
2443 item->destroy ();
2444
2445 item = next;
2446 }
2634 2447
2635 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2448 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2636 * in cities ONLY!!! It is very important that this doesn't get abused. 2449 * in cities ONLY!!! It is very important that this doesn't get abused.
2637 * Look at op_on_battleground() for more info --AndreasV 2450 * Look at op_on_battleground() for more info --AndreasV
2638 */ 2451 */
2639 if (op_on_battleground (op, &x, &y)) 2452 if (op_on_battleground (op, &x, &y))
2640 { 2453 {
2641 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2454 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2642 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2643
2644 /* restore player */
2645 at = archetype::find ("poisoning");
2646 if (object *tmp = present_arch_in_ob (at, op))
2647 {
2648 tmp->destroy ();
2649 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2650 }
2651
2652 at = archetype::find ("confusion");
2653 if (object *tmp = present_arch_in_ob (at, op))
2654 {
2655 tmp->destroy ();
2656 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2657 }
2658
2659 cure_disease (op, 0); /* remove any disease */
2660 op->stats.hp = op->stats.maxhp;
2661 if (op->stats.food <= 0)
2662 op->stats.food = 999;
2663 2455
2664 /* create a bodypart-trophy to make the winner happy */ 2456 /* create a bodypart-trophy to make the winner happy */
2665 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2457 if (object *tmp = arch_to_object (archetype::find ("finger")))
2666 { 2458 {
2667 sprintf (buf, "%s's finger", &op->name); 2459 tmp->name = format ("%s's finger" , &op->name);
2668 tmp->name = buf; 2460 tmp->name_pl = format ("%s's fingers", &op->name);
2669 sprintf (buf, " This finger has been cut off %s\n"
2670 " the %s, when he was defeated at\n level %d by %s.\n",
2671 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2672 tmp->msg = buf; 2461 tmp->msg = format (
2462 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2463 &op->name, op->contr->title,
2464 (int)op->level,
2465 op->contr->killer_name ()
2466 );
2673 tmp->value = 0, tmp->type = 0; 2467 tmp->value = 0, tmp->type = 0;
2674 tmp->materialname = "organics"; 2468 tmp->materialname = "organics";
2675 tmp->insert_at (op, tmp); 2469 tmp->insert_at (op, tmp);
2676 } 2470 }
2677 2471
2678 /* teleport defeated player to new destination */ 2472 /* teleport defeated player to new destination */
2679 transfer_ob (op, x, y, 0, NULL); 2473 transfer_ob (op, x, y, 0, NULL);
2680 op->contr->braced = 0; 2474 op->contr->braced = 0;
2475
2476 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2681 return; 2477 return;
2682 } 2478 }
2683 2479
2480 deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
2481 deathtab << "T<YOU HAVE DIED>\n\n";
2482
2684 INVOKE_PLAYER (DEATH, op->contr); 2483 INVOKE_PLAYER (DEATH, op->contr);
2685 2484
2686 command_kill_pets (op, 0); 2485 command_kill_pets (op, 0);
2687 2486
2688 if (op->stats.food < 0) 2487 op->contr->play_sound (sound_find ("player_dies"));
2689 {
2690 sprintf (buf, "%s starved to death.", &op->name);
2691 strcpy (op->contr->killer, "starvation");
2692 }
2693 else
2694 sprintf (buf, "%s died.", &op->name);
2695
2696 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2697 2488
2698 /* save the map location for corpse, gravestone */ 2489 /* save the map location for corpse, gravestone */
2699 x = op->x; 2490 x = op->x;
2700 y = op->y; 2491 y = op->y;
2701 map = op->map; 2492 map = op->map;
… …
2729 2520
2730 lost_a_stat = 0; 2521 lost_a_stat = 0;
2731 2522
2732 for (z = 0; z < num_stats_lose; z++) 2523 for (z = 0; z < num_stats_lose; z++)
2733 { 2524 {
2734 i = RANDOM () % NUM_STATS; 2525 i = rndm (NUM_STATS);
2735 2526
2736 if (settings.stat_loss_on_death) 2527 if (settings.stat_loss_on_death)
2737 { 2528 {
2738 /* Pick a random stat and take a point off it. Tell the player 2529 /* Pick a random stat and take a point off it. Tell the player
2739 * what he lost. 2530 * what he lost.
… …
2790 } 2581 }
2791 } 2582 }
2792 2583
2793 if (lose_this_stat) 2584 if (lose_this_stat)
2794 { 2585 {
2795 this_stat = get_attr_value (&(dep->stats), i); 2586 this_stat = get_attr_value (&dep->stats, i);
2796 /* We could try to do something clever like find another 2587 /* We could try to do something clever like find another
2797 * stat to reduce if this fails. But chances are, if 2588 * stat to reduce if this fails. But chances are, if
2798 * stats have been depleted to -50, all are pretty low 2589 * stats have been depleted to -50, all are pretty low
2799 * and should be roughly the same, so it shouldn't make a 2590 * and should be roughly the same, so it shouldn't make a
2800 * difference. 2591 * difference.
… …
2808 lost_a_stat = 1; 2599 lost_a_stat = 1;
2809 } 2600 }
2810 } 2601 }
2811 } 2602 }
2812 } 2603 }
2604
2813 /* If no stat lost, tell the player. */ 2605 /* If no stat lost, tell the player. */
2814 if (!lost_a_stat) 2606 if (!lost_a_stat)
2815 { 2607 {
2816 /* determine_god() seems to not work sometimes... why is this? 2608 /* determine_god() seems to not work sometimes... why is this?
2817 Should I be using something else? GD */ 2609 Should I be using something else? GD */
2818 const char *god = determine_god (op); 2610 shstr_tmp god = determine_god (op);
2819 2611
2820 if (god && (strcmp (god, "none"))) 2612 if (god != shstr_none)
2821 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2613 deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2822 else 2614 else
2823 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2615 deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2824 } 2616 }
2825#else 2617#else
2826 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2618 deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2827#endif 2619#endif
2828 2620
2829 /* Put a gravestone up where the character 'almost' died. List the 2621 /* Put a gravestone up where the character 'almost' died. List the
2830 * exp loss on the stone. 2622 * exp loss on the stone.
2831 */ 2623 */
2832 tmp = arch_to_object (archetype::find ("gravestone")); 2624 tmp = arch_to_object (archetype::find ("gravestone"));
2833 sprintf (buf, "%s's gravestone", &op->name); 2625 tmp->name = format ("%s's gravestone", &op->name);
2834 tmp->name = buf; 2626 tmp->name_pl = format ("%s's gravestones", &op->name);
2835 sprintf (buf, "%s's gravestones", &op->name); 2627 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2836 tmp->name_pl = buf; 2628 &op->name, op->contr->title, op->contr->killer_name ());
2837 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);
2838 tmp->msg = buf;
2839 tmp->x = op->x, tmp->y = op->y; 2629 tmp->x = op->x, tmp->y = op->y;
2840 insert_ob_in_map (tmp, op->map, NULL, 0); 2630 insert_ob_in_map (tmp, op->map, NULL, 0);
2841 2631
2842 /**************************************/ 2632 /**************************************/
2843 /* */ 2633 /* */
2844 /* Subtract the experience points, */ 2634 /* Subtract the experience points, */
2845 /* if we died cause of food, give us */
2846 /* food, and reset HP's... */
2847 /* */ 2635 /* */
2848 /**************************************/ 2636 /**************************************/
2849 2637
2850 /* remove any poisoning and confusion the character may be suffering. */
2851 /* restore player */
2852 at = archetype::find ("poisoning");
2853 tmp = present_arch_in_ob (at, op);
2854
2855 if (tmp)
2856 {
2857 tmp->destroy ();
2858 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2859 }
2860
2861 at = archetype::find ("confusion");
2862 tmp = present_arch_in_ob (at, op);
2863 if (tmp)
2864 {
2865 tmp->destroy ();
2866 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2867 }
2868
2869 cure_disease (op, 0); /* remove any disease */
2870
2871 /*add_exp(op, (op->stats.exp * -0.20)); */ 2638 /*add_exp(op, (op->stats.exp * -0.20)); */
2872 apply_death_exp_penalty (op); 2639 apply_death_exp_penalty (op);
2873 if (op->stats.food < 100)
2874 op->stats.food = 900;
2875 op->stats.hp = op->stats.maxhp;
2876 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2877 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2878 2640
2879 /* 2641 /*
2880 * Check to see if the player has any unpaid items. If so, remove them 2642 * Check to see if the player has any unpaid items. If so, remove them
2881 * and put them back in the map. 2643 * and put them back in the map.
2882 */ 2644 */
2883 remove_unpaid_objects (op->inv, op); 2645 op->drop_unpaid_items ();
2884 2646
2885 /****************************************/ 2647 /****************************************/
2886 /* */ 2648 /* */
2887 /* Move player to his current respawn- */ 2649 /* Move player to his current respawn- */
2888 /* position (usually last savebed) */ 2650 /* position (usually last savebed) */
… …
2917 if (will_kill_again & (1 << at)) 2679 if (will_kill_again & (1 << at))
2918 force->resist[at] = 100; 2680 force->resist[at] = 100;
2919 2681
2920 insert_ob_in_ob (force, op); 2682 insert_ob_in_ob (force, op);
2921 op->update_stats (); 2683 op->update_stats ();
2922
2923 } 2684 }
2924 2685
2925 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2686 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2926} 2687}
2927 2688
2928void 2689void
2929loot_object (object *op) 2690loot_object (object *op)
2930{ /* Grab and destroy some treasure */ 2691{ /* Grab and destroy some treasure */
… …
2947 2708
2948 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2709 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2949 { 2710 {
2950 if (tmp->nrof > 1) 2711 if (tmp->nrof > 1)
2951 { 2712 {
2952 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2713 tmp->decrease (rndm (1, tmp->nrof - 1));
2953 tmp2->destroy ();
2954 insert_ob_in_map (tmp, op->map, NULL, 0); 2714 insert_ob_in_map (tmp, op->map, NULL, 0);
2955 } 2715 }
2956 else 2716 else
2957 tmp->destroy (); 2717 tmp->destroy ();
2958 } 2718 }
… …
2969void 2729void
2970fix_weight (void) 2730fix_weight (void)
2971{ 2731{
2972 for_all_players (pl) 2732 for_all_players (pl)
2973 { 2733 {
2974 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2734 sint32 old = pl->ob->carrying;
2975 2735
2976 if (old == sum) 2736 pl->ob->update_weight ();
2977 continue; 2737
2738 if (old != pl->ob->carrying)
2739 {
2978 pl->ob->update_stats (); 2740 pl->ob->update_stats ();
2979 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2741 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2742 }
2980 } 2743 }
2981} 2744}
2982 2745
2983void 2746void
2984fix_luck (void) 2747fix_luck (void)
… …
3026} 2789}
3027 2790
3028void 2791void
3029make_visible (object *op) 2792make_visible (object *op)
3030{ 2793{
3031 op->hide = 0; 2794 op->flag [FLAG_HIDDEN] = 0;
3032 op->invisible = 0; 2795 op->invisible = 0;
2796
3033 if (op->type == PLAYER) 2797 if (op->type == PLAYER)
3034 { 2798 {
3035 op->contr->tmp_invis = 0; 2799 op->contr->tmp_invis = 0;
3036 op->contr->invis_race = 0; 2800 op->contr->invis_race = 0;
3037 } 2801 }
… …
3040} 2804}
3041 2805
3042int 2806int
3043is_true_undead (object *op) 2807is_true_undead (object *op)
3044{ 2808{
3045 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 2809 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3046 return 1; 2810 return 1;
3047 2811
3048 return 0; 2812 return 0;
3049} 2813}
3050 2814
3051/* look at the surrounding terrain to determine 2815/* look at the surrounding terrain to determine
3052 * the hideability of this object. Positive levels 2816 * the hideability of this object. Positive levels
3053 * indicate greater hideability. 2817 * indicate greater hideability.
3054 */ 2818 */
3055
3056int 2819int
3057hideability (object *ob) 2820hideability (object *ob)
3058{ 2821{
3059 int i, level = 0, mflag; 2822 int i, level = 0, mflag;
3060 sint16 x, y; 2823 sint16 x, y;
3061 2824
3062 if (!ob || !ob->map) 2825 if (!ob || !ob->map)
3063 return 0; 2826 return 0;
3064 2827
3065 /* so, on normal lighted maps, its hard to hide */ 2828 /* so, on normal lighted maps, its hard to hide */
3066 level = ob->map->darkness - 2; 2829 level = ob->map->darklevel () - 2;
3067 2830
3068 /* this also picks up whether the object is glowing. 2831 /* this also picks up whether the object is glowing.
3069 * If you carry a light on a non-dark map, its not 2832 * If you carry a light on a non-dark map, its not
3070 * as bad as carrying a light on a pitch dark map */ 2833 * as bad as carrying a light on a pitch dark map */
3071 if (has_carried_lights (ob)) 2834 if (ob->has_carried_lights ())
3072 level = -(10 + (2 * ob->map->darkness)); 2835 level = -(10 + (2 * ob->map->darklevel ()));
3073 2836
3074 /* scan through all nearby squares for terrain to hide in */ 2837 /* scan through all nearby squares for terrain to hide in */
3075 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 2838 for (i = 0, x = ob->x, y = ob->y;
2839 i <= SIZEOFFREE1;
2840 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3076 { 2841 {
3077 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 2842 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3078 if (mflag & P_OUT_OF_MAP) 2843 if (mflag & P_OUT_OF_MAP)
3079 {
3080 continue; 2844 continue;
3081 } 2845
3082 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 2846 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3083 level += 2; 2847 level += 2;
3084 else /* open terrain! */ 2848 else /* open terrain! */
3085 level -= 1; 2849 level -= 1;
3086 } 2850 }
… …
3097 * spot (surrounded by clear terrain in broad daylight). -b.t. 2861 * spot (surrounded by clear terrain in broad daylight). -b.t.
3098 */ 2862 */
3099void 2863void
3100do_hidden_move (object *op) 2864do_hidden_move (object *op)
3101{ 2865{
3102 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 2866 int hide = 0;
3103 object *skop;
3104 2867
3105 if (!op || !op->map) 2868 if (!op || !op->map)
3106 return; 2869 return;
3107 2870
3108 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 2871 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
2872 int num = random_roll (0, 19, op, PREFER_LOW);
3109 2873
3110 /* its *extremely* hard to run and sneak/hide at the same time! */ 2874 /* its *extremely* hard to run and sneak/hide at the same time! */
3111 if (op->type == PLAYER && op->contr->run_on) 2875 if (op->type == PLAYER && op->contr->run_on)
3112 if (!skop || num >= skop->level) 2876 if (!skop || num >= skop->level)
3113 { 2877 {
… …
3123 num -= hide; 2887 num -= hide;
3124 2888
3125 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 2889 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3126 { 2890 {
3127 make_visible (op); 2891 make_visible (op);
2892
3128 if (op->type == PLAYER) 2893 if (op->type == PLAYER)
3129 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 2894 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3130 } 2895 }
3131 else if (op->type == PLAYER && skop) 2896 else if (op->type == PLAYER && skop)
3132 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 2897 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3185 * object op. This function works fine for monsters, 2950 * object op. This function works fine for monsters,
3186 * but we dont worry if the object isnt the top one in 2951 * but we dont worry if the object isnt the top one in
3187 * a pile (say a coin under a table would return "viewable" 2952 * a pile (say a coin under a table would return "viewable"
3188 * by this routine). Another question, should we be 2953 * by this routine). Another question, should we be
3189 * concerned with the direction the player is looking 2954 * concerned with the direction the player is looking
3190 * in? Realistically, most of use cant see stuff behind 2955 * in? Realistically, most of us can't see stuff behind
3191 * our backs...on the other hand, does the "facing" direction 2956 * our backs...on the other hand, does the "facing" direction
3192 * imply the way your head, or body is facing? Its possible 2957 * imply the way your head, or body is facing? It's possible
3193 * for them to differ. Sigh, this fctn could get a bit more complex. 2958 * for them to differ. Sigh, this fctn could get a bit more complex.
3194 * -b.t. 2959 * -b.t.
3195 * This function is now map tiling safe. 2960 * This function is now map tiling safe.
3196 */ 2961 */
3197
3198int 2962int
3199player_can_view (object *pl, object *op) 2963player_can_view (object *pl, object *op)
3200{ 2964{
3201 rv_vector rv; 2965 rv_vector rv;
3202 int dx, dy; 2966 int dx, dy;
… …
3214 2978
3215 get_rangevector (pl, op, &rv, 0x1); 2979 get_rangevector (pl, op, &rv, 0x1);
3216 2980
3217 /* starting with the 'head' part, lets loop 2981 /* starting with the 'head' part, lets loop
3218 * through the object and find if it has any 2982 * through the object and find if it has any
3219 * part that is in the los array but isnt on 2983 * part that is in the los array but isn't on
3220 * a blocked los square. 2984 * a blocked los square.
3221 * we use the archetype to figure out offsets. 2985 * we use the archetype to figure out offsets.
3222 */ 2986 */
3223 while (op) 2987 while (op)
3224 { 2988 {
3225 dx = rv.distance_x + op->arch->clone.x; 2989 dx = rv.distance_x + op->arch->x;
3226 dy = rv.distance_y + op->arch->clone.y; 2990 dy = rv.distance_y + op->arch->y;
3227 2991
3228 /* only the viewable area the player sees is updated by LOS 2992 if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3229 * code, so we need to restrict ourselves to that range of values
3230 * for any meaningful values.
3231 */
3232 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3233 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3234 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3235 return 1; 2993 return 1;
2994
3236 op = op->more; 2995 op = op->more;
3237 } 2996 }
2997
3238 return 0; 2998 return 0;
3239} 2999}
3240 3000
3241/* routine for both players and monsters. We call this when 3001/* routine for both players and monsters. We call this when
3242 * there is a possibility for our action distrubing our hiding 3002 * there is a possibility for our action distrubing our hiding
3243 * place or invisiblity spell. Artefact invisiblity is not 3003 * place or invisiblity spell. Artefact invisiblity causes
3244 * effected by this. If we arent invisible to begin with, we 3004 * "noise" instead. If we arent invisible to begin with, we
3245 * return 0. 3005 * return 0.
3246 */ 3006 */
3247int 3007int
3248action_makes_visible (object *op) 3008action_makes_visible (object *op)
3249{ 3009{
3250
3251 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3010 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3252 { 3011 {
3253 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3012 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3013 {
3014 // artefact invisibility is permanent, but we still make noise
3015 // this is important for game-balance.
3016 if (op->contr)
3017 op->make_noise ();
3018
3254 return 0; 3019 return 0;
3020 }
3255 3021
3256 if (op->contr && op->contr->tmp_invis == 0) 3022 if (op->contr && op->contr->tmp_invis == 0)
3257 return 0; 3023 return 0;
3258 3024
3259 /* If monsters, they should become visible */ 3025 /* If monsters, they should become visible */
3260 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) 3026 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3261 { 3027 {
3262 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3028 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3263 return 1; 3029 return 1;
3264 } 3030 }
3265 } 3031 }
3032
3266 return 0; 3033 return 0;
3267} 3034}
3268 3035
3269/* op_on_battleground - checks if the given object op (usually 3036/* op_on_battleground - checks if the given object op (usually
3270 * a player) is standing on a valid battleground-tile, 3037 * a player) is standing on a valid battleground-tile,
… …
3275 * Default is to do the same as before, so only people wanting to have different points need worry about this 3042 * Default is to do the same as before, so only people wanting to have different points need worry about this
3276 */ 3043 */
3277int 3044int
3278op_on_battleground (object *op, int *x, int *y) 3045op_on_battleground (object *op, int *x, int *y)
3279{ 3046{
3280 object *tmp;
3281
3282 /* A battleground-tile needs the following attributes to be valid: 3047 /* A battleground-tile needs the following attributes to be valid:
3283 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3048 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3284 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3049 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3285 * and the exit-coordinates sp/hp must both be > 0. 3050 * and the exit-coordinates sp/hp must both be > 0.
3286 * => The intention here is to prevent abuse of the battleground- 3051 * => The intention here is to prevent abuse of the battleground-
3287 * feature (like pickable or hidden battleground tiles). */ 3052 * feature (like pickable or hidden battleground tiles). */
3288 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3053 for (object *tmp = op->below; tmp; tmp = tmp->below)
3289 { 3054 {
3290 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3055 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3291 { 3056 {
3292 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3057 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3293 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3058 && tmp->type == BATTLEGROUND
3059 && tmp->name == shstr_battleground
3060 && EXIT_X (tmp) && EXIT_Y (tmp))
3294 { 3061 {
3295 /*before we assign the exit, check if this is a teambattle */ 3062 /* before we assign the exit, check if this is a teambattle */
3296 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3063 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3297 { 3064 {
3298 object *invtmp;
3299
3300 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3065 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3301 { 3066 {
3302 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3067 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3303 { 3068 {
3304 if (x != NULL && y != NULL) 3069 if (x && y)
3305 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3070 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3071
3306 return 1; 3072 return 1;
3307 } 3073 }
3308 } 3074 }
3309 } 3075 }
3076
3310 if (x != NULL && y != NULL) 3077 if (x && y)
3311 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3078 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3079
3312 return 1; 3080 return 1;
3313 } 3081 }
3314 } 3082 }
3315 } 3083 }
3084
3316 /* If we got here, did not find a battleground */ 3085 /* If we got here, did not find a battleground */
3317 return 0; 3086 return 0;
3318} 3087}
3319 3088
3320/* 3089/*
… …
3336 char buf[MAX_BUF]; /* tmp. string buffer */ 3105 char buf[MAX_BUF]; /* tmp. string buffer */
3337 int i = 0, j = 0; 3106 int i = 0, j = 0;
3338 3107
3339 /* get the appropriate treasurelist */ 3108 /* get the appropriate treasurelist */
3340 if (atnr == ATNR_FIRE) 3109 if (atnr == ATNR_FIRE)
3341 trlist = treasurelist::find ("dragon_ability_fire"); 3110 trlist = treasurelist::find (shstr_dragon_ability_fire);
3342 else if (atnr == ATNR_COLD) 3111 else if (atnr == ATNR_COLD)
3343 trlist = treasurelist::find ("dragon_ability_cold"); 3112 trlist = treasurelist::find (shstr_dragon_ability_cold);
3344 else if (atnr == ATNR_ELECTRICITY) 3113 else if (atnr == ATNR_ELECTRICITY)
3345 trlist = treasurelist::find ("dragon_ability_elec"); 3114 trlist = treasurelist::find (shstr_dragon_ability_elec);
3346 else if (atnr == ATNR_POISON) 3115 else if (atnr == ATNR_POISON)
3347 trlist = treasurelist::find ("dragon_ability_poison"); 3116 trlist = treasurelist::find (shstr_dragon_ability_poison);
3348 3117
3349 if (trlist == NULL || who->type != PLAYER) 3118 if (trlist == NULL || who->type != PLAYER)
3350 return; 3119 return;
3351 3120
3352 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3121 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3356 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3125 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3357 return; 3126 return;
3358 } 3127 }
3359 3128
3360 /* everything seems okay - now bring on the gift: */ 3129 /* everything seems okay - now bring on the gift: */
3361 item = &(tr->item->clone); 3130 item = tr->item;
3362 3131
3363 if (item->type == SPELL) 3132 if (item->type == SPELL)
3364 { 3133 {
3365 if (check_spell_known (who, item->name)) 3134 if (check_spell_known (who, item->name))
3366 return; 3135 return;
… …
3425 { 3194 {
3426 /* forces in the treasurelist can alter the player's stats */ 3195 /* forces in the treasurelist can alter the player's stats */
3427 object *skin; 3196 object *skin;
3428 3197
3429 /* first get the dragon skin force */ 3198 /* first get the dragon skin force */
3430 shstr_cmp dragon_skin_force ("dragon_skin_force");
3431 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below) 3199 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3432 ; 3200 ;
3433 3201
3434 if (!skin) 3202 if (!skin)
3435 return; 3203 return;
3436 3204
… …
3471 else 3239 else
3472 { 3240 {
3473 /* generate misc. treasure */ 3241 /* generate misc. treasure */
3474 tmp = arch_to_object (tr->item); 3242 tmp = arch_to_object (tr->item);
3475 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3243 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3476 tmp = insert_ob_in_ob (tmp, who); 3244 who->insert (tmp);
3477 if (who->type == PLAYER)
3478 esrv_send_item (who, tmp);
3479 } 3245 }
3480} 3246}
3481 3247
3482/** 3248/**
3483 * Unready an object for a player. This function does nothing if the object was 3249 * Unready an object for a player. This function does nothing if the object was
… …
3495 if (pl->ranged_ob == ob) 3261 if (pl->ranged_ob == ob)
3496 pl->ranged_ob = 0; 3262 pl->ranged_ob = 0;
3497} 3263}
3498 3264
3499sint8 3265sint8
3500player::visibility_at (maptile *map, int x, int y) const 3266player::darkness_at (maptile *map, int x, int y) const
3501{ 3267{
3502 if (!ns) 3268 if (!ns)
3503 return 0; 3269 return LOS_BLOCKED;
3504 3270
3505 int dx, dy; 3271 int dx, dy;
3506 if (!adjacent_map (map, ns->current_map, &dx, &dy)) 3272 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3507 return 0; 3273 return LOS_BLOCKED;
3508 3274
3509 x += dx - ns->current_x + ns->mapx / 2; 3275 x += dx - ns->current_x;
3510 y += dy - ns->current_y + ns->mapy / 2; 3276 y += dy - ns->current_y;
3511 3277
3512 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3513 return 0;
3514
3515 return 100 - blocked_los [x][y]; 3278 return blocked_los (x, y);
3516} 3279}
3280
3281void
3282player::infobox (const char *title, const char *msg, int color)
3283{
3284 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3285}
3286
3287void
3288player::statusmsg (const char *msg, int color)
3289{
3290 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3291}
3292
3293void
3294player::failmsg (const char *msg, int color)
3295{
3296 play_sound (sound_find ("generic_failure"));
3297 statusmsg (msg, color);
3298}
3299

Diff Legend

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