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

Diff Legend

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