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

Diff Legend

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