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.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC vs.
Revision 1.193 by root, Mon Oct 15 17:50:27 2007 UTC

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

Diff Legend

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