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.122 by root, Wed May 9 11:32:31 2007 UTC vs.
Revision 1.192 by root, Wed Apr 30 06:40:28 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 fprintf (stderr, "applied<%s>\n", &op->name);//D 321 combat_ob = op;
275 apply_special (ob, op, AP_UNAPPLY);
276 apply_special (ob, op, AP_APPLY);
277 break; 322 break;
278 } 323 }
279 324
280 ob->update_stats (); 325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
281 ns->floorbox_update (); 326 ob->deactivate (); // change_Weapon activates, fix this better
282
283 esrv_send_inventory (ob, ob);
284 esrv_add_spells (this, 0);
285
286 activate ();
287
288 send_rules (ob);
289 send_news (ob);
290 display_motd (ob);
291
292 INVOKE_PLAYER (CONNECT, this);
293 INVOKE_PLAYER (LOGIN, this);
294} 327}
295 328
296void 329void
297player::disconnect ()
298{
299 if (ns)
300 {
301 if (active)
302 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
303
304 INVOKE_PLAYER (DISCONNECT, this);
305
306 ns->reset_stats ();
307 ns->pl = 0;
308 ns = 0;
309 }
310
311 if (ob)
312 ob->close_container (); //TODO: client-specific
313
314 deactivate ();
315}
316
317// the need for this function can be explained
318// by load_object not returning the object
319void
320player::set_object (object *op) 330player::set_observe (object *op)
321{ 331{
322 ob = op; 332 observe = op ? op : ob;
323 ob->contr = this; /* this aren't yet in archetype */ 333 do_los = 1;
324
325 ob->speed_left = 0.5;
326 ob->speed = 1.0;
327 ob->direction = 5; /* So player faces south */
328} 334}
329 335
330player::player () 336player::player ()
331{ 337{
332 /* There are some elements we want initialised to non zero value - 338 /* There are some elements we want initialised to non zero value -
… …
343 petmode = pet_normal; 349 petmode = pet_normal;
344 listening = 10; 350 listening = 10;
345 usekeys = containers; 351 usekeys = containers;
346 peaceful = 1; /* default peaceful */ 352 peaceful = 1; /* default peaceful */
347 do_los = 1; 353 do_los = 1;
354
355 weapon_sp = 1.0f;
356 weapon_sp_left = 0.5f;
348} 357}
349 358
350void 359void
351player::do_destroy () 360player::do_destroy ()
352{ 361{
… …
357 if (ob) 366 if (ob)
358 { 367 {
359 ob->destroy_inv (false); 368 ob->destroy_inv (false);
360 ob->destroy (); 369 ob->destroy ();
361 } 370 }
371
372 ob = observe = 0;
362} 373}
363 374
364player::~player () 375player::~player ()
365{ 376{
366 /* Clear item stack */ 377 /* Clear item stack */
… …
393 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
394 */ 405 */
395archetype * 406archetype *
396get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
397{ 408{
398 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);
399 416
400 for (;;) 417 for (;;)
401 { 418 {
402 if (at == NULL || at->next == NULL) 419 if (++i == archetypes.end ())
403 at = first_archetype; 420 i = archetypes.begin ();
404 else 421 else if (*i == at)
405 at = at->next; 422 cleanup ("not a single player archetype found");
406 423
407 if (at->clone.type == PLAYER) 424 if ((*i)->type == PLAYER)
408 return at; 425 return *i;
409
410 if (at == start)
411 {
412 LOG (llevError, "No Player archetypes\n");
413 exit (-1);
414 }
415 } 426 }
416} 427}
417 428
418object * 429object *
419get_nearest_player (object *mon) 430get_nearest_player (object *mon)
… …
423 unsigned lastdist; 434 unsigned lastdist;
424 rv_vector rv; 435 rv_vector rv;
425 436
426 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 437 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
427 { 438 {
428 /* We should not find free objects on this friendly list, but it
429 * does periodically happen. Given that, lets deal with it.
430 * While unlikely, it is possible the next object on the friendly
431 * list is also free, so encapsulate this in a while loop.
432 */
433 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
434 {
435 object *tmp = ol->ob;
436
437 /* Can't do much more other than log the fact, because the object
438 * itself will have been cleared.
439 */
440 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
441 tmp->debug_desc ());
442 ol = ol->next;
443 remove_friendly_object (tmp);
444 if (!ol)
445 return op;
446 }
447
448 /* Remove special check for player from this. First, it looks to cause
449 * some crashes (ol->ob->contr not set properly?), but secondly, a more
450 * complicated method of state checking would be needed in any case -
451 * as it was, a clever player could type quit, and the function would
452 * skip them over while waiting for confirmation. Remove
453 * on_same_map check, as can_detect_enemy also does this
454 */
455 if (!can_detect_enemy (mon, ol->ob, &rv)) 439 if (!can_detect_enemy (mon, ol->ob, &rv))
456 continue; 440 continue;
457 441
458 if (lastdist > rv.distance) 442 if (lastdist > rv.distance)
459 { 443 {
… …
654 638
655 return firstdir; 639 return firstdir;
656} 640}
657 641
658void 642void
659give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
660{ 644{
661 object *op, *next = NULL;
662
663 if (pl->randomitems != NULL) 645 if (pl->randomitems)
664 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
665 647
666 for (op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
667 { 649 {
668 next = op->below; 650 next = op->below;
669 651
670 /* Forces get applied per default, unless they have the 652 /* Forces get applied per default, unless they have the
671 * 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
… …
676 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
677 * by this player due to race restrictions 659 * by this player due to race restrictions
678 */ 660 */
679 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
680 { 662 {
681 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
682 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
683 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
684 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
685 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))
686 { 670 {
687 op->destroy (); 671 op->destroy ();
688 continue; 672 continue;
689 } 673 }
690 } 674 }
… …
713 if (op->nrof > 1) 697 if (op->nrof > 1)
714 op->nrof = 1; 698 op->nrof = 1;
715 } 699 }
716 700
717 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
718 {
719 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
720 }
721 703
722 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
723 * 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
724 * merged properly. 706 * merged properly.
725 */ 707 */
726 if (need_identify (op)) 708 if (need_identify (op))
727 { 709 {
728 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
729 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
730 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
731 } 713 }
714
732 if (op->type == SPELL) 715 if (op->type == SPELL)
733 { 716 {
734 op->destroy (); 717 op->destroy ();
735 continue; 718 continue;
736 } 719 }
… …
738 { 721 {
739 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
740 op->stats.exp = 0; 723 op->stats.exp = 0;
741 op->level = 1; 724 op->level = 1;
742 } 725 }
743 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
744 else
745 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
746 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
747 729
748 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
749 link_player_skills (pl); 731 link_player_skills (pl);
… …
785} 767}
786 768
787void 769void
788object::roll_stats () 770object::roll_stats ()
789{ 771{
790 int statsort [7]; 772 int statsort [NUM_STATS];
791 773
792 for (;;) 774 for (;;)
793 { 775 {
794 int sum = 0; 776 int sum = 0;
795 for (int i = 7; i--; ) 777 for (int i = NUM_STATS; i--; )
796 sum += statsort [i] = roll_stat (); 778 sum += statsort [i] = roll_stat ();
797 779
798 if (sum >= 82 && sum <= 116) 780 if (sum >= 82 && sum <= 116)
799 break; 781 break;
800 } 782 }
801 783
802 // Sort the stats so that rerolling is easier... 784 // Sort the stats so that rerolling is easier...
803 std::sort (statsort, statsort + 7, std::greater<int>()); 785 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
804 786
787 for (int i = 0; i < NUM_STATS; ++i)
805 stats.Str = statsort[0]; 788 stats.stat (i) = statsort [i];
806 stats.Dex = statsort[1];
807 stats.Con = statsort[2];
808 stats.Int = statsort[3];
809 stats.Wis = statsort[4];
810 stats.Pow = statsort[5];
811 stats.Cha = statsort[6];
812 789
813 stats.exp = 0; 790 stats.exp = 0;
814 stats.ac = 0; 791 stats.ac = 0;
815 792
816 stats.hp = stats.maxhp; 793 stats.hp = stats.maxhp;
… …
828} 805}
829 806
830void 807void
831object::swap_stats (int a, int b) 808object::swap_stats (int a, int b)
832{ 809{
833 int tmp = get_attr_value (&contr->orig_stats, a); 810 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
834 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
835 set_attr_value (&contr->orig_stats, b, tmp);
836 811
812 for (int i = 0; i < NUM_STATS; ++i)
837 stats.Str = contr->orig_stats.Str; 813 stats.stat (i) = contr->orig_stats.stat (i);
838 stats.Dex = contr->orig_stats.Dex;
839 stats.Con = contr->orig_stats.Con;
840 stats.Int = contr->orig_stats.Int;
841 stats.Wis = contr->orig_stats.Wis;
842 stats.Pow = contr->orig_stats.Pow;
843 stats.Cha = contr->orig_stats.Cha;
844 814
845 //TODO: the following code looks so borked and should, at the very least, 815 //TODO: the following code looks so borked and should, at the very least,
846 // be merged with the similar code in roll_stats 816 // be merged with the similar code in roll_stats
847 stats.ac = 0; 817 stats.ac = 0;
848 818
… …
867static void 837static void
868start_info (object *op) 838start_info (object *op)
869{ 839{
870 char buf[MAX_BUF]; 840 char buf[MAX_BUF];
871 841
872 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 842 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
873 new_draw_info (NDI_UNIQUE, 0, op, buf); 843 new_draw_info (NDI_UNIQUE, 0, op, buf);
874 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
875 //new_draw_info (NDI_UNIQUE, 0, op, " ");
876} 844}
877 845
878/* This function takes the key that is passed, and does the 846/* This function takes the key that is passed, and does the
879 * appropriate action with it (change race, or other things). 847 * appropriate action with it (change race, or other things).
880 * The function name is for historical reasons - now we have 848 * The function name is for historical reasons - now we have
… …
883 */ 851 */
884void 852void
885player::chargen_race_done () 853player::chargen_race_done ()
886{ 854{
887 /* this must before then initial items are given */ 855 /* this must before then initial items are given */
888 esrv_new_player (ob->contr, ob->weight + ob->carrying); 856 esrv_new_player (ob->contr);
889 857
890 treasurelist *tl = treasurelist::find ("starting_wealth"); 858 treasurelist *tl = treasurelist::find ("starting_wealth");
891 if (tl) 859 if (tl)
892 create_treasure (tl, ob, 0, 0, 0); 860 create_treasure (tl, ob, 0, 0, 0);
893 861
… …
921 if (*first_map_ext_path) 889 if (*first_map_ext_path)
922 { 890 {
923 object *tmp; 891 object *tmp;
924 char mapname[MAX_BUF]; 892 char mapname[MAX_BUF];
925 893
926 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name); 894 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
927 tmp = object::create (); 895 tmp = object::create ();
928 EXIT_PATH (tmp) = mapname; 896 EXIT_PATH (tmp) = mapname;
929 EXIT_X (tmp) = ob->x; 897 EXIT_X (tmp) = ob->x;
930 EXIT_Y (tmp) = ob->y; 898 EXIT_Y (tmp) = ob->y;
931 ob->enter_exit (tmp); /* we don't really care if it succeeded; 899 ob->enter_exit (tmp); /* we don't really care if it succeeded;
… …
950 int x = ob->x, y = ob->y; 918 int x = ob->x, y = ob->y;
951 919
952 ob->remove_statbonus (); 920 ob->remove_statbonus ();
953 ob->remove (); 921 ob->remove ();
954 ob->arch = get_player_archetype (ob->arch); 922 ob->arch = get_player_archetype (ob->arch);
955 ob->arch->clone.copy_to (ob); 923 ob->arch->copy_to (ob);
956 ob->instantiate (); 924 ob->instantiate ();
957 ob->stats = ob->contr->orig_stats; 925 ob->stats = ob->contr->orig_stats;
958 ob->name = ob->name_pl = name; 926 ob->name = ob->name_pl = name;
959 ob->x = x; 927 ob->x = x;
960 ob->y = y; 928 ob->y = y;
961 SET_ANIMATION (ob, 2); /* So player faces south */ 929 SET_ANIMATION (ob, 2); /* So player faces south */
962 insert_ob_in_map (ob, ob->map, ob, 0); 930 insert_ob_in_map (ob, ob->map, ob, 0);
963 assign (ob->contr->title, ob->arch->clone.name); 931 assign (ob->contr->title, ob->arch->object::name);
964 ob->add_statbonus (); 932 ob->add_statbonus ();
965 } 933 }
966 while (!allowed_class (ob)); 934 while (!allowed_class (ob));
967 935
968 update_object (ob, UP_OBJ_FACE); 936 update_object (ob, UP_OBJ_FACE);
… …
1043 if (op->move_type & MOVE_FLYING) 1011 if (op->move_type & MOVE_FLYING)
1044 return 1; 1012 return 1;
1045 1013
1046 next = op->below; 1014 next = op->below;
1047 1015
1016 int cnt = MAX_ITEM_PER_DROP;
1017#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1018
1048 /* loop while there are items on the floor that are not marked as 1019 /* loop while there are items on the floor that are not marked as
1049 * destroyed */ 1020 * destroyed */
1050 while (next && !next->destroyed ()) 1021 while (next && !next->destroyed ())
1051 { 1022 {
1052 tmp = next; 1023 tmp = next;
1053 next = tmp->below; 1024 next = tmp->below;
1054 1025
1026 if (cnt <= 0)
1027 {
1028 op->failmsg ("Couldn't pickup all items at once.");
1029 return 0;
1030 }
1031
1055 if (op->destroyed ()) 1032 if (op->destroyed ())
1056 return 0; 1033 return 0;
1057 1034
1058 if (!can_pick (op, tmp)) 1035 if (!can_pick (op, tmp))
1059 continue; 1036 continue;
1060 1037
1061 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1038 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1062 { 1039 {
1063 if (item_matched_string (op, tmp, op->contr->search_str)) 1040 if (item_matched_string (op, tmp, op->contr->search_str))
1064 pick_up (op, tmp); 1041 CHK_PICK_PICKUP;
1065 continue; 1042 continue;
1066 } 1043 }
1067 1044
1068 /* high not bit set? We're using the old autopickup model */ 1045 /* high not bit set? We're using the old autopickup model */
1069 if (!(op->contr->mode & PU_NEWMODE)) 1046 if (!(op->contr->mode & PU_NEWMODE))
… …
1071 switch (op->contr->mode) 1048 switch (op->contr->mode)
1072 { 1049 {
1073 case 0: 1050 case 0:
1074 return 1; /* don't pick up */ 1051 return 1; /* don't pick up */
1075 case 1: 1052 case 1:
1076 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1077 return 1; 1054 return 1;
1078 case 2: 1055 case 2:
1079 pick_up (op, tmp); 1056 CHK_PICK_PICKUP;
1080 return 0; 1057 return 0;
1081 case 3: 1058 case 3:
1082 return 0; /* stop before pickup */ 1059 return 0; /* stop before pickup */
1083 case 4: 1060 case 4:
1084 pick_up (op, tmp); 1061 CHK_PICK_PICKUP;
1085 break; 1062 break;
1086 case 5: 1063 case 5:
1087 pick_up (op, tmp); 1064 CHK_PICK_PICKUP;
1088 stop = 1; 1065 stop = 1;
1089 break; 1066 break;
1090 case 6: 1067 case 6:
1091 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1068 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1092 pick_up (op, tmp); 1069 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1070 CHK_PICK_PICKUP;
1093 break; 1071 break;
1094 1072
1095 case 7: 1073 case 7:
1096 if (tmp->type == MONEY || tmp->type == GEM) 1074 if (tmp->type == MONEY || tmp->type == GEM)
1097 pick_up (op, tmp); 1075 CHK_PICK_PICKUP;
1098 break; 1076 break;
1099 1077
1100 default: 1078 default:
1101 /* use value density */ 1079 /* use value density */
1102 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1080 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1103 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1081 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1104 pick_up (op, tmp); 1082 CHK_PICK_PICKUP;
1105 } 1083 }
1106 } 1084 }
1107 else 1085 else
1108 { /* old model */ 1086 { /* old model */
1109 /* NEW pickup handling */ 1087 /* NEW pickup handling */
… …
1113 if (tmp->name != NULL) 1091 if (tmp->name != NULL)
1114 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1092 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1115 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1093 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1116 else 1094 else
1117 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1095 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1118 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1096 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1119 1097
1120 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1098 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1121 } 1099 }
1122 1100
1123 /* philosophy: 1101 /* philosophy:
… …
1164 /* all food and drink if desired */ 1142 /* all food and drink if desired */
1165 /* question: don't pick up known-poisonous stuff? */ 1143 /* question: don't pick up known-poisonous stuff? */
1166 if (op->contr->mode & PU_FOOD) 1144 if (op->contr->mode & PU_FOOD)
1167 if (tmp->type == FOOD) 1145 if (tmp->type == FOOD)
1168 { 1146 {
1169 pick_up (op, tmp); 1147 CHK_PICK_PICKUP;
1170 continue; 1148 continue;
1171 } 1149 }
1172 1150
1173 if (op->contr->mode & PU_DRINK) 1151 if (op->contr->mode & PU_DRINK)
1174 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1152 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1175 { 1153 {
1176 pick_up (op, tmp); 1154 CHK_PICK_PICKUP;
1177 continue; 1155 continue;
1178 } 1156 }
1179 1157
1180 if (op->contr->mode & PU_POTION) 1158 if (op->contr->mode & PU_POTION)
1181 if (tmp->type == POTION) 1159 if (tmp->type == POTION)
1182 { 1160 {
1183 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1184 continue; 1162 continue;
1185 } 1163 }
1186 1164
1187 /* spellbooks, skillscrolls and normal books/scrolls */ 1165 /* spellbooks, skillscrolls and normal books/scrolls */
1188 if (op->contr->mode & PU_SPELLBOOK) 1166 if (op->contr->mode & PU_SPELLBOOK)
1189 if (tmp->type == SPELLBOOK) 1167 if (tmp->type == SPELLBOOK)
1190 { 1168 {
1191 pick_up (op, tmp); 1169 CHK_PICK_PICKUP;
1192 continue; 1170 continue;
1193 } 1171 }
1194 1172
1195 if (op->contr->mode & PU_SKILLSCROLL) 1173 if (op->contr->mode & PU_SKILLSCROLL)
1196 if (tmp->type == SKILLSCROLL) 1174 if (tmp->type == SKILLSCROLL)
1197 { 1175 {
1198 pick_up (op, tmp); 1176 CHK_PICK_PICKUP;
1199 continue; 1177 continue;
1200 } 1178 }
1201 1179
1202 if (op->contr->mode & PU_READABLES) 1180 if (op->contr->mode & PU_READABLES)
1203 if (tmp->type == BOOK || tmp->type == SCROLL) 1181 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1204 { 1182 {
1205 pick_up (op, tmp); 1183 CHK_PICK_PICKUP;
1206 continue; 1184 continue;
1207 } 1185 }
1208 1186
1209 /* wands/staves/rods/horns */ 1187 /* wands/staves/rods/horns */
1210 if (op->contr->mode & PU_MAGIC_DEVICE) 1188 if (op->contr->mode & PU_MAGIC_DEVICE)
1211 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1189 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1212 { 1190 {
1213 pick_up (op, tmp); 1191 CHK_PICK_PICKUP;
1214 continue; 1192 continue;
1215 } 1193 }
1216 1194
1217 /* pick up all magical items */ 1195 /* pick up all magical items */
1218 if (op->contr->mode & PU_MAGICAL) 1196 if (op->contr->mode & PU_MAGICAL)
1219 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1197 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1220 { 1198 {
1221 pick_up (op, tmp); 1199 CHK_PICK_PICKUP;
1222 continue; 1200 continue;
1223 } 1201 }
1224 1202
1225 if (op->contr->mode & PU_VALUABLES) 1203 if (op->contr->mode & PU_VALUABLES)
1226 { 1204 {
1227 if (tmp->type == MONEY || tmp->type == GEM) 1205 if (tmp->type == MONEY || tmp->type == GEM)
1228 { 1206 {
1229 pick_up (op, tmp); 1207 CHK_PICK_PICKUP;
1230 continue; 1208 continue;
1231 } 1209 }
1232 } 1210 }
1233 1211
1234 /* rings & amulets - talismans seems to be typed AMULET */ 1212 /* rings & amulets - talismans seems to be typed AMULET */
1235 if (op->contr->mode & PU_JEWELS) 1213 if (op->contr->mode & PU_JEWELS)
1236 if (tmp->type == RING || tmp->type == AMULET) 1214 if (tmp->type == RING || tmp->type == AMULET)
1237 { 1215 {
1238 pick_up (op, tmp); 1216 CHK_PICK_PICKUP;
1239 continue; 1217 continue;
1240 } 1218 }
1241 1219
1242 /* we don't forget dragon food */ 1220 /* we don't forget dragon food */
1243 if (op->contr->mode & PU_FLESH) 1221 if (op->contr->mode & PU_FLESH)
1244 if (tmp->type == FLESH) 1222 if (tmp->type == FLESH)
1245 { 1223 {
1246 pick_up (op, tmp); 1224 CHK_PICK_PICKUP;
1247 continue; 1225 continue;
1248 } 1226 }
1249 1227
1250 /* bows and arrows. Bows are good for selling! */ 1228 /* bows and arrows. Bows are good for selling! */
1251 if (op->contr->mode & PU_BOW) 1229 if (op->contr->mode & PU_BOW)
1252 if (tmp->type == BOW) 1230 if (tmp->type == BOW)
1253 { 1231 {
1254 pick_up (op, tmp); 1232 CHK_PICK_PICKUP;
1255 continue; 1233 continue;
1256 } 1234 }
1257 1235
1258 if (op->contr->mode & PU_ARROW) 1236 if (op->contr->mode & PU_ARROW)
1259 if (tmp->type == ARROW) 1237 if (tmp->type == ARROW)
1260 { 1238 {
1261 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1262 continue; 1240 continue;
1263 } 1241 }
1264 1242
1265 /* all kinds of armor etc. */ 1243 /* all kinds of armor etc. */
1266 if (op->contr->mode & PU_ARMOUR) 1244 if (op->contr->mode & PU_ARMOUR)
1267 if (tmp->type == ARMOUR) 1245 if (tmp->type == ARMOUR)
1268 { 1246 {
1269 pick_up (op, tmp); 1247 CHK_PICK_PICKUP;
1270 continue; 1248 continue;
1271 } 1249 }
1272 1250
1273 if (op->contr->mode & PU_HELMET) 1251 if (op->contr->mode & PU_HELMET)
1274 if (tmp->type == HELMET) 1252 if (tmp->type == HELMET)
1275 { 1253 {
1276 pick_up (op, tmp); 1254 CHK_PICK_PICKUP;
1277 continue; 1255 continue;
1278 } 1256 }
1279 1257
1280 if (op->contr->mode & PU_SHIELD) 1258 if (op->contr->mode & PU_SHIELD)
1281 if (tmp->type == SHIELD) 1259 if (tmp->type == SHIELD)
1282 { 1260 {
1283 pick_up (op, tmp); 1261 CHK_PICK_PICKUP;
1284 continue; 1262 continue;
1285 } 1263 }
1286 1264
1287 if (op->contr->mode & PU_BOOTS) 1265 if (op->contr->mode & PU_BOOTS)
1288 if (tmp->type == BOOTS) 1266 if (tmp->type == BOOTS)
1289 { 1267 {
1290 pick_up (op, tmp); 1268 CHK_PICK_PICKUP;
1291 continue; 1269 continue;
1292 } 1270 }
1293 1271
1294 if (op->contr->mode & PU_GLOVES) 1272 if (op->contr->mode & PU_GLOVES)
1295 if (tmp->type == GLOVES) 1273 if (tmp->type == GLOVES)
1296 { 1274 {
1297 pick_up (op, tmp); 1275 CHK_PICK_PICKUP;
1298 continue; 1276 continue;
1299 } 1277 }
1300 1278
1301 if (op->contr->mode & PU_CLOAK) 1279 if (op->contr->mode & PU_CLOAK)
1302 if (tmp->type == CLOAK) 1280 if (tmp->type == CLOAK)
1303 { 1281 {
1304 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1305 continue; 1283 continue;
1306 } 1284 }
1307 1285
1308 /* hoping to catch throwing daggers here */ 1286 /* hoping to catch throwing daggers here */
1309 if (op->contr->mode & PU_MISSILEWEAPON) 1287 if (op->contr->mode & PU_MISSILEWEAPON)
1310 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1288 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1311 { 1289 {
1312 pick_up (op, tmp); 1290 CHK_PICK_PICKUP;
1313 continue; 1291 continue;
1314 } 1292 }
1315 1293
1316 /* careful: chairs and tables are weapons! */ 1294 /* careful: chairs and tables are weapons! */
1317 if (op->contr->mode & PU_ALLWEAPON) 1295 if (op->contr->mode & PU_ALLWEAPON)
1318 { 1296 {
1319 if (tmp->type == WEAPON && tmp->name != NULL) 1297 if (tmp->type == WEAPON && tmp->name != NULL)
1320 { 1298 {
1321 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1299 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1322 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1300 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1323 { 1301 {
1324 pick_up (op, tmp); 1302 CHK_PICK_PICKUP;
1325 continue; 1303 continue;
1326 } 1304 }
1327 } 1305 }
1328 1306
1329 if (tmp->type == WEAPON && tmp->name == NULL) 1307 if (tmp->type == WEAPON && tmp->name == NULL)
1330 { 1308 {
1331 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1309 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1332 { 1310 {
1333 pick_up (op, tmp); 1311 CHK_PICK_PICKUP;
1334 continue; 1312 continue;
1335 } 1313 }
1336 } 1314 }
1337 } 1315 }
1338 1316
1339 /* misc stuff that's useful */ 1317 /* misc stuff that's useful */
1340 if (op->contr->mode & PU_KEY) 1318 if (op->contr->mode & PU_KEY)
1341 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1319 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1342 { 1320 {
1343 pick_up (op, tmp); 1321 CHK_PICK_PICKUP;
1344 continue; 1322 continue;
1345 } 1323 }
1346 1324
1347 /* any of the last 4 bits set means we use the ratio for value 1325 /* any of the last 4 bits set means we use the ratio for value
1348 * pickups */ 1326 * pickups */
… …
1353 /* >=7 is the old standard setting. Now we take the last 4 bits 1331 /* >=7 is the old standard setting. Now we take the last 4 bits
1354 * and multiply them by 5, giving 0..15*5== 5..75 */ 1332 * and multiply them by 5, giving 0..15*5== 5..75 */
1355 wvratio = (op->contr->mode & PU_RATIO) * 5; 1333 wvratio = (op->contr->mode & PU_RATIO) * 5;
1356 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1334 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1357 { 1335 {
1358 pick_up (op, tmp); 1336 CHK_PICK_PICKUP;
1359#if 0 1337#if 0
1360 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1338 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1361 if (tmp->name != NULL) 1339 if (tmp->name != NULL)
1362 { 1340 {
1363 fprintf (stderr, "%s", tmp->name); 1341 fprintf (stderr, "%s", tmp->name);
1364 } 1342 }
1365 else 1343 else
1366 fprintf (stderr, "%s", tmp->arch->name); 1344 fprintf (stderr, "%s", tmp->arch->archname);
1367 fprintf (stderr, ",%d] = ", tmp->type); 1345 fprintf (stderr, ",%d] = ", tmp->type);
1368 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1346 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1369#endif 1347#endif
1370 continue; 1348 continue;
1371 } 1349 }
… …
1382 * found object is returned. 1360 * found object is returned.
1383 */ 1361 */
1384object * 1362object *
1385find_arrow (object *op, const char *type) 1363find_arrow (object *op, const char *type)
1386{ 1364{
1387 object *tmp = 0;
1388
1389 for (op = op->inv; op; op = op->below) 1365 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1390 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1391 tmp = find_arrow (op, type);
1392 else if (op->type == ARROW && op->race == type) 1366 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1367 return splay (tmp);
1368
1369 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1370 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1371 if (object *arrow = find_arrow (tmp, type))
1372 {
1373 splay (tmp);
1393 return op; 1374 return arrow;
1375 }
1394 1376
1395 return tmp; 1377 return 0;
1396} 1378}
1397 1379
1398/* 1380/*
1399 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1381 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1400 * against the target. A full test is not performed, simply a basic test 1382 * against the target. A full test is not performed, simply a basic test
… …
1423 } 1405 }
1424 } 1406 }
1425 else if (arrow->type == ARROW && arrow->race == type) 1407 else if (arrow->type == ARROW && arrow->race == type)
1426 { 1408 {
1427 /* allways prefer assasination/slaying */ 1409 /* allways prefer assasination/slaying */
1428 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1410 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1429 { 1411 {
1430 if (arrow->attacktype & AT_DEATH) 1412 if (arrow->attacktype & AT_DEATH)
1431 { 1413 {
1432 *better = 100; 1414 *better = 100;
1433 return arrow; 1415 return arrow;
… …
1441 else 1423 else
1442 { 1424 {
1443 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1425 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1444 { 1426 {
1445 attacktype = 1 << attacknum; 1427 attacktype = 1 << attacknum;
1446 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1428 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1447 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1429 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1448 { 1430 {
1449 tmp = arrow; 1431 tmp = arrow;
1450 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1432 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1451 } 1433 }
1452 } 1434 }
1453 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1435 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1454 { 1436 {
1455 tmp = arrow; 1437 tmp = arrow;
… …
1548 */ 1530 */
1549int 1531int
1550fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1532fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1551{ 1533{
1552 object *left, *bow; 1534 object *left, *bow;
1553 int bowspeed, mflags; 1535 int mflags;
1554 maptile *m; 1536 maptile *m;
1555 1537
1556 if (!dir) 1538 if (!dir)
1557 { 1539 {
1558 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1540 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1559 return 0; 1541 return 0;
1560 } 1542 }
1561 1543
1562 if (player *pl = op->contr) 1544 if (op->contr)
1563 { 1545 bow = op->current_weapon;
1564 bow = pl->ranged_ob;
1565 op->set_weapon (bow);
1566 }
1567 else 1546 else
1568 { 1547 {
1569 for (bow = op->inv; bow; bow = bow->below) 1548 for (bow = op->inv; bow; bow = bow->below)
1570 /* Don't check for applied - monsters don't apply bows - in that way, they 1549 /* Don't check for applied - monsters don't apply bows - in that way, they
1571 * don't need to switch back and forth between bows and weapons. 1550 * don't need to switch back and forth between bows and weapons.
… …
1592 { 1571 {
1593 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1572 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1594 return 0; 1573 return 0;
1595 } 1574 }
1596 1575
1597 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1598
1599 /* penalize ROF for bestarrow */
1600 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1601 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1602
1603 if (bowspeed < 1)
1604 bowspeed = 1;
1605
1606 if (arrow == NULL) 1576 if (arrow == NULL)
1607 { 1577 {
1608 if ((arrow = find_arrow (op, bow->race)) == NULL) 1578 if ((arrow = find_arrow (op, bow->race)) == NULL)
1609 { 1579 {
1610 if (op->type == PLAYER) 1580 if (op->type == PLAYER)
… …
1633 arrow->destroy (); 1603 arrow->destroy ();
1634 return 0; 1604 return 0;
1635 } 1605 }
1636 1606
1637 left = arrow; /* these are arrows left to the player */ 1607 left = arrow; /* these are arrows left to the player */
1638 arrow = get_split_ob (arrow, 1); 1608 arrow = arrow->split ();
1639 if (!arrow) 1609 if (!arrow)
1640 { 1610 {
1641 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1611 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1642 return 0; 1612 return 0;
1643 } 1613 }
1644 1614
1645 arrow->set_owner (op); 1615 arrow->set_owner (op);
1646 arrow->skill = bow->skill; 1616 arrow->skill = bow->skill;
1647 arrow->direction = dir; 1617 arrow->direction = dir;
1648 1618
1649 if (op->type == PLAYER)
1650 {
1651 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1652 op->update_stats ();
1653 }
1654
1655 SET_ANIMATION (arrow, arrow->direction);
1656
1657 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1619 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1658 arrow->stats.hp = arrow->stats.dam; 1620 arrow->stats.hp = arrow->stats.dam;
1659 arrow->stats.grace = arrow->attacktype; 1621 arrow->stats.grace = arrow->attacktype;
1660 1622
1661 if (arrow->slaying) 1623 if (arrow->slaying)
1662 arrow->spellarg = strdup (arrow->slaying); 1624 arrow->spellarg = strdup (arrow->slaying);
1663 1625
1664 arrow->stats.dam += op->stats.dam + arrow->magic; 1626#if 0
1627 if (player *pl = op->contr)
1628 {
1629 float speed = pl->weapon_sp;
1630
1631 /* penalize ROF for bestarrow */
1632 if (pl->bowtype == bow_bestarrow)
1633 speed *= .9f;
1634 else
1635 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1636
1637 op->speed_left += speed - op->speed;
1638 }
1639#endif
1640
1641 SET_ANIMATION (arrow, arrow->direction);
1665 1642
1666 /* update the speed */ 1643 /* update the speed */
1667 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1644 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1668 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1645 + bow->stats.dam / 7.f;
1669 1646
1670 arrow->set_speed (max (arrow->speed, 1.0)); 1647 arrow->set_speed (max (arrow->speed, 2.f));
1671 arrow->speed_left = 0; 1648 arrow->speed_left = 0;
1672 1649
1673 arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1650 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1674 1651
1675 if (op->type == PLAYER) 1652 if (op->type == PLAYER)
1676 { 1653 {
1677 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1654 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1678 arrow->stats.wc -= dex_bonus[op->stats.Dex]; 1655 wc -= dex_bonus[op->stats.Dex];
1679 1656
1680 if (!arrow->slaying) 1657 if (!arrow->slaying)
1681 arrow->slaying = op->slaying; 1658 arrow->slaying = op->slaying;
1659
1660 arrow->attacktype |= op->attacktype;
1682 } 1661 }
1683 else 1662 else
1684 { 1663 {
1685 arrow->level = op->level; 1664 arrow->level = op->level;
1686 arrow->stats.wc -= bow->magic; 1665 arrow->stats.wc -= bow->magic;
1687 1666
1688 if (!arrow->slaying) 1667 if (!arrow->slaying)
1689 arrow->slaying = bow->slaying; 1668 arrow->slaying = bow->slaying;
1690 }
1691 1669
1692 arrow->stats.wc -= arrow->level;
1693
1694 arrow->attacktype |= bow->attacktype; 1670 arrow->attacktype |= bow->attacktype;
1671 }
1695 1672
1673 wc -= arrow->level;
1674 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1675
1676 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1696 arrow->move_type = MOVE_FLY_LOW; 1677 arrow->move_type = MOVE_FLY_LOW;
1697 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1678 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1698 1679
1699 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1680 op->play_sound (sound_find ("fire_arrow"));
1700 m->insert (arrow, sx, sy, op); 1681 m->insert (arrow, sx, sy, op);
1701 1682
1702 if (!arrow->destroyed ()) 1683 if (!arrow->destroyed ())
1703 move_arrow (arrow); 1684 move_arrow (arrow);
1704
1705 if (op->type == PLAYER)
1706 {
1707 if (left->destroyed ())
1708 esrv_del_item (op->contr, left->count);
1709 else
1710 esrv_send_item (op, left);
1711 }
1712 1685
1713 return 1; 1686 return 1;
1714} 1687}
1715 1688
1716/* Special fire code for players - this takes into 1689/* Special fire code for players - this takes into
… …
1755 } 1728 }
1756 1729
1757 return ret; 1730 return ret;
1758} 1731}
1759 1732
1760
1761/* Fires a misc (wand/rod/horn) object in 'dir'. 1733/* Fires a misc (wand/rod/horn) object in 'dir'.
1762 * Broken apart from 'fire' to keep it more readable. 1734 * Broken apart from 'fire' to keep it more readable.
1763 */ 1735 */
1764void 1736void
1765fire_misc_object (object *op, int dir) 1737fire_misc_object (object *op, int dir)
… …
1776 { 1748 {
1777 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1749 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1778 return; 1750 return;
1779 } 1751 }
1780 1752
1781 op->set_weapon (item); 1753 if (!op->change_weapon (item))
1754 return;
1782 1755
1783 if (item->type == WAND) 1756 if (item->type == WAND)
1784 { 1757 {
1785 if (item->stats.food <= 0) 1758 if (item->stats.food <= 0)
1786 { 1759 {
1787 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1760 op->contr->play_sound (sound_find ("wand_poof"));
1788 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1761 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1789 1762
1790 return; 1763 return;
1791 } 1764 }
1792 } 1765 }
1793 else if (item->type == ROD || item->type == HORN) 1766 else if (item->type == ROD || item->type == HORN)
1794 { 1767 {
1795 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1768 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1769
1770 // using the maximum of the rods charge allows at least one spell cast
1771 // for a rod or horn, this fixes some broken rods.
1772 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1796 { 1773 {
1797 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1774 op->contr->play_sound (sound_find ("wand_poof"));
1798 1775
1799 if (item->type == ROD) 1776 if (item->type == ROD)
1800 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1801 else 1778 else
1802 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1779 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1815 object *tmp; 1792 object *tmp;
1816 1793
1817 if (item->arch) 1794 if (item->arch)
1818 { 1795 {
1819 CLEAR_FLAG (item, FLAG_ANIMATE); 1796 CLEAR_FLAG (item, FLAG_ANIMATE);
1820 item->face = item->arch->clone.face; 1797 item->face = item->arch->face;
1821 item->set_speed (0); 1798 item->set_speed (0);
1822 } 1799 }
1823 1800
1824 if ((tmp = item->in_player ())) 1801 if (object *pl = item->visible_to ())
1825 esrv_update_item (UPD_ANIM, tmp, item); 1802 esrv_update_item (UPD_ANIM, pl, item);
1826 } 1803 }
1827 } 1804 }
1828 else if (item->type == ROD || item->type == HORN) 1805 else if (item->type == ROD || item->type == HORN)
1829 drain_rod_charge (item); 1806 drain_rod_charge (item);
1830 } 1807 }
1831} 1808}
1832 1809
1833/* Received a fire command for the player - go and do it. 1810/* Received a fire command for the player - go and do it.
1834 */ 1811 */
1835void 1812bool
1836fire (object *op, int dir) 1813fire (object *op, int dir)
1837{ 1814{
1838 int spellcost = 0; 1815 int spellcost = 0;
1839 1816
1840 /* check for loss of invisiblity/hide */ 1817 /* check for loss of invisiblity/hide */
… …
1844 player *pl = op->contr; 1821 player *pl = op->contr;
1845 1822
1846 if (pl->golem) 1823 if (pl->golem)
1847 { 1824 {
1848 control_golem (op->contr->golem, dir); 1825 control_golem (op->contr->golem, dir);
1849 return; 1826 return false;
1850 } 1827 }
1851 1828
1852 object *ob = pl->ranged_ob; 1829 object *ob = pl->ranged_ob;
1853 1830
1854 if (!ob) 1831 if (!ob)
1855 return; 1832 return false;
1833
1834 if (!op->change_weapon (ob))
1835 return false;
1836
1837 if (op->speed_left > 0.f)
1838 --op->speed_left;
1839 else
1840 return false;
1856 1841
1857 switch (ob->type) 1842 switch (ob->type)
1858 { 1843 {
1859 case BOW: 1844 case BOW:
1860 player_fire_bow (op, dir); 1845 player_fire_bow (op, dir);
… …
1867 case BUILDER: 1852 case BUILDER:
1868 apply_map_builder (op, dir); 1853 apply_map_builder (op, dir);
1869 break; 1854 break;
1870 1855
1871 case SKILL: 1856 case SKILL:
1872 case SKILL_TOOL:
1873 do_skill (op, op, ob, dir, 0); 1857 do_skill (op, op, ob, dir, 0);
1874 break; 1858 break;
1875 1859
1876 default: 1860 default:
1877 fire_misc_object (op, dir); 1861 fire_misc_object (op, dir);
1878 break; 1862 break;
1879 } 1863 }
1864
1865 return true;
1880} 1866}
1881 1867
1882/* find_key 1868/* find_key
1883 * We try to find a key for the door as passed. If we find a key 1869 * We try to find a key for the door as passed. If we find a key
1884 * and successfully use it, we return the key, otherwise NULL 1870 * and successfully use it, we return the key, otherwise NULL
… …
1971 * 0 otherwise 1957 * 0 otherwise
1972 */ 1958 */
1973static int 1959static int
1974player_attack_door (object *op, object *door) 1960player_attack_door (object *op, object *door)
1975{ 1961{
1976 /* If its a door, try to find a use a key. If we do destroy the door, 1962 /* If its a door, try to find a key. If we do destroy the door,
1977 * might as well return immediately as there is nothing more to do - 1963 * might as well return immediately as there is nothing more to do -
1978 * otherwise, we fall through to the rest of the code. 1964 * otherwise, we fall through to the rest of the code.
1979 */ 1965 */
1980 object *key = find_key (op, op, door); 1966 object *key = find_key (op, op, door);
1981 1967
1982 /* IF we found a key, do some extra work */ 1968 /* If we found a key, do some extra work */
1983 if (key) 1969 if (key)
1984 { 1970 {
1985 object *container = key->env; 1971 object *container = key->env;
1986
1987 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1988 1972
1989 if (action_makes_visible (op)) 1973 if (action_makes_visible (op))
1990 make_visible (op); 1974 make_visible (op);
1991 1975
1992 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1976 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
… …
1994 1978
1995 if (door->type == DOOR) 1979 if (door->type == DOOR)
1996 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1980 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1997 else if (door->type == LOCKED_DOOR) 1981 else if (door->type == LOCKED_DOOR)
1998 { 1982 {
1999 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1983 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2000 remove_door2 (door); /* remove door without violence ;-) */ 1984 remove_door2 (door); /* remove door without violence ;-) */
2001 } 1985 }
2002 1986
2003 /* Do this after we print the message */ 1987 /* Do this after we print the message */
2004 decrease_ob (key); /* Use up one of the keys */ 1988 key->decrease (); /* Use up one of the keys */
2005 /* Need to update the weight the container the key was in */
2006 if (container != op)
2007 esrv_update_item (UPD_WEIGHT, op, container);
2008 1989
2009 return 1; /* Nothing more to do below */ 1990 return 1; /* Nothing more to do below */
2010 } 1991 }
2011 else if (door->type == LOCKED_DOOR) 1992 else if (door->type == LOCKED_DOOR)
2012 { 1993 {
2013 /* Might as well return now - no other way to open this */ 1994 /* Might as well return now - no other way to open this */
2014 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1995 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2015 return 1; 1996 return 1;
2016 } 1997 }
2017 1998
2018 return 0; 1999 return 0;
2019} 2000}
… …
2022 * It should keep the code cleaner. 2003 * It should keep the code cleaner.
2023 * When this is called, the players direction has been updated 2004 * When this is called, the players direction has been updated
2024 * (taking into account confusion.) The player is also actually 2005 * (taking into account confusion.) The player is also actually
2025 * going to try and move (not fire weapons). 2006 * going to try and move (not fire weapons).
2026 */ 2007 */
2027void 2008bool
2028move_player_attack (object *op, int dir) 2009move_player_attack (object *op, int dir)
2029{ 2010{
2030 object *tmp, *mon;
2031 int on_battleground; 2011 int on_battleground;
2032 maptile *m;
2033 2012
2034 sint16 nx = freearr_x[dir] + op->x; 2013 sint16 nx = freearr_x[dir] + op->x;
2035 sint16 ny = freearr_y[dir] + op->y; 2014 sint16 ny = freearr_y[dir] + op->y;
2036 2015
2037 on_battleground = op_on_battleground (op, 0, 0); 2016 on_battleground = op_on_battleground (op, 0, 0);
2017
2018 if (out_of_map (op->map, nx, ny))
2019 return false;
2020
2021 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2022 {
2023 --op->speed_left;
2024 return true;
2025 }
2038 2026
2039 /* If braced, or can't move to the square, and it is not out of the 2027 /* If braced, or can't move to the square, and it is not out of the
2040 * map, attack it. Note order of if statement is important - don't 2028 * map, attack it. Note order of if statement is important - don't
2041 * want to be calling move_ob if braced, because move_ob will move the 2029 * want to be calling move_ob if braced, because move_ob will move the
2042 * player. This is a pretty nasty hack, because if we could 2030 * player. This is a pretty nasty hack, because if we could
2043 * move to some space, it then means that if we are braced, we should 2031 * move to some space, it then means that if we are braced, we should
2044 * do nothing at all. As it is, if we are braced, we go through 2032 * do nothing at all. As it is, if we are braced, we go through
2045 * quite a bit of processing. However, it probably is less than what 2033 * quite a bit of processing. However, it probably is less than what
2046 * move_ob uses. 2034 * move_ob uses.
2047 */ 2035 */
2048 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2049 {
2050 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2051 {
2052 m = op->map->xy_find (nx, ny); 2036 maptile *m = op->map->xy_find (nx, ny);
2053 if (!m)
2054 return; /* Don't think this should happen */
2055 }
2056 else
2057 m = op->map;
2058 2037
2059 if (!(tmp = m->at (nx, ny).bot))
2060 return;
2061
2062 mon = 0;
2063 /* Go through all the objects, and find ones of interest. Only stop if 2038 /* Go through all the objects, and find ones of interest. Only stop if
2064 * we find a monster - that is something we know we want to attack. 2039 * we find a monster - that is something we know we want to attack.
2065 * if its a door or barrel (can roll) see if there may be monsters 2040 * if its a door or barrel (can roll) see if there may be monsters
2066 * on the space 2041 * on the space
2067 */ 2042 */
2068 while (tmp) 2043 object *mon;
2069 { 2044 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2070 if (tmp == op) 2045 {
2071 { 2046 if ((mon->flag [FLAG_ALIVE]
2072 tmp = tmp->above; 2047 || mon->type == LOCKED_DOOR
2073 continue; 2048 || mon->flag [FLAG_CAN_ROLL])
2074 }
2075
2076 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2077 {
2078 mon = tmp; 2049 && mon != op)
2079 break; 2050 break;
2080 } 2051 }
2081 2052
2082 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2083 mon = tmp;
2084
2085 tmp = tmp->above;
2086 }
2087
2088 if (!mon) /* This happens anytime the player tries to move */ 2053 if (!mon) /* This happens anytime the player tries to move */
2089 return; /* into a wall */ 2054 return false; /* into a wall */
2090 2055
2091 if (mon->head)
2092 mon = mon->head; 2056 mon = mon->head_ ();
2093 2057
2094 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2058 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2059 if (op->contr->weapon_sp_left > 0.f)
2095 if (player_attack_door (op, mon)) 2060 if (player_attack_door (op, mon))
2061 {
2062 --op->contr->weapon_sp_left;
2096 return; 2063 return true;
2064 }
2097 2065
2098 /* The following deals with possibly attacking peaceful 2066 /* The following deals with possibly attacking peaceful
2099 * or frienddly creatures. Basically, all players are considered 2067 * or friendly creatures. Basically, all players are considered
2100 * unaggressive. If the moving player has peaceful set, then the 2068 * unaggressive. If the moving player has peaceful set, then the
2101 * object should be pushed instead of attacked. It is assumed that 2069 * object should be pushed instead of attacked. It is assumed that
2102 * if you are braced, you will not attack friends accidently, 2070 * if you are braced, you will not attack friends accidently,
2103 * and thus will not push them. 2071 * and thus will not push them.
2104 */ 2072 */
2105 2073
2106 /* If the creature is a pet, push it even if the player is not 2074 /* If the creature is a pet, push it even if the player is not
2107 * peaceful. Our assumption is the creature is a pet if the 2075 * peaceful. Our assumption is the creature is a pet if the
2108 * player owns it and it is either friendly or unagressive. 2076 * player owns it and it is either friendly or unagressive.
2109 */ 2077 */
2110 if ((op->type == PLAYER) 2078 if (op->type == PLAYER
2111#if COZY_SERVER
2112 &&
2113 ((mon->owner && mon->owner->contr 2079 && ((mon->owner && mon->owner->contr
2114 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2080 && same_party (mon->owner->contr->party, op->contr->party))
2115#else
2116 && mon->owner == op 2081 || mon->owner == op)
2117#endif
2118 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2082 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2119 { 2083 {
2120 /* If we're braced, we don't want to switch places with it */ 2084 /* If we're braced, we don't want to switch places with it */
2121 if (op->contr->braced) 2085 if (op->contr->braced)
2122 return; 2086 return false;
2123 2087
2124 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2088 if (op->speed_left > 0.f)
2089 {
2090 --op->speed_left;
2091
2092 op->play_sound (sound_find ("push_player"));
2125 push_ob (mon, dir, op); 2093 push_ob (mon, dir, op);
2094
2126 if (op->contr->tmp_invis || op->hide) 2095 if (op->contr->tmp_invis || op->hide)
2127 make_visible (op); 2096 make_visible (op);
2128 2097
2129 return; 2098 return true;
2130 } 2099 }
2100 else
2101 return false;
2102 }
2131 2103
2132 /* in certain circumstances, you shouldn't attack friendly 2104 /* in certain circumstances, you shouldn't attack friendly
2133 * creatures. Note that if you are braced, you can't push 2105 * creatures. Note that if you are braced, you can't push
2134 * someone, but put it inside this loop so that you won't 2106 * someone, but put it inside this loop so that you won't
2135 * attack them either. 2107 * attack them either.
2136 */ 2108 */
2137 if ((mon->type == PLAYER || mon->enemy != op) && 2109 if ((mon->type == PLAYER || mon->enemy != op)
2138 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2110 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2139#ifdef PROHIBIT_PLAYERKILL
2140 (op->contr->peaceful 2111 && ((op->contr->peaceful
2141 || (mon->type == PLAYER 2112 || (mon->type == PLAYER && mon->contr->peaceful))
2142 && mon->contr->
2143 peaceful)) &&
2144#else
2145 op->contr->peaceful &&
2146#endif
2147 !on_battleground)) 2113 && !on_battleground))
2114 {
2115 if (op->speed_left > 0.f)
2148 { 2116 {
2117 --op->speed_left;
2118
2149 if (!op->contr->braced) 2119 if (!op->contr->braced)
2150 { 2120 {
2151 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2121 op->play_sound (sound_find ("push_player"));
2152 push_ob (mon, dir, op); 2122 push_ob (mon, dir, op);
2153 } 2123 }
2154 else 2124 else
2155 new_draw_info (0, 0, op, "You withhold your attack"); 2125 op->statusmsg ("You withhold your attack");
2156 2126
2157 if (op->contr->tmp_invis || op->hide) 2127 if (op->contr->tmp_invis || op->hide)
2158 make_visible (op); 2128 make_visible (op);
2159 }
2160 2129
2130 return true;
2131 }
2132 }
2161 /* If the object is a boulder or other rollable object, then 2133 /* If the object is a boulder or other rollable object, then
2162 * roll it if not braced. You can't roll it if you are braced. 2134 * roll it if not braced. You can't roll it if you are braced.
2163 */ 2135 */
2164 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2136 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2137 {
2138 if (op->speed_left > 0.f)
2165 { 2139 {
2140 --op->speed_left;
2141
2166 recursive_roll (mon, dir, op); 2142 recursive_roll (mon, dir, op);
2167 if (action_makes_visible (op)) 2143 if (action_makes_visible (op))
2168 make_visible (op); 2144 make_visible (op);
2169 }
2170 2145
2146 return true;
2147 }
2148 }
2171 /* Any generic living creature. Including things like doors. 2149 /* Any generic living creature. Including things like doors.
2172 * Way it works is like this: First, it must have some hit points 2150 * Way it works is like this: First, it must have some hit points
2173 * and be living. Then, it must be one of the following: 2151 * and be living. Then, it must be one of the following:
2174 * 1) Not a player, 2) A player, but of a different party. Note 2152 * 1) Not a player, 2) A player, but of a different party. Note
2175 * that party_number -1 is no party, so attacks can still happen. 2153 * that party_number -1 is no party, so attacks can still happen.
2176 */ 2154 */
2177 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2155 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2178 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2156 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2179 { 2157 {
2180 2158 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2181 /* If the player hasn't hit something this tick, and does
2182 * so, give them speed boost based on weapon speed. Doing
2183 * it here is better than process_players2, which basically
2184 * incurred a 1 tick offset.
2185 */
2186 if (!op->contr->has_hit)
2187 { 2159 {
2188 op->speed_left += op->speed / op->contr->weapon_sp; 2160 --op->contr->weapon_sp_left;
2189
2190 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2191 }
2192 2161
2193 skill_attack (mon, op, 0, 0, 0); 2162 skill_attack (mon, op, 0, 0, 0);
2194
2195 /* If attacking another player, that player gets automatic
2196 * hitback, and doesn't loose luck either.
2197 * Disable hitback on the battleground or if the target is
2198 * the wiz.
2199 */
2200 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2201 {
2202 short luck = mon->stats.luck;
2203
2204 mon->contr->has_hit = 1;
2205 skill_attack (op, mon, 0, 0, 0);
2206 mon->stats.luck = luck;
2207 }
2208 2163
2209 if (action_makes_visible (op)) 2164 if (action_makes_visible (op))
2210 make_visible (op); 2165 make_visible (op);
2211 }
2212 } /* if player should attack something */
2213}
2214 2166
2215int 2167 return true;
2168 }
2169 }
2170
2171 return false;
2172}
2173
2174bool
2216move_player (object *op, int dir) 2175move_player (object *op, int dir)
2217{ 2176{
2218 int pick; 2177 int pick;
2219 2178
2220 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2179 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2221 return 0; 2180 return 0;
2222 2181
2223 /* Sanity check: make sure dir is valid */ 2182 /* Sanity check: make sure dir is valid */
2224 if ((dir < 0) || (dir >= 9)) 2183 if ((dir < 0) || (dir >= 9))
2225 { 2184 {
… …
2234 op->facing = dir; 2193 op->facing = dir;
2235 2194
2236 if (op->hide) 2195 if (op->hide)
2237 do_hidden_move (op); 2196 do_hidden_move (op);
2238 2197
2198 bool retval;
2199
2239 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2200 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2240 /*nop */ ; 2201 retval = RESULT_INT (0);
2241 else if (op->contr->fire_on) 2202 else if (op->contr->fire_on)
2242 fire (op, dir); 2203 retval = fire (op, dir);
2243 else 2204 else
2244 { 2205 {
2245 move_player_attack (op, dir); 2206 retval = move_player_attack (op, dir);
2246 pick = check_pick (op); 2207 pick = check_pick (op);
2247 } 2208 }
2248 2209
2249 /* Add special check for newcs players and fire on - this way, the 2210 /* Add special check for newcs players and fire on - this way, the
2250 * server can handle repeat firing. 2211 * server can handle repeat firing.
… …
2257 /* Update how the player looks. Use the facing, so direction may 2218 /* Update how the player looks. Use the facing, so direction may
2258 * get reset to zero. This allows for full animation capabilities 2219 * get reset to zero. This allows for full animation capabilities
2259 * for players. 2220 * for players.
2260 */ 2221 */
2261 animate_object (op, op->facing); 2222 animate_object (op, op->facing);
2262 return 0; 2223
2224 return retval;
2263} 2225}
2264 2226
2265/* This is similar to handle_player, below, but is only used by the 2227/* This is similar to handle_player, below, but is only used by the
2266 * new client/server stuff. 2228 * new client/server stuff.
2267 * This is sort of special, in that the new client/server actually uses 2229 * This is sort of special, in that the new client/server actually uses
2268 * the new speed values for commands. 2230 * the new speed values for commands.
2269 * 2231 *
2270 * Returns true if there are more actions we can do. 2232 * Returns true if there are more actions we can do. Should not do
2233 * many actions in a row, as that would be too unfair to other
2234 * players.
2271 */ 2235 */
2272int 2236bool
2273handle_newcs_player (object *op) 2237handle_newcs_player (object *op)
2274{ 2238{
2275 if (QUERY_FLAG (op, FLAG_SCARED)) 2239 if (QUERY_FLAG (op, FLAG_SCARED))
2276 { 2240 {
2277 flee_player (op); 2241 if (op->speed_left > 0.f)
2278 /* If player is still scared, that is his action for this tick */
2279 if (QUERY_FLAG (op, FLAG_SCARED))
2280 { 2242 {
2281 op->speed_left--; 2243 --op->speed_left;
2244 flee_player (op);
2245
2282 return 0; 2246 return true;
2283 } 2247 }
2248 else
2249 return false;
2284 } 2250 }
2285 2251
2286 /* call this here - we also will call this in do_ericserver, but 2252 /* call this here - we also will call this in do_ericserver, but
2287 * the players time has been increased when doericserver has been 2253 * the players time has been increased when doericserver has been
2288 * called, so we recheck it here. 2254 * called, so we recheck it here.
2289 */ 2255 */
2290 if (op->contr->ns->handle_command ()) 2256 if (op->contr->ns->handle_command ())
2291 return 1; 2257 return true;
2292 2258
2293 if (op->speed_left > 0)
2294 {
2295 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2259 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2296 {
2297 /* All move commands take 1 tick, at least for now */
2298 op->speed_left--;
2299
2300 /* Instead of all the stuff below, let move_player take care
2301 * of it. Also, some of the skill stuff is only put in
2302 * there, as well as the confusion stuff.
2303 */
2304 move_player (op, op->direction); 2260 return move_player (op, op->direction);
2305 2261
2306 return op->speed_left > 0;
2307 }
2308 }
2309
2310 return 0; 2262 return false;
2311} 2263}
2312 2264
2313int 2265int
2314save_life (object *op) 2266save_life (object *op)
2315{ 2267{
… …
2317 return 0; 2269 return 0;
2318 2270
2319 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2271 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2320 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2272 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2321 { 2273 {
2322 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2274 op->play_sound (sound_find ("ob_evaporate"));
2323 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2275 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2324
2325 if (op->contr)
2326 esrv_del_item (op->contr, tmp->count);
2327 2276
2328 tmp->destroy (); 2277 tmp->destroy ();
2329 CLEAR_FLAG (op, FLAG_LIFESAVE); 2278 CLEAR_FLAG (op, FLAG_LIFESAVE);
2330 2279
2331 if (op->stats.hp < 0) 2280 if (op->stats.hp < 0)
… …
2344 return 0; 2293 return 0;
2345} 2294}
2346 2295
2347/* This goes throws the inventory and removes unpaid objects, and puts them 2296/* This goes throws the inventory and removes unpaid objects, and puts them
2348 * back in the map (location and map determined by values of env). This 2297 * back in the map (location and map determined by values of env). This
2349 * function will descend into containers. op is the object to start the search 2298 * function will descend into containers. op is the object to start the search
2350 * from. 2299 * from.
2351 */ 2300 */
2301static void
2302drop_unpaid_items (object *op, object *env)
2303{
2304 while (op)
2305 {
2306 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2307
2308 if (QUERY_FLAG (op, FLAG_UNPAID))
2309 op->insert_at (env);
2310 else if (op->inv)
2311 drop_unpaid_items (op->inv, env);
2312
2313 op = next;
2314 }
2315}
2316
2352void 2317void
2353remove_unpaid_objects (object *op, object *env) 2318object::drop_unpaid_items ()
2354{ 2319{
2355 while (op) 2320 if (!flag [FLAG_REMOVED])
2356 { 2321 ::drop_unpaid_items (inv, this);
2357 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2358
2359 if (QUERY_FLAG (op, FLAG_UNPAID))
2360 {
2361 if (env->type == PLAYER)
2362 esrv_del_item (env->contr, op->count);
2363
2364 op->insert_at (env);
2365 }
2366 else if (op->inv)
2367 remove_unpaid_objects (op->inv, env);
2368
2369 op = next;
2370 }
2371} 2322}
2372 2323
2373/* 2324/*
2374 * Returns pointer a static string containing gravestone text 2325 * Returns pointer a static string containing gravestone text
2375 * Moved from apply.c to player.c - player.c is what 2326 * Moved from apply.c to player.c - player.c is what
2376 * actually uses this function. player.c may not be quite the 2327 * actually uses this function. player.c may not be quite the
2377 * best, a misc file for object actions is probably better, 2328 * best, a misc file for object actions is probably better,
2378 * but there isn't one in the server directory. 2329 * but there isn't one in the server directory.
2379 */ 2330 */
2380char * 2331const char *
2381gravestone_text (object *op) 2332gravestone_text (object *op)
2382{ 2333{
2383 static char buf2[MAX_BUF]; 2334 static dynbuf_text buf;
2384 char buf[MAX_BUF];
2385 time_t now = time (NULL);
2386 2335
2387 strcpy (buf2, " R.I.P.\n\n"); 2336 buf << "---- R.I.P. ----\n\n";
2337 op->name;
2338
2388 if (op->type == PLAYER) 2339 if (op->type == PLAYER)
2389 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2340 buf << " the " << op->contr->title;
2390 else
2391 sprintf (buf, "%s\n", &op->name);
2392 2341
2393 strncat (buf2, " ", 20 - strlen (buf) / 2); 2342 buf << "\n\n";
2394 strcat (buf2, buf); 2343
2344 buf << "who was level ";
2345 buf << (sint32)op->level << "\n\n" // OO breakdown
2346 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2347
2395 if (op->type == PLAYER) 2348 if (op->type == PLAYER)
2396 sprintf (buf, "who was in level %d when killed\n", op->level); 2349 buf << "by " << op->contr->killer_name () << ".\n\n";
2397 else
2398 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2399 2350
2400 strncat (buf2, " ", 20 - strlen (buf) / 2);
2401 strcat (buf2, buf);
2402 if (op->type == PLAYER)
2403 { 2351 {
2404 sprintf (buf, "by %s.\n\n", op->contr->killer); 2352 static char buf2[128];
2405 strncat (buf2, " ", 21 - strlen (buf) / 2); 2353 time_t now = time (NULL);
2406 strcat (buf2, buf);
2407 }
2408
2409 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2354 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2410 strncat (buf2, " ", 20 - strlen (buf) / 2); 2355 buf << buf2;
2411 strcat (buf2, buf); 2356 }
2412 2357
2413 return buf2; 2358 return buf;
2414} 2359}
2415 2360
2416void 2361void
2417do_some_living (object *op) 2362do_some_living (object *op)
2418{ 2363{
… …
2470 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2415 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2471 else 2416 else
2472 { 2417 {
2473 gen_grace = op->stats.maxgrace; 2418 gen_grace = op->stats.maxgrace;
2474 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2419 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2475 }
2476
2477 /* Regenerate Spell Points */
2478 if (!op->contr->golem && --op->last_sp < 0)
2479 {
2480 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2481 if (op->stats.sp < op->stats.maxsp)
2482 {
2483 op->stats.sp++;
2484 /* dms do not consume food */
2485 if (!QUERY_FLAG (op, FLAG_WIZ))
2486 {
2487 op->stats.food--;
2488 if (op->contr->digestion < 0)
2489 op->stats.food += op->contr->digestion;
2490 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2491 op->stats.food = last_food;
2492 }
2493 }
2494
2495 if (max_sp > 1)
2496 {
2497 over_sp = (gen_sp + 10) / rate_sp;
2498 if (over_sp > 0)
2499 {
2500 if (op->stats.sp < op->stats.maxsp)
2501 {
2502 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2503
2504 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2505 op->stats.sp--;
2506
2507 if (op->stats.sp > op->stats.maxsp)
2508 op->stats.sp = op->stats.maxsp;
2509 }
2510 op->last_sp = 0;
2511 }
2512 else
2513 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2514 }
2515 else
2516 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2517 } 2420 }
2518 2421
2519 /* Regenerate Grace */ 2422 /* Regenerate Grace */
2520 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2423 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2521 if (--op->last_grace < 0) 2424 if (--op->last_grace < 0)
… …
2542 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2445 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2543 } 2446 }
2544 /* wearing stuff doesn't detract from grace generation. */ 2447 /* wearing stuff doesn't detract from grace generation. */
2545 } 2448 }
2546 2449
2450 if (op->stats.food > 0)
2451 {
2547 /* Regenerate Hit Points */ 2452 /* Regenerate Spell Points */
2548 if (--op->last_heal < 0) 2453 if (!op->contr->golem && --op->last_sp < 0)
2549 {
2550 if (op->stats.hp < op->stats.maxhp)
2551 { 2454 {
2552 op->stats.hp++; 2455 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2553 /* dms do not consume food */ 2456
2554 if (!QUERY_FLAG (op, FLAG_WIZ)) 2457 if (op->stats.sp < op->stats.maxsp)
2555 { 2458 {
2459 op->stats.sp++;
2460
2461 /* dms do not consume food */
2462 if (!QUERY_FLAG (op, FLAG_WIZ))
2463 {
2556 op->stats.food--; 2464 op->stats.food--;
2465
2557 if (op->contr->digestion < 0) 2466 if (op->contr->digestion < 0)
2558 op->stats.food += op->contr->digestion; 2467 op->stats.food += op->contr->digestion;
2559 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2468 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2560 op->stats.food = last_food; 2469 op->stats.food = last_food;
2470 }
2561 } 2471 }
2562 }
2563 2472
2564 if (max_hp > 1) 2473 if (max_sp > 1)
2565 {
2566 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2567 if (over_hp > 0)
2568 { 2474 {
2569 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2475 over_sp = (gen_sp + 10) / rate_sp;
2476 if (over_sp > 0)
2477 {
2478 if (op->stats.sp < op->stats.maxsp)
2479 {
2480 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2481
2482 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2483 op->stats.sp--;
2484
2485 if (op->stats.sp > op->stats.maxsp)
2486 op->stats.sp = op->stats.maxsp;
2487 }
2488
2570 op->last_heal = 0; 2489 op->last_sp = 0;
2490 }
2491 else
2492 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2571 } 2493 }
2572 else 2494 else
2495 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2496 }
2497
2498 /* Regenerate Hit Points */
2499 if (--op->last_heal < 0)
2500 {
2501 if (op->stats.hp < op->stats.maxhp)
2573 { 2502 {
2574 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2503 op->stats.hp++;
2504
2505 /* dms do not consume food */
2506 if (!QUERY_FLAG (op, FLAG_WIZ))
2507 {
2508 op->stats.food--;
2509
2510 if (op->contr->digestion < 0)
2511 op->stats.food += op->contr->digestion;
2512 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2513 op->stats.food = last_food;
2514 }
2575 } 2515 }
2516
2517 if (max_hp > 1)
2518 {
2519 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2520
2521 if (over_hp > 0)
2522 {
2523 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2524 op->last_heal = 0;
2525 }
2526 else
2527 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2576 } 2528 }
2577 else 2529 else
2578 {
2579 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2530 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2580 } 2531 }
2581 } 2532 }
2582 2533
2583 /* Digestion */ 2534 /* Digestion */
2584 if (--op->last_eat < 0) 2535 if (--op->last_eat < 0)
2585 { 2536 {
2586#ifdef COZY_SERVER 2537 int bonus = max (0, op->contr->digestion),
2587 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2538 penalty = max (0, -op->contr->digestion);
2588 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2589#else
2590 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2591#endif
2592 2539
2593 if (op->contr->gen_hp > 0)
2594 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2540 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2595 else
2596 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2597 2541
2598 /* dms do not consume food */ 2542 /* dms do not consume food */
2599 if (!QUERY_FLAG (op, FLAG_WIZ)) 2543 if (!QUERY_FLAG (op, FLAG_WIZ))
2600 op->stats.food--; 2544 op->stats.food--;
2601 } 2545 }
… …
2628 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2572 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2629 manual_apply (op, flesh, 0); 2573 manual_apply (op, flesh, 0);
2630 } 2574 }
2631 } 2575 }
2632 2576
2633 while (op->stats.food < 0 && op->stats.hp >= 0) 2577 if (op->stats.food < 0)
2634 op->stats.food++, op->stats.hp--; 2578 {
2579 op->stats.hp += op->stats.food;
2580 op->stats.food = 0;
2581 }
2635 2582
2636 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2583 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2637 kill_player (op); 2584 kill_player (op);
2638 } 2585 }
2639} 2586}
… …
2644 * file. 2591 * file.
2645 */ 2592 */
2646void 2593void
2647kill_player (object *op) 2594kill_player (object *op)
2648{ 2595{
2596 int x, y;
2649 char buf[MAX_BUF]; 2597 char buf[MAX_BUF];
2650 int x, y;
2651
2652 //int i;
2653 maptile *map; /* this is for resurrection */ 2598 maptile *map; /* this is for resurrection */
2654
2655 /* int z;
2656 int num_stats_lose;
2657 int lost_a_stat;
2658 int lose_this_stat;
2659 int this_stat; */
2660 int will_kill_again; 2599 int will_kill_again;
2661 archetype *at; 2600 archetype *at;
2662 object *tmp; 2601 object *tmp;
2663 2602
2664 if (save_life (op)) 2603 if (save_life (op))
2665 return; 2604 return;
2666
2667 2605
2668 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2606 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2669 * in cities ONLY!!! It is very important that this doesn't get abused. 2607 * in cities ONLY!!! It is very important that this doesn't get abused.
2670 * Look at op_on_battleground() for more info --AndreasV 2608 * Look at op_on_battleground() for more info --AndreasV
2671 */ 2609 */
… …
2687 { 2625 {
2688 tmp->destroy (); 2626 tmp->destroy ();
2689 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2627 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2690 } 2628 }
2691 2629
2692 cure_disease (op, 0); /* remove any disease */ 2630 cure_disease (op, 0, 0); /* remove any disease */
2693 op->stats.hp = op->stats.maxhp; 2631 op->stats.hp = op->stats.maxhp;
2694 if (op->stats.food <= 0) 2632 if (op->stats.food <= 0)
2695 op->stats.food = 999; 2633 op->stats.food = 999;
2696 2634
2697 /* create a bodypart-trophy to make the winner happy */ 2635 /* create a bodypart-trophy to make the winner happy */
2698 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2636 if (object *tmp = arch_to_object (archetype::find ("finger")))
2699 { 2637 {
2700 sprintf (buf, "%s's finger", &op->name); 2638 tmp->name = format ("%s's finger" , &op->name);
2701 tmp->name = buf; 2639 tmp->name_pl = format ("%s's fingers", &op->name);
2702 sprintf (buf, " This finger has been cut off %s\n"
2703 " the %s, when he was defeated at\n level %d by %s.\n",
2704 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2705 tmp->msg = buf; 2640 tmp->msg = format (
2641 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2642 &op->name, op->contr->title,
2643 (int)op->level,
2644 op->contr->killer_name ()
2645 );
2706 tmp->value = 0, tmp->type = 0; 2646 tmp->value = 0, tmp->type = 0;
2707 tmp->materialname = "organics"; 2647 tmp->materialname = "organics";
2708 tmp->insert_at (op, tmp); 2648 tmp->insert_at (op, tmp);
2709 } 2649 }
2710 2650
… …
2718 2658
2719 command_kill_pets (op, 0); 2659 command_kill_pets (op, 0);
2720 2660
2721 if (op->stats.food < 0) 2661 if (op->stats.food < 0)
2722 { 2662 {
2723 sprintf (buf, "%s starved to death.", &op->name); 2663 op->contr->killer = archetype::get ("killer_starvation");
2724 strcpy (op->contr->killer, "starvation"); 2664 op->contr->killer->destroy ();
2725 } 2665 }
2726 else
2727 sprintf (buf, "%s died.", &op->name);
2728 2666
2729 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2667 op->contr->play_sound (sound_find ("player_dies"));
2730 2668
2731 /* save the map location for corpse, gravestone */ 2669 /* save the map location for corpse, gravestone */
2732 x = op->x; 2670 x = op->x;
2733 y = op->y; 2671 y = op->y;
2734 map = op->map; 2672 map = op->map;
… …
2865 tmp = arch_to_object (archetype::find ("gravestone")); 2803 tmp = arch_to_object (archetype::find ("gravestone"));
2866 sprintf (buf, "%s's gravestone", &op->name); 2804 sprintf (buf, "%s's gravestone", &op->name);
2867 tmp->name = buf; 2805 tmp->name = buf;
2868 sprintf (buf, "%s's gravestones", &op->name); 2806 sprintf (buf, "%s's gravestones", &op->name);
2869 tmp->name_pl = buf; 2807 tmp->name_pl = buf;
2870 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); 2808 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_name ());
2871 tmp->msg = buf; 2809 tmp->msg = buf;
2872 tmp->x = op->x, tmp->y = op->y; 2810 tmp->x = op->x, tmp->y = op->y;
2873 insert_ob_in_map (tmp, op->map, NULL, 0); 2811 insert_ob_in_map (tmp, op->map, NULL, 0);
2874 2812
2875 /**************************************/ 2813 /**************************************/
… …
2897 { 2835 {
2898 tmp->destroy (); 2836 tmp->destroy ();
2899 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2837 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2900 } 2838 }
2901 2839
2902 cure_disease (op, 0); /* remove any disease */ 2840 cure_disease (op, 0, 0); /* remove any disease */
2903 2841
2904 /*add_exp(op, (op->stats.exp * -0.20)); */ 2842 /*add_exp(op, (op->stats.exp * -0.20)); */
2905 apply_death_exp_penalty (op); 2843 apply_death_exp_penalty (op);
2906 if (op->stats.food < 100) 2844 if (op->stats.food < 100)
2907 op->stats.food = 900; 2845 op->stats.food = 900;
… …
2911 2849
2912 /* 2850 /*
2913 * Check to see if the player has any unpaid items. If so, remove them 2851 * Check to see if the player has any unpaid items. If so, remove them
2914 * and put them back in the map. 2852 * and put them back in the map.
2915 */ 2853 */
2916 remove_unpaid_objects (op->inv, op); 2854 op->drop_unpaid_items ();
2917 2855
2918 /****************************************/ 2856 /****************************************/
2919 /* */ 2857 /* */
2920 /* Move player to his current respawn- */ 2858 /* Move player to his current respawn- */
2921 /* position (usually last savebed) */ 2859 /* position (usually last savebed) */
… …
2941 object *force; 2879 object *force;
2942 int at; 2880 int at;
2943 2881
2944 force = get_archetype (FORCE_NAME); 2882 force = get_archetype (FORCE_NAME);
2945 /* 50 ticks should be enough time for the spell to abate */ 2883 /* 50 ticks should be enough time for the spell to abate */
2946 force->speed = 0.1; 2884 force->speed = 0.1f;
2947 force->speed_left = -5.0; 2885 force->speed_left = -5.f;
2948 SET_FLAG (force, FLAG_APPLIED); 2886 SET_FLAG (force, FLAG_APPLIED);
2949 for (at = 0; at < NROFATTACKS; at++) 2887 for (at = 0; at < NROFATTACKS; at++)
2950 if (will_kill_again & (1 << at)) 2888 if (will_kill_again & (1 << at))
2951 force->resist[at] = 100; 2889 force->resist[at] = 100;
2952 2890
… …
2980 2918
2981 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2919 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2982 { 2920 {
2983 if (tmp->nrof > 1) 2921 if (tmp->nrof > 1)
2984 { 2922 {
2985 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2923 tmp->decrease (rndm (1, tmp->nrof - 1));
2986 tmp2->destroy ();
2987 insert_ob_in_map (tmp, op->map, NULL, 0); 2924 insert_ob_in_map (tmp, op->map, NULL, 0);
2988 } 2925 }
2989 else 2926 else
2990 tmp->destroy (); 2927 tmp->destroy ();
2991 } 2928 }
… …
3002void 2939void
3003fix_weight (void) 2940fix_weight (void)
3004{ 2941{
3005 for_all_players (pl) 2942 for_all_players (pl)
3006 { 2943 {
3007 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2944 sint32 old = pl->ob->carrying;
3008 2945
3009 if (old == sum) 2946 pl->ob->update_weight ();
3010 continue; 2947
2948 if (old != pl->ob->carrying)
2949 {
3011 pl->ob->update_stats (); 2950 pl->ob->update_stats ();
3012 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2951 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2952 }
3013 } 2953 }
3014} 2954}
3015 2955
3016void 2956void
3017fix_luck (void) 2957fix_luck (void)
… …
3061void 3001void
3062make_visible (object *op) 3002make_visible (object *op)
3063{ 3003{
3064 op->hide = 0; 3004 op->hide = 0;
3065 op->invisible = 0; 3005 op->invisible = 0;
3006
3066 if (op->type == PLAYER) 3007 if (op->type == PLAYER)
3067 { 3008 {
3068 op->contr->tmp_invis = 0; 3009 op->contr->tmp_invis = 0;
3069 op->contr->invis_race = 0; 3010 op->contr->invis_race = 0;
3070 } 3011 }
… …
3073} 3014}
3074 3015
3075int 3016int
3076is_true_undead (object *op) 3017is_true_undead (object *op)
3077{ 3018{
3078 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3019 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3079 return 1; 3020 return 1;
3080 3021
3081 return 0; 3022 return 0;
3082} 3023}
3083 3024
3084/* look at the surrounding terrain to determine 3025/* look at the surrounding terrain to determine
3085 * the hideability of this object. Positive levels 3026 * the hideability of this object. Positive levels
3086 * indicate greater hideability. 3027 * indicate greater hideability.
3087 */ 3028 */
3088
3089int 3029int
3090hideability (object *ob) 3030hideability (object *ob)
3091{ 3031{
3092 int i, level = 0, mflag; 3032 int i, level = 0, mflag;
3093 sint16 x, y; 3033 sint16 x, y;
… …
3103 * as bad as carrying a light on a pitch dark map */ 3043 * as bad as carrying a light on a pitch dark map */
3104 if (has_carried_lights (ob)) 3044 if (has_carried_lights (ob))
3105 level = -(10 + (2 * ob->map->darkness)); 3045 level = -(10 + (2 * ob->map->darkness));
3106 3046
3107 /* scan through all nearby squares for terrain to hide in */ 3047 /* scan through all nearby squares for terrain to hide in */
3108 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3048 for (i = 0, x = ob->x, y = ob->y;
3049 i <= SIZEOFFREE1;
3050 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3109 { 3051 {
3110 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3052 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3111 if (mflag & P_OUT_OF_MAP) 3053 if (mflag & P_OUT_OF_MAP)
3112 {
3113 continue; 3054 continue;
3114 } 3055
3115 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3056 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3116 level += 2; 3057 level += 2;
3117 else /* open terrain! */ 3058 else /* open terrain! */
3118 level -= 1; 3059 level -= 1;
3119 } 3060 }
… …
3127/* For Hidden creatures - a chance of becoming 'unhidden' 3068/* For Hidden creatures - a chance of becoming 'unhidden'
3128 * every time they move - as we subtract off 'invisibility' 3069 * every time they move - as we subtract off 'invisibility'
3129 * AND, for players, if they move into a ridiculously unhideable 3070 * AND, for players, if they move into a ridiculously unhideable
3130 * spot (surrounded by clear terrain in broad daylight). -b.t. 3071 * spot (surrounded by clear terrain in broad daylight). -b.t.
3131 */ 3072 */
3132
3133void 3073void
3134do_hidden_move (object *op) 3074do_hidden_move (object *op)
3135{ 3075{
3136 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3076 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3137 object *skop; 3077 object *skop;
… …
3219 * object op. This function works fine for monsters, 3159 * object op. This function works fine for monsters,
3220 * 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
3221 * a pile (say a coin under a table would return "viewable" 3161 * a pile (say a coin under a table would return "viewable"
3222 * by this routine). Another question, should we be 3162 * by this routine). Another question, should we be
3223 * concerned with the direction the player is looking 3163 * concerned with the direction the player is looking
3224 * in? Realistically, most of use cant see stuff behind 3164 * in? Realistically, most of us can't see stuff behind
3225 * our backs...on the other hand, does the "facing" direction 3165 * our backs...on the other hand, does the "facing" direction
3226 * imply the way your head, or body is facing? Its possible 3166 * imply the way your head, or body is facing? It's possible
3227 * 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.
3228 * -b.t. 3168 * -b.t.
3229 * This function is now map tiling safe. 3169 * This function is now map tiling safe.
3230 */ 3170 */
3231
3232int 3171int
3233player_can_view (object *pl, object *op) 3172player_can_view (object *pl, object *op)
3234{ 3173{
3235 rv_vector rv; 3174 rv_vector rv;
3236 int dx, dy; 3175 int dx, dy;
… …
3248 3187
3249 get_rangevector (pl, op, &rv, 0x1); 3188 get_rangevector (pl, op, &rv, 0x1);
3250 3189
3251 /* starting with the 'head' part, lets loop 3190 /* starting with the 'head' part, lets loop
3252 * through the object and find if it has any 3191 * through the object and find if it has any
3253 * part that is in the los array but isnt on 3192 * part that is in the los array but isn't on
3254 * a blocked los square. 3193 * a blocked los square.
3255 * we use the archetype to figure out offsets. 3194 * we use the archetype to figure out offsets.
3256 */ 3195 */
3257 while (op) 3196 while (op)
3258 { 3197 {
3259 dx = rv.distance_x + op->arch->clone.x; 3198 dx = rv.distance_x + op->arch->x;
3260 dy = rv.distance_y + op->arch->clone.y; 3199 dy = rv.distance_y + op->arch->y;
3261 3200
3262 /* only the viewable area the player sees is updated by LOS 3201 /* only the viewable area the player sees is updated by LOS
3263 * 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
3264 * for any meaningful values. 3203 * for any meaningful values.
3265 */ 3204 */
3266 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3205 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3267 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3206 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3268 !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)])
3269 return 1; 3208 return 1;
3209
3270 op = op->more; 3210 op = op->more;
3271 } 3211 }
3212
3272 return 0; 3213 return 0;
3273} 3214}
3274 3215
3275/* routine for both players and monsters. We call this when 3216/* routine for both players and monsters. We call this when
3276 * there is a possibility for our action distrubing our hiding 3217 * there is a possibility for our action distrubing our hiding
… …
3279 * return 0. 3220 * return 0.
3280 */ 3221 */
3281int 3222int
3282action_makes_visible (object *op) 3223action_makes_visible (object *op)
3283{ 3224{
3284
3285 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3225 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3286 { 3226 {
3287 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3227 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3288 return 0; 3228 return 0;
3289 3229
… …
3295 { 3235 {
3296 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");
3297 return 1; 3237 return 1;
3298 } 3238 }
3299 } 3239 }
3240
3300 return 0; 3241 return 0;
3301} 3242}
3302 3243
3303/* op_on_battleground - checks if the given object op (usually 3244/* op_on_battleground - checks if the given object op (usually
3304 * a player) is standing on a valid battleground-tile, 3245 * a player) is standing on a valid battleground-tile,
… …
3309 * 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
3310 */ 3251 */
3311int 3252int
3312op_on_battleground (object *op, int *x, int *y) 3253op_on_battleground (object *op, int *x, int *y)
3313{ 3254{
3314 object *tmp;
3315
3316 /* A battleground-tile needs the following attributes to be valid: 3255 /* A battleground-tile needs the following attributes to be valid:
3317 * 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),
3318 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3257 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3319 * and the exit-coordinates sp/hp must both be > 0. 3258 * and the exit-coordinates sp/hp must both be > 0.
3320 * => The intention here is to prevent abuse of the battleground- 3259 * => The intention here is to prevent abuse of the battleground-
3321 * feature (like pickable or hidden battleground tiles). */ 3260 * feature (like pickable or hidden battleground tiles). */
3322 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3261 for (object *tmp = op->below; tmp; tmp = tmp->below)
3323 { 3262 {
3324 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3263 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3325 { 3264 {
3326 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3265 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3327 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))
3328 { 3269 {
3329 /*before we assign the exit, check if this is a teambattle */ 3270 /* before we assign the exit, check if this is a teambattle */
3330 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))
3331 { 3272 {
3332 object *invtmp;
3333
3334 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3273 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3335 { 3274 {
3336 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3275 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3337 { 3276 {
3338 if (x != NULL && y != NULL) 3277 if (x && y)
3339 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3278 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3279
3340 return 1; 3280 return 1;
3341 } 3281 }
3342 } 3282 }
3343 } 3283 }
3284
3344 if (x != NULL && y != NULL) 3285 if (x && y)
3345 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3286 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3287
3346 return 1; 3288 return 1;
3347 } 3289 }
3348 } 3290 }
3349 } 3291 }
3292
3350 /* If we got here, did not find a battleground */ 3293 /* If we got here, did not find a battleground */
3351 return 0; 3294 return 0;
3352} 3295}
3353 3296
3354/* 3297/*
… …
3370 char buf[MAX_BUF]; /* tmp. string buffer */ 3313 char buf[MAX_BUF]; /* tmp. string buffer */
3371 int i = 0, j = 0; 3314 int i = 0, j = 0;
3372 3315
3373 /* get the appropriate treasurelist */ 3316 /* get the appropriate treasurelist */
3374 if (atnr == ATNR_FIRE) 3317 if (atnr == ATNR_FIRE)
3375 trlist = treasurelist::find ("dragon_ability_fire"); 3318 trlist = treasurelist::find (shstr_dragon_ability_fire);
3376 else if (atnr == ATNR_COLD) 3319 else if (atnr == ATNR_COLD)
3377 trlist = treasurelist::find ("dragon_ability_cold"); 3320 trlist = treasurelist::find (shstr_dragon_ability_cold);
3378 else if (atnr == ATNR_ELECTRICITY) 3321 else if (atnr == ATNR_ELECTRICITY)
3379 trlist = treasurelist::find ("dragon_ability_elec"); 3322 trlist = treasurelist::find (shstr_dragon_ability_elec);
3380 else if (atnr == ATNR_POISON) 3323 else if (atnr == ATNR_POISON)
3381 trlist = treasurelist::find ("dragon_ability_poison"); 3324 trlist = treasurelist::find (shstr_dragon_ability_poison);
3382 3325
3383 if (trlist == NULL || who->type != PLAYER) 3326 if (trlist == NULL || who->type != PLAYER)
3384 return; 3327 return;
3385 3328
3386 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++);
… …
3390 /* 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]); */
3391 return; 3334 return;
3392 } 3335 }
3393 3336
3394 /* everything seems okay - now bring on the gift: */ 3337 /* everything seems okay - now bring on the gift: */
3395 item = &(tr->item->clone); 3338 item = tr->item;
3396 3339
3397 if (item->type == SPELL) 3340 if (item->type == SPELL)
3398 { 3341 {
3399 if (check_spell_known (who, item->name)) 3342 if (check_spell_known (who, item->name))
3400 return; 3343 return;
… …
3459 { 3402 {
3460 /* forces in the treasurelist can alter the player's stats */ 3403 /* forces in the treasurelist can alter the player's stats */
3461 object *skin; 3404 object *skin;
3462 3405
3463 /* first get the dragon skin force */ 3406 /* first get the dragon skin force */
3464 shstr_cmp dragon_skin_force ("dragon_skin_force");
3465 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)
3466 ; 3408 ;
3467 3409
3468 if (!skin) 3410 if (!skin)
3469 return; 3411 return;
3470 3412
… …
3505 else 3447 else
3506 { 3448 {
3507 /* generate misc. treasure */ 3449 /* generate misc. treasure */
3508 tmp = arch_to_object (tr->item); 3450 tmp = arch_to_object (tr->item);
3509 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));
3510 tmp = insert_ob_in_ob (tmp, who); 3452 who->insert (tmp);
3511 if (who->type == PLAYER)
3512 esrv_send_item (who, tmp);
3513 } 3453 }
3514} 3454}
3515 3455
3516/** 3456/**
3517 * 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
… …
3546 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))
3547 return 0; 3487 return 0;
3548 3488
3549 return 100 - blocked_los [x][y]; 3489 return 100 - blocked_los [x][y];
3550} 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