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.103 by root, Sat Feb 10 01:52:29 2007 UTC vs.
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC

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

Diff Legend

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