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.153 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.182 by root, Thu Apr 17 14:06:03 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 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
… …
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, ob->weight + ob->carrying);
244 245
246 ob->update_stats ();
247
248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob);
250 esrv_add_spells (this, 0);
251
252 activate ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
300
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
249 for (object *op = ob->inv; op; op = op->below) 305 for (object *op = ob->inv; op; op = op->below)
… …
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 ob->close_container (); //TODO: client-specific
303
304 observe = ob;
305
306 deactivate ();
307}
308
309// the need for this function can be explained
310// by load_object not returning the object
311void
312player::set_object (object *op)
313{
314 ob = observe = op;
315 ob->contr = this; /* this aren't yet in archetype */
316
317 ob->speed = 1.0f;
318 ob->speed_left = 0.5f;
319
320 ob->direction = 5; /* So player faces south */
321} 327}
322 328
323void 329void
324player::set_observe (object *op) 330player::set_observe (object *op)
325{ 331{
… …
422 unsigned lastdist; 428 unsigned lastdist;
423 rv_vector rv; 429 rv_vector rv;
424 430
425 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 431 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426 { 432 {
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)) 433 if (!can_detect_enemy (mon, ol->ob, &rv))
455 continue; 434 continue;
456 435
457 if (lastdist > rv.distance) 436 if (lastdist > rv.distance)
458 { 437 {
… …
653 632
654 return firstdir; 633 return firstdir;
655} 634}
656 635
657void 636void
658give_initial_items (object *pl, treasurelist * items) 637give_initial_items (object *pl, treasurelist *items)
659{ 638{
660 object *op, *next = NULL;
661
662 if (pl->randomitems != NULL) 639 if (pl->randomitems)
663 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 640 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
664 641
665 for (op = pl->inv; op; op = next) 642 for (object *next, *op = pl->inv; op; op = next)
666 { 643 {
667 next = op->below; 644 next = op->below;
668 645
669 /* Forces get applied per default, unless they have the 646 /* Forces get applied per default, unless they have the
670 * flag "neutral" set. Sorry but I can't think of a better way 647 * flag "neutral" set. Sorry but I can't think of a better way
… …
675 /* we never give weapons/armour if these cannot be used 652 /* we never give weapons/armour if these cannot be used
676 * by this player due to race restrictions 653 * by this player due to race restrictions
677 */ 654 */
678 if (pl->type == PLAYER) 655 if (pl->type == PLAYER)
679 { 656 {
680 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 657 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
658 &&
681 (op->type == ARMOUR || op->type == BOOTS || 659 (op->type == ARMOUR || op->type == BOOTS
682 op->type == CLOAK || op->type == HELMET || 660 || op->type == CLOAK || op->type == HELMET
683 op->type == SHIELD || op->type == GLOVES || 661 || op->type == SHIELD || op->type == GLOVES
662 || op->type == BRACERS || op->type == GIRDLE))
684 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 663 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
685 { 664 {
686 op->destroy (); 665 op->destroy ();
687 continue; 666 continue;
688 } 667 }
689 } 668 }
… …
712 if (op->nrof > 1) 691 if (op->nrof > 1)
713 op->nrof = 1; 692 op->nrof = 1;
714 } 693 }
715 694
716 if (op->type == SPELLBOOK && op->inv) 695 if (op->type == SPELLBOOK && op->inv)
717 {
718 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 696 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
719 }
720 697
721 /* Give starting characters identified, uncursed, and undamned 698 /* Give starting characters identified, uncursed, and undamned
722 * items. Just don't identify gold or silver, or it won't be 699 * items. Just don't identify gold or silver, or it won't be
723 * merged properly. 700 * merged properly.
724 */ 701 */
725 if (need_identify (op)) 702 if (need_identify (op))
726 { 703 {
727 SET_FLAG (op, FLAG_IDENTIFIED); 704 SET_FLAG (op, FLAG_IDENTIFIED);
728 CLEAR_FLAG (op, FLAG_CURSED); 705 CLEAR_FLAG (op, FLAG_CURSED);
729 CLEAR_FLAG (op, FLAG_DAMNED); 706 CLEAR_FLAG (op, FLAG_DAMNED);
730 } 707 }
708
731 if (op->type == SPELL) 709 if (op->type == SPELL)
732 { 710 {
733 op->destroy (); 711 op->destroy ();
734 continue; 712 continue;
735 } 713 }
… …
737 { 715 {
738 SET_FLAG (op, FLAG_CAN_USE_SKILL); 716 SET_FLAG (op, FLAG_CAN_USE_SKILL);
739 op->stats.exp = 0; 717 op->stats.exp = 0;
740 op->level = 1; 718 op->level = 1;
741 } 719 }
742 /* lock all 'normal items by default */ 720 else /* lock all 'normal items by default */
743 else
744 SET_FLAG (op, FLAG_INV_LOCKED); 721 SET_FLAG (op, FLAG_INV_LOCKED);
745 } /* for loop of objects in player inv */ 722 } /* for loop of objects in player inv */
746 723
747 /* Need to set up the skill pointers */ 724 /* Need to set up the skill pointers */
748 link_player_skills (pl); 725 link_player_skills (pl);
… …
854static void 831static void
855start_info (object *op) 832start_info (object *op)
856{ 833{
857 char buf[MAX_BUF]; 834 char buf[MAX_BUF];
858 835
859 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 836 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
860 new_draw_info (NDI_UNIQUE, 0, op, buf); 837 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} 838}
864 839
865/* This function takes the key that is passed, and does the 840/* This function takes the key that is passed, and does the
866 * appropriate action with it (change race, or other things). 841 * appropriate action with it (change race, or other things).
867 * The function name is for historical reasons - now we have 842 * The function name is for historical reasons - now we have
… …
1030 if (op->move_type & MOVE_FLYING) 1005 if (op->move_type & MOVE_FLYING)
1031 return 1; 1006 return 1;
1032 1007
1033 next = op->below; 1008 next = op->below;
1034 1009
1010 int cnt = MAX_ITEM_PER_DROP;
1011#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1012
1035 /* loop while there are items on the floor that are not marked as 1013 /* loop while there are items on the floor that are not marked as
1036 * destroyed */ 1014 * destroyed */
1037 while (next && !next->destroyed ()) 1015 while (next && !next->destroyed ())
1038 { 1016 {
1039 tmp = next; 1017 tmp = next;
1040 next = tmp->below; 1018 next = tmp->below;
1041 1019
1020 if (cnt <= 0)
1021 {
1022 op->failmsg ("Couldn't pickup all items at once.");
1023 return 0;
1024 }
1025
1042 if (op->destroyed ()) 1026 if (op->destroyed ())
1043 return 0; 1027 return 0;
1044 1028
1045 if (!can_pick (op, tmp)) 1029 if (!can_pick (op, tmp))
1046 continue; 1030 continue;
1047 1031
1048 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1032 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1049 { 1033 {
1050 if (item_matched_string (op, tmp, op->contr->search_str)) 1034 if (item_matched_string (op, tmp, op->contr->search_str))
1051 pick_up (op, tmp); 1035 CHK_PICK_PICKUP;
1052 continue; 1036 continue;
1053 } 1037 }
1054 1038
1055 /* high not bit set? We're using the old autopickup model */ 1039 /* high not bit set? We're using the old autopickup model */
1056 if (!(op->contr->mode & PU_NEWMODE)) 1040 if (!(op->contr->mode & PU_NEWMODE))
… …
1058 switch (op->contr->mode) 1042 switch (op->contr->mode)
1059 { 1043 {
1060 case 0: 1044 case 0:
1061 return 1; /* don't pick up */ 1045 return 1; /* don't pick up */
1062 case 1: 1046 case 1:
1063 pick_up (op, tmp); 1047 CHK_PICK_PICKUP;
1064 return 1; 1048 return 1;
1065 case 2: 1049 case 2:
1066 pick_up (op, tmp); 1050 CHK_PICK_PICKUP;
1067 return 0; 1051 return 0;
1068 case 3: 1052 case 3:
1069 return 0; /* stop before pickup */ 1053 return 0; /* stop before pickup */
1070 case 4: 1054 case 4:
1071 pick_up (op, tmp); 1055 CHK_PICK_PICKUP;
1072 break; 1056 break;
1073 case 5: 1057 case 5:
1074 pick_up (op, tmp); 1058 CHK_PICK_PICKUP;
1075 stop = 1; 1059 stop = 1;
1076 break; 1060 break;
1077 case 6: 1061 case 6:
1078 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1062 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1079 pick_up (op, tmp); 1063 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1064 CHK_PICK_PICKUP;
1080 break; 1065 break;
1081 1066
1082 case 7: 1067 case 7:
1083 if (tmp->type == MONEY || tmp->type == GEM) 1068 if (tmp->type == MONEY || tmp->type == GEM)
1084 pick_up (op, tmp); 1069 CHK_PICK_PICKUP;
1085 break; 1070 break;
1086 1071
1087 default: 1072 default:
1088 /* use value density */ 1073 /* use value density */
1089 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1074 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1090 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1075 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1091 pick_up (op, tmp); 1076 CHK_PICK_PICKUP;
1092 } 1077 }
1093 } 1078 }
1094 else 1079 else
1095 { /* old model */ 1080 { /* old model */
1096 /* NEW pickup handling */ 1081 /* NEW pickup handling */
… …
1151 /* all food and drink if desired */ 1136 /* all food and drink if desired */
1152 /* question: don't pick up known-poisonous stuff? */ 1137 /* question: don't pick up known-poisonous stuff? */
1153 if (op->contr->mode & PU_FOOD) 1138 if (op->contr->mode & PU_FOOD)
1154 if (tmp->type == FOOD) 1139 if (tmp->type == FOOD)
1155 { 1140 {
1156 pick_up (op, tmp); 1141 CHK_PICK_PICKUP;
1157 continue; 1142 continue;
1158 } 1143 }
1159 1144
1160 if (op->contr->mode & PU_DRINK) 1145 if (op->contr->mode & PU_DRINK)
1161 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1146 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1162 { 1147 {
1163 pick_up (op, tmp); 1148 CHK_PICK_PICKUP;
1164 continue; 1149 continue;
1165 } 1150 }
1166 1151
1167 if (op->contr->mode & PU_POTION) 1152 if (op->contr->mode & PU_POTION)
1168 if (tmp->type == POTION) 1153 if (tmp->type == POTION)
1169 { 1154 {
1170 pick_up (op, tmp); 1155 CHK_PICK_PICKUP;
1171 continue; 1156 continue;
1172 } 1157 }
1173 1158
1174 /* spellbooks, skillscrolls and normal books/scrolls */ 1159 /* spellbooks, skillscrolls and normal books/scrolls */
1175 if (op->contr->mode & PU_SPELLBOOK) 1160 if (op->contr->mode & PU_SPELLBOOK)
1176 if (tmp->type == SPELLBOOK) 1161 if (tmp->type == SPELLBOOK)
1177 { 1162 {
1178 pick_up (op, tmp); 1163 CHK_PICK_PICKUP;
1179 continue; 1164 continue;
1180 } 1165 }
1181 1166
1182 if (op->contr->mode & PU_SKILLSCROLL) 1167 if (op->contr->mode & PU_SKILLSCROLL)
1183 if (tmp->type == SKILLSCROLL) 1168 if (tmp->type == SKILLSCROLL)
1184 { 1169 {
1185 pick_up (op, tmp); 1170 CHK_PICK_PICKUP;
1186 continue; 1171 continue;
1187 } 1172 }
1188 1173
1189 if (op->contr->mode & PU_READABLES) 1174 if (op->contr->mode & PU_READABLES)
1190 if (tmp->type == BOOK || tmp->type == SCROLL) 1175 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1191 { 1176 {
1192 pick_up (op, tmp); 1177 CHK_PICK_PICKUP;
1193 continue; 1178 continue;
1194 } 1179 }
1195 1180
1196 /* wands/staves/rods/horns */ 1181 /* wands/staves/rods/horns */
1197 if (op->contr->mode & PU_MAGIC_DEVICE) 1182 if (op->contr->mode & PU_MAGIC_DEVICE)
1198 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1183 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1199 { 1184 {
1200 pick_up (op, tmp); 1185 CHK_PICK_PICKUP;
1201 continue; 1186 continue;
1202 } 1187 }
1203 1188
1204 /* pick up all magical items */ 1189 /* pick up all magical items */
1205 if (op->contr->mode & PU_MAGICAL) 1190 if (op->contr->mode & PU_MAGICAL)
1206 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1191 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1207 { 1192 {
1208 pick_up (op, tmp); 1193 CHK_PICK_PICKUP;
1209 continue; 1194 continue;
1210 } 1195 }
1211 1196
1212 if (op->contr->mode & PU_VALUABLES) 1197 if (op->contr->mode & PU_VALUABLES)
1213 { 1198 {
1214 if (tmp->type == MONEY || tmp->type == GEM) 1199 if (tmp->type == MONEY || tmp->type == GEM)
1215 { 1200 {
1216 pick_up (op, tmp); 1201 CHK_PICK_PICKUP;
1217 continue; 1202 continue;
1218 } 1203 }
1219 } 1204 }
1220 1205
1221 /* rings & amulets - talismans seems to be typed AMULET */ 1206 /* rings & amulets - talismans seems to be typed AMULET */
1222 if (op->contr->mode & PU_JEWELS) 1207 if (op->contr->mode & PU_JEWELS)
1223 if (tmp->type == RING || tmp->type == AMULET) 1208 if (tmp->type == RING || tmp->type == AMULET)
1224 { 1209 {
1225 pick_up (op, tmp); 1210 CHK_PICK_PICKUP;
1226 continue; 1211 continue;
1227 } 1212 }
1228 1213
1229 /* we don't forget dragon food */ 1214 /* we don't forget dragon food */
1230 if (op->contr->mode & PU_FLESH) 1215 if (op->contr->mode & PU_FLESH)
1231 if (tmp->type == FLESH) 1216 if (tmp->type == FLESH)
1232 { 1217 {
1233 pick_up (op, tmp); 1218 CHK_PICK_PICKUP;
1234 continue; 1219 continue;
1235 } 1220 }
1236 1221
1237 /* bows and arrows. Bows are good for selling! */ 1222 /* bows and arrows. Bows are good for selling! */
1238 if (op->contr->mode & PU_BOW) 1223 if (op->contr->mode & PU_BOW)
1239 if (tmp->type == BOW) 1224 if (tmp->type == BOW)
1240 { 1225 {
1241 pick_up (op, tmp); 1226 CHK_PICK_PICKUP;
1242 continue; 1227 continue;
1243 } 1228 }
1244 1229
1245 if (op->contr->mode & PU_ARROW) 1230 if (op->contr->mode & PU_ARROW)
1246 if (tmp->type == ARROW) 1231 if (tmp->type == ARROW)
1247 { 1232 {
1248 pick_up (op, tmp); 1233 CHK_PICK_PICKUP;
1249 continue; 1234 continue;
1250 } 1235 }
1251 1236
1252 /* all kinds of armor etc. */ 1237 /* all kinds of armor etc. */
1253 if (op->contr->mode & PU_ARMOUR) 1238 if (op->contr->mode & PU_ARMOUR)
1254 if (tmp->type == ARMOUR) 1239 if (tmp->type == ARMOUR)
1255 { 1240 {
1256 pick_up (op, tmp); 1241 CHK_PICK_PICKUP;
1257 continue; 1242 continue;
1258 } 1243 }
1259 1244
1260 if (op->contr->mode & PU_HELMET) 1245 if (op->contr->mode & PU_HELMET)
1261 if (tmp->type == HELMET) 1246 if (tmp->type == HELMET)
1262 { 1247 {
1263 pick_up (op, tmp); 1248 CHK_PICK_PICKUP;
1264 continue; 1249 continue;
1265 } 1250 }
1266 1251
1267 if (op->contr->mode & PU_SHIELD) 1252 if (op->contr->mode & PU_SHIELD)
1268 if (tmp->type == SHIELD) 1253 if (tmp->type == SHIELD)
1269 { 1254 {
1270 pick_up (op, tmp); 1255 CHK_PICK_PICKUP;
1271 continue; 1256 continue;
1272 } 1257 }
1273 1258
1274 if (op->contr->mode & PU_BOOTS) 1259 if (op->contr->mode & PU_BOOTS)
1275 if (tmp->type == BOOTS) 1260 if (tmp->type == BOOTS)
1276 { 1261 {
1277 pick_up (op, tmp); 1262 CHK_PICK_PICKUP;
1278 continue; 1263 continue;
1279 } 1264 }
1280 1265
1281 if (op->contr->mode & PU_GLOVES) 1266 if (op->contr->mode & PU_GLOVES)
1282 if (tmp->type == GLOVES) 1267 if (tmp->type == GLOVES)
1283 { 1268 {
1284 pick_up (op, tmp); 1269 CHK_PICK_PICKUP;
1285 continue; 1270 continue;
1286 } 1271 }
1287 1272
1288 if (op->contr->mode & PU_CLOAK) 1273 if (op->contr->mode & PU_CLOAK)
1289 if (tmp->type == CLOAK) 1274 if (tmp->type == CLOAK)
1290 { 1275 {
1291 pick_up (op, tmp); 1276 CHK_PICK_PICKUP;
1292 continue; 1277 continue;
1293 } 1278 }
1294 1279
1295 /* hoping to catch throwing daggers here */ 1280 /* hoping to catch throwing daggers here */
1296 if (op->contr->mode & PU_MISSILEWEAPON) 1281 if (op->contr->mode & PU_MISSILEWEAPON)
1297 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1282 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1298 { 1283 {
1299 pick_up (op, tmp); 1284 CHK_PICK_PICKUP;
1300 continue; 1285 continue;
1301 } 1286 }
1302 1287
1303 /* careful: chairs and tables are weapons! */ 1288 /* careful: chairs and tables are weapons! */
1304 if (op->contr->mode & PU_ALLWEAPON) 1289 if (op->contr->mode & PU_ALLWEAPON)
… …
1306 if (tmp->type == WEAPON && tmp->name != NULL) 1291 if (tmp->type == WEAPON && tmp->name != NULL)
1307 { 1292 {
1308 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL && 1293 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1309 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL) 1294 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310 { 1295 {
1311 pick_up (op, tmp); 1296 CHK_PICK_PICKUP;
1312 continue; 1297 continue;
1313 } 1298 }
1314 } 1299 }
1315 1300
1316 if (tmp->type == WEAPON && tmp->name == NULL) 1301 if (tmp->type == WEAPON && tmp->name == NULL)
1317 { 1302 {
1318 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL) 1303 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1319 { 1304 {
1320 pick_up (op, tmp); 1305 CHK_PICK_PICKUP;
1321 continue; 1306 continue;
1322 } 1307 }
1323 } 1308 }
1324 } 1309 }
1325 1310
1326 /* misc stuff that's useful */ 1311 /* misc stuff that's useful */
1327 if (op->contr->mode & PU_KEY) 1312 if (op->contr->mode & PU_KEY)
1328 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1313 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1329 { 1314 {
1330 pick_up (op, tmp); 1315 CHK_PICK_PICKUP;
1331 continue; 1316 continue;
1332 } 1317 }
1333 1318
1334 /* any of the last 4 bits set means we use the ratio for value 1319 /* any of the last 4 bits set means we use the ratio for value
1335 * pickups */ 1320 * pickups */
… …
1340 /* >=7 is the old standard setting. Now we take the last 4 bits 1325 /* >=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 */ 1326 * and multiply them by 5, giving 0..15*5== 5..75 */
1342 wvratio = (op->contr->mode & PU_RATIO) * 5; 1327 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) 1328 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1344 { 1329 {
1345 pick_up (op, tmp); 1330 CHK_PICK_PICKUP;
1346#if 0 1331#if 0
1347 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1332 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1348 if (tmp->name != NULL) 1333 if (tmp->name != NULL)
1349 { 1334 {
1350 fprintf (stderr, "%s", tmp->name); 1335 fprintf (stderr, "%s", tmp->name);
… …
1369 * found object is returned. 1354 * found object is returned.
1370 */ 1355 */
1371object * 1356object *
1372find_arrow (object *op, const char *type) 1357find_arrow (object *op, const char *type)
1373{ 1358{
1374 object *tmp = 0;
1375
1376 for (op = op->inv; op; op = op->below) 1359 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) 1360 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1361 return splay (tmp);
1362
1363 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1364 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1365 if (object *arrow = find_arrow (tmp, type))
1366 {
1367 splay (tmp);
1380 return op; 1368 return arrow;
1369 }
1381 1370
1382 return tmp; 1371 return 0;
1383} 1372}
1384 1373
1385/* 1374/*
1386 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1375 * 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 1376 * against the target. A full test is not performed, simply a basic test
… …
1680 1669
1681 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1670 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1682 arrow->move_type = MOVE_FLY_LOW; 1671 arrow->move_type = MOVE_FLY_LOW;
1683 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1672 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1684 1673
1685 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1674 op->play_sound (sound_find ("fire_arrow"));
1686 m->insert (arrow, sx, sy, op); 1675 m->insert (arrow, sx, sy, op);
1687 1676
1688 if (!arrow->destroyed ()) 1677 if (!arrow->destroyed ())
1689 move_arrow (arrow); 1678 move_arrow (arrow);
1690 1679
… …
1768 1757
1769 if (item->type == WAND) 1758 if (item->type == WAND)
1770 { 1759 {
1771 if (item->stats.food <= 0) 1760 if (item->stats.food <= 0)
1772 { 1761 {
1773 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1762 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)); 1763 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1775 1764
1776 return; 1765 return;
1777 } 1766 }
1778 } 1767 }
1779 else if (item->type == ROD || item->type == HORN) 1768 else if (item->type == ROD || item->type == HORN)
1780 { 1769 {
1781 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1770 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1782 { 1771 {
1783 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1772 op->contr->play_sound (sound_find ("wand_poof"));
1784 1773
1785 if (item->type == ROD) 1774 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)); 1775 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1787 else 1776 else
1788 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1777 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 */ 1966 /* If we found a key, do some extra work */
1978 if (key) 1967 if (key)
1979 { 1968 {
1980 object *container = key->env; 1969 object *container = key->env;
1981 1970
1982 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1983
1984 if (action_makes_visible (op)) 1971 if (action_makes_visible (op))
1985 make_visible (op); 1972 make_visible (op);
1986 1973
1987 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1974 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1988 spring_trap (door->inv, op); 1975 spring_trap (door->inv, op);
1989 1976
1990 if (door->type == DOOR) 1977 if (door->type == DOOR)
1991 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1978 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1992 else if (door->type == LOCKED_DOOR) 1979 else if (door->type == LOCKED_DOOR)
1993 { 1980 {
1994 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1981 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1995 remove_door2 (door); /* remove door without violence ;-) */ 1982 remove_door2 (door); /* remove door without violence ;-) */
1996 } 1983 }
1997 1984
1998 /* Do this after we print the message */ 1985 /* Do this after we print the message */
1999 decrease_ob (key); /* Use up one of the keys */ 1986 decrease_ob (key); /* Use up one of the keys */
… …
2004 return 1; /* Nothing more to do below */ 1991 return 1; /* Nothing more to do below */
2005 } 1992 }
2006 else if (door->type == LOCKED_DOOR) 1993 else if (door->type == LOCKED_DOOR)
2007 { 1994 {
2008 /* Might as well return now - no other way to open this */ 1995 /* Might as well return now - no other way to open this */
2009 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1996 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2010 return 1; 1997 return 1;
2011 } 1998 }
2012 1999
2013 return 0; 2000 return 0;
2014} 2001}
… …
2101 2088
2102 if (op->speed_left > 0.f) 2089 if (op->speed_left > 0.f)
2103 { 2090 {
2104 --op->speed_left; 2091 --op->speed_left;
2105 2092
2106 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2093 op->play_sound (sound_find ("push_player"));
2107 push_ob (mon, dir, op); 2094 push_ob (mon, dir, op);
2108 2095
2109 if (op->contr->tmp_invis || op->hide) 2096 if (op->contr->tmp_invis || op->hide)
2110 make_visible (op); 2097 make_visible (op);
2111 2098
… …
2130 { 2117 {
2131 --op->speed_left; 2118 --op->speed_left;
2132 2119
2133 if (!op->contr->braced) 2120 if (!op->contr->braced)
2134 { 2121 {
2135 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2122 op->play_sound (sound_find ("push_player"));
2136 push_ob (mon, dir, op); 2123 push_ob (mon, dir, op);
2137 } 2124 }
2138 else 2125 else
2139 new_draw_info (0, 0, op, "You withhold your attack"); 2126 op->statusmsg ("You withhold your attack");
2140 2127
2141 if (op->contr->tmp_invis || op->hide) 2128 if (op->contr->tmp_invis || op->hide)
2142 make_visible (op); 2129 make_visible (op);
2143 2130
2144 return true; 2131 return true;
… …
2188bool 2175bool
2189move_player (object *op, int dir) 2176move_player (object *op, int dir)
2190{ 2177{
2191 int pick; 2178 int pick;
2192 2179
2193 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2180 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2194 return 0; 2181 return 0;
2195 2182
2196 /* Sanity check: make sure dir is valid */ 2183 /* Sanity check: make sure dir is valid */
2197 if ((dir < 0) || (dir >= 9)) 2184 if ((dir < 0) || (dir >= 9))
2198 { 2185 {
… …
2283 return 0; 2270 return 0;
2284 2271
2285 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2272 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2286 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2273 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2287 { 2274 {
2288 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2275 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)); 2276 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2290 2277
2291 if (op->contr) 2278 if (op->contr)
2292 esrv_del_item (op->contr, tmp->count); 2279 esrv_del_item (op->contr, tmp->count);
2293 2280
… …
2313/* This goes throws the inventory and removes unpaid objects, and puts them 2300/* 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 2301 * 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 2302 * function will descend into containers. op is the object to start the search
2316 * from. 2303 * from.
2317 */ 2304 */
2318void 2305static void
2319remove_unpaid_objects (object *op, object *env) 2306drop_unpaid_items (object *op, object *env)
2320{ 2307{
2321 while (op) 2308 while (op)
2322 { 2309 {
2323 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2310 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2324 2311
… …
2328 esrv_del_item (env->contr, op->count); 2315 esrv_del_item (env->contr, op->count);
2329 2316
2330 op->insert_at (env); 2317 op->insert_at (env);
2331 } 2318 }
2332 else if (op->inv) 2319 else if (op->inv)
2333 remove_unpaid_objects (op->inv, env); 2320 drop_unpaid_items (op->inv, env);
2334 2321
2335 op = next; 2322 op = next;
2336 } 2323 }
2324}
2325
2326void
2327object::drop_unpaid_items ()
2328{
2329 if (!flag [FLAG_REMOVED])
2330 ::drop_unpaid_items (inv, this);
2337} 2331}
2338 2332
2339/* 2333/*
2340 * Returns pointer a static string containing gravestone text 2334 * Returns pointer a static string containing gravestone text
2341 * Moved from apply.c to player.c - player.c is what 2335 * Moved from apply.c to player.c - player.c is what
… …
2436 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2430 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2437 else 2431 else
2438 { 2432 {
2439 gen_grace = op->stats.maxgrace; 2433 gen_grace = op->stats.maxgrace;
2440 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2434 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 } 2435 }
2484 2436
2485 /* Regenerate Grace */ 2437 /* Regenerate Grace */
2486 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2438 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2487 if (--op->last_grace < 0) 2439 if (--op->last_grace < 0)
… …
2508 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2460 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2509 } 2461 }
2510 /* wearing stuff doesn't detract from grace generation. */ 2462 /* wearing stuff doesn't detract from grace generation. */
2511 } 2463 }
2512 2464
2465 if (op->stats.food > 0)
2466 {
2513 /* Regenerate Hit Points */ 2467 /* Regenerate Spell Points */
2514 if (--op->last_heal < 0) 2468 if (!op->contr->golem && --op->last_sp < 0)
2515 {
2516 if (op->stats.hp < op->stats.maxhp)
2517 { 2469 {
2518 op->stats.hp++; 2470 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2519 /* dms do not consume food */ 2471
2520 if (!QUERY_FLAG (op, FLAG_WIZ)) 2472 if (op->stats.sp < op->stats.maxsp)
2521 { 2473 {
2474 op->stats.sp++;
2475
2476 /* dms do not consume food */
2477 if (!QUERY_FLAG (op, FLAG_WIZ))
2478 {
2522 op->stats.food--; 2479 op->stats.food--;
2480
2523 if (op->contr->digestion < 0) 2481 if (op->contr->digestion < 0)
2524 op->stats.food += op->contr->digestion; 2482 op->stats.food += op->contr->digestion;
2525 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2483 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2526 op->stats.food = last_food; 2484 op->stats.food = last_food;
2485 }
2527 } 2486 }
2528 }
2529 2487
2530 if (max_hp > 1) 2488 if (max_sp > 1)
2531 {
2532 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533 if (over_hp > 0)
2534 { 2489 {
2535 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2490 over_sp = (gen_sp + 10) / rate_sp;
2491 if (over_sp > 0)
2492 {
2493 if (op->stats.sp < op->stats.maxsp)
2494 {
2495 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2496
2497 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2498 op->stats.sp--;
2499
2500 if (op->stats.sp > op->stats.maxsp)
2501 op->stats.sp = op->stats.maxsp;
2502 }
2503
2536 op->last_heal = 0; 2504 op->last_sp = 0;
2505 }
2506 else
2507 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2537 } 2508 }
2538 else 2509 else
2510 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2511 }
2512
2513 /* Regenerate Hit Points */
2514 if (--op->last_heal < 0)
2515 {
2516 if (op->stats.hp < op->stats.maxhp)
2539 { 2517 {
2540 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2518 op->stats.hp++;
2519
2520 /* dms do not consume food */
2521 if (!QUERY_FLAG (op, FLAG_WIZ))
2522 {
2523 op->stats.food--;
2524
2525 if (op->contr->digestion < 0)
2526 op->stats.food += op->contr->digestion;
2527 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2528 op->stats.food = last_food;
2529 }
2541 } 2530 }
2531
2532 if (max_hp > 1)
2533 {
2534 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2535
2536 if (over_hp > 0)
2537 {
2538 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2539 op->last_heal = 0;
2540 }
2541 else
2542 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2542 } 2543 }
2543 else 2544 else
2544 {
2545 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2545 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2546 } 2546 }
2547 } 2547 }
2548 2548
2549 /* Digestion */ 2549 /* Digestion */
2550 if (--op->last_eat < 0) 2550 if (--op->last_eat < 0)
2551 { 2551 {
2552 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2552 int bonus = max (0, op->contr->digestion),
2553 penalty = max (0, -op->contr->digestion);
2553 2554
2554 if (op->contr->gen_hp > 0)
2555 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2555 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 2556
2559 /* dms do not consume food */ 2557 /* dms do not consume food */
2560 if (!QUERY_FLAG (op, FLAG_WIZ)) 2558 if (!QUERY_FLAG (op, FLAG_WIZ))
2561 op->stats.food--; 2559 op->stats.food--;
2562 } 2560 }
… …
2589 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2587 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2590 manual_apply (op, flesh, 0); 2588 manual_apply (op, flesh, 0);
2591 } 2589 }
2592 } 2590 }
2593 2591
2594 while (op->stats.food < 0 && op->stats.hp >= 0) 2592 if (op->stats.food < 0)
2595 op->stats.food++, op->stats.hp--; 2593 {
2594 op->stats.hp += op->stats.food;
2595 op->stats.food = 0;
2596 }
2596 2597
2597 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2598 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2598 kill_player (op); 2599 kill_player (op);
2599 } 2600 }
2600} 2601}
… …
2605 * file. 2606 * file.
2606 */ 2607 */
2607void 2608void
2608kill_player (object *op) 2609kill_player (object *op)
2609{ 2610{
2611 int x, y;
2610 char buf[MAX_BUF]; 2612 char buf[MAX_BUF];
2611 int x, y;
2612
2613 //int i;
2614 maptile *map; /* this is for resurrection */ 2613 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; 2614 int will_kill_again;
2622 archetype *at; 2615 archetype *at;
2623 object *tmp; 2616 object *tmp;
2624 2617
2625 if (save_life (op)) 2618 if (save_life (op))
2626 return; 2619 return;
2627
2628 2620
2629 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2621 /* 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. 2622 * in cities ONLY!!! It is very important that this doesn't get abused.
2631 * Look at op_on_battleground() for more info --AndreasV 2623 * Look at op_on_battleground() for more info --AndreasV
2632 */ 2624 */
… …
2648 { 2640 {
2649 tmp->destroy (); 2641 tmp->destroy ();
2650 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2642 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2651 } 2643 }
2652 2644
2653 cure_disease (op, 0); /* remove any disease */ 2645 cure_disease (op, 0, 0); /* remove any disease */
2654 op->stats.hp = op->stats.maxhp; 2646 op->stats.hp = op->stats.maxhp;
2655 if (op->stats.food <= 0) 2647 if (op->stats.food <= 0)
2656 op->stats.food = 999; 2648 op->stats.food = 999;
2657 2649
2658 /* create a bodypart-trophy to make the winner happy */ 2650 /* create a bodypart-trophy to make the winner happy */
2659 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2651 if (object *tmp = arch_to_object (archetype::find ("finger")))
2660 { 2652 {
2661 sprintf (buf, "%s's finger", &op->name); 2653 tmp->name = format ("%s's finger" , &op->name);
2662 tmp->name = buf; 2654 tmp->name_pl = format ("%s's fingers", &op->name);
2663 sprintf (buf, " This finger has been cut off %s\n" 2655 tmp->msg = format (
2664 " the %s, when he was defeated at\n level %d by %s.\n", 2656 "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); 2657 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2666 tmp->msg = buf; 2658 );
2667 tmp->value = 0, tmp->type = 0; 2659 tmp->value = 0, tmp->type = 0;
2668 tmp->materialname = "organics"; 2660 tmp->materialname = "organics";
2669 tmp->insert_at (op, tmp); 2661 tmp->insert_at (op, tmp);
2670 } 2662 }
2671 2663
… …
2678 INVOKE_PLAYER (DEATH, op->contr); 2670 INVOKE_PLAYER (DEATH, op->contr);
2679 2671
2680 command_kill_pets (op, 0); 2672 command_kill_pets (op, 0);
2681 2673
2682 if (op->stats.food < 0) 2674 if (op->stats.food < 0)
2683 {
2684 sprintf (buf, "%s starved to death.", &op->name);
2685 strcpy (op->contr->killer, "starvation"); 2675 strcpy (op->contr->killer, "starvation");
2686 }
2687 else
2688 sprintf (buf, "%s died.", &op->name);
2689 2676
2690 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2677 op->contr->play_sound (sound_find ("player_dies"));
2691 2678
2692 /* save the map location for corpse, gravestone */ 2679 /* save the map location for corpse, gravestone */
2693 x = op->x; 2680 x = op->x;
2694 y = op->y; 2681 y = op->y;
2695 map = op->map; 2682 map = op->map;
… …
2858 { 2845 {
2859 tmp->destroy (); 2846 tmp->destroy ();
2860 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2847 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2861 } 2848 }
2862 2849
2863 cure_disease (op, 0); /* remove any disease */ 2850 cure_disease (op, 0, 0); /* remove any disease */
2864 2851
2865 /*add_exp(op, (op->stats.exp * -0.20)); */ 2852 /*add_exp(op, (op->stats.exp * -0.20)); */
2866 apply_death_exp_penalty (op); 2853 apply_death_exp_penalty (op);
2867 if (op->stats.food < 100) 2854 if (op->stats.food < 100)
2868 op->stats.food = 900; 2855 op->stats.food = 900;
… …
2872 2859
2873 /* 2860 /*
2874 * Check to see if the player has any unpaid items. If so, remove them 2861 * Check to see if the player has any unpaid items. If so, remove them
2875 * and put them back in the map. 2862 * and put them back in the map.
2876 */ 2863 */
2877 remove_unpaid_objects (op->inv, op); 2864 op->drop_unpaid_items ();
2878 2865
2879 /****************************************/ 2866 /****************************************/
2880 /* */ 2867 /* */
2881 /* Move player to his current respawn- */ 2868 /* Move player to his current respawn- */
2882 /* position (usually last savebed) */ 2869 /* position (usually last savebed) */
… …
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++);
… …
3505 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))
3506 return 0; 3497 return 0;
3507 3498
3508 return 100 - blocked_los [x][y]; 3499 return 100 - blocked_los [x][y];
3509} 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