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.306 by root, Sun Nov 29 09:41:27 2009 UTC vs.
Revision 1.310 by root, Thu Dec 17 01:04:37 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
… …
248 * Improvements made with merge: Better checking on potion, and also 248 * Improvements made with merge: Better checking on potion, and also
249 * check weight 249 * check weight
250 */ 250 */
251bool object::can_merge_slow (object *ob1, object *ob2) 251bool object::can_merge_slow (object *ob1, object *ob2)
252{ 252{
253 /* A couple quicksanity checks */ 253 /* A couple quick sanity checks */
254 if (ob1 == ob2 254 if (ob1 == ob2
255 || ob1->type != ob2->type 255 || ob1->type != ob2->type
256 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
257 || ob1->value != ob2->value 256 || ob1->value != ob2->value
258 || ob1->name != ob2->name) 257 || ob1->name != ob2->name
258 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
259 return 0; 259 return 0;
260 260
261 /* Do not merge objects if nrof would overflow, assume nrof 261 /* Do not merge objects if nrof would overflow, assume nrof
262 * is always 0 .. 2**31-1 */ 262 * is always 0 .. 2**31-1 */
263 if (ob1->nrof > 0x7fffffff - ob2->nrof) 263 if (ob1->nrof > 0x7fffffff - ob2->nrof)
… …
284 || ob1->magic != ob2->magic 284 || ob1->magic != ob2->magic
285 || ob1->slaying != ob2->slaying 285 || ob1->slaying != ob2->slaying
286 || ob1->skill != ob2->skill 286 || ob1->skill != ob2->skill
287 || ob1->value != ob2->value 287 || ob1->value != ob2->value
288 || ob1->animation_id != ob2->animation_id 288 || ob1->animation_id != ob2->animation_id
289 || (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 dependend on each other
290 || ob1->client_type != ob2->client_type 290 || ob1->client_type != ob2->client_type
291 || ob1->material != ob2->material 291 || ob1->material != ob2->material
292 || ob1->lore != ob2->lore 292 || ob1->lore != ob2->lore
293 || ob1->subtype != ob2->subtype 293 || ob1->subtype != ob2->subtype
294 || ob1->move_type != ob2->move_type 294 || ob1->move_type != ob2->move_type
… …
698 if (!uuid.seq) // HACK 698 if (!uuid.seq) // HACK
699 uuid = UUID::gen (); 699 uuid = UUID::gen ();
700 700
701 // TODO: unclean state changes, should nt be done in copy_to AND instantiate 701 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
702 if (flag [FLAG_RANDOM_SPEED] && speed) 702 if (flag [FLAG_RANDOM_SPEED] && speed)
703 speed_left = -rndm (); // TODO animation 703 speed_left = - speed - rndm (); // TODO animation
704 else 704 else
705 speed_left = -speed; 705 speed_left = -1.;
706 706
707 /* 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
708 * 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.
709 * 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
710 * values for the body_used info, so when items are created 710 * values for the body_used info, so when items are created
… …
722 object *neu = create (); 722 object *neu = create ();
723 copy_to (neu); 723 copy_to (neu);
724 724
725 // TODO: unclean state changes, should not be done in clone AND instantiate 725 // TODO: unclean state changes, should not be done in clone AND instantiate
726 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) 726 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
727 neu->speed_left = -rndm (); // TODO animation 727 neu->speed_left = - neu->speed - rndm (); // TODO animation
728 728
729 neu->map = map; // not copied by copy_to 729 neu->map = map; // not copied by copy_to
730 return neu; 730 return neu;
731} 731}
732 732
… …
1269 1269
1270 object *prev = this; 1270 object *prev = this;
1271 1271
1272 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1272 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1273 { 1273 {
1274 object *op = arch_to_object (at); 1274 object *op = at->instance ();
1275 1275
1276 op->name = name; 1276 op->name = name;
1277 op->name_pl = name_pl; 1277 op->name_pl = name_pl;
1278 op->title = title; 1278 op->title = title;
1279 1279
… …
1554 1554
1555 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1555 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1556 if (tmp->arch->archname == archname) /* same archetype */ 1556 if (tmp->arch->archname == archname) /* same archetype */
1557 tmp->destroy (); 1557 tmp->destroy ();
1558 1558
1559 object *tmp = arch_to_object (archetype::find (archname)); 1559 object *tmp = archetype::find (archname)->instance ();
1560 1560
1561 tmp->x = op->x; 1561 tmp->x = op->x;
1562 tmp->y = op->y; 1562 tmp->y = op->y;
1563 1563
1564 insert_ob_in_map (tmp, op->map, op, 0); 1564 insert_ob_in_map (tmp, op->map, op, 0);
… …
2563 // TODO: this does not seem to serve any purpose anymore? 2563 // TODO: this does not seem to serve any purpose anymore?
2564#if 0 2564#if 0
2565 // insert the "Close Container" object. 2565 // insert the "Close Container" object.
2566 if (archetype *closer = new_container->other_arch) 2566 if (archetype *closer = new_container->other_arch)
2567 { 2567 {
2568 object *closer = arch_to_object (new_container->other_arch); 2568 object *closer = new_container->other_arch->instance ();
2569 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2569 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2570 new_container->insert (closer); 2570 new_container->insert (closer);
2571 } 2571 }
2572#endif 2572#endif
2573 2573

Diff Legend

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