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