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