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.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.139 by root, Sat Apr 21 17:34:22 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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>
… …
357/* 357/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 359 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 360 * The result of the dump is stored in the static global errmsg array.
361 */ 361 */
362
363char * 362char *
364dump_object (object *op) 363dump_object (object *op)
365{ 364{
366 if (!op) 365 if (!op)
367 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
368 367
369 object_freezer freezer; 368 object_freezer freezer;
370 save_object (freezer, op, 1); 369 op->write (freezer);
371 return freezer.as_string (); 370 return freezer.as_string ();
372} 371}
373 372
374/* 373/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 374 * 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. 394 * Returns the object which has the count-variable equal to the argument.
396 */ 395 */
397object * 396object *
398find_object (tag_t i) 397find_object (tag_t i)
399{ 398{
400 return ((unsigned int)i) < objects.size () 399 for_all_objects (op)
401 ? objects [i] 400 if (op->count == i)
402 : 0; 401 return op;
402
403 return 0;
403} 404}
404 405
405/* 406/*
406 * Returns the first object which has a name equal to the argument. 407 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 408 * Used only by the patch command, but not all that useful.
… …
453 * refcounts and freeing the links. 454 * refcounts and freeing the links.
454 */ 455 */
455static void 456static void
456free_key_values (object *op) 457free_key_values (object *op)
457{ 458{
458 for (key_value *i = op->key_values; i != 0;) 459 for (key_value *i = op->key_values; i; )
459 { 460 {
460 key_value *next = i->next; 461 key_value *next = i->next;
461 delete i; 462 delete i;
462 463
463 i = next; 464 i = next;
464 } 465 }
465 466
466 op->key_values = 0; 467 op->key_values = 0;
467} 468}
468 469
469/* 470object &
470 * copy_to first frees everything allocated by the dst object, 471object::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{ 472{
480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 473 bool is_freed = flag [FLAG_FREED];
481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 474 bool is_removed = flag [FLAG_REMOVED];
482 475
483 *(object_copy *)dst = *this; 476 *(object_copy *)this = src;
484 477
485 if (is_freed) 478 flag [FLAG_FREED] = is_freed;
486 SET_FLAG (dst, FLAG_FREED); 479 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 480
494 /* Copy over key_values, if any. */ 481 /* Copy over key_values, if any. */
495 if (key_values) 482 if (src.key_values)
496 { 483 {
497 key_value *tail = 0; 484 key_value *tail = 0;
498 key_value *i;
499
500 dst->key_values = 0; 485 key_values = 0;
501 486
502 for (i = key_values; i; i = i->next) 487 for (key_value *i = src.key_values; i; i = i->next)
503 { 488 {
504 key_value *new_link = new key_value; 489 key_value *new_link = new key_value;
505 490
506 new_link->next = 0; 491 new_link->next = 0;
507 new_link->key = i->key; 492 new_link->key = i->key;
508 new_link->value = i->value; 493 new_link->value = i->value;
509 494
510 /* Try and be clever here, too. */ 495 /* Try and be clever here, too. */
511 if (!dst->key_values) 496 if (!key_values)
512 { 497 {
513 dst->key_values = new_link; 498 key_values = new_link;
514 tail = new_link; 499 tail = new_link;
515 } 500 }
516 else 501 else
517 { 502 {
518 tail->next = new_link; 503 tail->next = new_link;
519 tail = new_link; 504 tail = new_link;
520 } 505 }
521 } 506 }
522 } 507 }
508}
509
510/*
511 * copy_to first frees everything allocated by the dst object,
512 * and then copies the contents of itself into the second
513 * object, allocating what needs to be allocated. Basically, any
514 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
515 * if the first object is freed, the pointers in the new object
516 * will point at garbage.
517 */
518void
519object::copy_to (object *dst)
520{
521 *dst = *this;
522
523 if (speed < 0)
524 dst->speed_left = speed_left - rndm ();
523 525
524 dst->set_speed (dst->speed); 526 dst->set_speed (dst->speed);
527}
528
529void
530object::instantiate ()
531{
532 if (!uuid.seq) // HACK
533 uuid = gen_uuid ();
534
535 speed_left = -0.1f;
536 /* copy the body_info to the body_used - this is only really
537 * need for monsters, but doesn't hurt to do it for everything.
538 * by doing so, when a monster is created, it has good starting
539 * values for the body_used info, so when items are created
540 * for it, they can be properly equipped.
541 */
542 memcpy (body_used, body_info, sizeof (body_used));
543
544 attachable::instantiate ();
525} 545}
526 546
527object * 547object *
528object::clone () 548object::clone ()
529{ 549{
… …
587 * UP_OBJ_FACE: only the objects face has changed. 607 * UP_OBJ_FACE: only the objects face has changed.
588 */ 608 */
589void 609void
590update_object (object *op, int action) 610update_object (object *op, int action)
591{ 611{
592 MoveType move_on, move_off, move_block, move_slow;
593
594 if (op == NULL) 612 if (op == NULL)
595 { 613 {
596 /* this should never happen */ 614 /* this should never happen */
597 LOG (llevDebug, "update_object() called for NULL object.\n"); 615 LOG (llevDebug, "update_object() called for NULL object.\n");
598 return; 616 return;
… …
658 676
659 if (op->more) 677 if (op->more)
660 update_object (op->more, action); 678 update_object (op->more, action);
661} 679}
662 680
663object *object::first;
664
665object::object () 681object::object ()
666{ 682{
667 SET_FLAG (this, FLAG_REMOVED); 683 SET_FLAG (this, FLAG_REMOVED);
668 684
669 expmul = 1.0; 685 expmul = 1.0;
670 face = blank_face; 686 face = blank_face;
671} 687}
672 688
673object::~object () 689object::~object ()
674{ 690{
691 unlink ();
692
675 free_key_values (this); 693 free_key_values (this);
676} 694}
677 695
696static int object_count;
697
678void object::link () 698void object::link ()
679{ 699{
700 assert (!index);//D
680 uuid = gen_uuid (); 701 uuid = gen_uuid ();
702 count = ++object_count;
681 703
704 refcnt_inc ();
682 objects.insert (this); 705 objects.insert (this);
683} 706}
684 707
685void object::unlink () 708void object::unlink ()
686{ 709{
710 if (!index)
711 return;
712
687 objects.erase (this); 713 objects.erase (this);
714 refcnt_dec ();
688} 715}
689 716
690void 717void
691object::activate () 718object::activate ()
692{ 719{
… …
764 * drop on that space. 791 * drop on that space.
765 */ 792 */
766 if (!drop_to_ground 793 if (!drop_to_ground
767 || !map 794 || !map
768 || map->in_memory != MAP_IN_MEMORY 795 || map->in_memory != MAP_IN_MEMORY
796 || map->nodrop
769 || ms ().move_block == MOVE_ALL) 797 || ms ().move_block == MOVE_ALL)
770 { 798 {
771 while (inv) 799 while (inv)
772 { 800 {
773 inv->destroy_inv (drop_to_ground); 801 inv->destroy_inv (drop_to_ground);
… …
782 810
783 if (op->flag [FLAG_STARTEQUIP] 811 if (op->flag [FLAG_STARTEQUIP]
784 || op->flag [FLAG_NO_DROP] 812 || op->flag [FLAG_NO_DROP]
785 || op->type == RUNE 813 || op->type == RUNE
786 || op->type == TRAP 814 || op->type == TRAP
787 || op->flag [FLAG_IS_A_TEMPLATE]) 815 || op->flag [FLAG_IS_A_TEMPLATE]
816 || op->flag [FLAG_DESTROY_ON_DEATH])
788 op->destroy (); 817 op->destroy ();
789 else 818 else
790 map->insert (op, x, y); 819 map->insert (op, x, y);
791 } 820 }
792 } 821 }
… …
800} 829}
801 830
802void 831void
803object::do_destroy () 832object::do_destroy ()
804{ 833{
834 attachable::do_destroy ();
835
805 if (flag [FLAG_IS_LINKED]) 836 if (flag [FLAG_IS_LINKED])
806 remove_button_link (this); 837 remove_button_link (this);
807 838
808 if (flag [FLAG_FRIENDLY]) 839 if (flag [FLAG_FRIENDLY])
840 {
809 remove_friendly_object (this); 841 remove_friendly_object (this);
842
843 if (type == GOLEM
844 && owner
845 && owner->type == PLAYER
846 && owner->contr->ranges[range_golem] == this)
847 owner->contr->ranges[range_golem] = 0;
848 }
810 849
811 if (!flag [FLAG_REMOVED]) 850 if (!flag [FLAG_REMOVED])
812 remove (); 851 remove ();
813 852
814 if (flag [FLAG_FREED]) 853 destroy_inv (true);
815 return;
816 854
817 set_speed (0); 855 deactivate ();
856 unlink ();
818 857
819 flag [FLAG_FREED] = 1; 858 flag [FLAG_FREED] = 1;
820
821 attachable::do_destroy ();
822
823 destroy_inv (true);
824 unlink ();
825 859
826 // hack to ensure that freed objects still have a valid map 860 // hack to ensure that freed objects still have a valid map
827 { 861 {
828 static maptile *freed_map; // freed objects are moved here to avoid crashes 862 static maptile *freed_map; // freed objects are moved here to avoid crashes
829 863
… …
891 * This function removes the object op from the linked list of objects 925 * This function removes the object op from the linked list of objects
892 * which it is currently tied to. When this function is done, the 926 * which it is currently tied to. When this function is done, the
893 * object will have no environment. If the object previously had an 927 * object will have no environment. If the object previously had an
894 * environment, the x and y coordinates will be updated to 928 * environment, the x and y coordinates will be updated to
895 * the previous environment. 929 * the previous environment.
896 * Beware: This function is called from the editor as well!
897 */ 930 */
898void 931void
899object::remove () 932object::do_remove ()
900{ 933{
901 object *tmp, *last = 0; 934 object *tmp, *last = 0;
902 object *otmp; 935 object *otmp;
903 936
904 if (QUERY_FLAG (this, FLAG_REMOVED)) 937 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
947 } 980 }
948 else if (map) 981 else if (map)
949 { 982 {
950 if (type == PLAYER) 983 if (type == PLAYER)
951 { 984 {
985 // leaving a spot always closes any open container on the ground
986 if (container && !container->env)
987 // this causes spurious floorbox updates, but it ensures
988 // that the CLOSE event is being sent.
989 close_container ();
990
952 --map->players; 991 --map->players;
953 map->touch (); 992 map->touch ();
954 } 993 }
955 994
956 map->dirty = true; 995 map->dirty = true;
996 mapspace &ms = this->ms ();
957 997
958 /* link the object above us */ 998 /* link the object above us */
959 if (above) 999 if (above)
960 above->below = below; 1000 above->below = below;
961 else 1001 else
962 map->at (x, y).top = below; /* we were top, set new top */ 1002 ms.top = below; /* we were top, set new top */
963 1003
964 /* Relink the object below us, if there is one */ 1004 /* Relink the object below us, if there is one */
965 if (below) 1005 if (below)
966 below->above = above; 1006 below->above = above;
967 else 1007 else
… …
969 /* Nothing below, which means we need to relink map object for this space 1009 /* Nothing below, which means we need to relink map object for this space
970 * use translated coordinates in case some oddness with map tiling is 1010 * use translated coordinates in case some oddness with map tiling is
971 * evident 1011 * evident
972 */ 1012 */
973 if (GET_MAP_OB (map, x, y) != this) 1013 if (GET_MAP_OB (map, x, y) != this)
974 {
975 char *dump = dump_object (this);
976 LOG (llevError,
977 "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); 1014 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 ());
978 free (dump);
979 dump = dump_object (GET_MAP_OB (map, x, y));
980 LOG (llevError, "%s\n", dump);
981 free (dump);
982 }
983 1015
984 map->at (x, y).bot = above; /* goes on above it. */ 1016 ms.bot = above; /* goes on above it. */
985 } 1017 }
986 1018
987 above = 0; 1019 above = 0;
988 below = 0; 1020 below = 0;
989 1021
990 if (map->in_memory == MAP_SAVING) 1022 if (map->in_memory == MAP_SAVING)
991 return; 1023 return;
992 1024
993 int check_walk_off = !flag [FLAG_NO_APPLY]; 1025 int check_walk_off = !flag [FLAG_NO_APPLY];
994 1026
995 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1027 for (tmp = ms.bot; tmp; tmp = tmp->above)
996 { 1028 {
997 /* No point updating the players look faces if he is the object 1029 /* No point updating the players look faces if he is the object
998 * being removed. 1030 * being removed.
999 */ 1031 */
1000 1032
… …
1080 } 1112 }
1081 1113
1082 return 0; 1114 return 0;
1083} 1115}
1084 1116
1117void
1118object::expand_tail ()
1119{
1120 if (more)
1121 return;
1122
1123 object *prev = this;
1124
1125 for (archetype *at = arch->more; at; at = at->more)
1126 {
1127 object *op = arch_to_object (at);
1128
1129 op->name = name;
1130 op->name_pl = name_pl;
1131 op->title = title;
1132
1133 op->head = this;
1134 prev->more = op;
1135
1136 prev = op;
1137 }
1138}
1139
1085/* 1140/*
1086 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1141 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1087 * job preparing multi-part monsters 1142 * job preparing multi-part monsters.
1088 */ 1143 */
1089object * 1144object *
1090insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1145insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1091{ 1146{
1092 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1147 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1119 * just 'op' otherwise 1174 * just 'op' otherwise
1120 */ 1175 */
1121object * 1176object *
1122insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1177insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1123{ 1178{
1179 assert (!op->flag [FLAG_FREED]);
1180
1124 object *tmp, *top, *floor = NULL; 1181 object *tmp, *top, *floor = NULL;
1125 sint16 x, y;
1126 1182
1127 if (QUERY_FLAG (op, FLAG_FREED)) 1183 op->remove ();
1128 {
1129 LOG (llevError, "Trying to insert freed object!\n");
1130 return NULL;
1131 }
1132 1184
1133 if (!m) 1185#if 0
1134 { 1186 if (!m->active != !op->active)
1135 char *dump = dump_object (op); 1187 if (m->active)
1136 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1188 op->activate_recursive ();
1137 free (dump); 1189 else
1138 return op; 1190 op->deactivate_recursive ();
1139 } 1191#endif
1140 1192
1141 if (out_of_map (m, op->x, op->y)) 1193 if (out_of_map (m, op->x, op->y))
1142 { 1194 {
1143 char *dump = dump_object (op);
1144 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1195 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1145#ifdef MANY_CORES 1196#ifdef MANY_CORES
1146 /* Better to catch this here, as otherwise the next use of this object 1197 /* Better to catch this here, as otherwise the next use of this object
1147 * is likely to cause a crash. Better to find out where it is getting 1198 * is likely to cause a crash. Better to find out where it is getting
1148 * improperly inserted. 1199 * improperly inserted.
1149 */ 1200 */
1150 abort (); 1201 abort ();
1151#endif 1202#endif
1152 free (dump);
1153 return op; 1203 return op;
1154 } 1204 }
1155 1205
1156 if (!QUERY_FLAG (op, FLAG_REMOVED))
1157 {
1158 char *dump = dump_object (op);
1159 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1160 free (dump);
1161 return op;
1162 }
1163
1164 if (op->more)
1165 {
1166 /* The part may be on a different map. */
1167
1168 object *more = op->more; 1206 if (object *more = op->more)
1169 1207 {
1170 /* We really need the caller to normalise coordinates - if
1171 * we set the map, that doesn't work if the location is within
1172 * a map and this is straddling an edge. So only if coordinate
1173 * is clear wrong do we normalise it.
1174 */
1175 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1176 more->map = get_map_from_coord (m, &more->x, &more->y);
1177 else if (!more->map)
1178 {
1179 /* For backwards compatibility - when not dealing with tiled maps,
1180 * more->map should always point to the parent.
1181 */
1182 more->map = m;
1183 }
1184
1185 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1208 if (!insert_ob_in_map (more, m, originator, flag))
1186 { 1209 {
1187 if (!op->head) 1210 if (!op->head)
1188 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1211 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1189 1212
1190 return 0; 1213 return 0;
… …
1195 1218
1196 /* Ideally, the caller figures this out. However, it complicates a lot 1219 /* Ideally, the caller figures this out. However, it complicates a lot
1197 * of areas of callers (eg, anything that uses find_free_spot would now 1220 * of areas of callers (eg, anything that uses find_free_spot would now
1198 * need extra work 1221 * need extra work
1199 */ 1222 */
1200 op->map = get_map_from_coord (m, &op->x, &op->y); 1223 if (!xy_normalise (m, op->x, op->y))
1201 x = op->x; 1224 return 0;
1202 y = op->y; 1225
1226 op->map = m;
1227 mapspace &ms = op->ms ();
1203 1228
1204 /* this has to be done after we translate the coordinates. 1229 /* this has to be done after we translate the coordinates.
1205 */ 1230 */
1206 if (op->nrof && !(flag & INS_NO_MERGE)) 1231 if (op->nrof && !(flag & INS_NO_MERGE))
1207 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1232 for (tmp = ms.bot; tmp; tmp = tmp->above)
1208 if (object::can_merge (op, tmp)) 1233 if (object::can_merge (op, tmp))
1209 { 1234 {
1210 op->nrof += tmp->nrof; 1235 op->nrof += tmp->nrof;
1211 tmp->destroy (); 1236 tmp->destroy ();
1212 } 1237 }
… …
1229 op->below = originator->below; 1254 op->below = originator->below;
1230 1255
1231 if (op->below) 1256 if (op->below)
1232 op->below->above = op; 1257 op->below->above = op;
1233 else 1258 else
1234 op->ms ().bot = op; 1259 ms.bot = op;
1235 1260
1236 /* since *below* originator, no need to update top */ 1261 /* since *below* originator, no need to update top */
1237 originator->below = op; 1262 originator->below = op;
1238 } 1263 }
1239 else 1264 else
1240 { 1265 {
1266 top = ms.bot;
1267
1241 /* If there are other objects, then */ 1268 /* If there are other objects, then */
1242 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1269 if ((!(flag & INS_MAP_LOAD)) && top)
1243 { 1270 {
1244 object *last = 0; 1271 object *last = 0;
1245 1272
1246 /* 1273 /*
1247 * If there are multiple objects on this space, we do some trickier handling. 1274 * If there are multiple objects on this space, we do some trickier handling.
… …
1253 * once we get to them. This reduces the need to traverse over all of 1280 * once we get to them. This reduces the need to traverse over all of
1254 * them when adding another one - this saves quite a bit of cpu time 1281 * them when adding another one - this saves quite a bit of cpu time
1255 * when lots of spells are cast in one area. Currently, it is presumed 1282 * when lots of spells are cast in one area. Currently, it is presumed
1256 * that flying non pickable objects are spell objects. 1283 * that flying non pickable objects are spell objects.
1257 */ 1284 */
1258 while (top) 1285 for (top = ms.bot; top; top = top->above)
1259 { 1286 {
1260 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1287 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1261 floor = top; 1288 floor = top;
1262 1289
1263 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1290 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1266 top = top->below; 1293 top = top->below;
1267 break; 1294 break;
1268 } 1295 }
1269 1296
1270 last = top; 1297 last = top;
1271 top = top->above;
1272 } 1298 }
1273 1299
1274 /* Don't want top to be NULL, so set it to the last valid object */ 1300 /* Don't want top to be NULL, so set it to the last valid object */
1275 top = last; 1301 top = last;
1276 1302
… …
1278 * looks like instead of lots of conditions here. 1304 * looks like instead of lots of conditions here.
1279 * makes things faster, and effectively the same result. 1305 * makes things faster, and effectively the same result.
1280 */ 1306 */
1281 1307
1282 /* Have object 'fall below' other objects that block view. 1308 /* Have object 'fall below' other objects that block view.
1283 * Unless those objects are exits, type 66 1309 * Unless those objects are exits.
1284 * If INS_ON_TOP is used, don't do this processing 1310 * If INS_ON_TOP is used, don't do this processing
1285 * Need to find the object that in fact blocks view, otherwise 1311 * Need to find the object that in fact blocks view, otherwise
1286 * stacking is a bit odd. 1312 * stacking is a bit odd.
1287 */ 1313 */
1288 if (!(flag & INS_ON_TOP) && 1314 if (!(flag & INS_ON_TOP)
1289 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1315 && ms.flags () & P_BLOCKSVIEW
1316 && (op->face && !faces [op->face].visibility))
1290 { 1317 {
1291 for (last = top; last != floor; last = last->below) 1318 for (last = top; last != floor; last = last->below)
1292 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1319 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1293 break; 1320 break;
1321
1294 /* Check to see if we found the object that blocks view, 1322 /* Check to see if we found the object that blocks view,
1295 * and make sure we have a below pointer for it so that 1323 * and make sure we have a below pointer for it so that
1296 * we can get inserted below this one, which requires we 1324 * we can get inserted below this one, which requires we
1297 * set top to the object below us. 1325 * set top to the object below us.
1298 */ 1326 */
… …
1300 top = last->below; 1328 top = last->below;
1301 } 1329 }
1302 } /* If objects on this space */ 1330 } /* If objects on this space */
1303 1331
1304 if (flag & INS_MAP_LOAD) 1332 if (flag & INS_MAP_LOAD)
1305 top = GET_MAP_TOP (op->map, op->x, op->y); 1333 top = ms.top;
1306 1334
1307 if (flag & INS_ABOVE_FLOOR_ONLY) 1335 if (flag & INS_ABOVE_FLOOR_ONLY)
1308 top = floor; 1336 top = floor;
1309 1337
1310 /* Top is the object that our object (op) is going to get inserted above. 1338 /* Top is the object that our object (op) is going to get inserted above.
1311 */ 1339 */
1312 1340
1313 /* First object on this space */ 1341 /* First object on this space */
1314 if (!top) 1342 if (!top)
1315 { 1343 {
1316 op->above = GET_MAP_OB (op->map, op->x, op->y); 1344 op->above = ms.bot;
1317 1345
1318 if (op->above) 1346 if (op->above)
1319 op->above->below = op; 1347 op->above->below = op;
1320 1348
1321 op->below = 0; 1349 op->below = 0;
1322 op->ms ().bot = op; 1350 ms.bot = op;
1323 } 1351 }
1324 else 1352 else
1325 { /* get inserted into the stack above top */ 1353 { /* get inserted into the stack above top */
1326 op->above = top->above; 1354 op->above = top->above;
1327 1355
… …
1331 op->below = top; 1359 op->below = top;
1332 top->above = op; 1360 top->above = op;
1333 } 1361 }
1334 1362
1335 if (!op->above) 1363 if (!op->above)
1336 op->ms ().top = op; 1364 ms.top = op;
1337 } /* else not INS_BELOW_ORIGINATOR */ 1365 } /* else not INS_BELOW_ORIGINATOR */
1338 1366
1339 if (op->type == PLAYER) 1367 if (op->type == PLAYER)
1340 { 1368 {
1341 op->contr->do_los = 1; 1369 op->contr->do_los = 1;
… …
1347 1375
1348 /* If we have a floor, we know the player, if any, will be above 1376 /* If we have a floor, we know the player, if any, will be above
1349 * it, so save a few ticks and start from there. 1377 * it, so save a few ticks and start from there.
1350 */ 1378 */
1351 if (!(flag & INS_MAP_LOAD)) 1379 if (!(flag & INS_MAP_LOAD))
1352 if (object *pl = op->ms ().player ()) 1380 if (object *pl = ms.player ())
1353 if (pl->contr->ns) 1381 if (pl->contr->ns)
1354 pl->contr->ns->floorbox_update (); 1382 pl->contr->ns->floorbox_update ();
1355 1383
1356 /* If this object glows, it may affect lighting conditions that are 1384 /* If this object glows, it may affect lighting conditions that are
1357 * visible to others on this map. But update_all_los is really 1385 * visible to others on this map. But update_all_los is really
… …
1419} 1447}
1420 1448
1421object * 1449object *
1422object::insert_at (object *where, object *originator, int flags) 1450object::insert_at (object *where, object *originator, int flags)
1423{ 1451{
1424 where->map->insert (this, where->x, where->y, originator, flags); 1452 return where->map->insert (this, where->x, where->y, originator, flags);
1425} 1453}
1426 1454
1427/* 1455/*
1428 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1456 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1429 * is returned contains nr objects, and the remaining parts contains 1457 * is returned contains nr objects, and the remaining parts contains
… …
1469 * the amount of an object. If the amount reaches 0, the object 1497 * the amount of an object. If the amount reaches 0, the object
1470 * is subsequently removed and freed. 1498 * is subsequently removed and freed.
1471 * 1499 *
1472 * Return value: 'op' if something is left, NULL if the amount reached 0 1500 * Return value: 'op' if something is left, NULL if the amount reached 0
1473 */ 1501 */
1474
1475object * 1502object *
1476decrease_ob_nr (object *op, uint32 i) 1503decrease_ob_nr (object *op, uint32 i)
1477{ 1504{
1478 object *tmp; 1505 object *tmp;
1479 1506
… …
1554 1581
1555/* 1582/*
1556 * add_weight(object, weight) adds the specified weight to an object, 1583 * add_weight(object, weight) adds the specified weight to an object,
1557 * and also updates how much the environment(s) is/are carrying. 1584 * and also updates how much the environment(s) is/are carrying.
1558 */ 1585 */
1559
1560void 1586void
1561add_weight (object *op, signed long weight) 1587add_weight (object *op, signed long weight)
1562{ 1588{
1563 while (op != NULL) 1589 while (op != NULL)
1564 { 1590 {
… …
1596 * inside the object environment. 1622 * inside the object environment.
1597 * 1623 *
1598 * The function returns now pointer to inserted item, and return value can 1624 * The function returns now pointer to inserted item, and return value can
1599 * be != op, if items are merged. -Tero 1625 * be != op, if items are merged. -Tero
1600 */ 1626 */
1601
1602object * 1627object *
1603object::insert (object *op) 1628object::insert (object *op)
1604{ 1629{
1605 object *tmp, *otmp; 1630 object *tmp, *otmp;
1606 1631
… …
1766 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1791 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1767 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1792 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768 { 1793 {
1769 1794
1770 float 1795 float
1771 diff = tmp->move_slow_penalty * FABS (op->speed); 1796 diff = tmp->move_slow_penalty * fabs (op->speed);
1772 1797
1773 if (op->type == PLAYER) 1798 if (op->type == PLAYER)
1774 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1799 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1775 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1800 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1776 diff /= 4.0; 1801 diff /= 4.0;
… …
1983 } 2008 }
1984 2009
1985 if (!index) 2010 if (!index)
1986 return -1; 2011 return -1;
1987 2012
1988 return altern[RANDOM () % index]; 2013 return altern [rndm (index)];
1989} 2014}
1990 2015
1991/* 2016/*
1992 * find_first_free_spot(archetype, maptile, x, y) works like 2017 * find_first_free_spot(archetype, maptile, x, y) works like
1993 * find_free_spot(), but it will search max number of squares. 2018 * find_free_spot(), but it will search max number of squares.
… …
2014{ 2039{
2015 arr += begin; 2040 arr += begin;
2016 end -= begin; 2041 end -= begin;
2017 2042
2018 while (--end) 2043 while (--end)
2019 swap (arr [end], arr [RANDOM () % (end + 1)]); 2044 swap (arr [end], arr [rndm (end + 1)]);
2020} 2045}
2021 2046
2022/* new function to make monster searching more efficient, and effective! 2047/* new function to make monster searching more efficient, and effective!
2023 * This basically returns a randomized array (in the passed pointer) of 2048 * This basically returns a randomized array (in the passed pointer) of
2024 * the spaces to find monsters. In this way, it won't always look for 2049 * the spaces to find monsters. In this way, it won't always look for
… …
2158 2183
2159 return 3; 2184 return 3;
2160} 2185}
2161 2186
2162/* 2187/*
2163 * absdir(int): Returns a number between 1 and 8, which represent
2164 * the "absolute" direction of a number (it actually takes care of
2165 * "overflow" in previous calculations of a direction).
2166 */
2167
2168int
2169absdir (int d)
2170{
2171 while (d < 1)
2172 d += 8;
2173
2174 while (d > 8)
2175 d -= 8;
2176
2177 return d;
2178}
2179
2180/*
2181 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2188 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2182 * between two directions (which are expected to be absolute (see absdir()) 2189 * between two directions (which are expected to be absolute (see absdir())
2183 */ 2190 */
2184
2185int 2191int
2186dirdiff (int dir1, int dir2) 2192dirdiff (int dir1, int dir2)
2187{ 2193{
2188 int d; 2194 int d;
2189 2195
… …
2355 insert_ob_in_ob (object_create_clone (item), dst); 2361 insert_ob_in_ob (object_create_clone (item), dst);
2356 2362
2357 return dst; 2363 return dst;
2358} 2364}
2359 2365
2360/* GROS - Creates an object using a string representing its content. */
2361/* Basically, we save the content of the string to a temp file, then call */
2362/* load_object on it. I admit it is a highly inefficient way to make things, */
2363/* but it was simple to make and allows reusing the load_object function. */
2364/* Remember not to use load_object_str in a time-critical situation. */
2365/* Also remember that multiparts objects are not supported for now. */
2366object *
2367load_object_str (const char *obstr)
2368{
2369 object *op;
2370 char filename[MAX_BUF];
2371
2372 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2373
2374 FILE *tempfile = fopen (filename, "w");
2375
2376 if (tempfile == NULL)
2377 {
2378 LOG (llevError, "Error - Unable to access load object temp file\n");
2379 return NULL;
2380 }
2381
2382 fprintf (tempfile, obstr);
2383 fclose (tempfile);
2384
2385 op = object::create ();
2386
2387 object_thawer thawer (filename);
2388
2389 if (thawer)
2390 load_object (thawer, op, 0);
2391
2392 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2393 CLEAR_FLAG (op, FLAG_REMOVED);
2394
2395 return op;
2396}
2397
2398/* This returns the first object in who's inventory that 2366/* This returns the first object in who's inventory that
2399 * has the same type and subtype match. 2367 * has the same type and subtype match.
2400 * returns NULL if no match. 2368 * returns NULL if no match.
2401 */ 2369 */
2402object * 2370object *
… …
2455 if (link->key == canonical_key) 2423 if (link->key == canonical_key)
2456 return link->value; 2424 return link->value;
2457 2425
2458 return 0; 2426 return 0;
2459} 2427}
2460
2461 2428
2462/* 2429/*
2463 * Updates the canonical_key in op to value. 2430 * Updates the canonical_key in op to value.
2464 * 2431 *
2465 * canonical_key is a shared string (value doesn't have to be). 2432 * canonical_key is a shared string (value doesn't have to be).
… …
2605{ 2572{
2606 char flagdesc[512]; 2573 char flagdesc[512];
2607 char info2[256 * 4]; 2574 char info2[256 * 4];
2608 char *p = info; 2575 char *p = info;
2609 2576
2610 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2577 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2611 count, uuid.seq, 2578 count, uuid.seq,
2612 &name, 2579 &name,
2613 title ? "\",title:" : "", 2580 title ? "\",title:\"" : "",
2614 title ? (const char *)title : "", 2581 title ? (const char *)title : "",
2615 flag_desc (flagdesc, 512), type); 2582 flag_desc (flagdesc, 512), type);
2616 2583
2617 if (env) 2584 if (env)
2618 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2585 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2628{ 2595{
2629 static char info[256 * 4]; 2596 static char info[256 * 4];
2630 return debug_desc (info); 2597 return debug_desc (info);
2631} 2598}
2632 2599
2600const char *
2601object::debug_desc2 () const
2602{
2603 static char info[256 * 4];
2604 return debug_desc (info);
2605}
2606
2607struct region *
2608object::region () const
2609{
2610 return map ? map->region (x, y)
2611 : region::default_region ();
2612}
2613
2614const materialtype_t *
2615object::dominant_material () const
2616{
2617 if (materialtype_t *mat = name_to_material (materialname))
2618 return mat;
2619
2620 // omfg this is slow, this has to be temporary :)
2621 shstr unknown ("unknown");
2622
2623 return name_to_material (unknown);
2624}
2625
2626void
2627object::open_container (object *new_container)
2628{
2629 if (container == new_container)
2630 return;
2631
2632 if (object *old_container = container)
2633 {
2634 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2635 return;
2636
2637#if 0
2638 // remove the "Close old_container" object.
2639 if (object *closer = old_container->inv)
2640 if (closer->type == CLOSE_CON)
2641 closer->destroy ();
2642#endif
2643
2644 old_container->flag [FLAG_APPLIED] = 0;
2645 container = 0;
2646
2647 esrv_update_item (UPD_FLAGS, this, old_container);
2648 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2649 }
2650
2651 if (new_container)
2652 {
2653 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2654 return;
2655
2656 // TODO: this does not seem to serve any purpose anymore?
2657#if 0
2658 // insert the "Close Container" object.
2659 if (archetype *closer = new_container->other_arch)
2660 {
2661 object *closer = arch_to_object (new_container->other_arch);
2662 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2663 new_container->insert (closer);
2664 }
2665#endif
2666
2667 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2668
2669 new_container->flag [FLAG_APPLIED] = 1;
2670 container = new_container;
2671
2672 esrv_update_item (UPD_FLAGS, this, new_container);
2673 esrv_send_inventory (this, new_container);
2674 }
2675}
2676
2677

Diff Legend

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