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.140 by root, Fri May 18 13:15:29 2007 UTC vs.
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC

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

Diff Legend

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