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.153 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.250 by root, Sat Dec 12 03:17:21 2009 UTC

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

Diff Legend

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