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.109 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.146 by root, Fri May 11 21:07:13 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28#include <global.h> 28#include <global.h>
29#include <stdio.h> 29#include <stdio.h>
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/uio.h> 31#include <sys/uio.h>
32#include <object.h> 32#include <object.h>
33#include <funcpoint.h> 33#include <funcpoint.h>
34#include <sproto.h>
34#include <loader.h> 35#include <loader.h>
35 36
36#include <bitset> 37#include <bitset>
37 38
38int nrofallocobjects = 0; 39int nrofallocobjects = 0;
… …
324sum_weight (object *op) 325sum_weight (object *op)
325{ 326{
326 long sum; 327 long sum;
327 object *inv; 328 object *inv;
328 329
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 330 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 331 {
331 if (inv->inv) 332 if (inv->inv)
332 sum_weight (inv); 333 sum_weight (inv);
334
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 336 }
335 337
336 if (op->type == CONTAINER && op->stats.Str) 338 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 339 sum = (sum * (100 - op->stats.Str)) / 100;
… …
357/* 359/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 361 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 362 * The result of the dump is stored in the static global errmsg array.
361 */ 363 */
362
363char * 364char *
364dump_object (object *op) 365dump_object (object *op)
365{ 366{
366 if (!op) 367 if (!op)
367 return strdup ("[NULLOBJ]"); 368 return strdup ("[NULLOBJ]");
368 369
369 object_freezer freezer; 370 object_freezer freezer;
370 save_object (freezer, op, 1); 371 op->write (freezer);
371 return freezer.as_string (); 372 return freezer.as_string ();
372} 373}
373 374
374/* 375/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 376 * get_nearest_part(multi-object, object 2) returns the part of the
… …
395 * Returns the object which has the count-variable equal to the argument. 396 * Returns the object which has the count-variable equal to the argument.
396 */ 397 */
397object * 398object *
398find_object (tag_t i) 399find_object (tag_t i)
399{ 400{
400 return ((unsigned int)i) < objects.size () 401 for_all_objects (op)
401 ? objects [i] 402 if (op->count == i)
402 : 0; 403 return op;
404
405 return 0;
403} 406}
404 407
405/* 408/*
406 * Returns the first object which has a name equal to the argument. 409 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 410 * Used only by the patch command, but not all that useful.
… …
447 owner = owner->owner; 450 owner = owner->owner;
448 451
449 this->owner = owner; 452 this->owner = owner;
450} 453}
451 454
455void
456object::set_weapon (object *ob)
457{
458 if (current_weapon == ob)
459 return;
460
461 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
462
463 if (chosen_skill)
464 chosen_skill->flag [FLAG_APPLIED] = false;
465
466 current_weapon = ob;
467 chosen_skill = ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
468
469 if (chosen_skill)
470 chosen_skill->flag [FLAG_APPLIED] = true;
471
472 update_stats ();
473}
474
452/* Zero the key_values on op, decrementing the shared-string 475/* Zero the key_values on op, decrementing the shared-string
453 * refcounts and freeing the links. 476 * refcounts and freeing the links.
454 */ 477 */
455static void 478static void
456free_key_values (object *op) 479free_key_values (object *op)
457{ 480{
458 for (key_value *i = op->key_values; i != 0;) 481 for (key_value *i = op->key_values; i; )
459 { 482 {
460 key_value *next = i->next; 483 key_value *next = i->next;
461 delete i; 484 delete i;
462 485
463 i = next; 486 i = next;
464 } 487 }
465 488
466 op->key_values = 0; 489 op->key_values = 0;
467} 490}
468 491
469/* 492object &
470 * copy_to first frees everything allocated by the dst object, 493object::operator =(const object &src)
471 * and then copies the contents of itself into the second
472 * object, allocating what needs to be allocated. Basically, any
473 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
474 * if the first object is freed, the pointers in the new object
475 * will point at garbage.
476 */
477void
478object::copy_to (object *dst)
479{ 494{
480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 495 bool is_freed = flag [FLAG_FREED];
481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 496 bool is_removed = flag [FLAG_REMOVED];
482 497
483 *(object_copy *)dst = *this; 498 *(object_copy *)this = src;
484 499
485 if (is_freed) 500 flag [FLAG_FREED] = is_freed;
486 SET_FLAG (dst, FLAG_FREED); 501 flag [FLAG_REMOVED] = is_removed;
487
488 if (is_removed)
489 SET_FLAG (dst, FLAG_REMOVED);
490
491 if (speed < 0)
492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493 502
494 /* Copy over key_values, if any. */ 503 /* Copy over key_values, if any. */
495 if (key_values) 504 if (src.key_values)
496 { 505 {
497 key_value *tail = 0; 506 key_value *tail = 0;
498 key_value *i;
499
500 dst->key_values = 0; 507 key_values = 0;
501 508
502 for (i = key_values; i; i = i->next) 509 for (key_value *i = src.key_values; i; i = i->next)
503 { 510 {
504 key_value *new_link = new key_value; 511 key_value *new_link = new key_value;
505 512
506 new_link->next = 0; 513 new_link->next = 0;
507 new_link->key = i->key; 514 new_link->key = i->key;
508 new_link->value = i->value; 515 new_link->value = i->value;
509 516
510 /* Try and be clever here, too. */ 517 /* Try and be clever here, too. */
511 if (!dst->key_values) 518 if (!key_values)
512 { 519 {
513 dst->key_values = new_link; 520 key_values = new_link;
514 tail = new_link; 521 tail = new_link;
515 } 522 }
516 else 523 else
517 { 524 {
518 tail->next = new_link; 525 tail->next = new_link;
519 tail = new_link; 526 tail = new_link;
520 } 527 }
521 } 528 }
522 } 529 }
530}
531
532/*
533 * copy_to first frees everything allocated by the dst object,
534 * and then copies the contents of itself into the second
535 * object, allocating what needs to be allocated. Basically, any
536 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
537 * if the first object is freed, the pointers in the new object
538 * will point at garbage.
539 */
540void
541object::copy_to (object *dst)
542{
543 *dst = *this;
544
545 if (speed < 0)
546 dst->speed_left = speed_left - rndm ();
523 547
524 dst->set_speed (dst->speed); 548 dst->set_speed (dst->speed);
549}
550
551void
552object::instantiate ()
553{
554 if (!uuid.seq) // HACK
555 uuid = gen_uuid ();
556
557 speed_left = -0.1f;
558 /* copy the body_info to the body_used - this is only really
559 * need for monsters, but doesn't hurt to do it for everything.
560 * by doing so, when a monster is created, it has good starting
561 * values for the body_used info, so when items are created
562 * for it, they can be properly equipped.
563 */
564 for (int i = NUM_BODY_LOCATIONS; i--; )
565 slot[i].used = slot[i].info;
566
567 attachable::instantiate ();
525} 568}
526 569
527object * 570object *
528object::clone () 571object::clone ()
529{ 572{
… …
587 * UP_OBJ_FACE: only the objects face has changed. 630 * UP_OBJ_FACE: only the objects face has changed.
588 */ 631 */
589void 632void
590update_object (object *op, int action) 633update_object (object *op, int action)
591{ 634{
592 MoveType move_on, move_off, move_block, move_slow;
593
594 if (op == NULL) 635 if (op == NULL)
595 { 636 {
596 /* this should never happen */ 637 /* this should never happen */
597 LOG (llevDebug, "update_object() called for NULL object.\n"); 638 LOG (llevDebug, "update_object() called for NULL object.\n");
598 return; 639 return;
… …
658 699
659 if (op->more) 700 if (op->more)
660 update_object (op->more, action); 701 update_object (op->more, action);
661} 702}
662 703
663object *object::first;
664
665object::object () 704object::object ()
666{ 705{
667 SET_FLAG (this, FLAG_REMOVED); 706 SET_FLAG (this, FLAG_REMOVED);
668 707
669 expmul = 1.0; 708 expmul = 1.0;
670 face = blank_face; 709 face = blank_face;
671} 710}
672 711
673object::~object () 712object::~object ()
674{ 713{
714 unlink ();
715
675 free_key_values (this); 716 free_key_values (this);
676} 717}
677 718
719static int object_count;
720
678void object::link () 721void object::link ()
679{ 722{
723 assert (!index);//D
680 uuid = gen_uuid (); 724 uuid = gen_uuid ();
725 count = ++object_count;
681 726
682 refcnt_inc (); 727 refcnt_inc ();
683 objects.insert (this); 728 objects.insert (this);
684} 729}
685 730
686void object::unlink () 731void object::unlink ()
687{ 732{
733 if (!index)
734 return;
735
688 objects.erase (this); 736 objects.erase (this);
689 refcnt_dec (); 737 refcnt_dec ();
690} 738}
691 739
692void 740void
… …
766 * drop on that space. 814 * drop on that space.
767 */ 815 */
768 if (!drop_to_ground 816 if (!drop_to_ground
769 || !map 817 || !map
770 || map->in_memory != MAP_IN_MEMORY 818 || map->in_memory != MAP_IN_MEMORY
819 || map->nodrop
771 || ms ().move_block == MOVE_ALL) 820 || ms ().move_block == MOVE_ALL)
772 { 821 {
773 while (inv) 822 while (inv)
774 { 823 {
775 inv->destroy_inv (drop_to_ground); 824 inv->destroy_inv (drop_to_ground);
… …
784 833
785 if (op->flag [FLAG_STARTEQUIP] 834 if (op->flag [FLAG_STARTEQUIP]
786 || op->flag [FLAG_NO_DROP] 835 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE 836 || op->type == RUNE
788 || op->type == TRAP 837 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE]) 838 || op->flag [FLAG_IS_A_TEMPLATE]
839 || op->flag [FLAG_DESTROY_ON_DEATH])
790 op->destroy (); 840 op->destroy ();
791 else 841 else
792 map->insert (op, x, y); 842 map->insert (op, x, y);
793 } 843 }
794 } 844 }
… …
802} 852}
803 853
804void 854void
805object::do_destroy () 855object::do_destroy ()
806{ 856{
857 attachable::do_destroy ();
858
807 if (flag [FLAG_IS_LINKED]) 859 if (flag [FLAG_IS_LINKED])
808 remove_button_link (this); 860 remove_button_link (this);
809 861
810 if (flag [FLAG_FRIENDLY]) 862 if (flag [FLAG_FRIENDLY])
811 remove_friendly_object (this); 863 remove_friendly_object (this);
812 864
813 if (!flag [FLAG_REMOVED]) 865 if (!flag [FLAG_REMOVED])
814 remove (); 866 remove ();
815 867
816 if (flag [FLAG_FREED]) 868 destroy_inv (true);
817 return;
818 869
819 set_speed (0); 870 deactivate ();
871 unlink ();
820 872
821 flag [FLAG_FREED] = 1; 873 flag [FLAG_FREED] = 1;
822
823 attachable::do_destroy ();
824
825 destroy_inv (true);
826 unlink ();
827 874
828 // hack to ensure that freed objects still have a valid map 875 // hack to ensure that freed objects still have a valid map
829 { 876 {
830 static maptile *freed_map; // freed objects are moved here to avoid crashes 877 static maptile *freed_map; // freed objects are moved here to avoid crashes
831 878
… …
893 * This function removes the object op from the linked list of objects 940 * This function removes the object op from the linked list of objects
894 * which it is currently tied to. When this function is done, the 941 * which it is currently tied to. When this function is done, the
895 * object will have no environment. If the object previously had an 942 * object will have no environment. If the object previously had an
896 * environment, the x and y coordinates will be updated to 943 * environment, the x and y coordinates will be updated to
897 * the previous environment. 944 * the previous environment.
898 * Beware: This function is called from the editor as well!
899 */ 945 */
900void 946void
901object::remove () 947object::do_remove ()
902{ 948{
903 object *tmp, *last = 0; 949 object *tmp, *last = 0;
904 object *otmp; 950 object *otmp;
905 951
906 if (QUERY_FLAG (this, FLAG_REMOVED)) 952 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
949 } 995 }
950 else if (map) 996 else if (map)
951 { 997 {
952 if (type == PLAYER) 998 if (type == PLAYER)
953 { 999 {
1000 // leaving a spot always closes any open container on the ground
1001 if (container && !container->env)
1002 // this causes spurious floorbox updates, but it ensures
1003 // that the CLOSE event is being sent.
1004 close_container ();
1005
954 --map->players; 1006 --map->players;
955 map->touch (); 1007 map->touch ();
956 } 1008 }
957 1009
958 map->dirty = true; 1010 map->dirty = true;
1011 mapspace &ms = this->ms ();
959 1012
960 /* link the object above us */ 1013 /* link the object above us */
961 if (above) 1014 if (above)
962 above->below = below; 1015 above->below = below;
963 else 1016 else
964 map->at (x, y).top = below; /* we were top, set new top */ 1017 ms.top = below; /* we were top, set new top */
965 1018
966 /* Relink the object below us, if there is one */ 1019 /* Relink the object below us, if there is one */
967 if (below) 1020 if (below)
968 below->above = above; 1021 below->above = above;
969 else 1022 else
… …
971 /* Nothing below, which means we need to relink map object for this space 1024 /* Nothing below, which means we need to relink map object for this space
972 * use translated coordinates in case some oddness with map tiling is 1025 * use translated coordinates in case some oddness with map tiling is
973 * evident 1026 * evident
974 */ 1027 */
975 if (GET_MAP_OB (map, x, y) != this) 1028 if (GET_MAP_OB (map, x, y) != this)
976 {
977 char *dump = dump_object (this);
978 LOG (llevError,
979 "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); 1029 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
980 free (dump);
981 dump = dump_object (GET_MAP_OB (map, x, y));
982 LOG (llevError, "%s\n", dump);
983 free (dump);
984 }
985 1030
986 map->at (x, y).bot = above; /* goes on above it. */ 1031 ms.bot = above; /* goes on above it. */
987 } 1032 }
988 1033
989 above = 0; 1034 above = 0;
990 below = 0; 1035 below = 0;
991 1036
992 if (map->in_memory == MAP_SAVING) 1037 if (map->in_memory == MAP_SAVING)
993 return; 1038 return;
994 1039
995 int check_walk_off = !flag [FLAG_NO_APPLY]; 1040 int check_walk_off = !flag [FLAG_NO_APPLY];
996 1041
997 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1042 for (tmp = ms.bot; tmp; tmp = tmp->above)
998 { 1043 {
999 /* No point updating the players look faces if he is the object 1044 /* No point updating the players look faces if he is the object
1000 * being removed. 1045 * being removed.
1001 */ 1046 */
1002 1047
… …
1082 } 1127 }
1083 1128
1084 return 0; 1129 return 0;
1085} 1130}
1086 1131
1132void
1133object::expand_tail ()
1134{
1135 if (more)
1136 return;
1137
1138 object *prev = this;
1139
1140 for (archetype *at = arch->more; at; at = at->more)
1141 {
1142 object *op = arch_to_object (at);
1143
1144 op->name = name;
1145 op->name_pl = name_pl;
1146 op->title = title;
1147
1148 op->head = this;
1149 prev->more = op;
1150
1151 prev = op;
1152 }
1153}
1154
1087/* 1155/*
1088 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1156 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1089 * job preparing multi-part monsters 1157 * job preparing multi-part monsters.
1090 */ 1158 */
1091object * 1159object *
1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1160insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1093{ 1161{
1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1162 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1121 * just 'op' otherwise 1189 * just 'op' otherwise
1122 */ 1190 */
1123object * 1191object *
1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1192insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1125{ 1193{
1194 assert (!op->flag [FLAG_FREED]);
1195
1126 object *tmp, *top, *floor = NULL; 1196 object *tmp, *top, *floor = NULL;
1127 sint16 x, y;
1128 1197
1129 if (QUERY_FLAG (op, FLAG_FREED)) 1198 op->remove ();
1130 {
1131 LOG (llevError, "Trying to insert freed object!\n");
1132 return NULL;
1133 }
1134 1199
1135 if (!m) 1200#if 0
1136 { 1201 if (!m->active != !op->active)
1137 char *dump = dump_object (op); 1202 if (m->active)
1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1203 op->activate_recursive ();
1139 free (dump); 1204 else
1140 return op; 1205 op->deactivate_recursive ();
1141 } 1206#endif
1142 1207
1143 if (out_of_map (m, op->x, op->y)) 1208 if (out_of_map (m, op->x, op->y))
1144 { 1209 {
1145 char *dump = dump_object (op);
1146 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1210 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1147#ifdef MANY_CORES 1211#ifdef MANY_CORES
1148 /* Better to catch this here, as otherwise the next use of this object 1212 /* Better to catch this here, as otherwise the next use of this object
1149 * is likely to cause a crash. Better to find out where it is getting 1213 * is likely to cause a crash. Better to find out where it is getting
1150 * improperly inserted. 1214 * improperly inserted.
1151 */ 1215 */
1152 abort (); 1216 abort ();
1153#endif 1217#endif
1154 free (dump);
1155 return op; 1218 return op;
1156 } 1219 }
1157 1220
1158 if (!QUERY_FLAG (op, FLAG_REMOVED))
1159 {
1160 char *dump = dump_object (op);
1161 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1162 free (dump);
1163 return op;
1164 }
1165
1166 if (op->more)
1167 {
1168 /* The part may be on a different map. */
1169
1170 object *more = op->more; 1221 if (object *more = op->more)
1171 1222 {
1172 /* We really need the caller to normalise coordinates - if
1173 * we set the map, that doesn't work if the location is within
1174 * a map and this is straddling an edge. So only if coordinate
1175 * is clear wrong do we normalise it.
1176 */
1177 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1178 more->map = get_map_from_coord (m, &more->x, &more->y);
1179 else if (!more->map)
1180 {
1181 /* For backwards compatibility - when not dealing with tiled maps,
1182 * more->map should always point to the parent.
1183 */
1184 more->map = m;
1185 }
1186
1187 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1223 if (!insert_ob_in_map (more, m, originator, flag))
1188 { 1224 {
1189 if (!op->head) 1225 if (!op->head)
1190 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1191 1227
1192 return 0; 1228 return 0;
… …
1197 1233
1198 /* Ideally, the caller figures this out. However, it complicates a lot 1234 /* Ideally, the caller figures this out. However, it complicates a lot
1199 * of areas of callers (eg, anything that uses find_free_spot would now 1235 * of areas of callers (eg, anything that uses find_free_spot would now
1200 * need extra work 1236 * need extra work
1201 */ 1237 */
1202 op->map = get_map_from_coord (m, &op->x, &op->y); 1238 if (!xy_normalise (m, op->x, op->y))
1203 x = op->x; 1239 return 0;
1204 y = op->y; 1240
1241 op->map = m;
1242 mapspace &ms = op->ms ();
1205 1243
1206 /* this has to be done after we translate the coordinates. 1244 /* this has to be done after we translate the coordinates.
1207 */ 1245 */
1208 if (op->nrof && !(flag & INS_NO_MERGE)) 1246 if (op->nrof && !(flag & INS_NO_MERGE))
1209 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1247 for (tmp = ms.bot; tmp; tmp = tmp->above)
1210 if (object::can_merge (op, tmp)) 1248 if (object::can_merge (op, tmp))
1211 { 1249 {
1212 op->nrof += tmp->nrof; 1250 op->nrof += tmp->nrof;
1213 tmp->destroy (); 1251 tmp->destroy ();
1214 } 1252 }
… …
1231 op->below = originator->below; 1269 op->below = originator->below;
1232 1270
1233 if (op->below) 1271 if (op->below)
1234 op->below->above = op; 1272 op->below->above = op;
1235 else 1273 else
1236 op->ms ().bot = op; 1274 ms.bot = op;
1237 1275
1238 /* since *below* originator, no need to update top */ 1276 /* since *below* originator, no need to update top */
1239 originator->below = op; 1277 originator->below = op;
1240 } 1278 }
1241 else 1279 else
1242 { 1280 {
1281 top = ms.bot;
1282
1243 /* If there are other objects, then */ 1283 /* If there are other objects, then */
1244 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1284 if ((!(flag & INS_MAP_LOAD)) && top)
1245 { 1285 {
1246 object *last = 0; 1286 object *last = 0;
1247 1287
1248 /* 1288 /*
1249 * If there are multiple objects on this space, we do some trickier handling. 1289 * If there are multiple objects on this space, we do some trickier handling.
… …
1255 * once we get to them. This reduces the need to traverse over all of 1295 * once we get to them. This reduces the need to traverse over all of
1256 * them when adding another one - this saves quite a bit of cpu time 1296 * them when adding another one - this saves quite a bit of cpu time
1257 * when lots of spells are cast in one area. Currently, it is presumed 1297 * when lots of spells are cast in one area. Currently, it is presumed
1258 * that flying non pickable objects are spell objects. 1298 * that flying non pickable objects are spell objects.
1259 */ 1299 */
1260 while (top) 1300 for (top = ms.bot; top; top = top->above)
1261 { 1301 {
1262 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1302 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1263 floor = top; 1303 floor = top;
1264 1304
1265 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1305 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1268 top = top->below; 1308 top = top->below;
1269 break; 1309 break;
1270 } 1310 }
1271 1311
1272 last = top; 1312 last = top;
1273 top = top->above;
1274 } 1313 }
1275 1314
1276 /* Don't want top to be NULL, so set it to the last valid object */ 1315 /* Don't want top to be NULL, so set it to the last valid object */
1277 top = last; 1316 top = last;
1278 1317
… …
1280 * looks like instead of lots of conditions here. 1319 * looks like instead of lots of conditions here.
1281 * makes things faster, and effectively the same result. 1320 * makes things faster, and effectively the same result.
1282 */ 1321 */
1283 1322
1284 /* Have object 'fall below' other objects that block view. 1323 /* Have object 'fall below' other objects that block view.
1285 * Unless those objects are exits, type 66 1324 * Unless those objects are exits.
1286 * If INS_ON_TOP is used, don't do this processing 1325 * If INS_ON_TOP is used, don't do this processing
1287 * Need to find the object that in fact blocks view, otherwise 1326 * Need to find the object that in fact blocks view, otherwise
1288 * stacking is a bit odd. 1327 * stacking is a bit odd.
1289 */ 1328 */
1290 if (!(flag & INS_ON_TOP) && 1329 if (!(flag & INS_ON_TOP)
1291 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1330 && ms.flags () & P_BLOCKSVIEW
1331 && (op->face && !faces [op->face].visibility))
1292 { 1332 {
1293 for (last = top; last != floor; last = last->below) 1333 for (last = top; last != floor; last = last->below)
1294 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1334 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1295 break; 1335 break;
1336
1296 /* Check to see if we found the object that blocks view, 1337 /* Check to see if we found the object that blocks view,
1297 * and make sure we have a below pointer for it so that 1338 * and make sure we have a below pointer for it so that
1298 * we can get inserted below this one, which requires we 1339 * we can get inserted below this one, which requires we
1299 * set top to the object below us. 1340 * set top to the object below us.
1300 */ 1341 */
… …
1302 top = last->below; 1343 top = last->below;
1303 } 1344 }
1304 } /* If objects on this space */ 1345 } /* If objects on this space */
1305 1346
1306 if (flag & INS_MAP_LOAD) 1347 if (flag & INS_MAP_LOAD)
1307 top = GET_MAP_TOP (op->map, op->x, op->y); 1348 top = ms.top;
1308 1349
1309 if (flag & INS_ABOVE_FLOOR_ONLY) 1350 if (flag & INS_ABOVE_FLOOR_ONLY)
1310 top = floor; 1351 top = floor;
1311 1352
1312 /* Top is the object that our object (op) is going to get inserted above. 1353 /* Top is the object that our object (op) is going to get inserted above.
1313 */ 1354 */
1314 1355
1315 /* First object on this space */ 1356 /* First object on this space */
1316 if (!top) 1357 if (!top)
1317 { 1358 {
1318 op->above = GET_MAP_OB (op->map, op->x, op->y); 1359 op->above = ms.bot;
1319 1360
1320 if (op->above) 1361 if (op->above)
1321 op->above->below = op; 1362 op->above->below = op;
1322 1363
1323 op->below = 0; 1364 op->below = 0;
1324 op->ms ().bot = op; 1365 ms.bot = op;
1325 } 1366 }
1326 else 1367 else
1327 { /* get inserted into the stack above top */ 1368 { /* get inserted into the stack above top */
1328 op->above = top->above; 1369 op->above = top->above;
1329 1370
… …
1333 op->below = top; 1374 op->below = top;
1334 top->above = op; 1375 top->above = op;
1335 } 1376 }
1336 1377
1337 if (!op->above) 1378 if (!op->above)
1338 op->ms ().top = op; 1379 ms.top = op;
1339 } /* else not INS_BELOW_ORIGINATOR */ 1380 } /* else not INS_BELOW_ORIGINATOR */
1340 1381
1341 if (op->type == PLAYER) 1382 if (op->type == PLAYER)
1342 { 1383 {
1343 op->contr->do_los = 1; 1384 op->contr->do_los = 1;
… …
1349 1390
1350 /* If we have a floor, we know the player, if any, will be above 1391 /* If we have a floor, we know the player, if any, will be above
1351 * it, so save a few ticks and start from there. 1392 * it, so save a few ticks and start from there.
1352 */ 1393 */
1353 if (!(flag & INS_MAP_LOAD)) 1394 if (!(flag & INS_MAP_LOAD))
1354 if (object *pl = op->ms ().player ()) 1395 if (object *pl = ms.player ())
1355 if (pl->contr->ns) 1396 if (pl->contr->ns)
1356 pl->contr->ns->floorbox_update (); 1397 pl->contr->ns->floorbox_update ();
1357 1398
1358 /* If this object glows, it may affect lighting conditions that are 1399 /* If this object glows, it may affect lighting conditions that are
1359 * visible to others on this map. But update_all_los is really 1400 * visible to others on this map. But update_all_los is really
… …
1421} 1462}
1422 1463
1423object * 1464object *
1424object::insert_at (object *where, object *originator, int flags) 1465object::insert_at (object *where, object *originator, int flags)
1425{ 1466{
1426 where->map->insert (this, where->x, where->y, originator, flags); 1467 return where->map->insert (this, where->x, where->y, originator, flags);
1427} 1468}
1428 1469
1429/* 1470/*
1430 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1471 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1431 * is returned contains nr objects, and the remaining parts contains 1472 * is returned contains nr objects, and the remaining parts contains
… …
1471 * the amount of an object. If the amount reaches 0, the object 1512 * the amount of an object. If the amount reaches 0, the object
1472 * is subsequently removed and freed. 1513 * is subsequently removed and freed.
1473 * 1514 *
1474 * Return value: 'op' if something is left, NULL if the amount reached 0 1515 * Return value: 'op' if something is left, NULL if the amount reached 0
1475 */ 1516 */
1476
1477object * 1517object *
1478decrease_ob_nr (object *op, uint32 i) 1518decrease_ob_nr (object *op, uint32 i)
1479{ 1519{
1480 object *tmp; 1520 object *tmp;
1481 1521
… …
1556 1596
1557/* 1597/*
1558 * add_weight(object, weight) adds the specified weight to an object, 1598 * add_weight(object, weight) adds the specified weight to an object,
1559 * and also updates how much the environment(s) is/are carrying. 1599 * and also updates how much the environment(s) is/are carrying.
1560 */ 1600 */
1561
1562void 1601void
1563add_weight (object *op, signed long weight) 1602add_weight (object *op, signed long weight)
1564{ 1603{
1565 while (op != NULL) 1604 while (op != NULL)
1566 { 1605 {
… …
1598 * inside the object environment. 1637 * inside the object environment.
1599 * 1638 *
1600 * The function returns now pointer to inserted item, and return value can 1639 * The function returns now pointer to inserted item, and return value can
1601 * be != op, if items are merged. -Tero 1640 * be != op, if items are merged. -Tero
1602 */ 1641 */
1603
1604object * 1642object *
1605object::insert (object *op) 1643object::insert (object *op)
1606{ 1644{
1607 object *tmp, *otmp; 1645 object *tmp, *otmp;
1608 1646
… …
1768 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1806 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1807 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1770 { 1808 {
1771 1809
1772 float 1810 float
1773 diff = tmp->move_slow_penalty * FABS (op->speed); 1811 diff = tmp->move_slow_penalty * fabs (op->speed);
1774 1812
1775 if (op->type == PLAYER) 1813 if (op->type == PLAYER)
1776 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1814 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1777 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1815 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1778 diff /= 4.0; 1816 diff /= 4.0;
… …
1985 } 2023 }
1986 2024
1987 if (!index) 2025 if (!index)
1988 return -1; 2026 return -1;
1989 2027
1990 return altern[RANDOM () % index]; 2028 return altern [rndm (index)];
1991} 2029}
1992 2030
1993/* 2031/*
1994 * find_first_free_spot(archetype, maptile, x, y) works like 2032 * find_first_free_spot(archetype, maptile, x, y) works like
1995 * find_free_spot(), but it will search max number of squares. 2033 * find_free_spot(), but it will search max number of squares.
… …
2016{ 2054{
2017 arr += begin; 2055 arr += begin;
2018 end -= begin; 2056 end -= begin;
2019 2057
2020 while (--end) 2058 while (--end)
2021 swap (arr [end], arr [RANDOM () % (end + 1)]); 2059 swap (arr [end], arr [rndm (end + 1)]);
2022} 2060}
2023 2061
2024/* new function to make monster searching more efficient, and effective! 2062/* new function to make monster searching more efficient, and effective!
2025 * This basically returns a randomized array (in the passed pointer) of 2063 * This basically returns a randomized array (in the passed pointer) of
2026 * the spaces to find monsters. In this way, it won't always look for 2064 * the spaces to find monsters. In this way, it won't always look for
… …
2160 2198
2161 return 3; 2199 return 3;
2162} 2200}
2163 2201
2164/* 2202/*
2165 * absdir(int): Returns a number between 1 and 8, which represent
2166 * the "absolute" direction of a number (it actually takes care of
2167 * "overflow" in previous calculations of a direction).
2168 */
2169
2170int
2171absdir (int d)
2172{
2173 while (d < 1)
2174 d += 8;
2175
2176 while (d > 8)
2177 d -= 8;
2178
2179 return d;
2180}
2181
2182/*
2183 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2203 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2184 * between two directions (which are expected to be absolute (see absdir()) 2204 * between two directions (which are expected to be absolute (see absdir())
2185 */ 2205 */
2186
2187int 2206int
2188dirdiff (int dir1, int dir2) 2207dirdiff (int dir1, int dir2)
2189{ 2208{
2190 int d; 2209 int d;
2191 2210
… …
2357 insert_ob_in_ob (object_create_clone (item), dst); 2376 insert_ob_in_ob (object_create_clone (item), dst);
2358 2377
2359 return dst; 2378 return dst;
2360} 2379}
2361 2380
2362/* GROS - Creates an object using a string representing its content. */
2363/* Basically, we save the content of the string to a temp file, then call */
2364/* load_object on it. I admit it is a highly inefficient way to make things, */
2365/* but it was simple to make and allows reusing the load_object function. */
2366/* Remember not to use load_object_str in a time-critical situation. */
2367/* Also remember that multiparts objects are not supported for now. */
2368object *
2369load_object_str (const char *obstr)
2370{
2371 object *op;
2372 char filename[MAX_BUF];
2373
2374 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2375
2376 FILE *tempfile = fopen (filename, "w");
2377
2378 if (tempfile == NULL)
2379 {
2380 LOG (llevError, "Error - Unable to access load object temp file\n");
2381 return NULL;
2382 }
2383
2384 fprintf (tempfile, obstr);
2385 fclose (tempfile);
2386
2387 op = object::create ();
2388
2389 object_thawer thawer (filename);
2390
2391 if (thawer)
2392 load_object (thawer, op, 0);
2393
2394 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2395 CLEAR_FLAG (op, FLAG_REMOVED);
2396
2397 return op;
2398}
2399
2400/* This returns the first object in who's inventory that 2381/* This returns the first object in who's inventory that
2401 * has the same type and subtype match. 2382 * has the same type and subtype match.
2402 * returns NULL if no match. 2383 * returns NULL if no match.
2403 */ 2384 */
2404object * 2385object *
… …
2457 if (link->key == canonical_key) 2438 if (link->key == canonical_key)
2458 return link->value; 2439 return link->value;
2459 2440
2460 return 0; 2441 return 0;
2461} 2442}
2462
2463 2443
2464/* 2444/*
2465 * Updates the canonical_key in op to value. 2445 * Updates the canonical_key in op to value.
2466 * 2446 *
2467 * canonical_key is a shared string (value doesn't have to be). 2447 * canonical_key is a shared string (value doesn't have to be).
… …
2607{ 2587{
2608 char flagdesc[512]; 2588 char flagdesc[512];
2609 char info2[256 * 4]; 2589 char info2[256 * 4];
2610 char *p = info; 2590 char *p = info;
2611 2591
2612 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2592 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2613 count, uuid.seq, 2593 count, uuid.seq,
2614 &name, 2594 &name,
2615 title ? "\",title:" : "", 2595 title ? "\",title:\"" : "",
2616 title ? (const char *)title : "", 2596 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type); 2597 flag_desc (flagdesc, 512), type);
2618 2598
2619 if (env) 2599 if (env)
2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2600 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2626} 2606}
2627 2607
2628const char * 2608const char *
2629object::debug_desc () const 2609object::debug_desc () const
2630{ 2610{
2631 static char info[256 * 4]; 2611 static char info[3][256 * 4];
2612 static int info_idx;
2613
2632 return debug_desc (info); 2614 return debug_desc (info [++info_idx % 3]);
2633} 2615}
2634 2616
2617struct region *
2618object::region () const
2619{
2620 return map ? map->region (x, y)
2621 : region::default_region ();
2622}
2623
2624const materialtype_t *
2625object::dominant_material () const
2626{
2627 if (materialtype_t *mat = name_to_material (materialname))
2628 return mat;
2629
2630 // omfg this is slow, this has to be temporary :)
2631 shstr unknown ("unknown");
2632
2633 return name_to_material (unknown);
2634}
2635
2636void
2637object::open_container (object *new_container)
2638{
2639 if (container == new_container)
2640 return;
2641
2642 if (object *old_container = container)
2643 {
2644 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2645 return;
2646
2647#if 0
2648 // remove the "Close old_container" object.
2649 if (object *closer = old_container->inv)
2650 if (closer->type == CLOSE_CON)
2651 closer->destroy ();
2652#endif
2653
2654 old_container->flag [FLAG_APPLIED] = 0;
2655 container = 0;
2656
2657 esrv_update_item (UPD_FLAGS, this, old_container);
2658 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2659 }
2660
2661 if (new_container)
2662 {
2663 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2664 return;
2665
2666 // TODO: this does not seem to serve any purpose anymore?
2667#if 0
2668 // insert the "Close Container" object.
2669 if (archetype *closer = new_container->other_arch)
2670 {
2671 object *closer = arch_to_object (new_container->other_arch);
2672 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2673 new_container->insert (closer);
2674 }
2675#endif
2676
2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2678
2679 new_container->flag [FLAG_APPLIED] = 1;
2680 container = new_container;
2681
2682 esrv_update_item (UPD_FLAGS, this, new_container);
2683 esrv_send_inventory (this, new_container);
2684 }
2685}
2686
2687

Diff Legend

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