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

Diff Legend

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