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.293 by root, Wed Oct 21 00:44:39 2009 UTC vs.
Revision 1.297 by root, Sat Nov 7 18:30:05 2009 UTC

… …
38uint32_t mapspace::smellcount = 10000; 38uint32_t mapspace::smellcount = 10000;
39 39
40objectvec objects; 40objectvec objects;
41activevec actives; 41activevec actives;
42 42
43//+GPL
44
43short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
44 0, 46 0,
45 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
46 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
… …
50 0, 52 0,
51 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
52 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
53 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
54}; 56};
55int maxfree[SIZEOFFREE] = {
56 0,
57 9, 10, 13, 14, 17, 18, 21, 22,
58 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
59 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
60};
61int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
62 0, 58 0,
63 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
64 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
65 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 61 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
62};
63
64static int maxfree[SIZEOFFREE] = {
65 0,
66 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
66}; 69};
67 70
68static void 71static void
69write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
70{ 73{
… …
183bool object::can_merge_slow (object *ob1, object *ob2) 186bool object::can_merge_slow (object *ob1, object *ob2)
184{ 187{
185 /* A couple quicksanity checks */ 188 /* A couple quicksanity checks */
186 if (ob1 == ob2 189 if (ob1 == ob2
187 || ob1->type != ob2->type 190 || ob1->type != ob2->type
188 || ob1->speed != ob2->speed 191 || fabs (ob1->speed - ob2->speed) < MIN_ACTIVE_SPEED
189 || ob1->value != ob2->value 192 || ob1->value != ob2->value
190 || ob1->name != ob2->name) 193 || ob1->name != ob2->name)
191 return 0; 194 return 0;
192 195
193 /* Do not merge objects if nrof would overflow, assume nrof 196 /* Do not merge objects if nrof would overflow, assume nrof
… …
227 || ob1->move_block != ob2->move_block 230 || ob1->move_block != ob2->move_block
228 || ob1->move_allow != ob2->move_allow 231 || ob1->move_allow != ob2->move_allow
229 || ob1->move_on != ob2->move_on 232 || ob1->move_on != ob2->move_on
230 || ob1->move_off != ob2->move_off 233 || ob1->move_off != ob2->move_off
231 || ob1->move_slow != ob2->move_slow 234 || ob1->move_slow != ob2->move_slow
232 || ob1->move_slow_penalty != ob2->move_slow_penalty 235 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) < (1.f / 1024.f)
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 236 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 237 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235 return 0; 238 return 0;
236 239
237 if ((ob1->flag ^ ob2->flag) 240 if ((ob1->flag ^ ob2->flag)
… …
439{ 442{
440 return dump_object (this); 443 return dump_object (this);
441} 444}
442 445
443/* 446/*
444 * get_nearest_part(multi-object, object 2) returns the part of the
445 * multi-object 1 which is closest to the second object.
446 * If it's not a multi-object, it is returned.
447 */
448object *
449get_nearest_part (object *op, const object *pl)
450{
451 object *tmp, *closest;
452 int last_dist, i;
453
454 if (!op->more)
455 return op;
456
457 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
458 tmp;
459 tmp = tmp->more)
460 if ((i = distance (tmp, pl)) < last_dist)
461 closest = tmp, last_dist = i;
462
463 return closest;
464}
465
466/*
467 * Returns the object which has the count-variable equal to the argument. 447 * Returns the object which has the count-variable equal to the argument.
468 * VERRRY slow. 448 * VERRRY slow.
469 */ 449 */
470object * 450object *
471find_object (tag_t i) 451find_object (tag_t i)
… …
699 * This function needs to be called whenever the speed of an object changes. 679 * This function needs to be called whenever the speed of an object changes.
700 */ 680 */
701void 681void
702object::set_speed (float speed) 682object::set_speed (float speed)
703{ 683{
704 if (flag [FLAG_FREED] && speed)
705 {
706 LOG (llevError, "Object %s is freed but has speed.\n", &name);
707 speed = 0;
708 }
709
710 this->speed = speed; 684 this->speed = speed;
711 685
712 if (has_active_speed ()) 686 if (has_active_speed ())
713 activate (); 687 activate ();
714 else 688 else
… …
764 738
765 if (!(m.flags_ & P_UPTODATE)) 739 if (!(m.flags_ & P_UPTODATE))
766 /* nop */; 740 /* nop */;
767 else if (action == UP_OBJ_INSERT) 741 else if (action == UP_OBJ_INSERT)
768 { 742 {
743#if 0
769 // this is likely overkill, TODO: revisit (schmorp) 744 // this is likely overkill, TODO: revisit (schmorp)
770 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 745 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
771 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 746 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
772 || (op->is_player () && !(m.flags_ & P_PLAYER)) 747 || (op->is_player () && !(m.flags_ & P_PLAYER))
773 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 748 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
… …
778 || (m.move_slow | op->move_slow) != m.move_slow 753 || (m.move_slow | op->move_slow) != m.move_slow
779 /* This isn't perfect, but I don't expect a lot of objects to 754 /* This isn't perfect, but I don't expect a lot of objects to
780 * have move_allow right now. 755 * have move_allow right now.
781 */ 756 */
782 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 757 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
783 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
784 m.invalidate (); 758 m.invalidate ();
759#else
760 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
761 m.invalidate ();
762#endif
785 } 763 }
786 /* if the object is being removed, we can't make intelligent 764 /* if the object is being removed, we can't make intelligent
787 * decisions, because remove_ob can't really pass the object 765 * decisions, because remove_ob can't really pass the object
788 * that is being removed. 766 * that is being removed.
789 */ 767 */
… …
2171 * This basically means that if direction is 15, then it could either go 2149 * This basically means that if direction is 15, then it could either go
2172 * direction 4, 14, or 16 to get back to where we are. 2150 * direction 4, 14, or 16 to get back to where we are.
2173 * Moved from spell_util.c to object.c with the other related direction 2151 * Moved from spell_util.c to object.c with the other related direction
2174 * functions. 2152 * functions.
2175 */ 2153 */
2176const int reduction_dir[SIZEOFFREE][3] = { 2154static const int reduction_dir[SIZEOFFREE][3] = {
2177 {0, 0, 0}, /* 0 */ 2155 {0, 0, 0}, /* 0 */
2178 {0, 0, 0}, /* 1 */ 2156 {0, 0, 0}, /* 1 */
2179 {0, 0, 0}, /* 2 */ 2157 {0, 0, 0}, /* 2 */
2180 {0, 0, 0}, /* 3 */ 2158 {0, 0, 0}, /* 3 */
2181 {0, 0, 0}, /* 4 */ 2159 {0, 0, 0}, /* 4 */
… …
2540 return splay (tmp); 2518 return splay (tmp);
2541 2519
2542 return 0; 2520 return 0;
2543} 2521}
2544 2522
2523//-GPL
2524
2545void 2525void
2546object::force_set_timer (int duration) 2526object::force_set_timer (int duration)
2547{ 2527{
2548 this->duration = 1; 2528 this->duration = 1;
2549 this->speed_left = -1.f; 2529 this->speed_left = -1.f;
… …
2558 force->destroy (); 2538 force->destroy ();
2559 2539
2560 object *force = get_archetype (FORCE_NAME); 2540 object *force = get_archetype (FORCE_NAME);
2561 2541
2562 force->slaying = name; 2542 force->slaying = name;
2563
2564 force->force_set_timer (duration); 2543 force->force_set_timer (duration);
2565
2566 force->flag [FLAG_APPLIED] = true; 2544 force->flag [FLAG_APPLIED] = true;
2567 2545
2568 return insert (force); 2546 return insert (force);
2569} 2547}
2570 2548
2571void 2549void

Diff Legend

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