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.199 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.203 by root, Fri Apr 11 13:59:05 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] = {
45 0,
46 0, 1, 1, 1, 0, -1, -1, -1,
47 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 48 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 49};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 50short freearr_y[SIZEOFFREE] = {
51 0,
52 -1, -1, 0, 1, 1, 1, 0, -1,
53 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -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 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50}; 55};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 56int maxfree[SIZEOFFREE] = {
57 0,
58 9, 10, 13, 14, 17, 18, 21, 22,
59 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52 48, 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 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 61};
54int freedir[SIZEOFFREE] = { 62int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 63 0,
64 1, 2, 3, 4, 5, 6, 7, 8,
65 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 66 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 67};
58 68
59static void 69static void
60write_uuid (void) 70write_uuid (uval64 skip, bool sync)
61{ 71{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 72 CALL_BEGIN (2);
63 73 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 74 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 75 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 76 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 77}
79 78
80static void 79static void
81read_uuid (void) 80read_uuid (void)
82{ 81{
… …
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 (UUID_SKIP, true);
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);
100 _exit (1); 99 _exit (1);
101 } 100 }
102 101
103 int version; 102 UUID::BUF buf;
104 unsigned long long uid; 103 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 104 fgets (buf, sizeof (buf), fp);
105
106 if (!UUID::cur.parse (buf))
106 { 107 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 108 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 109 _exit (1);
109 } 110 }
110 111
111 uuid.seq = uid; 112 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 113
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 114 write_uuid (UUID_SKIP, true);
114 fclose (fp); 115 fclose (fp);
115} 116}
116 117
117UUID 118UUID
118gen_uuid () 119UUID::gen ()
119{ 120{
120 UUID uid; 121 UUID uid;
121 122
122 uid.seq = ++uuid.seq; 123 uid.seq = ++cur.seq;
123 124
124 if (!(uuid.seq & (UUID_SKIP - 1))) 125 if (expect_false (!(cur.seq & (UUID_SKIP - 1))))
125 write_uuid (); 126 write_uuid (UUID_SKIP, false);
126 127
127 return uid; 128 return uid;
128} 129}
129 130
130void 131void
131init_uuid () 132UUID::init ()
132{ 133{
133 read_uuid (); 134 read_uuid ();
134} 135}
135 136
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 137/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
… …
429 break; 430 break;
430 431
431 return op; 432 return op;
432} 433}
433 434
434void
435free_all_object_data ()
436{
437 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438}
439
440/* 435/*
441 * Sets the owner and sets the skill and exp pointers to owner's current 436 * Sets the owner and sets the skill and exp pointers to owner's current
442 * skill and experience objects. 437 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO 438 * ACTUALLY NO! investigate! TODO
444 */ 439 */
… …
603 598
604void 599void
605object::instantiate () 600object::instantiate ()
606{ 601{
607 if (!uuid.seq) // HACK 602 if (!uuid.seq) // HACK
608 uuid = gen_uuid (); 603 uuid = UUID::gen ();
609 604
610 speed_left = -0.1f; 605 speed_left = -0.1f;
611 /* copy the body_info to the body_used - this is only really 606 /* 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. 607 * 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 608 * by doing so, when a monster is created, it has good starting
… …
772static int object_count; 767static int object_count;
773 768
774void object::link () 769void object::link ()
775{ 770{
776 assert (!index);//D 771 assert (!index);//D
777 uuid = gen_uuid (); 772 uuid = UUID::gen ();
778 count = ++object_count; 773 count = ++object_count;
779 774
780 refcnt_inc (); 775 refcnt_inc ();
781 objects.insert (this); 776 objects.insert (this);
782} 777}
… …
935 930
936 freed_map->path = "<freed objects map>"; 931 freed_map->path = "<freed objects map>";
937 freed_map->name = "/internal/freed_objects_map"; 932 freed_map->name = "/internal/freed_objects_map";
938 freed_map->width = 3; 933 freed_map->width = 3;
939 freed_map->height = 3; 934 freed_map->height = 3;
935 freed_map->nodrop = 1;
940 936
941 freed_map->alloc (); 937 freed_map->alloc ();
942 freed_map->in_memory = MAP_IN_MEMORY; 938 freed_map->in_memory = MAP_IN_MEMORY;
943 } 939 }
944 940
… …
2018 2014
2019 /* However, often 2015 /* However, often
2020 * ob doesn't have any move type (when used to place exits) 2016 * ob doesn't have any move type (when used to place exits)
2021 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 2017 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2022 */ 2018 */
2023 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 2019 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2024 { 2020 {
2025 altern [index++] = i; 2021 altern [index++] = i;
2026 continue; 2022 continue;
2027 } 2023 }
2028 2024
… …
2613{ 2609{
2614 char flagdesc[512]; 2610 char flagdesc[512];
2615 char info2[256 * 4]; 2611 char info2[256 * 4];
2616 char *p = info; 2612 char *p = info;
2617 2613
2618 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2614 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619 count, uuid.seq, 2615 count,
2616 uuid.c_str (),
2620 &name, 2617 &name,
2621 title ? "\",title:\"" : "", 2618 title ? "\",title:\"" : "",
2622 title ? (const char *)title : "", 2619 title ? (const char *)title : "",
2623 flag_desc (flagdesc, 512), type); 2620 flag_desc (flagdesc, 512), type);
2624 2621

Diff Legend

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