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.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC

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

Diff Legend

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