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

Diff Legend

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