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.139 by root, Fri May 18 01:01:02 2007 UTC vs.
Revision 1.236 by root, Thu Nov 5 14:56:06 2009 UTC

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

Diff Legend

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