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.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.87 by root, Tue Dec 26 08:54:59 2006 UTC

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

Diff Legend

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