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.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.212 by root, Tue Dec 23 00:39:48 2008 UTC

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

Diff Legend

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