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.43 by root, Thu Sep 14 17:10:24 2006 UTC vs.
Revision 1.346 by root, Wed May 4 07:36:40 2011 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 (at your option) any later version. 11 * 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License
19 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 21 *
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <support@deliantra.net>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28#include <global.h> 25#include <global.h>
29#include <stdio.h> 26#include <stdio.h>
30#include <sys/types.h> 27#include <sys/types.h>
31#include <sys/uio.h> 28#include <sys/uio.h>
32#include <object.h> 29#include <object.h>
33#include <funcpoint.h> 30#include <sproto.h>
34#include <loader.h>
35 31
36int nrofallocobjects = 0; 32#include <bitset>
37static UUID uuid; 33
34UUID UUID::cur;
35static uint64_t seq_next_save;
38const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000;
39 38
40object *objects; /* Pointer to the list of used objects */ 39objectvec objects;
41object *active_objects; /* List of active objects that need to be processed */ 40activevec actives;
42 41
43short 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, 42freelist_item *object::freelist;
43uint32_t object::object_count;
44uint32_t object::free_count;
45uint32_t object::create_count;
46uint32_t object::destroy_count;
47
48//+GPL
49
50short freearr_x[SIZEOFFREE] = {
51 0,
52 0, 1, 1, 1, 0, -1, -1, -1,
53 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 54 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 55};
46short 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, 56short freearr_y[SIZEOFFREE] = {
57 0,
58 -1, -1, 0, 1, 1, 1, 0, -1,
59 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
47 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 60 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
48};
49int 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,
50 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
51}; 61};
52int freedir[SIZEOFFREE] = { 62int freedir[SIZEOFFREE] = {
53 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,
54 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
55}; 67};
56 68
69static int maxfree[SIZEOFFREE] = {
70 0,
71 9, 10, 13, 14, 17, 18, 21, 22,
72 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
73 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
74};
75
76const char *wall_suffix[16] = {
77 "0",
78 "1_3",
79 "1_4",
80 "2_1_2",
81 "1_2",
82 "2_2_4",
83 "2_2_1",
84 "3_1",
85 "1_1",
86 "2_2_3",
87 "2_2_2",
88 "3_3",
89 "2_1_1",
90 "3_4",
91 "3_2",
92 "4"
93};
94
57static void 95static void
58write_uuid (void) 96write_uuid (uval64 skip, bool sync)
59{ 97{
60 char filename1[MAX_BUF], filename2[MAX_BUF]; 98 CALL_BEGIN (2);
61 99 CALL_ARG_SV (newSVval64 (skip));
62 sprintf (filename1, "%s/uuid", settings.localdir); 100 CALL_ARG_SV (boolSV (sync));
63 sprintf (filename2, "%s/uuid~", settings.localdir); 101 CALL_CALL ("cf::write_uuid", G_DISCARD);
64 102 CALL_END;
65 FILE *fp;
66
67 if (!(fp = fopen (filename2, "w")))
68 {
69 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70 return;
71 }
72
73 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74 fclose (fp);
75 rename (filename2, filename1);
76} 103}
77 104
78static void 105static void
79read_uuid (void) 106read_uuid ()
80{ 107{
81 char filename[MAX_BUF]; 108 char filename[MAX_BUF];
82 109
83 sprintf (filename, "%s/uuid", settings.localdir); 110 sprintf (filename, "%s/uuid", settings.localdir);
111
112 seq_next_save = 0;
84 113
85 FILE *fp; 114 FILE *fp;
86 115
87 if (!(fp = fopen (filename, "r"))) 116 if (!(fp = fopen (filename, "r")))
88 { 117 {
89 if (errno == ENOENT) 118 if (errno == ENOENT)
90 { 119 {
91 LOG (llevInfo, "RESET uid to 1\n"); 120 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0; 121 UUID::cur.seq = 0;
93 write_uuid (); 122 write_uuid (UUID_GAP, true);
94 return; 123 return;
95 } 124 }
96 125
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 126 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 127 _exit (1);
99 } 128 }
100 129
101 int version; 130 char buf [UUID::MAX_LEN];
102 unsigned long long uid; 131 buf[0] = 0;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 132 fgets (buf, sizeof (buf), fp);
133
134 if (!UUID::cur.parse (buf))
104 { 135 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 136 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106 _exit (1); 137 _exit (1);
107 } 138 }
108 139
109 uuid.seq = uid;
110 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid); 140 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
141
142 write_uuid (UUID_GAP, true);
112 fclose (fp); 143 fclose (fp);
113} 144}
114 145
115UUID 146UUID
116gen_uuid () 147UUID::gen ()
117{ 148{
118 UUID uid; 149 UUID uid;
119 150
120 uid.seq = ++uuid.seq; 151 uid.seq = ++cur.seq;
121 152
122 if (!(uuid.seq & (UUID_SKIP - 1))) 153 if (expect_false (cur.seq >= seq_next_save))
123 write_uuid (); 154 {
155 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
156 write_uuid (UUID_GAP, false);
157 }
158
124 159
125 return uid; 160 return uid;
126} 161}
127 162
128void 163void
129init_uuid () 164UUID::init ()
130{ 165{
131 read_uuid (); 166 read_uuid ();
132} 167}
133 168
169bool
170UUID::parse (const char *s)
171{
172 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
173 return false;
174
175 seq = 0;
176
177 while (*s != '>')
178 {
179 if (*s < '0')
180 return false;
181
182 // this gives nice branchless code with gcc
183 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
184 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
185
186 seq = (seq << 4) | digit;
187
188 ++s;
189 }
190
191 return true;
192}
193
194char *
195UUID::append (char *buf) const
196{
197 *buf++ = '<';
198 *buf++ = '1';
199 *buf++ = '.';
200
201 uint64_t seq = this->seq;
202 const int bits = 64;
203 char nz = 0;
204 static const char tohex [] = "0123456789abcdef";
205
206 // assert (len >= 3 + bits / 4 + 1 + 1);
207 for (int i = bits / 4; --i; )
208 {
209 uint8_t digit = seq >> (bits - 4);
210
211 *buf = tohex [digit];
212 nz |= digit;
213 buf += nz ? 1 : 0;
214 seq <<= 4;
215 }
216
217 // last digit is special - always emit
218 uint8_t digit = seq >> (bits - 4);
219 *buf++ = tohex [digit];
220
221 *buf++ = '>';
222
223 return buf;
224}
225
226char *
227UUID::c_str () const
228{
229 static char buf [MAX_LEN];
230 *append (buf) = 0;
231 return buf;
232}
233
134/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 234/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
135static int 235static bool
136compare_ob_value_lists_one (const object *wants, const object *has) 236compare_ob_value_lists_one (const object *wants, const object *has)
137{ 237{
138 key_value *wants_field;
139
140 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 238 /* n-squared behaviour (see kv.get), but I'm hoping both
141 * objects with lists are rare, and lists stay short. If not, use a 239 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 240 * different structure or at least keep the lists sorted...
143 */ 241 */
144 242
145 /* For each field in wants, */ 243 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 244 for (key_value *kv = wants->kv.first; kv; kv = kv->next)
147 { 245 if (has->kv.get (kv->key) != kv->value)
148 key_value *has_field; 246 return false;
149
150 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key);
152
153 if (has_field == NULL)
154 {
155 /* No field with that name. */
156 return FALSE;
157 }
158
159 /* Found the matching field. */
160 if (has_field->value != wants_field->value)
161 {
162 /* Values don't match, so this half of the comparison is false. */
163 return FALSE;
164 }
165
166 /* If we get here, we found a match. Now for the next field in wants. */
167 }
168 247
169 /* If we get here, every field in wants has a matching field in has. */ 248 /* If we get here, every field in wants has a matching field in has. */
170 return TRUE; 249 return true;
171} 250}
172 251
173/* Returns TRUE if ob1 has the same key_values as ob2. */ 252/* Returns TRUE if ob1 has the same key_values as ob2. */
174static int 253static bool
175compare_ob_value_lists (const object *ob1, const object *ob2) 254compare_ob_value_lists (const object *ob1, const object *ob2)
176{ 255{
177 /* However, there may be fields in has which aren't partnered in wants, 256 /* However, there may be fields in has which aren't partnered in wants,
178 * so we need to run the comparison *twice*. :( 257 * so we need to run the comparison *twice*. :(
179 */ 258 */
180 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 259 return compare_ob_value_lists_one (ob1, ob2)
260 && compare_ob_value_lists_one (ob2, ob1);
181} 261}
182 262
183/* Function examines the 2 objects given to it, and returns true if 263/* Function examines the 2 objects given to it, and returns true if
184 * they can be merged together. 264 * they can be merged together.
185 * 265 *
186 * Note that this function appears a lot longer than the macro it 266 * Note that this function appears a lot longer than the macro it
187 * replaces - this is mostly for clarity - a decent compiler should hopefully 267 * replaces - this is mostly for clarity - a decent compiler should hopefully
188 * reduce this to the same efficiency. 268 * reduce this to the same efficiency.
189 * 269 *
190 * Check nrof variable *before* calling CAN_MERGE() 270 * Check nrof variable *before* calling can_merge()
191 * 271 *
192 * Improvements made with merge: Better checking on potion, and also 272 * Improvements made with merge: Better checking on potion, and also
193 * check weight 273 * check weight
194 */ 274 */
195
196bool object::can_merge (object *ob1, object *ob2) 275bool object::can_merge_slow (object *ob1, object *ob2)
197{ 276{
198 /* A couple quicksanity checks */ 277 /* A couple quick sanity checks */
199 if ((ob1 == ob2) || (ob1->type != ob2->type)) 278 if (ob1 == ob2
279 || ob1->type != ob2->type
280 || ob1->value != ob2->value
281 || ob1->name != ob2->name
282 || ob1->custom_name != ob2->custom_name
283 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
200 return 0; 284 return 0;
201 285
202 if (ob1->speed != ob2->speed) 286 /* Do not merge objects if nrof would overflow, assume nrof
287 * is always 0 .. 2**31-1 */
288 if (ob1->nrof > 0x7fffffff - ob2->nrof)
203 return 0; 289 return 0;
204 290
205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
206 * value could not be stored in a sint32 (which unfortunately sometimes is
207 * used to store nrof).
208 */
209 if (ob1->nrof + ob2->nrof >= 1UL << 31)
210 return 0;
211
212 /* If the objects have been identified, set the BEEN_APPLIED flag. 291 /* If the objects have been identified, set the BEEN_APPLIED flag.
213 * This is to the comparison of the flags below will be OK. We 292 * This is to the comparison of the flags below will be OK. We
214 * just can't ignore the been applied or identified flags, as they 293 * just can't ignore the been applied or identified flags, as they
215 * are not equal - just if it has been identified, the been_applied 294 * are not equal - just if it has been identified, the been_applied
216 * flags lose any meaning. 295 * flags lose any meaning.
217 */ 296 */
218 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 297 if (ob1->flag [FLAG_IDENTIFIED])
219 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 298 ob1->set_flag (FLAG_BEEN_APPLIED);
220 299
221 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 300 if (ob2->flag [FLAG_IDENTIFIED])
222 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 301 ob2->set_flag (FLAG_BEEN_APPLIED);
223 302
224 303 if (ob1->arch->archname != ob2->arch->archname
225 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
226 * being locked in inventory should prevent merging.
227 * 0x4 in flags3 is CLIENT_SENT
228 */
229 if ((ob1->arch != ob2->arch) ||
230 (ob1->flags[0] != ob2->flags[0]) ||
231 (ob1->flags[1] != ob2->flags[1]) ||
232 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234 (ob1->name != ob2->name) || 304 || ob1->name != ob2->name
235 (ob1->title != ob2->title) || 305 || ob1->title != ob2->title
236 (ob1->msg != ob2->msg) || 306 || ob1->msg != ob2->msg
237 (ob1->weight != ob2->weight) || 307 || ob1->weight != ob2->weight
238 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||
239 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||
240 (ob1->attacktype != ob2->attacktype) || 308 || ob1->attacktype != ob2->attacktype
241 (ob1->magic != ob2->magic) || 309 || ob1->magic != ob2->magic
242 (ob1->slaying != ob2->slaying) || 310 || ob1->slaying != ob2->slaying
243 (ob1->skill != ob2->skill) || 311 || ob1->skill != ob2->skill
244 (ob1->value != ob2->value) || 312 || ob1->value != ob2->value
245 (ob1->animation_id != ob2->animation_id) || 313 || ob1->animation_id != ob2->animation_id
314 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
246 (ob1->client_type != ob2->client_type) || 315 || ob1->client_type != ob2->client_type
247 (ob1->materialname != ob2->materialname) || 316 || ob1->material != ob2->material
248 (ob1->lore != ob2->lore) || 317 || ob1->lore != ob2->lore
249 (ob1->subtype != ob2->subtype) || 318 || ob1->subtype != ob2->subtype
250 (ob1->move_type != ob2->move_type) || 319 || ob1->move_type != ob2->move_type
251 (ob1->move_block != ob2->move_block) || 320 || ob1->move_block != ob2->move_block
252 (ob1->move_allow != ob2->move_allow) || 321 || ob1->move_allow != ob2->move_allow
253 (ob1->move_on != ob2->move_on) || 322 || ob1->move_on != ob2->move_on
254 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 323 || ob1->move_off != ob2->move_off
324 || ob1->move_slow != ob2->move_slow
325 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
326 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
327 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
255 return 0; 328 return 0;
256 329
330 if ((ob1->flag ^ ob2->flag)
331 .reset (FLAG_INV_LOCKED)
332 .reset (FLAG_REMOVED)
333 .any ())
334 return 0;
335
257 /* This is really a spellbook check - really, we should 336 /* This is really a spellbook check - we should in general
258 * check all objects in the inventory. 337 * not merge objects with real inventories, as splitting them
338 * is hard.
259 */ 339 */
260 if (ob1->inv || ob2->inv) 340 if (ob1->inv || ob2->inv)
261 { 341 {
262 /* if one object has inventory but the other doesn't, not equiv */
263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264 return 0;
265
266 /* Now check to see if the two inventory objects could merge */
267 if (!CAN_MERGE (ob1->inv, ob2->inv)) 342 if (!(ob1->inv && ob2->inv))
268 return 0; 343 return 0; /* inventories differ in length */
344
345 if (ob1->inv->below || ob2->inv->below)
346 return 0; /* more than one object in inv */
347
348 if (!object::can_merge (ob1->inv, ob2->inv))
349 return 0; /* inventory objects differ */
269 350
270 /* inventory ok - still need to check rest of this object to see 351 /* inventory ok - still need to check rest of this object to see
271 * if it is valid. 352 * if it is valid.
272 */ 353 */
273 } 354 }
274 355
275 /* Don't merge objects that are applied. With the new 'body' code, 356 /* Don't merge objects that are applied. With the new 'body' code,
276 * it is possible for most any character to have more than one of 357 * it is possible for most any character to have more than one of
277 * some items equipped, and we don't want those to merge. 358 * some items equipped, and we don't want those to merge.
278 */ 359 */
279 if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) 360 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
280 return 0; 361 return 0;
281 362
282 /* Note sure why the following is the case - either the object has to 363 /* Note sure why the following is the case - either the object has to
283 * be animated or have a very low speed. Is this an attempted monster 364 * be animated or have a very low speed. Is this an attempted monster
284 * check? 365 * check?
285 */ 366 */
286 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 367 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
287 return 0; 368 return 0;
288 369
289 switch (ob1->type) 370 switch (ob1->type)
290 { 371 {
291 case SCROLL: 372 case SCROLL:
292 if (ob1->level != ob2->level) 373 if (ob1->level != ob2->level)
293 return 0; 374 return 0;
294 break; 375 break;
295 } 376 }
296 377
297 if (ob1->key_values != NULL || ob2->key_values != NULL) 378 if (!ob1->kv.empty () || !ob2->kv.empty ())
298 { 379 {
299 /* At least one of these has key_values. */ 380 /* At least one of these has key_values. */
300 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 381 if (ob1->kv.empty () != ob2->kv.empty ())
301 /* One has fields, but the other one doesn't. */ 382 return 0; /* One has fields, but the other one doesn't. */
383
384 if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 385 return 0;
303 else if (!compare_ob_value_lists (ob1, ob2))
304 return 0;
305 } 386 }
306 387
307 //TODO: generate an event or call into perl for additional checks
308 if (ob1->self || ob2->self) 388 if (ob1->self || ob2->self)
309 { 389 {
310 ob1->optimise (); 390 ob1->optimise ();
311 ob2->optimise (); 391 ob2->optimise ();
312 392
313 if (ob1->self || ob2->self) 393 if (ob1->self || ob2->self)
394 {
395 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
396 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
397
398 if (k1 != k2)
314 return 0; 399 return 0;
400
401 if (k1 == 0)
402 return 1;
403
404 if (!cfperl_can_merge (ob1, ob2))
405 return 0;
406 }
315 } 407 }
316 408
317 /* Everything passes, must be OK. */ 409 /* Everything passes, must be OK. */
318 return 1; 410 return 1;
319} 411}
320 412
413// find player who can see this object
414object *
415object::visible_to () const
416{
417 if (client_visible () && !flag [FLAG_REMOVED])
418 {
419 // see if we are in a container of sorts
420 if (env)
421 {
422 // the player inventory itself is always visible
423 if (env->is_player ())
424 return env;
425
426 // else a player could have our env open
427 object *envest = env->outer_env_or_self ();
428
429 // the player itself is always on a map, so we will find him here
430 // even if our inv is in a player.
431 if (envest->is_on_map ())
432 if (object *pl = envest->ms ().player ())
433 if (pl->container_ () == env)
434 return pl;
435 }
436 else
437 {
438 // maybe there is a player standing on the same mapspace
439 // this will catch the case where "this" is a player
440 if (object *pl = ms ().player ())
441 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
442 || pl->container_ () == this)
443 return pl;
444 }
445 }
446
447 return 0;
448}
449
450// adjust weight per container type ("of holding")
451static uint32
452weight_adjust_for (object *op, uint32 weight)
453{
454 return op->type == CONTAINER
455 ? weight - weight * op->stats.Str / 100
456 : weight;
457}
458
321/* 459/*
460 * subtracts, then adds, the specified weight to an object,
461 * and also updates how much the environment(s) is/are carrying.
462 */
463static void
464adjust_weight (object *op, sint32 sub, sint32 add)
465{
466 while (op)
467 {
468 sint32 ocarrying = op->carrying;
469
470 op->carrying -= weight_adjust_for (op, sub);
471 op->carrying += weight_adjust_for (op, add);
472
473 if (object *pl = op->visible_to ())
474 if (pl != op) // player is handled lazily
475 esrv_update_item (UPD_WEIGHT, pl, op);
476
477 sub = ocarrying;
478 add = op->carrying;
479
480 op = op->env;
481 }
482}
483
484/*
322 * sum_weight() is a recursive function which calculates the weight 485 * this is a recursive function which calculates the weight
323 * an object is carrying. It goes through in figures out how much 486 * an object is carrying. It goes through op and figures out how much
324 * containers are carrying, and sums it up. 487 * containers are carrying, and sums it up.
325 */ 488 */
326long 489void
327sum_weight (object *op) 490object::update_weight ()
328{ 491{
329 long sum; 492 sint32 sum = 0;
330 object *inv;
331 493
332 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 494 for (object *op = inv; op; op = op->below)
333 {
334 if (inv->inv)
335 sum_weight (inv);
336 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
337 } 495 {
496 op->update_weight ();
338 497
339 if (op->type == CONTAINER && op->stats.Str) 498 sum += weight_adjust_for (this, op->total_weight ());
340 sum = (sum * (100 - op->stats.Str)) / 100; 499 }
341 500
342 if (op->carrying != sum) 501 if (sum != carrying)
502 {
503 if (carrying != sum && carrying)//D
504 LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
505 (long long)sum, (long long)carrying, debug_desc ());
506
343 op->carrying = sum; 507 carrying = sum;
344 508
345 return sum; 509 if (object *pl = visible_to ())
346} 510 if (pl != this) // player is handled lazily
347 511 esrv_update_item (UPD_WEIGHT, pl, this);
348/**
349 * Return the outermost environment object for a given object.
350 */
351
352object *
353object_get_env_recursive (object *op)
354{
355 while (op->env != NULL)
356 op = op->env;
357 return op;
358}
359
360/*
361 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
362 * a better check. We basically keeping traversing up until we can't
363 * or find a player.
364 */
365
366object *
367is_player_inv (object *op)
368{
369 for (; op != NULL && op->type != PLAYER; op = op->env)
370 if (op->env == op)
371 op->env = NULL;
372 return op;
373}
374
375/*
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array.
379 */
380
381void
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 { 512 }
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429} 513}
430 514
431/* 515/*
432 * Dumps an object. Returns output in the static global errmsg array. 516 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
433 */ 517 */
434 518char *
435void
436dump_object (object *op) 519dump_object (object *op)
437{ 520{
438 if (op == NULL) 521 if (!op)
439 { 522 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 523
447void 524 object_freezer freezer;
448dump_all_objects (void) 525 op->write (freezer);
449{ 526 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 527}
458 528
459/* 529char *
460 * get_nearest_part(multi-object, object 2) returns the part of the 530object::as_string ()
461 * multi-object 1 which is closest to the second object.
462 * If it's not a multi-object, it is returned.
463 */
464
465object *
466get_nearest_part (object *op, const object *pl)
467{ 531{
468 object *tmp, *closest; 532 return dump_object (this);
469 int last_dist, i;
470
471 if (op->more == NULL)
472 return op;
473 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
474 if ((i = distance (tmp, pl)) < last_dist)
475 closest = tmp, last_dist = i;
476 return closest;
477} 533}
478 534
479/* 535/*
480 * Returns the object which has the count-variable equal to the argument. 536 * Returns the object which has the count-variable equal to the argument.
537 * VERRRY slow.
481 */ 538 */
482
483object * 539object *
484find_object (tag_t i) 540find_object (tag_t i)
485{ 541{
486 object *op; 542 for_all_objects (op)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 543 if (op->count == i)
490 break;
491 return op; 544 return op;
545
546 return 0;
547}
548
549/*
550 * Returns the object which has the uuid equal to the argument.
551 * MOAR VERRRY slow.
552 */
553
554object *
555find_object_uuid (UUID i)
556{
557 for_all_objects (op)
558 if (op->uuid == i)
559 return op;
560
561 return 0;
492} 562}
493 563
494/* 564/*
495 * Returns the first object which has a name equal to the argument. 565 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 566 * Used only by the patch command, but not all that useful.
497 * Enables features like "patch <name-of-other-player> food 999" 567 * Enables features like "patch <name-of-other-player> food 999"
498 */ 568 */
499
500object * 569object *
501find_object_name (const char *str) 570find_object_name (const char *str)
502{ 571{
503 shstr_cmp str_ (str); 572 shstr_cmp str_ (str);
504 object *op;
505 573
506 for (op = objects; op != NULL; op = op->next) 574 if (str_)
575 for_all_objects (op)
507 if (op->name == str_) 576 if (op->name == str_)
508 break; 577 return op;
509 578
510 return op; 579 return 0;
511}
512
513void
514free_all_object_data ()
515{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517} 580}
518 581
519/* 582/*
520 * Sets the owner and sets the skill and exp pointers to owner's current 583 * Sets the owner and sets the skill and exp pointers to owner's current
521 * skill and experience objects. 584 * skill and experience objects.
585 * ACTUALLY NO! investigate! TODO
522 */ 586 */
523void 587void
524object::set_owner (object *owner) 588object::set_owner (object *owner)
525{ 589{
590 // allow objects which own objects
526 if (!owner) 591 if (owner)
527 return;
528
529 /* next line added to allow objects which own objects */
530 /* Add a check for ownercounts in here, as I got into an endless loop
531 * with the fireball owning a poison cloud which then owned the
532 * fireball. I believe that was caused by one of the objects getting
533 * freed and then another object replacing it. Since the ownercounts
534 * didn't match, this check is valid and I believe that cause is valid.
535 */
536 while (owner->owner) 592 while (owner->owner)
537 owner = owner->owner; 593 owner = owner->owner;
594
595 if (flag [FLAG_FREED])
596 {
597 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
598 return;
599 }
538 600
539 this->owner = owner; 601 this->owner = owner;
540} 602}
541 603
542/* Zero the key_values on op, decrementing the shared-string
543 * refcounts and freeing the links.
544 */
545static void
546free_key_values (object *op)
547{
548 for (key_value *i = op->key_values; i != 0;)
549 {
550 key_value *next = i->next;
551 delete i;
552
553 i = next;
554 }
555
556 op->key_values = 0;
557}
558
559void object::clear ()
560{
561 attachable_base::clear ();
562
563 free_key_values (this);
564
565 owner = 0;
566 name = 0;
567 name_pl = 0;
568 title = 0;
569 race = 0;
570 slaying = 0;
571 skill = 0;
572 msg = 0;
573 lore = 0;
574 custom_name = 0;
575 materialname = 0;
576 contr = 0;
577 below = 0;
578 above = 0;
579 inv = 0;
580 container = 0;
581 env = 0;
582 more = 0;
583 head = 0;
584 map = 0;
585 active_next = 0;
586 active_prev = 0;
587
588 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
589
590 SET_FLAG (this, FLAG_REMOVED);
591
592 /* What is not cleared is next, prev, and count */
593
594 expmul = 1.0;
595 face = blank_face;
596
597 if (settings.casting_time)
598 casting_time = -1;
599}
600
601void object::clone (object *destination)
602{
603 *(object_copy *)destination = *this;
604 *(object_pod *)destination = *this;
605
606 if (self || cb)
607 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
608}
609
610/* 604/*
611 * copy object first frees everything allocated by the second object, 605 * copy_to first frees everything allocated by the dst object,
612 * and then copies the contends of the first object into the second 606 * and then copies the contents of itself into the second
613 * object, allocating what needs to be allocated. Basically, any 607 * object, allocating what needs to be allocated. Basically, any
614 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 608 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
615 * if the first object is freed, the pointers in the new object 609 * if the first object is freed, the pointers in the new object
616 * will point at garbage. 610 * will point at garbage.
617 */ 611 */
618void 612void
619copy_object (object *op2, object *op) 613object::copy_to (object *dst)
620{ 614{
621 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 615 dst->remove ();
622 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 616 *(object_copy *)dst = *this;
623 617
624 op2->clone (op); 618 // maybe move to object_copy?
619 dst->kv = kv;
625 620
626 if (is_freed) 621 dst->flag [FLAG_REMOVED] = true;
627 SET_FLAG (op, FLAG_FREED); 622 dst->activate ();
628 if (is_removed) 623}
629 SET_FLAG (op, FLAG_REMOVED);
630 624
631 if (op2->speed < 0) 625void
632 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 626object::instantiate ()
627{
628 if (!uuid.seq) // HACK
629 uuid = UUID::gen ();
633 630
634 /* Copy over key_values, if any. */ 631 // TODO: unclean state changes, should not be done in copy_to AND instantiate
635 if (op2->key_values) 632 if (flag [FLAG_RANDOM_SPEED] && speed)
636 { 633 speed_left = - speed - rndm (); // TODO animation
637 key_value *tail = 0; 634 else
638 key_value *i; 635 speed_left = -1.;
639 636
640 op->key_values = 0; 637 /* copy the body_info to the body_used - this is only really
638 * need for monsters, but doesn't hurt to do it for everything.
639 * by doing so, when a monster is created, it has good starting
640 * values for the body_used info, so when items are created
641 * for it, they can be properly equipped.
642 */
643 for (int i = NUM_BODY_LOCATIONS; i--; )
644 slot[i].used = slot[i].info;
641 645
642 for (i = op2->key_values; i; i = i->next) 646 attachable::instantiate ();
643 { 647}
644 key_value *new_link = new key_value;
645 648
646 new_link->next = 0; 649object *
647 new_link->key = i->key; 650object::clone ()
648 new_link->value = i->value; 651{
652 object *neu = create ();
653 copy_to (neu);
649 654
650 /* Try and be clever here, too. */ 655 // TODO: unclean state changes, should not be done in clone AND instantiate
651 if (!op->key_values) 656 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
652 { 657 neu->speed_left = - neu->speed - rndm (); // TODO animation
653 op->key_values = new_link;
654 tail = new_link;
655 }
656 else
657 {
658 tail->next = new_link;
659 tail = new_link;
660 }
661 }
662 }
663 658
664 update_ob_speed (op); 659 neu->map = map; // not copied by copy_to
660 return neu;
665} 661}
666 662
667/* 663/*
668 * If an object with the IS_TURNABLE() flag needs to be turned due 664 * If an object with the IS_TURNABLE() flag needs to be turned due
669 * to the closest player being on the other side, this function can 665 * to the closest player being on the other side, this function can
670 * be called to update the face variable, _and_ how it looks on the map. 666 * be called to update the face variable, _and_ how it looks on the map.
671 */ 667 */
672
673void 668void
674update_turn_face (object *op) 669update_turn_face (object *op)
675{ 670{
676 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 671 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
677 return; 672 return;
673
678 SET_ANIMATION (op, op->direction); 674 SET_ANIMATION (op, op->direction);
679 update_object (op, UP_OBJ_FACE); 675 update_object (op, UP_OBJ_FACE);
680} 676}
681 677
682/* 678/*
683 * Updates the speed of an object. If the speed changes from 0 to another 679 * Updates the speed of an object. If the speed changes from 0 to another
684 * value, or vice versa, then add/remove the object from the active list. 680 * value, or vice versa, then add/remove the object from the active list.
685 * This function needs to be called whenever the speed of an object changes. 681 * This function needs to be called whenever the speed of an object changes.
686 */ 682 */
687void 683void
688update_ob_speed (object *op) 684object::set_speed (float speed)
689{ 685{
690 extern int arch_init; 686 this->speed = speed;
691 687
692 /* No reason putting the archetypes objects on the speed list, 688 if (has_active_speed ())
693 * since they never really need to be updated. 689 activate ();
694 */
695
696 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
697 {
698 LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
699#ifdef MANY_CORES
700 abort ();
701#else
702 op->speed = 0;
703#endif
704 }
705
706 if (arch_init)
707 return;
708
709 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
710 {
711 /* If already on active list, don't do anything */
712 if (op->active_next || op->active_prev || op == active_objects)
713 return;
714
715 /* process_events() expects us to insert the object at the beginning
716 * of the list. */
717 op->active_next = active_objects;
718
719 if (op->active_next != NULL)
720 op->active_next->active_prev = op;
721
722 active_objects = op;
723 }
724 else 690 else
725 { 691 deactivate ();
726 /* If not on the active list, nothing needs to be done */
727 if (!op->active_next && !op->active_prev && op != active_objects)
728 return;
729
730 if (op->active_prev == NULL)
731 {
732 active_objects = op->active_next;
733
734 if (op->active_next != NULL)
735 op->active_next->active_prev = NULL;
736 }
737 else
738 {
739 op->active_prev->active_next = op->active_next;
740
741 if (op->active_next)
742 op->active_next->active_prev = op->active_prev;
743 }
744
745 op->active_next = NULL;
746 op->active_prev = NULL;
747 }
748} 692}
749 693
750/* This function removes object 'op' from the list of active
751 * objects.
752 * This should only be used for style maps or other such
753 * reference maps where you don't want an object that isn't
754 * in play chewing up cpu time getting processed.
755 * The reverse of this is to call update_ob_speed, which
756 * will do the right thing based on the speed of the object.
757 */
758void
759remove_from_active_list (object *op)
760{
761 /* If not on the active list, nothing needs to be done */
762 if (!op->active_next && !op->active_prev && op != active_objects)
763 return;
764
765 if (op->active_prev == NULL)
766 {
767 active_objects = op->active_next;
768 if (op->active_next != NULL)
769 op->active_next->active_prev = NULL;
770 }
771 else
772 {
773 op->active_prev->active_next = op->active_next;
774 if (op->active_next)
775 op->active_next->active_prev = op->active_prev;
776 }
777 op->active_next = NULL;
778 op->active_prev = NULL;
779}
780
781/* 694/*
782 * update_object() updates the array which represents the map. 695 * update_object() updates the the map.
783 * It takes into account invisible objects (and represent squares covered 696 * It takes into account invisible objects (and represent squares covered
784 * by invisible objects by whatever is below them (unless it's another 697 * by invisible objects by whatever is below them (unless it's another
785 * invisible object, etc...) 698 * invisible object, etc...)
786 * If the object being updated is beneath a player, the look-window 699 * If the object being updated is beneath a player, the look-window
787 * of that player is updated (this might be a suboptimal way of 700 * of that player is updated (this might be a suboptimal way of
788 * updating that window, though, since update_object() is called _often_) 701 * updating that window, though, since update_object() is called _often_)
789 * 702 *
790 * action is a hint of what the caller believes need to be done. 703 * action is a hint of what the caller believes need to be done.
791 * For example, if the only thing that has changed is the face (due to
792 * an animation), we don't need to call update_position until that actually
793 * comes into view of a player. OTOH, many other things, like addition/removal
794 * of walls or living creatures may need us to update the flags now.
795 * current action are: 704 * current action are:
796 * UP_OBJ_INSERT: op was inserted 705 * UP_OBJ_INSERT: op was inserted
797 * UP_OBJ_REMOVE: op was removed 706 * UP_OBJ_REMOVE: op was removed
798 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 707 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
799 * as that is easier than trying to look at what may have changed. 708 * as that is easier than trying to look at what may have changed.
800 * UP_OBJ_FACE: only the objects face has changed. 709 * UP_OBJ_FACE: only the objects face has changed.
801 */ 710 */
802
803void 711void
804update_object (object *op, int action) 712update_object (object *op, int action)
805{ 713{
806 int update_now = 0, flags; 714 if (!op)
807 MoveType move_on, move_off, move_block, move_slow;
808
809 if (op == NULL)
810 { 715 {
811 /* this should never happen */ 716 /* this should never happen */
812 LOG (llevDebug, "update_object() called for NULL object.\n"); 717 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
813 return; 718 return;
814 } 719 }
815 720
816 if (op->env != NULL) 721 if (!op->is_on_map ())
817 { 722 {
818 /* Animation is currently handled by client, so nothing 723 /* Animation is currently handled by client, so nothing
819 * to do in this case. 724 * to do in this case.
820 */ 725 */
821 return; 726 return;
822 } 727 }
823 728
824 /* If the map is saving, don't do anything as everything is
825 * going to get freed anyways.
826 */
827 if (!op->map || op->map->in_memory == MAP_SAVING)
828 return;
829
830 /* make sure the object is within map boundaries */ 729 /* make sure the object is within map boundaries */
831 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 730 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
832 { 731 {
833 LOG (llevError, "update_object() called for object out of map!\n"); 732 LOG (llevError, "update_object() called for object out of map!\n");
834#ifdef MANY_CORES 733#ifdef MANY_CORES
835 abort (); 734 abort ();
836#endif 735#endif
837 return; 736 return;
838 } 737 }
839 738
840 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 739 mapspace &m = op->ms ();
841 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
842 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
843 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
844 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
845 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
846 740
741 if (!(m.flags_ & P_UPTODATE))
742 /* nop */;
847 if (action == UP_OBJ_INSERT) 743 else if (action == UP_OBJ_INSERT)
848 { 744 {
745#if 0
746 // this is likely overkill, TODO: revisit (schmorp)
849 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 747 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
850 update_now = 1; 748 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
851 749 || (op->is_player () && !(m.flags_ & P_PLAYER))
852 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))
853 update_now = 1;
854
855 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))
856 update_now = 1;
857
858 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
859 update_now = 1;
860
861 if (op->type == SAFE_GROUND && !(flags & P_SAFE)) 750 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
862 update_now = 1; 751 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
863 752 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
864 if ((move_on | op->move_on) != move_on) 753 || (m.move_on | op->move_on ) != m.move_on
865 update_now = 1;
866
867 if ((move_off | op->move_off) != move_off) 754 || (m.move_off | op->move_off ) != m.move_off
868 update_now = 1; 755 || (m.move_slow | op->move_slow) != m.move_slow
869
870 /* This isn't perfect, but I don't expect a lot of objects to 756 /* This isn't perfect, but I don't expect a lot of objects to
871 * to have move_allow right now. 757 * have move_allow right now.
872 */ 758 */
873 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 759 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
874 update_now = 1; 760 m.invalidate ();
875 761#else
876 if ((move_slow | op->move_slow) != move_slow) 762 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
877 update_now = 1; 763 m.invalidate ();
764#endif
878 } 765 }
879 /* if the object is being removed, we can't make intelligent 766 /* if the object is being removed, we can't make intelligent
880 * decisions, because remove_ob can't really pass the object 767 * decisions, because remove_ob can't really pass the object
881 * that is being removed. 768 * that is being removed.
882 */ 769 */
883 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 770 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
884 update_now = 1; 771 m.invalidate ();
885 else if (action == UP_OBJ_FACE) 772 else if (action == UP_OBJ_FACE)
886 /* Nothing to do for that case */ ; 773 /* Nothing to do for that case */ ;
887 else 774 else
888 LOG (llevError, "update_object called with invalid action: %d\n", action); 775 LOG (llevError, "update_object called with invalid action: %d\n", action);
889 776
890 if (update_now)
891 {
892 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
893 update_position (op->map, op->x, op->y);
894 }
895
896 if (op->more != NULL) 777 if (op->more)
897 update_object (op->more, action); 778 update_object (op->more, action);
898} 779}
899 780
900static unordered_vector<object *> mortals;
901
902void object::free_mortals ()
903{
904 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
905 if ((*i)->refcnt)
906 ++i; // further delay freeing
907 else
908 {
909 delete *i;
910 mortals.erase (i);
911 }
912
913 static int lastmortals = 0;//D
914
915 if (mortals.size() != lastmortals)//D
916 {
917 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 }
920}
921
922object::object () 781object::object ()
923{ 782{
924 SET_FLAG (this, FLAG_REMOVED); 783 this->set_flag (FLAG_REMOVED);
925 784
926 expmul = 1.0; 785 //expmul = 1.0; declared const for the time being
927 face = blank_face; 786 face = blank_face;
787 material = MATERIAL_NULL;
928} 788}
929 789
930object::~object () 790object::~object ()
931{ 791{
932 free_key_values (this); 792 unlink ();
793
794 kv.clear ();
933} 795}
934 796
935void object::link () 797void object::link ()
936{ 798{
937 count = ++ob_count; 799 assert (!index);//D
938 uuid = gen_uuid (); 800 uuid = UUID::gen ();
939 801
940 prev = 0; 802 refcnt_inc ();
941 next = objects; 803 objects.insert (this);
942 804
943 if (objects) 805 ++create_count;
944 objects->prev = this;
945 806
946 objects = this;
947} 807}
948 808
949void object::unlink () 809void object::unlink ()
950{ 810{
951 //count = 0;//D 811 if (!index)
952 if (!prev && !next) return;//D
953
954 if (this == objects)
955 objects = next;
956
957 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next;
959 if (next) next->prev = prev;
960
961 prev = 0;
962 next = 0;
963}
964
965object *object::create ()
966{
967 object *op = new object;
968 op->link ();
969 return op;
970}
971
972/*
973 * free_object() frees everything allocated by an object, removes
974 * it from the list of used objects, and puts it on the list of
975 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for
977 * this function to succeed.
978 *
979 * If free_inventory is set, free inventory as well. Else drop items in
980 * inventory to the ground.
981 */
982void object::free (bool free_inventory)
983{
984 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 812 return;
986 813
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 814 ++destroy_count;
988 remove_friendly_object (this);
989 815
990 if (!QUERY_FLAG (this, FLAG_REMOVED)) 816 objects.erase (this);
991 remove_ob (this); 817 refcnt_dec ();
818}
992 819
993 SET_FLAG (this, FLAG_FREED); 820void
821object::activate ()
822{
823 /* If already on active list, don't do anything */
824 if (active)
825 return;
994 826
995 if (more) 827 if (has_active_speed ())
996 {
997 more->free (free_inventory);
998 more = 0;
999 } 828 {
829 if (flag [FLAG_FREED])
830 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
1000 831
832 actives.insert (this);
833 }
834}
835
836void
837object::activate_recursive ()
838{
839 activate ();
840
841 for (object *op = inv; op; op = op->below)
842 op->activate_recursive ();
843}
844
845/* This function removes object 'op' from the list of active
846 * objects.
847 * This should only be used for style maps or other such
848 * reference maps where you don't want an object that isn't
849 * in play chewing up cpu time getting processed.
850 * The reverse of this is to call update_ob_speed, which
851 * will do the right thing based on the speed of the object.
852 */
853void
854object::deactivate ()
855{
856 /* If not on the active list, nothing needs to be done */
857 if (!active)
858 return;
859
860 actives.erase (this);
861}
862
863void
864object::deactivate_recursive ()
865{
866 for (object *op = inv; op; op = op->below)
867 op->deactivate_recursive ();
868
869 deactivate ();
870}
871
872void
873object::set_flag_inv (int flag, int value)
874{
875 for (object *op = inv; op; op = op->below)
876 {
877 op->flag [flag] = value;
878 op->set_flag_inv (flag, value);
879 }
880}
881
882/*
883 * Remove and free all objects in the inventory of the given object.
884 * object.c ?
885 */
886void
887object::destroy_inv (bool drop_to_ground)
888{
889 // need to check first, because the checks below might segfault
890 // as we might be on an invalid mapspace and crossfire code
891 // is too buggy to ensure that the inventory is empty.
892 // corollary: if you create arrows etc. with stuff in its inventory,
893 // cf will crash below with off-map x and y
1001 if (inv) 894 if (!inv)
1002 { 895 return;
896
1003 /* Only if the space blocks everything do we not process - 897 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 898 * if some form of movement is allowed, let objects
1005 * drop on that space. 899 * drop on that space.
1006 */ 900 */
1007 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 901 if (!drop_to_ground
902 || !map
903 || !map->linkable ()
904 || map->no_drop
905 || ms ().move_block == MOVE_ALL)
906 {
907 while (inv)
908 inv->destroy ();
909 }
910 else
911 { /* Put objects in inventory onto this space */
912 while (inv)
1008 { 913 {
1009 object *op = inv; 914 object *op = inv;
1010 915
1011 while (op) 916 if (op->flag [FLAG_STARTEQUIP]
1012 { 917 || op->flag [FLAG_NO_DROP]
1013 object *tmp = op->below; 918 || op->type == RUNE
1014 op->free (free_inventory); 919 || op->type == TRAP
1015 op = tmp; 920 || op->flag [FLAG_IS_A_TEMPLATE]
1016 } 921 || op->flag [FLAG_DESTROY_ON_DEATH])
922 op->destroy ();
923 else
924 map->insert (op, x, y);
1017 } 925 }
1018 else 926 }
1019 { /* Put objects in inventory onto this space */ 927}
1020 object *op = inv;
1021 928
1022 while (op) 929/*
1023 { 930 * Remove and free all objects in the inventory of the given object.
1024 object *tmp = op->below; 931 * Unlike destroy_inv, this assumes the *this is destroyed as well
1025 932 * well, so we can (and have to!) take shortcuts.
1026 remove_ob (op); 933 */
1027 934void
1028 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 935object::destroy_inv_fast ()
1029 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 936{
1030 free_object (op); 937 while (object *op = inv)
1031 else
1032 {
1033 op->x = x;
1034 op->y = y;
1035 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1036 }
1037
1038 op = tmp;
1039 }
1040 }
1041 } 938 {
939 // remove from object the fast way
940 op->flag [FLAG_REMOVED] = true;
941 op->env = 0;
942 if ((inv = inv->below))
943 inv->above = 0;
1042 944
1043 owner = 0; 945 // then destroy
946 op->destroy ();
947 }
948}
1044 949
1045 /* Remove object from the active list */ 950void
1046 speed = 0; 951object::freelist_free (int count)
1047 update_ob_speed (this); 952{
953 while (count-- && freelist)
954 {
955 freelist_item *next = freelist->next;
956 // count is being "destroyed"
1048 957
958 sfree ((char *)freelist, sizeof (object));
959
960 freelist = next;
961 --free_count;
962 }
963}
964
965object *
966object::create ()
967{
968 object *op;
969
970 if (freelist)
971 {
972 freelist_item li = *freelist;
973 memset (freelist, 0, sizeof (object));
974
975 op = new (freelist) object;
976 op->count = li.count;
977
978 freelist = li.next;
979 --free_count;
980 }
981 else
982 {
983 void *ni = salloc0<char> (sizeof (object));
984
985 op = new(ni) object;
986
987 op->count = ++object_count;
988 }
989
990 op->link ();
991
992 return op;
993}
994
995void
996object::do_delete ()
997{
998 uint32_t count = this->count;
999
1000 this->~object ();
1001
1002 freelist_item *li = (freelist_item *)this;
1003 li->next = freelist;
1004 li->count = count;
1005
1006 freelist = li;
1007 ++free_count;
1008}
1009
1010static struct freed_map : maptile
1011{
1012 freed_map ()
1013 : maptile (3, 3)
1014 {
1015 path = "<freed objects map>";
1016 name = "/internal/freed_objects_map";
1017 no_drop = 1;
1018 no_reset = 1;
1019
1020 in_memory = MAP_ACTIVE;
1021 }
1022
1023 ~freed_map ()
1024 {
1025 destroy ();
1026 }
1027} freed_map; // freed objects are moved here to avoid crashes
1028
1029void
1030object::do_destroy ()
1031{
1032 if (flag [FLAG_IS_LINKED])
1033 remove_link ();
1034
1035 if (flag [FLAG_FRIENDLY])
1036 remove_friendly_object (this);
1037
1038 remove ();
1039
1040 attachable::do_destroy ();
1041
1042 deactivate ();
1049 unlink (); 1043 unlink ();
1050 1044
1051 mortals.push_back (this); 1045 flag [FLAG_FREED] = 1;
1052}
1053 1046
1054/* 1047 // hack to ensure that freed objects still have a valid map
1055 * sub_weight() recursively (outwards) subtracts a number from the 1048 map = &freed_map;
1056 * weight of an object (and what is carried by it's environment(s)). 1049 x = 1;
1057 */ 1050 y = 1;
1058 1051
1059void 1052 if (more)
1060sub_weight (object *op, signed long weight)
1061{
1062 while (op != NULL)
1063 {
1064 if (op->type == CONTAINER)
1065 {
1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1067 }
1068 op->carrying -= weight;
1069 op = op->env;
1070 } 1053 {
1071} 1054 more->destroy ();
1055 more = 0;
1056 }
1072 1057
1073/* remove_ob(op): 1058 head = 0;
1059
1060 // clear those pointers that likely might cause circular references
1061 owner = 0;
1062 enemy = 0;
1063 attacked_by = 0;
1064 current_weapon = 0;
1065}
1066
1067void
1068object::destroy ()
1069{
1070 if (destroyed ())
1071 return;
1072
1073 if (!is_head () && !head->destroyed ())
1074 {
1075 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1076 head->destroy ();
1077 return;
1078 }
1079
1080 destroy_inv_fast ();
1081
1082 if (is_head ())
1083 if (sound_destroy)
1084 play_sound (sound_destroy);
1085 else if (flag [FLAG_MONSTER])
1086 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
1087
1088 attachable::destroy ();
1089}
1090
1091/* op->remove ():
1074 * This function removes the object op from the linked list of objects 1092 * This function removes the object op from the linked list of objects
1075 * which it is currently tied to. When this function is done, the 1093 * which it is currently tied to. When this function is done, the
1076 * object will have no environment. If the object previously had an 1094 * object will have no environment. If the object previously had an
1077 * environment, the x and y coordinates will be updated to 1095 * environment, the x and y coordinates will be updated to
1078 * the previous environment. 1096 * the previous environment.
1079 * Beware: This function is called from the editor as well!
1080 */ 1097 */
1081
1082void 1098void
1083remove_ob (object *op) 1099object::do_remove ()
1084{ 1100{
1085 object * 1101 if (flag [FLAG_REMOVED])
1086 tmp, *
1087 last = NULL;
1088 object *
1089 otmp;
1090
1091 tag_t
1092 tag;
1093 int
1094 check_walk_off;
1095 mapstruct *
1096 m;
1097
1098 sint16
1099 x,
1100 y;
1101
1102 if (QUERY_FLAG (op, FLAG_REMOVED))
1103 return; 1102 return;
1104 1103
1105 SET_FLAG (op, FLAG_REMOVED); 1104 INVOKE_OBJECT (REMOVE, this);
1106 1105
1107 if (op->more != NULL) 1106 flag [FLAG_REMOVED] = true;
1108 remove_ob (op->more); 1107
1108 if (more)
1109 more->remove ();
1109 1110
1110 /* 1111 /*
1111 * In this case, the object to be removed is in someones 1112 * In this case, the object to be removed is in someones
1112 * inventory. 1113 * inventory.
1113 */ 1114 */
1114 if (op->env != NULL) 1115 if (env)
1115 { 1116 {
1116 if (op->nrof) 1117 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1117 sub_weight (op->env, op->weight * op->nrof); 1118 if (object *pl = visible_to ())
1118 else 1119 esrv_del_item (pl->contr, count);
1119 sub_weight (op->env, op->weight + op->carrying); 1120 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1120 1121
1121 /* NO_FIX_PLAYER is set when a great many changes are being 1122 adjust_weight (env, total_weight (), 0);
1122 * made to players inventory. If set, avoiding the call
1123 * to save cpu time.
1124 */
1125 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1126 fix_player (otmp);
1127 1123
1128 if (op->above != NULL) 1124 object *pl = in_player ();
1129 op->above->below = op->below;
1130 else
1131 op->env->inv = op->below;
1132
1133 if (op->below != NULL)
1134 op->below->above = op->above;
1135 1125
1136 /* we set up values so that it could be inserted into 1126 /* we set up values so that it could be inserted into
1137 * the map, but we don't actually do that - it is up 1127 * the map, but we don't actually do that - it is up
1138 * to the caller to decide what we want to do. 1128 * to the caller to decide what we want to do.
1139 */ 1129 */
1140 op->x = op->env->x, op->y = op->env->y;
1141 op->map = op->env->map; 1130 map = env->map;
1142 op->above = NULL, op->below = NULL;
1143 op->env = NULL;
1144 }
1145 else if (op->map)
1146 {
1147 x = op->x; 1131 x = env->x;
1148 y = op->y; 1132 y = env->y;
1149 m = get_map_from_coord (op->map, &x, &y);
1150 1133
1151 if (!m) 1134 // make sure cmov optimisation is applicable
1135 *(above ? &above->below : &env->inv) = below;
1136 *(below ? &below->above : &above ) = above; // &above is just a dummy
1137
1138 above = 0;
1139 below = 0;
1140 env = 0;
1141
1142 if (pl && pl->is_player ())
1152 { 1143 {
1153 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1144 if (expect_false (pl->contr->combat_ob == this))
1154 op->map->path, op->x, op->y);
1155 /* in old days, we used to set x and y to 0 and continue.
1156 * it seems if we get into this case, something is probablye
1157 * screwed up and should be fixed.
1158 */ 1145 {
1159 abort (); 1146 pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1147 pl->contr->combat_ob = 0;
1148 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1149 }
1150
1151 if (expect_false (pl->contr->ranged_ob == this))
1152 {
1153 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1154 pl->contr->ranged_ob = 0;
1155 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1156 }
1157
1158 pl->contr->queue_stats_update ();
1159
1160 if (expect_false (glow_radius) && pl->is_on_map ())
1161 update_all_los (pl->map, pl->x, pl->y);
1160 } 1162 }
1163 }
1164 else if (map)
1165 {
1166 map->dirty = true;
1167 mapspace &ms = this->ms ();
1161 1168
1162 if (op->map != m) 1169 if (object *pl = ms.player ())
1163 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1164 op->map->path, m->path, op->x, op->y, x, y);
1165
1166 /* Re did the following section of code - it looks like it had
1167 * lots of logic for things we no longer care about
1168 */ 1170 {
1171 if (is_player ())
1172 {
1173 if (!flag [FLAG_WIZPASS])
1174 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1175
1176 // leaving a spot always closes any open container on the ground
1177 if (container && !container->env)
1178 // this causes spurious floorbox updates, but it ensures
1179 // that the CLOSE event is being sent.
1180 close_container ();
1181
1182 --map->players;
1183 map->touch ();
1184 }
1185 else if (pl->container_ () == this)
1186 {
1187 // removing a container should close it
1188 close_container ();
1189 }
1190 else
1191 esrv_del_item (pl->contr, count);
1192 }
1169 1193
1170 /* link the object above us */ 1194 /* link the object above us */
1171 if (op->above) 1195 // re-link, make sure compiler can easily use cmove
1172 op->above->below = op->below; 1196 *(above ? &above->below : &ms.top) = below;
1173 else 1197 *(below ? &below->above : &ms.bot) = above;
1174 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1175 1198
1176 /* Relink the object below us, if there is one */ 1199 above = 0;
1177 if (op->below) 1200 below = 0;
1178 op->below->above = op->above; 1201
1179 else 1202 ms.invalidate ();
1203
1204 int check_walk_off = !flag [FLAG_NO_APPLY];
1205
1206 if (object *pl = ms.player ())
1180 { 1207 {
1181 /* Nothing below, which means we need to relink map object for this space 1208 if (pl->container_ () == this)
1182 * use translated coordinates in case some oddness with map tiling is 1209 /* If a container that the player is currently using somehow gets
1183 * evident 1210 * removed (most likely destroyed), update the player view
1211 * appropriately.
1184 */ 1212 */
1185 if (GET_MAP_OB (m, x, y) != op) 1213 pl->close_container ();
1186 {
1187 dump_object (op);
1188 LOG (llevError,
1189 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
1190 dump_object (GET_MAP_OB (m, x, y));
1191 LOG (llevError, "%s\n", errmsg);
1192 }
1193 1214
1194 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1215 //TODO: the floorbox prev/next might need updating
1216 //esrv_del_item (pl->contr, count);
1217 //TODO: update floorbox to preserve ordering
1218 if (pl->contr->ns)
1219 pl->contr->ns->floorbox_update ();
1195 } 1220 }
1196 1221
1197 op->above = 0; 1222 if (check_walk_off)
1198 op->below = 0; 1223 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1199
1200 if (op->map->in_memory == MAP_SAVING)
1201 return;
1202
1203 tag = op->count;
1204 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1205
1206 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1207 { 1224 {
1225 above = tmp->above;
1226
1208 /* No point updating the players look faces if he is the object 1227 /* No point updating the players look faces if he is the object
1209 * being removed. 1228 * being removed.
1210 */
1211
1212 if (tmp->type == PLAYER && tmp != op)
1213 {
1214 /* If a container that the player is currently using somehow gets
1215 * removed (most likely destroyed), update the player view
1216 * appropriately.
1217 */ 1229 */
1218 if (tmp->container == op)
1219 {
1220 CLEAR_FLAG (op, FLAG_APPLIED);
1221 tmp->container = NULL;
1222 }
1223 1230
1224 tmp->contr->socket.update_look = 1; 1231 /* See if object moving off should effect something */
1232 if ((move_type & tmp->move_off)
1233 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1234 move_apply (tmp, this, 0);
1225 } 1235 }
1226 1236
1227 /* See if player moving off should effect something */ 1237 if (affects_los ())
1228 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1229 {
1230 move_apply (tmp, op, NULL);
1231
1232 if (was_destroyed (op, tag))
1233 {
1234 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1235 }
1236 }
1237
1238 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1239
1240 if (tmp->above == tmp)
1241 tmp->above = NULL;
1242
1243 last = tmp;
1244 }
1245
1246 /* last == NULL of there are no objects on this space */
1247 if (last == NULL)
1248 {
1249 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1250 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1251 * those out anyways, and if there are any flags set right now, they won't
1252 * be correct anyways.
1253 */
1254 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1255 update_position (op->map, op->x, op->y);
1256 }
1257 else
1258 update_object (last, UP_OBJ_REMOVE);
1259
1260 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1261 update_all_los (op->map, op->x, op->y); 1238 update_all_los (map, x, y);
1262 } 1239 }
1263} 1240}
1264 1241
1265/* 1242/*
1266 * merge_ob(op,top): 1243 * merge_ob(op,top):
1274merge_ob (object *op, object *top) 1251merge_ob (object *op, object *top)
1275{ 1252{
1276 if (!op->nrof) 1253 if (!op->nrof)
1277 return 0; 1254 return 0;
1278 1255
1279 if (top == NULL) 1256 if (!top)
1280 for (top = op; top != NULL && top->above != NULL; top = top->above); 1257 for (top = op; top && top->above; top = top->above)
1258 ;
1281 1259
1282 for (; top != NULL; top = top->below) 1260 for (; top; top = top->below)
1283 { 1261 if (object::can_merge (op, top))
1284 if (top == op)
1285 continue;
1286 if (CAN_MERGE (op, top))
1287 { 1262 {
1288 top->nrof += op->nrof; 1263 top->nrof += op->nrof;
1289 1264
1290/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1265 if (object *pl = top->visible_to ())
1291 op->weight = 0; /* Don't want any adjustements now */ 1266 esrv_update_item (UPD_NROF, pl, top);
1292 remove_ob (op); 1267
1293 free_object (op); 1268 op->weight = 0; // cancel the addition above
1269 op->carrying = 0; // must be 0 already
1270
1271 op->destroy ();
1272
1294 return top; 1273 return top;
1295 } 1274 }
1296 }
1297 1275
1298 return NULL; 1276 return 0;
1299} 1277}
1300 1278
1279void
1280object::expand_tail ()
1281{
1282 if (more)
1283 return;
1284
1285 object *prev = this;
1286
1287 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1288 {
1289 object *op = at->instance ();
1290
1291 op->name = name;
1292 op->name_pl = name_pl;
1293 op->title = title;
1294
1295 op->head = this;
1296 prev->more = op;
1297
1298 prev = op;
1299 }
1300}
1301
1301/* 1302/*
1302 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1303 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1303 * job preparing multi-part monsters 1304 * job preparing multi-part monsters.
1304 */ 1305 */
1305object * 1306object *
1306insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1307insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1307{ 1308{
1308 object *tmp; 1309 op->remove ();
1309 1310
1310 if (op->head)
1311 op = op->head;
1312
1313 for (tmp = op; tmp; tmp = tmp->more) 1311 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1314 { 1312 {
1315 tmp->x = x + tmp->arch->clone.x; 1313 tmp->x = x + tmp->arch->x;
1316 tmp->y = y + tmp->arch->clone.y; 1314 tmp->y = y + tmp->arch->y;
1317 } 1315 }
1318 1316
1319 return insert_ob_in_map (op, m, originator, flag); 1317 return insert_ob_in_map (op, m, originator, flag);
1320} 1318}
1321 1319
1334 * Passing 0 for flag gives proper default values, so flag really only needs 1332 * Passing 0 for flag gives proper default values, so flag really only needs
1335 * to be set if special handling is needed. 1333 * to be set if special handling is needed.
1336 * 1334 *
1337 * Return value: 1335 * Return value:
1338 * new object if 'op' was merged with other object 1336 * new object if 'op' was merged with other object
1339 * NULL if 'op' was destroyed 1337 * NULL if there was an error (destroyed, blocked etc.)
1340 * just 'op' otherwise 1338 * just 'op' otherwise
1341 */ 1339 */
1342
1343object * 1340object *
1344insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1341insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1345{ 1342{
1346 object *tmp, *top, *floor = NULL; 1343 op->remove ();
1347 sint16 x, y;
1348 1344
1349 if (QUERY_FLAG (op, FLAG_FREED)) 1345 if (m == &freed_map)//D TODO: remove soon
1350 { 1346 {//D
1351 LOG (llevError, "Trying to insert freed object!\n"); 1347 LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1352 return NULL;
1353 } 1348 }//D
1354
1355 if (m == NULL)
1356 {
1357 dump_object (op);
1358 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1359 return op;
1360 }
1361
1362 if (out_of_map (m, op->x, op->y))
1363 {
1364 dump_object (op);
1365 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1366#ifdef MANY_CORES
1367 /* Better to catch this here, as otherwise the next use of this object
1368 * is likely to cause a crash. Better to find out where it is getting
1369 * improperly inserted.
1370 */
1371 abort ();
1372#endif
1373 return op;
1374 }
1375
1376 if (!QUERY_FLAG (op, FLAG_REMOVED))
1377 {
1378 dump_object (op);
1379 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1380 return op;
1381 }
1382
1383 if (op->more != NULL)
1384 {
1385 /* The part may be on a different map. */
1386
1387 object *more = op->more;
1388
1389 /* We really need the caller to normalize coordinates - if
1390 * we set the map, that doesn't work if the location is within
1391 * a map and this is straddling an edge. So only if coordinate
1392 * is clear wrong do we normalize it.
1393 */
1394 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1395 more->map = get_map_from_coord (m, &more->x, &more->y);
1396 else if (!more->map)
1397 {
1398 /* For backwards compatibility - when not dealing with tiled maps,
1399 * more->map should always point to the parent.
1400 */
1401 more->map = m;
1402 }
1403
1404 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1405 {
1406 if (!op->head)
1407 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1408
1409 return NULL;
1410 }
1411 }
1412
1413 CLEAR_FLAG (op, FLAG_REMOVED);
1414 1349
1415 /* Ideally, the caller figures this out. However, it complicates a lot 1350 /* Ideally, the caller figures this out. However, it complicates a lot
1416 * of areas of callers (eg, anything that uses find_free_spot would now 1351 * of areas of callers (eg, anything that uses find_free_spot would now
1417 * need extra work 1352 * need extra work
1418 */ 1353 */
1419 op->map = get_map_from_coord (m, &op->x, &op->y); 1354 maptile *newmap = m;
1420 x = op->x; 1355 if (!xy_normalise (newmap, op->x, op->y))
1421 y = op->y; 1356 {
1357 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1358 return 0;
1359 }
1360
1361 if (object *more = op->more)
1362 if (!insert_ob_in_map (more, m, originator, flag))
1363 return 0;
1364
1365 op->flag [FLAG_REMOVED] = false;
1366 op->env = 0;
1367 op->map = newmap;
1368
1369 mapspace &ms = op->ms ();
1422 1370
1423 /* this has to be done after we translate the coordinates. 1371 /* this has to be done after we translate the coordinates.
1424 */ 1372 */
1425 if (op->nrof && !(flag & INS_NO_MERGE)) 1373 if (op->nrof && !(flag & INS_NO_MERGE))
1426 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1374 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1427 if (CAN_MERGE (op, tmp)) 1375 if (object::can_merge (op, tmp))
1428 { 1376 {
1377 // TODO: we actually want to update tmp, not op,
1378 // but some caller surely breaks when we return tmp
1379 // from here :/
1429 op->nrof += tmp->nrof; 1380 op->nrof += tmp->nrof;
1430 remove_ob (tmp); 1381 tmp->destroy ();
1431 free_object (tmp);
1432 } 1382 }
1433 1383
1434 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1384 op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1435 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1385 op->clr_flag (FLAG_INV_LOCKED);
1436 1386
1437 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1387 if (!op->flag [FLAG_ALIVE])
1438 CLEAR_FLAG (op, FLAG_NO_STEAL); 1388 op->clr_flag (FLAG_NO_STEAL);
1439 1389
1440 if (flag & INS_BELOW_ORIGINATOR) 1390 if (flag & INS_BELOW_ORIGINATOR)
1441 { 1391 {
1442 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1392 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1443 { 1393 {
1444 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1394 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1445 abort (); 1395 abort ();
1446 } 1396 }
1447 1397
1398 if (!originator->is_on_map ())
1399 {
1400 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1401 op->debug_desc (), originator->debug_desc ());
1402 abort ();
1403 }
1404
1448 op->above = originator; 1405 op->above = originator;
1449 op->below = originator->below; 1406 op->below = originator->below;
1450
1451 if (op->below)
1452 op->below->above = op;
1453 else
1454 SET_MAP_OB (op->map, op->x, op->y, op);
1455
1456 /* since *below* originator, no need to update top */
1457 originator->below = op; 1407 originator->below = op;
1408
1409 *(op->below ? &op->below->above : &ms.bot) = op;
1458 } 1410 }
1459 else 1411 else
1460 { 1412 {
1413 object *floor = 0;
1414 object *top = ms.top;
1415
1461 /* If there are other objects, then */ 1416 /* If there are other objects, then */
1462 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1417 if (top)
1463 { 1418 {
1464 object *last = NULL;
1465
1466 /* 1419 /*
1467 * If there are multiple objects on this space, we do some trickier handling. 1420 * If there are multiple objects on this space, we do some trickier handling.
1468 * We've already dealt with merging if appropriate. 1421 * We've already dealt with merging if appropriate.
1469 * Generally, we want to put the new object on top. But if 1422 * Generally, we want to put the new object on top. But if
1470 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1423 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1473 * once we get to them. This reduces the need to traverse over all of 1426 * once we get to them. This reduces the need to traverse over all of
1474 * them when adding another one - this saves quite a bit of cpu time 1427 * them when adding another one - this saves quite a bit of cpu time
1475 * when lots of spells are cast in one area. Currently, it is presumed 1428 * when lots of spells are cast in one area. Currently, it is presumed
1476 * that flying non pickable objects are spell objects. 1429 * that flying non pickable objects are spell objects.
1477 */ 1430 */
1478 1431 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1479 while (top != NULL)
1480 { 1432 {
1481 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1433 if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1482 floor = top; 1434 floor = tmp;
1483 1435
1484 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1436 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1485 { 1437 {
1486 /* We insert above top, so we want this object below this */ 1438 /* We insert above top, so we want this object below this */
1487 top = top->below; 1439 top = tmp->below;
1488 break; 1440 break;
1489 } 1441 }
1490 1442
1491 last = top;
1492 top = top->above; 1443 top = tmp;
1493 } 1444 }
1494
1495 /* Don't want top to be NULL, so set it to the last valid object */
1496 top = last;
1497 1445
1498 /* We let update_position deal with figuring out what the space 1446 /* We let update_position deal with figuring out what the space
1499 * looks like instead of lots of conditions here. 1447 * looks like instead of lots of conditions here.
1500 * makes things faster, and effectively the same result. 1448 * makes things faster, and effectively the same result.
1501 */ 1449 */
1502 1450
1503 /* Have object 'fall below' other objects that block view. 1451 /* Have object 'fall below' other objects that block view.
1504 * Unless those objects are exits, type 66 1452 * Unless those objects are exits.
1505 * If INS_ON_TOP is used, don't do this processing 1453 * If INS_ON_TOP is used, don't do this processing
1506 * Need to find the object that in fact blocks view, otherwise 1454 * Need to find the object that in fact blocks view, otherwise
1507 * stacking is a bit odd. 1455 * stacking is a bit odd.
1508 */ 1456 */
1509 if (!(flag & INS_ON_TOP) && 1457 if (!(flag & INS_ON_TOP)
1510 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1458 && ms.flags () & P_BLOCKSVIEW
1459 && (op->face && !faces [op->face].visibility))
1511 { 1460 {
1461 object *last;
1462
1512 for (last = top; last != floor; last = last->below) 1463 for (last = top; last != floor; last = last->below)
1513 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1464 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1514 break; 1465 break;
1466
1515 /* Check to see if we found the object that blocks view, 1467 /* Check to see if we found the object that blocks view,
1516 * and make sure we have a below pointer for it so that 1468 * and make sure we have a below pointer for it so that
1517 * we can get inserted below this one, which requires we 1469 * we can get inserted below this one, which requires we
1518 * set top to the object below us. 1470 * set top to the object below us.
1519 */ 1471 */
1520 if (last && last->below && last != floor) 1472 if (last && last->below && last != floor)
1521 top = last->below; 1473 top = last->below;
1522 } 1474 }
1523 } /* If objects on this space */ 1475 } /* If objects on this space */
1524 1476
1525 if (flag & INS_MAP_LOAD)
1526 top = GET_MAP_TOP (op->map, op->x, op->y);
1527
1528 if (flag & INS_ABOVE_FLOOR_ONLY) 1477 if (flag & INS_ABOVE_FLOOR_ONLY)
1529 top = floor; 1478 top = floor;
1530 1479
1531 /* Top is the object that our object (op) is going to get inserted above. 1480 // insert object above top, or bottom-most if top = 0
1532 */
1533
1534 /* First object on this space */
1535 if (!top) 1481 if (!top)
1536 { 1482 {
1537 op->above = GET_MAP_OB (op->map, op->x, op->y);
1538
1539 if (op->above)
1540 op->above->below = op;
1541
1542 op->below = NULL; 1483 op->below = 0;
1543 SET_MAP_OB (op->map, op->x, op->y, op); 1484 op->above = ms.bot;
1485 ms.bot = op;
1486
1487 *(op->above ? &op->above->below : &ms.top) = op;
1544 } 1488 }
1545 else 1489 else
1546 { /* get inserted into the stack above top */ 1490 {
1547 op->above = top->above; 1491 op->above = top->above;
1548
1549 if (op->above)
1550 op->above->below = op; 1492 top->above = op;
1551 1493
1552 op->below = top; 1494 op->below = top;
1553 top->above = op; 1495 *(op->above ? &op->above->below : &ms.top) = op;
1554 } 1496 }
1497 }
1555 1498
1556 if (op->above == NULL) 1499 if (op->is_player ())
1557 SET_MAP_TOP (op->map, op->x, op->y, op); 1500 {
1558 } /* else not INS_BELOW_ORIGINATOR */
1559
1560 if (op->type == PLAYER)
1561 op->contr->do_los = 1; 1501 op->contr->do_los = 1;
1502 ++op->map->players;
1503 op->map->touch ();
1504 }
1562 1505
1563 /* If we have a floor, we know the player, if any, will be above 1506 op->map->dirty = true;
1564 * it, so save a few ticks and start from there. 1507
1565 */ 1508 if (object *pl = ms.player ())
1566 if (!(flag & INS_MAP_LOAD)) 1509 //TODO: the floorbox prev/next might need updating
1567 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1510 //esrv_send_item (pl, op);
1568 if (tmp->type == PLAYER) 1511 //TODO: update floorbox to preserve ordering
1569 tmp->contr->socket.update_look = 1; 1512 if (pl->contr->ns)
1513 pl->contr->ns->floorbox_update ();
1570 1514
1571 /* If this object glows, it may affect lighting conditions that are 1515 /* If this object glows, it may affect lighting conditions that are
1572 * visible to others on this map. But update_all_los is really 1516 * visible to others on this map. But update_all_los is really
1573 * an inefficient way to do this, as it means los for all players 1517 * an inefficient way to do this, as it means los for all players
1574 * on the map will get recalculated. The players could very well 1518 * on the map will get recalculated. The players could very well
1575 * be far away from this change and not affected in any way - 1519 * be far away from this change and not affected in any way -
1576 * this should get redone to only look for players within range, 1520 * this should get redone to only look for players within range,
1577 * or just updating the P_NEED_UPDATE for spaces within this area 1521 * or just updating the P_UPTODATE for spaces within this area
1578 * of effect may be sufficient. 1522 * of effect may be sufficient.
1579 */ 1523 */
1580 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1524 if (op->affects_los ())
1525 {
1526 op->ms ().invalidate ();
1581 update_all_los (op->map, op->x, op->y); 1527 update_all_los (op->map, op->x, op->y);
1528 }
1582 1529
1583 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1530 /* updates flags (blocked, alive, no magic, etc) for this map space */
1584 update_object (op, UP_OBJ_INSERT); 1531 update_object (op, UP_OBJ_INSERT);
1585 1532
1533 INVOKE_OBJECT (INSERT, op);
1534
1586 /* Don't know if moving this to the end will break anything. However, 1535 /* Don't know if moving this to the end will break anything. However,
1587 * we want to have update_look set above before calling this. 1536 * we want to have floorbox_update called before calling this.
1588 * 1537 *
1589 * check_move_on() must be after this because code called from 1538 * check_move_on() must be after this because code called from
1590 * check_move_on() depends on correct map flags (so functions like 1539 * check_move_on() depends on correct map flags (so functions like
1591 * blocked() and wall() work properly), and these flags are updated by 1540 * blocked() and wall() work properly), and these flags are updated by
1592 * update_object(). 1541 * update_object().
1593 */ 1542 */
1594 1543
1595 /* if this is not the head or flag has been passed, don't check walk on status */ 1544 /* if this is not the head or flag has been passed, don't check walk on status */
1596 if (!(flag & INS_NO_WALK_ON) && !op->head) 1545 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1597 { 1546 {
1598 if (check_move_on (op, originator)) 1547 if (check_move_on (op, originator, flag))
1599 return NULL; 1548 return 0;
1600 1549
1601 /* If we are a multi part object, lets work our way through the check 1550 /* If we are a multi part object, let's work our way through the check
1602 * walk on's. 1551 * walk on's.
1603 */ 1552 */
1604 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1553 for (object *tmp = op->more; tmp; tmp = tmp->more)
1605 if (check_move_on (tmp, originator)) 1554 if (check_move_on (tmp, originator, flag))
1606 return NULL; 1555 return 0;
1607 } 1556 }
1608 1557
1609 return op; 1558 return op;
1610} 1559}
1611 1560
1612/* this function inserts an object in the map, but if it 1561/* this function inserts an object in the map, but if it
1613 * finds an object of its own type, it'll remove that one first. 1562 * finds an object of its own type, it'll remove that one first.
1614 * op is the object to insert it under: supplies x and the map. 1563 * op is the object to insert it under: supplies x and the map.
1615 */ 1564 */
1616void 1565void
1617replace_insert_ob_in_map (const char *arch_string, object *op) 1566replace_insert_ob_in_map (shstr_tmp archname, object *op)
1618{ 1567{
1619 object *
1620 tmp;
1621 object *
1622 tmp1;
1623
1624 /* first search for itself and remove any old instances */ 1568 /* first search for itself and remove any old instances */
1625 1569
1626 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1570 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1627 {
1628 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1571 if (tmp->arch->archname == archname) /* same archetype */
1629 { 1572 tmp->destroy ();
1630 remove_ob (tmp);
1631 free_object (tmp);
1632 }
1633 }
1634 1573
1635 tmp1 = arch_to_object (find_archetype (arch_string)); 1574 object *tmp = archetype::find (archname)->instance ();
1636 1575
1637 tmp1->x = op->x; 1576 tmp->x = op->x;
1638 tmp1->y = op->y; 1577 tmp->y = op->y;
1578
1639 insert_ob_in_map (tmp1, op->map, op, 0); 1579 insert_ob_in_map (tmp, op->map, op, 0);
1640} 1580}
1641
1642/*
1643 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1644 * is returned contains nr objects, and the remaining parts contains
1645 * the rest (or is removed and freed if that number is 0).
1646 * On failure, NULL is returned, and the reason put into the
1647 * global static errmsg array.
1648 */
1649 1581
1650object * 1582object *
1651get_split_ob (object *orig_ob, uint32 nr) 1583object::insert_at (object *where, object *originator, int flags)
1652{ 1584{
1653 object * 1585 if (where->env)
1654 newob; 1586 return where->env->insert (this);
1655 int 1587 else
1656 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1588 return where->map->insert (this, where->x, where->y, originator, flags);
1657
1658 if (orig_ob->nrof < nr)
1659 {
1660 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1661 return NULL;
1662 }
1663
1664 newob = object_create_clone (orig_ob);
1665
1666 if ((orig_ob->nrof -= nr) < 1)
1667 {
1668 if (!is_removed)
1669 remove_ob (orig_ob);
1670 free_object2 (orig_ob, 1);
1671 }
1672 else if (!is_removed)
1673 {
1674 if (orig_ob->env != NULL)
1675 sub_weight (orig_ob->env, orig_ob->weight * nr);
1676 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1677 {
1678 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1679 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1680 return NULL;
1681 }
1682 }
1683
1684 newob->nrof = nr;
1685
1686 return newob;
1687} 1589}
1688 1590
1591// check whether we can put this into the map, respect max_volume, max_items
1592bool
1593object::can_drop_at (maptile *m, int x, int y, object *originator)
1594{
1595 mapspace &ms = m->at (x, y);
1596
1597 int items = ms.items ();
1598
1599 if (!items // testing !items ensures we can drop at least one item
1600 || (items < m->max_items
1601 && ms.volume () < m->max_volume))
1602 return true;
1603
1604 if (originator && originator->is_player ())
1605 originator->contr->failmsgf (
1606 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1607 query_name ()
1608 );
1609
1610 return false;
1611}
1612
1689/* 1613/*
1690 * decrease_ob_nr(object, number) decreases a specified number from 1614 * decrease(object, number) decreases a specified number from
1691 * the amount of an object. If the amount reaches 0, the object 1615 * the amount of an object. If the amount reaches 0, the object
1692 * is subsequently removed and freed. 1616 * is subsequently removed and freed.
1693 * 1617 *
1694 * Return value: 'op' if something is left, NULL if the amount reached 0 1618 * Return value: 'op' if something is left, NULL if the amount reached 0
1695 */ 1619 */
1620bool
1621object::decrease (sint32 nr)
1622{
1623 if (!nr)
1624 return true;
1696 1625
1626 nr = min (nr, nrof);
1627
1628 if (nrof > nr)
1629 {
1630 sint64 oweight = total_weight ();
1631
1632 nrof -= nr;
1633
1634 if (object *pl = visible_to ())
1635 esrv_update_item (UPD_NROF, pl, this);
1636
1637 adjust_weight (env, oweight, total_weight ());
1638
1639 return true;
1640 }
1641 else
1642 {
1643 destroy ();
1644 return false;
1645 }
1646}
1647
1648/*
1649 * split(ob,nr) splits up ob into two parts. The part which
1650 * is returned contains nr objects, and the remaining parts contains
1651 * the rest (or is removed and returned if that number is 0).
1652 * On failure, NULL is returned.
1653 */
1697object * 1654object *
1698decrease_ob_nr (object *op, uint32 i) 1655object::split (sint32 nr)
1699{ 1656{
1700 object *tmp; 1657 int have = number_of ();
1701 player *pl;
1702 1658
1703 if (i == 0) /* objects with op->nrof require this check */ 1659 if (have < nr)
1704 return op; 1660 return 0;
1705 1661 else if (have == nr)
1706 if (i > op->nrof)
1707 i = op->nrof;
1708
1709 if (QUERY_FLAG (op, FLAG_REMOVED))
1710 op->nrof -= i;
1711 else if (op->env != NULL)
1712 { 1662 {
1713 /* is this object in the players inventory, or sub container
1714 * therein?
1715 */
1716 tmp = is_player_inv (op->env);
1717 /* nope. Is this a container the player has opened?
1718 * If so, set tmp to that player.
1719 * IMO, searching through all the players will mostly
1720 * likely be quicker than following op->env to the map,
1721 * and then searching the map for a player.
1722 */
1723 if (!tmp)
1724 {
1725 for (pl = first_player; pl; pl = pl->next)
1726 if (pl->ob->container == op->env)
1727 break;
1728 if (pl)
1729 tmp = pl->ob;
1730 else
1731 tmp = NULL;
1732 }
1733
1734 if (i < op->nrof)
1735 {
1736 sub_weight (op->env, op->weight * i);
1737 op->nrof -= i;
1738 if (tmp)
1739 {
1740 esrv_send_item (tmp, op);
1741 }
1742 }
1743 else
1744 {
1745 remove_ob (op); 1663 remove ();
1746 op->nrof = 0; 1664 return this;
1747 if (tmp)
1748 {
1749 esrv_del_item (tmp->contr, op->count);
1750 }
1751 }
1752 } 1665 }
1753 else 1666 else
1754 { 1667 {
1755 object *above = op->above; 1668 decrease (nr);
1756 1669
1757 if (i < op->nrof) 1670 object *op = deep_clone ();
1758 op->nrof -= i; 1671 op->nrof = nr;
1759 else
1760 {
1761 remove_ob (op);
1762 op->nrof = 0;
1763 }
1764
1765 /* Since we just removed op, op->above is null */
1766 for (tmp = above; tmp != NULL; tmp = tmp->above)
1767 if (tmp->type == PLAYER)
1768 {
1769 if (op->nrof)
1770 esrv_send_item (tmp, op);
1771 else
1772 esrv_del_item (tmp->contr, op->count);
1773 }
1774 }
1775
1776 if (op->nrof)
1777 return op; 1672 return op;
1778 else
1779 { 1673 }
1780 free_object (op); 1674}
1675
1676object *
1677insert_ob_in_ob (object *op, object *where)
1678{
1679 if (!where)
1680 {
1681 char *dump = dump_object (op);
1682 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1683 free (dump);
1781 return NULL; 1684 return op;
1782 }
1783}
1784
1785/*
1786 * add_weight(object, weight) adds the specified weight to an object,
1787 * and also updates how much the environment(s) is/are carrying.
1788 */
1789
1790void
1791add_weight (object *op, signed long weight)
1792{
1793 while (op != NULL)
1794 { 1685 }
1795 if (op->type == CONTAINER)
1796 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1797 1686
1798 op->carrying += weight; 1687 if (where->head_ () != where)
1799 op = op->env;
1800 } 1688 {
1801} 1689 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1690 where = where->head;
1691 }
1802 1692
1693 return where->insert (op);
1694}
1695
1803/* 1696/*
1804 * insert_ob_in_ob(op,environment): 1697 * env->insert (op)
1805 * This function inserts the object op in the linked list 1698 * This function inserts the object op in the linked list
1806 * inside the object environment. 1699 * inside the object environment.
1807 * 1700 *
1808 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1809 * the inventory at the last position or next to other objects of the same
1810 * type.
1811 * Frank: Now sorted by type, archetype and magic!
1812 *
1813 * The function returns now pointer to inserted item, and return value can 1701 * The function returns now pointer to inserted item, and return value can
1814 * be != op, if items are merged. -Tero 1702 * be != op, if items are merged. -Tero
1815 */ 1703 */
1816
1817object * 1704object *
1818insert_ob_in_ob (object *op, object *where) 1705object::insert (object *op)
1819{ 1706{
1820 object *
1821 tmp, *
1822 otmp;
1823
1824 if (!QUERY_FLAG (op, FLAG_REMOVED))
1825 {
1826 dump_object (op);
1827 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1828 return op;
1829 }
1830
1831 if (where == NULL)
1832 {
1833 dump_object (op);
1834 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1835 return op;
1836 }
1837
1838 if (where->head)
1839 {
1840 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1841 where = where->head;
1842 }
1843
1844 if (op->more) 1707 if (op->more)
1845 { 1708 {
1846 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1709 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1847 return op; 1710 return op;
1848 } 1711 }
1849 1712
1850 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1713 op->remove ();
1851 CLEAR_FLAG (op, FLAG_REMOVED); 1714
1715 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1716
1852 if (op->nrof) 1717 if (op->nrof)
1853 {
1854 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1718 for (object *tmp = inv; tmp; tmp = tmp->below)
1855 if (CAN_MERGE (tmp, op)) 1719 if (object::can_merge (tmp, op))
1856 { 1720 {
1857 /* return the original object and remove inserted object 1721 /* return the original object and remove inserted object
1858 (client needs the original object) */ 1722 (client prefers the original object) */
1723
1724 // carring must be 0 for mergable objects
1725 sint64 oweight = tmp->weight * tmp->nrof;
1726
1859 tmp->nrof += op->nrof; 1727 tmp->nrof += op->nrof;
1860 /* Weight handling gets pretty funky. Since we are adding to 1728
1861 * tmp->nrof, we need to increase the weight. 1729 if (object *pl = tmp->visible_to ())
1862 */ 1730 esrv_update_item (UPD_NROF, pl, tmp);
1731
1863 add_weight (where, op->weight * op->nrof); 1732 adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1864 SET_FLAG (op, FLAG_REMOVED); 1733
1865 free_object (op); /* free the inserted object */ 1734 op->destroy ();
1866 op = tmp; 1735 op = tmp;
1867 remove_ob (op); /* and fix old object's links */ 1736 goto inserted;
1868 CLEAR_FLAG (op, FLAG_REMOVED);
1869 break;
1870 } 1737 }
1871 1738
1872 /* I assume combined objects have no inventory 1739 op->owner = 0; // it's his/hers now. period.
1873 * We add the weight - this object could have just been removed
1874 * (if it was possible to merge). calling remove_ob will subtract
1875 * the weight, so we need to add it in again, since we actually do
1876 * the linking below
1877 */
1878 add_weight (where, op->weight * op->nrof);
1879 }
1880 else
1881 add_weight (where, (op->weight + op->carrying));
1882
1883 otmp = is_player_inv (where);
1884 if (otmp && otmp->contr != NULL)
1885 {
1886 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1887 fix_player (otmp);
1888 }
1889
1890 op->map = NULL; 1740 op->map = 0;
1891 op->env = where; 1741 op->x = 0;
1742 op->y = 0;
1743
1892 op->above = NULL; 1744 op->above = 0;
1893 op->below = NULL; 1745 op->below = inv;
1894 op->x = 0, op->y = 0; 1746 op->env = this;
1895 1747
1748 if (inv)
1749 inv->above = op;
1750
1751 inv = op;
1752
1753 op->flag [FLAG_REMOVED] = 0;
1754
1755 if (object *pl = op->visible_to ())
1756 esrv_send_item (pl, op);
1757
1758 adjust_weight (this, 0, op->total_weight ());
1759
1760inserted:
1896 /* reset the light list and los of the players on the map */ 1761 /* reset the light list and los of the players on the map */
1897 if ((op->glow_radius != 0) && where->map) 1762 if (op->glow_radius && is_on_map ())
1898 {
1899#ifdef DEBUG_LIGHTS
1900 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1901#endif /* DEBUG_LIGHTS */
1902 if (MAP_DARKNESS (where->map))
1903 update_all_los (where->map, where->x, where->y);
1904 } 1763 {
1905 1764 update_stats ();
1906 /* Client has no idea of ordering so lets not bother ordering it here. 1765 update_all_los (map, x, y);
1907 * It sure simplifies this function...
1908 */
1909 if (where->inv == NULL)
1910 where->inv = op;
1911 else
1912 { 1766 }
1913 op->below = where->inv; 1767 else if (is_player ())
1914 op->below->above = op; 1768 // if this is a player's inventory, update stats
1915 where->inv = op; 1769 contr->queue_stats_update ();
1916 } 1770
1771 INVOKE_OBJECT (INSERT, this);
1772
1917 return op; 1773 return op;
1918} 1774}
1919 1775
1920/* 1776/*
1921 * Checks if any objects has a move_type that matches objects 1777 * Checks if any objects has a move_type that matches objects
1935 * 1791 *
1936 * MSW 2001-07-08: Check all objects on space, not just those below 1792 * MSW 2001-07-08: Check all objects on space, not just those below
1937 * object being inserted. insert_ob_in_map may not put new objects 1793 * object being inserted. insert_ob_in_map may not put new objects
1938 * on top. 1794 * on top.
1939 */ 1795 */
1940
1941int 1796int
1942check_move_on (object *op, object *originator) 1797check_move_on (object *op, object *originator, int flags)
1943{ 1798{
1944 object * 1799 if (op->flag [FLAG_NO_APPLY])
1945 tmp;
1946 tag_t
1947 tag;
1948 mapstruct *
1949 m = op->map;
1950 int
1951 x = op->x, y = op->y;
1952
1953 MoveType
1954 move_on,
1955 move_slow,
1956 move_block;
1957
1958 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1959 return 0; 1800 return 0;
1960 1801
1961 tag = op->count; 1802 object *tmp;
1803 maptile *m = op->map;
1804 int x = op->x, y = op->y;
1962 1805
1963 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1806 mapspace &ms = m->at (x, y);
1964 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1807
1965 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1808 ms.update ();
1809
1810 MoveType move_on = ms.move_on;
1811 MoveType move_slow = ms.move_slow;
1812 MoveType move_block = ms.move_block;
1966 1813
1967 /* if nothing on this space will slow op down or be applied, 1814 /* if nothing on this space will slow op down or be applied,
1968 * no need to do checking below. have to make sure move_type 1815 * no need to do checking below. have to make sure move_type
1969 * is set, as lots of objects don't have it set - we treat that 1816 * is set, as lots of objects don't have it set - we treat that
1970 * as walking. 1817 * as walking.
1981 return 0; 1828 return 0;
1982 1829
1983 /* The objects have to be checked from top to bottom. 1830 /* The objects have to be checked from top to bottom.
1984 * Hence, we first go to the top: 1831 * Hence, we first go to the top:
1985 */ 1832 */
1986 1833 for (object *next, *tmp = ms.top; tmp; tmp = next)
1987 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)
1988 {
1989 /* Trim the search when we find the first other spell effect
1990 * this helps performance so that if a space has 50 spell objects,
1991 * we don't need to check all of them.
1992 */
1993 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1994 break;
1995 } 1834 {
1835 next = tmp->below;
1996 1836
1997 for (; tmp; tmp = tmp->below)
1998 {
1999 if (tmp == op) 1837 if (tmp == op)
2000 continue; /* Can't apply yourself */ 1838 continue; /* Can't apply yourself */
2001 1839
2002 /* Check to see if one of the movement types should be slowed down. 1840 /* Check to see if one of the movement types should be slowed down.
2003 * Second check makes sure that the movement types not being slowed 1841 * Second check makes sure that the movement types not being slowed
2004 * (~slow_move) is not blocked on this space - just because the 1842 * (~slow_move) is not blocked on this space - just because the
2005 * space doesn't slow down swimming (for example), if you can't actually 1843 * space doesn't slow down swimming (for example), if you can't actually
2006 * swim on that space, can't use it to avoid the penalty. 1844 * swim on that space, can't use it to avoid the penalty.
2007 */ 1845 */
2008 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1846 if (!op->flag [FLAG_WIZPASS])
2009 { 1847 {
2010 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1848 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2011 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1849 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2012 { 1850 {
2013
2014 float
2015 diff = tmp->move_slow_penalty * FABS (op->speed); 1851 float diff = tmp->move_slow_penalty * fabs (op->speed);
2016 1852
2017 if (op->type == PLAYER) 1853 if (op->is_player ())
2018 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1854 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
2019 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1855 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
2020 diff /= 4.0; 1856 diff /= 4.0;
2021 1857
2022 op->speed_left -= diff; 1858 op->speed_left -= diff;
2023 } 1859 }
2024 } 1860 }
2025 1861
2026 /* Basically same logic as above, except now for actual apply. */ 1862 /* Basically same logic as above, except now for actual apply. */
2027 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1863 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2028 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1864 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2029 { 1865 {
1866 if ((flags & INS_NO_AUTO_EXIT)
1867 && (tmp->type == EXIT || tmp->type == TELEPORTER
1868 || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
1869 continue;
1870
2030 move_apply (tmp, op, originator); 1871 move_apply (tmp, op, originator);
2031 1872
2032 if (was_destroyed (op, tag)) 1873 if (op->destroyed ())
2033 return 1; 1874 return 1;
2034 1875
2035 /* what the person/creature stepped onto has moved the object 1876 /* what the person/creature stepped onto has moved the object
2036 * someplace new. Don't process any further - if we did, 1877 * someplace new. Don't process any further - if we did,
2037 * have a feeling strange problems would result. 1878 * have a feeling strange problems would result.
2047/* 1888/*
2048 * present_arch(arch, map, x, y) searches for any objects with 1889 * present_arch(arch, map, x, y) searches for any objects with
2049 * a matching archetype at the given map and coordinates. 1890 * a matching archetype at the given map and coordinates.
2050 * The first matching object is returned, or NULL if none. 1891 * The first matching object is returned, or NULL if none.
2051 */ 1892 */
2052
2053object * 1893object *
2054present_arch (const archetype *at, mapstruct *m, int x, int y) 1894present_arch (const archetype *at, maptile *m, int x, int y)
2055{ 1895{
2056 object *
2057 tmp;
2058
2059 if (m == NULL || out_of_map (m, x, y)) 1896 if (!m || out_of_map (m, x, y))
2060 { 1897 {
2061 LOG (llevError, "Present_arch called outside map.\n"); 1898 LOG (llevError, "Present_arch called outside map.\n");
2062 return NULL; 1899 return NULL;
2063 } 1900 }
2064 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1901
2065 if (tmp->arch == at) 1902 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1903 if (tmp->arch->archname == at->archname)
2066 return tmp; 1904 return tmp;
1905
2067 return NULL; 1906 return NULL;
2068} 1907}
2069 1908
2070/* 1909/*
2071 * present(type, map, x, y) searches for any objects with 1910 * present(type, map, x, y) searches for any objects with
2072 * a matching type variable at the given map and coordinates. 1911 * a matching type variable at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1912 * The first matching object is returned, or NULL if none.
2074 */ 1913 */
2075
2076object * 1914object *
2077present (unsigned char type, mapstruct *m, int x, int y) 1915present (unsigned char type, maptile *m, int x, int y)
2078{ 1916{
2079 object *
2080 tmp;
2081
2082 if (out_of_map (m, x, y)) 1917 if (out_of_map (m, x, y))
2083 { 1918 {
2084 LOG (llevError, "Present called outside map.\n"); 1919 LOG (llevError, "Present called outside map.\n");
2085 return NULL; 1920 return NULL;
2086 } 1921 }
2087 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1922
1923 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2088 if (tmp->type == type) 1924 if (tmp->type == type)
2089 return tmp; 1925 return tmp;
1926
2090 return NULL; 1927 return NULL;
2091} 1928}
2092 1929
2093/* 1930/*
2094 * present_in_ob(type, object) searches for any objects with 1931 * present_in_ob(type, object) searches for any objects with
2095 * a matching type variable in the inventory of the given object. 1932 * a matching type variable in the inventory of the given object.
2096 * The first matching object is returned, or NULL if none. 1933 * The first matching object is returned, or NULL if none.
2097 */ 1934 */
2098
2099object * 1935object *
2100present_in_ob (unsigned char type, const object *op) 1936present_in_ob (unsigned char type, const object *op)
2101{ 1937{
2102 object *
2103 tmp;
2104
2105 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1938 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2106 if (tmp->type == type) 1939 if (tmp->type == type)
2107 return tmp; 1940 return tmp;
1941
2108 return NULL; 1942 return NULL;
2109} 1943}
2110 1944
2111/* 1945/*
2112 * present_in_ob (type, str, object) searches for any objects with 1946 * present_in_ob (type, str, object) searches for any objects with
2120 * str is the string to match against. Note that we match against 1954 * str is the string to match against. Note that we match against
2121 * the object name, not the archetype name. this is so that the 1955 * the object name, not the archetype name. this is so that the
2122 * spell code can use one object type (force), but change it's name 1956 * spell code can use one object type (force), but change it's name
2123 * to be unique. 1957 * to be unique.
2124 */ 1958 */
2125
2126object * 1959object *
2127present_in_ob_by_name (int type, const char *str, const object *op) 1960present_in_ob_by_name (int type, const char *str, const object *op)
2128{ 1961{
2129 object *
2130 tmp;
2131
2132 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1962 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2133 {
2134 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1963 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2135 return tmp; 1964 return tmp;
2136 } 1965
2137 return NULL; 1966 return 0;
2138} 1967}
2139 1968
2140/* 1969/*
2141 * present_arch_in_ob(archetype, object) searches for any objects with 1970 * present_arch_in_ob(archetype, object) searches for any objects with
2142 * a matching archetype in the inventory of the given object. 1971 * a matching archetype in the inventory of the given object.
2143 * The first matching object is returned, or NULL if none. 1972 * The first matching object is returned, or NULL if none.
2144 */ 1973 */
2145
2146object * 1974object *
2147present_arch_in_ob (const archetype *at, const object *op) 1975present_arch_in_ob (const archetype *at, const object *op)
2148{ 1976{
2149 object *
2150 tmp;
2151
2152 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2153 if (tmp->arch == at) 1978 if (tmp->arch->archname == at->archname)
2154 return tmp; 1979 return tmp;
1980
2155 return NULL; 1981 return NULL;
2156} 1982}
2157 1983
2158/* 1984/*
2159 * activate recursively a flag on an object inventory 1985 * activate recursively a flag on an object inventory
2160 */ 1986 */
2161void 1987void
2162flag_inv (object *op, int flag) 1988flag_inv (object *op, int flag)
2163{ 1989{
2164 object *
2165 tmp;
2166
2167 if (op->inv)
2168 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1990 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2169 { 1991 {
2170 SET_FLAG (tmp, flag); 1992 tmp->set_flag (flag);
2171 flag_inv (tmp, flag); 1993 flag_inv (tmp, flag);
2172 } 1994 }
2173} /* 1995}
1996
1997/*
2174 * desactivate recursively a flag on an object inventory 1998 * deactivate recursively a flag on an object inventory
2175 */ 1999 */
2176void 2000void
2177unflag_inv (object *op, int flag) 2001unflag_inv (object *op, int flag)
2178{ 2002{
2179 object *
2180 tmp;
2181
2182 if (op->inv)
2183 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2003 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2184 { 2004 {
2185 CLEAR_FLAG (tmp, flag); 2005 tmp->clr_flag (flag);
2186 unflag_inv (tmp, flag); 2006 unflag_inv (tmp, flag);
2187 } 2007 }
2188}
2189
2190/*
2191 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2192 * all it's inventory (recursively).
2193 * If checksums are used, a player will get set_cheat called for
2194 * him/her-self and all object carried by a call to this function.
2195 */
2196
2197void
2198set_cheat (object *op)
2199{
2200 SET_FLAG (op, FLAG_WAS_WIZ);
2201 flag_inv (op, FLAG_WAS_WIZ);
2202} 2008}
2203 2009
2204/* 2010/*
2205 * find_free_spot(object, map, x, y, start, stop) will search for 2011 * find_free_spot(object, map, x, y, start, stop) will search for
2206 * a spot at the given map and coordinates which will be able to contain 2012 * a spot at the given map and coordinates which will be able to contain
2208 * to search (see the freearr_x/y[] definition). 2014 * to search (see the freearr_x/y[] definition).
2209 * It returns a random choice among the alternatives found. 2015 * It returns a random choice among the alternatives found.
2210 * start and stop are where to start relative to the free_arr array (1,9 2016 * start and stop are where to start relative to the free_arr array (1,9
2211 * does all 4 immediate directions). This returns the index into the 2017 * does all 4 immediate directions). This returns the index into the
2212 * array of the free spot, -1 if no spot available (dir 0 = x,y) 2018 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2213 * Note - this only checks to see if there is space for the head of the
2214 * object - if it is a multispace object, this should be called for all
2215 * pieces.
2216 * Note2: This function does correctly handle tiled maps, but does not 2019 * Note: This function does correctly handle tiled maps, but does not
2217 * inform the caller. However, insert_ob_in_map will update as 2020 * inform the caller. However, insert_ob_in_map will update as
2218 * necessary, so the caller shouldn't need to do any special work. 2021 * necessary, so the caller shouldn't need to do any special work.
2219 * Note - updated to take an object instead of archetype - this is necessary 2022 * Note - updated to take an object instead of archetype - this is necessary
2220 * because arch_blocked (now ob_blocked) needs to know the movement type 2023 * because arch_blocked (now ob_blocked) needs to know the movement type
2221 * to know if the space in question will block the object. We can't use 2024 * to know if the space in question will block the object. We can't use
2222 * the archetype because that isn't correct if the monster has been 2025 * the archetype because that isn't correct if the monster has been
2223 * customized, changed states, etc. 2026 * customized, changed states, etc.
2224 */ 2027 */
2225
2226int 2028int
2227find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2029find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2228{ 2030{
2229 int
2230 i,
2231 index = 0, flag;
2232 static int
2233 altern[SIZEOFFREE]; 2031 int altern[SIZEOFFREE];
2032 int index = 0, flag;
2234 2033
2235 for (i = start; i < stop; i++) 2034 for (int i = start; i < stop; i++)
2236 { 2035 {
2237 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2036 mapxy pos (m, x, y); pos.move (i);
2238 if (!flag) 2037
2038 if (!pos.normalise ())
2039 continue;
2040
2041 mapspace &ms = *pos;
2042
2043 if (ms.flags () & P_IS_ALIVE)
2044 continue;
2045
2046 /* However, often
2047 * ob doesn't have any move type (when used to place exits)
2048 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2049 */
2050 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2051 {
2239 altern[index++] = i; 2052 altern [index++] = i;
2053 continue;
2054 }
2240 2055
2241 /* Basically, if we find a wall on a space, we cut down the search size. 2056 /* Basically, if we find a wall on a space, we cut down the search size.
2242 * In this way, we won't return spaces that are on another side of a wall. 2057 * In this way, we won't return spaces that are on another side of a wall.
2243 * This mostly work, but it cuts down the search size in all directions - 2058 * This mostly work, but it cuts down the search size in all directions -
2244 * if the space being examined only has a wall to the north and empty 2059 * if the space being examined only has a wall to the north and empty
2245 * spaces in all the other directions, this will reduce the search space 2060 * spaces in all the other directions, this will reduce the search space
2246 * to only the spaces immediately surrounding the target area, and 2061 * to only the spaces immediately surrounding the target area, and
2247 * won't look 2 spaces south of the target space. 2062 * won't look 2 spaces south of the target space.
2248 */ 2063 */
2249 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2064 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2065 {
2250 stop = maxfree[i]; 2066 stop = maxfree[i];
2067 continue;
2068 }
2069
2070 /* Note it is intentional that we check ob - the movement type of the
2071 * head of the object should correspond for the entire object.
2072 */
2073 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2074 continue;
2075
2076 if (ob->blocked (pos.m, pos.x, pos.y))
2077 continue;
2078
2079 altern [index++] = i;
2251 } 2080 }
2081
2252 if (!index) 2082 if (!index)
2253 return -1; 2083 return -1;
2084
2254 return altern[RANDOM () % index]; 2085 return altern [rndm (index)];
2255} 2086}
2256 2087
2257/* 2088/*
2258 * find_first_free_spot(archetype, mapstruct, x, y) works like 2089 * find_first_free_spot(archetype, maptile, x, y) works like
2259 * find_free_spot(), but it will search max number of squares. 2090 * find_free_spot(), but it will search max number of squares.
2260 * But it will return the first available spot, not a random choice. 2091 * But it will return the first available spot, not a random choice.
2261 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2092 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2262 */ 2093 */
2263
2264int 2094int
2265find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2095find_first_free_spot (const object *ob, maptile *m, int x, int y)
2266{ 2096{
2267 int
2268 i;
2269
2270 for (i = 0; i < SIZEOFFREE; i++) 2097 for (int i = 0; i < SIZEOFFREE; i++)
2271 {
2272 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2098 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2273 return i; 2099 return i;
2274 } 2100
2275 return -1; 2101 return -1;
2276} 2102}
2277 2103
2278/* 2104/*
2279 * The function permute(arr, begin, end) randomly reorders the array 2105 * The function permute(arr, begin, end) randomly reorders the array
2280 * arr[begin..end-1]. 2106 * arr[begin..end-1].
2107 * now uses a fisher-yates shuffle, old permute was broken
2281 */ 2108 */
2282static void 2109static void
2283permute (int *arr, int begin, int end) 2110permute (int *arr, int begin, int end)
2284{ 2111{
2285 int 2112 arr += begin;
2286 i,
2287 j,
2288 tmp,
2289 len;
2290
2291 len = end - begin; 2113 end -= begin;
2292 for (i = begin; i < end; i++)
2293 {
2294 j = begin + RANDOM () % len;
2295 2114
2296 tmp = arr[i]; 2115 while (--end)
2297 arr[i] = arr[j]; 2116 swap (arr [end], arr [rndm (end + 1)]);
2298 arr[j] = tmp;
2299 }
2300} 2117}
2301 2118
2302/* new function to make monster searching more efficient, and effective! 2119/* new function to make monster searching more efficient, and effective!
2303 * This basically returns a randomized array (in the passed pointer) of 2120 * This basically returns a randomized array (in the passed pointer) of
2304 * the spaces to find monsters. In this way, it won't always look for 2121 * the spaces to find monsters. In this way, it won't always look for
2307 * the 3x3 area will be searched, just not in a predictable order. 2124 * the 3x3 area will be searched, just not in a predictable order.
2308 */ 2125 */
2309void 2126void
2310get_search_arr (int *search_arr) 2127get_search_arr (int *search_arr)
2311{ 2128{
2312 int 2129 int i;
2313 i;
2314 2130
2315 for (i = 0; i < SIZEOFFREE; i++) 2131 for (i = 0; i < SIZEOFFREE; i++)
2316 {
2317 search_arr[i] = i; 2132 search_arr[i] = i;
2318 }
2319 2133
2320 permute (search_arr, 1, SIZEOFFREE1 + 1); 2134 permute (search_arr, 1, SIZEOFFREE1 + 1);
2321 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2135 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2322 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2136 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2323} 2137}
2332 * Perhaps incorrectly, but I'm making the assumption that exclude 2146 * Perhaps incorrectly, but I'm making the assumption that exclude
2333 * is actually want is going to try and move there. We need this info 2147 * is actually want is going to try and move there. We need this info
2334 * because we have to know what movement the thing looking to move 2148 * because we have to know what movement the thing looking to move
2335 * there is capable of. 2149 * there is capable of.
2336 */ 2150 */
2337
2338int 2151int
2339find_dir (mapstruct *m, int x, int y, object *exclude) 2152find_dir (maptile *m, int x, int y, object *exclude)
2340{ 2153{
2341 int
2342 i,
2343 max = SIZEOFFREE, mflags; 2154 int max = SIZEOFFREE, mflags;
2344
2345 sint16 nx, ny;
2346 object *
2347 tmp;
2348 mapstruct *
2349 mp;
2350
2351 MoveType blocked, move_type; 2155 MoveType move_type;
2352 2156
2353 if (exclude && exclude->head) 2157 if (exclude && exclude->head_ () != exclude)
2354 { 2158 {
2355 exclude = exclude->head; 2159 exclude = exclude->head;
2356 move_type = exclude->move_type; 2160 move_type = exclude->move_type;
2357 } 2161 }
2358 else 2162 else
2359 { 2163 {
2360 /* If we don't have anything, presume it can use all movement types. */ 2164 /* If we don't have anything, presume it can use all movement types. */
2361 move_type = MOVE_ALL; 2165 move_type = MOVE_ALL;
2362 } 2166 }
2363 2167
2364 for (i = 1; i < max; i++) 2168 for (int i = 1; i < max; i++)
2365 { 2169 {
2366 mp = m; 2170 mapxy pos (m, x, y);
2367 nx = x + freearr_x[i]; 2171 pos.move (i);
2368 ny = y + freearr_y[i];
2369 2172
2370 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2173 if (!pos.normalise ())
2371 if (mflags & P_OUT_OF_MAP)
2372 {
2373 max = maxfree[i]; 2174 max = maxfree[i];
2374 }
2375 else 2175 else
2376 { 2176 {
2377 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2177 mapspace &ms = *pos;
2378 2178
2379 if ((move_type & blocked) == move_type) 2179 if ((move_type & ms.move_block) == move_type)
2180 max = maxfree [i];
2181 else if (ms.flags () & P_IS_ALIVE)
2380 { 2182 {
2381 max = maxfree[i]; 2183 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2382 } 2184 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2383 else if (mflags & P_IS_ALIVE) 2185 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2384 {
2385 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)
2386 {
2387 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2388 {
2389 break;
2390 }
2391 }
2392 if (tmp)
2393 {
2394 return freedir[i]; 2186 return freedir [i];
2395 }
2396 } 2187 }
2397 } 2188 }
2398 } 2189 }
2190
2399 return 0; 2191 return 0;
2400} 2192}
2401 2193
2402/* 2194/*
2403 * distance(object 1, object 2) will return the square of the 2195 * distance(object 1, object 2) will return the square of the
2404 * distance between the two given objects. 2196 * distance between the two given objects.
2405 */ 2197 */
2406
2407int 2198int
2408distance (const object *ob1, const object *ob2) 2199distance (const object *ob1, const object *ob2)
2409{ 2200{
2410 int
2411 i;
2412
2413 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2201 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2414 return i;
2415} 2202}
2416 2203
2417/* 2204/*
2418 * find_dir_2(delta-x,delta-y) will return a direction in which 2205 * find_dir_2(delta-x,delta-y) will return a direction value
2419 * an object which has subtracted the x and y coordinates of another 2206 * for running into direct [dx, dy].
2420 * object, needs to travel toward it. 2207 * (the opposite of crossfire's find_dir_2!)
2421 */ 2208 */
2422
2423int 2209int
2424find_dir_2 (int x, int y) 2210find_dir_2 (int x, int y)
2425{ 2211{
2212#if 1 // new algorithm
2213 // this works by putting x, y into 16 sectors, which
2214 // are not equal sized, but are a better approximation
2215 // then the old algorithm, and then using a mapping
2216 // table to map it into a direction value.
2217 // basically, it maps these comparisons to each bit
2218 // bit #3: x < 0
2219 // bit #2: y < 0
2220 // bit #1: x > y
2221 // bit #0: x > 2y
2222
2223 static const uint8 dir[16] = {
2224 4, 5, 4, 3,
2225 2, 1, 2, 3,
2226 6, 5, 6, 7,
2227 8, 1, 8, 7,
2228 };
2229 int sector = 0;
2230
2231 // this is a bit ugly, but more likely to result in branchless code
2232 sector |= x < 0 ? 8 : 0;
2233 x = x < 0 ? -x : x; // abs
2234
2235 sector |= y < 0 ? 4 : 0;
2236 y = y < 0 ? -y : y; // abs
2237
2238 if (x > y)
2239 {
2240 sector |= 2;
2241
2242 if (x > y * 2)
2243 sector |= 1;
2244 }
2245 else
2246 {
2247 if (y > x * 2)
2248 sector |= 1;
2249 else if (!y)
2250 return 0; // x == 0 here
2251 }
2252
2253 return dir [sector];
2254#else // old algorithm
2426 int 2255 int q;
2427 q;
2428 2256
2429 if (y) 2257 if (y)
2430 q = x * 100 / y; 2258 q = 128 * x / y;
2431 else if (x) 2259 else if (x)
2432 q = -300 * x; 2260 q = -512 * x; // to make it > 309
2433 else 2261 else
2434 return 0; 2262 return 0;
2435 2263
2436 if (y > 0) 2264 if (y > 0)
2437 { 2265 {
2438 if (q < -242) 2266 if (q < -309) return 7;
2267 if (q < -52) return 6;
2268 if (q < 52) return 5;
2269 if (q < 309) return 4;
2270
2439 return 3; 2271 return 3;
2440 if (q < -41) 2272 }
2441 return 2; 2273 else
2442 if (q < 41) 2274 {
2443 return 1; 2275 if (q < -309) return 3;
2444 if (q < 242) 2276 if (q < -52) return 2;
2445 return 8; 2277 if (q < 52) return 1;
2278 if (q < 309) return 8;
2279
2446 return 7; 2280 return 7;
2447 } 2281 }
2448 2282#endif
2449 if (q < -242)
2450 return 7;
2451 if (q < -41)
2452 return 6;
2453 if (q < 41)
2454 return 5;
2455 if (q < 242)
2456 return 4;
2457
2458 return 3;
2459}
2460
2461/*
2462 * absdir(int): Returns a number between 1 and 8, which represent
2463 * the "absolute" direction of a number (it actually takes care of
2464 * "overflow" in previous calculations of a direction).
2465 */
2466
2467int
2468absdir (int d)
2469{
2470 while (d < 1)
2471 d += 8;
2472 while (d > 8)
2473 d -= 8;
2474 return d;
2475} 2283}
2476 2284
2477/* 2285/*
2478 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2286 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2479 * between two directions (which are expected to be absolute (see absdir()) 2287 * between two directions (which are expected to be absolute (see absdir())
2480 */ 2288 */
2481
2482int 2289int
2483dirdiff (int dir1, int dir2) 2290dirdiff (int dir1, int dir2)
2484{ 2291{
2485 int
2486 d;
2487
2488 d = abs (dir1 - dir2); 2292 int d = abs (dir1 - dir2);
2489 if (d > 4) 2293
2490 d = 8 - d; 2294 return d > 4 ? 8 - d : d;
2491 return d;
2492} 2295}
2493 2296
2494/* peterm: 2297/* peterm:
2495 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2298 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2496 * Basically, this is a table of directions, and what directions 2299 * Basically, this is a table of directions, and what directions
2498 * This basically means that if direction is 15, then it could either go 2301 * This basically means that if direction is 15, then it could either go
2499 * direction 4, 14, or 16 to get back to where we are. 2302 * direction 4, 14, or 16 to get back to where we are.
2500 * Moved from spell_util.c to object.c with the other related direction 2303 * Moved from spell_util.c to object.c with the other related direction
2501 * functions. 2304 * functions.
2502 */ 2305 */
2503
2504int
2505 reduction_dir[SIZEOFFREE][3] = { 2306static const int reduction_dir[SIZEOFFREE][3] = {
2506 {0, 0, 0}, /* 0 */ 2307 {0, 0, 0}, /* 0 */
2507 {0, 0, 0}, /* 1 */ 2308 {0, 0, 0}, /* 1 */
2508 {0, 0, 0}, /* 2 */ 2309 {0, 0, 0}, /* 2 */
2509 {0, 0, 0}, /* 3 */ 2310 {0, 0, 0}, /* 3 */
2510 {0, 0, 0}, /* 4 */ 2311 {0, 0, 0}, /* 4 */
2558 * find a path to that monster that we found. If not, 2359 * find a path to that monster that we found. If not,
2559 * we don't bother going toward it. Returns 1 if we 2360 * we don't bother going toward it. Returns 1 if we
2560 * can see a direct way to get it 2361 * can see a direct way to get it
2561 * Modified to be map tile aware -.MSW 2362 * Modified to be map tile aware -.MSW
2562 */ 2363 */
2563
2564
2565int 2364int
2566can_see_monsterP (mapstruct *m, int x, int y, int dir) 2365can_see_monsterP (maptile *m, int x, int y, int dir)
2567{ 2366{
2568 sint16 dx, dy; 2367 sint16 dx, dy;
2569 int
2570 mflags; 2368 int mflags;
2571 2369
2572 if (dir < 0) 2370 if (dir < 0)
2573 return 0; /* exit condition: invalid direction */ 2371 return 0; /* exit condition: invalid direction */
2574 2372
2575 dx = x + freearr_x[dir]; 2373 dx = x + freearr_x[dir];
2588 return 0; 2386 return 0;
2589 2387
2590 /* yes, can see. */ 2388 /* yes, can see. */
2591 if (dir < 9) 2389 if (dir < 9)
2592 return 1; 2390 return 1;
2391
2593 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2392 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2594 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2393 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2394 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2595} 2395}
2596
2597
2598 2396
2599/* 2397/*
2600 * can_pick(picker, item): finds out if an object is possible to be 2398 * can_pick(picker, item): finds out if an object is possible to be
2601 * picked up by the picker. Returnes 1 if it can be 2399 * picked up by the picker. Returnes 1 if it can be
2602 * picked up, otherwise 0. 2400 * picked up, otherwise 0.
2604 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2402 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2605 * core dumps if they do. 2403 * core dumps if they do.
2606 * 2404 *
2607 * Add a check so we can't pick up invisible objects (0.93.8) 2405 * Add a check so we can't pick up invisible objects (0.93.8)
2608 */ 2406 */
2609
2610int 2407int
2611can_pick (const object *who, const object *item) 2408can_pick (const object *who, const object *item)
2612{ 2409{
2613 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2410 return /*who->flag [FLAG_WIZ]|| */
2614 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2411 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2615 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2412 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2616} 2413}
2617
2618 2414
2619/* 2415/*
2620 * create clone from object to another 2416 * create clone from object to another
2621 */ 2417 */
2622object * 2418object *
2623object_create_clone (object *asrc) 2419object::deep_clone ()
2624{ 2420{
2625 object * 2421 assert (("deep_clone called on non-head object", is_head ()));
2626 dst = NULL, *tmp, *src, *part, *prev, *item;
2627 2422
2628 if (!asrc) 2423 object *dst = clone ();
2629 return NULL;
2630 src = asrc;
2631 if (src->head)
2632 src = src->head;
2633 2424
2634 prev = NULL; 2425 object *prev = dst;
2635 for (part = src; part; part = part->more) 2426 for (object *part = this->more; part; part = part->more)
2636 { 2427 {
2637 tmp = get_object (); 2428 object *tmp = part->clone ();
2638 copy_object (part, tmp);
2639 tmp->x -= src->x;
2640 tmp->y -= src->y;
2641 if (!part->head)
2642 {
2643 dst = tmp;
2644 tmp->head = NULL;
2645 }
2646 else
2647 {
2648 tmp->head = dst; 2429 tmp->head = dst;
2649 }
2650 tmp->more = NULL;
2651 if (prev)
2652 prev->more = tmp; 2430 prev->more = tmp;
2653 prev = tmp; 2431 prev = tmp;
2654 } 2432 }
2655 2433
2656 /*** copy inventory ***/
2657 for (item = src->inv; item; item = item->below) 2434 for (object *item = inv; item; item = item->below)
2658 { 2435 insert_ob_in_ob (item->deep_clone (), dst);
2659 (void) insert_ob_in_ob (object_create_clone (item), dst);
2660 }
2661 2436
2662 return dst; 2437 return dst;
2663}
2664
2665/* return true if the object was destroyed, 0 otherwise */
2666int
2667was_destroyed (const object *op, tag_t old_tag)
2668{
2669 /* checking for FLAG_FREED isn't necessary, but makes this function more
2670 * robust */
2671 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2672}
2673
2674/* GROS - Creates an object using a string representing its content. */
2675
2676/* Basically, we save the content of the string to a temp file, then call */
2677
2678/* load_object on it. I admit it is a highly inefficient way to make things, */
2679
2680/* but it was simple to make and allows reusing the load_object function. */
2681
2682/* Remember not to use load_object_str in a time-critical situation. */
2683
2684/* Also remember that multiparts objects are not supported for now. */
2685
2686object *
2687load_object_str (const char *obstr)
2688{
2689 object *
2690 op;
2691 char
2692 filename[MAX_BUF];
2693
2694 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2695
2696 FILE *
2697 tempfile = fopen (filename, "w");
2698
2699 if (tempfile == NULL)
2700 {
2701 LOG (llevError, "Error - Unable to access load object temp file\n");
2702 return NULL;
2703 }
2704
2705 fprintf (tempfile, obstr);
2706 fclose (tempfile);
2707
2708 op = get_object ();
2709
2710 object_thawer thawer (filename);
2711
2712 if (thawer)
2713 load_object (thawer, op, 0);
2714
2715 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2716 CLEAR_FLAG (op, FLAG_REMOVED);
2717
2718 return op;
2719} 2438}
2720 2439
2721/* This returns the first object in who's inventory that 2440/* This returns the first object in who's inventory that
2722 * has the same type and subtype match. 2441 * has the same type and subtype match.
2723 * returns NULL if no match. 2442 * returns NULL if no match.
2724 */ 2443 */
2725object * 2444object *
2726find_obj_by_type_subtype (const object *who, int type, int subtype) 2445find_obj_by_type_subtype (const object *who, int type, int subtype)
2727{ 2446{
2728 object *
2729 tmp;
2730
2731 for (tmp = who->inv; tmp; tmp = tmp->below) 2447 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2732 if (tmp->type == type && tmp->subtype == subtype) 2448 if (tmp->type == type && tmp->subtype == subtype)
2733 return tmp; 2449 return tmp;
2734 2450
2735 return NULL;
2736}
2737
2738/* If ob has a field named key, return the link from the list,
2739 * otherwise return NULL.
2740 *
2741 * key must be a passed in shared string - otherwise, this won't
2742 * do the desired thing.
2743 */
2744key_value *
2745get_ob_key_link (const object *ob, const char *key)
2746{
2747 key_value *
2748 link;
2749
2750 for (link = ob->key_values; link != NULL; link = link->next)
2751 {
2752 if (link->key == key)
2753 {
2754 return link;
2755 }
2756 }
2757
2758 return NULL;
2759}
2760
2761/*
2762 * Returns the value of op has an extra_field for key, or NULL.
2763 *
2764 * The argument doesn't need to be a shared string.
2765 *
2766 * The returned string is shared.
2767 */
2768const char *
2769get_ob_key_value (const object *op, const char *const key)
2770{
2771 key_value *link;
2772 shstr_cmp canonical_key (key);
2773
2774 if (!canonical_key)
2775 {
2776 /* 1. There being a field named key on any object
2777 * implies there'd be a shared string to find.
2778 * 2. Since there isn't, no object has this field.
2779 * 3. Therefore, *this* object doesn't have this field.
2780 */
2781 return 0;
2782 }
2783
2784 /* This is copied from get_ob_key_link() above -
2785 * only 4 lines, and saves the function call overhead.
2786 */
2787 for (link = op->key_values; link; link = link->next)
2788 if (link->key == canonical_key)
2789 return link->value;
2790
2791 return 0; 2451 return 0;
2792} 2452}
2793 2453
2794 2454/* Zero the key_values on op, decrementing the shared-string
2795/* 2455 * refcounts and freeing the links.
2796 * Updates the canonical_key in op to value.
2797 * 2456 */
2798 * canonical_key is a shared string (value doesn't have to be). 2457void
2799 * 2458key_values::clear ()
2800 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2801 * keys.
2802 *
2803 * Returns TRUE on success.
2804 */
2805int
2806set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2807{ 2459{
2808 key_value * 2460 for (key_value *kvp = first; kvp; )
2809 field = NULL, *last = NULL; 2461 {
2810 2462 key_value *next = kvp->next;
2811 for (field = op->key_values; field != NULL; field = field->next) 2463 delete kvp;
2464 kvp = next;
2812 { 2465 }
2813 if (field->key != canonical_key) 2466
2467 first = 0;
2468}
2469
2470shstr_tmp
2471key_values::get (shstr_tmp key) const
2472{
2473 for (key_value *kv = first; kv; kv = kv->next)
2474 if (kv->key == key)
2475 return kv->value;
2476
2477 return shstr ();
2478}
2479
2480void
2481key_values::add (shstr_tmp key, shstr_tmp value)
2482{
2483 key_value *kv = new key_value;
2484
2485 kv->next = first;
2486 kv->key = key;
2487 kv->value = value;
2488
2489 first = kv;
2490}
2491
2492void
2493key_values::set (shstr_tmp key, shstr_tmp value)
2494{
2495 for (key_value *kv = first; kv; kv = kv->next)
2496 if (kv->key == key)
2814 { 2497 {
2815 last = field; 2498 kv->value = value;
2816 continue; 2499 return;
2817 } 2500 }
2818 2501
2819 if (value) 2502 add (key, value);
2820 field->value = value; 2503}
2821 else 2504
2505void
2506key_values::del (shstr_tmp key)
2507{
2508 for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2509 if ((*kvp)->key == key)
2822 { 2510 {
2823 /* Basically, if the archetype has this key set, 2511 key_value *kv = *kvp;
2824 * we need to store the null value so when we save 2512 *kvp = (*kvp)->next;
2825 * it, we save the empty value so that when we load, 2513 delete kv;
2826 * we get this value back again. 2514 return;
2827 */
2828 if (get_ob_key_link (&op->arch->clone, canonical_key))
2829 field->value = 0;
2830 else
2831 {
2832 if (last)
2833 last->next = field->next;
2834 else
2835 op->key_values = field->next;
2836
2837 delete field;
2838 }
2839 } 2515 }
2840 return TRUE; 2516}
2517
2518void
2519key_values::reverse ()
2520{
2521 key_value *prev = 0;
2522 key_value *head = first;
2523
2524 while (head)
2841 } 2525 {
2842 /* IF we get here, key doesn't exist */ 2526 key_value *node = head;
2843 2527 head = head->next;
2844 /* No field, we'll have to add it. */ 2528 node->next = prev;
2845 2529 prev = node;
2846 if (!add_key)
2847 { 2530 }
2848 return FALSE;
2849 }
2850 /* There isn't any good reason to store a null
2851 * value in the key/value list. If the archetype has
2852 * this key, then we should also have it, so shouldn't
2853 * be here. If user wants to store empty strings,
2854 * should pass in ""
2855 */
2856 if (value == NULL)
2857 return TRUE;
2858 2531
2859 field = new key_value; 2532 first = prev;
2860
2861 field->key = canonical_key;
2862 field->value = value;
2863 /* Usual prepend-addition. */
2864 field->next = op->key_values;
2865 op->key_values = field;
2866
2867 return TRUE;
2868} 2533}
2869 2534
2870/* 2535key_values &
2871 * Updates the key in op to value. 2536key_values::operator =(const key_values &kv)
2872 *
2873 * If add_key is FALSE, this will only update existing keys,
2874 * and not add new ones.
2875 * In general, should be little reason FALSE is ever passed in for add_key
2876 *
2877 * Returns TRUE on success.
2878 */
2879int
2880set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2881{ 2537{
2882 shstr key_ (key); 2538 clear ();
2883 2539
2884 return set_ob_key_value_s (op, key_, value, add_key); 2540 for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
2541 add (kvp->key, kvp->value);
2542
2543 reverse ();
2885} 2544}
2886 2545
2887object::depth_iterator::depth_iterator (object *container) 2546object::depth_iterator::depth_iterator (object *container)
2888: iterator_base (container) 2547: iterator_base (container)
2889{ 2548{
2903 } 2562 }
2904 else 2563 else
2905 item = item->env; 2564 item = item->env;
2906} 2565}
2907 2566
2567const char *
2568object::flag_desc (char *desc, int len) const
2569{
2570 char *p = desc;
2571 bool first = true;
2572
2573 *p = 0;
2574
2575 for (int i = 0; i < NUM_FLAGS; i++)
2576 {
2577 if (len <= 10) // magic constant!
2578 {
2579 snprintf (p, len, ",...");
2580 break;
2581 }
2582
2583 if (flag [i])
2584 {
2585 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2586 len -= cnt;
2587 p += cnt;
2588 first = false;
2589 }
2590 }
2591
2592 return desc;
2593}
2594
2908// return a suitable string describing an objetc in enough detail to find it 2595// return a suitable string describing an object in enough detail to find it
2909const char * 2596const char *
2910object::debug_desc (char *info) const 2597object::debug_desc (char *info) const
2911{ 2598{
2599 char flagdesc[512];
2912 char info2[256 * 3]; 2600 char info2[256 * 4];
2913 char *p = info; 2601 char *p = info;
2914 2602
2915 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2603 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2916 count, 2604 count,
2605 uuid.c_str (),
2917 &name, 2606 &name,
2918 title ? " " : "", 2607 title ? ",title:\"" : "",
2919 title ? (const char *)title : ""); 2608 title ? (const char *)title : "",
2609 title ? "\"" : "",
2610 flag_desc (flagdesc, 512), type);
2920 2611
2921 if (env) 2612 if (!flag[FLAG_REMOVED] && env)
2922 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2613 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2923 2614
2924 if (map) 2615 if (map)
2925 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2616 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2926 2617
2927 return info; 2618 return info;
2928} 2619}
2929 2620
2930const char * 2621const char *
2931object::debug_desc () const 2622object::debug_desc () const
2932{ 2623{
2933 static char info[256 * 3]; 2624 static char info[3][256 * 4];
2625 static int info_idx;
2626
2934 return debug_desc (info); 2627 return debug_desc (info [++info_idx % 3]);
2935} 2628}
2936 2629
2630struct region *
2631object::region () const
2632{
2633 return map ? map->region (x, y)
2634 : region::default_region ();
2635}
2636
2637void
2638object::open_container (object *new_container)
2639{
2640 if (container == new_container)
2641 return;
2642
2643 object *old_container = container;
2644
2645 if (old_container)
2646 {
2647 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2648 return;
2649
2650#if 0
2651 // remove the "Close old_container" object.
2652 if (object *closer = old_container->inv)
2653 if (closer->type == CLOSE_CON)
2654 closer->destroy ();
2655#endif
2656
2657 // make sure the container is available
2658 esrv_send_item (this, old_container);
2659
2660 old_container->flag [FLAG_APPLIED] = false;
2661 container = 0;
2662
2663 // client needs item update to make it work, client bug requires this to be separate
2664 esrv_update_item (UPD_FLAGS, this, old_container);
2665
2666 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2667 play_sound (sound_find ("chest_close"));
2668 }
2669
2670 if (new_container)
2671 {
2672 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2673 return;
2674
2675 // TODO: this does not seem to serve any purpose anymore?
2676#if 0
2677 // insert the "Close Container" object.
2678 if (archetype *closer = new_container->other_arch)
2679 {
2680 object *closer = new_container->other_arch->instance ();
2681 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2682 new_container->insert (closer);
2683 }
2684#endif
2685
2686 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2687
2688 // make sure the container is available, client bug requires this to be separate
2689 esrv_send_item (this, new_container);
2690
2691 new_container->flag [FLAG_APPLIED] = true;
2692 container = new_container;
2693
2694 // client needs flag change
2695 esrv_update_item (UPD_FLAGS, this, new_container);
2696 esrv_send_inventory (this, new_container);
2697 play_sound (sound_find ("chest_open"));
2698 }
2699// else if (!old_container->env && contr && contr->ns)
2700// contr->ns->floorbox_reset ();
2701}
2702
2703object *
2704object::force_find (shstr_tmp name)
2705{
2706 /* cycle through his inventory to look for the MARK we want to
2707 * place
2708 */
2709 for (object *tmp = inv; tmp; tmp = tmp->below)
2710 if (tmp->type == FORCE && tmp->slaying == name)
2711 return splay (tmp);
2712
2713 return 0;
2714}
2715
2716//-GPL
2717
2718void
2719object::force_set_timer (int duration)
2720{
2721 this->duration = 1;
2722 this->speed_left = -1.f;
2723
2724 this->set_speed (duration ? 1.f / duration : 0.f);
2725}
2726
2727object *
2728object::force_add (shstr_tmp name, int duration)
2729{
2730 if (object *force = force_find (name))
2731 force->destroy ();
2732
2733 object *force = archetype::get (FORCE_NAME);
2734
2735 force->slaying = name;
2736 force->force_set_timer (duration);
2737 force->flag [FLAG_APPLIED] = true;
2738
2739 return insert (force);
2740}
2741
2742void
2743object::play_sound (faceidx sound) const
2744{
2745 if (!sound)
2746 return;
2747
2748 if (is_on_map ())
2749 map->play_sound (sound, x, y);
2750 else if (object *pl = in_player ())
2751 pl->contr->play_sound (sound);
2752}
2753
2754void
2755object::say_msg (const char *msg) const
2756{
2757 if (is_on_map ())
2758 map->say_msg (msg, x, y);
2759 else if (object *pl = in_player ())
2760 pl->contr->play_sound (sound);
2761}
2762
2763void
2764object::make_noise ()
2765{
2766 // we do not model noise in the map, so instead put
2767 // a temporary light into the noise source
2768 // could use the map instead, but that's less reliable for our
2769 // goal, which is to make invisibility a bit harder to exploit
2770
2771 // currently only works sensibly for players
2772 if (!is_player ())
2773 return;
2774
2775 // find old force, or create new one
2776 object *force = force_find (shstr_noise_force);
2777
2778 if (force)
2779 force->speed_left = -1.f; // patch old speed up
2780 else
2781 {
2782 force = archetype::get (shstr_noise_force);
2783
2784 force->slaying = shstr_noise_force;
2785 force->stats.food = 1;
2786 force->speed_left = -1.f;
2787
2788 force->set_speed (1.f / 4.f);
2789 force->flag [FLAG_IS_USED_UP] = true;
2790 force->flag [FLAG_APPLIED] = true;
2791
2792 insert (force);
2793 }
2794}
2795
2796void object::change_move_type (MoveType mt)
2797{
2798 if (move_type == mt)
2799 return;
2800
2801 if (is_on_map ())
2802 {
2803 // we are on the map, so handle move_on/off effects
2804 remove ();
2805 move_type = mt;
2806 map->insert (this, x, y, this);
2807 }
2808 else
2809 move_type = mt;
2810}
2811
2812/* object should be a player.
2813 * we return the object the player has marked with the 'mark' command
2814 * below. If no match is found (or object has changed), we return
2815 * NULL. We leave it up to the calling function to print messages if
2816 * nothing is found.
2817 */
2818object *
2819object::mark () const
2820{
2821 if (contr && contr->mark && contr->mark->env == this)
2822 return contr->mark;
2823 else
2824 return 0;
2825}
2826
2827// put marked object first in the inventory
2828// this is used by identify-like spells so players can influence
2829// the order a bit.
2830void
2831object::splay_marked ()
2832{
2833 if (object *marked = mark ())
2834 splay (marked);
2835}
2836

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines