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.201 by root, Tue Jan 22 16:22:45 2008 UTC vs.
Revision 1.202 by root, Thu Apr 10 15:35:15 2008 UTC

… …
33#include <sproto.h> 33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38UUID UUID::cur;
39static UUID uuid;
40const uint64 UUID_SKIP = 1<<19; 39static const uint64 UUID_SKIP = 1<<19;
41 40
42objectvec objects; 41objectvec objects;
43activevec actives; 42activevec actives;
44 43
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 44short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
70 { 69 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2); 70 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return; 71 return;
73 } 72 }
74 73
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2); 74 fprintf (fp, "<1,%llx>\n", (unsigned long long)UUID::cur.seq + UUID_SKIP * 2);
76 fclose (fp); 75 fclose (fp);
77 rename (filename2, filename1); 76 rename (filename2, filename1);
78} 77}
79 78
80static void 79static void
… …
89 if (!(fp = fopen (filename, "r"))) 88 if (!(fp = fopen (filename, "r")))
90 { 89 {
91 if (errno == ENOENT) 90 if (errno == ENOENT)
92 { 91 {
93 LOG (llevInfo, "RESET uid to 1\n"); 92 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 93 UUID::cur.seq = 0;
95 write_uuid (); 94 write_uuid ();
96 return; 95 return;
97 } 96 }
98 97
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
… …
106 { 105 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 106 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
108 _exit (1); 107 _exit (1);
109 } 108 }
110 109
111 uuid.seq = uid; 110 UUID::cur.seq = uid;
112 write_uuid (); 111 write_uuid ();
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 112 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
114 fclose (fp); 113 fclose (fp);
115} 114}
116 115
117UUID 116UUID
118gen_uuid () 117UUID::gen ()
119{ 118{
120 UUID uid; 119 UUID uid;
121 120
122 uid.seq = ++uuid.seq; 121 uid.seq = ++cur.seq;
123 122
124 if (!(uuid.seq & (UUID_SKIP - 1))) 123 if (!(cur.seq & (UUID_SKIP - 1)))
125 write_uuid (); 124 write_uuid ();
126 125
127 return uid; 126 return uid;
128} 127}
129 128
130void 129void
131init_uuid () 130UUID::init ()
132{ 131{
133 read_uuid (); 132 read_uuid ();
134} 133}
135 134
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 135/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
… …
429 break; 428 break;
430 429
431 return op; 430 return op;
432} 431}
433 432
434void
435free_all_object_data ()
436{
437 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438}
439
440/* 433/*
441 * Sets the owner and sets the skill and exp pointers to owner's current 434 * Sets the owner and sets the skill and exp pointers to owner's current
442 * skill and experience objects. 435 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO 436 * ACTUALLY NO! investigate! TODO
444 */ 437 */
… …
603 596
604void 597void
605object::instantiate () 598object::instantiate ()
606{ 599{
607 if (!uuid.seq) // HACK 600 if (!uuid.seq) // HACK
608 uuid = gen_uuid (); 601 uuid = UUID::gen ();
609 602
610 speed_left = -0.1f; 603 speed_left = -0.1f;
611 /* copy the body_info to the body_used - this is only really 604 /* copy the body_info to the body_used - this is only really
612 * need for monsters, but doesn't hurt to do it for everything. 605 * need for monsters, but doesn't hurt to do it for everything.
613 * by doing so, when a monster is created, it has good starting 606 * by doing so, when a monster is created, it has good starting
… …
772static int object_count; 765static int object_count;
773 766
774void object::link () 767void object::link ()
775{ 768{
776 assert (!index);//D 769 assert (!index);//D
777 uuid = gen_uuid (); 770 uuid = UUID::gen ();
778 count = ++object_count; 771 count = ++object_count;
779 772
780 refcnt_inc (); 773 refcnt_inc ();
781 objects.insert (this); 774 objects.insert (this);
782} 775}

Diff Legend

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