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

Diff Legend

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