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.294 by root, Thu Nov 5 15:43:21 2009 UTC

… …
37static const uint64 UUID_GAP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
38uint32_t mapspace::smellcount = 10000; 38uint32_t mapspace::smellcount = 10000;
39 39
40objectvec objects; 40objectvec objects;
41activevec actives; 41activevec actives;
42
43//+GPL
42 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,
… …
2540 return splay (tmp); 2542 return splay (tmp);
2541 2543
2542 return 0; 2544 return 0;
2543} 2545}
2544 2546
2547//-GPL
2548
2545void 2549void
2546object::force_set_timer (int duration) 2550object::force_set_timer (int duration)
2547{ 2551{
2548 this->duration = 1; 2552 this->duration = 1;
2549 this->speed_left = -1.f; 2553 this->speed_left = -1.f;
… …
2558 force->destroy (); 2562 force->destroy ();
2559 2563
2560 object *force = get_archetype (FORCE_NAME); 2564 object *force = get_archetype (FORCE_NAME);
2561 2565
2562 force->slaying = name; 2566 force->slaying = name;
2563
2564 force->force_set_timer (duration); 2567 force->force_set_timer (duration);
2565
2566 force->flag [FLAG_APPLIED] = true; 2568 force->flag [FLAG_APPLIED] = true;
2567 2569
2568 return insert (force); 2570 return insert (force);
2569} 2571}
2570 2572
2571void 2573void

Diff Legend

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