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.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.145 by root, Mon May 7 03:05:58 2007 UTC

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

Diff Legend

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