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.189 by root, Thu Sep 13 16:23:01 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
… …
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; 39static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 40static const uint64 UUID_GAP = 1<<19;
41 41
42objectvec objects; 42objectvec objects;
43activevec actives; 43activevec actives;
44 44
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, 45short freearr_x[SIZEOFFREE] = {
46 0,
47 0, 1, 1, 1, 0, -1, -1, -1,
48 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 49 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}; 50};
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, 51short freearr_y[SIZEOFFREE] = {
52 0,
53 -1, -1, 0, 1, 1, 1, 0, -1,
54 -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 55 -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}; 56};
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, 57int maxfree[SIZEOFFREE] = {
58 0,
59 9, 10, 13, 14, 17, 18, 21, 22,
60 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 61 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}; 62};
54int freedir[SIZEOFFREE] = { 63int 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, 64 0,
65 1, 2, 3, 4, 5, 6, 7, 8,
66 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 67 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}; 68};
58 69
59static void 70static void
60write_uuid (void) 71write_uuid (uval64 skip, bool sync)
61{ 72{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 73 CALL_BEGIN (2);
63 74 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 75 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 77 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} 78}
79 79
80static void 80static void
81read_uuid (void) 81read_uuid (void)
82{ 82{
83 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
84 84
85 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
86 86
87 seq_next_save = 0;
88
87 FILE *fp; 89 FILE *fp;
88 90
89 if (!(fp = fopen (filename, "r"))) 91 if (!(fp = fopen (filename, "r")))
90 { 92 {
91 if (errno == ENOENT) 93 if (errno == ENOENT)
92 { 94 {
93 LOG (llevInfo, "RESET uid to 1\n"); 95 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 96 UUID::cur.seq = 0;
95 write_uuid (); 97 write_uuid (UUID_GAP, true);
96 return; 98 return;
97 } 99 }
98 100
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 102 _exit (1);
101 } 103 }
102 104
103 int version; 105 UUID::BUF buf;
104 unsigned long long uid; 106 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
106 { 110 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 112 _exit (1);
109 } 113 }
110 114
111 uuid.seq = uid; 115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 116
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 117 write_uuid (UUID_GAP, true);
114 fclose (fp); 118 fclose (fp);
115} 119}
116 120
117UUID 121UUID
118gen_uuid () 122UUID::gen ()
119{ 123{
120 UUID uid; 124 UUID uid;
121 125
122 uid.seq = ++uuid.seq; 126 uid.seq = ++cur.seq;
123 127
124 if (!(uuid.seq & (UUID_SKIP - 1))) 128 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
126 134
127 return uid; 135 return uid;
128} 136}
129 137
130void 138void
131init_uuid () 139UUID::init ()
132{ 140{
133 read_uuid (); 141 read_uuid ();
134} 142}
135 143
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 144/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
… …
254 /* This is really a spellbook check - really, we should 262 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 263 * check all objects in the inventory.
256 */ 264 */
257 if (ob1->inv || ob2->inv) 265 if (ob1->inv || ob2->inv)
258 { 266 {
259 /* if one object has inventory but the other doesn't, not equiv */ 267 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 268 return 0; /* inventories differ in length */
261 return 0;
262 269
263 /* Now check to see if the two inventory objects could merge */ 270 if (ob1->inv->below || ob2->inv->below)
271 return 0; /* more than one object in inv */
272
264 if (!object::can_merge (ob1->inv, ob2->inv)) 273 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 274 return 0; /* inventory objexts differ */
266 275
267 /* inventory ok - still need to check rest of this object to see 276 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 277 * if it is valid.
269 */ 278 */
270 } 279 }
… …
305 { 314 {
306 ob1->optimise (); 315 ob1->optimise ();
307 ob2->optimise (); 316 ob2->optimise ();
308 317
309 if (ob1->self || ob2->self) 318 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2)) 319 {
320 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
321 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
322
323 if (k1 != k2)
311 return 0; 324 return 0;
325 else if (k1 == 0)
326 return 1;
327 else if (!cfperl_can_merge (ob1, ob2))
328 return 0;
329 }
312 } 330 }
313 331
314 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
315 return 1; 333 return 1;
316} 334}
… …
419 break; 437 break;
420 438
421 return op; 439 return op;
422} 440}
423 441
424void
425free_all_object_data ()
426{
427 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428}
429
430/* 442/*
431 * Sets the owner and sets the skill and exp pointers to owner's current 443 * Sets the owner and sets the skill and exp pointers to owner's current
432 * skill and experience objects. 444 * skill and experience objects.
433 * ACTUALLY NO! investigate! TODO 445 * ACTUALLY NO! investigate! TODO
434 */ 446 */
… …
437{ 449{
438 // allow objects which own objects 450 // allow objects which own objects
439 if (owner) 451 if (owner)
440 while (owner->owner) 452 while (owner->owner)
441 owner = owner->owner; 453 owner = owner->owner;
454
455 if (flag [FLAG_FREED])
456 {
457 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
458 return;
459 }
442 460
443 this->owner = owner; 461 this->owner = owner;
444} 462}
445 463
446int 464int
… …
587 605
588void 606void
589object::instantiate () 607object::instantiate ()
590{ 608{
591 if (!uuid.seq) // HACK 609 if (!uuid.seq) // HACK
592 uuid = gen_uuid (); 610 uuid = UUID::gen ();
593 611
594 speed_left = -0.1f; 612 speed_left = -0.1f;
595 /* copy the body_info to the body_used - this is only really 613 /* copy the body_info to the body_used - this is only really
596 * need for monsters, but doesn't hurt to do it for everything. 614 * need for monsters, but doesn't hurt to do it for everything.
597 * by doing so, when a monster is created, it has good starting 615 * by doing so, when a monster is created, it has good starting
… …
756static int object_count; 774static int object_count;
757 775
758void object::link () 776void object::link ()
759{ 777{
760 assert (!index);//D 778 assert (!index);//D
761 uuid = gen_uuid (); 779 uuid = UUID::gen ();
762 count = ++object_count; 780 count = ++object_count;
763 781
764 refcnt_inc (); 782 refcnt_inc ();
765 objects.insert (this); 783 objects.insert (this);
766} 784}
… …
919 937
920 freed_map->path = "<freed objects map>"; 938 freed_map->path = "<freed objects map>";
921 freed_map->name = "/internal/freed_objects_map"; 939 freed_map->name = "/internal/freed_objects_map";
922 freed_map->width = 3; 940 freed_map->width = 3;
923 freed_map->height = 3; 941 freed_map->height = 3;
942 freed_map->nodrop = 1;
924 943
925 freed_map->alloc (); 944 freed_map->alloc ();
926 freed_map->in_memory = MAP_IN_MEMORY; 945 freed_map->in_memory = MAP_IN_MEMORY;
927 } 946 }
928 947
… …
1140merge_ob (object *op, object *top) 1159merge_ob (object *op, object *top)
1141{ 1160{
1142 if (!op->nrof) 1161 if (!op->nrof)
1143 return 0; 1162 return 0;
1144 1163
1145 if (top) 1164 if (!top)
1146 for (top = op; top && top->above; top = top->above) 1165 for (top = op; top && top->above; top = top->above)
1147 ; 1166 ;
1148 1167
1149 for (; top; top = top->below) 1168 for (; top; top = top->below)
1150 { 1169 {
… …
1290 else 1309 else
1291 { 1310 {
1292 top = ms.bot; 1311 top = ms.bot;
1293 1312
1294 /* If there are other objects, then */ 1313 /* If there are other objects, then */
1295 if ((!(flag & INS_MAP_LOAD)) && top) 1314 if (top)
1296 { 1315 {
1297 object *last = 0; 1316 object *last = 0;
1298 1317
1299 /* 1318 /*
1300 * If there are multiple objects on this space, we do some trickier handling. 1319 * If there are multiple objects on this space, we do some trickier handling.
… …
1352 */ 1371 */
1353 if (last && last->below && last != floor) 1372 if (last && last->below && last != floor)
1354 top = last->below; 1373 top = last->below;
1355 } 1374 }
1356 } /* If objects on this space */ 1375 } /* If objects on this space */
1357 if (flag & INS_MAP_LOAD)
1358 top = ms.top;
1359 1376
1360 if (flag & INS_ABOVE_FLOOR_ONLY) 1377 if (flag & INS_ABOVE_FLOOR_ONLY)
1361 top = floor; 1378 top = floor;
1362 1379
1363 /* Top is the object that our object (op) is going to get inserted above. 1380 /* Top is the object that our object (op) is going to get inserted above.
… …
1396 op->map->touch (); 1413 op->map->touch ();
1397 } 1414 }
1398 1415
1399 op->map->dirty = true; 1416 op->map->dirty = true;
1400 1417
1401 if (!(flag & INS_MAP_LOAD))
1402 if (object *pl = ms.player ()) 1418 if (object *pl = ms.player ())
1403 pl->contr->ns->floorbox_update (); 1419 pl->contr->ns->floorbox_update ();
1404 1420
1405 /* If this object glows, it may affect lighting conditions that are 1421 /* If this object glows, it may affect lighting conditions that are
1406 * visible to others on this map. But update_all_los is really 1422 * visible to others on this map. But update_all_los is really
1407 * an inefficient way to do this, as it means los for all players 1423 * an inefficient way to do this, as it means los for all players
1408 * on the map will get recalculated. The players could very well 1424 * on the map will get recalculated. The players could very well
… …
1945 * activate recursively a flag on an object inventory 1961 * activate recursively a flag on an object inventory
1946 */ 1962 */
1947void 1963void
1948flag_inv (object *op, int flag) 1964flag_inv (object *op, int flag)
1949{ 1965{
1950 if (op->inv)
1951 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1966 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1952 { 1967 {
1953 SET_FLAG (tmp, flag); 1968 SET_FLAG (tmp, flag);
1954 flag_inv (tmp, flag); 1969 flag_inv (tmp, flag);
1955 } 1970 }
1956} 1971}
1957 1972
1958/* 1973/*
1959 * deactivate recursively a flag on an object inventory 1974 * deactivate recursively a flag on an object inventory
1960 */ 1975 */
1961void 1976void
1962unflag_inv (object *op, int flag) 1977unflag_inv (object *op, int flag)
1963{ 1978{
1964 if (op->inv)
1965 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1979 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1966 { 1980 {
1967 CLEAR_FLAG (tmp, flag); 1981 CLEAR_FLAG (tmp, flag);
1968 unflag_inv (tmp, flag); 1982 unflag_inv (tmp, flag);
1969 } 1983 }
1970} 1984}
1971 1985
1972/* 1986/*
1973 * find_free_spot(object, map, x, y, start, stop) will search for 1987 * find_free_spot(object, map, x, y, start, stop) will search for
1974 * a spot at the given map and coordinates which will be able to contain 1988 * a spot at the given map and coordinates which will be able to contain
… …
1976 * to search (see the freearr_x/y[] definition). 1990 * to search (see the freearr_x/y[] definition).
1977 * It returns a random choice among the alternatives found. 1991 * It returns a random choice among the alternatives found.
1978 * start and stop are where to start relative to the free_arr array (1,9 1992 * start and stop are where to start relative to the free_arr array (1,9
1979 * does all 4 immediate directions). This returns the index into the 1993 * does all 4 immediate directions). This returns the index into the
1980 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1994 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1981 * Note - this only checks to see if there is space for the head of the
1982 * object - if it is a multispace object, this should be called for all
1983 * pieces.
1984 * Note2: This function does correctly handle tiled maps, but does not 1995 * Note: This function does correctly handle tiled maps, but does not
1985 * inform the caller. However, insert_ob_in_map will update as 1996 * inform the caller. However, insert_ob_in_map will update as
1986 * necessary, so the caller shouldn't need to do any special work. 1997 * necessary, so the caller shouldn't need to do any special work.
1987 * Note - updated to take an object instead of archetype - this is necessary 1998 * Note - updated to take an object instead of archetype - this is necessary
1988 * because arch_blocked (now ob_blocked) needs to know the movement type 1999 * because arch_blocked (now ob_blocked) needs to know the movement type
1989 * to know if the space in question will block the object. We can't use 2000 * to know if the space in question will block the object. We can't use
… …
1991 * customized, changed states, etc. 2002 * customized, changed states, etc.
1992 */ 2003 */
1993int 2004int
1994find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2005find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1995{ 2006{
2007 int altern[SIZEOFFREE];
1996 int index = 0, flag; 2008 int index = 0, flag;
1997 int altern[SIZEOFFREE];
1998 2009
1999 for (int i = start; i < stop; i++) 2010 for (int i = start; i < stop; i++)
2000 { 2011 {
2001 mapxy pos (m, x, y); pos.move (i); 2012 mapxy pos (m, x, y); pos.move (i);
2002 2013
… …
2010 2021
2011 /* However, often 2022 /* However, often
2012 * ob doesn't have any move type (when used to place exits) 2023 * ob doesn't have any move type (when used to place exits)
2013 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 2024 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2014 */ 2025 */
2015 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 2026 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2027 {
2028 altern [index++] = i;
2016 continue; 2029 continue;
2030 }
2017 2031
2018 /* Basically, if we find a wall on a space, we cut down the search size. 2032 /* Basically, if we find a wall on a space, we cut down the search size.
2019 * In this way, we won't return spaces that are on another side of a wall. 2033 * In this way, we won't return spaces that are on another side of a wall.
2020 * This mostly work, but it cuts down the search size in all directions - 2034 * This mostly work, but it cuts down the search size in all directions -
2021 * if the space being examined only has a wall to the north and empty 2035 * if the space being examined only has a wall to the north and empty
… …
2031 2045
2032 /* Note it is intentional that we check ob - the movement type of the 2046 /* Note it is intentional that we check ob - the movement type of the
2033 * head of the object should correspond for the entire object. 2047 * head of the object should correspond for the entire object.
2034 */ 2048 */
2035 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2049 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2050 continue;
2051
2052 if (ob->blocked (m, pos.x, pos.y))
2036 continue; 2053 continue;
2037 2054
2038 altern [index++] = i; 2055 altern [index++] = i;
2039 } 2056 }
2040 2057
… …
2599{ 2616{
2600 char flagdesc[512]; 2617 char flagdesc[512];
2601 char info2[256 * 4]; 2618 char info2[256 * 4];
2602 char *p = info; 2619 char *p = info;
2603 2620
2604 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2621 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2605 count, uuid.seq, 2622 count,
2623 uuid.c_str (),
2606 &name, 2624 &name,
2607 title ? "\",title:\"" : "", 2625 title ? "\",title:\"" : "",
2608 title ? (const char *)title : "", 2626 title ? (const char *)title : "",
2609 flag_desc (flagdesc, 512), type); 2627 flag_desc (flagdesc, 512), type);
2610 2628

Diff Legend

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