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.134 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.198 by root, Mon Oct 22 02:52:48 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38int nrofallocobjects = 0;
… …
254 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 255 * check all objects in the inventory.
256 */ 256 */
257 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
258 { 258 {
259 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
261 return 0;
262 261
263 /* Now check to see if the two inventory objects could merge */ 262 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */
264
264 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 266 return 0; /* inventory objexts differ */
266 267
267 /* 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
268 * if it is valid. 269 * if it is valid.
269 */ 270 */
270 } 271 }
… …
299 return 0; 300 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 301 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 302 return 0;
302 } 303 }
303 304
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 305 if (ob1->self || ob2->self)
306 { 306 {
307 ob1->optimise (); 307 ob1->optimise ();
308 ob2->optimise (); 308 ob2->optimise ();
309 309
310 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
311 {
312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314
315 if (k1 != k2)
311 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 }
312 } 322 }
313 323
314 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
315 return 1; 325 return 1;
316} 326}
… …
324sum_weight (object *op) 334sum_weight (object *op)
325{ 335{
326 long sum; 336 long sum;
327 object *inv; 337 object *inv;
328 338
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 339 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 340 {
331 if (inv->inv) 341 if (inv->inv)
332 sum_weight (inv); 342 sum_weight (inv);
343
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 344 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 345 }
335 346
336 if (op->type == CONTAINER && op->stats.Str) 347 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 348 sum = (sum * (100 - op->stats.Str)) / 100;
… …
373/* 384/*
374 * 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
375 * multi-object 1 which is closest to the second object. 386 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 387 * If it's not a multi-object, it is returned.
377 */ 388 */
378
379object * 389object *
380get_nearest_part (object *op, const object *pl) 390get_nearest_part (object *op, const object *pl)
381{ 391{
382 object *tmp, *closest; 392 object *tmp, *closest;
383 int last_dist, i; 393 int last_dist, i;
… …
428} 438}
429 439
430/* 440/*
431 * 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
432 * skill and experience objects. 442 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO
433 */ 444 */
434void 445void
435object::set_owner (object *owner) 446object::set_owner (object *owner)
436{ 447{
448 // allow objects which own objects
437 if (!owner) 449 if (owner)
438 return;
439
440 /* next line added to allow objects which own objects */
441 /* Add a check for ownercounts in here, as I got into an endless loop
442 * with the fireball owning a poison cloud which then owned the
443 * fireball. I believe that was caused by one of the objects getting
444 * freed and then another object replacing it. Since the ownercounts
445 * didn't match, this check is valid and I believe that cause is valid.
446 */
447 while (owner->owner) 450 while (owner->owner)
448 owner = owner->owner; 451 owner = owner->owner;
452
453 if (flag [FLAG_FREED])
454 {
455 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
456 return;
457 }
449 458
450 this->owner = owner; 459 this->owner = owner;
460}
461
462int
463object::slottype () const
464{
465 if (type == SKILL)
466 {
467 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
468 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
469 }
470 else
471 {
472 if (slot [body_combat].info) return slot_combat;
473 if (slot [body_range ].info) return slot_ranged;
474 }
475
476 return slot_none;
477}
478
479bool
480object::change_weapon (object *ob)
481{
482 if (current_weapon == ob)
483 return true;
484
485 if (chosen_skill)
486 chosen_skill->flag [FLAG_APPLIED] = false;
487
488 current_weapon = ob;
489 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
490
491 if (chosen_skill)
492 chosen_skill->flag [FLAG_APPLIED] = true;
493
494 update_stats ();
495
496 if (ob)
497 {
498 // now check wether any body locations became invalid, in which case
499 // we cannot apply the weapon at the moment.
500 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
501 if (slot[i].used < 0)
502 {
503 current_weapon = chosen_skill = 0;
504 update_stats ();
505
506 new_draw_info_format (NDI_UNIQUE, 0, this,
507 "You try to balance all your items at once, "
508 "but the %s is just too much for your body. "
509 "[You need to unapply some items first.]", &ob->name);
510 return false;
511 }
512
513 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
514 }
515 else
516 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
517
518 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
519 {
520 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
521 &name, ob->debug_desc ());
522 return false;
523 }
524
525 return true;
451} 526}
452 527
453/* Zero the key_values on op, decrementing the shared-string 528/* Zero the key_values on op, decrementing the shared-string
454 * refcounts and freeing the links. 529 * refcounts and freeing the links.
455 */ 530 */
456static void 531static void
457free_key_values (object *op) 532free_key_values (object *op)
458{ 533{
459 for (key_value *i = op->key_values; i != 0;) 534 for (key_value *i = op->key_values; i; )
460 { 535 {
461 key_value *next = i->next; 536 key_value *next = i->next;
462 delete i; 537 delete i;
463 538
464 i = next; 539 i = next;
465 } 540 }
466 541
467 op->key_values = 0; 542 op->key_values = 0;
468} 543}
469 544
470/* 545object &
471 * copy_to first frees everything allocated by the dst object, 546object::operator =(const object &src)
472 * and then copies the contents of itself into the second
473 * object, allocating what needs to be allocated. Basically, any
474 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
475 * if the first object is freed, the pointers in the new object
476 * will point at garbage.
477 */
478void
479object::copy_to (object *dst)
480{ 547{
481 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 548 bool is_freed = flag [FLAG_FREED];
482 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 549 bool is_removed = flag [FLAG_REMOVED];
483 550
484 *(object_copy *)dst = *this; 551 *(object_copy *)this = src;
485 552
486 if (is_freed) 553 flag [FLAG_FREED] = is_freed;
487 SET_FLAG (dst, FLAG_FREED); 554 flag [FLAG_REMOVED] = is_removed;
488
489 if (is_removed)
490 SET_FLAG (dst, FLAG_REMOVED);
491
492 if (speed < 0)
493 dst->speed_left = speed_left - rndm ();
494 555
495 /* Copy over key_values, if any. */ 556 /* Copy over key_values, if any. */
496 if (key_values) 557 if (src.key_values)
497 { 558 {
498 key_value *tail = 0; 559 key_value *tail = 0;
499 key_value *i;
500
501 dst->key_values = 0; 560 key_values = 0;
502 561
503 for (i = key_values; i; i = i->next) 562 for (key_value *i = src.key_values; i; i = i->next)
504 { 563 {
505 key_value *new_link = new key_value; 564 key_value *new_link = new key_value;
506 565
507 new_link->next = 0; 566 new_link->next = 0;
508 new_link->key = i->key; 567 new_link->key = i->key;
509 new_link->value = i->value; 568 new_link->value = i->value;
510 569
511 /* Try and be clever here, too. */ 570 /* Try and be clever here, too. */
512 if (!dst->key_values) 571 if (!key_values)
513 { 572 {
514 dst->key_values = new_link; 573 key_values = new_link;
515 tail = new_link; 574 tail = new_link;
516 } 575 }
517 else 576 else
518 { 577 {
519 tail->next = new_link; 578 tail->next = new_link;
520 tail = new_link; 579 tail = new_link;
521 } 580 }
522 } 581 }
523 } 582 }
583}
584
585/*
586 * copy_to first frees everything allocated by the dst object,
587 * and then copies the contents of itself into the second
588 * object, allocating what needs to be allocated. Basically, any
589 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
590 * if the first object is freed, the pointers in the new object
591 * will point at garbage.
592 */
593void
594object::copy_to (object *dst)
595{
596 *dst = *this;
597
598 if (speed < 0)
599 dst->speed_left -= rndm ();
524 600
525 dst->set_speed (dst->speed); 601 dst->set_speed (dst->speed);
526} 602}
527 603
528void 604void
… …
536 * need for monsters, but doesn't hurt to do it for everything. 612 * need for monsters, but doesn't hurt to do it for everything.
537 * by doing so, when a monster is created, it has good starting 613 * by doing so, when a monster is created, it has good starting
538 * values for the body_used info, so when items are created 614 * values for the body_used info, so when items are created
539 * for it, they can be properly equipped. 615 * for it, they can be properly equipped.
540 */ 616 */
541 memcpy (body_used, body_info, sizeof (body_used)); 617 for (int i = NUM_BODY_LOCATIONS; i--; )
618 slot[i].used = slot[i].info;
542 619
543 attachable::instantiate (); 620 attachable::instantiate ();
544} 621}
545 622
546object * 623object *
… …
834 911
835 if (flag [FLAG_IS_LINKED]) 912 if (flag [FLAG_IS_LINKED])
836 remove_button_link (this); 913 remove_button_link (this);
837 914
838 if (flag [FLAG_FRIENDLY]) 915 if (flag [FLAG_FRIENDLY])
839 {
840 remove_friendly_object (this); 916 remove_friendly_object (this);
841
842 if (type == GOLEM
843 && owner
844 && owner->type == PLAYER
845 && owner->contr->ranges[range_golem] == this)
846 owner->contr->ranges[range_golem] = 0;
847 }
848 917
849 if (!flag [FLAG_REMOVED]) 918 if (!flag [FLAG_REMOVED])
850 remove (); 919 remove ();
851 920
852 destroy_inv (true); 921 destroy_inv (true);
… …
862 931
863 if (!freed_map) 932 if (!freed_map)
864 { 933 {
865 freed_map = new maptile; 934 freed_map = new maptile;
866 935
936 freed_map->path = "<freed objects map>";
867 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
868 freed_map->width = 3; 938 freed_map->width = 3;
869 freed_map->height = 3; 939 freed_map->height = 3;
870 940
871 freed_map->alloc (); 941 freed_map->alloc ();
… …
875 map = freed_map; 945 map = freed_map;
876 x = 1; 946 x = 1;
877 y = 1; 947 y = 1;
878 } 948 }
879 949
880 head = 0;
881
882 if (more) 950 if (more)
883 { 951 {
884 more->destroy (); 952 more->destroy ();
885 more = 0; 953 more = 0;
886 } 954 }
887 955
956 head = 0;
957
888 // clear those pointers that likely might have circular references to us 958 // clear those pointers that likely might cause circular references
889 owner = 0; 959 owner = 0;
890 enemy = 0; 960 enemy = 0;
891 attacked_by = 0; 961 attacked_by = 0;
962 current_weapon = 0;
892} 963}
893 964
894void 965void
895object::destroy (bool destroy_inventory) 966object::destroy (bool destroy_inventory)
896{ 967{
897 if (destroyed ()) 968 if (destroyed ())
898 return; 969 return;
899 970
900 if (destroy_inventory) 971 if (destroy_inventory)
901 destroy_inv (false); 972 destroy_inv (false);
973
974 if (is_head ())
975 if (sound_destroy)
976 play_sound (sound_destroy);
977 else if (flag [FLAG_MONSTER])
978 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
902 979
903 attachable::destroy (); 980 attachable::destroy ();
904} 981}
905 982
906/* 983/*
… …
1021 if (map->in_memory == MAP_SAVING) 1098 if (map->in_memory == MAP_SAVING)
1022 return; 1099 return;
1023 1100
1024 int check_walk_off = !flag [FLAG_NO_APPLY]; 1101 int check_walk_off = !flag [FLAG_NO_APPLY];
1025 1102
1103 if (object *pl = ms.player ())
1104 {
1105 if (pl->container == this)
1106 /* If a container that the player is currently using somehow gets
1107 * removed (most likely destroyed), update the player view
1108 * appropriately.
1109 */
1110 pl->close_container ();
1111
1112 pl->contr->ns->floorbox_update ();
1113 }
1114
1026 for (tmp = ms.bot; tmp; tmp = tmp->above) 1115 for (tmp = ms.bot; tmp; tmp = tmp->above)
1027 { 1116 {
1028 /* No point updating the players look faces if he is the object 1117 /* No point updating the players look faces if he is the object
1029 * being removed. 1118 * being removed.
1030 */ 1119 */
1031
1032 if (tmp->type == PLAYER && tmp != this)
1033 {
1034 /* If a container that the player is currently using somehow gets
1035 * removed (most likely destroyed), update the player view
1036 * appropriately.
1037 */
1038 if (tmp->container == this)
1039 {
1040 flag [FLAG_APPLIED] = 0;
1041 tmp->container = 0;
1042 }
1043
1044 if (tmp->contr->ns)
1045 tmp->contr->ns->floorbox_update ();
1046 }
1047 1120
1048 /* See if object moving off should effect something */ 1121 /* See if object moving off should effect something */
1049 if (check_walk_off 1122 if (check_walk_off
1050 && ((move_type & tmp->move_off) 1123 && ((move_type & tmp->move_off)
1051 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1124 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1054 1127
1055 if (destroyed ()) 1128 if (destroyed ())
1056 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1129 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1057 } 1130 }
1058 1131
1059 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1060 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1061 if (tmp->above == tmp)
1062 tmp->above = 0;
1063
1064 last = tmp; 1132 last = tmp;
1065 } 1133 }
1066 1134
1067 /* last == NULL if there are no objects on this space */ 1135 /* last == NULL if there are no objects on this space */
1068 //TODO: this makes little sense, why only update the topmost object? 1136 //TODO: this makes little sense, why only update the topmost object?
… …
1088merge_ob (object *op, object *top) 1156merge_ob (object *op, object *top)
1089{ 1157{
1090 if (!op->nrof) 1158 if (!op->nrof)
1091 return 0; 1159 return 0;
1092 1160
1093 if (top) 1161 if (!top)
1094 for (top = op; top && top->above; top = top->above) 1162 for (top = op; top && top->above; top = top->above)
1095 ; 1163 ;
1096 1164
1097 for (; top; top = top->below) 1165 for (; top; top = top->below)
1098 { 1166 {
… …
1111 } 1179 }
1112 1180
1113 return 0; 1181 return 0;
1114} 1182}
1115 1183
1184void
1185object::expand_tail ()
1186{
1187 if (more)
1188 return;
1189
1190 object *prev = this;
1191
1192 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1193 {
1194 object *op = arch_to_object (at);
1195
1196 op->name = name;
1197 op->name_pl = name_pl;
1198 op->title = title;
1199
1200 op->head = this;
1201 prev->more = op;
1202
1203 prev = op;
1204 }
1205}
1206
1116/* 1207/*
1117 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1208 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1118 * job preparing multi-part monsters. 1209 * job preparing multi-part monsters.
1119 */ 1210 */
1120object * 1211object *
1121insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1212insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1122{ 1213{
1123 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1214 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1124 { 1215 {
1125 tmp->x = x + tmp->arch->clone.x; 1216 tmp->x = x + tmp->arch->x;
1126 tmp->y = y + tmp->arch->clone.y; 1217 tmp->y = y + tmp->arch->y;
1127 } 1218 }
1128 1219
1129 return insert_ob_in_map (op, m, originator, flag); 1220 return insert_ob_in_map (op, m, originator, flag);
1130} 1221}
1131 1222
… …
1150 * just 'op' otherwise 1241 * just 'op' otherwise
1151 */ 1242 */
1152object * 1243object *
1153insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1244insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1154{ 1245{
1246 assert (!op->flag [FLAG_FREED]);
1247
1155 object *tmp, *top, *floor = NULL; 1248 object *top, *floor = NULL;
1156
1157 if (QUERY_FLAG (op, FLAG_FREED))
1158 {
1159 LOG (llevError, "Trying to insert freed object!\n");
1160 return NULL;
1161 }
1162
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1165 1249
1166 op->remove (); 1250 op->remove ();
1167
1168 if (!m)
1169 {
1170 char *dump = dump_object (op);
1171 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1172 free (dump);
1173 return op;
1174 }
1175
1176 if (out_of_map (m, op->x, op->y))
1177 {
1178 char *dump = dump_object (op);
1179 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1180#ifdef MANY_CORES
1181 /* Better to catch this here, as otherwise the next use of this object
1182 * is likely to cause a crash. Better to find out where it is getting
1183 * improperly inserted.
1184 */
1185 abort ();
1186#endif
1187 free (dump);
1188 return op;
1189 }
1190
1191 if (object *more = op->more)
1192 {
1193 if (!insert_ob_in_map (more, m, originator, flag))
1194 {
1195 if (!op->head)
1196 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1197
1198 return 0;
1199 }
1200 }
1201
1202 CLEAR_FLAG (op, FLAG_REMOVED);
1203 1251
1204 /* Ideally, the caller figures this out. However, it complicates a lot 1252 /* Ideally, the caller figures this out. However, it complicates a lot
1205 * of areas of callers (eg, anything that uses find_free_spot would now 1253 * of areas of callers (eg, anything that uses find_free_spot would now
1206 * need extra work 1254 * need extra work
1207 */ 1255 */
1208 if (!xy_normalise (m, op->x, op->y)) 1256 if (!xy_normalise (m, op->x, op->y))
1257 {
1258 op->destroy ();
1209 return 0; 1259 return 0;
1260 }
1261
1262 if (object *more = op->more)
1263 if (!insert_ob_in_map (more, m, originator, flag))
1264 return 0;
1265
1266 CLEAR_FLAG (op, FLAG_REMOVED);
1210 1267
1211 op->map = m; 1268 op->map = m;
1212 mapspace &ms = op->ms (); 1269 mapspace &ms = op->ms ();
1213 1270
1214 /* this has to be done after we translate the coordinates. 1271 /* this has to be done after we translate the coordinates.
1215 */ 1272 */
1216 if (op->nrof && !(flag & INS_NO_MERGE)) 1273 if (op->nrof && !(flag & INS_NO_MERGE))
1217 for (tmp = ms.bot; tmp; tmp = tmp->above) 1274 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1218 if (object::can_merge (op, tmp)) 1275 if (object::can_merge (op, tmp))
1219 { 1276 {
1220 op->nrof += tmp->nrof; 1277 op->nrof += tmp->nrof;
1221 tmp->destroy (); 1278 tmp->destroy ();
1222 } 1279 }
… …
1249 else 1306 else
1250 { 1307 {
1251 top = ms.bot; 1308 top = ms.bot;
1252 1309
1253 /* If there are other objects, then */ 1310 /* If there are other objects, then */
1254 if ((!(flag & INS_MAP_LOAD)) && top) 1311 if (top)
1255 { 1312 {
1256 object *last = 0; 1313 object *last = 0;
1257 1314
1258 /* 1315 /*
1259 * If there are multiple objects on this space, we do some trickier handling. 1316 * If there are multiple objects on this space, we do some trickier handling.
… …
1289 * looks like instead of lots of conditions here. 1346 * looks like instead of lots of conditions here.
1290 * makes things faster, and effectively the same result. 1347 * makes things faster, and effectively the same result.
1291 */ 1348 */
1292 1349
1293 /* Have object 'fall below' other objects that block view. 1350 /* Have object 'fall below' other objects that block view.
1294 * Unless those objects are exits, type 66 1351 * Unless those objects are exits.
1295 * If INS_ON_TOP is used, don't do this processing 1352 * If INS_ON_TOP is used, don't do this processing
1296 * Need to find the object that in fact blocks view, otherwise 1353 * Need to find the object that in fact blocks view, otherwise
1297 * stacking is a bit odd. 1354 * stacking is a bit odd.
1298 */ 1355 */
1299 if (!(flag & INS_ON_TOP) 1356 if (!(flag & INS_ON_TOP)
1300 && ms.flags () & P_BLOCKSVIEW 1357 && ms.flags () & P_BLOCKSVIEW
1301 && (op->face && !op->face->visibility)) 1358 && (op->face && !faces [op->face].visibility))
1302 { 1359 {
1303 for (last = top; last != floor; last = last->below) 1360 for (last = top; last != floor; last = last->below)
1304 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1361 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1305 break; 1362 break;
1306 1363
… …
1312 if (last && last->below && last != floor) 1369 if (last && last->below && last != floor)
1313 top = last->below; 1370 top = last->below;
1314 } 1371 }
1315 } /* If objects on this space */ 1372 } /* If objects on this space */
1316 1373
1317 if (flag & INS_MAP_LOAD)
1318 top = ms.top;
1319
1320 if (flag & INS_ABOVE_FLOOR_ONLY) 1374 if (flag & INS_ABOVE_FLOOR_ONLY)
1321 top = floor; 1375 top = floor;
1322 1376
1323 /* Top is the object that our object (op) is going to get inserted above. 1377 /* Top is the object that our object (op) is going to get inserted above.
1324 */ 1378 */
… …
1356 op->map->touch (); 1410 op->map->touch ();
1357 } 1411 }
1358 1412
1359 op->map->dirty = true; 1413 op->map->dirty = true;
1360 1414
1361 /* If we have a floor, we know the player, if any, will be above
1362 * it, so save a few ticks and start from there.
1363 */
1364 if (!(flag & INS_MAP_LOAD))
1365 if (object *pl = ms.player ()) 1415 if (object *pl = ms.player ())
1366 if (pl->contr->ns)
1367 pl->contr->ns->floorbox_update (); 1416 pl->contr->ns->floorbox_update ();
1368 1417
1369 /* If this object glows, it may affect lighting conditions that are 1418 /* If this object glows, it may affect lighting conditions that are
1370 * visible to others on this map. But update_all_los is really 1419 * visible to others on this map. But update_all_los is really
1371 * an inefficient way to do this, as it means los for all players 1420 * an inefficient way to do this, as it means los for all players
1372 * on the map will get recalculated. The players could very well 1421 * on the map will get recalculated. The players could very well
… …
1391 * blocked() and wall() work properly), and these flags are updated by 1440 * blocked() and wall() work properly), and these flags are updated by
1392 * update_object(). 1441 * update_object().
1393 */ 1442 */
1394 1443
1395 /* if this is not the head or flag has been passed, don't check walk on status */ 1444 /* if this is not the head or flag has been passed, don't check walk on status */
1396 if (!(flag & INS_NO_WALK_ON) && !op->head) 1445 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1397 { 1446 {
1398 if (check_move_on (op, originator)) 1447 if (check_move_on (op, originator))
1399 return 0; 1448 return 0;
1400 1449
1401 /* If we are a multi part object, lets work our way through the check 1450 /* If we are a multi part object, lets work our way through the check
1402 * walk on's. 1451 * walk on's.
1403 */ 1452 */
1404 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1453 for (object *tmp = op->more; tmp; tmp = tmp->more)
1405 if (check_move_on (tmp, originator)) 1454 if (check_move_on (tmp, originator))
1406 return 0; 1455 return 0;
1407 } 1456 }
1408 1457
1409 return op; 1458 return op;
… …
1419 object *tmp, *tmp1; 1468 object *tmp, *tmp1;
1420 1469
1421 /* first search for itself and remove any old instances */ 1470 /* first search for itself and remove any old instances */
1422 1471
1423 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1472 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1424 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1473 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1425 tmp->destroy (); 1474 tmp->destroy ();
1426 1475
1427 tmp1 = arch_to_object (archetype::find (arch_string)); 1476 tmp1 = arch_to_object (archetype::find (arch_string));
1428 1477
1429 tmp1->x = op->x; 1478 tmp1->x = op->x;
1430 tmp1->y = op->y; 1479 tmp1->y = op->y;
1431 insert_ob_in_map (tmp1, op->map, op, 0); 1480 insert_ob_in_map (tmp1, op->map, op, 0);
1432} 1481}
1433 1482
1434// XXX: function not returning object*
1435object * 1483object *
1436object::insert_at (object *where, object *originator, int flags) 1484object::insert_at (object *where, object *originator, int flags)
1437{ 1485{
1438 where->map->insert (this, where->x, where->y, originator, flags); 1486 return where->map->insert (this, where->x, where->y, originator, flags);
1439} 1487}
1440 1488
1441/* 1489/*
1442 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1490 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1443 * is returned contains nr objects, and the remaining parts contains 1491 * is returned contains nr objects, and the remaining parts contains
… …
1483 * the amount of an object. If the amount reaches 0, the object 1531 * the amount of an object. If the amount reaches 0, the object
1484 * is subsequently removed and freed. 1532 * is subsequently removed and freed.
1485 * 1533 *
1486 * Return value: 'op' if something is left, NULL if the amount reached 0 1534 * Return value: 'op' if something is left, NULL if the amount reached 0
1487 */ 1535 */
1488
1489object * 1536object *
1490decrease_ob_nr (object *op, uint32 i) 1537decrease_ob_nr (object *op, uint32 i)
1491{ 1538{
1492 object *tmp; 1539 object *tmp;
1493 1540
… …
1568 1615
1569/* 1616/*
1570 * add_weight(object, weight) adds the specified weight to an object, 1617 * add_weight(object, weight) adds the specified weight to an object,
1571 * and also updates how much the environment(s) is/are carrying. 1618 * and also updates how much the environment(s) is/are carrying.
1572 */ 1619 */
1573
1574void 1620void
1575add_weight (object *op, signed long weight) 1621add_weight (object *op, signed long weight)
1576{ 1622{
1577 while (op != NULL) 1623 while (op != NULL)
1578 { 1624 {
… …
1593 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1639 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1594 free (dump); 1640 free (dump);
1595 return op; 1641 return op;
1596 } 1642 }
1597 1643
1598 if (where->head) 1644 if (where->head_ () != where)
1599 { 1645 {
1600 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1646 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1601 where = where->head; 1647 where = where->head;
1602 } 1648 }
1603 1649
1604 return where->insert (op); 1650 return where->insert (op);
1605} 1651}
… …
1610 * inside the object environment. 1656 * inside the object environment.
1611 * 1657 *
1612 * The function returns now pointer to inserted item, and return value can 1658 * The function returns now pointer to inserted item, and return value can
1613 * be != op, if items are merged. -Tero 1659 * be != op, if items are merged. -Tero
1614 */ 1660 */
1615
1616object * 1661object *
1617object::insert (object *op) 1662object::insert (object *op)
1618{ 1663{
1619 object *tmp, *otmp;
1620
1621 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1664 if (!QUERY_FLAG (op, FLAG_REMOVED))
1622 op->remove (); 1665 op->remove ();
1623 1666
1624 if (op->more) 1667 if (op->more)
1625 { 1668 {
… …
1627 return op; 1670 return op;
1628 } 1671 }
1629 1672
1630 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1673 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1631 CLEAR_FLAG (op, FLAG_REMOVED); 1674 CLEAR_FLAG (op, FLAG_REMOVED);
1675
1632 if (op->nrof) 1676 if (op->nrof)
1633 { 1677 {
1634 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1678 for (object *tmp = inv; tmp; tmp = tmp->below)
1635 if (object::can_merge (tmp, op)) 1679 if (object::can_merge (tmp, op))
1636 { 1680 {
1637 /* return the original object and remove inserted object 1681 /* return the original object and remove inserted object
1638 (client needs the original object) */ 1682 (client needs the original object) */
1639 tmp->nrof += op->nrof; 1683 tmp->nrof += op->nrof;
… …
1658 add_weight (this, op->weight * op->nrof); 1702 add_weight (this, op->weight * op->nrof);
1659 } 1703 }
1660 else 1704 else
1661 add_weight (this, (op->weight + op->carrying)); 1705 add_weight (this, (op->weight + op->carrying));
1662 1706
1663 otmp = this->in_player (); 1707 if (object *otmp = this->in_player ())
1664 if (otmp && otmp->contr)
1665 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1708 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1666 otmp->update_stats (); 1709 otmp->update_stats ();
1667 1710
1711 op->owner = 0; // its his/hers now. period.
1668 op->map = 0; 1712 op->map = 0;
1669 op->env = this; 1713 op->env = this;
1670 op->above = 0; 1714 op->above = 0;
1671 op->below = 0; 1715 op->below = 0;
1672 op->x = 0, op->y = 0; 1716 op->x = op->y = 0;
1673 1717
1674 /* reset the light list and los of the players on the map */ 1718 /* reset the light list and los of the players on the map */
1675 if ((op->glow_radius != 0) && map) 1719 if (op->glow_radius && map)
1676 { 1720 {
1677#ifdef DEBUG_LIGHTS 1721#ifdef DEBUG_LIGHTS
1678 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1722 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1679#endif /* DEBUG_LIGHTS */ 1723#endif /* DEBUG_LIGHTS */
1680 if (map->darkness) 1724 if (map->darkness)
… …
1914 * activate recursively a flag on an object inventory 1958 * activate recursively a flag on an object inventory
1915 */ 1959 */
1916void 1960void
1917flag_inv (object *op, int flag) 1961flag_inv (object *op, int flag)
1918{ 1962{
1919 if (op->inv)
1920 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1963 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1921 { 1964 {
1922 SET_FLAG (tmp, flag); 1965 SET_FLAG (tmp, flag);
1923 flag_inv (tmp, flag); 1966 flag_inv (tmp, flag);
1924 } 1967 }
1925} 1968}
1926 1969
1927/* 1970/*
1928 * deactivate recursively a flag on an object inventory 1971 * deactivate recursively a flag on an object inventory
1929 */ 1972 */
1930void 1973void
1931unflag_inv (object *op, int flag) 1974unflag_inv (object *op, int flag)
1932{ 1975{
1933 if (op->inv)
1934 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1976 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1935 { 1977 {
1936 CLEAR_FLAG (tmp, flag); 1978 CLEAR_FLAG (tmp, flag);
1937 unflag_inv (tmp, flag); 1979 unflag_inv (tmp, flag);
1938 } 1980 }
1939}
1940
1941/*
1942 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1943 * all it's inventory (recursively).
1944 * If checksums are used, a player will get set_cheat called for
1945 * him/her-self and all object carried by a call to this function.
1946 */
1947void
1948set_cheat (object *op)
1949{
1950 SET_FLAG (op, FLAG_WAS_WIZ);
1951 flag_inv (op, FLAG_WAS_WIZ);
1952} 1981}
1953 1982
1954/* 1983/*
1955 * find_free_spot(object, map, x, y, start, stop) will search for 1984 * find_free_spot(object, map, x, y, start, stop) will search for
1956 * a spot at the given map and coordinates which will be able to contain 1985 * a spot at the given map and coordinates which will be able to contain
… …
1958 * to search (see the freearr_x/y[] definition). 1987 * to search (see the freearr_x/y[] definition).
1959 * It returns a random choice among the alternatives found. 1988 * It returns a random choice among the alternatives found.
1960 * start and stop are where to start relative to the free_arr array (1,9 1989 * start and stop are where to start relative to the free_arr array (1,9
1961 * does all 4 immediate directions). This returns the index into the 1990 * does all 4 immediate directions). This returns the index into the
1962 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1991 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1963 * Note - this only checks to see if there is space for the head of the
1964 * object - if it is a multispace object, this should be called for all
1965 * pieces.
1966 * Note2: This function does correctly handle tiled maps, but does not 1992 * Note: This function does correctly handle tiled maps, but does not
1967 * inform the caller. However, insert_ob_in_map will update as 1993 * inform the caller. However, insert_ob_in_map will update as
1968 * necessary, so the caller shouldn't need to do any special work. 1994 * necessary, so the caller shouldn't need to do any special work.
1969 * Note - updated to take an object instead of archetype - this is necessary 1995 * Note - updated to take an object instead of archetype - this is necessary
1970 * because arch_blocked (now ob_blocked) needs to know the movement type 1996 * because arch_blocked (now ob_blocked) needs to know the movement type
1971 * to know if the space in question will block the object. We can't use 1997 * to know if the space in question will block the object. We can't use
… …
1973 * customized, changed states, etc. 1999 * customized, changed states, etc.
1974 */ 2000 */
1975int 2001int
1976find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2002find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1977{ 2003{
2004 int altern[SIZEOFFREE];
1978 int index = 0, flag; 2005 int index = 0, flag;
1979 int altern[SIZEOFFREE];
1980 2006
1981 for (int i = start; i < stop; i++) 2007 for (int i = start; i < stop; i++)
1982 { 2008 {
1983 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2009 mapxy pos (m, x, y); pos.move (i);
1984 if (!flag) 2010
2011 if (!pos.normalise ())
2012 continue;
2013
2014 mapspace &ms = *pos;
2015
2016 if (ms.flags () & P_IS_ALIVE)
2017 continue;
2018
2019 /* However, often
2020 * ob doesn't have any move type (when used to place exits)
2021 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2022 */
2023 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2024 {
1985 altern [index++] = i; 2025 altern [index++] = i;
2026 continue;
2027 }
1986 2028
1987 /* Basically, if we find a wall on a space, we cut down the search size. 2029 /* Basically, if we find a wall on a space, we cut down the search size.
1988 * In this way, we won't return spaces that are on another side of a wall. 2030 * In this way, we won't return spaces that are on another side of a wall.
1989 * This mostly work, but it cuts down the search size in all directions - 2031 * This mostly work, but it cuts down the search size in all directions -
1990 * if the space being examined only has a wall to the north and empty 2032 * if the space being examined only has a wall to the north and empty
1991 * spaces in all the other directions, this will reduce the search space 2033 * spaces in all the other directions, this will reduce the search space
1992 * to only the spaces immediately surrounding the target area, and 2034 * to only the spaces immediately surrounding the target area, and
1993 * won't look 2 spaces south of the target space. 2035 * won't look 2 spaces south of the target space.
1994 */ 2036 */
1995 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2037 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2038 {
1996 stop = maxfree[i]; 2039 stop = maxfree[i];
2040 continue;
2041 }
2042
2043 /* Note it is intentional that we check ob - the movement type of the
2044 * head of the object should correspond for the entire object.
2045 */
2046 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2047 continue;
2048
2049 if (ob->blocked (m, pos.x, pos.y))
2050 continue;
2051
2052 altern [index++] = i;
1997 } 2053 }
1998 2054
1999 if (!index) 2055 if (!index)
2000 return -1; 2056 return -1;
2001 2057
… …
2010 */ 2066 */
2011int 2067int
2012find_first_free_spot (const object *ob, maptile *m, int x, int y) 2068find_first_free_spot (const object *ob, maptile *m, int x, int y)
2013{ 2069{
2014 for (int i = 0; i < SIZEOFFREE; i++) 2070 for (int i = 0; i < SIZEOFFREE; i++)
2015 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2071 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2016 return i; 2072 return i;
2017 2073
2018 return -1; 2074 return -1;
2019} 2075}
2020 2076
… …
2074 object *tmp; 2130 object *tmp;
2075 maptile *mp; 2131 maptile *mp;
2076 2132
2077 MoveType blocked, move_type; 2133 MoveType blocked, move_type;
2078 2134
2079 if (exclude && exclude->head) 2135 if (exclude && exclude->head_ () != exclude)
2080 { 2136 {
2081 exclude = exclude->head; 2137 exclude = exclude->head;
2082 move_type = exclude->move_type; 2138 move_type = exclude->move_type;
2083 } 2139 }
2084 else 2140 else
… …
2107 max = maxfree[i]; 2163 max = maxfree[i];
2108 else if (mflags & P_IS_ALIVE) 2164 else if (mflags & P_IS_ALIVE)
2109 { 2165 {
2110 for (tmp = ms.bot; tmp; tmp = tmp->above) 2166 for (tmp = ms.bot; tmp; tmp = tmp->above)
2111 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2167 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2112 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2168 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2113 break; 2169 break;
2114 2170
2115 if (tmp) 2171 if (tmp)
2116 return freedir[i]; 2172 return freedir[i];
2117 } 2173 }
… …
2297 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2353 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2298 * core dumps if they do. 2354 * core dumps if they do.
2299 * 2355 *
2300 * Add a check so we can't pick up invisible objects (0.93.8) 2356 * Add a check so we can't pick up invisible objects (0.93.8)
2301 */ 2357 */
2302
2303int 2358int
2304can_pick (const object *who, const object *item) 2359can_pick (const object *who, const object *item)
2305{ 2360{
2306 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2361 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2307 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2362 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2312 * create clone from object to another 2367 * create clone from object to another
2313 */ 2368 */
2314object * 2369object *
2315object_create_clone (object *asrc) 2370object_create_clone (object *asrc)
2316{ 2371{
2317 object *dst = 0, *tmp, *src, *part, *prev, *item; 2372 object *dst = 0, *tmp, *src, *prev, *item;
2318 2373
2319 if (!asrc) 2374 if (!asrc)
2320 return 0; 2375 return 0;
2321 2376
2322 src = asrc;
2323 if (src->head)
2324 src = src->head; 2377 src = asrc->head_ ();
2325 2378
2326 prev = 0; 2379 prev = 0;
2327 for (part = src; part; part = part->more) 2380 for (object *part = src; part; part = part->more)
2328 { 2381 {
2329 tmp = part->clone (); 2382 tmp = part->clone ();
2330 tmp->x -= src->x; 2383 tmp->x -= src->x;
2331 tmp->y -= src->y; 2384 tmp->y -= src->y;
2332 2385
… …
2412 if (link->key == canonical_key) 2465 if (link->key == canonical_key)
2413 return link->value; 2466 return link->value;
2414 2467
2415 return 0; 2468 return 0;
2416} 2469}
2417
2418 2470
2419/* 2471/*
2420 * Updates the canonical_key in op to value. 2472 * Updates the canonical_key in op to value.
2421 * 2473 *
2422 * canonical_key is a shared string (value doesn't have to be). 2474 * canonical_key is a shared string (value doesn't have to be).
… …
2446 /* Basically, if the archetype has this key set, 2498 /* Basically, if the archetype has this key set,
2447 * we need to store the null value so when we save 2499 * we need to store the null value so when we save
2448 * it, we save the empty value so that when we load, 2500 * it, we save the empty value so that when we load,
2449 * we get this value back again. 2501 * we get this value back again.
2450 */ 2502 */
2451 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2503 if (get_ob_key_link (op->arch, canonical_key))
2452 field->value = 0; 2504 field->value = 0;
2453 else 2505 else
2454 { 2506 {
2455 if (last) 2507 if (last)
2456 last->next = field->next; 2508 last->next = field->next;
… …
2525 } 2577 }
2526 else 2578 else
2527 item = item->env; 2579 item = item->env;
2528} 2580}
2529 2581
2530
2531const char * 2582const char *
2532object::flag_desc (char *desc, int len) const 2583object::flag_desc (char *desc, int len) const
2533{ 2584{
2534 char *p = desc; 2585 char *p = desc;
2535 bool first = true; 2586 bool first = true;
… …
2569 &name, 2620 &name,
2570 title ? "\",title:\"" : "", 2621 title ? "\",title:\"" : "",
2571 title ? (const char *)title : "", 2622 title ? (const char *)title : "",
2572 flag_desc (flagdesc, 512), type); 2623 flag_desc (flagdesc, 512), type);
2573 2624
2574 if (env) 2625 if (!this->flag[FLAG_REMOVED] && env)
2575 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2626 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2576 2627
2577 if (map) 2628 if (map)
2578 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2629 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2579 2630
… …
2581} 2632}
2582 2633
2583const char * 2634const char *
2584object::debug_desc () const 2635object::debug_desc () const
2585{ 2636{
2586 static char info[256 * 4]; 2637 static char info[3][256 * 4];
2638 static int info_idx;
2639
2587 return debug_desc (info); 2640 return debug_desc (info [++info_idx % 3]);
2588}
2589
2590const char *
2591object::debug_desc2 () const
2592{
2593 static char info[256 * 4];
2594 return debug_desc (info);
2595} 2641}
2596 2642
2597struct region * 2643struct region *
2598object::region () const 2644object::region () const
2599{ 2645{
… …
2602} 2648}
2603 2649
2604const materialtype_t * 2650const materialtype_t *
2605object::dominant_material () const 2651object::dominant_material () const
2606{ 2652{
2607 if (materialtype_t *mat = name_to_material (materialname)) 2653 if (materialtype_t *mt = name_to_material (materialname))
2608 return mat; 2654 return mt;
2609 2655
2610 // omfg this is slow, this has to be temporary :)
2611 shstr unknown ("unknown");
2612
2613 return name_to_material (unknown); 2656 return name_to_material (shstr_unknown);
2614} 2657}
2615 2658
2616void 2659void
2617object::open_container (object *new_container) 2660object::open_container (object *new_container)
2618{ 2661{
… …
2634 old_container->flag [FLAG_APPLIED] = 0; 2677 old_container->flag [FLAG_APPLIED] = 0;
2635 container = 0; 2678 container = 0;
2636 2679
2637 esrv_update_item (UPD_FLAGS, this, old_container); 2680 esrv_update_item (UPD_FLAGS, this, old_container);
2638 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2681 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2682 play_sound (sound_find ("chest_close"));
2639 } 2683 }
2640 2684
2641 if (new_container) 2685 if (new_container)
2642 { 2686 {
2643 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2687 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2659 new_container->flag [FLAG_APPLIED] = 1; 2703 new_container->flag [FLAG_APPLIED] = 1;
2660 container = new_container; 2704 container = new_container;
2661 2705
2662 esrv_update_item (UPD_FLAGS, this, new_container); 2706 esrv_update_item (UPD_FLAGS, this, new_container);
2663 esrv_send_inventory (this, new_container); 2707 esrv_send_inventory (this, new_container);
2708 play_sound (sound_find ("chest_open"));
2709 }
2710}
2711
2712object *
2713object::force_find (const shstr name)
2714{
2715 /* cycle through his inventory to look for the MARK we want to
2716 * place
2717 */
2718 for (object *tmp = inv; tmp; tmp = tmp->below)
2719 if (tmp->type == FORCE && tmp->slaying == name)
2720 return splay (tmp);
2721
2722 return 0;
2723}
2724
2725void
2726object::force_add (const shstr name, int duration)
2727{
2728 if (object *force = force_find (name))
2729 force->destroy ();
2730
2731 object *force = get_archetype (FORCE_NAME);
2732
2733 force->slaying = name;
2734 force->stats.food = 1;
2735 force->speed_left = -1.f;
2736
2737 force->set_speed (duration ? 1.f / duration : 0.f);
2738 force->flag [FLAG_IS_USED_UP] = true;
2739 force->flag [FLAG_APPLIED] = true;
2740
2741 insert (force);
2742}
2743
2744void
2745object::play_sound (faceidx sound) const
2746{
2747 if (!sound)
2748 return;
2749
2750 if (flag [FLAG_REMOVED])
2751 return;
2752
2753 if (env)
2664 } 2754 {
2755 if (object *pl = in_player ())
2756 pl->contr->play_sound (sound);
2757 }
2758 else
2759 map->play_sound (sound, x, y);
2665} 2760}
2666 2761
2667

Diff Legend

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