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.110 by root, Mon Apr 16 06:23:43 2007 UTC vs.
Revision 1.246 by root, Wed Nov 11 04:45:23 2009 UTC

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

Diff Legend

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