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.82 by elmex, Wed Jan 3 02:30:52 2007 UTC vs.
Revision 1.299 by root, Sat Sep 16 21:55:51 2017 UTC

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

Diff Legend

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