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.295 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.307 by root, Sun Nov 29 10:55:18 2009 UTC

… …
77 CALL_CALL ("cf::write_uuid", G_DISCARD); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
78 CALL_END; 78 CALL_END;
79} 79}
80 80
81static void 81static void
82read_uuid (void) 82read_uuid ()
83{ 83{
84 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
85 85
86 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
87 87
… …
101 101
102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
103 _exit (1); 103 _exit (1);
104 } 104 }
105 105
106 UUID::BUF buf; 106 char buf [UUID::MAX_LEN];
107 buf[0] = 0; 107 buf[0] = 0;
108 fgets (buf, sizeof (buf), fp); 108 fgets (buf, sizeof (buf), fp);
109 109
110 if (!UUID::cur.parse (buf)) 110 if (!UUID::cur.parse (buf))
111 { 111 {
… …
138 138
139void 139void
140UUID::init () 140UUID::init ()
141{ 141{
142 read_uuid (); 142 read_uuid ();
143}
144
145bool
146UUID::parse (const char *s)
147{
148 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
149 return false;
150
151 seq = 0;
152
153 while (*s != '>')
154 {
155 if (*s < '0')
156 return false;
157
158 // this gives nice branchless code with gcc
159 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
160 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
161
162 seq = (seq << 4) | digit;
163
164 ++s;
165 }
166
167 return true;
168}
169
170char *
171UUID::append (char *buf) const
172{
173 *buf++ = '<';
174 *buf++ = '1';
175 *buf++ = '.';
176
177 uint64_t seq = this->seq;
178 const int bits = 64;
179 char nz = 0;
180 static const char tohex [] = "0123456789abcdef";
181
182 // assert (len >= 3 + bits / 4 + 1 + 1);
183 for (int i = bits / 4; --i; )
184 {
185 uint8_t digit = seq >> (bits - 4);
186
187 *buf = tohex [digit];
188 nz |= digit;
189 buf += nz ? 1 : 0;
190 seq <<= 4;
191 }
192
193 // last digit is special - always emit
194 uint8_t digit = seq >> (bits - 4);
195 *buf++ = tohex [digit];
196
197 *buf++ = '>';
198
199 return buf;
200}
201
202char *
203UUID::c_str () const
204{
205 static char buf [MAX_LEN];
206 *append (buf) = 0;
207 return buf;
143} 208}
144 209
145/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 210/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
146static bool 211static bool
147compare_ob_value_lists_one (const object *wants, const object *has) 212compare_ob_value_lists_one (const object *wants, const object *has)
… …
186bool object::can_merge_slow (object *ob1, object *ob2) 251bool object::can_merge_slow (object *ob1, object *ob2)
187{ 252{
188 /* A couple quicksanity checks */ 253 /* A couple quicksanity checks */
189 if (ob1 == ob2 254 if (ob1 == ob2
190 || ob1->type != ob2->type 255 || ob1->type != ob2->type
191 || ob1->speed != ob2->speed 256 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
192 || ob1->value != ob2->value 257 || ob1->value != ob2->value
193 || ob1->name != ob2->name) 258 || ob1->name != ob2->name)
194 return 0; 259 return 0;
195 260
196 /* Do not merge objects if nrof would overflow, assume nrof 261 /* Do not merge objects if nrof would overflow, assume nrof
… …
221 || ob1->skill != ob2->skill 286 || ob1->skill != ob2->skill
222 || ob1->value != ob2->value 287 || ob1->value != ob2->value
223 || ob1->animation_id != ob2->animation_id 288 || ob1->animation_id != ob2->animation_id
224 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 289 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
225 || ob1->client_type != ob2->client_type 290 || ob1->client_type != ob2->client_type
226 || ob1->materialname != ob2->materialname 291 || ob1->material != ob2->material
227 || ob1->lore != ob2->lore 292 || ob1->lore != ob2->lore
228 || ob1->subtype != ob2->subtype 293 || ob1->subtype != ob2->subtype
229 || ob1->move_type != ob2->move_type 294 || ob1->move_type != ob2->move_type
230 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
231 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
232 || ob1->move_on != ob2->move_on 297 || ob1->move_on != ob2->move_on
233 || ob1->move_off != ob2->move_off 298 || ob1->move_off != ob2->move_off
234 || ob1->move_slow != ob2->move_slow 299 || ob1->move_slow != ob2->move_slow
235 || ob1->move_slow_penalty != ob2->move_slow_penalty 300 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
236 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 301 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 302 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
238 return 0; 303 return 0;
239 304
240 if ((ob1->flag ^ ob2->flag) 305 if ((ob1->flag ^ ob2->flag)
… …
442{ 507{
443 return dump_object (this); 508 return dump_object (this);
444} 509}
445 510
446/* 511/*
447 * get_nearest_part(multi-object, object 2) returns the part of the
448 * multi-object 1 which is closest to the second object.
449 * If it's not a multi-object, it is returned.
450 */
451static object *
452get_nearest_part (object *op, const object *pl)
453{
454 object *tmp, *closest;
455 int last_dist, i;
456
457 if (!op->more)
458 return op;
459
460 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
461 tmp;
462 tmp = tmp->more)
463 if ((i = distance (tmp, pl)) < last_dist)
464 closest = tmp, last_dist = i;
465
466 return closest;
467}
468
469/*
470 * Returns the object which has the count-variable equal to the argument. 512 * Returns the object which has the count-variable equal to the argument.
471 * VERRRY slow. 513 * VERRRY slow.
472 */ 514 */
473object * 515object *
474find_object (tag_t i) 516find_object (tag_t i)
… …
645 tail = new_link; 687 tail = new_link;
646 } 688 }
647 } 689 }
648 } 690 }
649 691
650 if (speed < 0)
651 dst->speed_left -= rndm ();
652
653 dst->activate (); 692 dst->activate ();
654} 693}
655 694
656void 695void
657object::instantiate () 696object::instantiate ()
658{ 697{
659 if (!uuid.seq) // HACK 698 if (!uuid.seq) // HACK
660 uuid = UUID::gen (); 699 uuid = UUID::gen ();
661 700
701 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
702 if (flag [FLAG_RANDOM_SPEED] && speed)
703 speed_left = -rndm (); // TODO animation
704 else
662 speed_left = -0.1f; 705 speed_left = -speed;
706
663 /* copy the body_info to the body_used - this is only really 707 /* copy the body_info to the body_used - this is only really
664 * need for monsters, but doesn't hurt to do it for everything. 708 * need for monsters, but doesn't hurt to do it for everything.
665 * by doing so, when a monster is created, it has good starting 709 * by doing so, when a monster is created, it has good starting
666 * values for the body_used info, so when items are created 710 * values for the body_used info, so when items are created
667 * for it, they can be properly equipped. 711 * for it, they can be properly equipped.
… …
675object * 719object *
676object::clone () 720object::clone ()
677{ 721{
678 object *neu = create (); 722 object *neu = create ();
679 copy_to (neu); 723 copy_to (neu);
724
725 // TODO: unclean state changes, should not be done in clone AND instantiate
726 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
727 neu->speed_left = -rndm (); // TODO animation
728
680 neu->map = map; // not copied by copy_to 729 neu->map = map; // not copied by copy_to
681 return neu; 730 return neu;
682} 731}
683 732
684/* 733/*
… …
702 * This function needs to be called whenever the speed of an object changes. 751 * This function needs to be called whenever the speed of an object changes.
703 */ 752 */
704void 753void
705object::set_speed (float speed) 754object::set_speed (float speed)
706{ 755{
707 if (flag [FLAG_FREED] && speed)
708 {
709 LOG (llevError, "Object %s is freed but has speed.\n", &name);
710 speed = 0;
711 }
712
713 this->speed = speed; 756 this->speed = speed;
714 757
715 if (has_active_speed ()) 758 if (has_active_speed ())
716 activate (); 759 activate ();
717 else 760 else
… …
767 810
768 if (!(m.flags_ & P_UPTODATE)) 811 if (!(m.flags_ & P_UPTODATE))
769 /* nop */; 812 /* nop */;
770 else if (action == UP_OBJ_INSERT) 813 else if (action == UP_OBJ_INSERT)
771 { 814 {
815#if 0
772 // this is likely overkill, TODO: revisit (schmorp) 816 // this is likely overkill, TODO: revisit (schmorp)
773 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 817 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
774 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 818 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
775 || (op->is_player () && !(m.flags_ & P_PLAYER)) 819 || (op->is_player () && !(m.flags_ & P_PLAYER))
776 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 820 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
… …
781 || (m.move_slow | op->move_slow) != m.move_slow 825 || (m.move_slow | op->move_slow) != m.move_slow
782 /* This isn't perfect, but I don't expect a lot of objects to 826 /* This isn't perfect, but I don't expect a lot of objects to
783 * have move_allow right now. 827 * have move_allow right now.
784 */ 828 */
785 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 829 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
786 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
787 m.invalidate (); 830 m.invalidate ();
831#else
832 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
833 m.invalidate ();
834#endif
788 } 835 }
789 /* if the object is being removed, we can't make intelligent 836 /* if the object is being removed, we can't make intelligent
790 * decisions, because remove_ob can't really pass the object 837 * decisions, because remove_ob can't really pass the object
791 * that is being removed. 838 * that is being removed.
792 */ 839 */
… …
804object::object () 851object::object ()
805{ 852{
806 SET_FLAG (this, FLAG_REMOVED); 853 SET_FLAG (this, FLAG_REMOVED);
807 854
808 //expmul = 1.0; declared const for the time being 855 //expmul = 1.0; declared const for the time being
809 face = blank_face; 856 face = blank_face;
857 material = MATERIAL_NULL;
810} 858}
811 859
812object::~object () 860object::~object ()
813{ 861{
814 unlink (); 862 unlink ();
… …
1085 1133
1086 above = 0; 1134 above = 0;
1087 below = 0; 1135 below = 0;
1088 env = 0; 1136 env = 0;
1089 1137
1090 /* NO_FIX_PLAYER is set when a great many changes are being 1138 if (pl && pl->is_player ())
1091 * made to players inventory. If set, avoiding the call
1092 * to save cpu time.
1093 */
1094 if (pl)
1095 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1096 { 1139 {
1097 pl->update_stats (); 1140 pl->contr->queue_stats_update ();
1098 1141
1099 if (glow_radius && pl->is_on_map ()) 1142 if (glow_radius && pl->is_on_map ())
1100 update_all_los (pl->map, pl->x, pl->y); 1143 update_all_los (pl->map, pl->x, pl->y);
1101 } 1144 }
1102 } 1145 }
1103 else if (map) 1146 else if (map)
1104 { 1147 {
1105 map->dirty = true; 1148 map->dirty = true;
1106 mapspace &ms = this->ms (); 1149 mapspace &ms = this->ms ();
… …
1528 return where->env->insert (this); 1571 return where->env->insert (this);
1529 else 1572 else
1530 return where->map->insert (this, where->x, where->y, originator, flags); 1573 return where->map->insert (this, where->x, where->y, originator, flags);
1531} 1574}
1532 1575
1576// check whether we can put this into the map, respect max_volume, max_items
1577bool
1578object::can_drop_at (maptile *m, int x, int y, object *originator)
1579{
1580 mapspace &ms = m->at (x, y);
1581
1582 int items = ms.items ();
1583
1584 if (!items // testing !items ensures we can drop at least one item
1585 || (items < m->max_items
1586 && ms.volume () < m->max_volume))
1587 return true;
1588
1589 if (originator && originator->is_player ())
1590 originator->contr->failmsg (format (
1591 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1592 query_name ()
1593 ));
1594
1595 return false;
1596}
1597
1533/* 1598/*
1534 * decrease(object, number) decreases a specified number from 1599 * decrease(object, number) decreases a specified number from
1535 * the amount of an object. If the amount reaches 0, the object 1600 * the amount of an object. If the amount reaches 0, the object
1536 * is subsequently removed and freed. 1601 * is subsequently removed and freed.
1537 * 1602 *
… …
1675 if (op->glow_radius && is_on_map ()) 1740 if (op->glow_radius && is_on_map ())
1676 { 1741 {
1677 update_stats (); 1742 update_stats ();
1678 update_all_los (map, x, y); 1743 update_all_los (map, x, y);
1679 } 1744 }
1680 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) 1745 else if (is_player ())
1681 // if this is a player's inventory, update stats 1746 // if this is a player's inventory, update stats
1682 update_stats (); 1747 contr->queue_stats_update ();
1683 1748
1684 INVOKE_OBJECT (INSERT, this); 1749 INVOKE_OBJECT (INSERT, this);
1685 1750
1686 return op; 1751 return op;
1687} 1752}
… …
2455{ 2520{
2456 return map ? map->region (x, y) 2521 return map ? map->region (x, y)
2457 : region::default_region (); 2522 : region::default_region ();
2458} 2523}
2459 2524
2460const materialtype_t *
2461object::dominant_material () const
2462{
2463 if (materialtype_t *mt = name_to_material (materialname))
2464 return mt;
2465
2466 return name_to_material (shstr_unknown);
2467}
2468
2469void 2525void
2470object::open_container (object *new_container) 2526object::open_container (object *new_container)
2471{ 2527{
2472 if (container == new_container) 2528 if (container == new_container)
2473 return; 2529 return;

Diff Legend

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