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.265 by root, Tue Apr 6 22:59:28 2010 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

… …
54 54
55 players.insert (this); 55 players.insert (this);
56 ob->remove (); 56 ob->remove ();
57 ob->map = 0; 57 ob->map = 0;
58 ob->activate_recursive (); 58 ob->activate_recursive ();
59 CLEAR_FLAG (ob, FLAG_FRIENDLY); 59 ob->clr_flag (FLAG_FRIENDLY);
60 add_friendly_object (ob); 60 add_friendly_object (ob);
61} 61}
62 62
63void 63void
64player::deactivate () 64player::deactivate ()
… …
75 75
76 ob->remove (); 76 ob->remove ();
77 ob->enemy = 0; // sometimes keeps an extra refcount on itself 77 ob->enemy = 0; // sometimes keeps an extra refcount on itself
78 ob->map = 0; 78 ob->map = 0;
79 party = 0; 79 party = 0;
80
81 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
82 80
83 players.erase (this); 81 players.erase (this);
84} 82}
85 83
86// connect the player with a specific client 84// connect the player with a specific client
… …
139 ob->flag [FLAG_READY_WEAPON] = false; 137 ob->flag [FLAG_READY_WEAPON] = false;
140 ob->flag [FLAG_READY_SKILL] = false; 138 ob->flag [FLAG_READY_SKILL] = false;
141 ob->flag [FLAG_READY_RANGE] = false; 139 ob->flag [FLAG_READY_RANGE] = false;
142 ob->flag [FLAG_READY_BOW] = false; 140 ob->flag [FLAG_READY_BOW] = false;
143 141
144 for (object *op = ob->inv; op; op = op->below)
145 if (op->flag [FLAG_APPLIED])
146 switch (op->type)
147 {
148 case SKILL:
149 op->flag [FLAG_APPLIED] = false;
150 break;
151
152 case SPELL:
153 case WAND:
154 case ROD:
155 case HORN:
156 case BOW:
157 case RANGED:
158 op->flag [FLAG_APPLIED] = false;
159 ranged_ob = op;
160 break;
161
162 case WEAPON:
163 op->flag [FLAG_APPLIED] = false;
164 combat_ob = op;
165 break;
166 }
167
168 ob->update_stats (); // we unapplied stuff above 142 ob->update_stats (); // we unapplied stuff above
169
170 ob->current_weapon = 0;
171 if (object *item = combat_ob ? combat_ob : ranged_ob)
172 ob->apply (item);
173
174 activate (); 143 activate ();
175 144
176 INVOKE_PLAYER (CONNECT, this); 145 INVOKE_PLAYER (CONNECT, this);
177 INVOKE_PLAYER (LOGIN, this); 146 INVOKE_PLAYER (LOGIN, this);
178} 147}
… …
265 disconnect (); 234 disconnect ();
266 235
267 attachable::do_destroy (); 236 attachable::do_destroy ();
268 237
269 if (ob) 238 if (ob)
270 {
271 ob->destroy_inv (false);
272 ob->destroy (); 239 ob->destroy ();
273 }
274 240
275 ob = observe = viewpoint = 0; 241 ob = observe = viewpoint = 0;
276} 242}
277 243
278player::~player () 244player::~player ()
… …
408 */ 374 */
409int 375int
410path_to_player (object *mon, object *pl, unsigned mindiff) 376path_to_player (object *mon, object *pl, unsigned mindiff)
411{ 377{
412 rv_vector rv; 378 rv_vector rv;
413 sint16 x, y;
414 int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked; 379 int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
415 maptile *m, *lastmap;
416 380
417 get_rangevector (mon, pl, &rv, 0); 381 get_rangevector (mon, pl, &rv, 0);
418 382
419 if (rv.distance < mindiff) 383 if (rv.distance < mindiff)
420 return 0; 384 return 0;
421 385
422 x = mon->x; 386 mapxy pos (mon);
423 y = mon->y;
424 m = mon->map;
425 dir = rv.direction; 387 dir = rv.direction;
426 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 388 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
427 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 389 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
428 390
429 /* If we can't solve it within the search distance, return now. */ 391 /* If we can't solve it within the search distance, return now. */
430 if (diff > max) 392 if (diff > max)
431 return 0; 393 return 0;
432 394
433 while (diff > 1 && max > 0) 395 while (diff > 1 && max > 0)
434 { 396 {
435 lastx = x; 397 mapxy lastpos = pos;
436 lasty = y;
437 lastmap = m;
438 x = lastx + freearr_x[dir];
439 y = lasty + freearr_y[dir];
440 398
441 mflags = get_map_flags (m, &m, x, y, &x, &y); 399 pos.move (dir);
442 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
443 400
444 /* Space is blocked - try changing direction a little */ 401 /* Space is blocked - try changing direction a little */
445 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW)) 402 if (!pos.normalise ()
446 && (m == mon->map && blocked_link (mon, m, x, y)))) 403 || (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
404 && blocked_link (mon, pos.m, pos.x, pos.y)))
447 { 405 {
448 /* recalculate direction from last good location. Possible 406 /* recalculate direction from last good location. Possible
449 * we were not traversing ideal location before. 407 * we were not traversing ideal location before.
450 */ 408 */
451 get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0); 409 get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
452 if (rv.direction != dir) 410 if (rv.direction != dir)
453 { 411 {
454 /* OK - says direction should be different - lets reset the 412 /* OK - says direction should be different - lets reset the
455 * the values so it will try again. 413 * the values so it will try again.
456 */ 414 */
457 x = lastx;
458 y = lasty;
459 m = lastmap; 415 pos = lastpos;
460 dir = firstdir = rv.direction; 416 dir = firstdir = rv.direction;
461 } 417 }
462 else 418 else
463 { 419 {
464 /* direct path is blocked - try taking a side step to 420 /* direct path is blocked - try taking a side step to
… …
471 */ 427 */
472 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++) 428 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
473 { 429 {
474 if (i == 0) 430 if (i == 0)
475 continue; /* already did this, so skip it */ 431 continue; /* already did this, so skip it */
432
476 /* Use lastdir here - otherwise, 433 /* Use lastdir here - otherwise,
477 * since the direction that the creature should move in 434 * since the direction that the creature should move in
478 * may change, you could get infinite loops. 435 * may change, you could get infinite loops.
479 * ie, player is northwest, but monster can only 436 * ie, player is northwest, but monster can only
480 * move west, so it does that. It goes some distance, 437 * move west, so it does that. It goes some distance,
… …
482 * can't do that, but now finds it can move east, and 439 * can't do that, but now finds it can move east, and
483 * gets back to its original point. lastdir contains 440 * gets back to its original point. lastdir contains
484 * the last direction the creature has successfully 441 * the last direction the creature has successfully
485 * moved. 442 * moved.
486 */ 443 */
487
488 x = lastx + freearr_x[absdir (lastdir + i)];
489 y = lasty + freearr_y[absdir (lastdir + i)];
490 m = lastmap; 444 pos = lastpos;
491 mflags = get_map_flags (m, &m, x, y, &x, &y); 445 pos.move (absdir (lastdir + i));
492 if (mflags & P_OUT_OF_MAP) 446
447 if (!pos.normalise ())
493 continue; 448 continue;
494 blocked = GET_MAP_MOVE_BLOCK (m, x, y); 449
495 if (OB_TYPE_MOVE_BLOCK (mon, blocked)) 450 mapspace &ms = *pos;
451
452 if (ms.flags () & P_BLOCKSVIEW)
496 continue; 453 continue;
497 if (mflags & P_BLOCKSVIEW) 454
455 if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
498 continue; 456 continue;
499 457
500 if (m == mon->map && blocked_link (mon, m, x, y)) 458 if (blocked_link (mon, pos.m, pos.x, pos.y))
501 break; 459 break;
502 } 460 }
461
503 /* go through entire loop without finding a valid 462 /* go through entire loop without finding a valid
504 * sidestep to take - thus, no valid path. 463 * sidestep to take - thus, no valid path.
505 */ 464 */
506 if (i == (DETOUR_AMOUNT + 1)) 465 if (i == DETOUR_AMOUNT + 1)
507 return 0; 466 return 0;
467
508 diff--; 468 diff--;
509 lastdir = dir; 469 lastdir = dir;
510 max--; 470 max--;
511 if (!firstdir) 471 if (!firstdir)
512 firstdir = dir + i; 472 firstdir = dir + i;
… …
516 { 476 {
517 /* we moved towards creature, so diff is less */ 477 /* we moved towards creature, so diff is less */
518 diff--; 478 diff--;
519 max--; 479 max--;
520 lastdir = dir; 480 lastdir = dir;
481
521 if (!firstdir) 482 if (!firstdir)
522 firstdir = dir; 483 firstdir = dir;
523 } 484 }
524 485
525 if (diff <= 1) 486 if (diff <= 1)
526 { 487 {
527 /* Recalculate diff (distance) because we may not have actually 488 /* Recalculate diff (distance) because we may not have actually
528 * headed toward player for entire distance. 489 * headed toward player for entire distance.
529 */ 490 */
530 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 491 get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
531 diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); 492 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
532 } 493 }
533 494
534 if (diff > max) 495 if (diff > max)
535 return 0; 496 return 0;
… …
553 next = op->below; 514 next = op->below;
554 515
555 /* Forces get applied per default, unless they have the 516 /* Forces get applied per default, unless they have the
556 * flag "neutral" set. Sorry but I can't think of a better way 517 * flag "neutral" set. Sorry but I can't think of a better way
557 */ 518 */
558 if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL)) 519 if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
559 SET_FLAG (op, FLAG_APPLIED); 520 op->set_flag (FLAG_APPLIED);
560 521
561 /* we never give weapons/armour if these cannot be used 522 /* we never give weapons/armour if these cannot be used
562 * by this player due to race restrictions 523 * by this player due to race restrictions
563 */ 524 */
564 if (pl->type == PLAYER) 525 if (pl->type == PLAYER)
565 { 526 {
566 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) 527 if ((!pl->flag [FLAG_USE_ARMOUR]
567 && 528 &&
568 (op->type == ARMOUR || op->type == BOOTS 529 (op->type == ARMOUR || op->type == BOOTS
569 || op->type == CLOAK || op->type == HELMET 530 || op->type == CLOAK || op->type == HELMET
570 || op->type == SHIELD || op->type == GLOVES 531 || op->type == SHIELD || op->type == GLOVES
571 || op->type == BRACERS || op->type == GIRDLE)) 532 || op->type == BRACERS || op->type == GIRDLE))
572 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 533 || (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
573 { 534 {
574 op->destroy (); 535 op->destroy ();
575 continue; 536 continue;
576 } 537 }
577 } 538 }
… …
594 if (op->nrof > 1) 555 if (op->nrof > 1)
595 op->nrof = 1; 556 op->nrof = 1;
596 } 557 }
597 558
598 if (op->type == SPELLBOOK && op->inv) 559 if (op->type == SPELLBOOK && op->inv)
599 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 560 op->inv->clr_flag (FLAG_STARTEQUIP);
600 561
601 /* Give starting characters identified, uncursed, and undamned 562 /* Give starting characters identified, uncursed, and undamned
602 * items. Just don't identify gold or silver, or it won't be 563 * items. Just don't identify gold or silver, or it won't be
603 * merged properly. 564 * merged properly.
604 */ 565 */
605 if (need_identify (op)) 566 if (op->need_identify ())
606 { 567 {
607 SET_FLAG (op, FLAG_IDENTIFIED); 568 op->set_flag (FLAG_IDENTIFIED);
608 CLEAR_FLAG (op, FLAG_CURSED); 569 op->clr_flag (FLAG_CURSED);
609 CLEAR_FLAG (op, FLAG_DAMNED); 570 op->clr_flag (FLAG_DAMNED);
610 } 571 }
611 572
612 if (op->type == SPELL) 573 if (op->type == SPELL)
613 { 574 {
614 op->destroy (); 575 op->destroy ();
615 continue; 576 continue;
616 } 577 }
617 else if (op->type == SKILL) 578 else if (op->type == SKILL)
618 { 579 {
619 SET_FLAG (op, FLAG_CAN_USE_SKILL); 580 op->set_flag (FLAG_CAN_USE_SKILL);
620 op->stats.exp = 0; 581 op->stats.exp = 0;
621 op->level = 1; 582 op->level = 1;
622 } 583 }
623 else /* lock all 'normal items by default */ 584 else /* lock all 'normal items by default */
624 SET_FLAG (op, FLAG_INV_LOCKED); 585 op->set_flag (FLAG_INV_LOCKED);
625 } /* for loop of objects in player inv */ 586 } /* for loop of objects in player inv */
626 587
627 /* Need to set up the skill pointers */ 588 /* Need to set up the skill pointers */
628 pl->contr->link_skills (); 589 pl->contr->link_skills ();
629} 590}
… …
763 724
764 if (ob->msg) 725 if (ob->msg)
765 ob->msg = 0; 726 ob->msg = 0;
766 727
767 start_info (ob); 728 start_info (ob);
768 CLEAR_FLAG (ob, FLAG_WIZ); 729 ob->clr_flag (FLAG_WIZ);
769 give_initial_items (ob, ob->randomitems); 730 give_initial_items (ob, ob->randomitems);
770 esrv_send_inventory (ob, ob); 731 esrv_send_inventory (ob, ob);
771 ob->update_stats (); 732 ob->update_stats ();
772 733
773 /* This moves the player to a different start map, if there 734 /* This moves the player to a different start map, if there
… …
822 rv_vector rv; 783 rv_vector rv;
823 784
824 if (op->stats.hp < 0) 785 if (op->stats.hp < 0)
825 { 786 {
826 LOG (llevDebug, "Fleeing player is dead.\n"); 787 LOG (llevDebug, "Fleeing player is dead.\n");
827 CLEAR_FLAG (op, FLAG_SCARED); 788 op->clr_flag (FLAG_SCARED);
828 return; 789 return;
829 } 790 }
830 791
831 if (!op->enemy) 792 if (!op->enemy)
832 { 793 {
833 LOG (llevDebug, "Fleeing player had no enemy.\n"); 794 LOG (llevDebug, "Fleeing player had no enemy.\n");
834 CLEAR_FLAG (op, FLAG_SCARED); 795 op->clr_flag (FLAG_SCARED);
835 return; 796 return;
836 } 797 }
837 798
838 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0)) 799 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
839 { 800 {
840 op->enemy = NULL; 801 op->enemy = NULL;
841 CLEAR_FLAG (op, FLAG_SCARED); 802 op->clr_flag (FLAG_SCARED);
842 return; 803 return;
843 } 804 }
844 805
845 get_rangevector (op, op->enemy, &rv, 0); 806 get_rangevector (op, op->enemy, &rv, 0);
846 807
… …
852 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m)))) 813 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
853 return; 814 return;
854 } 815 }
855 816
856 /* Cornered, get rid of scared */ 817 /* Cornered, get rid of scared */
857 CLEAR_FLAG (op, FLAG_SCARED); 818 op->clr_flag (FLAG_SCARED);
858 op->enemy = NULL; 819 op->enemy = NULL;
859} 820}
860 821
861/* check_pick sees if there is stuff to be picked up/picks up stuff. 822/* check_pick sees if there is stuff to be picked up/picks up stuff.
862 * It returns 1 if the player should keep on moving, 0 if he should 823 * It returns 1 if the player should keep on moving, 0 if he should
… …
954 * fighting */ 915 * fighting */
955 if (op->contr->mode & PU_INHIBIT) 916 if (op->contr->mode & PU_INHIBIT)
956 return 1; 917 return 1;
957 918
958 /* prevent us from turning into auto-thieves :) */ 919 /* prevent us from turning into auto-thieves :) */
959 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 920 if (tmp->flag [FLAG_UNPAID])
960 continue; 921 continue;
961 922
962 /* ignore known cursed objects */ 923 /* ignore known cursed objects */
963 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) 924 if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
964 continue; 925 continue;
965 926
966 /* all food and drink if desired */ 927 /* all food and drink if desired */
967 /* question: don't pick up known-poisonous stuff? */ 928 /* question: don't pick up known-poisonous stuff? */
968 if (op->contr->mode & PU_FOOD) 929 if (op->contr->mode & PU_FOOD)
… …
971 CHK_PICK_PICKUP; 932 CHK_PICK_PICKUP;
972 continue; 933 continue;
973 } 934 }
974 935
975 if (op->contr->mode & PU_DRINK) 936 if (op->contr->mode & PU_DRINK)
976 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 937 if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
977 { 938 {
978 CHK_PICK_PICKUP; 939 CHK_PICK_PICKUP;
979 continue; 940 continue;
980 } 941 }
981 942
… …
1019 continue; 980 continue;
1020 } 981 }
1021 982
1022 /* pick up all magical items */ 983 /* pick up all magical items */
1023 if (op->contr->mode & PU_MAGICAL) 984 if (op->contr->mode & PU_MAGICAL)
1024 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) 985 if (tmp->flag [FLAG_KNOWN_MAGICAL]
1025 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 986 && !tmp->flag [FLAG_KNOWN_CURSED])
1026 { 987 {
1027 CHK_PICK_PICKUP; 988 CHK_PICK_PICKUP;
1028 continue; 989 continue;
1029 } 990 }
1030 991
… …
1114 continue; 1075 continue;
1115 } 1076 }
1116 1077
1117 /* hoping to catch throwing daggers here */ 1078 /* hoping to catch throwing daggers here */
1118 if (op->contr->mode & PU_MISSILEWEAPON) 1079 if (op->contr->mode & PU_MISSILEWEAPON)
1119 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1080 if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1120 { 1081 {
1121 CHK_PICK_PICKUP; 1082 CHK_PICK_PICKUP;
1122 continue; 1083 continue;
1123 } 1084 }
1124 1085
… …
1179 * return 0. 1140 * return 0.
1180 */ 1141 */
1181static int 1142static int
1182action_makes_visible (object *op) 1143action_makes_visible (object *op)
1183{ 1144{
1184 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 1145 if (op->invisible && op->flag [FLAG_ALIVE])
1185 { 1146 {
1186 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 1147 if (op->flag [FLAG_MAKE_INVIS])
1187 { 1148 {
1188 // artefact invisibility is permanent, but we still make noise 1149 // artefact invisibility is permanent, but we still make noise
1189 // this is important for game-balance. 1150 // this is important for game-balance.
1190 if (op->contr) 1151 if (op->contr)
1191 op->make_noise (); 1152 op->make_noise ();
… …
1218 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1179 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1219 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1180 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1220 return splay (tmp); 1181 return splay (tmp);
1221 1182
1222 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1183 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1223 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type)) 1184 if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1224 if (object *arrow = find_arrow (tmp, type)) 1185 if (object *arrow = find_arrow (tmp, type))
1225 { 1186 {
1226 splay (tmp); 1187 splay (tmp);
1227 return arrow; 1188 return arrow;
1228 } 1189 }
… …
1245 if (!type) 1206 if (!type)
1246 return NULL; 1207 return NULL;
1247 1208
1248 for (arrow = op->inv; arrow; arrow = arrow->below) 1209 for (arrow = op->inv; arrow; arrow = arrow->below)
1249 { 1210 {
1250 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED)) 1211 if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1251 { 1212 {
1252 i = 0; 1213 i = 0;
1253 ntmp = find_better_arrow (arrow, target, type, &i); 1214 ntmp = find_better_arrow (arrow, target, type, &i);
1254 1215
1255 if (i > betterby) 1216 if (i > betterby)
… …
1356 break; 1317 break;
1357 } 1318 }
1358 1319
1359 if (mflags & P_IS_ALIVE) 1320 if (mflags & P_IS_ALIVE)
1360 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 1321 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1361 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 1322 if (tmp->flag [FLAG_ALIVE])
1362 break; 1323 break;
1363 } 1324 }
1364 1325
1365 if (!tmp) 1326 if (!tmp)
1366 return find_arrow (op, type); 1327 return find_arrow (op, type);
… …
1427 { 1388 {
1428 if (op->type == PLAYER) 1389 if (op->type == PLAYER)
1429 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1390 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1430 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1391 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1431 else 1392 else
1432 CLEAR_FLAG (op, FLAG_READY_BOW); 1393 op->clr_flag (FLAG_READY_BOW);
1433 1394
1434 return 0; 1395 return 0;
1435 } 1396 }
1436 } 1397 }
1437 1398
… …
1637 { 1598 {
1638 object *tmp; 1599 object *tmp;
1639 1600
1640 if (item->arch) 1601 if (item->arch)
1641 { 1602 {
1642 CLEAR_FLAG (item, FLAG_ANIMATE); 1603 item->clr_flag (FLAG_ANIMATE);
1643 item->face = item->arch->face; 1604 item->face = item->arch->face;
1644 item->set_speed (0); 1605 item->set_speed (0);
1645 } 1606 }
1646 1607
1647 if (object *pl = item->visible_to ()) 1608 if (object *pl = item->visible_to ())
… …
1775 * 1736 *
1776 * Change the color so that the message doesn't disappear with 1737 * Change the color so that the message doesn't disappear with
1777 * all the others. 1738 * all the others.
1778 */ 1739 */
1779 if (pl->contr->usekeys == key_inventory 1740 if (pl->contr->usekeys == key_inventory
1780 || !QUERY_FLAG (container, FLAG_APPLIED) 1741 || !container->flag [FLAG_APPLIED]
1781 || (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1742 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1782 { 1743 {
1783 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1744 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1784 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1745 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1785 return NULL; 1746 return NULL;
… …
1936 */ 1897 */
1937 if (op->type == PLAYER 1898 if (op->type == PLAYER
1938 && ((mon->owner && mon->owner->contr 1899 && ((mon->owner && mon->owner->contr
1939 && same_party (mon->owner->contr->party, op->contr->party)) 1900 && same_party (mon->owner->contr->party, op->contr->party))
1940 || mon->owner == op) 1901 || mon->owner == op)
1941 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 1902 && (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1942 { 1903 {
1943 /* If we're braced, we don't want to switch places with it */ 1904 /* If we're braced, we don't want to switch places with it */
1944 if (op->contr->braced) 1905 if (op->contr->braced)
1945 return false; 1906 return false;
1946 1907
… …
1966 * creatures. Note that if you are braced, you can't push 1927 * creatures. Note that if you are braced, you can't push
1967 * someone, but put it inside this loop so that you won't 1928 * someone, but put it inside this loop so that you won't
1968 * attack them either. 1929 * attack them either.
1969 */ 1930 */
1970 if ((mon->type == PLAYER || mon->enemy != op) 1931 if ((mon->type == PLAYER || mon->enemy != op)
1971 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 1932 && (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1972 && ((op->contr->peaceful 1933 && ((op->contr->peaceful
1973 || (mon->type == PLAYER && mon->contr->peaceful)) 1934 || (mon->type == PLAYER && mon->contr->peaceful))
1974 && !on_battleground)) 1935 && !on_battleground))
1975 { 1936 {
1976 if (op->speed_left > 0.f) 1937 if (op->speed_left > 0.f)
… …
1992 } 1953 }
1993 } 1954 }
1994 /* If the object is a boulder or other rollable object, then 1955 /* If the object is a boulder or other rollable object, then
1995 * roll it if not braced. You can't roll it if you are braced. 1956 * roll it if not braced. You can't roll it if you are braced.
1996 */ 1957 */
1997 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 1958 else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1998 { 1959 {
1999 if (op->speed_left > 0.f) 1960 if (op->speed_left > 0.f)
2000 { 1961 {
2001 --op->speed_left; 1962 --op->speed_left;
2002 1963
… …
2011 * Way it works is like this: First, it must have some hit points 1972 * Way it works is like this: First, it must have some hit points
2012 * and be living. Then, it must be one of the following: 1973 * and be living. Then, it must be one of the following:
2013 * 1) Not a player, 2) A player, but of a different party. Note 1974 * 1) Not a player, 2) A player, but of a different party. Note
2014 * that party_number -1 is no party, so attacks can still happen. 1975 * that party_number -1 is no party, so attacks can still happen.
2015 */ 1976 */
2016 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 1977 else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2017 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 1978 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2018 { 1979 {
2019 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS]) 1980 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2020 { 1981 {
2021 --op->contr->weapon_sp_left; 1982 --op->contr->weapon_sp_left;
… …
2037{ 1998{
2038 if (!op->map || op->map->in_memory != MAP_ACTIVE) 1999 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2039 return 0; 2000 return 0;
2040 2001
2041 /* Sanity check: make sure dir is valid */ 2002 /* Sanity check: make sure dir is valid */
2042 if (dir < 0 || dir >= 9) 2003 if (dir < 0 || dir > 8)
2043 { 2004 {
2044 LOG (llevError, "move_player: invalid direction %d\n", dir); 2005 LOG (llevError, "move_player: invalid direction %d\n", dir);
2045 return 0; 2006 return 0;
2046 } 2007 }
2047 2008
2048 /* peterm: added following line */ 2009 /* peterm: added following line */
2049 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2010 if (op->flag [FLAG_CONFUSED] && dir)
2050 dir = absdir (dir + rndm (3) + rndm (3) - 2); 2011 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2051 2012
2052 op->facing = dir; 2013 op->facing = dir;
2053 2014
2054 if (op->flag [FLAG_HIDDEN]) 2015 if (op->flag [FLAG_HIDDEN])
… …
2094 * players. 2055 * players.
2095 */ 2056 */
2096bool 2057bool
2097handle_newcs_player (object *op) 2058handle_newcs_player (object *op)
2098{ 2059{
2099 if (QUERY_FLAG (op, FLAG_SCARED)) 2060 if (op->flag [FLAG_SCARED])
2100 { 2061 {
2101 if (op->speed_left > 0.f) 2062 if (op->speed_left > 0.f)
2102 { 2063 {
2103 --op->speed_left; 2064 --op->speed_left;
2104 flee_player (op); 2065 flee_player (op);
… …
2123} 2084}
2124 2085
2125static int 2086static int
2126save_life (object *op) 2087save_life (object *op)
2127{ 2088{
2128 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2089 if (!op->flag [FLAG_LIFESAVE])
2129 return 0; 2090 return 0;
2130 2091
2131 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2092 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2132 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2093 if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2133 { 2094 {
2134 op->play_sound (sound_find ("ob_evaporate")); 2095 op->play_sound (sound_find ("ob_evaporate"));
2135 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2096 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2136 2097
2137 tmp->destroy (); 2098 tmp->destroy ();
2138 CLEAR_FLAG (op, FLAG_LIFESAVE); 2099 op->clr_flag (FLAG_LIFESAVE);
2139 2100
2140 if (op->stats.hp < 0) 2101 if (op->stats.hp < 0)
2141 op->stats.hp = op->stats.maxhp; 2102 op->stats.hp = op->stats.maxhp;
2142 2103
2143 if (op->stats.food < 0) 2104 if (op->stats.food < 0)
… …
2146 op->update_stats (); 2107 op->update_stats ();
2147 return 1; 2108 return 1;
2148 } 2109 }
2149 2110
2150 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2111 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2151 CLEAR_FLAG (op, FLAG_LIFESAVE); 2112 op->clr_flag (FLAG_LIFESAVE);
2152 enter_player_savebed (op); /* bring him home. */ 2113 enter_player_savebed (op); /* bring him home. */
2153 return 0; 2114 return 0;
2154} 2115}
2155 2116
2156/* This goes throws the inventory and removes unpaid objects, and puts them 2117/* This goes throws the inventory and removes unpaid objects, and puts them
… …
2163{ 2124{
2164 while (op) 2125 while (op)
2165 { 2126 {
2166 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2127 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2167 2128
2168 if (QUERY_FLAG (op, FLAG_UNPAID)) 2129 if (op->flag [FLAG_UNPAID])
2169 op->insert_at (env); 2130 op->insert_at (env);
2170 else if (op->inv) 2131 else if (op->inv)
2171 drop_unpaid_items (op->inv, env); 2132 drop_unpaid_items (op->inv, env);
2172 2133
2173 op = next; 2134 op = next;
… …
2203 * alternate it here for it to work correctly. 2164 * alternate it here for it to work correctly.
2204 */ 2165 */
2205 if (pticks & 2) 2166 if (pticks & 2)
2206 op->invisible--; 2167 op->invisible--;
2207 } 2168 }
2208 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) 2169 else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2209 { 2170 {
2210 if (!op->invisible--) 2171 if (!op->invisible--)
2211 { 2172 {
2212 make_visible (op); 2173 make_visible (op);
2213 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2174 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
… …
2280 if (op->stats.sp < op->stats.maxsp) 2241 if (op->stats.sp < op->stats.maxsp)
2281 { 2242 {
2282 op->stats.sp++; 2243 op->stats.sp++;
2283 2244
2284 /* dms do not consume food */ 2245 /* dms do not consume food */
2285 if (!QUERY_FLAG (op, FLAG_WIZ)) 2246 if (!op->flag [FLAG_WIZ])
2286 { 2247 {
2287 op->stats.food--; 2248 op->stats.food--;
2288 2249
2289 if (op->contr->digestion < 0) 2250 if (op->contr->digestion < 0)
2290 op->stats.food += op->contr->digestion; 2251 op->stats.food += op->contr->digestion;
… …
2324 if (op->stats.hp < op->stats.maxhp) 2285 if (op->stats.hp < op->stats.maxhp)
2325 { 2286 {
2326 op->stats.hp++; 2287 op->stats.hp++;
2327 2288
2328 /* dms do not consume food */ 2289 /* dms do not consume food */
2329 if (!QUERY_FLAG (op, FLAG_WIZ)) 2290 if (!op->flag [FLAG_WIZ])
2330 { 2291 {
2331 op->stats.food--; 2292 op->stats.food--;
2332 2293
2333 if (op->contr->digestion < 0) 2294 if (op->contr->digestion < 0)
2334 op->stats.food += op->contr->digestion; 2295 op->stats.food += op->contr->digestion;
… …
2361 penalty = max (0, -op->contr->digestion); 2322 penalty = max (0, -op->contr->digestion);
2362 2323
2363 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); 2324 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2364 2325
2365 /* dms do not consume food */ 2326 /* dms do not consume food */
2366 if (!QUERY_FLAG (op, FLAG_WIZ)) 2327 if (!op->flag [FLAG_WIZ])
2367 op->stats.food--; 2328 op->stats.food--;
2368 } 2329 }
2369 2330
2370 if (op->stats.food < 0 && op->stats.hp >= 0) 2331 if (op->stats.food < 0 && op->stats.hp >= 0)
2371 { 2332 {
2372 object *flesh = 0; 2333 object *flesh = 0;
2373 2334
2374 for_inv_removable (op, tmp) 2335 for_inv_removable (op, tmp)
2375 { 2336 {
2376 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 2337 if (tmp->flag [FLAG_UNPAID])
2377 continue; 2338 continue;
2378 2339
2379 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2340 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2380 { 2341 {
2381 op->statusmsg ("You blindly grab for a bite of food. " 2342 op->statusmsg ("You blindly grab for a bite of food. "
… …
2416 op->contr->killer->destroy (); 2377 op->contr->killer->destroy ();
2417 } 2378 }
2418 } 2379 }
2419 2380
2420 /* killer should be set here already */ 2381 /* killer should be set here already */
2421 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2382 if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2422 kill_player (op); 2383 kill_player (op);
2423 } 2384 }
2424} 2385}
2425 2386
2426/* If the player should die (lack of hp, food, etc), we call this. 2387/* If the player should die (lack of hp, food, etc), we call this.
… …
2621 * difference. 2582 * difference.
2622 */ 2583 */
2623 if (this_stat >= -50) 2584 if (this_stat >= -50)
2624 { 2585 {
2625 change_attr_value (&(dep->stats), i, -1); 2586 change_attr_value (&(dep->stats), i, -1);
2626 SET_FLAG (dep, FLAG_APPLIED); 2587 dep->set_flag (FLAG_APPLIED);
2627 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]); 2588 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2628 op->update_stats (); 2589 op->update_stats ();
2629 lost_a_stat = 1; 2590 lost_a_stat = 1;
2630 } 2591 }
2631 } 2592 }
… …
2702 2663
2703 force = get_archetype (FORCE_NAME); 2664 force = get_archetype (FORCE_NAME);
2704 /* 50 ticks should be enough time for the spell to abate */ 2665 /* 50 ticks should be enough time for the spell to abate */
2705 force->speed = 0.1f; 2666 force->speed = 0.1f;
2706 force->speed_left = -5.f; 2667 force->speed_left = -5.f;
2707 SET_FLAG (force, FLAG_APPLIED); 2668 force->set_flag (FLAG_APPLIED);
2708 for (at = 0; at < NROFATTACKS; at++) 2669 for (at = 0; at < NROFATTACKS; at++)
2709 if (will_kill_again & (1 << at)) 2670 if (will_kill_again & (1 << at))
2710 force->resist[at] = 100; 2671 force->resist[at] = 100;
2711 2672
2712 insert_ob_in_ob (force, op); 2673 insert_ob_in_ob (force, op);
… …
2734 tmp->x = op->x, tmp->y = op->y; 2695 tmp->x = op->x, tmp->y = op->y;
2735 2696
2736 if (tmp->type == CONTAINER) 2697 if (tmp->type == CONTAINER)
2737 loot_object (tmp); /* empty container to ground */ 2698 loot_object (tmp); /* empty container to ground */
2738 2699
2739 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2700 if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2740 { 2701 {
2741 if (tmp->nrof > 1) 2702 if (tmp->nrof > 1)
2742 { 2703 {
2743 tmp->decrease (rndm (1, tmp->nrof - 1)); 2704 tmp->decrease (rndm (1, tmp->nrof - 1));
2744 insert_ob_in_map (tmp, op->map, NULL, 0); 2705 insert_ob_in_map (tmp, op->map, NULL, 0);
… …
2834} 2795}
2835 2796
2836int 2797int
2837is_true_undead (object *op) 2798is_true_undead (object *op)
2838{ 2799{
2839 if (QUERY_FLAG (op->arch, FLAG_UNDEAD)) 2800 if (op->arch->flag [FLAG_UNDEAD])
2840 return 1; 2801 return 1;
2841 2802
2842 return 0; 2803 return 0;
2843} 2804}
2844 2805
… …
2942 2903
2943 if (who->type == PLAYER) 2904 if (who->type == PLAYER)
2944 player = 1; 2905 player = 1;
2945 2906
2946 else 2907 else
2947 friendly = QUERY_FLAG (who, FLAG_FRIENDLY); 2908 friendly = who->flag [FLAG_FRIENDLY];
2948 2909
2949 /* search adjacent squares */ 2910 /* search adjacent squares */
2950 for (i = 1; i < 9; i++) 2911 for (i = 1; i < 9; i++)
2951 { 2912 {
2952 x = who->x + freearr_x[i]; 2913 x = who->x + freearr_x[i];
… …
2961 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 2922 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2962 continue; 2923 continue;
2963 2924
2964 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) 2925 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2965 { 2926 {
2966 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 2927 if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2967 return 1; 2928 return 1;
2968 else if (tmp->type == PLAYER) 2929 else if (tmp->type == PLAYER)
2969 { 2930 {
2970 /*don't let a hidden DM prevent you from hiding */ 2931 /*don't let a hidden DM prevent you from hiding */
2971 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0) 2932 if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2972 return 1; 2933 return 1;
2973 } 2934 }
2974 } 2935 }
2975 } 2936 }
2976 return 0; 2937 return 0;
… …
3045 * and the exit-coordinates sp/hp must both be > 0. 3006 * and the exit-coordinates sp/hp must both be > 0.
3046 * => The intention here is to prevent abuse of the battleground- 3007 * => The intention here is to prevent abuse of the battleground-
3047 * feature (like pickable or hidden battleground tiles). */ 3008 * feature (like pickable or hidden battleground tiles). */
3048 for (object *tmp = op->below; tmp; tmp = tmp->below) 3009 for (object *tmp = op->below; tmp; tmp = tmp->below)
3049 { 3010 {
3050 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3011 if (tmp->flag [FLAG_IS_FLOOR])
3051 { 3012 {
3052 if (QUERY_FLAG (tmp, FLAG_NO_PICK) 3013 if (tmp->flag [FLAG_NO_PICK]
3053 && tmp->type == BATTLEGROUND 3014 && tmp->type == BATTLEGROUND
3054 && tmp->name == shstr_battleground 3015 && tmp->name == shstr_battleground
3055 && EXIT_X (tmp) && EXIT_Y (tmp)) 3016 && EXIT_X (tmp) && EXIT_Y (tmp))
3056 { 3017 {
3057 /* before we assign the exit, check if this is a teambattle */ 3018 /* before we assign the exit, check if this is a teambattle */
… …
3215 strcat (buf, "."); 3176 strcat (buf, ".");
3216 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3177 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3217 } 3178 }
3218 3179
3219 /* evtl. adding flags: */ 3180 /* evtl. adding flags: */
3220 if (QUERY_FLAG (item, FLAG_XRAYS)) 3181 if (item->flag [FLAG_XRAYS])
3221 SET_FLAG (skin, FLAG_XRAYS); 3182 skin->set_flag (FLAG_XRAYS);
3222 if (QUERY_FLAG (item, FLAG_STEALTH)) 3183 if (item->flag [FLAG_STEALTH])
3223 SET_FLAG (skin, FLAG_STEALTH); 3184 skin->set_flag (FLAG_STEALTH);
3224 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK)) 3185 if (item->flag [FLAG_SEE_IN_DARK])
3225 SET_FLAG (skin, FLAG_SEE_IN_DARK); 3186 skin->set_flag (FLAG_SEE_IN_DARK);
3226 3187
3227 /* print message if there is one */ 3188 /* print message if there is one */
3228 if (item->msg != NULL) 3189 if (item->msg != NULL)
3229 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3190 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3230 } 3191 }
… …
3272{ 3233{
3273 play_sound (sound_find ("generic_failure")); 3234 play_sound (sound_find ("generic_failure"));
3274 statusmsg (msg, color); 3235 statusmsg (msg, color);
3275} 3236}
3276 3237
3238void
3239object::failmsgf (const char *format, ...)
3240{
3241 if (!contr)
3242 return;
3243
3244 va_list ap;
3245 va_start (ap, format);
3246 contr->failmsg (vformat (format, ap));
3247 va_end (ap);
3248}
3249
3250void
3251player::failmsgf (const char *format, ...)
3252{
3253 va_list ap;
3254 va_start (ap, format);
3255 failmsg (vformat (format, ap));
3256 va_end (ap);
3257}
3258

Diff Legend

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