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.133 by root, Sat May 12 22:04:20 2007 UTC vs.
Revision 1.177 by root, Thu Dec 27 15:32:41 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
… …
157 op->x = -1; 156 op->x = -1;
158 op->y = -1; 157 op->y = -1;
159} 158}
160 159
161void 160void
162player::enter_map ()
163{
164 object *tmp = object::create ();
165
166 EXIT_PATH (tmp) = maplevel;
167 EXIT_X (tmp) = ob->x;
168 EXIT_Y (tmp) = ob->y;
169 ob->enter_exit (tmp);
170
171 tmp->destroy ();
172}
173
174void
175player::activate () 161player::activate ()
176{ 162{
177 if (active) 163 if (active)
178 return; 164 return;
179 165
… …
181 ob->remove (); 167 ob->remove ();
182 ob->map = 0; 168 ob->map = 0;
183 ob->activate_recursive (); 169 ob->activate_recursive ();
184 CLEAR_FLAG (ob, FLAG_FRIENDLY); 170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
185 add_friendly_object (ob); 171 add_friendly_object (ob);
186 enter_map ();
187} 172}
188 173
189void 174void
190player::deactivate () 175player::deactivate ()
191{ 176{
… …
198 183
199 if (ob->map) 184 if (ob->map)
200 maplevel = ob->map->path; 185 maplevel = ob->map->path;
201 186
202 ob->remove (); 187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
203 ob->map = 0; 189 ob->map = 0;
204 party = 0; 190 party = 0;
205 191
206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this 192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
207 193
… …
221 ob->close_container (); //TODO: client-specific 207 ob->close_container (); //TODO: client-specific
222 208
223 ns->update_look = 0; 209 ns->update_look = 0;
224 ns->look_position = 0; 210 ns->look_position = 0;
225 211
226 clear_los (ob); 212 clear_los (this);
227 213
228 ns->reset_stats (); 214 ns->reset_stats ();
229 215
230 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
231 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
232 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
233 219
234 ob->carrying = sum_weight (ob); 220 ob->carrying = sum_weight (ob);
235 link_player_skills (ob); 221 link_player_skills (ob);
236 222
237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238 224
239 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->object::name);
240 226
241 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
242 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
243 { 229 {
244 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
245 231
246 shstr_cmp dragon_ability_force ("dragon_ability_force");
247 shstr_cmp dragon_skin_force ("dragon_skin_force");
248
249 for (tmp = ob->inv; tmp; tmp = tmp->below) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
250 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
251 if (tmp->arch->name == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
252 abil = tmp; 235 abil = tmp;
253 else if (tmp->arch->name == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
254 skin = tmp; 237 skin = tmp;
255 238
256 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
257 } 240 }
258 241
259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
260 243
261 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this, ob->weight + ob->carrying);
245
246 ob->update_stats ();
247
248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob);
250 esrv_add_spells (this, 0);
251
252 activate ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
300
301 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false;
262 304
263 for (object *op = ob->inv; op; op = op->below) 305 for (object *op = ob->inv; op; op = op->below)
264 if (op->flag [FLAG_APPLIED]) 306 if (op->flag [FLAG_APPLIED])
265 switch (op->type) 307 switch (op->type)
266 { 308 {
309 case SKILL:
310 ob->flag [FLAG_APPLIED] = false;
311 break;
312
267 case WAND: 313 case WAND:
268 case ROD: 314 case ROD:
269 case HORN: 315 case HORN:
270 case BOW: 316 case BOW:
271 case SKILL: 317 ranged_ob = op;
272 case SKILL_TOOL: 318 break;
319
273 case WEAPON: 320 case WEAPON:
274 apply_special (ob, op, AP_UNAPPLY); 321 combat_ob = op;
275 apply_special (ob, op, AP_APPLY);
276 break; 322 break;
277 } 323 }
278 324
279 ob->update_stats (); 325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
280 ns->floorbox_update ();
281
282 esrv_send_inventory (ob, ob);
283 esrv_add_spells (this, 0);
284
285 activate ();
286
287 send_rules (ob);
288 send_news (ob);
289 display_motd (ob);
290
291 INVOKE_PLAYER (CONNECT, this);
292 INVOKE_PLAYER (LOGIN, this);
293} 326}
294 327
295void 328void
296player::disconnect ()
297{
298 if (ns)
299 {
300 if (active)
301 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
302
303 INVOKE_PLAYER (DISCONNECT, this);
304
305 ns->reset_stats ();
306 ns->pl = 0;
307 ns = 0;
308 }
309
310 if (ob)
311 ob->close_container (); //TODO: client-specific
312
313 deactivate ();
314}
315
316// the need for this function can be explained
317// by load_object not returning the object
318void
319player::set_object (object *op) 329player::set_observe (object *op)
320{ 330{
321 ob = op; 331 observe = op ? op : ob;
322 ob->contr = this; /* this aren't yet in archetype */ 332 do_los = 1;
323
324 ob->speed_left = 0.5f;
325 ob->speed = 1.0f;
326 ob->direction = 5; /* So player faces south */
327} 333}
328 334
329player::player () 335player::player ()
330{ 336{
331 /* There are some elements we want initialised to non zero value - 337 /* There are some elements we want initialised to non zero value -
… …
342 petmode = pet_normal; 348 petmode = pet_normal;
343 listening = 10; 349 listening = 10;
344 usekeys = containers; 350 usekeys = containers;
345 peaceful = 1; /* default peaceful */ 351 peaceful = 1; /* default peaceful */
346 do_los = 1; 352 do_los = 1;
353
354 weapon_sp = 1.0f;
355 weapon_sp_left = 0.5f;
347} 356}
348 357
349void 358void
350player::do_destroy () 359player::do_destroy ()
351{ 360{
… …
356 if (ob) 365 if (ob)
357 { 366 {
358 ob->destroy_inv (false); 367 ob->destroy_inv (false);
359 ob->destroy (); 368 ob->destroy ();
360 } 369 }
370
371 ob = observe = 0;
361} 372}
362 373
363player::~player () 374player::~player ()
364{ 375{
365 /* Clear item stack */ 376 /* Clear item stack */
… …
392 * Note: there MUST be at least one player archetype! 403 * Note: there MUST be at least one player archetype!
393 */ 404 */
394archetype * 405archetype *
395get_player_archetype (archetype *at) 406get_player_archetype (archetype *at)
396{ 407{
397 archetype *start = at; 408 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
398 409
399 for (;;) 410 for (;;)
400 { 411 {
401 if (at == NULL || at->next == NULL) 412 if (++i == archetypes.end ())
402 at = first_archetype; 413 i = archetypes.begin ();
403 else 414 else if (*i == at)
404 at = at->next; 415 cleanup ("not a single player archetype found");
405 416
406 if (at->clone.type == PLAYER) 417 if ((*i)->type == PLAYER)
407 return at; 418 return *i;
408
409 if (at == start)
410 {
411 LOG (llevError, "No Player archetypes\n");
412 exit (-1);
413 }
414 } 419 }
415} 420}
416 421
417object * 422object *
418get_nearest_player (object *mon) 423get_nearest_player (object *mon)
… …
422 unsigned lastdist; 427 unsigned lastdist;
423 rv_vector rv; 428 rv_vector rv;
424 429
425 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 430 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426 { 431 {
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)) 432 if (!can_detect_enemy (mon, ol->ob, &rv))
455 continue; 433 continue;
456 434
457 if (lastdist > rv.distance) 435 if (lastdist > rv.distance)
458 { 436 {
… …
655} 633}
656 634
657void 635void
658give_initial_items (object *pl, treasurelist * items) 636give_initial_items (object *pl, treasurelist * items)
659{ 637{
660 object *op, *next = NULL;
661
662 if (pl->randomitems != NULL) 638 if (pl->randomitems)
663 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 639 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
664 640
665 for (op = pl->inv; op; op = next) 641 for (object *next, *op = pl->inv; op; op = next)
666 { 642 {
667 next = op->below; 643 next = op->below;
668 644
669 /* Forces get applied per default, unless they have the 645 /* Forces get applied per default, unless they have the
670 * flag "neutral" set. Sorry but I can't think of a better way 646 * flag "neutral" set. Sorry but I can't think of a better way
… …
712 if (op->nrof > 1) 688 if (op->nrof > 1)
713 op->nrof = 1; 689 op->nrof = 1;
714 } 690 }
715 691
716 if (op->type == SPELLBOOK && op->inv) 692 if (op->type == SPELLBOOK && op->inv)
717 {
718 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 693 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
719 }
720 694
721 /* Give starting characters identified, uncursed, and undamned 695 /* Give starting characters identified, uncursed, and undamned
722 * items. Just don't identify gold or silver, or it won't be 696 * items. Just don't identify gold or silver, or it won't be
723 * merged properly. 697 * merged properly.
724 */ 698 */
… …
854static void 828static void
855start_info (object *op) 829start_info (object *op)
856{ 830{
857 char buf[MAX_BUF]; 831 char buf[MAX_BUF];
858 832
859 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 833 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
860 new_draw_info (NDI_UNIQUE, 0, op, buf); 834 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} 835}
864 836
865/* This function takes the key that is passed, and does the 837/* This function takes the key that is passed, and does the
866 * appropriate action with it (change race, or other things). 838 * appropriate action with it (change race, or other things).
867 * The function name is for historical reasons - now we have 839 * The function name is for historical reasons - now we have
… …
908 if (*first_map_ext_path) 880 if (*first_map_ext_path)
909 { 881 {
910 object *tmp; 882 object *tmp;
911 char mapname[MAX_BUF]; 883 char mapname[MAX_BUF];
912 884
913 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name); 885 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
914 tmp = object::create (); 886 tmp = object::create ();
915 EXIT_PATH (tmp) = mapname; 887 EXIT_PATH (tmp) = mapname;
916 EXIT_X (tmp) = ob->x; 888 EXIT_X (tmp) = ob->x;
917 EXIT_Y (tmp) = ob->y; 889 EXIT_Y (tmp) = ob->y;
918 ob->enter_exit (tmp); /* we don't really care if it succeeded; 890 ob->enter_exit (tmp); /* we don't really care if it succeeded;
… …
937 int x = ob->x, y = ob->y; 909 int x = ob->x, y = ob->y;
938 910
939 ob->remove_statbonus (); 911 ob->remove_statbonus ();
940 ob->remove (); 912 ob->remove ();
941 ob->arch = get_player_archetype (ob->arch); 913 ob->arch = get_player_archetype (ob->arch);
942 ob->arch->clone.copy_to (ob); 914 ob->arch->copy_to (ob);
943 ob->instantiate (); 915 ob->instantiate ();
944 ob->stats = ob->contr->orig_stats; 916 ob->stats = ob->contr->orig_stats;
945 ob->name = ob->name_pl = name; 917 ob->name = ob->name_pl = name;
946 ob->x = x; 918 ob->x = x;
947 ob->y = y; 919 ob->y = y;
948 SET_ANIMATION (ob, 2); /* So player faces south */ 920 SET_ANIMATION (ob, 2); /* So player faces south */
949 insert_ob_in_map (ob, ob->map, ob, 0); 921 insert_ob_in_map (ob, ob->map, ob, 0);
950 assign (ob->contr->title, ob->arch->clone.name); 922 assign (ob->contr->title, ob->arch->object::name);
951 ob->add_statbonus (); 923 ob->add_statbonus ();
952 } 924 }
953 while (!allowed_class (ob)); 925 while (!allowed_class (ob));
954 926
955 update_object (ob, UP_OBJ_FACE); 927 update_object (ob, UP_OBJ_FACE);
… …
1030 if (op->move_type & MOVE_FLYING) 1002 if (op->move_type & MOVE_FLYING)
1031 return 1; 1003 return 1;
1032 1004
1033 next = op->below; 1005 next = op->below;
1034 1006
1007 int cnt = MAX_ITEM_PER_DROP;
1008#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1009
1035 /* loop while there are items on the floor that are not marked as 1010 /* loop while there are items on the floor that are not marked as
1036 * destroyed */ 1011 * destroyed */
1037 while (next && !next->destroyed ()) 1012 while (next && !next->destroyed ())
1038 { 1013 {
1039 tmp = next; 1014 tmp = next;
1040 next = tmp->below; 1015 next = tmp->below;
1041 1016
1017 if (cnt <= 0)
1018 {
1019 op->failmsg ("Couldn't pickup all items at once.");
1020 return 0;
1021 }
1022
1042 if (op->destroyed ()) 1023 if (op->destroyed ())
1043 return 0; 1024 return 0;
1044 1025
1045 if (!can_pick (op, tmp)) 1026 if (!can_pick (op, tmp))
1046 continue; 1027 continue;
1047 1028
1048 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1029 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1049 { 1030 {
1050 if (item_matched_string (op, tmp, op->contr->search_str)) 1031 if (item_matched_string (op, tmp, op->contr->search_str))
1051 pick_up (op, tmp); 1032 CHK_PICK_PICKUP;
1052 continue; 1033 continue;
1053 } 1034 }
1054 1035
1055 /* high not bit set? We're using the old autopickup model */ 1036 /* high not bit set? We're using the old autopickup model */
1056 if (!(op->contr->mode & PU_NEWMODE)) 1037 if (!(op->contr->mode & PU_NEWMODE))
… …
1058 switch (op->contr->mode) 1039 switch (op->contr->mode)
1059 { 1040 {
1060 case 0: 1041 case 0:
1061 return 1; /* don't pick up */ 1042 return 1; /* don't pick up */
1062 case 1: 1043 case 1:
1063 pick_up (op, tmp); 1044 CHK_PICK_PICKUP;
1064 return 1; 1045 return 1;
1065 case 2: 1046 case 2:
1066 pick_up (op, tmp); 1047 CHK_PICK_PICKUP;
1067 return 0; 1048 return 0;
1068 case 3: 1049 case 3:
1069 return 0; /* stop before pickup */ 1050 return 0; /* stop before pickup */
1070 case 4: 1051 case 4:
1071 pick_up (op, tmp); 1052 CHK_PICK_PICKUP;
1072 break; 1053 break;
1073 case 5: 1054 case 5:
1074 pick_up (op, tmp); 1055 CHK_PICK_PICKUP;
1075 stop = 1; 1056 stop = 1;
1076 break; 1057 break;
1077 case 6: 1058 case 6:
1078 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1059 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1079 pick_up (op, tmp); 1060 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1061 CHK_PICK_PICKUP;
1080 break; 1062 break;
1081 1063
1082 case 7: 1064 case 7:
1083 if (tmp->type == MONEY || tmp->type == GEM) 1065 if (tmp->type == MONEY || tmp->type == GEM)
1084 pick_up (op, tmp); 1066 CHK_PICK_PICKUP;
1085 break; 1067 break;
1086 1068
1087 default: 1069 default:
1088 /* use value density */ 1070 /* use value density */
1089 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1071 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1090 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1072 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1091 pick_up (op, tmp); 1073 CHK_PICK_PICKUP;
1092 } 1074 }
1093 } 1075 }
1094 else 1076 else
1095 { /* old model */ 1077 { /* old model */
1096 /* NEW pickup handling */ 1078 /* NEW pickup handling */
… …
1100 if (tmp->name != NULL) 1082 if (tmp->name != NULL)
1101 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1083 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1102 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1084 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1103 else 1085 else
1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1086 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1087 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106 1088
1107 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1089 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1108 } 1090 }
1109 1091
1110 /* philosophy: 1092 /* philosophy:
… …
1151 /* all food and drink if desired */ 1133 /* all food and drink if desired */
1152 /* question: don't pick up known-poisonous stuff? */ 1134 /* question: don't pick up known-poisonous stuff? */
1153 if (op->contr->mode & PU_FOOD) 1135 if (op->contr->mode & PU_FOOD)
1154 if (tmp->type == FOOD) 1136 if (tmp->type == FOOD)
1155 { 1137 {
1156 pick_up (op, tmp); 1138 CHK_PICK_PICKUP;
1157 continue; 1139 continue;
1158 } 1140 }
1159 1141
1160 if (op->contr->mode & PU_DRINK) 1142 if (op->contr->mode & PU_DRINK)
1161 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1143 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1162 { 1144 {
1163 pick_up (op, tmp); 1145 CHK_PICK_PICKUP;
1164 continue; 1146 continue;
1165 } 1147 }
1166 1148
1167 if (op->contr->mode & PU_POTION) 1149 if (op->contr->mode & PU_POTION)
1168 if (tmp->type == POTION) 1150 if (tmp->type == POTION)
1169 { 1151 {
1170 pick_up (op, tmp); 1152 CHK_PICK_PICKUP;
1171 continue; 1153 continue;
1172 } 1154 }
1173 1155
1174 /* spellbooks, skillscrolls and normal books/scrolls */ 1156 /* spellbooks, skillscrolls and normal books/scrolls */
1175 if (op->contr->mode & PU_SPELLBOOK) 1157 if (op->contr->mode & PU_SPELLBOOK)
1176 if (tmp->type == SPELLBOOK) 1158 if (tmp->type == SPELLBOOK)
1177 { 1159 {
1178 pick_up (op, tmp); 1160 CHK_PICK_PICKUP;
1179 continue; 1161 continue;
1180 } 1162 }
1181 1163
1182 if (op->contr->mode & PU_SKILLSCROLL) 1164 if (op->contr->mode & PU_SKILLSCROLL)
1183 if (tmp->type == SKILLSCROLL) 1165 if (tmp->type == SKILLSCROLL)
1184 { 1166 {
1185 pick_up (op, tmp); 1167 CHK_PICK_PICKUP;
1186 continue; 1168 continue;
1187 } 1169 }
1188 1170
1189 if (op->contr->mode & PU_READABLES) 1171 if (op->contr->mode & PU_READABLES)
1190 if (tmp->type == BOOK || tmp->type == SCROLL) 1172 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1191 { 1173 {
1192 pick_up (op, tmp); 1174 CHK_PICK_PICKUP;
1193 continue; 1175 continue;
1194 } 1176 }
1195 1177
1196 /* wands/staves/rods/horns */ 1178 /* wands/staves/rods/horns */
1197 if (op->contr->mode & PU_MAGIC_DEVICE) 1179 if (op->contr->mode & PU_MAGIC_DEVICE)
1198 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1180 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1199 { 1181 {
1200 pick_up (op, tmp); 1182 CHK_PICK_PICKUP;
1201 continue; 1183 continue;
1202 } 1184 }
1203 1185
1204 /* pick up all magical items */ 1186 /* pick up all magical items */
1205 if (op->contr->mode & PU_MAGICAL) 1187 if (op->contr->mode & PU_MAGICAL)
1206 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1188 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1207 { 1189 {
1208 pick_up (op, tmp); 1190 CHK_PICK_PICKUP;
1209 continue; 1191 continue;
1210 } 1192 }
1211 1193
1212 if (op->contr->mode & PU_VALUABLES) 1194 if (op->contr->mode & PU_VALUABLES)
1213 { 1195 {
1214 if (tmp->type == MONEY || tmp->type == GEM) 1196 if (tmp->type == MONEY || tmp->type == GEM)
1215 { 1197 {
1216 pick_up (op, tmp); 1198 CHK_PICK_PICKUP;
1217 continue; 1199 continue;
1218 } 1200 }
1219 } 1201 }
1220 1202
1221 /* rings & amulets - talismans seems to be typed AMULET */ 1203 /* rings & amulets - talismans seems to be typed AMULET */
1222 if (op->contr->mode & PU_JEWELS) 1204 if (op->contr->mode & PU_JEWELS)
1223 if (tmp->type == RING || tmp->type == AMULET) 1205 if (tmp->type == RING || tmp->type == AMULET)
1224 { 1206 {
1225 pick_up (op, tmp); 1207 CHK_PICK_PICKUP;
1226 continue; 1208 continue;
1227 } 1209 }
1228 1210
1229 /* we don't forget dragon food */ 1211 /* we don't forget dragon food */
1230 if (op->contr->mode & PU_FLESH) 1212 if (op->contr->mode & PU_FLESH)
1231 if (tmp->type == FLESH) 1213 if (tmp->type == FLESH)
1232 { 1214 {
1233 pick_up (op, tmp); 1215 CHK_PICK_PICKUP;
1234 continue; 1216 continue;
1235 } 1217 }
1236 1218
1237 /* bows and arrows. Bows are good for selling! */ 1219 /* bows and arrows. Bows are good for selling! */
1238 if (op->contr->mode & PU_BOW) 1220 if (op->contr->mode & PU_BOW)
1239 if (tmp->type == BOW) 1221 if (tmp->type == BOW)
1240 { 1222 {
1241 pick_up (op, tmp); 1223 CHK_PICK_PICKUP;
1242 continue; 1224 continue;
1243 } 1225 }
1244 1226
1245 if (op->contr->mode & PU_ARROW) 1227 if (op->contr->mode & PU_ARROW)
1246 if (tmp->type == ARROW) 1228 if (tmp->type == ARROW)
1247 { 1229 {
1248 pick_up (op, tmp); 1230 CHK_PICK_PICKUP;
1249 continue; 1231 continue;
1250 } 1232 }
1251 1233
1252 /* all kinds of armor etc. */ 1234 /* all kinds of armor etc. */
1253 if (op->contr->mode & PU_ARMOUR) 1235 if (op->contr->mode & PU_ARMOUR)
1254 if (tmp->type == ARMOUR) 1236 if (tmp->type == ARMOUR)
1255 { 1237 {
1256 pick_up (op, tmp); 1238 CHK_PICK_PICKUP;
1257 continue; 1239 continue;
1258 } 1240 }
1259 1241
1260 if (op->contr->mode & PU_HELMET) 1242 if (op->contr->mode & PU_HELMET)
1261 if (tmp->type == HELMET) 1243 if (tmp->type == HELMET)
1262 { 1244 {
1263 pick_up (op, tmp); 1245 CHK_PICK_PICKUP;
1264 continue; 1246 continue;
1265 } 1247 }
1266 1248
1267 if (op->contr->mode & PU_SHIELD) 1249 if (op->contr->mode & PU_SHIELD)
1268 if (tmp->type == SHIELD) 1250 if (tmp->type == SHIELD)
1269 { 1251 {
1270 pick_up (op, tmp); 1252 CHK_PICK_PICKUP;
1271 continue; 1253 continue;
1272 } 1254 }
1273 1255
1274 if (op->contr->mode & PU_BOOTS) 1256 if (op->contr->mode & PU_BOOTS)
1275 if (tmp->type == BOOTS) 1257 if (tmp->type == BOOTS)
1276 { 1258 {
1277 pick_up (op, tmp); 1259 CHK_PICK_PICKUP;
1278 continue; 1260 continue;
1279 } 1261 }
1280 1262
1281 if (op->contr->mode & PU_GLOVES) 1263 if (op->contr->mode & PU_GLOVES)
1282 if (tmp->type == GLOVES) 1264 if (tmp->type == GLOVES)
1283 { 1265 {
1284 pick_up (op, tmp); 1266 CHK_PICK_PICKUP;
1285 continue; 1267 continue;
1286 } 1268 }
1287 1269
1288 if (op->contr->mode & PU_CLOAK) 1270 if (op->contr->mode & PU_CLOAK)
1289 if (tmp->type == CLOAK) 1271 if (tmp->type == CLOAK)
1290 { 1272 {
1291 pick_up (op, tmp); 1273 CHK_PICK_PICKUP;
1292 continue; 1274 continue;
1293 } 1275 }
1294 1276
1295 /* hoping to catch throwing daggers here */ 1277 /* hoping to catch throwing daggers here */
1296 if (op->contr->mode & PU_MISSILEWEAPON) 1278 if (op->contr->mode & PU_MISSILEWEAPON)
1297 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1279 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1298 { 1280 {
1299 pick_up (op, tmp); 1281 CHK_PICK_PICKUP;
1300 continue; 1282 continue;
1301 } 1283 }
1302 1284
1303 /* careful: chairs and tables are weapons! */ 1285 /* careful: chairs and tables are weapons! */
1304 if (op->contr->mode & PU_ALLWEAPON) 1286 if (op->contr->mode & PU_ALLWEAPON)
1305 { 1287 {
1306 if (tmp->type == WEAPON && tmp->name != NULL) 1288 if (tmp->type == WEAPON && tmp->name != NULL)
1307 { 1289 {
1308 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1290 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1309 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1291 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310 { 1292 {
1311 pick_up (op, tmp); 1293 CHK_PICK_PICKUP;
1312 continue; 1294 continue;
1313 } 1295 }
1314 } 1296 }
1315 1297
1316 if (tmp->type == WEAPON && tmp->name == NULL) 1298 if (tmp->type == WEAPON && tmp->name == NULL)
1317 { 1299 {
1318 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1300 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1319 { 1301 {
1320 pick_up (op, tmp); 1302 CHK_PICK_PICKUP;
1321 continue; 1303 continue;
1322 } 1304 }
1323 } 1305 }
1324 } 1306 }
1325 1307
1326 /* misc stuff that's useful */ 1308 /* misc stuff that's useful */
1327 if (op->contr->mode & PU_KEY) 1309 if (op->contr->mode & PU_KEY)
1328 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1310 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1329 { 1311 {
1330 pick_up (op, tmp); 1312 CHK_PICK_PICKUP;
1331 continue; 1313 continue;
1332 } 1314 }
1333 1315
1334 /* any of the last 4 bits set means we use the ratio for value 1316 /* any of the last 4 bits set means we use the ratio for value
1335 * pickups */ 1317 * pickups */
… …
1340 /* >=7 is the old standard setting. Now we take the last 4 bits 1322 /* >=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 */ 1323 * and multiply them by 5, giving 0..15*5== 5..75 */
1342 wvratio = (op->contr->mode & PU_RATIO) * 5; 1324 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) 1325 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1344 { 1326 {
1345 pick_up (op, tmp); 1327 CHK_PICK_PICKUP;
1346#if 0 1328#if 0
1347 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1329 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1348 if (tmp->name != NULL) 1330 if (tmp->name != NULL)
1349 { 1331 {
1350 fprintf (stderr, "%s", tmp->name); 1332 fprintf (stderr, "%s", tmp->name);
1351 } 1333 }
1352 else 1334 else
1353 fprintf (stderr, "%s", tmp->arch->name); 1335 fprintf (stderr, "%s", tmp->arch->archname);
1354 fprintf (stderr, ",%d] = ", tmp->type); 1336 fprintf (stderr, ",%d] = ", tmp->type);
1355 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1337 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1356#endif 1338#endif
1357 continue; 1339 continue;
1358 } 1340 }
… …
1373{ 1355{
1374 object *tmp = 0; 1356 object *tmp = 0;
1375 1357
1376 for (op = op->inv; op; op = op->below) 1358 for (op = op->inv; op; op = op->below)
1377 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1359 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1378 tmp = find_arrow (op, type); 1360 tmp = find_arrow (splay (op), type);
1379 else if (op->type == ARROW && op->race == type) 1361 else if (op->type == ARROW && op->race == type)
1380 return op; 1362 return splay (op);
1381 1363
1382 return tmp; 1364 return tmp;
1383} 1365}
1384 1366
1385/* 1367/*
… …
1428 else 1410 else
1429 { 1411 {
1430 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1412 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1431 { 1413 {
1432 attacktype = 1 << attacknum; 1414 attacktype = 1 << attacknum;
1433 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1415 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1434 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1416 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1435 { 1417 {
1436 tmp = arrow; 1418 tmp = arrow;
1437 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1419 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1438 } 1420 }
1439 } 1421 }
1440 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1422 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1441 { 1423 {
1442 tmp = arrow; 1424 tmp = arrow;
… …
1544 { 1526 {
1545 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1527 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1546 return 0; 1528 return 0;
1547 } 1529 }
1548 1530
1549 if (player *pl = op->contr) 1531 if (op->contr)
1550 { 1532 bow = op->current_weapon;
1551 bow = pl->ranged_ob;
1552 if (!op->change_weapon (bow))
1553 return 0;
1554 }
1555 else 1533 else
1556 { 1534 {
1557 for (bow = op->inv; bow; bow = bow->below) 1535 for (bow = op->inv; bow; bow = bow->below)
1558 /* Don't check for applied - monsters don't apply bows - in that way, they 1536 /* Don't check for applied - monsters don't apply bows - in that way, they
1559 * don't need to switch back and forth between bows and weapons. 1537 * don't need to switch back and forth between bows and weapons.
… …
1630 arrow->stats.grace = arrow->attacktype; 1608 arrow->stats.grace = arrow->attacktype;
1631 1609
1632 if (arrow->slaying) 1610 if (arrow->slaying)
1633 arrow->spellarg = strdup (arrow->slaying); 1611 arrow->spellarg = strdup (arrow->slaying);
1634 1612
1613#if 0
1635 if (player *pl = op->contr) 1614 if (player *pl = op->contr)
1636 { 1615 {
1637 pl->has_hit = 1;
1638#if 0
1639 float speed = pl->weapon_sp; 1616 float speed = pl->weapon_sp;
1640 1617
1641 /* penalize ROF for bestarrow */ 1618 /* penalize ROF for bestarrow */
1642 if (pl->bowtype == bow_bestarrow) 1619 if (pl->bowtype == bow_bestarrow)
1643 speed *= .9f; 1620 speed *= .9f;
1644 else 1621 else
1645 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f; 1622 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1646 1623
1647 op->speed_left += speed - op->speed; 1624 op->speed_left += speed - op->speed;
1625 }
1648#endif 1626#endif
1649 }
1650 1627
1651 SET_ANIMATION (arrow, arrow->direction); 1628 SET_ANIMATION (arrow, arrow->direction);
1652 1629
1653 /* update the speed */ 1630 /* update the speed */
1654 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 1631 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1655 + bow->stats.dam / 7.0; 1632 + bow->stats.dam / 7.f;
1656 1633
1657 arrow->set_speed (max (arrow->speed, 2.0)); 1634 arrow->set_speed (max (arrow->speed, 2.f));
1658 arrow->speed_left = 0; 1635 arrow->speed_left = 0;
1659 1636
1660 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1637 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1661 1638
1662 if (op->type == PLAYER) 1639 if (op->type == PLAYER)
… …
1685 1662
1686 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1663 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687 arrow->move_type = MOVE_FLY_LOW; 1664 arrow->move_type = MOVE_FLY_LOW;
1688 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1665 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1689 1666
1690 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1667 op->play_sound (sound_find ("fire_arrow"));
1691 m->insert (arrow, sx, sy, op); 1668 m->insert (arrow, sx, sy, op);
1692 1669
1693 if (!arrow->destroyed ()) 1670 if (!arrow->destroyed ())
1694 move_arrow (arrow); 1671 move_arrow (arrow);
1695 1672
… …
1746 } 1723 }
1747 1724
1748 return ret; 1725 return ret;
1749} 1726}
1750 1727
1751
1752/* Fires a misc (wand/rod/horn) object in 'dir'. 1728/* Fires a misc (wand/rod/horn) object in 'dir'.
1753 * Broken apart from 'fire' to keep it more readable. 1729 * Broken apart from 'fire' to keep it more readable.
1754 */ 1730 */
1755void 1731void
1756fire_misc_object (object *op, int dir) 1732fire_misc_object (object *op, int dir)
… …
1774 1750
1775 if (item->type == WAND) 1751 if (item->type == WAND)
1776 { 1752 {
1777 if (item->stats.food <= 0) 1753 if (item->stats.food <= 0)
1778 { 1754 {
1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1755 op->contr->play_sound (sound_find ("wand_poof"));
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1756 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781 1757
1782 return; 1758 return;
1783 } 1759 }
1784 } 1760 }
1785 else if (item->type == ROD || item->type == HORN) 1761 else if (item->type == ROD || item->type == HORN)
1786 { 1762 {
1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1763 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1788 { 1764 {
1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1765 op->contr->play_sound (sound_find ("wand_poof"));
1790 1766
1791 if (item->type == ROD) 1767 if (item->type == ROD)
1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1768 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1793 else 1769 else
1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1770 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1807 object *tmp; 1783 object *tmp;
1808 1784
1809 if (item->arch) 1785 if (item->arch)
1810 { 1786 {
1811 CLEAR_FLAG (item, FLAG_ANIMATE); 1787 CLEAR_FLAG (item, FLAG_ANIMATE);
1812 item->face = item->arch->clone.face; 1788 item->face = item->arch->face;
1813 item->set_speed (0); 1789 item->set_speed (0);
1814 } 1790 }
1815 1791
1816 if ((tmp = item->in_player ())) 1792 if ((tmp = item->in_player ()))
1817 esrv_update_item (UPD_ANIM, tmp, item); 1793 esrv_update_item (UPD_ANIM, tmp, item);
… …
1822 } 1798 }
1823} 1799}
1824 1800
1825/* Received a fire command for the player - go and do it. 1801/* Received a fire command for the player - go and do it.
1826 */ 1802 */
1827void 1803bool
1828fire (object *op, int dir) 1804fire (object *op, int dir)
1829{ 1805{
1830 int spellcost = 0; 1806 int spellcost = 0;
1831 1807
1832 /* check for loss of invisiblity/hide */ 1808 /* check for loss of invisiblity/hide */
… …
1836 player *pl = op->contr; 1812 player *pl = op->contr;
1837 1813
1838 if (pl->golem) 1814 if (pl->golem)
1839 { 1815 {
1840 control_golem (op->contr->golem, dir); 1816 control_golem (op->contr->golem, dir);
1841 return; 1817 return false;
1842 } 1818 }
1843 1819
1844 object *ob = pl->ranged_ob; 1820 object *ob = pl->ranged_ob;
1845 1821
1846 if (!ob) 1822 if (!ob)
1847 return; 1823 return false;
1824
1825 if (!op->change_weapon (ob))
1826 return false;
1827
1828 if (op->speed_left > 0.f)
1829 --op->speed_left;
1830 else
1831 return false;
1848 1832
1849 switch (ob->type) 1833 switch (ob->type)
1850 { 1834 {
1851 case BOW: 1835 case BOW:
1852 player_fire_bow (op, dir); 1836 player_fire_bow (op, dir);
… …
1859 case BUILDER: 1843 case BUILDER:
1860 apply_map_builder (op, dir); 1844 apply_map_builder (op, dir);
1861 break; 1845 break;
1862 1846
1863 case SKILL: 1847 case SKILL:
1864 case SKILL_TOOL:
1865 do_skill (op, op, ob, dir, 0); 1848 do_skill (op, op, ob, dir, 0);
1866 break; 1849 break;
1867 1850
1868 default: 1851 default:
1869 fire_misc_object (op, dir); 1852 fire_misc_object (op, dir);
1870 break; 1853 break;
1871 } 1854 }
1855
1856 return true;
1872} 1857}
1873 1858
1874/* find_key 1859/* find_key
1875 * We try to find a key for the door as passed. If we find a key 1860 * We try to find a key for the door as passed. If we find a key
1876 * and successfully use it, we return the key, otherwise NULL 1861 * and successfully use it, we return the key, otherwise NULL
… …
1963 * 0 otherwise 1948 * 0 otherwise
1964 */ 1949 */
1965static int 1950static int
1966player_attack_door (object *op, object *door) 1951player_attack_door (object *op, object *door)
1967{ 1952{
1968 /* If its a door, try to find a use a key. If we do destroy the door, 1953 /* If its a door, try to find a key. If we do destroy the door,
1969 * might as well return immediately as there is nothing more to do - 1954 * might as well return immediately as there is nothing more to do -
1970 * otherwise, we fall through to the rest of the code. 1955 * otherwise, we fall through to the rest of the code.
1971 */ 1956 */
1972 object *key = find_key (op, op, door); 1957 object *key = find_key (op, op, door);
1973 1958
1974 /* IF we found a key, do some extra work */ 1959 /* If we found a key, do some extra work */
1975 if (key) 1960 if (key)
1976 { 1961 {
1977 object *container = key->env; 1962 object *container = key->env;
1978
1979 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1980 1963
1981 if (action_makes_visible (op)) 1964 if (action_makes_visible (op))
1982 make_visible (op); 1965 make_visible (op);
1983 1966
1984 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1967 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
… …
1986 1969
1987 if (door->type == DOOR) 1970 if (door->type == DOOR)
1988 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1971 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1989 else if (door->type == LOCKED_DOOR) 1972 else if (door->type == LOCKED_DOOR)
1990 { 1973 {
1991 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1974 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1992 remove_door2 (door); /* remove door without violence ;-) */ 1975 remove_door2 (door); /* remove door without violence ;-) */
1993 } 1976 }
1994 1977
1995 /* Do this after we print the message */ 1978 /* Do this after we print the message */
1996 decrease_ob (key); /* Use up one of the keys */ 1979 decrease_ob (key); /* Use up one of the keys */
… …
2001 return 1; /* Nothing more to do below */ 1984 return 1; /* Nothing more to do below */
2002 } 1985 }
2003 else if (door->type == LOCKED_DOOR) 1986 else if (door->type == LOCKED_DOOR)
2004 { 1987 {
2005 /* Might as well return now - no other way to open this */ 1988 /* Might as well return now - no other way to open this */
2006 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1989 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2007 return 1; 1990 return 1;
2008 } 1991 }
2009 1992
2010 return 0; 1993 return 0;
2011} 1994}
… …
2014 * It should keep the code cleaner. 1997 * It should keep the code cleaner.
2015 * When this is called, the players direction has been updated 1998 * When this is called, the players direction has been updated
2016 * (taking into account confusion.) The player is also actually 1999 * (taking into account confusion.) The player is also actually
2017 * going to try and move (not fire weapons). 2000 * going to try and move (not fire weapons).
2018 */ 2001 */
2019void 2002bool
2020move_player_attack (object *op, int dir) 2003move_player_attack (object *op, int dir)
2021{ 2004{
2022 object *tmp, *mon;
2023 int on_battleground; 2005 int on_battleground;
2024 maptile *m;
2025 2006
2026 sint16 nx = freearr_x[dir] + op->x; 2007 sint16 nx = freearr_x[dir] + op->x;
2027 sint16 ny = freearr_y[dir] + op->y; 2008 sint16 ny = freearr_y[dir] + op->y;
2028 2009
2029 on_battleground = op_on_battleground (op, 0, 0); 2010 on_battleground = op_on_battleground (op, 0, 0);
2011
2012 if (out_of_map (op->map, nx, ny))
2013 return false;
2014
2015 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2016 {
2017 --op->speed_left;
2018 return true;
2019 }
2030 2020
2031 /* If braced, or can't move to the square, and it is not out of the 2021 /* If braced, or can't move to the square, and it is not out of the
2032 * map, attack it. Note order of if statement is important - don't 2022 * map, attack it. Note order of if statement is important - don't
2033 * want to be calling move_ob if braced, because move_ob will move the 2023 * want to be calling move_ob if braced, because move_ob will move the
2034 * player. This is a pretty nasty hack, because if we could 2024 * player. This is a pretty nasty hack, because if we could
2035 * move to some space, it then means that if we are braced, we should 2025 * move to some space, it then means that if we are braced, we should
2036 * do nothing at all. As it is, if we are braced, we go through 2026 * do nothing at all. As it is, if we are braced, we go through
2037 * quite a bit of processing. However, it probably is less than what 2027 * quite a bit of processing. However, it probably is less than what
2038 * move_ob uses. 2028 * move_ob uses.
2039 */ 2029 */
2040 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2041 {
2042 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2043 {
2044 m = op->map->xy_find (nx, ny); 2030 maptile *m = op->map->xy_find (nx, ny);
2045 if (!m)
2046 return; /* Don't think this should happen */
2047 }
2048 else
2049 m = op->map;
2050 2031
2051 if (!(tmp = m->at (nx, ny).bot))
2052 return;
2053
2054 mon = 0;
2055 /* Go through all the objects, and find ones of interest. Only stop if 2032 /* Go through all the objects, and find ones of interest. Only stop if
2056 * we find a monster - that is something we know we want to attack. 2033 * we find a monster - that is something we know we want to attack.
2057 * if its a door or barrel (can roll) see if there may be monsters 2034 * if its a door or barrel (can roll) see if there may be monsters
2058 * on the space 2035 * on the space
2059 */ 2036 */
2060 while (tmp) 2037 object *mon;
2061 { 2038 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2062 if (tmp == op) 2039 {
2063 { 2040 if ((mon->flag [FLAG_ALIVE]
2064 tmp = tmp->above; 2041 || mon->type == LOCKED_DOOR
2065 continue; 2042 || mon->flag [FLAG_CAN_ROLL])
2066 }
2067
2068 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2069 {
2070 mon = tmp; 2043 && mon != op)
2071 break; 2044 break;
2072 } 2045 }
2073 2046
2074 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2075 mon = tmp;
2076
2077 tmp = tmp->above;
2078 }
2079
2080 if (!mon) /* This happens anytime the player tries to move */ 2047 if (!mon) /* This happens anytime the player tries to move */
2081 return; /* into a wall */ 2048 return false; /* into a wall */
2082 2049
2083 if (mon->head)
2084 mon = mon->head; 2050 mon = mon->head_ ();
2085 2051
2086 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2052 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2053 if (op->contr->weapon_sp_left > 0.f)
2087 if (player_attack_door (op, mon)) 2054 if (player_attack_door (op, mon))
2055 {
2056 --op->contr->weapon_sp_left;
2088 return; 2057 return true;
2058 }
2089 2059
2090 /* The following deals with possibly attacking peaceful 2060 /* The following deals with possibly attacking peaceful
2091 * or frienddly creatures. Basically, all players are considered 2061 * or friendly creatures. Basically, all players are considered
2092 * unaggressive. If the moving player has peaceful set, then the 2062 * unaggressive. If the moving player has peaceful set, then the
2093 * object should be pushed instead of attacked. It is assumed that 2063 * object should be pushed instead of attacked. It is assumed that
2094 * if you are braced, you will not attack friends accidently, 2064 * if you are braced, you will not attack friends accidently,
2095 * and thus will not push them. 2065 * and thus will not push them.
2096 */ 2066 */
2097 2067
2098 /* If the creature is a pet, push it even if the player is not 2068 /* If the creature is a pet, push it even if the player is not
2099 * peaceful. Our assumption is the creature is a pet if the 2069 * peaceful. Our assumption is the creature is a pet if the
2100 * player owns it and it is either friendly or unagressive. 2070 * player owns it and it is either friendly or unagressive.
2101 */ 2071 */
2102 if ((op->type == PLAYER) 2072 if (op->type == PLAYER
2103#if COZY_SERVER
2104 &&
2105 ((mon->owner && mon->owner->contr 2073 && ((mon->owner && mon->owner->contr
2106 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2074 && same_party (mon->owner->contr->party, op->contr->party))
2107#else
2108 && mon->owner == op 2075 || mon->owner == op)
2109#endif
2110 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2076 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2111 { 2077 {
2112 /* If we're braced, we don't want to switch places with it */ 2078 /* If we're braced, we don't want to switch places with it */
2113 if (op->contr->braced) 2079 if (op->contr->braced)
2114 return; 2080 return false;
2115 2081
2116 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2082 if (op->speed_left > 0.f)
2083 {
2084 --op->speed_left;
2085
2086 op->play_sound (sound_find ("push_player"));
2117 push_ob (mon, dir, op); 2087 push_ob (mon, dir, op);
2088
2118 if (op->contr->tmp_invis || op->hide) 2089 if (op->contr->tmp_invis || op->hide)
2119 make_visible (op); 2090 make_visible (op);
2120 2091
2121 return; 2092 return true;
2122 } 2093 }
2094 else
2095 return false;
2096 }
2123 2097
2124 /* in certain circumstances, you shouldn't attack friendly 2098 /* in certain circumstances, you shouldn't attack friendly
2125 * creatures. Note that if you are braced, you can't push 2099 * creatures. Note that if you are braced, you can't push
2126 * someone, but put it inside this loop so that you won't 2100 * someone, but put it inside this loop so that you won't
2127 * attack them either. 2101 * attack them either.
2128 */ 2102 */
2129 if ((mon->type == PLAYER || mon->enemy != op) && 2103 if ((mon->type == PLAYER || mon->enemy != op)
2130 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2104 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2131#ifdef PROHIBIT_PLAYERKILL
2132 (op->contr->peaceful 2105 && ((op->contr->peaceful
2133 || (mon->type == PLAYER 2106 || (mon->type == PLAYER && mon->contr->peaceful))
2134 && mon->contr->
2135 peaceful)) &&
2136#else
2137 op->contr->peaceful &&
2138#endif
2139 !on_battleground)) 2107 && !on_battleground))
2108 {
2109 if (op->speed_left > 0.f)
2140 { 2110 {
2111 --op->speed_left;
2112
2141 if (!op->contr->braced) 2113 if (!op->contr->braced)
2142 { 2114 {
2143 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2115 op->play_sound (sound_find ("push_player"));
2144 push_ob (mon, dir, op); 2116 push_ob (mon, dir, op);
2145 } 2117 }
2146 else 2118 else
2147 new_draw_info (0, 0, op, "You withhold your attack"); 2119 op->statusmsg ("You withhold your attack");
2148 2120
2149 if (op->contr->tmp_invis || op->hide) 2121 if (op->contr->tmp_invis || op->hide)
2150 make_visible (op); 2122 make_visible (op);
2151 }
2152 2123
2124 return true;
2125 }
2126 }
2153 /* If the object is a boulder or other rollable object, then 2127 /* If the object is a boulder or other rollable object, then
2154 * roll it if not braced. You can't roll it if you are braced. 2128 * roll it if not braced. You can't roll it if you are braced.
2155 */ 2129 */
2156 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2130 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2131 {
2132 if (op->speed_left > 0.f)
2157 { 2133 {
2134 --op->speed_left;
2135
2158 recursive_roll (mon, dir, op); 2136 recursive_roll (mon, dir, op);
2159 if (action_makes_visible (op)) 2137 if (action_makes_visible (op))
2160 make_visible (op); 2138 make_visible (op);
2161 }
2162 2139
2140 return true;
2141 }
2142 }
2163 /* Any generic living creature. Including things like doors. 2143 /* Any generic living creature. Including things like doors.
2164 * Way it works is like this: First, it must have some hit points 2144 * Way it works is like this: First, it must have some hit points
2165 * and be living. Then, it must be one of the following: 2145 * and be living. Then, it must be one of the following:
2166 * 1) Not a player, 2) A player, but of a different party. Note 2146 * 1) Not a player, 2) A player, but of a different party. Note
2167 * that party_number -1 is no party, so attacks can still happen. 2147 * that party_number -1 is no party, so attacks can still happen.
2168 */ 2148 */
2169 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2149 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2170 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2150 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2151 {
2152 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2171 { 2153 {
2172 op->contr->has_hit = 1; 2154 --op->contr->weapon_sp_left;
2173 2155
2174 skill_attack (mon, op, 0, 0, 0); 2156 skill_attack (mon, op, 0, 0, 0);
2175
2176 /* If attacking another player, that player gets automatic
2177 * hitback, and doesn't loose luck either.
2178 * Disable hitback on the battleground or if the target is
2179 * the wiz.
2180 */
2181 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2182 {
2183 short luck = mon->stats.luck;
2184
2185 mon->contr->has_hit = 1;
2186 skill_attack (op, mon, 0, 0, 0);
2187 mon->stats.luck = luck;
2188 }
2189 2157
2190 if (action_makes_visible (op)) 2158 if (action_makes_visible (op))
2191 make_visible (op); 2159 make_visible (op);
2192 }
2193 } /* if player should attack something */
2194}
2195 2160
2196int 2161 return true;
2162 }
2163 }
2164
2165 return false;
2166}
2167
2168bool
2197move_player (object *op, int dir) 2169move_player (object *op, int dir)
2198{ 2170{
2199 int pick; 2171 int pick;
2200 2172
2201 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2173 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
… …
2215 op->facing = dir; 2187 op->facing = dir;
2216 2188
2217 if (op->hide) 2189 if (op->hide)
2218 do_hidden_move (op); 2190 do_hidden_move (op);
2219 2191
2192 bool retval;
2193
2220 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2194 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2221 /*nop */ ; 2195 retval = RESULT_INT (0);
2222 else if (op->contr->fire_on) 2196 else if (op->contr->fire_on)
2223 fire (op, dir); 2197 retval = fire (op, dir);
2224 else 2198 else
2225 { 2199 {
2226 move_player_attack (op, dir); 2200 retval = move_player_attack (op, dir);
2227 pick = check_pick (op); 2201 pick = check_pick (op);
2228 } 2202 }
2229 2203
2230 /* Add special check for newcs players and fire on - this way, the 2204 /* Add special check for newcs players and fire on - this way, the
2231 * server can handle repeat firing. 2205 * server can handle repeat firing.
… …
2238 /* Update how the player looks. Use the facing, so direction may 2212 /* Update how the player looks. Use the facing, so direction may
2239 * get reset to zero. This allows for full animation capabilities 2213 * get reset to zero. This allows for full animation capabilities
2240 * for players. 2214 * for players.
2241 */ 2215 */
2242 animate_object (op, op->facing); 2216 animate_object (op, op->facing);
2243 return 0; 2217
2218 return retval;
2244} 2219}
2245 2220
2246/* This is similar to handle_player, below, but is only used by the 2221/* This is similar to handle_player, below, but is only used by the
2247 * new client/server stuff. 2222 * new client/server stuff.
2248 * This is sort of special, in that the new client/server actually uses 2223 * This is sort of special, in that the new client/server actually uses
2249 * the new speed values for commands. 2224 * the new speed values for commands.
2250 * 2225 *
2251 * Returns true if there are more actions we can do. 2226 * Returns true if there are more actions we can do. Should not do
2227 * many actions in a row, as that would be too unfair to other
2228 * players.
2252 */ 2229 */
2253int 2230bool
2254handle_newcs_player (object *op) 2231handle_newcs_player (object *op)
2255{ 2232{
2256 if (QUERY_FLAG (op, FLAG_SCARED)) 2233 if (QUERY_FLAG (op, FLAG_SCARED))
2257 { 2234 {
2258 flee_player (op); 2235 if (op->speed_left > 0.f)
2259
2260 /* If player is still scared, that is his action for this tick */
2261 if (op->flag [FLAG_SCARED])
2262 { 2236 {
2263 --op->speed_left; 2237 --op->speed_left;
2238 flee_player (op);
2239
2264 return 0; 2240 return true;
2265 } 2241 }
2242 else
2243 return false;
2266 } 2244 }
2267 2245
2268 /* call this here - we also will call this in do_ericserver, but 2246 /* call this here - we also will call this in do_ericserver, but
2269 * the players time has been increased when doericserver has been 2247 * the players time has been increased when doericserver has been
2270 * called, so we recheck it here. 2248 * called, so we recheck it here.
2271 */ 2249 */
2272 if (op->contr->ns->handle_command ()) 2250 if (op->contr->ns->handle_command ())
2273 return 1; 2251 return true;
2274 2252
2275 if (op->speed_left > 0.f)
2276 {
2277 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2253 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2278 {
2279 /* All move commands take 1 tick, at least for now */
2280 --op->speed_left;
2281
2282 /* Instead of all the stuff below, let move_player take care
2283 * of it. Also, some of the skill stuff is only put in
2284 * there, as well as the confusion stuff.
2285 */
2286 move_player (op, op->direction); 2254 return move_player (op, op->direction);
2287 2255
2288 return op->speed_left > 0.f;
2289 }
2290 }
2291
2292 return 0; 2256 return false;
2293} 2257}
2294 2258
2295int 2259int
2296save_life (object *op) 2260save_life (object *op)
2297{ 2261{
… …
2299 return 0; 2263 return 0;
2300 2264
2301 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2265 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2302 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2266 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2303 { 2267 {
2304 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2268 op->play_sound (sound_find ("ob_evaporate"));
2305 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2269 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2306 2270
2307 if (op->contr) 2271 if (op->contr)
2308 esrv_del_item (op->contr, tmp->count); 2272 esrv_del_item (op->contr, tmp->count);
2309 2273
… …
2329/* This goes throws the inventory and removes unpaid objects, and puts them 2293/* This goes throws the inventory and removes unpaid objects, and puts them
2330 * back in the map (location and map determined by values of env). This 2294 * back in the map (location and map determined by values of env). This
2331 * function will descend into containers. op is the object to start the search 2295 * function will descend into containers. op is the object to start the search
2332 * from. 2296 * from.
2333 */ 2297 */
2334void 2298static void
2335remove_unpaid_objects (object *op, object *env) 2299drop_unpaid_items (object *op, object *env)
2336{ 2300{
2337 while (op) 2301 while (op)
2338 { 2302 {
2339 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2303 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2340 2304
… …
2344 esrv_del_item (env->contr, op->count); 2308 esrv_del_item (env->contr, op->count);
2345 2309
2346 op->insert_at (env); 2310 op->insert_at (env);
2347 } 2311 }
2348 else if (op->inv) 2312 else if (op->inv)
2349 remove_unpaid_objects (op->inv, env); 2313 drop_unpaid_items (op->inv, env);
2350 2314
2351 op = next; 2315 op = next;
2352 } 2316 }
2317}
2318
2319void
2320object::drop_unpaid_items ()
2321{
2322 if (!flag [FLAG_REMOVED])
2323 ::drop_unpaid_items (inv, this);
2353} 2324}
2354 2325
2355/* 2326/*
2356 * Returns pointer a static string containing gravestone text 2327 * Returns pointer a static string containing gravestone text
2357 * Moved from apply.c to player.c - player.c is what 2328 * Moved from apply.c to player.c - player.c is what
… …
2452 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2423 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2453 else 2424 else
2454 { 2425 {
2455 gen_grace = op->stats.maxgrace; 2426 gen_grace = op->stats.maxgrace;
2456 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2427 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2457 }
2458
2459 /* Regenerate Spell Points */
2460 if (!op->contr->golem && --op->last_sp < 0)
2461 {
2462 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2463 if (op->stats.sp < op->stats.maxsp)
2464 {
2465 op->stats.sp++;
2466 /* dms do not consume food */
2467 if (!QUERY_FLAG (op, FLAG_WIZ))
2468 {
2469 op->stats.food--;
2470 if (op->contr->digestion < 0)
2471 op->stats.food += op->contr->digestion;
2472 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2473 op->stats.food = last_food;
2474 }
2475 }
2476
2477 if (max_sp > 1)
2478 {
2479 over_sp = (gen_sp + 10) / rate_sp;
2480 if (over_sp > 0)
2481 {
2482 if (op->stats.sp < op->stats.maxsp)
2483 {
2484 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2485
2486 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2487 op->stats.sp--;
2488
2489 if (op->stats.sp > op->stats.maxsp)
2490 op->stats.sp = op->stats.maxsp;
2491 }
2492 op->last_sp = 0;
2493 }
2494 else
2495 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2496 }
2497 else
2498 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2499 } 2428 }
2500 2429
2501 /* Regenerate Grace */ 2430 /* Regenerate Grace */
2502 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2431 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2503 if (--op->last_grace < 0) 2432 if (--op->last_grace < 0)
… …
2524 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2453 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2525 } 2454 }
2526 /* wearing stuff doesn't detract from grace generation. */ 2455 /* wearing stuff doesn't detract from grace generation. */
2527 } 2456 }
2528 2457
2458 if (op->stats.food > 0)
2459 {
2529 /* Regenerate Hit Points */ 2460 /* Regenerate Spell Points */
2530 if (--op->last_heal < 0) 2461 if (!op->contr->golem && --op->last_sp < 0)
2531 {
2532 if (op->stats.hp < op->stats.maxhp)
2533 { 2462 {
2534 op->stats.hp++; 2463 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2535 /* dms do not consume food */ 2464
2536 if (!QUERY_FLAG (op, FLAG_WIZ)) 2465 if (op->stats.sp < op->stats.maxsp)
2537 { 2466 {
2467 op->stats.sp++;
2468
2469 /* dms do not consume food */
2470 if (!QUERY_FLAG (op, FLAG_WIZ))
2471 {
2538 op->stats.food--; 2472 op->stats.food--;
2473
2539 if (op->contr->digestion < 0) 2474 if (op->contr->digestion < 0)
2540 op->stats.food += op->contr->digestion; 2475 op->stats.food += op->contr->digestion;
2541 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2476 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2542 op->stats.food = last_food; 2477 op->stats.food = last_food;
2478 }
2543 } 2479 }
2544 }
2545 2480
2546 if (max_hp > 1) 2481 if (max_sp > 1)
2547 {
2548 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2549 if (over_hp > 0)
2550 { 2482 {
2551 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2483 over_sp = (gen_sp + 10) / rate_sp;
2484 if (over_sp > 0)
2485 {
2486 if (op->stats.sp < op->stats.maxsp)
2487 {
2488 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2489
2490 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2491 op->stats.sp--;
2492
2493 if (op->stats.sp > op->stats.maxsp)
2494 op->stats.sp = op->stats.maxsp;
2495 }
2496
2552 op->last_heal = 0; 2497 op->last_sp = 0;
2498 }
2499 else
2500 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2553 } 2501 }
2554 else 2502 else
2503 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2504 }
2505
2506 /* Regenerate Hit Points */
2507 if (--op->last_heal < 0)
2508 {
2509 if (op->stats.hp < op->stats.maxhp)
2555 { 2510 {
2556 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2511 op->stats.hp++;
2512
2513 /* dms do not consume food */
2514 if (!QUERY_FLAG (op, FLAG_WIZ))
2515 {
2516 op->stats.food--;
2517
2518 if (op->contr->digestion < 0)
2519 op->stats.food += op->contr->digestion;
2520 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2521 op->stats.food = last_food;
2522 }
2557 } 2523 }
2524
2525 if (max_hp > 1)
2526 {
2527 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2528
2529 if (over_hp > 0)
2530 {
2531 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2532 op->last_heal = 0;
2533 }
2534 else
2535 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2558 } 2536 }
2559 else 2537 else
2560 {
2561 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2538 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2562 } 2539 }
2563 } 2540 }
2564 2541
2565 /* Digestion */ 2542 /* Digestion */
2566 if (--op->last_eat < 0) 2543 if (--op->last_eat < 0)
2567 { 2544 {
2568#ifdef COZY_SERVER 2545 int bonus = max (0, op->contr->digestion),
2569 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2546 penalty = max (0, -op->contr->digestion);
2570 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2571#else
2572 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2573#endif
2574 2547
2575 if (op->contr->gen_hp > 0)
2576 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2548 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2577 else
2578 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2579 2549
2580 /* dms do not consume food */ 2550 /* dms do not consume food */
2581 if (!QUERY_FLAG (op, FLAG_WIZ)) 2551 if (!QUERY_FLAG (op, FLAG_WIZ))
2582 op->stats.food--; 2552 op->stats.food--;
2583 } 2553 }
… …
2610 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2580 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2611 manual_apply (op, flesh, 0); 2581 manual_apply (op, flesh, 0);
2612 } 2582 }
2613 } 2583 }
2614 2584
2615 while (op->stats.food < 0 && op->stats.hp >= 0) 2585 if (op->stats.food < 0)
2616 op->stats.food++, op->stats.hp--; 2586 {
2587 op->stats.hp += op->stats.food;
2588 op->stats.food = 0;
2589 }
2617 2590
2618 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2591 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2619 kill_player (op); 2592 kill_player (op);
2620 } 2593 }
2621} 2594}
… …
2626 * file. 2599 * file.
2627 */ 2600 */
2628void 2601void
2629kill_player (object *op) 2602kill_player (object *op)
2630{ 2603{
2604 int x, y;
2631 char buf[MAX_BUF]; 2605 char buf[MAX_BUF];
2632 int x, y;
2633
2634 //int i;
2635 maptile *map; /* this is for resurrection */ 2606 maptile *map; /* this is for resurrection */
2636
2637 /* int z;
2638 int num_stats_lose;
2639 int lost_a_stat;
2640 int lose_this_stat;
2641 int this_stat; */
2642 int will_kill_again; 2607 int will_kill_again;
2643 archetype *at; 2608 archetype *at;
2644 object *tmp; 2609 object *tmp;
2645 2610
2646 if (save_life (op)) 2611 if (save_life (op))
2647 return; 2612 return;
2648
2649 2613
2650 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2614 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2651 * in cities ONLY!!! It is very important that this doesn't get abused. 2615 * in cities ONLY!!! It is very important that this doesn't get abused.
2652 * Look at op_on_battleground() for more info --AndreasV 2616 * Look at op_on_battleground() for more info --AndreasV
2653 */ 2617 */
… …
2669 { 2633 {
2670 tmp->destroy (); 2634 tmp->destroy ();
2671 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2635 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2672 } 2636 }
2673 2637
2674 cure_disease (op, 0); /* remove any disease */ 2638 cure_disease (op, 0, 0); /* remove any disease */
2675 op->stats.hp = op->stats.maxhp; 2639 op->stats.hp = op->stats.maxhp;
2676 if (op->stats.food <= 0) 2640 if (op->stats.food <= 0)
2677 op->stats.food = 999; 2641 op->stats.food = 999;
2678 2642
2679 /* create a bodypart-trophy to make the winner happy */ 2643 /* create a bodypart-trophy to make the winner happy */
2680 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2644 if (object *tmp = arch_to_object (archetype::find ("finger")))
2681 { 2645 {
2682 sprintf (buf, "%s's finger", &op->name); 2646 tmp->name = format ("%s's finger" , &op->name);
2683 tmp->name = buf; 2647 tmp->name_pl = format ("%s's fingers", &op->name);
2684 sprintf (buf, " This finger has been cut off %s\n" 2648 tmp->msg = format (
2685 " the %s, when he was defeated at\n level %d by %s.\n", 2649 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2686 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2650 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2687 tmp->msg = buf; 2651 );
2688 tmp->value = 0, tmp->type = 0; 2652 tmp->value = 0, tmp->type = 0;
2689 tmp->materialname = "organics"; 2653 tmp->materialname = "organics";
2690 tmp->insert_at (op, tmp); 2654 tmp->insert_at (op, tmp);
2691 } 2655 }
2692 2656
… …
2699 INVOKE_PLAYER (DEATH, op->contr); 2663 INVOKE_PLAYER (DEATH, op->contr);
2700 2664
2701 command_kill_pets (op, 0); 2665 command_kill_pets (op, 0);
2702 2666
2703 if (op->stats.food < 0) 2667 if (op->stats.food < 0)
2704 {
2705 sprintf (buf, "%s starved to death.", &op->name);
2706 strcpy (op->contr->killer, "starvation"); 2668 strcpy (op->contr->killer, "starvation");
2707 }
2708 else
2709 sprintf (buf, "%s died.", &op->name);
2710 2669
2711 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2670 op->contr->play_sound (sound_find ("player_dies"));
2712 2671
2713 /* save the map location for corpse, gravestone */ 2672 /* save the map location for corpse, gravestone */
2714 x = op->x; 2673 x = op->x;
2715 y = op->y; 2674 y = op->y;
2716 map = op->map; 2675 map = op->map;
… …
2879 { 2838 {
2880 tmp->destroy (); 2839 tmp->destroy ();
2881 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2840 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2882 } 2841 }
2883 2842
2884 cure_disease (op, 0); /* remove any disease */ 2843 cure_disease (op, 0, 0); /* remove any disease */
2885 2844
2886 /*add_exp(op, (op->stats.exp * -0.20)); */ 2845 /*add_exp(op, (op->stats.exp * -0.20)); */
2887 apply_death_exp_penalty (op); 2846 apply_death_exp_penalty (op);
2888 if (op->stats.food < 100) 2847 if (op->stats.food < 100)
2889 op->stats.food = 900; 2848 op->stats.food = 900;
… …
2893 2852
2894 /* 2853 /*
2895 * Check to see if the player has any unpaid items. If so, remove them 2854 * Check to see if the player has any unpaid items. If so, remove them
2896 * and put them back in the map. 2855 * and put them back in the map.
2897 */ 2856 */
2898 remove_unpaid_objects (op->inv, op); 2857 op->drop_unpaid_items ();
2899 2858
2900 /****************************************/ 2859 /****************************************/
2901 /* */ 2860 /* */
2902 /* Move player to his current respawn- */ 2861 /* Move player to his current respawn- */
2903 /* position (usually last savebed) */ 2862 /* position (usually last savebed) */
… …
3043void 3002void
3044make_visible (object *op) 3003make_visible (object *op)
3045{ 3004{
3046 op->hide = 0; 3005 op->hide = 0;
3047 op->invisible = 0; 3006 op->invisible = 0;
3007
3048 if (op->type == PLAYER) 3008 if (op->type == PLAYER)
3049 { 3009 {
3050 op->contr->tmp_invis = 0; 3010 op->contr->tmp_invis = 0;
3051 op->contr->invis_race = 0; 3011 op->contr->invis_race = 0;
3052 } 3012 }
… …
3055} 3015}
3056 3016
3057int 3017int
3058is_true_undead (object *op) 3018is_true_undead (object *op)
3059{ 3019{
3060 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3020 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3061 return 1; 3021 return 1;
3062 3022
3063 return 0; 3023 return 0;
3064} 3024}
3065 3025
3066/* look at the surrounding terrain to determine 3026/* look at the surrounding terrain to determine
3067 * the hideability of this object. Positive levels 3027 * the hideability of this object. Positive levels
3068 * indicate greater hideability. 3028 * indicate greater hideability.
3069 */ 3029 */
3070
3071int 3030int
3072hideability (object *ob) 3031hideability (object *ob)
3073{ 3032{
3074 int i, level = 0, mflag; 3033 int i, level = 0, mflag;
3075 sint16 x, y; 3034 sint16 x, y;
… …
3109/* For Hidden creatures - a chance of becoming 'unhidden' 3068/* For Hidden creatures - a chance of becoming 'unhidden'
3110 * every time they move - as we subtract off 'invisibility' 3069 * every time they move - as we subtract off 'invisibility'
3111 * AND, for players, if they move into a ridiculously unhideable 3070 * AND, for players, if they move into a ridiculously unhideable
3112 * spot (surrounded by clear terrain in broad daylight). -b.t. 3071 * spot (surrounded by clear terrain in broad daylight). -b.t.
3113 */ 3072 */
3114
3115void 3073void
3116do_hidden_move (object *op) 3074do_hidden_move (object *op)
3117{ 3075{
3118 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3076 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3119 object *skop; 3077 object *skop;
… …
3201 * object op. This function works fine for monsters, 3159 * object op. This function works fine for monsters,
3202 * but we dont worry if the object isnt the top one in 3160 * but we dont worry if the object isnt the top one in
3203 * a pile (say a coin under a table would return "viewable" 3161 * a pile (say a coin under a table would return "viewable"
3204 * by this routine). Another question, should we be 3162 * by this routine). Another question, should we be
3205 * concerned with the direction the player is looking 3163 * concerned with the direction the player is looking
3206 * in? Realistically, most of use cant see stuff behind 3164 * in? Realistically, most of us can't see stuff behind
3207 * our backs...on the other hand, does the "facing" direction 3165 * our backs...on the other hand, does the "facing" direction
3208 * imply the way your head, or body is facing? Its possible 3166 * imply the way your head, or body is facing? It's possible
3209 * for them to differ. Sigh, this fctn could get a bit more complex. 3167 * for them to differ. Sigh, this fctn could get a bit more complex.
3210 * -b.t. 3168 * -b.t.
3211 * This function is now map tiling safe. 3169 * This function is now map tiling safe.
3212 */ 3170 */
3213
3214int 3171int
3215player_can_view (object *pl, object *op) 3172player_can_view (object *pl, object *op)
3216{ 3173{
3217 rv_vector rv; 3174 rv_vector rv;
3218 int dx, dy; 3175 int dx, dy;
… …
3230 3187
3231 get_rangevector (pl, op, &rv, 0x1); 3188 get_rangevector (pl, op, &rv, 0x1);
3232 3189
3233 /* starting with the 'head' part, lets loop 3190 /* starting with the 'head' part, lets loop
3234 * through the object and find if it has any 3191 * through the object and find if it has any
3235 * part that is in the los array but isnt on 3192 * part that is in the los array but isn't on
3236 * a blocked los square. 3193 * a blocked los square.
3237 * we use the archetype to figure out offsets. 3194 * we use the archetype to figure out offsets.
3238 */ 3195 */
3239 while (op) 3196 while (op)
3240 { 3197 {
3241 dx = rv.distance_x + op->arch->clone.x; 3198 dx = rv.distance_x + op->arch->x;
3242 dy = rv.distance_y + op->arch->clone.y; 3199 dy = rv.distance_y + op->arch->y;
3243 3200
3244 /* only the viewable area the player sees is updated by LOS 3201 /* only the viewable area the player sees is updated by LOS
3245 * code, so we need to restrict ourselves to that range of values 3202 * code, so we need to restrict ourselves to that range of values
3246 * for any meaningful values. 3203 * for any meaningful values.
3247 */ 3204 */
3248 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3205 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3249 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3206 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3250 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3207 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3251 return 1; 3208 return 1;
3209
3252 op = op->more; 3210 op = op->more;
3253 } 3211 }
3212
3254 return 0; 3213 return 0;
3255} 3214}
3256 3215
3257/* routine for both players and monsters. We call this when 3216/* routine for both players and monsters. We call this when
3258 * there is a possibility for our action distrubing our hiding 3217 * there is a possibility for our action distrubing our hiding
… …
3261 * return 0. 3220 * return 0.
3262 */ 3221 */
3263int 3222int
3264action_makes_visible (object *op) 3223action_makes_visible (object *op)
3265{ 3224{
3266
3267 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3225 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3268 { 3226 {
3269 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3227 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3270 return 0; 3228 return 0;
3271 3229
… …
3277 { 3235 {
3278 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3236 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3279 return 1; 3237 return 1;
3280 } 3238 }
3281 } 3239 }
3240
3282 return 0; 3241 return 0;
3283} 3242}
3284 3243
3285/* op_on_battleground - checks if the given object op (usually 3244/* op_on_battleground - checks if the given object op (usually
3286 * a player) is standing on a valid battleground-tile, 3245 * a player) is standing on a valid battleground-tile,
… …
3291 * Default is to do the same as before, so only people wanting to have different points need worry about this 3250 * Default is to do the same as before, so only people wanting to have different points need worry about this
3292 */ 3251 */
3293int 3252int
3294op_on_battleground (object *op, int *x, int *y) 3253op_on_battleground (object *op, int *x, int *y)
3295{ 3254{
3296 object *tmp;
3297
3298 /* A battleground-tile needs the following attributes to be valid: 3255 /* A battleground-tile needs the following attributes to be valid:
3299 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3256 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3300 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3257 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3301 * and the exit-coordinates sp/hp must both be > 0. 3258 * and the exit-coordinates sp/hp must both be > 0.
3302 * => The intention here is to prevent abuse of the battleground- 3259 * => The intention here is to prevent abuse of the battleground-
3303 * feature (like pickable or hidden battleground tiles). */ 3260 * feature (like pickable or hidden battleground tiles). */
3304 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3261 for (object *tmp = op->below; tmp; tmp = tmp->below)
3305 { 3262 {
3306 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3263 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3307 { 3264 {
3308 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3265 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3309 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3266 && tmp->type == BATTLEGROUND
3267 && tmp->name == shstr_battleground
3268 && EXIT_X (tmp) && EXIT_Y (tmp))
3310 { 3269 {
3311 /*before we assign the exit, check if this is a teambattle */ 3270 /* before we assign the exit, check if this is a teambattle */
3312 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3271 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3313 { 3272 {
3314 object *invtmp;
3315
3316 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3273 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3317 { 3274 {
3318 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3275 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3319 { 3276 {
3320 if (x != NULL && y != NULL) 3277 if (x && y)
3321 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3278 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3279
3322 return 1; 3280 return 1;
3323 } 3281 }
3324 } 3282 }
3325 } 3283 }
3284
3326 if (x != NULL && y != NULL) 3285 if (x && y)
3327 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3286 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3287
3328 return 1; 3288 return 1;
3329 } 3289 }
3330 } 3290 }
3331 } 3291 }
3292
3332 /* If we got here, did not find a battleground */ 3293 /* If we got here, did not find a battleground */
3333 return 0; 3294 return 0;
3334} 3295}
3335 3296
3336/* 3297/*
… …
3352 char buf[MAX_BUF]; /* tmp. string buffer */ 3313 char buf[MAX_BUF]; /* tmp. string buffer */
3353 int i = 0, j = 0; 3314 int i = 0, j = 0;
3354 3315
3355 /* get the appropriate treasurelist */ 3316 /* get the appropriate treasurelist */
3356 if (atnr == ATNR_FIRE) 3317 if (atnr == ATNR_FIRE)
3357 trlist = treasurelist::find ("dragon_ability_fire"); 3318 trlist = treasurelist::find (shstr_dragon_ability_fire);
3358 else if (atnr == ATNR_COLD) 3319 else if (atnr == ATNR_COLD)
3359 trlist = treasurelist::find ("dragon_ability_cold"); 3320 trlist = treasurelist::find (shstr_dragon_ability_cold);
3360 else if (atnr == ATNR_ELECTRICITY) 3321 else if (atnr == ATNR_ELECTRICITY)
3361 trlist = treasurelist::find ("dragon_ability_elec"); 3322 trlist = treasurelist::find (shstr_dragon_ability_elec);
3362 else if (atnr == ATNR_POISON) 3323 else if (atnr == ATNR_POISON)
3363 trlist = treasurelist::find ("dragon_ability_poison"); 3324 trlist = treasurelist::find (shstr_dragon_ability_poison);
3364 3325
3365 if (trlist == NULL || who->type != PLAYER) 3326 if (trlist == NULL || who->type != PLAYER)
3366 return; 3327 return;
3367 3328
3368 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3329 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3372 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3333 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3373 return; 3334 return;
3374 } 3335 }
3375 3336
3376 /* everything seems okay - now bring on the gift: */ 3337 /* everything seems okay - now bring on the gift: */
3377 item = &(tr->item->clone); 3338 item = tr->item;
3378 3339
3379 if (item->type == SPELL) 3340 if (item->type == SPELL)
3380 { 3341 {
3381 if (check_spell_known (who, item->name)) 3342 if (check_spell_known (who, item->name))
3382 return; 3343 return;
… …
3441 { 3402 {
3442 /* forces in the treasurelist can alter the player's stats */ 3403 /* forces in the treasurelist can alter the player's stats */
3443 object *skin; 3404 object *skin;
3444 3405
3445 /* first get the dragon skin force */ 3406 /* first get the dragon skin force */
3446 shstr_cmp dragon_skin_force ("dragon_skin_force");
3447 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3407 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3448 ; 3408 ;
3449 3409
3450 if (!skin) 3410 if (!skin)
3451 return; 3411 return;
3452 3412
… …
3528 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) 3488 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3529 return 0; 3489 return 0;
3530 3490
3531 return 100 - blocked_los [x][y]; 3491 return 100 - blocked_los [x][y];
3532} 3492}
3493
3494void
3495player::infobox (const char *title, const char *msg, int color)
3496{
3497 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3498}
3499
3500void
3501player::statusmsg (const char *msg, int color)
3502{
3503 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3504}
3505
3506void
3507player::failmsg (const char *msg, int color)
3508{
3509 play_sound (sound_find ("generic_failure"));
3510 statusmsg (msg, color);
3511}
3512

Diff Legend

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