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.196 by root, Wed Oct 17 22:01:27 2007 UTC vs.
Revision 1.202 by root, Thu Apr 10 15:35:15 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;
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 */
… …
447{ 440{
448 // allow objects which own objects 441 // allow objects which own objects
449 if (owner) 442 if (owner)
450 while (owner->owner) 443 while (owner->owner)
451 owner = owner->owner; 444 owner = owner->owner;
445
446 if (flag [FLAG_FREED])
447 {
448 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
449 return;
450 }
452 451
453 this->owner = owner; 452 this->owner = owner;
454} 453}
455 454
456int 455int
… …
597 596
598void 597void
599object::instantiate () 598object::instantiate ()
600{ 599{
601 if (!uuid.seq) // HACK 600 if (!uuid.seq) // HACK
602 uuid = gen_uuid (); 601 uuid = UUID::gen ();
603 602
604 speed_left = -0.1f; 603 speed_left = -0.1f;
605 /* 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
606 * 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.
607 * 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
… …
766static int object_count; 765static int object_count;
767 766
768void object::link () 767void object::link ()
769{ 768{
770 assert (!index);//D 769 assert (!index);//D
771 uuid = gen_uuid (); 770 uuid = UUID::gen ();
772 count = ++object_count; 771 count = ++object_count;
773 772
774 refcnt_inc (); 773 refcnt_inc ();
775 objects.insert (this); 774 objects.insert (this);
776} 775}
… …
929 928
930 freed_map->path = "<freed objects map>"; 929 freed_map->path = "<freed objects map>";
931 freed_map->name = "/internal/freed_objects_map"; 930 freed_map->name = "/internal/freed_objects_map";
932 freed_map->width = 3; 931 freed_map->width = 3;
933 freed_map->height = 3; 932 freed_map->height = 3;
933 freed_map->nodrop = 1;
934 934
935 freed_map->alloc (); 935 freed_map->alloc ();
936 freed_map->in_memory = MAP_IN_MEMORY; 936 freed_map->in_memory = MAP_IN_MEMORY;
937 } 937 }
938 938
… …
1952 * activate recursively a flag on an object inventory 1952 * activate recursively a flag on an object inventory
1953 */ 1953 */
1954void 1954void
1955flag_inv (object *op, int flag) 1955flag_inv (object *op, int flag)
1956{ 1956{
1957 if (op->inv)
1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1957 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 { 1958 {
1960 SET_FLAG (tmp, flag); 1959 SET_FLAG (tmp, flag);
1961 flag_inv (tmp, flag); 1960 flag_inv (tmp, flag);
1962 } 1961 }
1963} 1962}
1964 1963
1965/* 1964/*
1966 * deactivate recursively a flag on an object inventory 1965 * deactivate recursively a flag on an object inventory
1967 */ 1966 */
1968void 1967void
1969unflag_inv (object *op, int flag) 1968unflag_inv (object *op, int flag)
1970{ 1969{
1971 if (op->inv)
1972 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1970 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1973 { 1971 {
1974 CLEAR_FLAG (tmp, flag); 1972 CLEAR_FLAG (tmp, flag);
1975 unflag_inv (tmp, flag); 1973 unflag_inv (tmp, flag);
1976 } 1974 }
1977} 1975}
1978 1976
1979/* 1977/*
1980 * find_free_spot(object, map, x, y, start, stop) will search for 1978 * find_free_spot(object, map, x, y, start, stop) will search for
1981 * a spot at the given map and coordinates which will be able to contain 1979 * a spot at the given map and coordinates which will be able to contain
… …
2014 2012
2015 /* However, often 2013 /* However, often
2016 * ob doesn't have any move type (when used to place exits) 2014 * ob doesn't have any move type (when used to place exits)
2017 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 2015 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2018 */ 2016 */
2019 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 2017 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2020 { 2018 {
2021 altern [index++] = i; 2019 altern [index++] = i;
2022 continue; 2020 continue;
2023 } 2021 }
2024 2022

Diff Legend

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