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.86 by root, Tue Dec 26 08:17:58 2006 UTC vs.
Revision 1.210 by root, Mon Apr 21 07:01:40 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27#include <global.h> 24#include <global.h>
28#include <stdio.h> 25#include <stdio.h>
29#include <sys/types.h> 26#include <sys/types.h>
30#include <sys/uio.h> 27#include <sys/uio.h>
31#include <object.h> 28#include <object.h>
32#include <funcpoint.h> 29#include <funcpoint.h>
30#include <sproto.h>
33#include <loader.h> 31#include <loader.h>
34 32
35#include <bitset> 33#include <bitset>
36 34
37int nrofallocobjects = 0; 35UUID UUID::cur;
38static UUID uuid; 36static uint64_t seq_next_save;
39const uint64 UUID_SKIP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
40 38
41object *active_objects; /* List of active objects that need to be processed */ 39objectvec objects;
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, 42short freearr_x[SIZEOFFREE] = {
43 0,
44 0, 1, 1, 1, 0, -1, -1, -1,
45 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 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 47};
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, 48short freearr_y[SIZEOFFREE] = {
49 0,
50 -1, -1, 0, 1, 1, 1, 0, -1,
51 -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 52 -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}; 53};
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, 54int maxfree[SIZEOFFREE] = {
55 0,
56 9, 10, 13, 14, 17, 18, 21, 22,
57 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
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 58 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}; 59};
52int freedir[SIZEOFFREE] = { 60int 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, 61 0,
62 1, 2, 3, 4, 5, 6, 7, 8,
63 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 64 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}; 65};
56 66
57static void 67static void
58write_uuid (void) 68write_uuid (uval64 skip, bool sync)
59{ 69{
60 char filename1[MAX_BUF], filename2[MAX_BUF]; 70 CALL_BEGIN (2);
61 71 CALL_ARG_SV (newSVval64 (skip));
62 sprintf (filename1, "%s/uuid", settings.localdir); 72 CALL_ARG_SV (boolSV (sync));
63 sprintf (filename2, "%s/uuid~", settings.localdir); 73 CALL_CALL ("cf::write_uuid", G_DISCARD);
64 74 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} 75}
77 76
78static void 77static void
79read_uuid (void) 78read_uuid (void)
80{ 79{
81 char filename[MAX_BUF]; 80 char filename[MAX_BUF];
82 81
83 sprintf (filename, "%s/uuid", settings.localdir); 82 sprintf (filename, "%s/uuid", settings.localdir);
84 83
84 seq_next_save = 0;
85
85 FILE *fp; 86 FILE *fp;
86 87
87 if (!(fp = fopen (filename, "r"))) 88 if (!(fp = fopen (filename, "r")))
88 { 89 {
89 if (errno == ENOENT) 90 if (errno == ENOENT)
90 { 91 {
91 LOG (llevInfo, "RESET uid to 1\n"); 92 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0; 93 UUID::cur.seq = 0;
93 write_uuid (); 94 write_uuid (UUID_GAP, true);
94 return; 95 return;
95 } 96 }
96 97
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 99 _exit (1);
99 } 100 }
100 101
101 int version; 102 UUID::BUF buf;
102 unsigned long long uid; 103 buf[0] = 0;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 104 fgets (buf, sizeof (buf), fp);
105
106 if (!UUID::cur.parse (buf))
104 { 107 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 108 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106 _exit (1); 109 _exit (1);
107 } 110 }
108 111
109 uuid.seq = uid; 112 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110 write_uuid (); 113
111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 114 write_uuid (UUID_GAP, true);
112 fclose (fp); 115 fclose (fp);
113} 116}
114 117
115UUID 118UUID
116gen_uuid () 119UUID::gen ()
117{ 120{
118 UUID uid; 121 UUID uid;
119 122
120 uid.seq = ++uuid.seq; 123 uid.seq = ++cur.seq;
121 124
122 if (!(uuid.seq & (UUID_SKIP - 1))) 125 if (expect_false (cur.seq >= seq_next_save))
123 write_uuid (); 126 {
127 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
128 write_uuid (UUID_GAP, false);
129 }
130
124 131
125 return uid; 132 return uid;
126} 133}
127 134
128void 135void
129init_uuid () 136UUID::init ()
130{ 137{
131 read_uuid (); 138 read_uuid ();
132} 139}
133 140
134/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 141/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
135static int 142static bool
136compare_ob_value_lists_one (const object *wants, const object *has) 143compare_ob_value_lists_one (const object *wants, const object *has)
137{ 144{
138 key_value *wants_field; 145 key_value *wants_field;
139 146
140 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 147 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
148 key_value *has_field; 155 key_value *has_field;
149 156
150 /* Look for a field in has with the same key. */ 157 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 158 has_field = get_ob_key_link (has, wants_field->key);
152 159
153 if (has_field == NULL) 160 if (!has_field)
154 {
155 /* No field with that name. */ 161 return 0; /* No field with that name. */
156 return FALSE;
157 }
158 162
159 /* Found the matching field. */ 163 /* Found the matching field. */
160 if (has_field->value != wants_field->value) 164 if (has_field->value != wants_field->value)
161 {
162 /* Values don't match, so this half of the comparison is false. */ 165 return 0; /* Values don't match, so this half of the comparison is false. */
163 return FALSE;
164 }
165 166
166 /* If we get here, we found a match. Now for the next field in wants. */ 167 /* If we get here, we found a match. Now for the next field in wants. */
167 } 168 }
168 169
169 /* If we get here, every field in wants has a matching field in has. */ 170 /* If we get here, every field in wants has a matching field in has. */
170 return TRUE; 171 return 1;
171} 172}
172 173
173/* Returns TRUE if ob1 has the same key_values as ob2. */ 174/* Returns TRUE if ob1 has the same key_values as ob2. */
174static int 175static bool
175compare_ob_value_lists (const object *ob1, const object *ob2) 176compare_ob_value_lists (const object *ob1, const object *ob2)
176{ 177{
177 /* However, there may be fields in has which aren't partnered in wants, 178 /* However, there may be fields in has which aren't partnered in wants,
178 * so we need to run the comparison *twice*. :( 179 * so we need to run the comparison *twice*. :(
179 */ 180 */
190 * Check nrof variable *before* calling can_merge() 191 * Check nrof variable *before* calling can_merge()
191 * 192 *
192 * Improvements made with merge: Better checking on potion, and also 193 * Improvements made with merge: Better checking on potion, and also
193 * check weight 194 * check weight
194 */ 195 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
197{ 197{
198 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
199 if (ob1 == ob2 199 if (ob1 == ob2
200 || ob1->type != ob2->type 200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed 201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value 202 || ob1->value != ob2->value
203 || ob1->name != ob2->name) 203 || ob1->name != ob2->name)
204 return 0; 204 return 0;
205 205
206 //TODO: this ain't working well, use nicer and correct overflow check 206 /* Do not merge objects if nrof would overflow. First part checks
207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 * for unsigned overflow (2c), second part checks whether the result
208 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * would fit into a 32 bit signed int, which is often used to hold
209 * used to store nrof). 209 * nrof values.
210 */ 210 */
211 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212 return 0; 212 return 0;
213 213
214 /* If the objects have been identified, set the BEEN_APPLIED flag. 214 /* If the objects have been identified, set the BEEN_APPLIED flag.
215 * This is to the comparison of the flags below will be OK. We 215 * This is to the comparison of the flags below will be OK. We
216 * just can't ignore the been applied or identified flags, as they 216 * just can't ignore the been applied or identified flags, as they
217 * are not equal - just if it has been identified, the been_applied 217 * are not equal - just if it has been identified, the been_applied
218 * flags lose any meaning. 218 * flags lose any meaning.
219 */ 219 */
220 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 220 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 222
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 225
226 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 226 if (ob1->arch->name != ob2->arch->name
227 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 227 || ob1->name != ob2->name
229 || ob1->title != ob2->title 228 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 229 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 230 || ob1->weight != ob2->weight
232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
234 || ob1->attacktype != ob2->attacktype 231 || ob1->attacktype != ob2->attacktype
235 || ob1->magic != ob2->magic 232 || ob1->magic != ob2->magic
236 || ob1->slaying != ob2->slaying 233 || ob1->slaying != ob2->slaying
237 || ob1->skill != ob2->skill 234 || ob1->skill != ob2->skill
238 || ob1->value != ob2->value 235 || ob1->value != ob2->value
245 || ob1->move_block != ob2->move_block 242 || ob1->move_block != ob2->move_block
246 || ob1->move_allow != ob2->move_allow 243 || ob1->move_allow != ob2->move_allow
247 || ob1->move_on != ob2->move_on 244 || ob1->move_on != ob2->move_on
248 || ob1->move_off != ob2->move_off 245 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow 246 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty) 247 || ob1->move_slow_penalty != ob2->move_slow_penalty
248 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
249 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
251 return 0; 250 return 0;
252 251
252 if ((ob1->flag ^ ob2->flag)
253 .reset (FLAG_INV_LOCKED)
254 .reset (FLAG_CLIENT_SENT)
255 .reset (FLAG_REMOVED)
256 .any ())
257 return 0;
258
253 /* This is really a spellbook check - really, we should 259 /* This is really a spellbook check - we should in general
254 * check all objects in the inventory. 260 * not merge objects with real inventories, as splitting them
261 * is hard.
255 */ 262 */
256 if (ob1->inv || ob2->inv) 263 if (ob1->inv || ob2->inv)
257 { 264 {
258 /* if one object has inventory but the other doesn't, not equiv */ 265 if (!(ob1->inv && ob2->inv))
259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 266 return 0; /* inventories differ in length */
260 return 0;
261 267
262 /* Now check to see if the two inventory objects could merge */ 268 if (ob1->inv->below || ob2->inv->below)
269 return 0; /* more than one object in inv */
270
263 if (!object::can_merge (ob1->inv, ob2->inv)) 271 if (!object::can_merge (ob1->inv, ob2->inv))
264 return 0; 272 return 0; /* inventory objects differ */
265 273
266 /* inventory ok - still need to check rest of this object to see 274 /* inventory ok - still need to check rest of this object to see
267 * if it is valid. 275 * if it is valid.
268 */ 276 */
269 } 277 }
277 285
278 /* Note sure why the following is the case - either the object has to 286 /* Note sure why the following is the case - either the object has to
279 * be animated or have a very low speed. Is this an attempted monster 287 * be animated or have a very low speed. Is this an attempted monster
280 * check? 288 * check?
281 */ 289 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 290 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 291 return 0;
284 292
285 switch (ob1->type) 293 switch (ob1->type)
286 { 294 {
287 case SCROLL: 295 case SCROLL:
288 if (ob1->level != ob2->level) 296 if (ob1->level != ob2->level)
289 return 0; 297 return 0;
290 break; 298 break;
291 } 299 }
292 300
293 if (ob1->key_values != NULL || ob2->key_values != NULL) 301 if (ob1->key_values || ob2->key_values)
294 { 302 {
295 /* At least one of these has key_values. */ 303 /* At least one of these has key_values. */
296 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 304 if ((!ob1->key_values) != (!ob2->key_values))
297 /* One has fields, but the other one doesn't. */ 305 return 0; /* One has fields, but the other one doesn't. */
306
307 if (!compare_ob_value_lists (ob1, ob2))
298 return 0; 308 return 0;
299 else if (!compare_ob_value_lists (ob1, ob2))
300 return 0;
301 } 309 }
302 310
303 //TODO: generate an event or call into perl for additional checks
304 if (ob1->self || ob2->self) 311 if (ob1->self || ob2->self)
305 { 312 {
306 ob1->optimise (); 313 ob1->optimise ();
307 ob2->optimise (); 314 ob2->optimise ();
308 315
309 if (ob1->self || ob2->self) 316 if (ob1->self || ob2->self)
317 {
318 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
319 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
320
321 if (k1 != k2)
310 return 0; 322 return 0;
323
324 if (k1 == 0)
325 return 1;
326
327 if (!cfperl_can_merge (ob1, ob2))
328 return 0;
329 }
311 } 330 }
312 331
313 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
314 return 1; 333 return 1;
315} 334}
316 335
336// adjust weight per container type ("of holding")
337static sint32
338weight_adjust (object *op, sint32 weight)
339{
340 return op->type == CONTAINER
341 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342 : weight;
343}
344
317/* 345/*
346 * adjust_weight(object, weight) adds the specified weight to an object,
347 * and also updates how much the environment(s) is/are carrying.
348 */
349static void
350adjust_weight (object *op, sint32 weight)
351{
352 while (op)
353 {
354 weight = weight_adjust (op, weight);
355
356 op->carrying += weight;
357 op = op->env;
358 }
359}
360
361/*
318 * sum_weight() is a recursive function which calculates the weight 362 * this is a recursive function which calculates the weight
319 * an object is carrying. It goes through in figures out how much 363 * an object is carrying. It goes through op and figures out how much
320 * containers are carrying, and sums it up. 364 * containers are carrying, and sums it up.
321 */ 365 */
322long 366void
323sum_weight (object *op) 367object::update_weight ()
324{ 368{
325 long sum; 369 sint32 sum = 0;
326 object *inv;
327 370
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 371 for (object *op = inv; op; op = op->below)
329 { 372 {
330 if (inv->inv) 373 if (op->inv)
331 sum_weight (inv); 374 op->update_weight ();
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 }
334 375
335 if (op->type == CONTAINER && op->stats.Str) 376 sum += op->total_weight ();
336 sum = (sum * (100 - op->stats.Str)) / 100; 377 }
337 378
338 if (op->carrying != sum) 379 carrying = weight_adjust (this, sum);
339 op->carrying = sum;
340
341 return sum;
342} 380}
343 381
344/** 382/*
345 * Return the outermost environment object for a given object. 383 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
346 */ 384 */
347
348object *
349object_get_env_recursive (object *op)
350{
351 while (op->env != NULL)
352 op = op->env;
353 return op;
354}
355
356/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array.
360 */
361
362char * 385char *
363dump_object (object *op) 386dump_object (object *op)
364{ 387{
365 if (!op) 388 if (!op)
366 return strdup ("[NULLOBJ]"); 389 return strdup ("[NULLOBJ]");
367 390
368 object_freezer freezer; 391 object_freezer freezer;
369 save_object (freezer, op, 1); 392 op->write (freezer);
370 return freezer.as_string (); 393 return freezer.as_string ();
371} 394}
372 395
373/* 396/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 397 * get_nearest_part(multi-object, object 2) returns the part of the
375 * multi-object 1 which is closest to the second object. 398 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 399 * If it's not a multi-object, it is returned.
377 */ 400 */
378
379object * 401object *
380get_nearest_part (object *op, const object *pl) 402get_nearest_part (object *op, const object *pl)
381{ 403{
382 object *tmp, *closest; 404 object *tmp, *closest;
383 int last_dist, i; 405 int last_dist, i;
384 406
385 if (op->more == NULL) 407 if (!op->more)
386 return op; 408 return op;
409
387 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 410 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
411 tmp;
412 tmp = tmp->more)
388 if ((i = distance (tmp, pl)) < last_dist) 413 if ((i = distance (tmp, pl)) < last_dist)
389 closest = tmp, last_dist = i; 414 closest = tmp, last_dist = i;
415
390 return closest; 416 return closest;
391} 417}
392 418
393/* 419/*
394 * Returns the object which has the count-variable equal to the argument. 420 * Returns the object which has the count-variable equal to the argument.
421 * VERRRY slow.
395 */ 422 */
396
397object * 423object *
398find_object (tag_t i) 424find_object (tag_t i)
399{ 425{
400 for (object *op = object::first; op; op = op->next) 426 for_all_objects (op)
401 if (op->count == i) 427 if (op->count == i)
402 return op; 428 return op;
403 429
404 return 0; 430 return 0;
405} 431}
406 432
407/* 433/*
408 * Returns the first object which has a name equal to the argument. 434 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 435 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 436 * Enables features like "patch <name-of-other-player> food 999"
411 */ 437 */
412
413object * 438object *
414find_object_name (const char *str) 439find_object_name (const char *str)
415{ 440{
416 shstr_cmp str_ (str); 441 shstr_cmp str_ (str);
417 object *op; 442 object *op;
418 443
419 for (op = object::first; op != NULL; op = op->next) 444 for_all_objects (op)
420 if (op->name == str_) 445 if (op->name == str_)
421 break; 446 break;
422 447
423 return op; 448 return op;
424} 449}
425 450
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 451/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 452 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 453 * skill and experience objects.
454 * ACTUALLY NO! investigate! TODO
435 */ 455 */
436void 456void
437object::set_owner (object *owner) 457object::set_owner (object *owner)
438{ 458{
459 // allow objects which own objects
439 if (!owner) 460 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 461 while (owner->owner)
450 owner = owner->owner; 462 owner = owner->owner;
463
464 if (flag [FLAG_FREED])
465 {
466 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
467 return;
468 }
451 469
452 this->owner = owner; 470 this->owner = owner;
471}
472
473int
474object::slottype () const
475{
476 if (type == SKILL)
477 {
478 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
479 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
480 }
481 else
482 {
483 if (slot [body_combat].info) return slot_combat;
484 if (slot [body_range ].info) return slot_ranged;
485 }
486
487 return slot_none;
488}
489
490bool
491object::change_weapon (object *ob)
492{
493 if (current_weapon == ob)
494 return true;
495
496 if (chosen_skill)
497 chosen_skill->flag [FLAG_APPLIED] = false;
498
499 current_weapon = ob;
500 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
501
502 if (chosen_skill)
503 chosen_skill->flag [FLAG_APPLIED] = true;
504
505 update_stats ();
506
507 if (ob)
508 {
509 // now check wether any body locations became invalid, in which case
510 // we cannot apply the weapon at the moment.
511 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
512 if (slot[i].used < 0)
513 {
514 current_weapon = chosen_skill = 0;
515 update_stats ();
516
517 new_draw_info_format (NDI_UNIQUE, 0, this,
518 "You try to balance all your items at once, "
519 "but the %s is just too much for your body. "
520 "[You need to unapply some items first.]", &ob->name);
521 return false;
522 }
523
524 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
525 }
526 else
527 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
528
529 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
530 {
531 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
532 &name, ob->debug_desc ());
533 return false;
534 }
535
536 return true;
453} 537}
454 538
455/* Zero the key_values on op, decrementing the shared-string 539/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 540 * refcounts and freeing the links.
457 */ 541 */
458static void 542static void
459free_key_values (object *op) 543free_key_values (object *op)
460{ 544{
461 for (key_value *i = op->key_values; i != 0;) 545 for (key_value *i = op->key_values; i; )
462 { 546 {
463 key_value *next = i->next; 547 key_value *next = i->next;
464 delete i; 548 delete i;
465 549
466 i = next; 550 i = next;
467 } 551 }
468 552
469 op->key_values = 0; 553 op->key_values = 0;
470} 554}
471 555
472/* 556object &
473 * copy_to first frees everything allocated by the dst object, 557object::operator =(const object &src)
474 * and then copies the contents of itself into the second
475 * object, allocating what needs to be allocated. Basically, any
476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
477 * if the first object is freed, the pointers in the new object
478 * will point at garbage.
479 */
480void
481object::copy_to (object *dst)
482{ 558{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 559 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 560 bool is_removed = flag [FLAG_REMOVED];
485 561
486 *(object_copy *)dst = *this; 562 *(object_copy *)this = src;
487 563
488 if (is_freed) 564 flag [FLAG_FREED] = is_freed;
489 SET_FLAG (dst, FLAG_FREED); 565 flag [FLAG_REMOVED] = is_removed;
490
491 if (is_removed)
492 SET_FLAG (dst, FLAG_REMOVED);
493
494 if (speed < 0)
495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496 566
497 /* Copy over key_values, if any. */ 567 /* Copy over key_values, if any. */
498 if (key_values) 568 if (src.key_values)
499 { 569 {
500 key_value *tail = 0; 570 key_value *tail = 0;
501 key_value *i;
502
503 dst->key_values = 0; 571 key_values = 0;
504 572
505 for (i = key_values; i; i = i->next) 573 for (key_value *i = src.key_values; i; i = i->next)
506 { 574 {
507 key_value *new_link = new key_value; 575 key_value *new_link = new key_value;
508 576
509 new_link->next = 0; 577 new_link->next = 0;
510 new_link->key = i->key; 578 new_link->key = i->key;
511 new_link->value = i->value; 579 new_link->value = i->value;
512 580
513 /* Try and be clever here, too. */ 581 /* Try and be clever here, too. */
514 if (!dst->key_values) 582 if (!key_values)
515 { 583 {
516 dst->key_values = new_link; 584 key_values = new_link;
517 tail = new_link; 585 tail = new_link;
518 } 586 }
519 else 587 else
520 { 588 {
521 tail->next = new_link; 589 tail->next = new_link;
522 tail = new_link; 590 tail = new_link;
523 } 591 }
524 } 592 }
525 } 593 }
594}
526 595
527 update_ob_speed (dst); 596/*
597 * copy_to first frees everything allocated by the dst object,
598 * and then copies the contents of itself into the second
599 * object, allocating what needs to be allocated. Basically, any
600 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
601 * if the first object is freed, the pointers in the new object
602 * will point at garbage.
603 */
604void
605object::copy_to (object *dst)
606{
607 *dst = *this;
608
609 if (speed < 0)
610 dst->speed_left -= rndm ();
611
612 dst->set_speed (dst->speed);
613}
614
615void
616object::instantiate ()
617{
618 if (!uuid.seq) // HACK
619 uuid = UUID::gen ();
620
621 speed_left = -0.1f;
622 /* copy the body_info to the body_used - this is only really
623 * need for monsters, but doesn't hurt to do it for everything.
624 * by doing so, when a monster is created, it has good starting
625 * values for the body_used info, so when items are created
626 * for it, they can be properly equipped.
627 */
628 for (int i = NUM_BODY_LOCATIONS; i--; )
629 slot[i].used = slot[i].info;
630
631 attachable::instantiate ();
528} 632}
529 633
530object * 634object *
531object::clone () 635object::clone ()
532{ 636{
538/* 642/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 643 * If an object with the IS_TURNABLE() flag needs to be turned due
540 * to the closest player being on the other side, this function can 644 * to the closest player being on the other side, this function can
541 * be called to update the face variable, _and_ how it looks on the map. 645 * be called to update the face variable, _and_ how it looks on the map.
542 */ 646 */
543
544void 647void
545update_turn_face (object *op) 648update_turn_face (object *op)
546{ 649{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 650 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 651 return;
652
549 SET_ANIMATION (op, op->direction); 653 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 654 update_object (op, UP_OBJ_FACE);
551} 655}
552 656
553/* 657/*
554 * Updates the speed of an object. If the speed changes from 0 to another 658 * Updates the speed of an object. If the speed changes from 0 to another
555 * value, or vice versa, then add/remove the object from the active list. 659 * value, or vice versa, then add/remove the object from the active list.
556 * This function needs to be called whenever the speed of an object changes. 660 * This function needs to be called whenever the speed of an object changes.
557 */ 661 */
558void 662void
559update_ob_speed (object *op) 663object::set_speed (float speed)
560{ 664{
561 extern int arch_init; 665 if (flag [FLAG_FREED] && speed)
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
567 { 666 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 667 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 op->speed = 0; 668 speed = 0;
570 }
571
572 if (arch_init)
573 return;
574
575 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
576 { 669 }
577 /* If already on active list, don't do anything */
578 if (op->active_next || op->active_prev || op == active_objects)
579 return;
580 670
581 /* process_events() expects us to insert the object at the beginning 671 this->speed = speed;
582 * of the list. */
583 op->active_next = active_objects;
584 672
585 if (op->active_next != NULL) 673 if (has_active_speed ())
586 op->active_next->active_prev = op; 674 activate ();
587
588 active_objects = op;
589 }
590 else 675 else
591 { 676 deactivate ();
592 /* If not on the active list, nothing needs to be done */
593 if (!op->active_next && !op->active_prev && op != active_objects)
594 return;
595
596 if (op->active_prev == NULL)
597 {
598 active_objects = op->active_next;
599
600 if (op->active_next != NULL)
601 op->active_next->active_prev = NULL;
602 }
603 else
604 {
605 op->active_prev->active_next = op->active_next;
606
607 if (op->active_next)
608 op->active_next->active_prev = op->active_prev;
609 }
610
611 op->active_next = NULL;
612 op->active_prev = NULL;
613 }
614}
615
616/* This function removes object 'op' from the list of active
617 * objects.
618 * This should only be used for style maps or other such
619 * reference maps where you don't want an object that isn't
620 * in play chewing up cpu time getting processed.
621 * The reverse of this is to call update_ob_speed, which
622 * will do the right thing based on the speed of the object.
623 */
624void
625remove_from_active_list (object *op)
626{
627 /* If not on the active list, nothing needs to be done */
628 if (!op->active_next && !op->active_prev && op != active_objects)
629 return;
630
631 if (op->active_prev == NULL)
632 {
633 active_objects = op->active_next;
634 if (op->active_next != NULL)
635 op->active_next->active_prev = NULL;
636 }
637 else
638 {
639 op->active_prev->active_next = op->active_next;
640 if (op->active_next)
641 op->active_next->active_prev = op->active_prev;
642 }
643 op->active_next = NULL;
644 op->active_prev = NULL;
645} 677}
646 678
647/* 679/*
648 * update_object() updates the the map. 680 * update_object() updates the the map.
649 * It takes into account invisible objects (and represent squares covered 681 * It takes into account invisible objects (and represent squares covered
662 * UP_OBJ_FACE: only the objects face has changed. 694 * UP_OBJ_FACE: only the objects face has changed.
663 */ 695 */
664void 696void
665update_object (object *op, int action) 697update_object (object *op, int action)
666{ 698{
667 MoveType move_on, move_off, move_block, move_slow;
668
669 if (op == NULL) 699 if (op == NULL)
670 { 700 {
671 /* this should never happen */ 701 /* this should never happen */
672 LOG (llevDebug, "update_object() called for NULL object.\n"); 702 LOG (llevDebug, "update_object() called for NULL object.\n");
673 return; 703 return;
697 return; 727 return;
698 } 728 }
699 729
700 mapspace &m = op->ms (); 730 mapspace &m = op->ms ();
701 731
702 if (m.flags_ & P_NEED_UPDATE) 732 if (!(m.flags_ & P_UPTODATE))
703 /* nop */; 733 /* nop */;
704 else if (action == UP_OBJ_INSERT) 734 else if (action == UP_OBJ_INSERT)
705 { 735 {
706 // this is likely overkill, TODO: revisit (schmorp) 736 // this is likely overkill, TODO: revisit (schmorp)
707 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 737 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
716 /* This isn't perfect, but I don't expect a lot of objects to 746 /* This isn't perfect, but I don't expect a lot of objects to
717 * to have move_allow right now. 747 * to have move_allow right now.
718 */ 748 */
719 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 749 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
720 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 750 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
721 m.flags_ = P_NEED_UPDATE; 751 m.flags_ = 0;
722 } 752 }
723 /* if the object is being removed, we can't make intelligent 753 /* if the object is being removed, we can't make intelligent
724 * decisions, because remove_ob can't really pass the object 754 * decisions, because remove_ob can't really pass the object
725 * that is being removed. 755 * that is being removed.
726 */ 756 */
727 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 757 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
728 m.flags_ = P_NEED_UPDATE; 758 m.flags_ = 0;
729 else if (action == UP_OBJ_FACE) 759 else if (action == UP_OBJ_FACE)
730 /* Nothing to do for that case */ ; 760 /* Nothing to do for that case */ ;
731 else 761 else
732 LOG (llevError, "update_object called with invalid action: %d\n", action); 762 LOG (llevError, "update_object called with invalid action: %d\n", action);
733 763
734 if (op->more) 764 if (op->more)
735 update_object (op->more, action); 765 update_object (op->more, action);
736} 766}
737 767
738object::vector object::objects; // not yet used
739object *object::first;
740
741object::object () 768object::object ()
742{ 769{
743 SET_FLAG (this, FLAG_REMOVED); 770 SET_FLAG (this, FLAG_REMOVED);
744 771
745 expmul = 1.0; 772 expmul = 1.0;
746 face = blank_face; 773 face = blank_face;
747} 774}
748 775
749object::~object () 776object::~object ()
750{ 777{
778 unlink ();
779
751 free_key_values (this); 780 free_key_values (this);
752} 781}
753 782
783static int object_count;
784
754void object::link () 785void object::link ()
755{ 786{
787 assert (!index);//D
788 uuid = UUID::gen ();
756 count = ++ob_count; 789 count = ++object_count;
757 uuid = gen_uuid ();
758 790
759 prev = 0; 791 refcnt_inc ();
760 next = object::first; 792 objects.insert (this);
761
762 if (object::first)
763 object::first->prev = this;
764
765 object::first = this;
766} 793}
767 794
768void object::unlink () 795void object::unlink ()
769{ 796{
770 if (this == object::first) 797 if (!index)
771 object::first = next; 798 return;
772 799
773 /* Remove this object from the list of used objects */ 800 objects.erase (this);
774 if (prev) prev->next = next; 801 refcnt_dec ();
775 if (next) next->prev = prev; 802}
776 803
777 prev = 0; 804void
778 next = 0; 805object::activate ()
806{
807 /* If already on active list, don't do anything */
808 if (active)
809 return;
810
811 if (has_active_speed ())
812 actives.insert (this);
813}
814
815void
816object::activate_recursive ()
817{
818 activate ();
819
820 for (object *op = inv; op; op = op->below)
821 op->activate_recursive ();
822}
823
824/* This function removes object 'op' from the list of active
825 * objects.
826 * This should only be used for style maps or other such
827 * reference maps where you don't want an object that isn't
828 * in play chewing up cpu time getting processed.
829 * The reverse of this is to call update_ob_speed, which
830 * will do the right thing based on the speed of the object.
831 */
832void
833object::deactivate ()
834{
835 /* If not on the active list, nothing needs to be done */
836 if (!active)
837 return;
838
839 actives.erase (this);
840}
841
842void
843object::deactivate_recursive ()
844{
845 for (object *op = inv; op; op = op->below)
846 op->deactivate_recursive ();
847
848 deactivate ();
849}
850
851void
852object::set_flag_inv (int flag, int value)
853{
854 for (object *op = inv; op; op = op->below)
855 {
856 op->flag [flag] = value;
857 op->set_flag_inv (flag, value);
858 }
859}
860
861/*
862 * Remove and free all objects in the inventory of the given object.
863 * object.c ?
864 */
865void
866object::destroy_inv (bool drop_to_ground)
867{
868 // need to check first, because the checks below might segfault
869 // as we might be on an invalid mapspace and crossfire code
870 // is too buggy to ensure that the inventory is empty.
871 // corollary: if you create arrows etc. with stuff in tis inventory,
872 // cf will crash below with off-map x and y
873 if (!inv)
874 return;
875
876 /* Only if the space blocks everything do we not process -
877 * if some form of movement is allowed, let objects
878 * drop on that space.
879 */
880 if (!drop_to_ground
881 || !map
882 || map->in_memory != MAP_ACTIVE
883 || map->nodrop
884 || ms ().move_block == MOVE_ALL)
885 {
886 while (inv)
887 {
888 inv->destroy_inv (drop_to_ground);
889 inv->destroy ();
890 }
891 }
892 else
893 { /* Put objects in inventory onto this space */
894 while (inv)
895 {
896 object *op = inv;
897
898 if (op->flag [FLAG_STARTEQUIP]
899 || op->flag [FLAG_NO_DROP]
900 || op->type == RUNE
901 || op->type == TRAP
902 || op->flag [FLAG_IS_A_TEMPLATE]
903 || op->flag [FLAG_DESTROY_ON_DEATH])
904 op->destroy ();
905 else
906 map->insert (op, x, y);
907 }
908 }
779} 909}
780 910
781object *object::create () 911object *object::create ()
782{ 912{
783 object *op = new object; 913 object *op = new object;
784 op->link (); 914 op->link ();
785 return op; 915 return op;
786} 916}
787 917
788/*
789 * free_object() frees everything allocated by an object, removes
790 * it from the list of used objects, and puts it on the list of
791 * free objects. The IS_FREED() flag is set in the object.
792 * The object must have been removed by remove_ob() first for
793 * this function to succeed.
794 *
795 * If destroy_inventory is set, free inventory as well. Else drop items in
796 * inventory to the ground.
797 */
798void 918void
799object::do_destroy () 919object::do_destroy ()
800{ 920{
801 attachable::do_destroy (); 921 attachable::do_destroy ();
802 922
807 remove_friendly_object (this); 927 remove_friendly_object (this);
808 928
809 if (!flag [FLAG_REMOVED]) 929 if (!flag [FLAG_REMOVED])
810 remove (); 930 remove ();
811 931
812 if (flag [FLAG_FREED]) 932 destroy_inv (true);
813 return; 933
934 deactivate ();
935 unlink ();
814 936
815 flag [FLAG_FREED] = 1; 937 flag [FLAG_FREED] = 1;
816 938
817 // hack to ensure that freed objects still have a valid map 939 // hack to ensure that freed objects still have a valid map
818 { 940 {
820 942
821 if (!freed_map) 943 if (!freed_map)
822 { 944 {
823 freed_map = new maptile; 945 freed_map = new maptile;
824 946
947 freed_map->path = "<freed objects map>";
825 freed_map->name = "/internal/freed_objects_map"; 948 freed_map->name = "/internal/freed_objects_map";
826 freed_map->width = 3; 949 freed_map->width = 3;
827 freed_map->height = 3; 950 freed_map->height = 3;
951 freed_map->nodrop = 1;
828 952
829 freed_map->allocate (); 953 freed_map->alloc ();
954 freed_map->in_memory = MAP_ACTIVE;
830 } 955 }
831 956
832 map = freed_map; 957 map = freed_map;
833 x = 1; 958 x = 1;
834 y = 1; 959 y = 1;
835 } 960 }
836 961
962 if (more)
963 {
964 more->destroy ();
837 more = 0; 965 more = 0;
966 }
967
838 head = 0; 968 head = 0;
839 inv = 0;
840 969
841 // clear those pointers that likely might have circular references to us 970 // clear those pointers that likely might cause circular references
842 owner = 0; 971 owner = 0;
843 enemy = 0; 972 enemy = 0;
844 attacked_by = 0; 973 attacked_by = 0;
845 974 current_weapon = 0;
846 // only relevant for players(?), but make sure of it anyways
847 contr = 0;
848
849 /* Remove object from the active list */
850 speed = 0;
851 update_ob_speed (this);
852
853 unlink ();
854}
855
856/*
857 * Remove and free all objects in the inventory of the given object.
858 * object.c ?
859 */
860void
861object::destroy_inv (bool drop_to_ground)
862{
863 if (!inv)
864 return;
865
866 /* Only if the space blocks everything do we not process -
867 * if some form of movement is allowed, let objects
868 * drop on that space.
869 */
870 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
871 {
872 while (inv)
873 {
874 inv->destroy_inv (drop_to_ground);
875 inv->destroy ();
876 }
877 }
878 else
879 { /* Put objects in inventory onto this space */
880 while (inv)
881 {
882 object *op = inv;
883
884 if (op->flag [FLAG_STARTEQUIP]
885 || op->flag [FLAG_NO_DROP]
886 || op->type == RUNE
887 || op->type == TRAP
888 || op->flag [FLAG_IS_A_TEMPLATE])
889 op->destroy ();
890 else
891 {
892 op->remove ();
893 op->x = x;
894 op->y = y;
895 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
896 }
897 }
898 }
899} 975}
900 976
901void 977void
902object::destroy (bool destroy_inventory) 978object::destroy (bool destroy_inventory)
903{ 979{
904 if (destroyed ()) 980 if (destroyed ())
905 return; 981 return;
906 982
907 if (more)
908 {
909 //TODO: non-head objects must not have inventory
910 more->destroy (destroy_inventory);
911 more = 0;
912 }
913
914 if (destroy_inventory) 983 if (destroy_inventory)
915 destroy_inv (true); 984 destroy_inv (false);
985
986 if (is_head ())
987 if (sound_destroy)
988 play_sound (sound_destroy);
989 else if (flag [FLAG_MONSTER])
990 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
916 991
917 attachable::destroy (); 992 attachable::destroy ();
918}
919
920/*
921 * sub_weight() recursively (outwards) subtracts a number from the
922 * weight of an object (and what is carried by it's environment(s)).
923 */
924void
925sub_weight (object *op, signed long weight)
926{
927 while (op != NULL)
928 {
929 if (op->type == CONTAINER)
930 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
931
932 op->carrying -= weight;
933 op = op->env;
934 }
935} 993}
936 994
937/* op->remove (): 995/* op->remove ():
938 * This function removes the object op from the linked list of objects 996 * This function removes the object op from the linked list of objects
939 * which it is currently tied to. When this function is done, the 997 * which it is currently tied to. When this function is done, the
940 * object will have no environment. If the object previously had an 998 * object will have no environment. If the object previously had an
941 * environment, the x and y coordinates will be updated to 999 * environment, the x and y coordinates will be updated to
942 * the previous environment. 1000 * the previous environment.
943 * Beware: This function is called from the editor as well!
944 */ 1001 */
945void 1002void
946object::remove () 1003object::do_remove ()
947{ 1004{
948 object *tmp, *last = 0; 1005 object *tmp, *last = 0;
949 object *otmp; 1006 object *otmp;
950 1007
951 if (QUERY_FLAG (this, FLAG_REMOVED)) 1008 if (QUERY_FLAG (this, FLAG_REMOVED))
961 * In this case, the object to be removed is in someones 1018 * In this case, the object to be removed is in someones
962 * inventory. 1019 * inventory.
963 */ 1020 */
964 if (env) 1021 if (env)
965 { 1022 {
1023 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
966 if (nrof) 1027 if (below)
967 sub_weight (env, weight * nrof); 1028 below->above = above;
968 else 1029
969 sub_weight (env, weight + carrying); 1030 /* we set up values so that it could be inserted into
1031 * the map, but we don't actually do that - it is up
1032 * to the caller to decide what we want to do.
1033 */
1034 map = env->map;
1035 x = env->x;
1036 y = env->y;
1037 above = 0;
1038 below = 0;
1039 env = 0;
970 1040
971 /* NO_FIX_PLAYER is set when a great many changes are being 1041 /* NO_FIX_PLAYER is set when a great many changes are being
972 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
973 * to save cpu time. 1043 * to save cpu time.
974 */ 1044 */
975 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
976 otmp->update_stats (); 1046 otmp->update_stats ();
977
978 if (above != NULL)
979 above->below = below;
980 else
981 env->inv = below;
982
983 if (below != NULL)
984 below->above = above;
985
986 /* we set up values so that it could be inserted into
987 * the map, but we don't actually do that - it is up
988 * to the caller to decide what we want to do.
989 */
990 x = env->x, y = env->y;
991 map = env->map;
992 above = 0, below = 0;
993 env = 0;
994 } 1047 }
995 else if (map) 1048 else if (map)
996 { 1049 {
997 /* Re did the following section of code - it looks like it had 1050 if (type == PLAYER)
998 * lots of logic for things we no longer care about
999 */ 1051 {
1052 // leaving a spot always closes any open container on the ground
1053 if (container && !container->env)
1054 // this causes spurious floorbox updates, but it ensures
1055 // that the CLOSE event is being sent.
1056 close_container ();
1057
1058 --map->players;
1059 map->touch ();
1060 }
1061
1062 map->dirty = true;
1063 mapspace &ms = this->ms ();
1000 1064
1001 /* link the object above us */ 1065 /* link the object above us */
1002 if (above) 1066 if (above)
1003 above->below = below; 1067 above->below = below;
1004 else 1068 else
1005 map->at (x, y).top = below; /* we were top, set new top */ 1069 ms.top = below; /* we were top, set new top */
1006 1070
1007 /* Relink the object below us, if there is one */ 1071 /* Relink the object below us, if there is one */
1008 if (below) 1072 if (below)
1009 below->above = above; 1073 below->above = above;
1010 else 1074 else
1012 /* Nothing below, which means we need to relink map object for this space 1076 /* Nothing below, which means we need to relink map object for this space
1013 * use translated coordinates in case some oddness with map tiling is 1077 * use translated coordinates in case some oddness with map tiling is
1014 * evident 1078 * evident
1015 */ 1079 */
1016 if (GET_MAP_OB (map, x, y) != this) 1080 if (GET_MAP_OB (map, x, y) != this)
1017 {
1018 char *dump = dump_object (this);
1019 LOG (llevError,
1020 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1081 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1021 free (dump);
1022 dump = dump_object (GET_MAP_OB (map, x, y));
1023 LOG (llevError, "%s\n", dump);
1024 free (dump);
1025 }
1026 1082
1027 map->at (x, y).bot = above; /* goes on above it. */ 1083 ms.bot = above; /* goes on above it. */
1028 } 1084 }
1029 1085
1030 above = 0; 1086 above = 0;
1031 below = 0; 1087 below = 0;
1032 1088
1033 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
1034 return; 1090 return;
1035 1091
1036 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
1037 1093
1094 if (object *pl = ms.player ())
1095 {
1096 if (pl->container == this)
1097 /* If a container that the player is currently using somehow gets
1098 * removed (most likely destroyed), update the player view
1099 * appropriately.
1100 */
1101 pl->close_container ();
1102
1103 pl->contr->ns->floorbox_update ();
1104 }
1105
1038 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1106 for (tmp = ms.bot; tmp; tmp = tmp->above)
1039 { 1107 {
1040 /* No point updating the players look faces if he is the object 1108 /* No point updating the players look faces if he is the object
1041 * being removed. 1109 * being removed.
1042 */ 1110 */
1043 1111
1044 if (tmp->type == PLAYER && tmp != this)
1045 {
1046 /* If a container that the player is currently using somehow gets
1047 * removed (most likely destroyed), update the player view
1048 * appropriately.
1049 */
1050 if (tmp->container == this)
1051 {
1052 flag [FLAG_APPLIED] = 0;
1053 tmp->container = 0;
1054 }
1055
1056 if (tmp->contr->ns)
1057 tmp->contr->ns->floorbox_update ();
1058 }
1059
1060 /* See if player moving off should effect something */ 1112 /* See if object moving off should effect something */
1061 if (check_walk_off 1113 if (check_walk_off
1062 && ((move_type & tmp->move_off) 1114 && ((move_type & tmp->move_off)
1063 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1064 { 1116 {
1065 move_apply (tmp, this, 0); 1117 move_apply (tmp, this, 0);
1066 1118
1067 if (destroyed ()) 1119 if (destroyed ())
1068 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1120 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1069 } 1121 }
1070 1122
1071 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1072
1073 if (tmp->above == tmp)
1074 tmp->above = 0;
1075
1076 last = tmp; 1123 last = tmp;
1077 } 1124 }
1078 1125
1079 /* last == NULL of there are no objects on this space */ 1126 /* last == NULL if there are no objects on this space */
1127 //TODO: this makes little sense, why only update the topmost object?
1080 if (!last) 1128 if (!last)
1081 map->at (x, y).flags_ = P_NEED_UPDATE; 1129 map->at (x, y).flags_ = 0;
1082 else 1130 else
1083 update_object (last, UP_OBJ_REMOVE); 1131 update_object (last, UP_OBJ_REMOVE);
1084 1132
1085 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1133 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1086 update_all_los (map, x, y); 1134 update_all_los (map, x, y);
1099merge_ob (object *op, object *top) 1147merge_ob (object *op, object *top)
1100{ 1148{
1101 if (!op->nrof) 1149 if (!op->nrof)
1102 return 0; 1150 return 0;
1103 1151
1104 if (top) 1152 if (!top)
1105 for (top = op; top && top->above; top = top->above) 1153 for (top = op; top && top->above; top = top->above)
1106 ; 1154 ;
1107 1155
1108 for (; top; top = top->below) 1156 for (; top; top = top->below)
1109 { 1157 {
1122 } 1170 }
1123 1171
1124 return 0; 1172 return 0;
1125} 1173}
1126 1174
1175void
1176object::expand_tail ()
1177{
1178 if (more)
1179 return;
1180
1181 object *prev = this;
1182
1183 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1184 {
1185 object *op = arch_to_object (at);
1186
1187 op->name = name;
1188 op->name_pl = name_pl;
1189 op->title = title;
1190
1191 op->head = this;
1192 prev->more = op;
1193
1194 prev = op;
1195 }
1196}
1197
1127/* 1198/*
1128 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1199 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1129 * job preparing multi-part monsters 1200 * job preparing multi-part monsters.
1130 */ 1201 */
1131object * 1202object *
1132insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1203insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1133{ 1204{
1134 object *tmp;
1135
1136 if (op->head)
1137 op = op->head;
1138
1139 for (tmp = op; tmp; tmp = tmp->more) 1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140 { 1206 {
1141 tmp->x = x + tmp->arch->clone.x; 1207 tmp->x = x + tmp->arch->x;
1142 tmp->y = y + tmp->arch->clone.y; 1208 tmp->y = y + tmp->arch->y;
1143 } 1209 }
1144 1210
1145 return insert_ob_in_map (op, m, originator, flag); 1211 return insert_ob_in_map (op, m, originator, flag);
1146} 1212}
1147 1213
1166 * just 'op' otherwise 1232 * just 'op' otherwise
1167 */ 1233 */
1168object * 1234object *
1169insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1170{ 1236{
1237 assert (!op->flag [FLAG_FREED]);
1238
1171 object *tmp, *top, *floor = NULL; 1239 object *top, *floor = NULL;
1172 sint16 x, y;
1173 1240
1174 if (QUERY_FLAG (op, FLAG_FREED)) 1241 op->remove ();
1175 {
1176 LOG (llevError, "Trying to insert freed object!\n");
1177 return NULL;
1178 }
1179
1180 if (m == NULL)
1181 {
1182 char *dump = dump_object (op);
1183 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1184 free (dump);
1185 return op;
1186 }
1187
1188 if (out_of_map (m, op->x, op->y))
1189 {
1190 char *dump = dump_object (op);
1191 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1192#ifdef MANY_CORES
1193 /* Better to catch this here, as otherwise the next use of this object
1194 * is likely to cause a crash. Better to find out where it is getting
1195 * improperly inserted.
1196 */
1197 abort ();
1198#endif
1199 free (dump);
1200 return op;
1201 }
1202
1203 if (!QUERY_FLAG (op, FLAG_REMOVED))
1204 {
1205 char *dump = dump_object (op);
1206 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1207 free (dump);
1208 return op;
1209 }
1210
1211 if (op->more)
1212 {
1213 /* The part may be on a different map. */
1214
1215 object *more = op->more;
1216
1217 /* We really need the caller to normalize coordinates - if
1218 * we set the map, that doesn't work if the location is within
1219 * a map and this is straddling an edge. So only if coordinate
1220 * is clear wrong do we normalize it.
1221 */
1222 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1223 more->map = get_map_from_coord (m, &more->x, &more->y);
1224 else if (!more->map)
1225 {
1226 /* For backwards compatibility - when not dealing with tiled maps,
1227 * more->map should always point to the parent.
1228 */
1229 more->map = m;
1230 }
1231
1232 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1233 {
1234 if (!op->head)
1235 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1236
1237 return 0;
1238 }
1239 }
1240
1241 CLEAR_FLAG (op, FLAG_REMOVED);
1242 1242
1243 /* Ideally, the caller figures this out. However, it complicates a lot 1243 /* Ideally, the caller figures this out. However, it complicates a lot
1244 * of areas of callers (eg, anything that uses find_free_spot would now 1244 * of areas of callers (eg, anything that uses find_free_spot would now
1245 * need extra work 1245 * need extra work
1246 */ 1246 */
1247 op->map = get_map_from_coord (m, &op->x, &op->y); 1247 if (!xy_normalise (m, op->x, op->y))
1248 x = op->x; 1248 {
1249 y = op->y; 1249 op->destroy ();
1250 return 0;
1251 }
1252
1253 if (object *more = op->more)
1254 if (!insert_ob_in_map (more, m, originator, flag))
1255 return 0;
1256
1257 CLEAR_FLAG (op, FLAG_REMOVED);
1258
1259 op->map = m;
1260 mapspace &ms = op->ms ();
1250 1261
1251 /* this has to be done after we translate the coordinates. 1262 /* this has to be done after we translate the coordinates.
1252 */ 1263 */
1253 if (op->nrof && !(flag & INS_NO_MERGE)) 1264 if (op->nrof && !(flag & INS_NO_MERGE))
1254 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1255 if (object::can_merge (op, tmp)) 1266 if (object::can_merge (op, tmp))
1256 { 1267 {
1257 op->nrof += tmp->nrof; 1268 op->nrof += tmp->nrof;
1258 tmp->destroy (); 1269 tmp->destroy (1);
1259 } 1270 }
1260 1271
1261 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1272 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1262 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1273 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1263 1274
1276 op->below = originator->below; 1287 op->below = originator->below;
1277 1288
1278 if (op->below) 1289 if (op->below)
1279 op->below->above = op; 1290 op->below->above = op;
1280 else 1291 else
1281 op->ms ().bot = op; 1292 ms.bot = op;
1282 1293
1283 /* since *below* originator, no need to update top */ 1294 /* since *below* originator, no need to update top */
1284 originator->below = op; 1295 originator->below = op;
1285 } 1296 }
1286 else 1297 else
1287 { 1298 {
1299 top = ms.bot;
1300
1288 /* If there are other objects, then */ 1301 /* If there are other objects, then */
1289 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1302 if (top)
1290 { 1303 {
1291 object *last = NULL; 1304 object *last = 0;
1292 1305
1293 /* 1306 /*
1294 * If there are multiple objects on this space, we do some trickier handling. 1307 * If there are multiple objects on this space, we do some trickier handling.
1295 * We've already dealt with merging if appropriate. 1308 * We've already dealt with merging if appropriate.
1296 * Generally, we want to put the new object on top. But if 1309 * Generally, we want to put the new object on top. But if
1300 * once we get to them. This reduces the need to traverse over all of 1313 * once we get to them. This reduces the need to traverse over all of
1301 * them when adding another one - this saves quite a bit of cpu time 1314 * them when adding another one - this saves quite a bit of cpu time
1302 * when lots of spells are cast in one area. Currently, it is presumed 1315 * when lots of spells are cast in one area. Currently, it is presumed
1303 * that flying non pickable objects are spell objects. 1316 * that flying non pickable objects are spell objects.
1304 */ 1317 */
1305 1318 for (top = ms.bot; top; top = top->above)
1306 while (top != NULL)
1307 { 1319 {
1308 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1320 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1309 floor = top; 1321 floor = top;
1310 1322
1311 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1323 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1314 top = top->below; 1326 top = top->below;
1315 break; 1327 break;
1316 } 1328 }
1317 1329
1318 last = top; 1330 last = top;
1319 top = top->above;
1320 } 1331 }
1321 1332
1322 /* Don't want top to be NULL, so set it to the last valid object */ 1333 /* Don't want top to be NULL, so set it to the last valid object */
1323 top = last; 1334 top = last;
1324 1335
1326 * looks like instead of lots of conditions here. 1337 * looks like instead of lots of conditions here.
1327 * makes things faster, and effectively the same result. 1338 * makes things faster, and effectively the same result.
1328 */ 1339 */
1329 1340
1330 /* Have object 'fall below' other objects that block view. 1341 /* Have object 'fall below' other objects that block view.
1331 * Unless those objects are exits, type 66 1342 * Unless those objects are exits.
1332 * If INS_ON_TOP is used, don't do this processing 1343 * If INS_ON_TOP is used, don't do this processing
1333 * Need to find the object that in fact blocks view, otherwise 1344 * Need to find the object that in fact blocks view, otherwise
1334 * stacking is a bit odd. 1345 * stacking is a bit odd.
1335 */ 1346 */
1336 if (!(flag & INS_ON_TOP) && 1347 if (!(flag & INS_ON_TOP)
1337 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1348 && ms.flags () & P_BLOCKSVIEW
1349 && (op->face && !faces [op->face].visibility))
1338 { 1350 {
1339 for (last = top; last != floor; last = last->below) 1351 for (last = top; last != floor; last = last->below)
1340 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1352 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1341 break; 1353 break;
1354
1342 /* Check to see if we found the object that blocks view, 1355 /* Check to see if we found the object that blocks view,
1343 * and make sure we have a below pointer for it so that 1356 * and make sure we have a below pointer for it so that
1344 * we can get inserted below this one, which requires we 1357 * we can get inserted below this one, which requires we
1345 * set top to the object below us. 1358 * set top to the object below us.
1346 */ 1359 */
1347 if (last && last->below && last != floor) 1360 if (last && last->below && last != floor)
1348 top = last->below; 1361 top = last->below;
1349 } 1362 }
1350 } /* If objects on this space */ 1363 } /* If objects on this space */
1351 1364
1352 if (flag & INS_MAP_LOAD)
1353 top = GET_MAP_TOP (op->map, op->x, op->y);
1354
1355 if (flag & INS_ABOVE_FLOOR_ONLY) 1365 if (flag & INS_ABOVE_FLOOR_ONLY)
1356 top = floor; 1366 top = floor;
1357 1367
1358 /* Top is the object that our object (op) is going to get inserted above. 1368 /* Top is the object that our object (op) is going to get inserted above.
1359 */ 1369 */
1360 1370
1361 /* First object on this space */ 1371 /* First object on this space */
1362 if (!top) 1372 if (!top)
1363 { 1373 {
1364 op->above = GET_MAP_OB (op->map, op->x, op->y); 1374 op->above = ms.bot;
1365 1375
1366 if (op->above) 1376 if (op->above)
1367 op->above->below = op; 1377 op->above->below = op;
1368 1378
1369 op->below = NULL; 1379 op->below = 0;
1370 op->ms ().bot = op; 1380 ms.bot = op;
1371 } 1381 }
1372 else 1382 else
1373 { /* get inserted into the stack above top */ 1383 { /* get inserted into the stack above top */
1374 op->above = top->above; 1384 op->above = top->above;
1375 1385
1378 1388
1379 op->below = top; 1389 op->below = top;
1380 top->above = op; 1390 top->above = op;
1381 } 1391 }
1382 1392
1383 if (op->above == NULL) 1393 if (!op->above)
1384 op->ms ().top = op; 1394 ms.top = op;
1385 } /* else not INS_BELOW_ORIGINATOR */ 1395 } /* else not INS_BELOW_ORIGINATOR */
1386 1396
1387 if (op->type == PLAYER) 1397 if (op->type == PLAYER)
1398 {
1388 op->contr->do_los = 1; 1399 op->contr->do_los = 1;
1400 ++op->map->players;
1401 op->map->touch ();
1402 }
1389 1403
1390 /* If we have a floor, we know the player, if any, will be above 1404 op->map->dirty = true;
1391 * it, so save a few ticks and start from there. 1405
1392 */
1393 if (!(flag & INS_MAP_LOAD))
1394 if (object *pl = op->ms ().player ()) 1406 if (object *pl = ms.player ())
1395 if (pl->contr->ns)
1396 pl->contr->ns->floorbox_update (); 1407 pl->contr->ns->floorbox_update ();
1397 1408
1398 /* If this object glows, it may affect lighting conditions that are 1409 /* If this object glows, it may affect lighting conditions that are
1399 * visible to others on this map. But update_all_los is really 1410 * visible to others on this map. But update_all_los is really
1400 * an inefficient way to do this, as it means los for all players 1411 * an inefficient way to do this, as it means los for all players
1401 * on the map will get recalculated. The players could very well 1412 * on the map will get recalculated. The players could very well
1402 * be far away from this change and not affected in any way - 1413 * be far away from this change and not affected in any way -
1403 * this should get redone to only look for players within range, 1414 * this should get redone to only look for players within range,
1404 * or just updating the P_NEED_UPDATE for spaces within this area 1415 * or just updating the P_UPTODATE for spaces within this area
1405 * of effect may be sufficient. 1416 * of effect may be sufficient.
1406 */ 1417 */
1407 if (op->map->darkness && (op->glow_radius != 0)) 1418 if (op->map->darkness && (op->glow_radius != 0))
1408 update_all_los (op->map, op->x, op->y); 1419 update_all_los (op->map, op->x, op->y);
1409 1420
1420 * blocked() and wall() work properly), and these flags are updated by 1431 * blocked() and wall() work properly), and these flags are updated by
1421 * update_object(). 1432 * update_object().
1422 */ 1433 */
1423 1434
1424 /* if this is not the head or flag has been passed, don't check walk on status */ 1435 /* if this is not the head or flag has been passed, don't check walk on status */
1425 if (!(flag & INS_NO_WALK_ON) && !op->head) 1436 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1426 { 1437 {
1427 if (check_move_on (op, originator)) 1438 if (check_move_on (op, originator))
1428 return 0; 1439 return 0;
1429 1440
1430 /* If we are a multi part object, lets work our way through the check 1441 /* If we are a multi part object, lets work our way through the check
1431 * walk on's. 1442 * walk on's.
1432 */ 1443 */
1433 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1444 for (object *tmp = op->more; tmp; tmp = tmp->more)
1434 if (check_move_on (tmp, originator)) 1445 if (check_move_on (tmp, originator))
1435 return 0; 1446 return 0;
1436 } 1447 }
1437 1448
1438 return op; 1449 return op;
1443 * op is the object to insert it under: supplies x and the map. 1454 * op is the object to insert it under: supplies x and the map.
1444 */ 1455 */
1445void 1456void
1446replace_insert_ob_in_map (const char *arch_string, object *op) 1457replace_insert_ob_in_map (const char *arch_string, object *op)
1447{ 1458{
1448 object *tmp, *tmp1;
1449
1450 /* first search for itself and remove any old instances */ 1459 /* first search for itself and remove any old instances */
1451 1460
1452 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1461 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1462 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1454 tmp->destroy (); 1463 tmp->destroy (1);
1455 1464
1456 tmp1 = arch_to_object (archetype::find (arch_string)); 1465 object *tmp = arch_to_object (archetype::find (arch_string));
1457 1466
1458 tmp1->x = op->x; 1467 tmp->x = op->x;
1459 tmp1->y = op->y; 1468 tmp->y = op->y;
1469
1460 insert_ob_in_map (tmp1, op->map, op, 0); 1470 insert_ob_in_map (tmp, op->map, op, 0);
1461} 1471}
1462
1463/*
1464 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1465 * is returned contains nr objects, and the remaining parts contains
1466 * the rest (or is removed and freed if that number is 0).
1467 * On failure, NULL is returned, and the reason put into the
1468 * global static errmsg array.
1469 */
1470 1472
1471object * 1473object *
1472get_split_ob (object *orig_ob, uint32 nr) 1474object::insert_at (object *where, object *originator, int flags)
1473{ 1475{
1474 object *newob; 1476 if (where->env)
1475 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1477 return where->env->insert (this);
1478 else
1479 return where->map->insert (this, where->x, where->y, originator, flags);
1480}
1476 1481
1477 if (orig_ob->nrof < nr) 1482// find player who can see this object
1478 { 1483static object *
1479 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1484visible_to (object *op)
1480 return NULL; 1485{
1486 if (!op->flag [FLAG_REMOVED])
1481 } 1487 {
1482 1488 // see if we are in a container of sorts
1483 newob = object_create_clone (orig_ob); 1489 if (object *env = op->env)
1484
1485 if ((orig_ob->nrof -= nr) < 1)
1486 orig_ob->destroy (1);
1487 else if (!is_removed)
1488 {
1489 if (orig_ob->env != NULL)
1490 sub_weight (orig_ob->env, orig_ob->weight * nr);
1491 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1492 {
1493 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1494 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1495 return NULL;
1496 } 1490 {
1497 } 1491 // the player inventory itself is always visible
1492 if (env->type == PLAYER)
1493 return env;
1498 1494
1499 newob->nrof = nr; 1495 // else a player could have our env open
1496 env = env->outer_env ();
1500 1497
1498 // the player itself is always on a map, so we will find him here
1499 // even if our inv is in a player.
1500 if (env->is_on_map ())
1501 if (object *pl = env->ms ().player ())
1502 if (pl->container == op->env)
1503 return pl;
1504 }
1505 else
1506 {
1507 // maybe there is a player standing on the same mapspace
1508 if (object *pl = env->ms ().player ())
1509 return pl;
1510 }
1511 }
1512
1501 return newob; 1513 return 0;
1502} 1514}
1503 1515
1504/* 1516/*
1505 * decrease_ob_nr(object, number) decreases a specified number from 1517 * decrease(object, number) decreases a specified number from
1506 * the amount of an object. If the amount reaches 0, the object 1518 * the amount of an object. If the amount reaches 0, the object
1507 * is subsequently removed and freed. 1519 * is subsequently removed and freed.
1508 * 1520 *
1509 * Return value: 'op' if something is left, NULL if the amount reached 0 1521 * Return value: 'op' if something is left, NULL if the amount reached 0
1510 */ 1522 */
1523bool
1524object::decrease (sint32 nr)
1525{
1526 nr = min (nr, nrof);
1511 1527
1528 if (!nr)
1529 return 1;
1530
1531 nrof -= nr;
1532
1533 object *visible = visible_to (this);
1534
1535 if (nrof)
1536 {
1537 adjust_weight (env, -weight * nr); // carrying == 0
1538
1539 if (visible)
1540 esrv_send_item (visible, this);
1541
1542 return 1;
1543 }
1544 else
1545 {
1546 if (visible)
1547 esrv_del_item (visible->contr, count);
1548
1549 this->destroy (1);
1550 return 0;
1551 }
1552}
1553
1554/*
1555 * split(ob,nr) splits up ob into two parts. The part which
1556 * is returned contains nr objects, and the remaining parts contains
1557 * the rest (or is removed and returned if that number is 0).
1558 * On failure, NULL is returned.
1559 */
1512object * 1560object *
1513decrease_ob_nr (object *op, uint32 i) 1561object::split (sint32 nr)
1514{ 1562{
1515 object *tmp; 1563 if (nrof < nr)
1516
1517 if (i == 0) /* objects with op->nrof require this check */
1518 return op; 1564 return 0;
1519 1565 else if (nrof == nr)
1520 if (i > op->nrof)
1521 i = op->nrof;
1522
1523 if (QUERY_FLAG (op, FLAG_REMOVED))
1524 op->nrof -= i;
1525 else if (op->env)
1526 { 1566 {
1527 /* is this object in the players inventory, or sub container
1528 * therein?
1529 */
1530 tmp = op->in_player ();
1531 /* nope. Is this a container the player has opened?
1532 * If so, set tmp to that player.
1533 * IMO, searching through all the players will mostly
1534 * likely be quicker than following op->env to the map,
1535 * and then searching the map for a player.
1536 */
1537 if (!tmp)
1538 for_all_players (pl)
1539 if (pl->ob->container == op->env)
1540 {
1541 tmp = pl->ob;
1542 break;
1543 }
1544
1545 if (i < op->nrof)
1546 {
1547 sub_weight (op->env, op->weight * i);
1548 op->nrof -= i;
1549 if (tmp)
1550 esrv_send_item (tmp, op);
1551 }
1552 else
1553 {
1554 op->remove (); 1567 remove ();
1555 op->nrof = 0; 1568 return this;
1556 if (tmp)
1557 esrv_del_item (tmp->contr, op->count);
1558 }
1559 } 1569 }
1560 else 1570 else
1561 { 1571 {
1562 object *above = op->above; 1572 decrease (nr);
1563 1573
1564 if (i < op->nrof) 1574 object *op = object_create_clone (this);
1565 op->nrof -= i; 1575 op->nrof = nr;
1566 else
1567 {
1568 op->remove ();
1569 op->nrof = 0;
1570 }
1571
1572 /* Since we just removed op, op->above is null */
1573 for (tmp = above; tmp; tmp = tmp->above)
1574 if (tmp->type == PLAYER)
1575 {
1576 if (op->nrof)
1577 esrv_send_item (tmp, op);
1578 else
1579 esrv_del_item (tmp->contr, op->count);
1580 }
1581 }
1582
1583 if (op->nrof)
1584 return op; 1576 return op;
1585 else
1586 {
1587 op->destroy ();
1588 return 0;
1589 }
1590}
1591
1592/*
1593 * add_weight(object, weight) adds the specified weight to an object,
1594 * and also updates how much the environment(s) is/are carrying.
1595 */
1596
1597void
1598add_weight (object *op, signed long weight)
1599{
1600 while (op != NULL)
1601 {
1602 if (op->type == CONTAINER)
1603 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1604
1605 op->carrying += weight;
1606 op = op->env;
1607 } 1577 }
1608} 1578}
1609 1579
1610object * 1580object *
1611insert_ob_in_ob (object *op, object *where) 1581insert_ob_in_ob (object *op, object *where)
1616 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1586 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1617 free (dump); 1587 free (dump);
1618 return op; 1588 return op;
1619 } 1589 }
1620 1590
1621 if (where->head) 1591 if (where->head_ () != where)
1622 { 1592 {
1623 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1593 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1624 where = where->head; 1594 where = where->head;
1625 } 1595 }
1626 1596
1627 return where->insert (op); 1597 return where->insert (op);
1628} 1598}
1633 * inside the object environment. 1603 * inside the object environment.
1634 * 1604 *
1635 * The function returns now pointer to inserted item, and return value can 1605 * The function returns now pointer to inserted item, and return value can
1636 * be != op, if items are merged. -Tero 1606 * be != op, if items are merged. -Tero
1637 */ 1607 */
1638
1639object * 1608object *
1640object::insert (object *op) 1609object::insert (object *op)
1641{ 1610{
1642 object *tmp, *otmp;
1643
1644 if (!QUERY_FLAG (op, FLAG_REMOVED))
1645 op->remove ();
1646
1647 if (op->more) 1611 if (op->more)
1648 { 1612 {
1649 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1613 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1650 return op; 1614 return op;
1651 } 1615 }
1652 1616
1653 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1617 op->remove ();
1654 CLEAR_FLAG (op, FLAG_REMOVED); 1618
1619 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1620
1655 if (op->nrof) 1621 if (op->nrof)
1656 {
1657 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1622 for (object *tmp = inv; tmp; tmp = tmp->below)
1658 if (object::can_merge (tmp, op)) 1623 if (object::can_merge (tmp, op))
1659 { 1624 {
1660 /* return the original object and remove inserted object 1625 /* return the original object and remove inserted object
1661 (client needs the original object) */ 1626 (client needs the original object) */
1662 tmp->nrof += op->nrof; 1627 tmp->nrof += op->nrof;
1663 /* Weight handling gets pretty funky. Since we are adding to
1664 * tmp->nrof, we need to increase the weight.
1665 */
1666 add_weight (this, op->weight * op->nrof); 1628 adjust_weight (this, op->total_weight ());
1667 SET_FLAG (op, FLAG_REMOVED); 1629
1668 op->destroy (); /* free the inserted object */ 1630 op->destroy (1);
1669 op = tmp; 1631 op = tmp;
1670 op->remove (); /* and fix old object's links */ 1632 goto inserted;
1671 CLEAR_FLAG (op, FLAG_REMOVED);
1672 break;
1673 } 1633 }
1674 1634
1675 /* I assume combined objects have no inventory 1635 op->owner = 0; // it's his/hers now. period.
1676 * We add the weight - this object could have just been removed 1636 op->map = 0;
1677 * (if it was possible to merge). calling remove_ob will subtract 1637 op->x = 0;
1678 * the weight, so we need to add it in again, since we actually do 1638 op->y = 0;
1679 * the linking below
1680 */
1681 add_weight (this, op->weight * op->nrof);
1682 }
1683 else
1684 add_weight (this, (op->weight + op->carrying));
1685 1639
1686 otmp = this->in_player (); 1640 op->above = 0;
1687 if (otmp && otmp->contr) 1641 op->below = inv;
1642 op->env = this;
1643
1644 if (inv)
1645 inv->above = op;
1646
1647 inv = op;
1648
1649 op->flag [FLAG_REMOVED] = 0;
1650
1651 adjust_weight (this, op->total_weight ());
1652
1653inserted:
1654 /* reset the light list and los of the players on the map */
1655 if (op->glow_radius && map && map->darkness)
1656 update_all_los (map, x, y);
1657
1658 if (object *otmp = in_player ())
1688 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1659 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1689 otmp->update_stats (); 1660 otmp->update_stats ();
1690
1691 op->map = 0;
1692 op->env = this;
1693 op->above = 0;
1694 op->below = 0;
1695 op->x = 0, op->y = 0;
1696
1697 /* reset the light list and los of the players on the map */
1698 if ((op->glow_radius != 0) && map)
1699 {
1700#ifdef DEBUG_LIGHTS
1701 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1702#endif /* DEBUG_LIGHTS */
1703 if (map->darkness)
1704 update_all_los (map, x, y);
1705 }
1706
1707 /* Client has no idea of ordering so lets not bother ordering it here.
1708 * It sure simplifies this function...
1709 */
1710 if (!inv)
1711 inv = op;
1712 else
1713 {
1714 op->below = inv;
1715 op->below->above = op;
1716 inv = op;
1717 }
1718 1661
1719 INVOKE_OBJECT (INSERT, this); 1662 INVOKE_OBJECT (INSERT, this);
1720 1663
1721 return op; 1664 return op;
1722} 1665}
1739 * 1682 *
1740 * MSW 2001-07-08: Check all objects on space, not just those below 1683 * MSW 2001-07-08: Check all objects on space, not just those below
1741 * object being inserted. insert_ob_in_map may not put new objects 1684 * object being inserted. insert_ob_in_map may not put new objects
1742 * on top. 1685 * on top.
1743 */ 1686 */
1744
1745int 1687int
1746check_move_on (object *op, object *originator) 1688check_move_on (object *op, object *originator)
1747{ 1689{
1748 object *tmp; 1690 object *tmp;
1749 maptile *m = op->map; 1691 maptile *m = op->map;
1776 1718
1777 /* The objects have to be checked from top to bottom. 1719 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1720 * Hence, we first go to the top:
1779 */ 1721 */
1780 1722
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1723 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1724 {
1783 /* Trim the search when we find the first other spell effect 1725 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1726 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1727 * we don't need to check all of them.
1786 */ 1728 */
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1746 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1747 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1748 {
1807 1749
1808 float 1750 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1751 diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1752
1811 if (op->type == PLAYER) 1753 if (op->type == PLAYER)
1812 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1754 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1813 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1755 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814 diff /= 4.0; 1756 diff /= 4.0;
1844 * The first matching object is returned, or NULL if none. 1786 * The first matching object is returned, or NULL if none.
1845 */ 1787 */
1846object * 1788object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1789present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1790{
1849 if (m == NULL || out_of_map (m, x, y)) 1791 if (!m || out_of_map (m, x, y))
1850 { 1792 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1793 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1794 return NULL;
1853 } 1795 }
1854 1796
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1797 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1798 if (tmp->arch == at)
1857 return tmp; 1799 return tmp;
1858 1800
1859 return NULL; 1801 return NULL;
1860} 1802}
1871 { 1813 {
1872 LOG (llevError, "Present called outside map.\n"); 1814 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1815 return NULL;
1874 } 1816 }
1875 1817
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1818 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1819 if (tmp->type == type)
1878 return tmp; 1820 return tmp;
1879 1821
1880 return NULL; 1822 return NULL;
1881} 1823}
1938 * activate recursively a flag on an object inventory 1880 * activate recursively a flag on an object inventory
1939 */ 1881 */
1940void 1882void
1941flag_inv (object *op, int flag) 1883flag_inv (object *op, int flag)
1942{ 1884{
1943 if (op->inv)
1944 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1885 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1945 { 1886 {
1946 SET_FLAG (tmp, flag); 1887 SET_FLAG (tmp, flag);
1947 flag_inv (tmp, flag); 1888 flag_inv (tmp, flag);
1948 } 1889 }
1949} 1890}
1950 1891
1951/* 1892/*
1952 * deactivate recursively a flag on an object inventory 1893 * deactivate recursively a flag on an object inventory
1953 */ 1894 */
1954void 1895void
1955unflag_inv (object *op, int flag) 1896unflag_inv (object *op, int flag)
1956{ 1897{
1957 if (op->inv)
1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1898 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 { 1899 {
1960 CLEAR_FLAG (tmp, flag); 1900 CLEAR_FLAG (tmp, flag);
1961 unflag_inv (tmp, flag); 1901 unflag_inv (tmp, flag);
1962 } 1902 }
1963}
1964
1965/*
1966 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1967 * all it's inventory (recursively).
1968 * If checksums are used, a player will get set_cheat called for
1969 * him/her-self and all object carried by a call to this function.
1970 */
1971void
1972set_cheat (object *op)
1973{
1974 SET_FLAG (op, FLAG_WAS_WIZ);
1975 flag_inv (op, FLAG_WAS_WIZ);
1976} 1903}
1977 1904
1978/* 1905/*
1979 * find_free_spot(object, map, x, y, start, stop) will search for 1906 * find_free_spot(object, map, x, y, start, stop) will search for
1980 * a spot at the given map and coordinates which will be able to contain 1907 * a spot at the given map and coordinates which will be able to contain
1982 * to search (see the freearr_x/y[] definition). 1909 * to search (see the freearr_x/y[] definition).
1983 * It returns a random choice among the alternatives found. 1910 * It returns a random choice among the alternatives found.
1984 * start and stop are where to start relative to the free_arr array (1,9 1911 * start and stop are where to start relative to the free_arr array (1,9
1985 * does all 4 immediate directions). This returns the index into the 1912 * does all 4 immediate directions). This returns the index into the
1986 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1913 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1987 * Note - this only checks to see if there is space for the head of the
1988 * object - if it is a multispace object, this should be called for all
1989 * pieces.
1990 * Note2: This function does correctly handle tiled maps, but does not 1914 * Note: This function does correctly handle tiled maps, but does not
1991 * inform the caller. However, insert_ob_in_map will update as 1915 * inform the caller. However, insert_ob_in_map will update as
1992 * necessary, so the caller shouldn't need to do any special work. 1916 * necessary, so the caller shouldn't need to do any special work.
1993 * Note - updated to take an object instead of archetype - this is necessary 1917 * Note - updated to take an object instead of archetype - this is necessary
1994 * because arch_blocked (now ob_blocked) needs to know the movement type 1918 * because arch_blocked (now ob_blocked) needs to know the movement type
1995 * to know if the space in question will block the object. We can't use 1919 * to know if the space in question will block the object. We can't use
1997 * customized, changed states, etc. 1921 * customized, changed states, etc.
1998 */ 1922 */
1999int 1923int
2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1924find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2001{ 1925{
1926 int altern[SIZEOFFREE];
2002 int index = 0, flag; 1927 int index = 0, flag;
2003 int altern[SIZEOFFREE];
2004 1928
2005 for (int i = start; i < stop; i++) 1929 for (int i = start; i < stop; i++)
2006 { 1930 {
2007 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1931 mapxy pos (m, x, y); pos.move (i);
2008 if (!flag) 1932
1933 if (!pos.normalise ())
1934 continue;
1935
1936 mapspace &ms = *pos;
1937
1938 if (ms.flags () & P_IS_ALIVE)
1939 continue;
1940
1941 /* However, often
1942 * ob doesn't have any move type (when used to place exits)
1943 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1944 */
1945 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1946 {
2009 altern [index++] = i; 1947 altern [index++] = i;
1948 continue;
1949 }
2010 1950
2011 /* Basically, if we find a wall on a space, we cut down the search size. 1951 /* Basically, if we find a wall on a space, we cut down the search size.
2012 * In this way, we won't return spaces that are on another side of a wall. 1952 * In this way, we won't return spaces that are on another side of a wall.
2013 * This mostly work, but it cuts down the search size in all directions - 1953 * This mostly work, but it cuts down the search size in all directions -
2014 * if the space being examined only has a wall to the north and empty 1954 * if the space being examined only has a wall to the north and empty
2015 * spaces in all the other directions, this will reduce the search space 1955 * spaces in all the other directions, this will reduce the search space
2016 * to only the spaces immediately surrounding the target area, and 1956 * to only the spaces immediately surrounding the target area, and
2017 * won't look 2 spaces south of the target space. 1957 * won't look 2 spaces south of the target space.
2018 */ 1958 */
2019 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1959 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1960 {
2020 stop = maxfree[i]; 1961 stop = maxfree[i];
1962 continue;
1963 }
1964
1965 /* Note it is intentional that we check ob - the movement type of the
1966 * head of the object should correspond for the entire object.
1967 */
1968 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1969 continue;
1970
1971 if (ob->blocked (m, pos.x, pos.y))
1972 continue;
1973
1974 altern [index++] = i;
2021 } 1975 }
2022 1976
2023 if (!index) 1977 if (!index)
2024 return -1; 1978 return -1;
2025 1979
2026 return altern[RANDOM () % index]; 1980 return altern [rndm (index)];
2027} 1981}
2028 1982
2029/* 1983/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 1984 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 1985 * find_free_spot(), but it will search max number of squares.
2034 */ 1988 */
2035int 1989int
2036find_first_free_spot (const object *ob, maptile *m, int x, int y) 1990find_first_free_spot (const object *ob, maptile *m, int x, int y)
2037{ 1991{
2038 for (int i = 0; i < SIZEOFFREE; i++) 1992 for (int i = 0; i < SIZEOFFREE; i++)
2039 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 1993 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2040 return i; 1994 return i;
2041 1995
2042 return -1; 1996 return -1;
2043} 1997}
2044 1998
2052{ 2006{
2053 arr += begin; 2007 arr += begin;
2054 end -= begin; 2008 end -= begin;
2055 2009
2056 while (--end) 2010 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2011 swap (arr [end], arr [rndm (end + 1)]);
2058} 2012}
2059 2013
2060/* new function to make monster searching more efficient, and effective! 2014/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2015 * This basically returns a randomized array (in the passed pointer) of
2062 * the spaces to find monsters. In this way, it won't always look for 2016 * the spaces to find monsters. In this way, it won't always look for
2098 object *tmp; 2052 object *tmp;
2099 maptile *mp; 2053 maptile *mp;
2100 2054
2101 MoveType blocked, move_type; 2055 MoveType blocked, move_type;
2102 2056
2103 if (exclude && exclude->head) 2057 if (exclude && exclude->head_ () != exclude)
2104 { 2058 {
2105 exclude = exclude->head; 2059 exclude = exclude->head;
2106 move_type = exclude->move_type; 2060 move_type = exclude->move_type;
2107 } 2061 }
2108 else 2062 else
2131 max = maxfree[i]; 2085 max = maxfree[i];
2132 else if (mflags & P_IS_ALIVE) 2086 else if (mflags & P_IS_ALIVE)
2133 { 2087 {
2134 for (tmp = ms.bot; tmp; tmp = tmp->above) 2088 for (tmp = ms.bot; tmp; tmp = tmp->above)
2135 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2089 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2136 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2090 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2137 break; 2091 break;
2138 2092
2139 if (tmp) 2093 if (tmp)
2140 return freedir[i]; 2094 return freedir[i];
2141 } 2095 }
2196 2150
2197 return 3; 2151 return 3;
2198} 2152}
2199 2153
2200/* 2154/*
2201 * absdir(int): Returns a number between 1 and 8, which represent
2202 * the "absolute" direction of a number (it actually takes care of
2203 * "overflow" in previous calculations of a direction).
2204 */
2205
2206int
2207absdir (int d)
2208{
2209 while (d < 1)
2210 d += 8;
2211
2212 while (d > 8)
2213 d -= 8;
2214
2215 return d;
2216}
2217
2218/*
2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2155 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2156 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2157 */
2222
2223int 2158int
2224dirdiff (int dir1, int dir2) 2159dirdiff (int dir1, int dir2)
2225{ 2160{
2226 int d; 2161 int d;
2227 2162
2340 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2275 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2341 * core dumps if they do. 2276 * core dumps if they do.
2342 * 2277 *
2343 * Add a check so we can't pick up invisible objects (0.93.8) 2278 * Add a check so we can't pick up invisible objects (0.93.8)
2344 */ 2279 */
2345
2346int 2280int
2347can_pick (const object *who, const object *item) 2281can_pick (const object *who, const object *item)
2348{ 2282{
2349 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2283 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2350 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2284 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2355 * create clone from object to another 2289 * create clone from object to another
2356 */ 2290 */
2357object * 2291object *
2358object_create_clone (object *asrc) 2292object_create_clone (object *asrc)
2359{ 2293{
2360 object *dst = 0, *tmp, *src, *part, *prev, *item; 2294 object *dst = 0, *tmp, *src, *prev, *item;
2361 2295
2362 if (!asrc) 2296 if (!asrc)
2363 return 0; 2297 return 0;
2364 2298
2365 src = asrc;
2366 if (src->head)
2367 src = src->head; 2299 src = asrc->head_ ();
2368 2300
2369 prev = 0; 2301 prev = 0;
2370 for (part = src; part; part = part->more) 2302 for (object *part = src; part; part = part->more)
2371 { 2303 {
2372 tmp = part->clone (); 2304 tmp = part->clone ();
2373 tmp->x -= src->x; 2305 tmp->x -= src->x;
2374 tmp->y -= src->y; 2306 tmp->y -= src->y;
2375 2307
2391 2323
2392 for (item = src->inv; item; item = item->below) 2324 for (item = src->inv; item; item = item->below)
2393 insert_ob_in_ob (object_create_clone (item), dst); 2325 insert_ob_in_ob (object_create_clone (item), dst);
2394 2326
2395 return dst; 2327 return dst;
2396}
2397
2398/* GROS - Creates an object using a string representing its content. */
2399/* Basically, we save the content of the string to a temp file, then call */
2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2401/* but it was simple to make and allows reusing the load_object function. */
2402/* Remember not to use load_object_str in a time-critical situation. */
2403/* Also remember that multiparts objects are not supported for now. */
2404object *
2405load_object_str (const char *obstr)
2406{
2407 object *op;
2408 char filename[MAX_BUF];
2409
2410 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412 FILE *tempfile = fopen (filename, "w");
2413
2414 if (tempfile == NULL)
2415 {
2416 LOG (llevError, "Error - Unable to access load object temp file\n");
2417 return NULL;
2418 }
2419
2420 fprintf (tempfile, obstr);
2421 fclose (tempfile);
2422
2423 op = object::create ();
2424
2425 object_thawer thawer (filename);
2426
2427 if (thawer)
2428 load_object (thawer, op, 0);
2429
2430 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431 CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433 return op;
2434} 2328}
2435 2329
2436/* This returns the first object in who's inventory that 2330/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2331 * has the same type and subtype match.
2438 * returns NULL if no match. 2332 * returns NULL if no match.
2493 if (link->key == canonical_key) 2387 if (link->key == canonical_key)
2494 return link->value; 2388 return link->value;
2495 2389
2496 return 0; 2390 return 0;
2497} 2391}
2498
2499 2392
2500/* 2393/*
2501 * Updates the canonical_key in op to value. 2394 * Updates the canonical_key in op to value.
2502 * 2395 *
2503 * canonical_key is a shared string (value doesn't have to be). 2396 * canonical_key is a shared string (value doesn't have to be).
2527 /* Basically, if the archetype has this key set, 2420 /* Basically, if the archetype has this key set,
2528 * we need to store the null value so when we save 2421 * we need to store the null value so when we save
2529 * it, we save the empty value so that when we load, 2422 * it, we save the empty value so that when we load,
2530 * we get this value back again. 2423 * we get this value back again.
2531 */ 2424 */
2532 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2425 if (get_ob_key_link (op->arch, canonical_key))
2533 field->value = 0; 2426 field->value = 0;
2534 else 2427 else
2535 { 2428 {
2536 if (last) 2429 if (last)
2537 last->next = field->next; 2430 last->next = field->next;
2606 } 2499 }
2607 else 2500 else
2608 item = item->env; 2501 item = item->env;
2609} 2502}
2610 2503
2504const char *
2505object::flag_desc (char *desc, int len) const
2506{
2507 char *p = desc;
2508 bool first = true;
2509
2510 *p = 0;
2511
2512 for (int i = 0; i < NUM_FLAGS; i++)
2513 {
2514 if (len <= 10) // magic constant!
2515 {
2516 snprintf (p, len, ",...");
2517 break;
2518 }
2519
2520 if (flag [i])
2521 {
2522 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2523 len -= cnt;
2524 p += cnt;
2525 first = false;
2526 }
2527 }
2528
2529 return desc;
2530}
2531
2611// return a suitable string describing an objetc in enough detail to find it 2532// return a suitable string describing an object in enough detail to find it
2612const char * 2533const char *
2613object::debug_desc (char *info) const 2534object::debug_desc (char *info) const
2614{ 2535{
2536 char flagdesc[512];
2615 char info2[256 * 3]; 2537 char info2[256 * 4];
2616 char *p = info; 2538 char *p = info;
2617 2539
2618 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2540 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619 count, 2541 count,
2542 uuid.c_str (),
2620 &name, 2543 &name,
2621 title ? " " : "", 2544 title ? "\",title:\"" : "",
2622 title ? (const char *)title : ""); 2545 title ? (const char *)title : "",
2546 flag_desc (flagdesc, 512), type);
2623 2547
2624 if (env) 2548 if (!this->flag[FLAG_REMOVED] && env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2549 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2626 2550
2627 if (map) 2551 if (map)
2628 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2552 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2629 2553
2630 return info; 2554 return info;
2631} 2555}
2632 2556
2633const char * 2557const char *
2634object::debug_desc () const 2558object::debug_desc () const
2635{ 2559{
2636 static char info[256 * 3]; 2560 static char info[3][256 * 4];
2561 static int info_idx;
2562
2637 return debug_desc (info); 2563 return debug_desc (info [++info_idx % 3]);
2638} 2564}
2639 2565
2566struct region *
2567object::region () const
2568{
2569 return map ? map->region (x, y)
2570 : region::default_region ();
2571}
2572
2573const materialtype_t *
2574object::dominant_material () const
2575{
2576 if (materialtype_t *mt = name_to_material (materialname))
2577 return mt;
2578
2579 return name_to_material (shstr_unknown);
2580}
2581
2582void
2583object::open_container (object *new_container)
2584{
2585 if (container == new_container)
2586 return;
2587
2588 if (object *old_container = container)
2589 {
2590 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2591 return;
2592
2593#if 0
2594 // remove the "Close old_container" object.
2595 if (object *closer = old_container->inv)
2596 if (closer->type == CLOSE_CON)
2597 closer->destroy ();
2598#endif
2599
2600 old_container->flag [FLAG_APPLIED] = 0;
2601 container = 0;
2602
2603 esrv_update_item (UPD_FLAGS, this, old_container);
2604 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2605 play_sound (sound_find ("chest_close"));
2606 }
2607
2608 if (new_container)
2609 {
2610 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2611 return;
2612
2613 // TODO: this does not seem to serve any purpose anymore?
2614#if 0
2615 // insert the "Close Container" object.
2616 if (archetype *closer = new_container->other_arch)
2617 {
2618 object *closer = arch_to_object (new_container->other_arch);
2619 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2620 new_container->insert (closer);
2621 }
2622#endif
2623
2624 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2625
2626 new_container->flag [FLAG_APPLIED] = 1;
2627 container = new_container;
2628
2629 esrv_update_item (UPD_FLAGS, this, new_container);
2630 esrv_send_inventory (this, new_container);
2631 play_sound (sound_find ("chest_open"));
2632 }
2633}
2634
2635object *
2636object::force_find (const shstr name)
2637{
2638 /* cycle through his inventory to look for the MARK we want to
2639 * place
2640 */
2641 for (object *tmp = inv; tmp; tmp = tmp->below)
2642 if (tmp->type == FORCE && tmp->slaying == name)
2643 return splay (tmp);
2644
2645 return 0;
2646}
2647
2648void
2649object::force_add (const shstr name, int duration)
2650{
2651 if (object *force = force_find (name))
2652 force->destroy ();
2653
2654 object *force = get_archetype (FORCE_NAME);
2655
2656 force->slaying = name;
2657 force->stats.food = 1;
2658 force->speed_left = -1.f;
2659
2660 force->set_speed (duration ? 1.f / duration : 0.f);
2661 force->flag [FLAG_IS_USED_UP] = true;
2662 force->flag [FLAG_APPLIED] = true;
2663
2664 insert (force);
2665}
2666
2667void
2668object::play_sound (faceidx sound)
2669{
2670 if (!sound)
2671 return;
2672
2673 if (flag [FLAG_REMOVED])
2674 return;
2675
2676 if (env)
2677 {
2678 if (object *pl = in_player ())
2679 pl->contr->play_sound (sound);
2680 }
2681 else
2682 map->play_sound (sound, x, y);
2683}
2684

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines