ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.313 by root, Fri Mar 26 00:05:45 2010 UTC vs.
Revision 1.337 by root, Thu May 6 21:45:49 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
36static const uint64 UUID_GAP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000; 37uint32_t mapspace::smellcount = 10000;
38 38
39objectvec objects; 39objectvec objects;
40activevec actives; 40activevec actives;
41
42freelist_item *object::freelist;
43uint32_t object::object_count;
44uint32_t object::free_count;
45uint32_t object::create_count;
46uint32_t object::destroy_count;
41 47
42//+GPL 48//+GPL
43 49
44short freearr_x[SIZEOFFREE] = { 50short freearr_x[SIZEOFFREE] = {
45 0, 51 0,
… …
266 * This is to the comparison of the flags below will be OK. We 272 * This is to the comparison of the flags below will be OK. We
267 * just can't ignore the been applied or identified flags, as they 273 * just can't ignore the been applied or identified flags, as they
268 * are not equal - just if it has been identified, the been_applied 274 * are not equal - just if it has been identified, the been_applied
269 * flags lose any meaning. 275 * flags lose any meaning.
270 */ 276 */
271 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 277 if (ob1->flag [FLAG_IDENTIFIED])
272 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 278 ob1->set_flag (FLAG_BEEN_APPLIED);
273 279
274 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 280 if (ob2->flag [FLAG_IDENTIFIED])
275 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 281 ob2->set_flag (FLAG_BEEN_APPLIED);
276 282
277 if (ob1->arch->archname != ob2->arch->archname 283 if (ob1->arch->archname != ob2->arch->archname
278 || ob1->name != ob2->name 284 || ob1->name != ob2->name
279 || ob1->title != ob2->title 285 || ob1->title != ob2->title
280 || ob1->msg != ob2->msg 286 || ob1->msg != ob2->msg
… …
329 335
330 /* Don't merge objects that are applied. With the new 'body' code, 336 /* Don't merge objects that are applied. With the new 'body' code,
331 * it is possible for most any character to have more than one of 337 * it is possible for most any character to have more than one of
332 * some items equipped, and we don't want those to merge. 338 * some items equipped, and we don't want those to merge.
333 */ 339 */
334 if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) 340 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
335 return 0; 341 return 0;
336 342
337 /* Note sure why the following is the case - either the object has to 343 /* Note sure why the following is the case - either the object has to
338 * be animated or have a very low speed. Is this an attempted monster 344 * be animated or have a very low speed. Is this an attempted monster
339 * check? 345 * check?
340 */ 346 */
341 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) 347 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
342 return 0; 348 return 0;
343 349
344 switch (ob1->type) 350 switch (ob1->type)
345 { 351 {
346 case SCROLL: 352 case SCROLL:
… …
420 426
421 return 0; 427 return 0;
422} 428}
423 429
424// adjust weight per container type ("of holding") 430// adjust weight per container type ("of holding")
425static sint32 431static uint32
426weight_adjust_for (object *op, sint32 weight) 432weight_adjust_for (object *op, uint32 weight)
427{ 433{
428 return op->type == CONTAINER 434 return op->type == CONTAINER
429 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 435 ? weight - weight * op->stats.Str / 100
430 : weight; 436 : weight;
431} 437}
432 438
433/* 439/*
434 * adjust_weight(object, weight) adds the specified weight to an object, 440 * subtracts, then adds, the specified weight to an object,
435 * and also updates how much the environment(s) is/are carrying. 441 * and also updates how much the environment(s) is/are carrying.
436 */ 442 */
437static void 443static void
438adjust_weight (object *op, sint32 weight) 444adjust_weight (object *op, sint32 sub, sint32 add)
439{ 445{
440 while (op) 446 while (op)
441 { 447 {
442 // adjust by actual difference to account for rounding errors 448 sint32 ocarrying = op->carrying;
443 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
444 weight = weight_adjust_for (op, op->carrying)
445 - weight_adjust_for (op, op->carrying - weight);
446 449
447 if (!weight) 450 op->carrying -= weight_adjust_for (op, sub);
448 return; 451 op->carrying += weight_adjust_for (op, add);
449
450 op->carrying += weight;
451 452
452 if (object *pl = op->visible_to ()) 453 if (object *pl = op->visible_to ())
453 if (pl != op) // player is handled lazily 454 if (pl != op) // player is handled lazily
454 esrv_update_item (UPD_WEIGHT, pl, op); 455 esrv_update_item (UPD_WEIGHT, pl, op);
455 456
457 sub = ocarrying;
458 add = op->carrying;
459
456 op = op->env; 460 op = op->env;
457 } 461 }
458} 462}
459 463
460/* 464/*
… …
467{ 471{
468 sint32 sum = 0; 472 sint32 sum = 0;
469 473
470 for (object *op = inv; op; op = op->below) 474 for (object *op = inv; op; op = op->below)
471 { 475 {
472 if (op->inv)
473 op->update_weight (); 476 op->update_weight ();
474 477
475 sum += op->total_weight (); 478 sum += weight_adjust_for (this, op->total_weight ());
476 } 479 }
477
478 sum = weight_adjust_for (this, sum);
479 480
480 if (sum != carrying) 481 if (sum != carrying)
481 { 482 {
483 if (carrying != sum && carrying)//D
484 LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
485 (long long)sum, (long long)carrying, debug_desc ());
486
482 carrying = sum; 487 carrying = sum;
483 488
484 if (object *pl = visible_to ()) 489 if (object *pl = visible_to ())
485 if (pl != this) // player is handled lazily 490 if (pl != this) // player is handled lazily
486 esrv_update_item (UPD_WEIGHT, pl, this); 491 esrv_update_item (UPD_WEIGHT, pl, this);
… …
572 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); 577 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
573 return; 578 return;
574 } 579 }
575 580
576 this->owner = owner; 581 this->owner = owner;
577}
578
579int
580object::slottype () const
581{
582 if (type == SKILL)
583 {
584 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
585 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
586 }
587 else
588 {
589 if (slot [body_combat].info) return slot_combat;
590 if (slot [body_range ].info) return slot_ranged;
591 }
592
593 return slot_none;
594}
595
596bool
597object::change_weapon (object *ob)
598{
599 if (current_weapon == ob)
600 return true;
601
602 if (chosen_skill)
603 chosen_skill->flag [FLAG_APPLIED] = false;
604
605 current_weapon = ob;
606 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
607
608 if (chosen_skill)
609 chosen_skill->flag [FLAG_APPLIED] = true;
610
611 update_stats ();
612
613 if (ob)
614 {
615 // now check wether any body locations became invalid, in which case
616 // we cannot apply the weapon at the moment.
617 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
618 if (slot[i].used < 0)
619 {
620 current_weapon = chosen_skill = 0;
621 update_stats ();
622
623 new_draw_info_format (NDI_UNIQUE, 0, this,
624 "You try to balance all your items at once, "
625 "but the %s is just too much for your body. "
626 "[You need to unapply some items first - use the 'body' command to see "
627 "how many items you cna wera on a specific body part.]", &ob->name);
628 return false;
629 }
630
631 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
632 }
633 else
634 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
635
636 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
637 {
638 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
639 &name, ob->debug_desc ());
640 return false;
641 }
642
643 return true;
644} 582}
645 583
646/* Zero the key_values on op, decrementing the shared-string 584/* Zero the key_values on op, decrementing the shared-string
647 * refcounts and freeing the links. 585 * refcounts and freeing the links.
648 */ 586 */
… …
750 * be called to update the face variable, _and_ how it looks on the map. 688 * be called to update the face variable, _and_ how it looks on the map.
751 */ 689 */
752void 690void
753update_turn_face (object *op) 691update_turn_face (object *op)
754{ 692{
755 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) 693 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
756 return; 694 return;
757 695
758 SET_ANIMATION (op, op->direction); 696 SET_ANIMATION (op, op->direction);
759 update_object (op, UP_OBJ_FACE); 697 update_object (op, UP_OBJ_FACE);
760} 698}
… …
826 /* nop */; 764 /* nop */;
827 else if (action == UP_OBJ_INSERT) 765 else if (action == UP_OBJ_INSERT)
828 { 766 {
829#if 0 767#if 0
830 // this is likely overkill, TODO: revisit (schmorp) 768 // this is likely overkill, TODO: revisit (schmorp)
831 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 769 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
832 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 770 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
833 || (op->is_player () && !(m.flags_ & P_PLAYER)) 771 || (op->is_player () && !(m.flags_ & P_PLAYER))
834 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 772 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
835 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 773 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
836 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 774 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
837 || (m.move_on | op->move_on ) != m.move_on 775 || (m.move_on | op->move_on ) != m.move_on
838 || (m.move_off | op->move_off ) != m.move_off 776 || (m.move_off | op->move_off ) != m.move_off
839 || (m.move_slow | op->move_slow) != m.move_slow 777 || (m.move_slow | op->move_slow) != m.move_slow
840 /* This isn't perfect, but I don't expect a lot of objects to 778 /* This isn't perfect, but I don't expect a lot of objects to
841 * have move_allow right now. 779 * have move_allow right now.
… …
862 update_object (op->more, action); 800 update_object (op->more, action);
863} 801}
864 802
865object::object () 803object::object ()
866{ 804{
867 SET_FLAG (this, FLAG_REMOVED); 805 this->set_flag (FLAG_REMOVED);
868 806
869 //expmul = 1.0; declared const for the time being 807 //expmul = 1.0; declared const for the time being
870 face = blank_face; 808 face = blank_face;
871 material = MATERIAL_NULL; 809 material = MATERIAL_NULL;
872} 810}
… …
876 unlink (); 814 unlink ();
877 815
878 free_key_values (this); 816 free_key_values (this);
879} 817}
880 818
881static int object_count;
882
883void object::link () 819void object::link ()
884{ 820{
885 assert (!index);//D 821 assert (!index);//D
886 uuid = UUID::gen (); 822 uuid = UUID::gen ();
887 count = ++object_count;
888 823
889 refcnt_inc (); 824 refcnt_inc ();
890 objects.insert (this); 825 objects.insert (this);
826
827 ++create_count;
828
891} 829}
892 830
893void object::unlink () 831void object::unlink ()
894{ 832{
895 if (!index) 833 if (!index)
896 return; 834 return;
835
836 ++destroy_count;
897 837
898 objects.erase (this); 838 objects.erase (this);
899 refcnt_dec (); 839 refcnt_dec ();
900} 840}
901 841
… …
1006 map->insert (op, x, y); 946 map->insert (op, x, y);
1007 } 947 }
1008 } 948 }
1009} 949}
1010 950
951/*
952 * Remove and free all objects in the inventory of the given object.
953 * Unlike destroy_inv, this assumes the *this is destroyed as well
954 * well, so we can (and have to!) take shortcuts.
955 */
956void
957object::destroy_inv_fast ()
958{
959 while (object *op = inv)
960 {
961 // remove from object the fast way
962 op->flag [FLAG_REMOVED] = true;
963 op->env = 0;
964 if ((inv = inv->below))
965 inv->above = 0;
966
967 // then destroy
968 op->destroy ();
969 }
970}
971
972void
973object::freelist_free (int count)
974{
975 while (count-- && freelist)
976 {
977 freelist_item *next = freelist->next;
978 // count is being "destroyed"
979
980 sfree ((char *)freelist, sizeof (object));
981
982 freelist = next;
983 --free_count;
984 }
985}
986
987object *
1011object *object::create () 988object::create ()
1012{ 989{
1013 object *op = new object; 990 object *op;
991
992 if (freelist)
993 {
994 freelist_item li = *freelist;
995 memset (freelist, 0, sizeof (object));
996
997 op = new (freelist) object;
998 op->count = li.count;
999
1000 freelist = li.next;
1001 --free_count;
1002 }
1003 else
1004 {
1005 void *ni = salloc0<char> (sizeof (object));
1006
1007 op = new(ni) object;
1008
1009 op->count = ++object_count;
1010 }
1011
1014 op->link (); 1012 op->link ();
1013
1015 return op; 1014 return op;
1016} 1015}
1017 1016
1017void
1018object::do_delete ()
1019{
1020 uint32_t count = this->count;
1021
1022 this->~object ();
1023
1024 freelist_item *li = (freelist_item *)this;
1025 li->next = freelist;
1026 li->count = count;
1027
1028 freelist = li;
1029 ++free_count;
1030}
1031
1018static struct freed_map : maptile 1032static struct freed_map : maptile
1019{ 1033{
1020 freed_map () 1034 freed_map ()
1035 : maptile (3, 3)
1021 { 1036 {
1022 path = "<freed objects map>"; 1037 path = "<freed objects map>";
1023 name = "/internal/freed_objects_map"; 1038 name = "/internal/freed_objects_map";
1024 width = 3;
1025 height = 3;
1026 no_drop = 1; 1039 no_drop = 1;
1027 no_reset = 1; 1040 no_reset = 1;
1028 1041
1029 alloc ();
1030 in_memory = MAP_ACTIVE; 1042 in_memory = MAP_ACTIVE;
1031 } 1043 }
1032 1044
1033 ~freed_map () 1045 ~freed_map ()
1034 { 1046 {
… …
1085 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1097 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1086 head->destroy (); 1098 head->destroy ();
1087 return; 1099 return;
1088 } 1100 }
1089 1101
1090 destroy_inv (false); 1102 destroy_inv_fast ();
1091 1103
1092 if (is_head ()) 1104 if (is_head ())
1093 if (sound_destroy) 1105 if (sound_destroy)
1094 play_sound (sound_destroy); 1106 play_sound (sound_destroy);
1095 else if (flag [FLAG_MONSTER]) 1107 else if (flag [FLAG_MONSTER])
… …
1127 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed 1139 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1128 if (object *pl = visible_to ()) 1140 if (object *pl = visible_to ())
1129 esrv_del_item (pl->contr, count); 1141 esrv_del_item (pl->contr, count);
1130 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1142 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1131 1143
1132 adjust_weight (env, -total_weight ()); 1144 adjust_weight (env, total_weight (), 0);
1133 1145
1134 object *pl = in_player (); 1146 object *pl = in_player ();
1135 1147
1136 /* we set up values so that it could be inserted into 1148 /* we set up values so that it could be inserted into
1137 * the map, but we don't actually do that - it is up 1149 * the map, but we don't actually do that - it is up
… …
1149 below = 0; 1161 below = 0;
1150 env = 0; 1162 env = 0;
1151 1163
1152 if (pl && pl->is_player ()) 1164 if (pl && pl->is_player ())
1153 { 1165 {
1166 if (expect_false (pl->contr->combat_ob == this))
1167 {
1168 pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
1169 pl->contr->combat_ob = 0;
1170 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1171 }
1172
1173 if (expect_false (pl->contr->ranged_ob == this))
1174 {
1175 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
1176 pl->contr->ranged_ob = 0;
1177 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1178 }
1179
1154 pl->contr->queue_stats_update (); 1180 pl->contr->queue_stats_update ();
1155 1181
1156 if (glow_radius && pl->is_on_map ()) 1182 if (expect_false (glow_radius) && pl->is_on_map ())
1157 update_all_los (pl->map, pl->x, pl->y); 1183 update_all_los (pl->map, pl->x, pl->y);
1158 } 1184 }
1159 } 1185 }
1160 else if (map) 1186 else if (map)
1161 { 1187 {
… …
1181 else if (pl->container_ () == this) 1207 else if (pl->container_ () == this)
1182 { 1208 {
1183 // removing a container should close it 1209 // removing a container should close it
1184 close_container (); 1210 close_container ();
1185 } 1211 }
1186 1212 else
1187 esrv_del_item (pl->contr, count); 1213 esrv_del_item (pl->contr, count);
1188 } 1214 }
1189 1215
1190 /* link the object above us */ 1216 /* link the object above us */
1191 // re-link, make sure compiler can easily use cmove 1217 // re-link, make sure compiler can easily use cmove
1192 *(above ? &above->below : &ms.top) = below; 1218 *(above ? &above->below : &ms.top) = below;
… …
1378 // from here :/ 1404 // from here :/
1379 op->nrof += tmp->nrof; 1405 op->nrof += tmp->nrof;
1380 tmp->destroy (); 1406 tmp->destroy ();
1381 } 1407 }
1382 1408
1383 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1409 op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1384 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1410 op->clr_flag (FLAG_INV_LOCKED);
1385 1411
1386 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1412 if (!op->flag [FLAG_ALIVE])
1387 CLEAR_FLAG (op, FLAG_NO_STEAL); 1413 op->clr_flag (FLAG_NO_STEAL);
1388 1414
1389 if (flag & INS_BELOW_ORIGINATOR) 1415 if (flag & INS_BELOW_ORIGINATOR)
1390 { 1416 {
1391 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1417 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1392 { 1418 {
… …
1427 * when lots of spells are cast in one area. Currently, it is presumed 1453 * when lots of spells are cast in one area. Currently, it is presumed
1428 * that flying non pickable objects are spell objects. 1454 * that flying non pickable objects are spell objects.
1429 */ 1455 */
1430 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1456 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1431 { 1457 {
1432 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) 1458 if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1433 floor = tmp; 1459 floor = tmp;
1434 1460
1435 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1461 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1436 { 1462 {
1437 /* We insert above top, so we want this object below this */ 1463 /* We insert above top, so we want this object below this */
1438 top = tmp->below; 1464 top = tmp->below;
1439 break; 1465 break;
1440 } 1466 }
… …
1458 && (op->face && !faces [op->face].visibility)) 1484 && (op->face && !faces [op->face].visibility))
1459 { 1485 {
1460 object *last; 1486 object *last;
1461 1487
1462 for (last = top; last != floor; last = last->below) 1488 for (last = top; last != floor; last = last->below)
1463 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1489 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1464 break; 1490 break;
1465 1491
1466 /* Check to see if we found the object that blocks view, 1492 /* Check to see if we found the object that blocks view,
1467 * and make sure we have a below pointer for it so that 1493 * and make sure we have a below pointer for it so that
1468 * we can get inserted below this one, which requires we 1494 * we can get inserted below this one, which requires we
… …
1541 */ 1567 */
1542 1568
1543 /* if this is not the head or flag has been passed, don't check walk on status */ 1569 /* if this is not the head or flag has been passed, don't check walk on status */
1544 if (!(flag & INS_NO_WALK_ON) && op->is_head ()) 1570 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1545 { 1571 {
1546 if (check_move_on (op, originator)) 1572 if (check_move_on (op, originator, flag))
1547 return 0; 1573 return 0;
1548 1574
1549 /* If we are a multi part object, lets work our way through the check 1575 /* If we are a multi part object, let's work our way through the check
1550 * walk on's. 1576 * walk on's.
1551 */ 1577 */
1552 for (object *tmp = op->more; tmp; tmp = tmp->more) 1578 for (object *tmp = op->more; tmp; tmp = tmp->more)
1553 if (check_move_on (tmp, originator)) 1579 if (check_move_on (tmp, originator, flag))
1554 return 0; 1580 return 0;
1555 } 1581 }
1556 1582
1557 return op; 1583 return op;
1558} 1584}
… …
1599 || (items < m->max_items 1625 || (items < m->max_items
1600 && ms.volume () < m->max_volume)) 1626 && ms.volume () < m->max_volume))
1601 return true; 1627 return true;
1602 1628
1603 if (originator && originator->is_player ()) 1629 if (originator && originator->is_player ())
1604 originator->contr->failmsg (format ( 1630 originator->contr->failmsgf (
1605 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", 1631 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1606 query_name () 1632 query_name ()
1607 )); 1633 );
1608 1634
1609 return false; 1635 return false;
1610} 1636}
1611 1637
1612/* 1638/*
… …
1624 1650
1625 nr = min (nr, nrof); 1651 nr = min (nr, nrof);
1626 1652
1627 if (nrof > nr) 1653 if (nrof > nr)
1628 { 1654 {
1655 sint64 oweight = total_weight ();
1656
1629 nrof -= nr; 1657 nrof -= nr;
1630 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1631 1658
1632 if (object *pl = visible_to ()) 1659 if (object *pl = visible_to ())
1633 esrv_update_item (UPD_NROF, pl, this); 1660 esrv_update_item (UPD_NROF, pl, this);
1661
1662 adjust_weight (env, oweight, total_weight ());
1634 1663
1635 return true; 1664 return true;
1636 } 1665 }
1637 else 1666 else
1638 { 1667 {
… …
1713 if (op->nrof) 1742 if (op->nrof)
1714 for (object *tmp = inv; tmp; tmp = tmp->below) 1743 for (object *tmp = inv; tmp; tmp = tmp->below)
1715 if (object::can_merge (tmp, op)) 1744 if (object::can_merge (tmp, op))
1716 { 1745 {
1717 /* return the original object and remove inserted object 1746 /* return the original object and remove inserted object
1718 (client needs the original object) */ 1747 (client prefers the original object) */
1748
1749 // carring must be 0 for mergable objects
1750 sint64 oweight = tmp->weight * tmp->nrof;
1751
1719 tmp->nrof += op->nrof; 1752 tmp->nrof += op->nrof;
1720 1753
1721 if (object *pl = tmp->visible_to ()) 1754 if (object *pl = tmp->visible_to ())
1722 esrv_update_item (UPD_NROF, pl, tmp); 1755 esrv_update_item (UPD_NROF, pl, tmp);
1723 1756
1724 adjust_weight (this, op->total_weight ()); 1757 adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1725 1758
1726 op->destroy (); 1759 op->destroy ();
1727 op = tmp; 1760 op = tmp;
1728 goto inserted; 1761 goto inserted;
1729 } 1762 }
… …
1745 op->flag [FLAG_REMOVED] = 0; 1778 op->flag [FLAG_REMOVED] = 0;
1746 1779
1747 if (object *pl = op->visible_to ()) 1780 if (object *pl = op->visible_to ())
1748 esrv_send_item (pl, op); 1781 esrv_send_item (pl, op);
1749 1782
1750 adjust_weight (this, op->total_weight ()); 1783 adjust_weight (this, 0, op->total_weight ());
1751 1784
1752inserted: 1785inserted:
1753 /* reset the light list and los of the players on the map */ 1786 /* reset the light list and los of the players on the map */
1754 if (op->glow_radius && is_on_map ()) 1787 if (op->glow_radius && is_on_map ())
1755 { 1788 {
… …
1784 * MSW 2001-07-08: Check all objects on space, not just those below 1817 * MSW 2001-07-08: Check all objects on space, not just those below
1785 * object being inserted. insert_ob_in_map may not put new objects 1818 * object being inserted. insert_ob_in_map may not put new objects
1786 * on top. 1819 * on top.
1787 */ 1820 */
1788int 1821int
1789check_move_on (object *op, object *originator) 1822check_move_on (object *op, object *originator, int flags)
1790{ 1823{
1791 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1824 if (op->flag [FLAG_NO_APPLY])
1792 return 0; 1825 return 0;
1793 1826
1794 object *tmp; 1827 object *tmp;
1795 maptile *m = op->map; 1828 maptile *m = op->map;
1796 int x = op->x, y = op->y; 1829 int x = op->x, y = op->y;
… …
1833 * Second check makes sure that the movement types not being slowed 1866 * Second check makes sure that the movement types not being slowed
1834 * (~slow_move) is not blocked on this space - just because the 1867 * (~slow_move) is not blocked on this space - just because the
1835 * space doesn't slow down swimming (for example), if you can't actually 1868 * space doesn't slow down swimming (for example), if you can't actually
1836 * swim on that space, can't use it to avoid the penalty. 1869 * swim on that space, can't use it to avoid the penalty.
1837 */ 1870 */
1838 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1871 if (!op->flag [FLAG_WIZPASS])
1839 { 1872 {
1840 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1873 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1841 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1874 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1842 { 1875 {
1843 float diff = tmp->move_slow_penalty * fabs (op->speed); 1876 float diff = tmp->move_slow_penalty * fabs (op->speed);
… …
1853 1886
1854 /* Basically same logic as above, except now for actual apply. */ 1887 /* Basically same logic as above, except now for actual apply. */
1855 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1888 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1856 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1889 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1857 { 1890 {
1891 if ((flags & INS_NO_AUTO_EXIT)
1892 && (tmp->type == EXIT || tmp->type == TELEPORTER
1893 || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
1894 continue;
1895
1858 move_apply (tmp, op, originator); 1896 move_apply (tmp, op, originator);
1859 1897
1860 if (op->destroyed ()) 1898 if (op->destroyed ())
1861 return 1; 1899 return 1;
1862 1900
… …
1974void 2012void
1975flag_inv (object *op, int flag) 2013flag_inv (object *op, int flag)
1976{ 2014{
1977 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2015 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1978 { 2016 {
1979 SET_FLAG (tmp, flag); 2017 tmp->set_flag (flag);
1980 flag_inv (tmp, flag); 2018 flag_inv (tmp, flag);
1981 } 2019 }
1982} 2020}
1983 2021
1984/* 2022/*
… …
1987void 2025void
1988unflag_inv (object *op, int flag) 2026unflag_inv (object *op, int flag)
1989{ 2027{
1990 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2028 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1991 { 2029 {
1992 CLEAR_FLAG (tmp, flag); 2030 tmp->clr_flag (flag);
1993 unflag_inv (tmp, flag); 2031 unflag_inv (tmp, flag);
1994 } 2032 }
1995} 2033}
1996 2034
1997/* 2035/*
… …
2187{ 2225{
2188 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2226 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2189} 2227}
2190 2228
2191/* 2229/*
2192 * find_dir_2(delta-x,delta-y) will return a direction in which 2230 * find_dir_2(delta-x,delta-y) will return a direction value
2193 * an object which has subtracted the x and y coordinates of another 2231 * for running into direct [dx, dy].
2194 * object, needs to travel toward it. 2232 * (the opposite of crossfire's find_dir_2!)
2195 */ 2233 */
2196int 2234int
2197find_dir_2 (int x, int y) 2235find_dir_2 (int x, int y)
2198{ 2236{
2237#if 1 // new algorithm
2238 // this works by putting x, y into 16 sectors, which
2239 // are not equal sized, but are a better approximation
2240 // then the old algorithm, and then using a mapping
2241 // table to map it into a direction value.
2242 // basically, it maps these comparisons to each bit
2243 // bit #3: x < 0
2244 // bit #2: y < 0
2245 // bit #1: x > y
2246 // bit #0: x > 2y
2247
2248 static const uint8 dir[16] = {
2249 4, 5, 4, 3,
2250 2, 1, 2, 3,
2251 6, 5, 6, 7,
2252 8, 1, 8, 7,
2253 };
2254 int sector = 0;
2255
2256 // this is a bit ugly, but more likely to result in branchless code
2257 sector |= x < 0 ? 8 : 0;
2258 x = x < 0 ? -x : x; // abs
2259
2260 sector |= y < 0 ? 4 : 0;
2261 y = y < 0 ? -y : y; // abs
2262
2263 if (x > y)
2264 {
2265 sector |= 2;
2266
2267 if (x > y * 2)
2268 sector |= 1;
2269 }
2270 else
2271 {
2272 if (y > x * 2)
2273 sector |= 1;
2274 else if (!y)
2275 return 0; // x == 0 here
2276 }
2277
2278 return dir [sector];
2279#else // old algorithm
2199 int q; 2280 int q;
2200 2281
2201 if (y) 2282 if (y)
2202 q = x * 100 / y; 2283 q = 128 * x / y;
2203 else if (x) 2284 else if (x)
2204 q = -300 * x; 2285 q = -512 * x; // to make it > 309
2205 else 2286 else
2206 return 0; 2287 return 0;
2207 2288
2208 if (y > 0) 2289 if (y > 0)
2209 { 2290 {
2210 if (q < -242) 2291 if (q < -309) return 7;
2292 if (q < -52) return 6;
2293 if (q < 52) return 5;
2294 if (q < 309) return 4;
2295
2211 return 3; 2296 return 3;
2212 if (q < -41) 2297 }
2213 return 2; 2298 else
2214 if (q < 41) 2299 {
2215 return 1; 2300 if (q < -309) return 3;
2216 if (q < 242) 2301 if (q < -52) return 2;
2217 return 8; 2302 if (q < 52) return 1;
2303 if (q < 309) return 8;
2304
2218 return 7; 2305 return 7;
2219 } 2306 }
2220 2307#endif
2221 if (q < -242)
2222 return 7;
2223 if (q < -41)
2224 return 6;
2225 if (q < 41)
2226 return 5;
2227 if (q < 242)
2228 return 4;
2229
2230 return 3;
2231} 2308}
2232 2309
2233/* 2310/*
2234 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2311 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2235 * between two directions (which are expected to be absolute (see absdir()) 2312 * between two directions (which are expected to be absolute (see absdir())
2236 */ 2313 */
2237int 2314int
2238dirdiff (int dir1, int dir2) 2315dirdiff (int dir1, int dir2)
2239{ 2316{
2240 int d;
2241
2242 d = abs (dir1 - dir2); 2317 int d = abs (dir1 - dir2);
2243 if (d > 4)
2244 d = 8 - d;
2245 2318
2246 return d; 2319 return d > 4 ? 8 - d : d;
2247} 2320}
2248 2321
2249/* peterm: 2322/* peterm:
2250 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2323 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2251 * Basically, this is a table of directions, and what directions 2324 * Basically, this is a table of directions, and what directions
… …
2357 * Add a check so we can't pick up invisible objects (0.93.8) 2430 * Add a check so we can't pick up invisible objects (0.93.8)
2358 */ 2431 */
2359int 2432int
2360can_pick (const object *who, const object *item) 2433can_pick (const object *who, const object *item)
2361{ 2434{
2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2435 return /*who->flag [FLAG_WIZ]|| */
2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2436 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2364 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2437 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2365} 2438}
2366 2439
2367/* 2440/*
2368 * create clone from object to another 2441 * create clone from object to another
2369 */ 2442 */
… …
2709 } 2782 }
2710 else 2783 else
2711 move_type = mt; 2784 move_type = mt;
2712} 2785}
2713 2786
2787/* object should be a player.
2788 * we return the object the player has marked with the 'mark' command
2789 * below. If no match is found (or object has changed), we return
2790 * NULL. We leave it up to the calling function to print messages if
2791 * nothing is found.
2792 */
2793object *
2794object::mark () const
2795{
2796 if (contr && contr->mark && contr->mark->env == this)
2797 return contr->mark;
2798 else
2799 return 0;
2800}
2801

Diff Legend

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