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.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.136 by root, Thu Mar 15 14:23:02 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines