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.144 by root, Sat May 26 15:44:08 2007 UTC vs.
Revision 1.246 by root, Wed Nov 11 04:45:23 2009 UTC

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

Diff Legend

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