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.149 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors 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>
… …
184 183
185 if (ob->map) 184 if (ob->map)
186 maplevel = ob->map->path; 185 maplevel = ob->map->path;
187 186
188 ob->remove (); 187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0; 189 ob->map = 0;
190 party = 0; 190 party = 0;
191 191
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193 193
… …
215 215
216 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->race; 218 ob->race = ob->arch->race;
219 219
220 ob->carrying = sum_weight (ob); 220 ob->update_weight ();
221 link_player_skills (ob); 221 link_player_skills (ob);
222 222
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224 224
225 assign (title, ob->arch->object::name); 225 assign (title, ob->arch->object::name);
… …
227 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
229 { 229 {
230 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
231 231
232 shstr_cmp dragon_ability_force ("dragon_ability_force");
233 shstr_cmp dragon_skin_force ("dragon_skin_force");
234
235 for (tmp = ob->inv; tmp; tmp = tmp->below) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
237 if (tmp->arch->archname == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
238 abil = tmp; 235 abil = tmp;
239 else if (tmp->arch->archname == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
240 skin = tmp; 237 skin = tmp;
241 238
242 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
243 } 240 }
244 241
245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246 243
247 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this, ob->weight + ob->carrying);
245
246 ob->update_stats ();
247
248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob);
250 esrv_add_spells (this, 0);
251
252 activate ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
248 300
249 ob->flag [FLAG_READY_WEAPON] = false; 301 ob->flag [FLAG_READY_WEAPON] = false;
250 ob->flag [FLAG_READY_SKILL] = false; 302 ob->flag [FLAG_READY_SKILL] = false;
251 ob->flag [FLAG_READY_BOW] = false; 303 ob->flag [FLAG_READY_BOW] = false;
252 304
… …
269 combat_ob = op; 321 combat_ob = op;
270 break; 322 break;
271 } 323 }
272 324
273 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274 ob->update_stats (); 326 ob->deactivate (); // change_Weapon activates, fix this better
275
276 ns->floorbox_update ();
277 esrv_send_inventory (ob, ob);
278 esrv_add_spells (this, 0);
279
280 activate ();
281
282 send_rules (ob);
283 send_news (ob);
284 display_motd (ob);
285
286 INVOKE_PLAYER (CONNECT, this);
287 INVOKE_PLAYER (LOGIN, this);
288}
289
290void
291player::disconnect ()
292{
293 if (ns)
294 {
295 if (active)
296 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297
298 INVOKE_PLAYER (DISCONNECT, this);
299
300 ns->reset_stats ();
301 ns->pl = 0;
302 ns = 0;
303 }
304
305 if (ob)
306 ob->close_container (); //TODO: client-specific
307
308 deactivate ();
309}
310
311// the need for this function can be explained
312// by load_object not returning the object
313void
314player::set_object (object *op)
315{
316 ob = observe = op;
317 ob->contr = this; /* this aren't yet in archetype */
318
319 ob->speed = 1.0f;
320 ob->speed_left = 0.5f;
321
322 ob->direction = 5; /* So player faces south */
323} 327}
324 328
325void 329void
326player::set_observe (object *op) 330player::set_observe (object *op)
327{ 331{
… …
362 if (ob) 366 if (ob)
363 { 367 {
364 ob->destroy_inv (false); 368 ob->destroy_inv (false);
365 ob->destroy (); 369 ob->destroy ();
366 } 370 }
371
372 ob = observe = 0;
367} 373}
368 374
369player::~player () 375player::~player ()
370{ 376{
371 /* Clear item stack */ 377 /* Clear item stack */
… …
398 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
399 */ 405 */
400archetype * 406archetype *
401get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
402{ 408{
409 // archetypes could have been reloaded
410 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
411
412 if (!nat)
413 return at;
414
403 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); 415 archvec::iterator i = archetypes.find (nat);
404 416
405 for (;;) 417 for (;;)
406 { 418 {
407 if (++i == archetypes.end ()) 419 if (++i == archetypes.end ())
408 i = archetypes.begin (); 420 i = archetypes.begin ();
… …
422 unsigned lastdist; 434 unsigned lastdist;
423 rv_vector rv; 435 rv_vector rv;
424 436
425 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 437 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426 { 438 {
427 /* We should not find free objects on this friendly list, but it
428 * does periodically happen. Given that, lets deal with it.
429 * While unlikely, it is possible the next object on the friendly
430 * list is also free, so encapsulate this in a while loop.
431 */
432 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
433 {
434 object *tmp = ol->ob;
435
436 /* Can't do much more other than log the fact, because the object
437 * itself will have been cleared.
438 */
439 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440 tmp->debug_desc ());
441 ol = ol->next;
442 remove_friendly_object (tmp);
443 if (!ol)
444 return op;
445 }
446
447 /* Remove special check for player from this. First, it looks to cause
448 * some crashes (ol->ob->contr not set properly?), but secondly, a more
449 * complicated method of state checking would be needed in any case -
450 * as it was, a clever player could type quit, and the function would
451 * skip them over while waiting for confirmation. Remove
452 * on_same_map check, as can_detect_enemy also does this
453 */
454 if (!can_detect_enemy (mon, ol->ob, &rv)) 439 if (!can_detect_enemy (mon, ol->ob, &rv))
455 continue; 440 continue;
456 441
457 if (lastdist > rv.distance) 442 if (lastdist > rv.distance)
458 { 443 {
… …
653 638
654 return firstdir; 639 return firstdir;
655} 640}
656 641
657void 642void
658give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
659{ 644{
660 object *op, *next = NULL;
661
662 if (pl->randomitems != NULL) 645 if (pl->randomitems)
663 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
664 647
665 for (op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
666 { 649 {
667 next = op->below; 650 next = op->below;
668 651
669 /* Forces get applied per default, unless they have the 652 /* Forces get applied per default, unless they have the
670 * flag "neutral" set. Sorry but I can't think of a better way 653 * flag "neutral" set. Sorry but I can't think of a better way
… …
675 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
676 * by this player due to race restrictions 659 * by this player due to race restrictions
677 */ 660 */
678 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
679 { 662 {
680 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
681 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
682 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
683 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
684 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 669 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
685 { 670 {
686 op->destroy (); 671 op->destroy ();
687 continue; 672 continue;
688 } 673 }
689 } 674 }
… …
712 if (op->nrof > 1) 697 if (op->nrof > 1)
713 op->nrof = 1; 698 op->nrof = 1;
714 } 699 }
715 700
716 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
717 {
718 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
719 }
720 703
721 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
722 * items. Just don't identify gold or silver, or it won't be 705 * items. Just don't identify gold or silver, or it won't be
723 * merged properly. 706 * merged properly.
724 */ 707 */
725 if (need_identify (op)) 708 if (need_identify (op))
726 { 709 {
727 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
728 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
729 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
730 } 713 }
714
731 if (op->type == SPELL) 715 if (op->type == SPELL)
732 { 716 {
733 op->destroy (); 717 op->destroy ();
734 continue; 718 continue;
735 } 719 }
… …
737 { 721 {
738 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
739 op->stats.exp = 0; 723 op->stats.exp = 0;
740 op->level = 1; 724 op->level = 1;
741 } 725 }
742 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
743 else
744 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
745 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
746 729
747 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
748 link_player_skills (pl); 731 link_player_skills (pl);
… …
854static void 837static void
855start_info (object *op) 838start_info (object *op)
856{ 839{
857 char buf[MAX_BUF]; 840 char buf[MAX_BUF];
858 841
859 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 842 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
860 new_draw_info (NDI_UNIQUE, 0, op, buf); 843 new_draw_info (NDI_UNIQUE, 0, op, buf);
861 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
862 //new_draw_info (NDI_UNIQUE, 0, op, " ");
863} 844}
864 845
865/* This function takes the key that is passed, and does the 846/* This function takes the key that is passed, and does the
866 * appropriate action with it (change race, or other things). 847 * appropriate action with it (change race, or other things).
867 * The function name is for historical reasons - now we have 848 * The function name is for historical reasons - now we have
… …
1030 if (op->move_type & MOVE_FLYING) 1011 if (op->move_type & MOVE_FLYING)
1031 return 1; 1012 return 1;
1032 1013
1033 next = op->below; 1014 next = op->below;
1034 1015
1016 int cnt = MAX_ITEM_PER_DROP;
1017#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1018
1035 /* loop while there are items on the floor that are not marked as 1019 /* loop while there are items on the floor that are not marked as
1036 * destroyed */ 1020 * destroyed */
1037 while (next && !next->destroyed ()) 1021 while (next && !next->destroyed ())
1038 { 1022 {
1039 tmp = next; 1023 tmp = next;
1040 next = tmp->below; 1024 next = tmp->below;
1041 1025
1026 if (cnt <= 0)
1027 {
1028 op->failmsg ("Couldn't pickup all items at once.");
1029 return 0;
1030 }
1031
1042 if (op->destroyed ()) 1032 if (op->destroyed ())
1043 return 0; 1033 return 0;
1044 1034
1045 if (!can_pick (op, tmp)) 1035 if (!can_pick (op, tmp))
1046 continue; 1036 continue;
1047 1037
1048 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1038 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1049 { 1039 {
1050 if (item_matched_string (op, tmp, op->contr->search_str)) 1040 if (item_matched_string (op, tmp, op->contr->search_str))
1051 pick_up (op, tmp); 1041 CHK_PICK_PICKUP;
1052 continue; 1042 continue;
1053 } 1043 }
1054 1044
1055 /* high not bit set? We're using the old autopickup model */ 1045 /* high not bit set? We're using the old autopickup model */
1056 if (!(op->contr->mode & PU_NEWMODE)) 1046 if (!(op->contr->mode & PU_NEWMODE))
… …
1058 switch (op->contr->mode) 1048 switch (op->contr->mode)
1059 { 1049 {
1060 case 0: 1050 case 0:
1061 return 1; /* don't pick up */ 1051 return 1; /* don't pick up */
1062 case 1: 1052 case 1:
1063 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1064 return 1; 1054 return 1;
1065 case 2: 1055 case 2:
1066 pick_up (op, tmp); 1056 CHK_PICK_PICKUP;
1067 return 0; 1057 return 0;
1068 case 3: 1058 case 3:
1069 return 0; /* stop before pickup */ 1059 return 0; /* stop before pickup */
1070 case 4: 1060 case 4:
1071 pick_up (op, tmp); 1061 CHK_PICK_PICKUP;
1072 break; 1062 break;
1073 case 5: 1063 case 5:
1074 pick_up (op, tmp); 1064 CHK_PICK_PICKUP;
1075 stop = 1; 1065 stop = 1;
1076 break; 1066 break;
1077 case 6: 1067 case 6:
1078 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1068 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1079 pick_up (op, tmp); 1069 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1070 CHK_PICK_PICKUP;
1080 break; 1071 break;
1081 1072
1082 case 7: 1073 case 7:
1083 if (tmp->type == MONEY || tmp->type == GEM) 1074 if (tmp->type == MONEY || tmp->type == GEM)
1084 pick_up (op, tmp); 1075 CHK_PICK_PICKUP;
1085 break; 1076 break;
1086 1077
1087 default: 1078 default:
1088 /* use value density */ 1079 /* use value density */
1089 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1080 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1090 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1081 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1091 pick_up (op, tmp); 1082 CHK_PICK_PICKUP;
1092 } 1083 }
1093 } 1084 }
1094 else 1085 else
1095 { /* old model */ 1086 { /* old model */
1096 /* NEW pickup handling */ 1087 /* NEW pickup handling */
… …
1151 /* all food and drink if desired */ 1142 /* all food and drink if desired */
1152 /* question: don't pick up known-poisonous stuff? */ 1143 /* question: don't pick up known-poisonous stuff? */
1153 if (op->contr->mode & PU_FOOD) 1144 if (op->contr->mode & PU_FOOD)
1154 if (tmp->type == FOOD) 1145 if (tmp->type == FOOD)
1155 { 1146 {
1156 pick_up (op, tmp); 1147 CHK_PICK_PICKUP;
1157 continue; 1148 continue;
1158 } 1149 }
1159 1150
1160 if (op->contr->mode & PU_DRINK) 1151 if (op->contr->mode & PU_DRINK)
1161 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1152 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1162 { 1153 {
1163 pick_up (op, tmp); 1154 CHK_PICK_PICKUP;
1164 continue; 1155 continue;
1165 } 1156 }
1166 1157
1167 if (op->contr->mode & PU_POTION) 1158 if (op->contr->mode & PU_POTION)
1168 if (tmp->type == POTION) 1159 if (tmp->type == POTION)
1169 { 1160 {
1170 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1171 continue; 1162 continue;
1172 } 1163 }
1173 1164
1174 /* spellbooks, skillscrolls and normal books/scrolls */ 1165 /* spellbooks, skillscrolls and normal books/scrolls */
1175 if (op->contr->mode & PU_SPELLBOOK) 1166 if (op->contr->mode & PU_SPELLBOOK)
1176 if (tmp->type == SPELLBOOK) 1167 if (tmp->type == SPELLBOOK)
1177 { 1168 {
1178 pick_up (op, tmp); 1169 CHK_PICK_PICKUP;
1179 continue; 1170 continue;
1180 } 1171 }
1181 1172
1182 if (op->contr->mode & PU_SKILLSCROLL) 1173 if (op->contr->mode & PU_SKILLSCROLL)
1183 if (tmp->type == SKILLSCROLL) 1174 if (tmp->type == SKILLSCROLL)
1184 { 1175 {
1185 pick_up (op, tmp); 1176 CHK_PICK_PICKUP;
1186 continue; 1177 continue;
1187 } 1178 }
1188 1179
1189 if (op->contr->mode & PU_READABLES) 1180 if (op->contr->mode & PU_READABLES)
1190 if (tmp->type == BOOK || tmp->type == SCROLL) 1181 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1191 { 1182 {
1192 pick_up (op, tmp); 1183 CHK_PICK_PICKUP;
1193 continue; 1184 continue;
1194 } 1185 }
1195 1186
1196 /* wands/staves/rods/horns */ 1187 /* wands/staves/rods/horns */
1197 if (op->contr->mode & PU_MAGIC_DEVICE) 1188 if (op->contr->mode & PU_MAGIC_DEVICE)
1198 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1189 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1199 { 1190 {
1200 pick_up (op, tmp); 1191 CHK_PICK_PICKUP;
1201 continue; 1192 continue;
1202 } 1193 }
1203 1194
1204 /* pick up all magical items */ 1195 /* pick up all magical items */
1205 if (op->contr->mode & PU_MAGICAL) 1196 if (op->contr->mode & PU_MAGICAL)
1206 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1197 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1207 { 1198 {
1208 pick_up (op, tmp); 1199 CHK_PICK_PICKUP;
1209 continue; 1200 continue;
1210 } 1201 }
1211 1202
1212 if (op->contr->mode & PU_VALUABLES) 1203 if (op->contr->mode & PU_VALUABLES)
1213 { 1204 {
1214 if (tmp->type == MONEY || tmp->type == GEM) 1205 if (tmp->type == MONEY || tmp->type == GEM)
1215 { 1206 {
1216 pick_up (op, tmp); 1207 CHK_PICK_PICKUP;
1217 continue; 1208 continue;
1218 } 1209 }
1219 } 1210 }
1220 1211
1221 /* rings & amulets - talismans seems to be typed AMULET */ 1212 /* rings & amulets - talismans seems to be typed AMULET */
1222 if (op->contr->mode & PU_JEWELS) 1213 if (op->contr->mode & PU_JEWELS)
1223 if (tmp->type == RING || tmp->type == AMULET) 1214 if (tmp->type == RING || tmp->type == AMULET)
1224 { 1215 {
1225 pick_up (op, tmp); 1216 CHK_PICK_PICKUP;
1226 continue; 1217 continue;
1227 } 1218 }
1228 1219
1229 /* we don't forget dragon food */ 1220 /* we don't forget dragon food */
1230 if (op->contr->mode & PU_FLESH) 1221 if (op->contr->mode & PU_FLESH)
1231 if (tmp->type == FLESH) 1222 if (tmp->type == FLESH)
1232 { 1223 {
1233 pick_up (op, tmp); 1224 CHK_PICK_PICKUP;
1234 continue; 1225 continue;
1235 } 1226 }
1236 1227
1237 /* bows and arrows. Bows are good for selling! */ 1228 /* bows and arrows. Bows are good for selling! */
1238 if (op->contr->mode & PU_BOW) 1229 if (op->contr->mode & PU_BOW)
1239 if (tmp->type == BOW) 1230 if (tmp->type == BOW)
1240 { 1231 {
1241 pick_up (op, tmp); 1232 CHK_PICK_PICKUP;
1242 continue; 1233 continue;
1243 } 1234 }
1244 1235
1245 if (op->contr->mode & PU_ARROW) 1236 if (op->contr->mode & PU_ARROW)
1246 if (tmp->type == ARROW) 1237 if (tmp->type == ARROW)
1247 { 1238 {
1248 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1249 continue; 1240 continue;
1250 } 1241 }
1251 1242
1252 /* all kinds of armor etc. */ 1243 /* all kinds of armor etc. */
1253 if (op->contr->mode & PU_ARMOUR) 1244 if (op->contr->mode & PU_ARMOUR)
1254 if (tmp->type == ARMOUR) 1245 if (tmp->type == ARMOUR)
1255 { 1246 {
1256 pick_up (op, tmp); 1247 CHK_PICK_PICKUP;
1257 continue; 1248 continue;
1258 } 1249 }
1259 1250
1260 if (op->contr->mode & PU_HELMET) 1251 if (op->contr->mode & PU_HELMET)
1261 if (tmp->type == HELMET) 1252 if (tmp->type == HELMET)
1262 { 1253 {
1263 pick_up (op, tmp); 1254 CHK_PICK_PICKUP;
1264 continue; 1255 continue;
1265 } 1256 }
1266 1257
1267 if (op->contr->mode & PU_SHIELD) 1258 if (op->contr->mode & PU_SHIELD)
1268 if (tmp->type == SHIELD) 1259 if (tmp->type == SHIELD)
1269 { 1260 {
1270 pick_up (op, tmp); 1261 CHK_PICK_PICKUP;
1271 continue; 1262 continue;
1272 } 1263 }
1273 1264
1274 if (op->contr->mode & PU_BOOTS) 1265 if (op->contr->mode & PU_BOOTS)
1275 if (tmp->type == BOOTS) 1266 if (tmp->type == BOOTS)
1276 { 1267 {
1277 pick_up (op, tmp); 1268 CHK_PICK_PICKUP;
1278 continue; 1269 continue;
1279 } 1270 }
1280 1271
1281 if (op->contr->mode & PU_GLOVES) 1272 if (op->contr->mode & PU_GLOVES)
1282 if (tmp->type == GLOVES) 1273 if (tmp->type == GLOVES)
1283 { 1274 {
1284 pick_up (op, tmp); 1275 CHK_PICK_PICKUP;
1285 continue; 1276 continue;
1286 } 1277 }
1287 1278
1288 if (op->contr->mode & PU_CLOAK) 1279 if (op->contr->mode & PU_CLOAK)
1289 if (tmp->type == CLOAK) 1280 if (tmp->type == CLOAK)
1290 { 1281 {
1291 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1292 continue; 1283 continue;
1293 } 1284 }
1294 1285
1295 /* hoping to catch throwing daggers here */ 1286 /* hoping to catch throwing daggers here */
1296 if (op->contr->mode & PU_MISSILEWEAPON) 1287 if (op->contr->mode & PU_MISSILEWEAPON)
1297 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1288 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1298 { 1289 {
1299 pick_up (op, tmp); 1290 CHK_PICK_PICKUP;
1300 continue; 1291 continue;
1301 } 1292 }
1302 1293
1303 /* careful: chairs and tables are weapons! */ 1294 /* careful: chairs and tables are weapons! */
1304 if (op->contr->mode & PU_ALLWEAPON) 1295 if (op->contr->mode & PU_ALLWEAPON)
… …
1306 if (tmp->type == WEAPON && tmp->name != NULL) 1297 if (tmp->type == WEAPON && tmp->name != NULL)
1307 { 1298 {
1308 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL && 1299 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1309 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL) 1300 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310 { 1301 {
1311 pick_up (op, tmp); 1302 CHK_PICK_PICKUP;
1312 continue; 1303 continue;
1313 } 1304 }
1314 } 1305 }
1315 1306
1316 if (tmp->type == WEAPON && tmp->name == NULL) 1307 if (tmp->type == WEAPON && tmp->name == NULL)
1317 { 1308 {
1318 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL) 1309 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1319 { 1310 {
1320 pick_up (op, tmp); 1311 CHK_PICK_PICKUP;
1321 continue; 1312 continue;
1322 } 1313 }
1323 } 1314 }
1324 } 1315 }
1325 1316
1326 /* misc stuff that's useful */ 1317 /* misc stuff that's useful */
1327 if (op->contr->mode & PU_KEY) 1318 if (op->contr->mode & PU_KEY)
1328 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1319 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1329 { 1320 {
1330 pick_up (op, tmp); 1321 CHK_PICK_PICKUP;
1331 continue; 1322 continue;
1332 } 1323 }
1333 1324
1334 /* any of the last 4 bits set means we use the ratio for value 1325 /* any of the last 4 bits set means we use the ratio for value
1335 * pickups */ 1326 * pickups */
… …
1340 /* >=7 is the old standard setting. Now we take the last 4 bits 1331 /* >=7 is the old standard setting. Now we take the last 4 bits
1341 * and multiply them by 5, giving 0..15*5== 5..75 */ 1332 * and multiply them by 5, giving 0..15*5== 5..75 */
1342 wvratio = (op->contr->mode & PU_RATIO) * 5; 1333 wvratio = (op->contr->mode & PU_RATIO) * 5;
1343 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1334 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1344 { 1335 {
1345 pick_up (op, tmp); 1336 CHK_PICK_PICKUP;
1346#if 0 1337#if 0
1347 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1338 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1348 if (tmp->name != NULL) 1339 if (tmp->name != NULL)
1349 { 1340 {
1350 fprintf (stderr, "%s", tmp->name); 1341 fprintf (stderr, "%s", tmp->name);
… …
1369 * found object is returned. 1360 * found object is returned.
1370 */ 1361 */
1371object * 1362object *
1372find_arrow (object *op, const char *type) 1363find_arrow (object *op, const char *type)
1373{ 1364{
1374 object *tmp = 0;
1375
1376 for (op = op->inv; op; op = op->below) 1365 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1377 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1378 tmp = find_arrow (op, type);
1379 else if (op->type == ARROW && op->race == type) 1366 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1367 return splay (tmp);
1368
1369 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1370 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1371 if (object *arrow = find_arrow (tmp, type))
1372 {
1373 splay (tmp);
1380 return op; 1374 return arrow;
1375 }
1381 1376
1382 return tmp; 1377 return 0;
1383} 1378}
1384 1379
1385/* 1380/*
1386 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1381 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1387 * against the target. A full test is not performed, simply a basic test 1382 * against the target. A full test is not performed, simply a basic test
… …
1608 arrow->destroy (); 1603 arrow->destroy ();
1609 return 0; 1604 return 0;
1610 } 1605 }
1611 1606
1612 left = arrow; /* these are arrows left to the player */ 1607 left = arrow; /* these are arrows left to the player */
1613 arrow = get_split_ob (arrow, 1); 1608 arrow = arrow->split ();
1614 if (!arrow) 1609 if (!arrow)
1615 { 1610 {
1616 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1611 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1617 return 0; 1612 return 0;
1618 } 1613 }
… …
1680 1675
1681 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1676 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1682 arrow->move_type = MOVE_FLY_LOW; 1677 arrow->move_type = MOVE_FLY_LOW;
1683 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1678 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1684 1679
1685 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1680 op->play_sound (sound_find ("fire_arrow"));
1686 m->insert (arrow, sx, sy, op); 1681 m->insert (arrow, sx, sy, op);
1687 1682
1688 if (!arrow->destroyed ()) 1683 if (!arrow->destroyed ())
1689 move_arrow (arrow); 1684 move_arrow (arrow);
1690
1691 if (op->type == PLAYER)
1692 {
1693 if (left->destroyed ())
1694 esrv_del_item (op->contr, left->count);
1695 else
1696 esrv_send_item (op, left);
1697 }
1698 1685
1699 return 1; 1686 return 1;
1700} 1687}
1701 1688
1702/* Special fire code for players - this takes into 1689/* Special fire code for players - this takes into
… …
1768 1755
1769 if (item->type == WAND) 1756 if (item->type == WAND)
1770 { 1757 {
1771 if (item->stats.food <= 0) 1758 if (item->stats.food <= 0)
1772 { 1759 {
1773 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1760 op->contr->play_sound (sound_find ("wand_poof"));
1774 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1761 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1775 1762
1776 return; 1763 return;
1777 } 1764 }
1778 } 1765 }
1779 else if (item->type == ROD || item->type == HORN) 1766 else if (item->type == ROD || item->type == HORN)
1780 { 1767 {
1781 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1768 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1782 { 1769 {
1783 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1770 op->contr->play_sound (sound_find ("wand_poof"));
1784 1771
1785 if (item->type == ROD) 1772 if (item->type == ROD)
1786 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1773 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1787 else 1774 else
1788 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1775 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1977 /* If we found a key, do some extra work */ 1964 /* If we found a key, do some extra work */
1978 if (key) 1965 if (key)
1979 { 1966 {
1980 object *container = key->env; 1967 object *container = key->env;
1981 1968
1982 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1983
1984 if (action_makes_visible (op)) 1969 if (action_makes_visible (op))
1985 make_visible (op); 1970 make_visible (op);
1986 1971
1987 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1972 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1988 spring_trap (door->inv, op); 1973 spring_trap (door->inv, op);
1989 1974
1990 if (door->type == DOOR) 1975 if (door->type == DOOR)
1991 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1976 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1992 else if (door->type == LOCKED_DOOR) 1977 else if (door->type == LOCKED_DOOR)
1993 { 1978 {
1994 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1979 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1995 remove_door2 (door); /* remove door without violence ;-) */ 1980 remove_door2 (door); /* remove door without violence ;-) */
1996 } 1981 }
1997 1982
1998 /* Do this after we print the message */ 1983 /* Do this after we print the message */
1999 decrease_ob (key); /* Use up one of the keys */ 1984 key->decrease (); /* Use up one of the keys */
2000 /* Need to update the weight the container the key was in */ 1985 /* Need to update the weight the container the key was in */
2001 if (container != op) 1986 if (container != op)
2002 esrv_update_item (UPD_WEIGHT, op, container); 1987 esrv_update_item (UPD_WEIGHT, op, container);
2003 1988
2004 return 1; /* Nothing more to do below */ 1989 return 1; /* Nothing more to do below */
2005 } 1990 }
2006 else if (door->type == LOCKED_DOOR) 1991 else if (door->type == LOCKED_DOOR)
2007 { 1992 {
2008 /* Might as well return now - no other way to open this */ 1993 /* Might as well return now - no other way to open this */
2009 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1994 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2010 return 1; 1995 return 1;
2011 } 1996 }
2012 1997
2013 return 0; 1998 return 0;
2014} 1999}
… …
2101 2086
2102 if (op->speed_left > 0.f) 2087 if (op->speed_left > 0.f)
2103 { 2088 {
2104 --op->speed_left; 2089 --op->speed_left;
2105 2090
2106 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2091 op->play_sound (sound_find ("push_player"));
2107 push_ob (mon, dir, op); 2092 push_ob (mon, dir, op);
2108 2093
2109 if (op->contr->tmp_invis || op->hide) 2094 if (op->contr->tmp_invis || op->hide)
2110 make_visible (op); 2095 make_visible (op);
2111 2096
… …
2130 { 2115 {
2131 --op->speed_left; 2116 --op->speed_left;
2132 2117
2133 if (!op->contr->braced) 2118 if (!op->contr->braced)
2134 { 2119 {
2135 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2120 op->play_sound (sound_find ("push_player"));
2136 push_ob (mon, dir, op); 2121 push_ob (mon, dir, op);
2137 } 2122 }
2138 else 2123 else
2139 new_draw_info (0, 0, op, "You withhold your attack"); 2124 op->statusmsg ("You withhold your attack");
2140 2125
2141 if (op->contr->tmp_invis || op->hide) 2126 if (op->contr->tmp_invis || op->hide)
2142 make_visible (op); 2127 make_visible (op);
2143 2128
2144 return true; 2129 return true;
… …
2188bool 2173bool
2189move_player (object *op, int dir) 2174move_player (object *op, int dir)
2190{ 2175{
2191 int pick; 2176 int pick;
2192 2177
2193 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2178 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2194 return 0; 2179 return 0;
2195 2180
2196 /* Sanity check: make sure dir is valid */ 2181 /* Sanity check: make sure dir is valid */
2197 if ((dir < 0) || (dir >= 9)) 2182 if ((dir < 0) || (dir >= 9))
2198 { 2183 {
… …
2283 return 0; 2268 return 0;
2284 2269
2285 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2270 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2286 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2271 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2287 { 2272 {
2288 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2273 op->play_sound (sound_find ("ob_evaporate"));
2289 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2274 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2290 2275
2291 if (op->contr) 2276 if (op->contr)
2292 esrv_del_item (op->contr, tmp->count); 2277 esrv_del_item (op->contr, tmp->count);
2293 2278
… …
2313/* This goes throws the inventory and removes unpaid objects, and puts them 2298/* This goes throws the inventory and removes unpaid objects, and puts them
2314 * back in the map (location and map determined by values of env). This 2299 * back in the map (location and map determined by values of env). This
2315 * function will descend into containers. op is the object to start the search 2300 * function will descend into containers. op is the object to start the search
2316 * from. 2301 * from.
2317 */ 2302 */
2318void 2303static void
2319remove_unpaid_objects (object *op, object *env) 2304drop_unpaid_items (object *op, object *env)
2320{ 2305{
2321 while (op) 2306 while (op)
2322 { 2307 {
2323 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2308 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2324 2309
… …
2328 esrv_del_item (env->contr, op->count); 2313 esrv_del_item (env->contr, op->count);
2329 2314
2330 op->insert_at (env); 2315 op->insert_at (env);
2331 } 2316 }
2332 else if (op->inv) 2317 else if (op->inv)
2333 remove_unpaid_objects (op->inv, env); 2318 drop_unpaid_items (op->inv, env);
2334 2319
2335 op = next; 2320 op = next;
2336 } 2321 }
2322}
2323
2324void
2325object::drop_unpaid_items ()
2326{
2327 if (!flag [FLAG_REMOVED])
2328 ::drop_unpaid_items (inv, this);
2337} 2329}
2338 2330
2339/* 2331/*
2340 * Returns pointer a static string containing gravestone text 2332 * Returns pointer a static string containing gravestone text
2341 * Moved from apply.c to player.c - player.c is what 2333 * Moved from apply.c to player.c - player.c is what
… …
2436 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2428 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2437 else 2429 else
2438 { 2430 {
2439 gen_grace = op->stats.maxgrace; 2431 gen_grace = op->stats.maxgrace;
2440 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2432 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2441 }
2442
2443 /* Regenerate Spell Points */
2444 if (!op->contr->golem && --op->last_sp < 0)
2445 {
2446 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2447 if (op->stats.sp < op->stats.maxsp)
2448 {
2449 op->stats.sp++;
2450 /* dms do not consume food */
2451 if (!QUERY_FLAG (op, FLAG_WIZ))
2452 {
2453 op->stats.food--;
2454 if (op->contr->digestion < 0)
2455 op->stats.food += op->contr->digestion;
2456 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2457 op->stats.food = last_food;
2458 }
2459 }
2460
2461 if (max_sp > 1)
2462 {
2463 over_sp = (gen_sp + 10) / rate_sp;
2464 if (over_sp > 0)
2465 {
2466 if (op->stats.sp < op->stats.maxsp)
2467 {
2468 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2469
2470 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2471 op->stats.sp--;
2472
2473 if (op->stats.sp > op->stats.maxsp)
2474 op->stats.sp = op->stats.maxsp;
2475 }
2476 op->last_sp = 0;
2477 }
2478 else
2479 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2480 }
2481 else
2482 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2483 } 2433 }
2484 2434
2485 /* Regenerate Grace */ 2435 /* Regenerate Grace */
2486 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2436 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2487 if (--op->last_grace < 0) 2437 if (--op->last_grace < 0)
… …
2508 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2458 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2509 } 2459 }
2510 /* wearing stuff doesn't detract from grace generation. */ 2460 /* wearing stuff doesn't detract from grace generation. */
2511 } 2461 }
2512 2462
2463 if (op->stats.food > 0)
2464 {
2513 /* Regenerate Hit Points */ 2465 /* Regenerate Spell Points */
2514 if (--op->last_heal < 0) 2466 if (!op->contr->golem && --op->last_sp < 0)
2515 {
2516 if (op->stats.hp < op->stats.maxhp)
2517 { 2467 {
2518 op->stats.hp++; 2468 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2519 /* dms do not consume food */ 2469
2520 if (!QUERY_FLAG (op, FLAG_WIZ)) 2470 if (op->stats.sp < op->stats.maxsp)
2521 { 2471 {
2472 op->stats.sp++;
2473
2474 /* dms do not consume food */
2475 if (!QUERY_FLAG (op, FLAG_WIZ))
2476 {
2522 op->stats.food--; 2477 op->stats.food--;
2478
2523 if (op->contr->digestion < 0) 2479 if (op->contr->digestion < 0)
2524 op->stats.food += op->contr->digestion; 2480 op->stats.food += op->contr->digestion;
2525 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2481 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2526 op->stats.food = last_food; 2482 op->stats.food = last_food;
2483 }
2527 } 2484 }
2528 }
2529 2485
2530 if (max_hp > 1) 2486 if (max_sp > 1)
2531 {
2532 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533 if (over_hp > 0)
2534 { 2487 {
2535 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 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
2536 op->last_heal = 0; 2502 op->last_sp = 0;
2503 }
2504 else
2505 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2537 } 2506 }
2538 else 2507 else
2508 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2509 }
2510
2511 /* Regenerate Hit Points */
2512 if (--op->last_heal < 0)
2513 {
2514 if (op->stats.hp < op->stats.maxhp)
2539 { 2515 {
2540 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2516 op->stats.hp++;
2517
2518 /* dms do not consume food */
2519 if (!QUERY_FLAG (op, FLAG_WIZ))
2520 {
2521 op->stats.food--;
2522
2523 if (op->contr->digestion < 0)
2524 op->stats.food += op->contr->digestion;
2525 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2526 op->stats.food = last_food;
2527 }
2541 } 2528 }
2529
2530 if (max_hp > 1)
2531 {
2532 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533
2534 if (over_hp > 0)
2535 {
2536 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2537 op->last_heal = 0;
2538 }
2539 else
2540 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2542 } 2541 }
2543 else 2542 else
2544 {
2545 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2543 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2546 } 2544 }
2547 } 2545 }
2548 2546
2549 /* Digestion */ 2547 /* Digestion */
2550 if (--op->last_eat < 0) 2548 if (--op->last_eat < 0)
2551 { 2549 {
2552 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2550 int bonus = max (0, op->contr->digestion),
2551 penalty = max (0, -op->contr->digestion);
2553 2552
2554 if (op->contr->gen_hp > 0)
2555 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2553 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2556 else
2557 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2558 2554
2559 /* dms do not consume food */ 2555 /* dms do not consume food */
2560 if (!QUERY_FLAG (op, FLAG_WIZ)) 2556 if (!QUERY_FLAG (op, FLAG_WIZ))
2561 op->stats.food--; 2557 op->stats.food--;
2562 } 2558 }
… …
2589 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2585 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2590 manual_apply (op, flesh, 0); 2586 manual_apply (op, flesh, 0);
2591 } 2587 }
2592 } 2588 }
2593 2589
2594 while (op->stats.food < 0 && op->stats.hp >= 0) 2590 if (op->stats.food < 0)
2595 op->stats.food++, op->stats.hp--; 2591 {
2592 op->stats.hp += op->stats.food;
2593 op->stats.food = 0;
2594 }
2596 2595
2597 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2596 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2598 kill_player (op); 2597 kill_player (op);
2599 } 2598 }
2600} 2599}
… …
2605 * file. 2604 * file.
2606 */ 2605 */
2607void 2606void
2608kill_player (object *op) 2607kill_player (object *op)
2609{ 2608{
2609 int x, y;
2610 char buf[MAX_BUF]; 2610 char buf[MAX_BUF];
2611 int x, y;
2612
2613 //int i;
2614 maptile *map; /* this is for resurrection */ 2611 maptile *map; /* this is for resurrection */
2615
2616 /* int z;
2617 int num_stats_lose;
2618 int lost_a_stat;
2619 int lose_this_stat;
2620 int this_stat; */
2621 int will_kill_again; 2612 int will_kill_again;
2622 archetype *at; 2613 archetype *at;
2623 object *tmp; 2614 object *tmp;
2624 2615
2625 if (save_life (op)) 2616 if (save_life (op))
2626 return; 2617 return;
2627
2628 2618
2629 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2619 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2630 * in cities ONLY!!! It is very important that this doesn't get abused. 2620 * in cities ONLY!!! It is very important that this doesn't get abused.
2631 * Look at op_on_battleground() for more info --AndreasV 2621 * Look at op_on_battleground() for more info --AndreasV
2632 */ 2622 */
… …
2648 { 2638 {
2649 tmp->destroy (); 2639 tmp->destroy ();
2650 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2640 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2651 } 2641 }
2652 2642
2653 cure_disease (op, 0); /* remove any disease */ 2643 cure_disease (op, 0, 0); /* remove any disease */
2654 op->stats.hp = op->stats.maxhp; 2644 op->stats.hp = op->stats.maxhp;
2655 if (op->stats.food <= 0) 2645 if (op->stats.food <= 0)
2656 op->stats.food = 999; 2646 op->stats.food = 999;
2657 2647
2658 /* create a bodypart-trophy to make the winner happy */ 2648 /* create a bodypart-trophy to make the winner happy */
2659 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2649 if (object *tmp = arch_to_object (archetype::find ("finger")))
2660 { 2650 {
2661 sprintf (buf, "%s's finger", &op->name); 2651 tmp->name = format ("%s's finger" , &op->name);
2662 tmp->name = buf; 2652 tmp->name_pl = format ("%s's fingers", &op->name);
2663 sprintf (buf, " This finger has been cut off %s\n" 2653 tmp->msg = format (
2664 " the %s, when he was defeated at\n level %d by %s.\n", 2654 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2665 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2655 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2666 tmp->msg = buf; 2656 );
2667 tmp->value = 0, tmp->type = 0; 2657 tmp->value = 0, tmp->type = 0;
2668 tmp->materialname = "organics"; 2658 tmp->materialname = "organics";
2669 tmp->insert_at (op, tmp); 2659 tmp->insert_at (op, tmp);
2670 } 2660 }
2671 2661
… …
2678 INVOKE_PLAYER (DEATH, op->contr); 2668 INVOKE_PLAYER (DEATH, op->contr);
2679 2669
2680 command_kill_pets (op, 0); 2670 command_kill_pets (op, 0);
2681 2671
2682 if (op->stats.food < 0) 2672 if (op->stats.food < 0)
2683 {
2684 sprintf (buf, "%s starved to death.", &op->name);
2685 strcpy (op->contr->killer, "starvation"); 2673 strcpy (op->contr->killer, "starvation");
2686 }
2687 else
2688 sprintf (buf, "%s died.", &op->name);
2689 2674
2690 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2675 op->contr->play_sound (sound_find ("player_dies"));
2691 2676
2692 /* save the map location for corpse, gravestone */ 2677 /* save the map location for corpse, gravestone */
2693 x = op->x; 2678 x = op->x;
2694 y = op->y; 2679 y = op->y;
2695 map = op->map; 2680 map = op->map;
… …
2858 { 2843 {
2859 tmp->destroy (); 2844 tmp->destroy ();
2860 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2845 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2861 } 2846 }
2862 2847
2863 cure_disease (op, 0); /* remove any disease */ 2848 cure_disease (op, 0, 0); /* remove any disease */
2864 2849
2865 /*add_exp(op, (op->stats.exp * -0.20)); */ 2850 /*add_exp(op, (op->stats.exp * -0.20)); */
2866 apply_death_exp_penalty (op); 2851 apply_death_exp_penalty (op);
2867 if (op->stats.food < 100) 2852 if (op->stats.food < 100)
2868 op->stats.food = 900; 2853 op->stats.food = 900;
… …
2872 2857
2873 /* 2858 /*
2874 * Check to see if the player has any unpaid items. If so, remove them 2859 * Check to see if the player has any unpaid items. If so, remove them
2875 * and put them back in the map. 2860 * and put them back in the map.
2876 */ 2861 */
2877 remove_unpaid_objects (op->inv, op); 2862 op->drop_unpaid_items ();
2878 2863
2879 /****************************************/ 2864 /****************************************/
2880 /* */ 2865 /* */
2881 /* Move player to his current respawn- */ 2866 /* Move player to his current respawn- */
2882 /* position (usually last savebed) */ 2867 /* position (usually last savebed) */
… …
2941 2926
2942 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2927 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2943 { 2928 {
2944 if (tmp->nrof > 1) 2929 if (tmp->nrof > 1)
2945 { 2930 {
2946 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2931 tmp->decrease (rndm (1, tmp->nrof - 1));
2947 tmp2->destroy ();
2948 insert_ob_in_map (tmp, op->map, NULL, 0); 2932 insert_ob_in_map (tmp, op->map, NULL, 0);
2949 } 2933 }
2950 else 2934 else
2951 tmp->destroy (); 2935 tmp->destroy ();
2952 } 2936 }
… …
2963void 2947void
2964fix_weight (void) 2948fix_weight (void)
2965{ 2949{
2966 for_all_players (pl) 2950 for_all_players (pl)
2967 { 2951 {
2968 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2952 sint32 old = pl->ob->carrying;
2969 2953
2970 if (old == sum) 2954 pl->ob->update_weight ();
2971 continue; 2955
2956 if (old != pl->ob->carrying)
2957 {
2972 pl->ob->update_stats (); 2958 pl->ob->update_stats ();
2973 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2959 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2960 }
2974 } 2961 }
2975} 2962}
2976 2963
2977void 2964void
2978fix_luck (void) 2965fix_luck (void)
… …
3022void 3009void
3023make_visible (object *op) 3010make_visible (object *op)
3024{ 3011{
3025 op->hide = 0; 3012 op->hide = 0;
3026 op->invisible = 0; 3013 op->invisible = 0;
3014
3027 if (op->type == PLAYER) 3015 if (op->type == PLAYER)
3028 { 3016 {
3029 op->contr->tmp_invis = 0; 3017 op->contr->tmp_invis = 0;
3030 op->contr->invis_race = 0; 3018 op->contr->invis_race = 0;
3031 } 3019 }
… …
3044 3032
3045/* look at the surrounding terrain to determine 3033/* look at the surrounding terrain to determine
3046 * the hideability of this object. Positive levels 3034 * the hideability of this object. Positive levels
3047 * indicate greater hideability. 3035 * indicate greater hideability.
3048 */ 3036 */
3049
3050int 3037int
3051hideability (object *ob) 3038hideability (object *ob)
3052{ 3039{
3053 int i, level = 0, mflag; 3040 int i, level = 0, mflag;
3054 sint16 x, y; 3041 sint16 x, y;
… …
3064 * as bad as carrying a light on a pitch dark map */ 3051 * as bad as carrying a light on a pitch dark map */
3065 if (has_carried_lights (ob)) 3052 if (has_carried_lights (ob))
3066 level = -(10 + (2 * ob->map->darkness)); 3053 level = -(10 + (2 * ob->map->darkness));
3067 3054
3068 /* scan through all nearby squares for terrain to hide in */ 3055 /* scan through all nearby squares for terrain to hide in */
3069 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3056 for (i = 0, x = ob->x, y = ob->y;
3057 i <= SIZEOFFREE1;
3058 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3070 { 3059 {
3071 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3060 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3072 if (mflag & P_OUT_OF_MAP) 3061 if (mflag & P_OUT_OF_MAP)
3073 {
3074 continue; 3062 continue;
3075 } 3063
3076 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3064 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3077 level += 2; 3065 level += 2;
3078 else /* open terrain! */ 3066 else /* open terrain! */
3079 level -= 1; 3067 level -= 1;
3080 } 3068 }
… …
3179 * object op. This function works fine for monsters, 3167 * object op. This function works fine for monsters,
3180 * but we dont worry if the object isnt the top one in 3168 * but we dont worry if the object isnt the top one in
3181 * a pile (say a coin under a table would return "viewable" 3169 * a pile (say a coin under a table would return "viewable"
3182 * by this routine). Another question, should we be 3170 * by this routine). Another question, should we be
3183 * concerned with the direction the player is looking 3171 * concerned with the direction the player is looking
3184 * in? Realistically, most of use cant see stuff behind 3172 * in? Realistically, most of us can't see stuff behind
3185 * our backs...on the other hand, does the "facing" direction 3173 * our backs...on the other hand, does the "facing" direction
3186 * imply the way your head, or body is facing? Its possible 3174 * imply the way your head, or body is facing? It's possible
3187 * for them to differ. Sigh, this fctn could get a bit more complex. 3175 * for them to differ. Sigh, this fctn could get a bit more complex.
3188 * -b.t. 3176 * -b.t.
3189 * This function is now map tiling safe. 3177 * This function is now map tiling safe.
3190 */ 3178 */
3191
3192int 3179int
3193player_can_view (object *pl, object *op) 3180player_can_view (object *pl, object *op)
3194{ 3181{
3195 rv_vector rv; 3182 rv_vector rv;
3196 int dx, dy; 3183 int dx, dy;
… …
3208 3195
3209 get_rangevector (pl, op, &rv, 0x1); 3196 get_rangevector (pl, op, &rv, 0x1);
3210 3197
3211 /* starting with the 'head' part, lets loop 3198 /* starting with the 'head' part, lets loop
3212 * through the object and find if it has any 3199 * through the object and find if it has any
3213 * part that is in the los array but isnt on 3200 * part that is in the los array but isn't on
3214 * a blocked los square. 3201 * a blocked los square.
3215 * we use the archetype to figure out offsets. 3202 * we use the archetype to figure out offsets.
3216 */ 3203 */
3217 while (op) 3204 while (op)
3218 { 3205 {
… …
3221 3208
3222 /* only the viewable area the player sees is updated by LOS 3209 /* only the viewable area the player sees is updated by LOS
3223 * code, so we need to restrict ourselves to that range of values 3210 * code, so we need to restrict ourselves to that range of values
3224 * for any meaningful values. 3211 * for any meaningful values.
3225 */ 3212 */
3226 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3213 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3227 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3214 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3228 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3215 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3229 return 1; 3216 return 1;
3217
3230 op = op->more; 3218 op = op->more;
3231 } 3219 }
3220
3232 return 0; 3221 return 0;
3233} 3222}
3234 3223
3235/* routine for both players and monsters. We call this when 3224/* routine for both players and monsters. We call this when
3236 * there is a possibility for our action distrubing our hiding 3225 * there is a possibility for our action distrubing our hiding
… …
3239 * return 0. 3228 * return 0.
3240 */ 3229 */
3241int 3230int
3242action_makes_visible (object *op) 3231action_makes_visible (object *op)
3243{ 3232{
3244
3245 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3233 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3246 { 3234 {
3247 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3235 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3248 return 0; 3236 return 0;
3249 3237
… …
3255 { 3243 {
3256 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3244 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3257 return 1; 3245 return 1;
3258 } 3246 }
3259 } 3247 }
3248
3260 return 0; 3249 return 0;
3261} 3250}
3262 3251
3263/* op_on_battleground - checks if the given object op (usually 3252/* op_on_battleground - checks if the given object op (usually
3264 * a player) is standing on a valid battleground-tile, 3253 * a player) is standing on a valid battleground-tile,
… …
3269 * Default is to do the same as before, so only people wanting to have different points need worry about this 3258 * Default is to do the same as before, so only people wanting to have different points need worry about this
3270 */ 3259 */
3271int 3260int
3272op_on_battleground (object *op, int *x, int *y) 3261op_on_battleground (object *op, int *x, int *y)
3273{ 3262{
3274 object *tmp;
3275
3276 /* A battleground-tile needs the following attributes to be valid: 3263 /* A battleground-tile needs the following attributes to be valid:
3277 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3264 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3278 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3265 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3279 * and the exit-coordinates sp/hp must both be > 0. 3266 * and the exit-coordinates sp/hp must both be > 0.
3280 * => The intention here is to prevent abuse of the battleground- 3267 * => The intention here is to prevent abuse of the battleground-
3281 * feature (like pickable or hidden battleground tiles). */ 3268 * feature (like pickable or hidden battleground tiles). */
3282 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3269 for (object *tmp = op->below; tmp; tmp = tmp->below)
3283 { 3270 {
3284 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3271 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3285 { 3272 {
3286 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3273 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3287 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3274 && tmp->type == BATTLEGROUND
3275 && tmp->name == shstr_battleground
3276 && EXIT_X (tmp) && EXIT_Y (tmp))
3288 { 3277 {
3289 /*before we assign the exit, check if this is a teambattle */ 3278 /* before we assign the exit, check if this is a teambattle */
3290 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3279 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3291 { 3280 {
3292 object *invtmp;
3293
3294 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3281 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3295 { 3282 {
3296 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3283 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3297 { 3284 {
3298 if (x != NULL && y != NULL) 3285 if (x && y)
3299 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3286 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3287
3300 return 1; 3288 return 1;
3301 } 3289 }
3302 } 3290 }
3303 } 3291 }
3292
3304 if (x != NULL && y != NULL) 3293 if (x && y)
3305 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3294 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3295
3306 return 1; 3296 return 1;
3307 } 3297 }
3308 } 3298 }
3309 } 3299 }
3300
3310 /* If we got here, did not find a battleground */ 3301 /* If we got here, did not find a battleground */
3311 return 0; 3302 return 0;
3312} 3303}
3313 3304
3314/* 3305/*
… …
3330 char buf[MAX_BUF]; /* tmp. string buffer */ 3321 char buf[MAX_BUF]; /* tmp. string buffer */
3331 int i = 0, j = 0; 3322 int i = 0, j = 0;
3332 3323
3333 /* get the appropriate treasurelist */ 3324 /* get the appropriate treasurelist */
3334 if (atnr == ATNR_FIRE) 3325 if (atnr == ATNR_FIRE)
3335 trlist = treasurelist::find ("dragon_ability_fire"); 3326 trlist = treasurelist::find (shstr_dragon_ability_fire);
3336 else if (atnr == ATNR_COLD) 3327 else if (atnr == ATNR_COLD)
3337 trlist = treasurelist::find ("dragon_ability_cold"); 3328 trlist = treasurelist::find (shstr_dragon_ability_cold);
3338 else if (atnr == ATNR_ELECTRICITY) 3329 else if (atnr == ATNR_ELECTRICITY)
3339 trlist = treasurelist::find ("dragon_ability_elec"); 3330 trlist = treasurelist::find (shstr_dragon_ability_elec);
3340 else if (atnr == ATNR_POISON) 3331 else if (atnr == ATNR_POISON)
3341 trlist = treasurelist::find ("dragon_ability_poison"); 3332 trlist = treasurelist::find (shstr_dragon_ability_poison);
3342 3333
3343 if (trlist == NULL || who->type != PLAYER) 3334 if (trlist == NULL || who->type != PLAYER)
3344 return; 3335 return;
3345 3336
3346 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3337 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3419 { 3410 {
3420 /* forces in the treasurelist can alter the player's stats */ 3411 /* forces in the treasurelist can alter the player's stats */
3421 object *skin; 3412 object *skin;
3422 3413
3423 /* first get the dragon skin force */ 3414 /* first get the dragon skin force */
3424 shstr_cmp dragon_skin_force ("dragon_skin_force");
3425 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below) 3415 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3426 ; 3416 ;
3427 3417
3428 if (!skin) 3418 if (!skin)
3429 return; 3419 return;
3430 3420
… …
3506 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) 3496 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3507 return 0; 3497 return 0;
3508 3498
3509 return 100 - blocked_los [x][y]; 3499 return 100 - blocked_los [x][y];
3510} 3500}
3501
3502void
3503player::infobox (const char *title, const char *msg, int color)
3504{
3505 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3506}
3507
3508void
3509player::statusmsg (const char *msg, int color)
3510{
3511 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3512}
3513
3514void
3515player::failmsg (const char *msg, int color)
3516{
3517 play_sound (sound_find ("generic_failure"));
3518 statusmsg (msg, color);
3519}
3520

Diff Legend

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