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.142 by root, Mon Apr 30 04:25:29 2007 UTC

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

Diff Legend

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