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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.139 by root, Sat Apr 21 17:34:22 2007 UTC

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