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.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC

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

Diff Legend

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