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.158 by root, Mon Aug 13 15:46:45 2007 UTC vs.
Revision 1.194 by root, Sun May 4 19:41:51 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,2008 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 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * 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>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <sproto.h> 25#include <sproto.h>
26#include <sounds.h> 26#include <sounds.h>
… …
183 183
184 if (ob->map) 184 if (ob->map)
185 maplevel = ob->map->path; 185 maplevel = ob->map->path;
186 186
187 ob->remove (); 187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
188 ob->map = 0; 189 ob->map = 0;
189 party = 0; 190 party = 0;
190 191
191 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
192 193
… …
214 215
215 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
216 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
217 ob->race = ob->arch->race; 218 ob->race = ob->arch->race;
218 219
219 ob->carrying = sum_weight (ob); 220 ob->update_weight ();
220 link_player_skills (ob); 221 link_player_skills (ob);
221 222
222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
223 224
224 assign (title, ob->arch->object::name); 225 assign (title, ob->arch->object::name);
… …
238 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
239 } 240 }
240 241
241 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
242 243
243 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this);
245
246 ob->update_stats ();
247
248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob);
250 esrv_add_spells (this, 0);
251
252 activate ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
244 300
245 ob->flag [FLAG_READY_WEAPON] = false; 301 ob->flag [FLAG_READY_WEAPON] = false;
246 ob->flag [FLAG_READY_SKILL] = false; 302 ob->flag [FLAG_READY_SKILL] = false;
247 ob->flag [FLAG_READY_BOW] = false; 303 ob->flag [FLAG_READY_BOW] = false;
248 304
… …
265 combat_ob = op; 321 combat_ob = op;
266 break; 322 break;
267 } 323 }
268 324
269 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
270 ob->update_stats (); 326 ob->deactivate (); // change_Weapon activates, fix this better
271
272 ns->floorbox_update ();
273 esrv_send_inventory (ob, ob);
274 esrv_add_spells (this, 0);
275
276 activate ();
277
278 send_rules (ob);
279 send_news (ob);
280 display_motd (ob);
281
282 INVOKE_PLAYER (CONNECT, this);
283 INVOKE_PLAYER (LOGIN, this);
284}
285
286void
287player::disconnect ()
288{
289 if (ns)
290 {
291 if (active)
292 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
293
294 INVOKE_PLAYER (DISCONNECT, this);
295
296 ns->reset_stats ();
297 ns->pl = 0;
298 ns = 0;
299 }
300
301 if (ob)
302 {
303 ob->close_container (); //TODO: client-specific
304 ob->drop_unpaid_items ();
305 }
306
307 observe = ob;
308
309 deactivate ();
310}
311
312// the need for this function can be explained
313// by load_object not returning the object
314void
315player::set_object (object *op)
316{
317 ob = observe = op;
318 ob->contr = this; /* this aren't yet in archetype */
319
320 ob->speed = 1.0f;
321 ob->speed_left = 0.5f;
322
323 ob->direction = 5; /* So player faces south */
324} 327}
325 328
326void 329void
327player::set_observe (object *op) 330player::set_observe (object *op)
328{ 331{
… …
401 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
402 */ 405 */
403archetype * 406archetype *
404get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
405{ 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
406 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); 415 archvec::iterator i = archetypes.find (nat);
407 416
408 for (;;) 417 for (;;)
409 { 418 {
410 if (++i == archetypes.end ()) 419 if (++i == archetypes.end ())
411 i = archetypes.begin (); 420 i = archetypes.begin ();
… …
425 unsigned lastdist; 434 unsigned lastdist;
426 rv_vector rv; 435 rv_vector rv;
427 436
428 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 437 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
429 { 438 {
430 /* We should not find free objects on this friendly list, but it
431 * does periodically happen. Given that, lets deal with it.
432 * While unlikely, it is possible the next object on the friendly
433 * list is also free, so encapsulate this in a while loop.
434 */
435 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
436 {
437 object *tmp = ol->ob;
438
439 /* Can't do much more other than log the fact, because the object
440 * itself will have been cleared.
441 */
442 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
443 tmp->debug_desc ());
444 ol = ol->next;
445 remove_friendly_object (tmp);
446 if (!ol)
447 return op;
448 }
449
450 /* Remove special check for player from this. First, it looks to cause
451 * some crashes (ol->ob->contr not set properly?), but secondly, a more
452 * complicated method of state checking would be needed in any case -
453 * as it was, a clever player could type quit, and the function would
454 * skip them over while waiting for confirmation. Remove
455 * on_same_map check, as can_detect_enemy also does this
456 */
457 if (!can_detect_enemy (mon, ol->ob, &rv)) 439 if (!can_detect_enemy (mon, ol->ob, &rv))
458 continue; 440 continue;
459 441
460 if (lastdist > rv.distance) 442 if (lastdist > rv.distance)
461 { 443 {
… …
656 638
657 return firstdir; 639 return firstdir;
658} 640}
659 641
660void 642void
661give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
662{ 644{
663 object *op, *next = NULL;
664
665 if (pl->randomitems != NULL) 645 if (pl->randomitems)
666 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
667 647
668 for (op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
669 { 649 {
670 next = op->below; 650 next = op->below;
671 651
672 /* Forces get applied per default, unless they have the 652 /* Forces get applied per default, unless they have the
673 * 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
… …
678 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
679 * by this player due to race restrictions 659 * by this player due to race restrictions
680 */ 660 */
681 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
682 { 662 {
683 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
684 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
685 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
686 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
687 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))
688 { 670 {
689 op->destroy (); 671 op->destroy ();
690 continue; 672 continue;
691 } 673 }
692 } 674 }
… …
715 if (op->nrof > 1) 697 if (op->nrof > 1)
716 op->nrof = 1; 698 op->nrof = 1;
717 } 699 }
718 700
719 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
720 {
721 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
722 }
723 703
724 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
725 * 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
726 * merged properly. 706 * merged properly.
727 */ 707 */
728 if (need_identify (op)) 708 if (need_identify (op))
729 { 709 {
730 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
731 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
732 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
733 } 713 }
714
734 if (op->type == SPELL) 715 if (op->type == SPELL)
735 { 716 {
736 op->destroy (); 717 op->destroy ();
737 continue; 718 continue;
738 } 719 }
… …
740 { 721 {
741 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
742 op->stats.exp = 0; 723 op->stats.exp = 0;
743 op->level = 1; 724 op->level = 1;
744 } 725 }
745 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
746 else
747 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
748 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
749 729
750 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
751 link_player_skills (pl); 731 link_player_skills (pl);
… …
857static void 837static void
858start_info (object *op) 838start_info (object *op)
859{ 839{
860 char buf[MAX_BUF]; 840 char buf[MAX_BUF];
861 841
862 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 842 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
863 new_draw_info (NDI_UNIQUE, 0, op, buf); 843 new_draw_info (NDI_UNIQUE, 0, op, buf);
864 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
865 //new_draw_info (NDI_UNIQUE, 0, op, " ");
866} 844}
867 845
868/* This function takes the key that is passed, and does the 846/* This function takes the key that is passed, and does the
869 * appropriate action with it (change race, or other things). 847 * appropriate action with it (change race, or other things).
870 * The function name is for historical reasons - now we have 848 * The function name is for historical reasons - now we have
… …
873 */ 851 */
874void 852void
875player::chargen_race_done () 853player::chargen_race_done ()
876{ 854{
877 /* this must before then initial items are given */ 855 /* this must before then initial items are given */
878 esrv_new_player (ob->contr, ob->weight + ob->carrying); 856 esrv_new_player (ob->contr);
879 857
880 treasurelist *tl = treasurelist::find ("starting_wealth"); 858 treasurelist *tl = treasurelist::find ("starting_wealth");
881 if (tl) 859 if (tl)
882 create_treasure (tl, ob, 0, 0, 0); 860 create_treasure (tl, ob, 0, 0, 0);
883 861
… …
1033 if (op->move_type & MOVE_FLYING) 1011 if (op->move_type & MOVE_FLYING)
1034 return 1; 1012 return 1;
1035 1013
1036 next = op->below; 1014 next = op->below;
1037 1015
1016 int cnt = MAX_ITEM_PER_DROP;
1017#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1018
1038 /* 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
1039 * destroyed */ 1020 * destroyed */
1040 while (next && !next->destroyed ()) 1021 while (next && !next->destroyed ())
1041 { 1022 {
1042 tmp = next; 1023 tmp = next;
1043 next = tmp->below; 1024 next = tmp->below;
1044 1025
1026 if (cnt <= 0)
1027 {
1028 op->failmsg ("Couldn't pickup all items at once.");
1029 return 0;
1030 }
1031
1045 if (op->destroyed ()) 1032 if (op->destroyed ())
1046 return 0; 1033 return 0;
1047 1034
1048 if (!can_pick (op, tmp)) 1035 if (!can_pick (op, tmp))
1049 continue; 1036 continue;
1050 1037
1051 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1038 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052 { 1039 {
1053 if (item_matched_string (op, tmp, op->contr->search_str)) 1040 if (item_matched_string (op, tmp, op->contr->search_str))
1054 pick_up (op, tmp); 1041 CHK_PICK_PICKUP;
1055 continue; 1042 continue;
1056 } 1043 }
1057 1044
1058 /* high not bit set? We're using the old autopickup model */ 1045 /* high not bit set? We're using the old autopickup model */
1059 if (!(op->contr->mode & PU_NEWMODE)) 1046 if (!(op->contr->mode & PU_NEWMODE))
… …
1061 switch (op->contr->mode) 1048 switch (op->contr->mode)
1062 { 1049 {
1063 case 0: 1050 case 0:
1064 return 1; /* don't pick up */ 1051 return 1; /* don't pick up */
1065 case 1: 1052 case 1:
1066 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1067 return 1; 1054 return 1;
1068 case 2: 1055 case 2:
1069 pick_up (op, tmp); 1056 CHK_PICK_PICKUP;
1070 return 0; 1057 return 0;
1071 case 3: 1058 case 3:
1072 return 0; /* stop before pickup */ 1059 return 0; /* stop before pickup */
1073 case 4: 1060 case 4:
1074 pick_up (op, tmp); 1061 CHK_PICK_PICKUP;
1075 break; 1062 break;
1076 case 5: 1063 case 5:
1077 pick_up (op, tmp); 1064 CHK_PICK_PICKUP;
1078 stop = 1; 1065 stop = 1;
1079 break; 1066 break;
1080 case 6: 1067 case 6:
1081 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1068 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1082 pick_up (op, tmp); 1069 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1070 CHK_PICK_PICKUP;
1083 break; 1071 break;
1084 1072
1085 case 7: 1073 case 7:
1086 if (tmp->type == MONEY || tmp->type == GEM) 1074 if (tmp->type == MONEY || tmp->type == GEM)
1087 pick_up (op, tmp); 1075 CHK_PICK_PICKUP;
1088 break; 1076 break;
1089 1077
1090 default: 1078 default:
1091 /* use value density */ 1079 /* use value density */
1092 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1080 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093 && (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)
1094 pick_up (op, tmp); 1082 CHK_PICK_PICKUP;
1095 } 1083 }
1096 } 1084 }
1097 else 1085 else
1098 { /* old model */ 1086 { /* old model */
1099 /* NEW pickup handling */ 1087 /* NEW pickup handling */
… …
1154 /* all food and drink if desired */ 1142 /* all food and drink if desired */
1155 /* question: don't pick up known-poisonous stuff? */ 1143 /* question: don't pick up known-poisonous stuff? */
1156 if (op->contr->mode & PU_FOOD) 1144 if (op->contr->mode & PU_FOOD)
1157 if (tmp->type == FOOD) 1145 if (tmp->type == FOOD)
1158 { 1146 {
1159 pick_up (op, tmp); 1147 CHK_PICK_PICKUP;
1160 continue; 1148 continue;
1161 } 1149 }
1162 1150
1163 if (op->contr->mode & PU_DRINK) 1151 if (op->contr->mode & PU_DRINK)
1164 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)))
1165 { 1153 {
1166 pick_up (op, tmp); 1154 CHK_PICK_PICKUP;
1167 continue; 1155 continue;
1168 } 1156 }
1169 1157
1170 if (op->contr->mode & PU_POTION) 1158 if (op->contr->mode & PU_POTION)
1171 if (tmp->type == POTION) 1159 if (tmp->type == POTION)
1172 { 1160 {
1173 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1174 continue; 1162 continue;
1175 } 1163 }
1176 1164
1177 /* spellbooks, skillscrolls and normal books/scrolls */ 1165 /* spellbooks, skillscrolls and normal books/scrolls */
1178 if (op->contr->mode & PU_SPELLBOOK) 1166 if (op->contr->mode & PU_SPELLBOOK)
1179 if (tmp->type == SPELLBOOK) 1167 if (tmp->type == SPELLBOOK)
1180 { 1168 {
1181 pick_up (op, tmp); 1169 CHK_PICK_PICKUP;
1182 continue; 1170 continue;
1183 } 1171 }
1184 1172
1185 if (op->contr->mode & PU_SKILLSCROLL) 1173 if (op->contr->mode & PU_SKILLSCROLL)
1186 if (tmp->type == SKILLSCROLL) 1174 if (tmp->type == SKILLSCROLL)
1187 { 1175 {
1188 pick_up (op, tmp); 1176 CHK_PICK_PICKUP;
1189 continue; 1177 continue;
1190 } 1178 }
1191 1179
1192 if (op->contr->mode & PU_READABLES) 1180 if (op->contr->mode & PU_READABLES)
1193 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE) 1181 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1194 { 1182 {
1195 pick_up (op, tmp); 1183 CHK_PICK_PICKUP;
1196 continue; 1184 continue;
1197 } 1185 }
1198 1186
1199 /* wands/staves/rods/horns */ 1187 /* wands/staves/rods/horns */
1200 if (op->contr->mode & PU_MAGIC_DEVICE) 1188 if (op->contr->mode & PU_MAGIC_DEVICE)
1201 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1189 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202 { 1190 {
1203 pick_up (op, tmp); 1191 CHK_PICK_PICKUP;
1204 continue; 1192 continue;
1205 } 1193 }
1206 1194
1207 /* pick up all magical items */ 1195 /* pick up all magical items */
1208 if (op->contr->mode & PU_MAGICAL) 1196 if (op->contr->mode & PU_MAGICAL)
1209 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))
1210 { 1198 {
1211 pick_up (op, tmp); 1199 CHK_PICK_PICKUP;
1212 continue; 1200 continue;
1213 } 1201 }
1214 1202
1215 if (op->contr->mode & PU_VALUABLES) 1203 if (op->contr->mode & PU_VALUABLES)
1216 { 1204 {
1217 if (tmp->type == MONEY || tmp->type == GEM) 1205 if (tmp->type == MONEY || tmp->type == GEM)
1218 { 1206 {
1219 pick_up (op, tmp); 1207 CHK_PICK_PICKUP;
1220 continue; 1208 continue;
1221 } 1209 }
1222 } 1210 }
1223 1211
1224 /* rings & amulets - talismans seems to be typed AMULET */ 1212 /* rings & amulets - talismans seems to be typed AMULET */
1225 if (op->contr->mode & PU_JEWELS) 1213 if (op->contr->mode & PU_JEWELS)
1226 if (tmp->type == RING || tmp->type == AMULET) 1214 if (tmp->type == RING || tmp->type == AMULET)
1227 { 1215 {
1228 pick_up (op, tmp); 1216 CHK_PICK_PICKUP;
1229 continue; 1217 continue;
1230 } 1218 }
1231 1219
1232 /* we don't forget dragon food */ 1220 /* we don't forget dragon food */
1233 if (op->contr->mode & PU_FLESH) 1221 if (op->contr->mode & PU_FLESH)
1234 if (tmp->type == FLESH) 1222 if (tmp->type == FLESH)
1235 { 1223 {
1236 pick_up (op, tmp); 1224 CHK_PICK_PICKUP;
1237 continue; 1225 continue;
1238 } 1226 }
1239 1227
1240 /* bows and arrows. Bows are good for selling! */ 1228 /* bows and arrows. Bows are good for selling! */
1241 if (op->contr->mode & PU_BOW) 1229 if (op->contr->mode & PU_BOW)
1242 if (tmp->type == BOW) 1230 if (tmp->type == BOW)
1243 { 1231 {
1244 pick_up (op, tmp); 1232 CHK_PICK_PICKUP;
1245 continue; 1233 continue;
1246 } 1234 }
1247 1235
1248 if (op->contr->mode & PU_ARROW) 1236 if (op->contr->mode & PU_ARROW)
1249 if (tmp->type == ARROW) 1237 if (tmp->type == ARROW)
1250 { 1238 {
1251 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1252 continue; 1240 continue;
1253 } 1241 }
1254 1242
1255 /* all kinds of armor etc. */ 1243 /* all kinds of armor etc. */
1256 if (op->contr->mode & PU_ARMOUR) 1244 if (op->contr->mode & PU_ARMOUR)
1257 if (tmp->type == ARMOUR) 1245 if (tmp->type == ARMOUR)
1258 { 1246 {
1259 pick_up (op, tmp); 1247 CHK_PICK_PICKUP;
1260 continue; 1248 continue;
1261 } 1249 }
1262 1250
1263 if (op->contr->mode & PU_HELMET) 1251 if (op->contr->mode & PU_HELMET)
1264 if (tmp->type == HELMET) 1252 if (tmp->type == HELMET)
1265 { 1253 {
1266 pick_up (op, tmp); 1254 CHK_PICK_PICKUP;
1267 continue; 1255 continue;
1268 } 1256 }
1269 1257
1270 if (op->contr->mode & PU_SHIELD) 1258 if (op->contr->mode & PU_SHIELD)
1271 if (tmp->type == SHIELD) 1259 if (tmp->type == SHIELD)
1272 { 1260 {
1273 pick_up (op, tmp); 1261 CHK_PICK_PICKUP;
1274 continue; 1262 continue;
1275 } 1263 }
1276 1264
1277 if (op->contr->mode & PU_BOOTS) 1265 if (op->contr->mode & PU_BOOTS)
1278 if (tmp->type == BOOTS) 1266 if (tmp->type == BOOTS)
1279 { 1267 {
1280 pick_up (op, tmp); 1268 CHK_PICK_PICKUP;
1281 continue; 1269 continue;
1282 } 1270 }
1283 1271
1284 if (op->contr->mode & PU_GLOVES) 1272 if (op->contr->mode & PU_GLOVES)
1285 if (tmp->type == GLOVES) 1273 if (tmp->type == GLOVES)
1286 { 1274 {
1287 pick_up (op, tmp); 1275 CHK_PICK_PICKUP;
1288 continue; 1276 continue;
1289 } 1277 }
1290 1278
1291 if (op->contr->mode & PU_CLOAK) 1279 if (op->contr->mode & PU_CLOAK)
1292 if (tmp->type == CLOAK) 1280 if (tmp->type == CLOAK)
1293 { 1281 {
1294 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1295 continue; 1283 continue;
1296 } 1284 }
1297 1285
1298 /* hoping to catch throwing daggers here */ 1286 /* hoping to catch throwing daggers here */
1299 if (op->contr->mode & PU_MISSILEWEAPON) 1287 if (op->contr->mode & PU_MISSILEWEAPON)
1300 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1288 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301 { 1289 {
1302 pick_up (op, tmp); 1290 CHK_PICK_PICKUP;
1303 continue; 1291 continue;
1304 } 1292 }
1305 1293
1306 /* careful: chairs and tables are weapons! */ 1294 /* careful: chairs and tables are weapons! */
1307 if (op->contr->mode & PU_ALLWEAPON) 1295 if (op->contr->mode & PU_ALLWEAPON)
… …
1309 if (tmp->type == WEAPON && tmp->name != NULL) 1297 if (tmp->type == WEAPON && tmp->name != NULL)
1310 { 1298 {
1311 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 &&
1312 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL) 1300 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313 { 1301 {
1314 pick_up (op, tmp); 1302 CHK_PICK_PICKUP;
1315 continue; 1303 continue;
1316 } 1304 }
1317 } 1305 }
1318 1306
1319 if (tmp->type == WEAPON && tmp->name == NULL) 1307 if (tmp->type == WEAPON && tmp->name == NULL)
1320 { 1308 {
1321 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)
1322 { 1310 {
1323 pick_up (op, tmp); 1311 CHK_PICK_PICKUP;
1324 continue; 1312 continue;
1325 } 1313 }
1326 } 1314 }
1327 } 1315 }
1328 1316
1329 /* misc stuff that's useful */ 1317 /* misc stuff that's useful */
1330 if (op->contr->mode & PU_KEY) 1318 if (op->contr->mode & PU_KEY)
1331 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1319 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332 { 1320 {
1333 pick_up (op, tmp); 1321 CHK_PICK_PICKUP;
1334 continue; 1322 continue;
1335 } 1323 }
1336 1324
1337 /* 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
1338 * pickups */ 1326 * pickups */
… …
1343 /* >=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
1344 * and multiply them by 5, giving 0..15*5== 5..75 */ 1332 * and multiply them by 5, giving 0..15*5== 5..75 */
1345 wvratio = (op->contr->mode & PU_RATIO) * 5; 1333 wvratio = (op->contr->mode & PU_RATIO) * 5;
1346 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)
1347 { 1335 {
1348 pick_up (op, tmp); 1336 CHK_PICK_PICKUP;
1349#if 0 1337#if 0
1350 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1338 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351 if (tmp->name != NULL) 1339 if (tmp->name != NULL)
1352 { 1340 {
1353 fprintf (stderr, "%s", tmp->name); 1341 fprintf (stderr, "%s", tmp->name);
… …
1372 * found object is returned. 1360 * found object is returned.
1373 */ 1361 */
1374object * 1362object *
1375find_arrow (object *op, const char *type) 1363find_arrow (object *op, const char *type)
1376{ 1364{
1377 object *tmp = 0;
1378
1379 for (op = op->inv; op; op = op->below) 1365 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1381 tmp = find_arrow (op, type);
1382 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);
1383 return op; 1374 return arrow;
1375 }
1384 1376
1385 return tmp; 1377 return 0;
1386} 1378}
1387 1379
1388/* 1380/*
1389 * 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
1390 * 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
… …
1413 } 1405 }
1414 } 1406 }
1415 else if (arrow->type == ARROW && arrow->race == type) 1407 else if (arrow->type == ARROW && arrow->race == type)
1416 { 1408 {
1417 /* allways prefer assasination/slaying */ 1409 /* allways prefer assasination/slaying */
1418 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1410 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1419 { 1411 {
1420 if (arrow->attacktype & AT_DEATH) 1412 if (arrow->attacktype & AT_DEATH)
1421 { 1413 {
1422 *better = 100; 1414 *better = 100;
1423 return arrow; 1415 return arrow;
… …
1611 arrow->destroy (); 1603 arrow->destroy ();
1612 return 0; 1604 return 0;
1613 } 1605 }
1614 1606
1615 left = arrow; /* these are arrows left to the player */ 1607 left = arrow; /* these are arrows left to the player */
1616 arrow = get_split_ob (arrow, 1); 1608 arrow = arrow->split ();
1617 if (!arrow) 1609 if (!arrow)
1618 { 1610 {
1619 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);
1620 return 0; 1612 return 0;
1621 } 1613 }
… …
1688 op->play_sound (sound_find ("fire_arrow")); 1680 op->play_sound (sound_find ("fire_arrow"));
1689 m->insert (arrow, sx, sy, op); 1681 m->insert (arrow, sx, sy, op);
1690 1682
1691 if (!arrow->destroyed ()) 1683 if (!arrow->destroyed ())
1692 move_arrow (arrow); 1684 move_arrow (arrow);
1693
1694 if (op->type == PLAYER)
1695 {
1696 if (left->destroyed ())
1697 esrv_del_item (op->contr, left->count);
1698 else
1699 esrv_send_item (op, left);
1700 }
1701 1685
1702 return 1; 1686 return 1;
1703} 1687}
1704 1688
1705/* Special fire code for players - this takes into 1689/* Special fire code for players - this takes into
… …
1779 return; 1763 return;
1780 } 1764 }
1781 } 1765 }
1782 else if (item->type == ROD || item->type == HORN) 1766 else if (item->type == ROD || item->type == HORN)
1783 { 1767 {
1784 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1768 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1769
1770 // using the maximum of the rods charge allows at least one spell cast
1771 // for a rod or horn, this fixes some broken rods.
1772 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1785 { 1773 {
1786 op->contr->play_sound (sound_find ("wand_poof")); 1774 op->contr->play_sound (sound_find ("wand_poof"));
1787 1775
1788 if (item->type == ROD) 1776 if (item->type == ROD)
1789 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1808 CLEAR_FLAG (item, FLAG_ANIMATE); 1796 CLEAR_FLAG (item, FLAG_ANIMATE);
1809 item->face = item->arch->face; 1797 item->face = item->arch->face;
1810 item->set_speed (0); 1798 item->set_speed (0);
1811 } 1799 }
1812 1800
1813 if ((tmp = item->in_player ())) 1801 if (object *pl = item->visible_to ())
1814 esrv_update_item (UPD_ANIM, tmp, item); 1802 esrv_update_item (UPD_ANIM, pl, item);
1815 } 1803 }
1816 } 1804 }
1817 else if (item->type == ROD || item->type == HORN) 1805 else if (item->type == ROD || item->type == HORN)
1818 drain_rod_charge (item); 1806 drain_rod_charge (item);
1819 } 1807 }
… …
1990 1978
1991 if (door->type == DOOR) 1979 if (door->type == DOOR)
1992 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1980 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1993 else if (door->type == LOCKED_DOOR) 1981 else if (door->type == LOCKED_DOOR)
1994 { 1982 {
1995 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1983 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1996 remove_door2 (door); /* remove door without violence ;-) */ 1984 remove_door2 (door); /* remove door without violence ;-) */
1997 } 1985 }
1998 1986
1999 /* Do this after we print the message */ 1987 /* Do this after we print the message */
2000 decrease_ob (key); /* Use up one of the keys */ 1988 key->decrease (); /* Use up one of the keys */
2001 /* Need to update the weight the container the key was in */
2002 if (container != op)
2003 esrv_update_item (UPD_WEIGHT, op, container);
2004 1989
2005 return 1; /* Nothing more to do below */ 1990 return 1; /* Nothing more to do below */
2006 } 1991 }
2007 else if (door->type == LOCKED_DOOR) 1992 else if (door->type == LOCKED_DOOR)
2008 { 1993 {
2009 /* Might as well return now - no other way to open this */ 1994 /* Might as well return now - no other way to open this */
2010 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1995 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2011 return 1; 1996 return 1;
2012 } 1997 }
2013 1998
2014 return 0; 1999 return 0;
2015} 2000}
… …
2135 { 2120 {
2136 op->play_sound (sound_find ("push_player")); 2121 op->play_sound (sound_find ("push_player"));
2137 push_ob (mon, dir, op); 2122 push_ob (mon, dir, op);
2138 } 2123 }
2139 else 2124 else
2140 new_draw_info (0, 0, op, "You withhold your attack"); 2125 op->statusmsg ("You withhold your attack");
2141 2126
2142 if (op->contr->tmp_invis || op->hide) 2127 if (op->contr->tmp_invis || op->hide)
2143 make_visible (op); 2128 make_visible (op);
2144 2129
2145 return true; 2130 return true;
… …
2189bool 2174bool
2190move_player (object *op, int dir) 2175move_player (object *op, int dir)
2191{ 2176{
2192 int pick; 2177 int pick;
2193 2178
2194 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2179 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2195 return 0; 2180 return 0;
2196 2181
2197 /* Sanity check: make sure dir is valid */ 2182 /* Sanity check: make sure dir is valid */
2198 if ((dir < 0) || (dir >= 9)) 2183 if ((dir < 0) || (dir >= 9))
2199 { 2184 {
… …
2287 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2272 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2288 { 2273 {
2289 op->play_sound (sound_find ("ob_evaporate")); 2274 op->play_sound (sound_find ("ob_evaporate"));
2290 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2275 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2291 2276
2292 if (op->contr)
2293 esrv_del_item (op->contr, tmp->count);
2294
2295 tmp->destroy (); 2277 tmp->destroy ();
2296 CLEAR_FLAG (op, FLAG_LIFESAVE); 2278 CLEAR_FLAG (op, FLAG_LIFESAVE);
2297 2279
2298 if (op->stats.hp < 0) 2280 if (op->stats.hp < 0)
2299 op->stats.hp = op->stats.maxhp; 2281 op->stats.hp = op->stats.maxhp;
… …
2311 return 0; 2293 return 0;
2312} 2294}
2313 2295
2314/* This goes throws the inventory and removes unpaid objects, and puts them 2296/* This goes throws the inventory and removes unpaid objects, and puts them
2315 * back in the map (location and map determined by values of env). This 2297 * back in the map (location and map determined by values of env). This
2316 * function will descend into containers. op is the object to start the search 2298 * function will descend into containers. op is the object to start the search
2317 * from. 2299 * from.
2318 */ 2300 */
2319static void 2301static void
2320drop_unpaid_items (object *op, object *env) 2302drop_unpaid_items (object *op, object *env)
2321{ 2303{
2322 while (op) 2304 while (op)
2323 { 2305 {
2324 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2306 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2325 2307
2326 if (QUERY_FLAG (op, FLAG_UNPAID)) 2308 if (QUERY_FLAG (op, FLAG_UNPAID))
2327 {
2328 if (env->type == PLAYER)
2329 esrv_del_item (env->contr, op->count);
2330
2331 op->insert_at (env); 2309 op->insert_at (env);
2332 }
2333 else if (op->inv) 2310 else if (op->inv)
2334 drop_unpaid_items (op->inv, env); 2311 drop_unpaid_items (op->inv, env);
2335 2312
2336 op = next; 2313 op = next;
2337 } 2314 }
… …
2349 * Moved from apply.c to player.c - player.c is what 2326 * Moved from apply.c to player.c - player.c is what
2350 * actually uses this function. player.c may not be quite the 2327 * actually uses this function. player.c may not be quite the
2351 * best, a misc file for object actions is probably better, 2328 * best, a misc file for object actions is probably better,
2352 * but there isn't one in the server directory. 2329 * but there isn't one in the server directory.
2353 */ 2330 */
2354char * 2331const char *
2355gravestone_text (object *op) 2332gravestone_text (object *op)
2356{ 2333{
2357 static char buf2[MAX_BUF]; 2334 static dynbuf_text buf;
2358 char buf[MAX_BUF];
2359 time_t now = time (NULL);
2360 2335
2361 strcpy (buf2, " R.I.P.\n\n"); 2336 buf << "---- R.I.P. ----\n\n";
2337 op->name;
2338
2362 if (op->type == PLAYER) 2339 if (op->type == PLAYER)
2363 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2340 buf << " the " << op->contr->title;
2364 else
2365 sprintf (buf, "%s\n", &op->name);
2366 2341
2367 strncat (buf2, " ", 20 - strlen (buf) / 2); 2342 buf << "\n\n";
2368 strcat (buf2, buf); 2343
2344 buf << "who was level ";
2345 buf << (sint32)op->level << "\n\n" // OO breakdown
2346 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2347
2369 if (op->type == PLAYER) 2348 if (op->type == PLAYER)
2370 sprintf (buf, "who was in level %d when killed\n", op->level); 2349 buf << "by " << op->contr->killer_name () << ".\n\n";
2371 else
2372 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2373 2350
2374 strncat (buf2, " ", 20 - strlen (buf) / 2);
2375 strcat (buf2, buf);
2376 if (op->type == PLAYER)
2377 { 2351 {
2378 sprintf (buf, "by %s.\n\n", op->contr->killer); 2352 static char buf2[128];
2379 strncat (buf2, " ", 21 - strlen (buf) / 2); 2353 time_t now = time (NULL);
2380 strcat (buf2, buf);
2381 }
2382
2383 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2354 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2384 strncat (buf2, " ", 20 - strlen (buf) / 2); 2355 buf << buf2;
2385 strcat (buf2, buf); 2356 }
2386 2357
2387 return buf2; 2358 return buf;
2388} 2359}
2389 2360
2390void 2361void
2391do_some_living (object *op) 2362do_some_living (object *op)
2392{ 2363{
… …
2444 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2415 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2445 else 2416 else
2446 { 2417 {
2447 gen_grace = op->stats.maxgrace; 2418 gen_grace = op->stats.maxgrace;
2448 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2419 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2449 }
2450
2451 /* Regenerate Spell Points */
2452 if (!op->contr->golem && --op->last_sp < 0)
2453 {
2454 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2455 if (op->stats.sp < op->stats.maxsp)
2456 {
2457 op->stats.sp++;
2458 /* dms do not consume food */
2459 if (!QUERY_FLAG (op, FLAG_WIZ))
2460 {
2461 op->stats.food--;
2462 if (op->contr->digestion < 0)
2463 op->stats.food += op->contr->digestion;
2464 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2465 op->stats.food = last_food;
2466 }
2467 }
2468
2469 if (max_sp > 1)
2470 {
2471 over_sp = (gen_sp + 10) / rate_sp;
2472 if (over_sp > 0)
2473 {
2474 if (op->stats.sp < op->stats.maxsp)
2475 {
2476 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2477
2478 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2479 op->stats.sp--;
2480
2481 if (op->stats.sp > op->stats.maxsp)
2482 op->stats.sp = op->stats.maxsp;
2483 }
2484 op->last_sp = 0;
2485 }
2486 else
2487 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2488 }
2489 else
2490 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2491 } 2420 }
2492 2421
2493 /* Regenerate Grace */ 2422 /* Regenerate Grace */
2494 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2423 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2495 if (--op->last_grace < 0) 2424 if (--op->last_grace < 0)
… …
2516 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2445 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2517 } 2446 }
2518 /* wearing stuff doesn't detract from grace generation. */ 2447 /* wearing stuff doesn't detract from grace generation. */
2519 } 2448 }
2520 2449
2450 if (op->stats.food > 0)
2451 {
2521 /* Regenerate Hit Points */ 2452 /* Regenerate Spell Points */
2522 if (--op->last_heal < 0) 2453 if (!op->contr->golem && --op->last_sp < 0)
2523 {
2524 if (op->stats.hp < op->stats.maxhp)
2525 { 2454 {
2526 op->stats.hp++; 2455 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2527 /* dms do not consume food */ 2456
2528 if (!QUERY_FLAG (op, FLAG_WIZ)) 2457 if (op->stats.sp < op->stats.maxsp)
2529 { 2458 {
2459 op->stats.sp++;
2460
2461 /* dms do not consume food */
2462 if (!QUERY_FLAG (op, FLAG_WIZ))
2463 {
2530 op->stats.food--; 2464 op->stats.food--;
2465
2531 if (op->contr->digestion < 0) 2466 if (op->contr->digestion < 0)
2532 op->stats.food += op->contr->digestion; 2467 op->stats.food += op->contr->digestion;
2533 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2468 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2534 op->stats.food = last_food; 2469 op->stats.food = last_food;
2470 }
2535 } 2471 }
2536 }
2537 2472
2538 if (max_hp > 1) 2473 if (max_sp > 1)
2539 {
2540 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2541 if (over_hp > 0)
2542 { 2474 {
2543 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2475 over_sp = (gen_sp + 10) / rate_sp;
2476 if (over_sp > 0)
2477 {
2478 if (op->stats.sp < op->stats.maxsp)
2479 {
2480 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2481
2482 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2483 op->stats.sp--;
2484
2485 if (op->stats.sp > op->stats.maxsp)
2486 op->stats.sp = op->stats.maxsp;
2487 }
2488
2544 op->last_heal = 0; 2489 op->last_sp = 0;
2490 }
2491 else
2492 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2545 } 2493 }
2546 else 2494 else
2495 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2496 }
2497
2498 /* Regenerate Hit Points */
2499 if (--op->last_heal < 0)
2500 {
2501 if (op->stats.hp < op->stats.maxhp)
2547 { 2502 {
2548 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2503 op->stats.hp++;
2504
2505 /* dms do not consume food */
2506 if (!QUERY_FLAG (op, FLAG_WIZ))
2507 {
2508 op->stats.food--;
2509
2510 if (op->contr->digestion < 0)
2511 op->stats.food += op->contr->digestion;
2512 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2513 op->stats.food = last_food;
2514 }
2549 } 2515 }
2516
2517 if (max_hp > 1)
2518 {
2519 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2520
2521 if (over_hp > 0)
2522 {
2523 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2524 op->last_heal = 0;
2525 }
2526 else
2527 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2550 } 2528 }
2551 else 2529 else
2552 {
2553 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2530 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2554 } 2531 }
2555 } 2532 }
2556 2533
2557 /* Digestion */ 2534 /* Digestion */
2558 if (--op->last_eat < 0) 2535 if (--op->last_eat < 0)
… …
2595 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2572 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2596 manual_apply (op, flesh, 0); 2573 manual_apply (op, flesh, 0);
2597 } 2574 }
2598 } 2575 }
2599 2576
2600 while (op->stats.food < 0 && op->stats.hp >= 0) 2577 if (op->stats.food < 0 && op->stats.hp >= -op->stats.food)
2601 op->stats.food++, op->stats.hp--; 2578 {
2579 op->stats.hp += op->stats.food;
2580 op->stats.food = 0;
2581 }
2602 2582
2603 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2583 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2604 kill_player (op); 2584 kill_player (op);
2605 } 2585 }
2606} 2586}
… …
2611 * file. 2591 * file.
2612 */ 2592 */
2613void 2593void
2614kill_player (object *op) 2594kill_player (object *op)
2615{ 2595{
2596 int x, y;
2616 char buf[MAX_BUF]; 2597 char buf[MAX_BUF];
2617 int x, y;
2618
2619 //int i;
2620 maptile *map; /* this is for resurrection */ 2598 maptile *map; /* this is for resurrection */
2621
2622 /* int z;
2623 int num_stats_lose;
2624 int lost_a_stat;
2625 int lose_this_stat;
2626 int this_stat; */
2627 int will_kill_again; 2599 int will_kill_again;
2628 archetype *at; 2600 archetype *at;
2629 object *tmp; 2601 object *tmp;
2630 2602
2631 if (save_life (op)) 2603 if (save_life (op))
… …
2653 { 2625 {
2654 tmp->destroy (); 2626 tmp->destroy ();
2655 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2627 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2656 } 2628 }
2657 2629
2658 cure_disease (op, 0); /* remove any disease */ 2630 cure_disease (op, 0, 0); /* remove any disease */
2659 op->stats.hp = op->stats.maxhp; 2631 op->stats.hp = op->stats.maxhp;
2660 if (op->stats.food <= 0) 2632 if (op->stats.food <= 0)
2661 op->stats.food = 999; 2633 op->stats.food = 999;
2662 2634
2663 /* create a bodypart-trophy to make the winner happy */ 2635 /* create a bodypart-trophy to make the winner happy */
2664 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2636 if (object *tmp = arch_to_object (archetype::find ("finger")))
2665 { 2637 {
2666 sprintf (buf, "%s's finger", &op->name); 2638 tmp->name = format ("%s's finger" , &op->name);
2667 tmp->name = buf; 2639 tmp->name_pl = format ("%s's fingers", &op->name);
2668 sprintf (buf, " This finger has been cut off %s\n"
2669 " the %s, when he was defeated at\n level %d by %s.\n",
2670 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2671 tmp->msg = buf; 2640 tmp->msg = format (
2641 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2642 &op->name, op->contr->title,
2643 (int)op->level,
2644 op->contr->killer_name ()
2645 );
2672 tmp->value = 0, tmp->type = 0; 2646 tmp->value = 0, tmp->type = 0;
2673 tmp->materialname = "organics"; 2647 tmp->materialname = "organics";
2674 tmp->insert_at (op, tmp); 2648 tmp->insert_at (op, tmp);
2675 } 2649 }
2676 2650
… …
2684 2658
2685 command_kill_pets (op, 0); 2659 command_kill_pets (op, 0);
2686 2660
2687 if (op->stats.food < 0) 2661 if (op->stats.food < 0)
2688 { 2662 {
2689 sprintf (buf, "%s starved to death.", &op->name); 2663 op->contr->killer = archetype::get ("killer_starvation");
2690 strcpy (op->contr->killer, "starvation"); 2664 op->contr->killer->destroy ();
2691 } 2665 }
2692 else
2693 sprintf (buf, "%s died.", &op->name);
2694 2666
2695 op->contr->play_sound (sound_find ("player_dies")); 2667 op->contr->play_sound (sound_find ("player_dies"));
2696 2668
2697 /* save the map location for corpse, gravestone */ 2669 /* save the map location for corpse, gravestone */
2698 x = op->x; 2670 x = op->x;
… …
2831 tmp = arch_to_object (archetype::find ("gravestone")); 2803 tmp = arch_to_object (archetype::find ("gravestone"));
2832 sprintf (buf, "%s's gravestone", &op->name); 2804 sprintf (buf, "%s's gravestone", &op->name);
2833 tmp->name = buf; 2805 tmp->name = buf;
2834 sprintf (buf, "%s's gravestones", &op->name); 2806 sprintf (buf, "%s's gravestones", &op->name);
2835 tmp->name_pl = buf; 2807 tmp->name_pl = buf;
2836 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer); 2808 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2837 tmp->msg = buf; 2809 tmp->msg = buf;
2838 tmp->x = op->x, tmp->y = op->y; 2810 tmp->x = op->x, tmp->y = op->y;
2839 insert_ob_in_map (tmp, op->map, NULL, 0); 2811 insert_ob_in_map (tmp, op->map, NULL, 0);
2840 2812
2841 /**************************************/ 2813 /**************************************/
… …
2863 { 2835 {
2864 tmp->destroy (); 2836 tmp->destroy ();
2865 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2837 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2866 } 2838 }
2867 2839
2868 cure_disease (op, 0); /* remove any disease */ 2840 cure_disease (op, 0, 0); /* remove any disease */
2869 2841
2870 /*add_exp(op, (op->stats.exp * -0.20)); */ 2842 /*add_exp(op, (op->stats.exp * -0.20)); */
2871 apply_death_exp_penalty (op); 2843 apply_death_exp_penalty (op);
2872 if (op->stats.food < 100) 2844 if (op->stats.food < 100)
2873 op->stats.food = 900; 2845 op->stats.food = 900;
… …
2946 2918
2947 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2919 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2948 { 2920 {
2949 if (tmp->nrof > 1) 2921 if (tmp->nrof > 1)
2950 { 2922 {
2951 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2923 tmp->decrease (rndm (1, tmp->nrof - 1));
2952 tmp2->destroy ();
2953 insert_ob_in_map (tmp, op->map, NULL, 0); 2924 insert_ob_in_map (tmp, op->map, NULL, 0);
2954 } 2925 }
2955 else 2926 else
2956 tmp->destroy (); 2927 tmp->destroy ();
2957 } 2928 }
… …
2968void 2939void
2969fix_weight (void) 2940fix_weight (void)
2970{ 2941{
2971 for_all_players (pl) 2942 for_all_players (pl)
2972 { 2943 {
2973 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2944 sint32 old = pl->ob->carrying;
2974 2945
2975 if (old == sum) 2946 pl->ob->update_weight ();
2976 continue; 2947
2948 if (old != pl->ob->carrying)
2949 {
2977 pl->ob->update_stats (); 2950 pl->ob->update_stats ();
2978 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2951 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2952 }
2979 } 2953 }
2980} 2954}
2981 2955
2982void 2956void
2983fix_luck (void) 2957fix_luck (void)
… …
3027void 3001void
3028make_visible (object *op) 3002make_visible (object *op)
3029{ 3003{
3030 op->hide = 0; 3004 op->hide = 0;
3031 op->invisible = 0; 3005 op->invisible = 0;
3006
3032 if (op->type == PLAYER) 3007 if (op->type == PLAYER)
3033 { 3008 {
3034 op->contr->tmp_invis = 0; 3009 op->contr->tmp_invis = 0;
3035 op->contr->invis_race = 0; 3010 op->contr->invis_race = 0;
3036 } 3011 }
… …
3049 3024
3050/* look at the surrounding terrain to determine 3025/* look at the surrounding terrain to determine
3051 * the hideability of this object. Positive levels 3026 * the hideability of this object. Positive levels
3052 * indicate greater hideability. 3027 * indicate greater hideability.
3053 */ 3028 */
3054
3055int 3029int
3056hideability (object *ob) 3030hideability (object *ob)
3057{ 3031{
3058 int i, level = 0, mflag; 3032 int i, level = 0, mflag;
3059 sint16 x, y; 3033 sint16 x, y;
… …
3069 * as bad as carrying a light on a pitch dark map */ 3043 * as bad as carrying a light on a pitch dark map */
3070 if (has_carried_lights (ob)) 3044 if (has_carried_lights (ob))
3071 level = -(10 + (2 * ob->map->darkness)); 3045 level = -(10 + (2 * ob->map->darkness));
3072 3046
3073 /* scan through all nearby squares for terrain to hide in */ 3047 /* scan through all nearby squares for terrain to hide in */
3074 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3048 for (i = 0, x = ob->x, y = ob->y;
3049 i <= SIZEOFFREE1;
3050 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3075 { 3051 {
3076 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3052 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3077 if (mflag & P_OUT_OF_MAP) 3053 if (mflag & P_OUT_OF_MAP)
3078 {
3079 continue; 3054 continue;
3080 } 3055
3081 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3056 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3082 level += 2; 3057 level += 2;
3083 else /* open terrain! */ 3058 else /* open terrain! */
3084 level -= 1; 3059 level -= 1;
3085 } 3060 }
… …
3096 * spot (surrounded by clear terrain in broad daylight). -b.t. 3071 * spot (surrounded by clear terrain in broad daylight). -b.t.
3097 */ 3072 */
3098void 3073void
3099do_hidden_move (object *op) 3074do_hidden_move (object *op)
3100{ 3075{
3101 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3076 int hide = 0;
3102 object *skop;
3103 3077
3104 if (!op || !op->map) 3078 if (!op || !op->map)
3105 return; 3079 return;
3106 3080
3107 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3081 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3082 int num = random_roll (0, 19, op, PREFER_LOW);
3108 3083
3109 /* its *extremely* hard to run and sneak/hide at the same time! */ 3084 /* its *extremely* hard to run and sneak/hide at the same time! */
3110 if (op->type == PLAYER && op->contr->run_on) 3085 if (op->type == PLAYER && op->contr->run_on)
3111 if (!skop || num >= skop->level) 3086 if (!skop || num >= skop->level)
3112 { 3087 {
… …
3122 num -= hide; 3097 num -= hide;
3123 3098
3124 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3099 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3125 { 3100 {
3126 make_visible (op); 3101 make_visible (op);
3102
3127 if (op->type == PLAYER) 3103 if (op->type == PLAYER)
3128 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3104 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3129 } 3105 }
3130 else if (op->type == PLAYER && skop) 3106 else if (op->type == PLAYER && skop)
3131 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3107 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3184 * object op. This function works fine for monsters, 3160 * object op. This function works fine for monsters,
3185 * but we dont worry if the object isnt the top one in 3161 * but we dont worry if the object isnt the top one in
3186 * a pile (say a coin under a table would return "viewable" 3162 * a pile (say a coin under a table would return "viewable"
3187 * by this routine). Another question, should we be 3163 * by this routine). Another question, should we be
3188 * concerned with the direction the player is looking 3164 * concerned with the direction the player is looking
3189 * in? Realistically, most of use cant see stuff behind 3165 * in? Realistically, most of us can't see stuff behind
3190 * our backs...on the other hand, does the "facing" direction 3166 * our backs...on the other hand, does the "facing" direction
3191 * imply the way your head, or body is facing? Its possible 3167 * imply the way your head, or body is facing? It's possible
3192 * for them to differ. Sigh, this fctn could get a bit more complex. 3168 * for them to differ. Sigh, this fctn could get a bit more complex.
3193 * -b.t. 3169 * -b.t.
3194 * This function is now map tiling safe. 3170 * This function is now map tiling safe.
3195 */ 3171 */
3196
3197int 3172int
3198player_can_view (object *pl, object *op) 3173player_can_view (object *pl, object *op)
3199{ 3174{
3200 rv_vector rv; 3175 rv_vector rv;
3201 int dx, dy; 3176 int dx, dy;
… …
3213 3188
3214 get_rangevector (pl, op, &rv, 0x1); 3189 get_rangevector (pl, op, &rv, 0x1);
3215 3190
3216 /* starting with the 'head' part, lets loop 3191 /* starting with the 'head' part, lets loop
3217 * through the object and find if it has any 3192 * through the object and find if it has any
3218 * part that is in the los array but isnt on 3193 * part that is in the los array but isn't on
3219 * a blocked los square. 3194 * a blocked los square.
3220 * we use the archetype to figure out offsets. 3195 * we use the archetype to figure out offsets.
3221 */ 3196 */
3222 while (op) 3197 while (op)
3223 { 3198 {
… …
3226 3201
3227 /* only the viewable area the player sees is updated by LOS 3202 /* only the viewable area the player sees is updated by LOS
3228 * code, so we need to restrict ourselves to that range of values 3203 * code, so we need to restrict ourselves to that range of values
3229 * for any meaningful values. 3204 * for any meaningful values.
3230 */ 3205 */
3231 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3206 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3232 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3207 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3233 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3208 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3234 return 1; 3209 return 1;
3210
3235 op = op->more; 3211 op = op->more;
3236 } 3212 }
3213
3237 return 0; 3214 return 0;
3238} 3215}
3239 3216
3240/* routine for both players and monsters. We call this when 3217/* routine for both players and monsters. We call this when
3241 * there is a possibility for our action distrubing our hiding 3218 * there is a possibility for our action distrubing our hiding
… …
3244 * return 0. 3221 * return 0.
3245 */ 3222 */
3246int 3223int
3247action_makes_visible (object *op) 3224action_makes_visible (object *op)
3248{ 3225{
3249
3250 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3226 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3251 { 3227 {
3252 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3228 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3253 return 0; 3229 return 0;
3254 3230
… …
3260 { 3236 {
3261 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3237 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3262 return 1; 3238 return 1;
3263 } 3239 }
3264 } 3240 }
3241
3265 return 0; 3242 return 0;
3266} 3243}
3267 3244
3268/* op_on_battleground - checks if the given object op (usually 3245/* op_on_battleground - checks if the given object op (usually
3269 * a player) is standing on a valid battleground-tile, 3246 * a player) is standing on a valid battleground-tile,
… …
3274 * Default is to do the same as before, so only people wanting to have different points need worry about this 3251 * Default is to do the same as before, so only people wanting to have different points need worry about this
3275 */ 3252 */
3276int 3253int
3277op_on_battleground (object *op, int *x, int *y) 3254op_on_battleground (object *op, int *x, int *y)
3278{ 3255{
3279 object *tmp;
3280
3281 /* A battleground-tile needs the following attributes to be valid: 3256 /* A battleground-tile needs the following attributes to be valid:
3282 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3257 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3283 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3258 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3284 * and the exit-coordinates sp/hp must both be > 0. 3259 * and the exit-coordinates sp/hp must both be > 0.
3285 * => The intention here is to prevent abuse of the battleground- 3260 * => The intention here is to prevent abuse of the battleground-
3286 * feature (like pickable or hidden battleground tiles). */ 3261 * feature (like pickable or hidden battleground tiles). */
3287 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3262 for (object *tmp = op->below; tmp; tmp = tmp->below)
3288 { 3263 {
3289 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3264 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3290 { 3265 {
3291 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3266 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3292 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3267 && tmp->type == BATTLEGROUND
3268 && tmp->name == shstr_battleground
3269 && EXIT_X (tmp) && EXIT_Y (tmp))
3293 { 3270 {
3294 /*before we assign the exit, check if this is a teambattle */ 3271 /* before we assign the exit, check if this is a teambattle */
3295 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3272 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3296 { 3273 {
3297 object *invtmp;
3298
3299 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3274 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3300 { 3275 {
3301 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3276 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3302 { 3277 {
3303 if (x != NULL && y != NULL) 3278 if (x && y)
3304 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3279 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3280
3305 return 1; 3281 return 1;
3306 } 3282 }
3307 } 3283 }
3308 } 3284 }
3285
3309 if (x != NULL && y != NULL) 3286 if (x && y)
3310 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3287 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3288
3311 return 1; 3289 return 1;
3312 } 3290 }
3313 } 3291 }
3314 } 3292 }
3293
3315 /* If we got here, did not find a battleground */ 3294 /* If we got here, did not find a battleground */
3316 return 0; 3295 return 0;
3317} 3296}
3318 3297
3319/* 3298/*
… …
3335 char buf[MAX_BUF]; /* tmp. string buffer */ 3314 char buf[MAX_BUF]; /* tmp. string buffer */
3336 int i = 0, j = 0; 3315 int i = 0, j = 0;
3337 3316
3338 /* get the appropriate treasurelist */ 3317 /* get the appropriate treasurelist */
3339 if (atnr == ATNR_FIRE) 3318 if (atnr == ATNR_FIRE)
3340 trlist = treasurelist::find ("dragon_ability_fire"); 3319 trlist = treasurelist::find (shstr_dragon_ability_fire);
3341 else if (atnr == ATNR_COLD) 3320 else if (atnr == ATNR_COLD)
3342 trlist = treasurelist::find ("dragon_ability_cold"); 3321 trlist = treasurelist::find (shstr_dragon_ability_cold);
3343 else if (atnr == ATNR_ELECTRICITY) 3322 else if (atnr == ATNR_ELECTRICITY)
3344 trlist = treasurelist::find ("dragon_ability_elec"); 3323 trlist = treasurelist::find (shstr_dragon_ability_elec);
3345 else if (atnr == ATNR_POISON) 3324 else if (atnr == ATNR_POISON)
3346 trlist = treasurelist::find ("dragon_ability_poison"); 3325 trlist = treasurelist::find (shstr_dragon_ability_poison);
3347 3326
3348 if (trlist == NULL || who->type != PLAYER) 3327 if (trlist == NULL || who->type != PLAYER)
3349 return; 3328 return;
3350 3329
3351 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3330 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3469 else 3448 else
3470 { 3449 {
3471 /* generate misc. treasure */ 3450 /* generate misc. treasure */
3472 tmp = arch_to_object (tr->item); 3451 tmp = arch_to_object (tr->item);
3473 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3452 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3474 tmp = insert_ob_in_ob (tmp, who); 3453 who->insert (tmp);
3475 if (who->type == PLAYER)
3476 esrv_send_item (who, tmp);
3477 } 3454 }
3478} 3455}
3479 3456
3480/** 3457/**
3481 * Unready an object for a player. This function does nothing if the object was 3458 * Unready an object for a player. This function does nothing if the object was
… …
3510 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) 3487 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3511 return 0; 3488 return 0;
3512 3489
3513 return 100 - blocked_los [x][y]; 3490 return 100 - blocked_los [x][y];
3514} 3491}
3492
3493void
3494player::infobox (const char *title, const char *msg, int color)
3495{
3496 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3497}
3498
3499void
3500player::statusmsg (const char *msg, int color)
3501{
3502 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3503}
3504
3505void
3506player::failmsg (const char *msg, int color)
3507{
3508 play_sound (sound_find ("generic_failure"));
3509 statusmsg (msg, color);
3510}
3511

Diff Legend

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