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.139 by root, Fri May 18 01:01:02 2007 UTC vs.
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC

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

Diff Legend

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