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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.146 by root, Fri May 11 21:07:13 2007 UTC

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

Diff Legend

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