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.112 by root, Mon Jan 8 14:11:04 2007 UTC vs.
Revision 1.138 by root, Sat Apr 21 16:56:29 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
… …
455 * refcounts and freeing the links. 454 * refcounts and freeing the links.
456 */ 455 */
457static void 456static void
458free_key_values (object *op) 457free_key_values (object *op)
459{ 458{
460 for (key_value *i = op->key_values; i != 0;) 459 for (key_value *i = op->key_values; i; )
461 { 460 {
462 key_value *next = i->next; 461 key_value *next = i->next;
463 delete i; 462 delete i;
464 463
465 i = next; 464 i = next;
466 } 465 }
467 466
468 op->key_values = 0; 467 op->key_values = 0;
469} 468}
470 469
471/* 470object &
472 * copy_to first frees everything allocated by the dst object, 471object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 472{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 473 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 474 bool is_removed = flag [FLAG_REMOVED];
484 475
485 *(object_copy *)dst = *this; 476 *(object_copy *)this = src;
486 477
487 if (is_freed) 478 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 479 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495 480
496 /* Copy over key_values, if any. */ 481 /* Copy over key_values, if any. */
497 if (key_values) 482 if (src.key_values)
498 { 483 {
499 key_value *tail = 0; 484 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 485 key_values = 0;
503 486
504 for (i = key_values; i; i = i->next) 487 for (key_value *i = src.key_values; i; i = i->next)
505 { 488 {
506 key_value *new_link = new key_value; 489 key_value *new_link = new key_value;
507 490
508 new_link->next = 0; 491 new_link->next = 0;
509 new_link->key = i->key; 492 new_link->key = i->key;
510 new_link->value = i->value; 493 new_link->value = i->value;
511 494
512 /* Try and be clever here, too. */ 495 /* Try and be clever here, too. */
513 if (!dst->key_values) 496 if (!key_values)
514 { 497 {
515 dst->key_values = new_link; 498 key_values = new_link;
516 tail = new_link; 499 tail = new_link;
517 } 500 }
518 else 501 else
519 { 502 {
520 tail->next = new_link; 503 tail->next = new_link;
521 tail = new_link; 504 tail = new_link;
522 } 505 }
523 } 506 }
524 } 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 ();
525 525
526 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 ();
527} 545}
528 546
529object * 547object *
530object::clone () 548object::clone ()
531{ 549{
… …
589 * UP_OBJ_FACE: only the objects face has changed. 607 * UP_OBJ_FACE: only the objects face has changed.
590 */ 608 */
591void 609void
592update_object (object *op, int action) 610update_object (object *op, int action)
593{ 611{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 612 if (op == NULL)
597 { 613 {
598 /* this should never happen */ 614 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 615 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 616 return;
… …
660 676
661 if (op->more) 677 if (op->more)
662 update_object (op->more, action); 678 update_object (op->more, action);
663} 679}
664 680
665object *object::first;
666
667object::object () 681object::object ()
668{ 682{
669 SET_FLAG (this, FLAG_REMOVED); 683 SET_FLAG (this, FLAG_REMOVED);
670 684
671 expmul = 1.0; 685 expmul = 1.0;
672 face = blank_face; 686 face = blank_face;
673} 687}
674 688
675object::~object () 689object::~object ()
676{ 690{
691 unlink ();
692
677 free_key_values (this); 693 free_key_values (this);
678} 694}
679 695
680static int object_count; 696static int object_count;
681 697
… …
689 objects.insert (this); 705 objects.insert (this);
690} 706}
691 707
692void object::unlink () 708void object::unlink ()
693{ 709{
694 assert (index);//D 710 if (!index)
711 return;
712
695 objects.erase (this); 713 objects.erase (this);
696 refcnt_dec (); 714 refcnt_dec ();
697} 715}
698 716
699void 717void
… …
773 * drop on that space. 791 * drop on that space.
774 */ 792 */
775 if (!drop_to_ground 793 if (!drop_to_ground
776 || !map 794 || !map
777 || map->in_memory != MAP_IN_MEMORY 795 || map->in_memory != MAP_IN_MEMORY
796 || map->nodrop
778 || ms ().move_block == MOVE_ALL) 797 || ms ().move_block == MOVE_ALL)
779 { 798 {
780 while (inv) 799 while (inv)
781 { 800 {
782 inv->destroy_inv (drop_to_ground); 801 inv->destroy_inv (drop_to_ground);
… …
816 835
817 if (flag [FLAG_IS_LINKED]) 836 if (flag [FLAG_IS_LINKED])
818 remove_button_link (this); 837 remove_button_link (this);
819 838
820 if (flag [FLAG_FRIENDLY]) 839 if (flag [FLAG_FRIENDLY])
840 {
821 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 }
822 849
823 if (!flag [FLAG_REMOVED]) 850 if (!flag [FLAG_REMOVED])
824 remove (); 851 remove ();
825 852
826 destroy_inv (true); 853 destroy_inv (true);
… …
898 * 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
899 * 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
900 * object will have no environment. If the object previously had an 927 * object will have no environment. If the object previously had an
901 * environment, the x and y coordinates will be updated to 928 * environment, the x and y coordinates will be updated to
902 * the previous environment. 929 * the previous environment.
903 * Beware: This function is called from the editor as well!
904 */ 930 */
905void 931void
906object::remove () 932object::do_remove ()
907{ 933{
908 object *tmp, *last = 0; 934 object *tmp, *last = 0;
909 object *otmp; 935 object *otmp;
910 936
911 if (QUERY_FLAG (this, FLAG_REMOVED)) 937 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
954 } 980 }
955 else if (map) 981 else if (map)
956 { 982 {
957 if (type == PLAYER) 983 if (type == PLAYER)
958 { 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
959 --map->players; 991 --map->players;
960 map->touch (); 992 map->touch ();
961 } 993 }
962 994
963 map->dirty = true; 995 map->dirty = true;
996 mapspace &ms = this->ms ();
964 997
965 /* link the object above us */ 998 /* link the object above us */
966 if (above) 999 if (above)
967 above->below = below; 1000 above->below = below;
968 else 1001 else
969 map->at (x, y).top = below; /* we were top, set new top */ 1002 ms.top = below; /* we were top, set new top */
970 1003
971 /* Relink the object below us, if there is one */ 1004 /* Relink the object below us, if there is one */
972 if (below) 1005 if (below)
973 below->above = above; 1006 below->above = above;
974 else 1007 else
… …
976 /* 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
977 * use translated coordinates in case some oddness with map tiling is 1010 * use translated coordinates in case some oddness with map tiling is
978 * evident 1011 * evident
979 */ 1012 */
980 if (GET_MAP_OB (map, x, y) != this) 1013 if (GET_MAP_OB (map, x, y) != this)
981 {
982 char *dump = dump_object (this);
983 LOG (llevError,
984 "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 ());
985 free (dump);
986 dump = dump_object (GET_MAP_OB (map, x, y));
987 LOG (llevError, "%s\n", dump);
988 free (dump);
989 }
990 1015
991 map->at (x, y).bot = above; /* goes on above it. */ 1016 ms.bot = above; /* goes on above it. */
992 } 1017 }
993 1018
994 above = 0; 1019 above = 0;
995 below = 0; 1020 below = 0;
996 1021
997 if (map->in_memory == MAP_SAVING) 1022 if (map->in_memory == MAP_SAVING)
998 return; 1023 return;
999 1024
1000 int check_walk_off = !flag [FLAG_NO_APPLY]; 1025 int check_walk_off = !flag [FLAG_NO_APPLY];
1001 1026
1002 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1027 for (tmp = ms.bot; tmp; tmp = tmp->above)
1003 { 1028 {
1004 /* 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
1005 * being removed. 1030 * being removed.
1006 */ 1031 */
1007 1032
… …
1087 } 1112 }
1088 1113
1089 return 0; 1114 return 0;
1090} 1115}
1091 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
1092/* 1140/*
1093 * 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
1094 * job preparing multi-part monsters 1142 * job preparing multi-part monsters.
1095 */ 1143 */
1096object * 1144object *
1097insert_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)
1098{ 1146{
1099 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1147 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1126 * just 'op' otherwise 1174 * just 'op' otherwise
1127 */ 1175 */
1128object * 1176object *
1129insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1177insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1130{ 1178{
1179 assert (!op->flag [FLAG_FREED]);
1180
1131 object *tmp, *top, *floor = NULL; 1181 object *tmp, *top, *floor = NULL;
1132 sint16 x, y;
1133 1182
1134 if (QUERY_FLAG (op, FLAG_FREED)) 1183 op->remove ();
1135 {
1136 LOG (llevError, "Trying to insert freed object!\n");
1137 return NULL;
1138 }
1139 1184
1140 if (!m) 1185 if (!m->active != !op->active)
1141 { 1186 if (m->active)
1142 char *dump = dump_object (op); 1187 op->activate_recursive ();
1143 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1188 else
1144 free (dump); 1189 op->deactivate_recursive ();
1145 return op;
1146 }
1147 1190
1148 if (out_of_map (m, op->x, op->y)) 1191 if (out_of_map (m, op->x, op->y))
1149 { 1192 {
1150 char *dump = dump_object (op);
1151 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1193 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1152#ifdef MANY_CORES 1194#ifdef MANY_CORES
1153 /* Better to catch this here, as otherwise the next use of this object 1195 /* Better to catch this here, as otherwise the next use of this object
1154 * is likely to cause a crash. Better to find out where it is getting 1196 * is likely to cause a crash. Better to find out where it is getting
1155 * improperly inserted. 1197 * improperly inserted.
1156 */ 1198 */
1157 abort (); 1199 abort ();
1158#endif 1200#endif
1159 free (dump);
1160 return op; 1201 return op;
1161 } 1202 }
1162 1203
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 {
1165 char *dump = dump_object (op);
1166 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1167 free (dump);
1168 return op;
1169 }
1170
1171 if (op->more)
1172 {
1173 /* The part may be on a different map. */
1174
1175 object *more = op->more; 1204 if (object *more = op->more)
1176 1205 {
1177 /* We really need the caller to normalise coordinates - if
1178 * we set the map, that doesn't work if the location is within
1179 * a map and this is straddling an edge. So only if coordinate
1180 * is clear wrong do we normalise it.
1181 */
1182 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1183 more->map = get_map_from_coord (m, &more->x, &more->y);
1184 else if (!more->map)
1185 {
1186 /* For backwards compatibility - when not dealing with tiled maps,
1187 * more->map should always point to the parent.
1188 */
1189 more->map = m;
1190 }
1191
1192 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1206 if (!insert_ob_in_map (more, m, originator, flag))
1193 { 1207 {
1194 if (!op->head) 1208 if (!op->head)
1195 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1209 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1196 1210
1197 return 0; 1211 return 0;
… …
1202 1216
1203 /* Ideally, the caller figures this out. However, it complicates a lot 1217 /* Ideally, the caller figures this out. However, it complicates a lot
1204 * of areas of callers (eg, anything that uses find_free_spot would now 1218 * of areas of callers (eg, anything that uses find_free_spot would now
1205 * need extra work 1219 * need extra work
1206 */ 1220 */
1207 op->map = get_map_from_coord (m, &op->x, &op->y); 1221 if (!xy_normalise (m, op->x, op->y))
1208 x = op->x; 1222 return 0;
1209 y = op->y; 1223
1224 op->map = m;
1225 mapspace &ms = op->ms ();
1210 1226
1211 /* this has to be done after we translate the coordinates. 1227 /* this has to be done after we translate the coordinates.
1212 */ 1228 */
1213 if (op->nrof && !(flag & INS_NO_MERGE)) 1229 if (op->nrof && !(flag & INS_NO_MERGE))
1214 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1230 for (tmp = ms.bot; tmp; tmp = tmp->above)
1215 if (object::can_merge (op, tmp)) 1231 if (object::can_merge (op, tmp))
1216 { 1232 {
1217 op->nrof += tmp->nrof; 1233 op->nrof += tmp->nrof;
1218 tmp->destroy (); 1234 tmp->destroy ();
1219 } 1235 }
… …
1236 op->below = originator->below; 1252 op->below = originator->below;
1237 1253
1238 if (op->below) 1254 if (op->below)
1239 op->below->above = op; 1255 op->below->above = op;
1240 else 1256 else
1241 op->ms ().bot = op; 1257 ms.bot = op;
1242 1258
1243 /* since *below* originator, no need to update top */ 1259 /* since *below* originator, no need to update top */
1244 originator->below = op; 1260 originator->below = op;
1245 } 1261 }
1246 else 1262 else
1247 { 1263 {
1264 top = ms.bot;
1265
1248 /* If there are other objects, then */ 1266 /* If there are other objects, then */
1249 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1267 if ((!(flag & INS_MAP_LOAD)) && top)
1250 { 1268 {
1251 object *last = 0; 1269 object *last = 0;
1252 1270
1253 /* 1271 /*
1254 * If there are multiple objects on this space, we do some trickier handling. 1272 * If there are multiple objects on this space, we do some trickier handling.
… …
1260 * once we get to them. This reduces the need to traverse over all of 1278 * once we get to them. This reduces the need to traverse over all of
1261 * them when adding another one - this saves quite a bit of cpu time 1279 * them when adding another one - this saves quite a bit of cpu time
1262 * when lots of spells are cast in one area. Currently, it is presumed 1280 * when lots of spells are cast in one area. Currently, it is presumed
1263 * that flying non pickable objects are spell objects. 1281 * that flying non pickable objects are spell objects.
1264 */ 1282 */
1265 while (top) 1283 for (top = ms.bot; top; top = top->above)
1266 { 1284 {
1267 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1285 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1268 floor = top; 1286 floor = top;
1269 1287
1270 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1288 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1273 top = top->below; 1291 top = top->below;
1274 break; 1292 break;
1275 } 1293 }
1276 1294
1277 last = top; 1295 last = top;
1278 top = top->above;
1279 } 1296 }
1280 1297
1281 /* Don't want top to be NULL, so set it to the last valid object */ 1298 /* Don't want top to be NULL, so set it to the last valid object */
1282 top = last; 1299 top = last;
1283 1300
… …
1285 * looks like instead of lots of conditions here. 1302 * looks like instead of lots of conditions here.
1286 * makes things faster, and effectively the same result. 1303 * makes things faster, and effectively the same result.
1287 */ 1304 */
1288 1305
1289 /* Have object 'fall below' other objects that block view. 1306 /* Have object 'fall below' other objects that block view.
1290 * Unless those objects are exits, type 66 1307 * Unless those objects are exits.
1291 * If INS_ON_TOP is used, don't do this processing 1308 * If INS_ON_TOP is used, don't do this processing
1292 * Need to find the object that in fact blocks view, otherwise 1309 * Need to find the object that in fact blocks view, otherwise
1293 * stacking is a bit odd. 1310 * stacking is a bit odd.
1294 */ 1311 */
1295 if (!(flag & INS_ON_TOP) && 1312 if (!(flag & INS_ON_TOP)
1296 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1313 && ms.flags () & P_BLOCKSVIEW
1314 && (op->face && !faces [op->face].visibility))
1297 { 1315 {
1298 for (last = top; last != floor; last = last->below) 1316 for (last = top; last != floor; last = last->below)
1299 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1317 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1300 break; 1318 break;
1319
1301 /* Check to see if we found the object that blocks view, 1320 /* Check to see if we found the object that blocks view,
1302 * and make sure we have a below pointer for it so that 1321 * and make sure we have a below pointer for it so that
1303 * we can get inserted below this one, which requires we 1322 * we can get inserted below this one, which requires we
1304 * set top to the object below us. 1323 * set top to the object below us.
1305 */ 1324 */
… …
1307 top = last->below; 1326 top = last->below;
1308 } 1327 }
1309 } /* If objects on this space */ 1328 } /* If objects on this space */
1310 1329
1311 if (flag & INS_MAP_LOAD) 1330 if (flag & INS_MAP_LOAD)
1312 top = GET_MAP_TOP (op->map, op->x, op->y); 1331 top = ms.top;
1313 1332
1314 if (flag & INS_ABOVE_FLOOR_ONLY) 1333 if (flag & INS_ABOVE_FLOOR_ONLY)
1315 top = floor; 1334 top = floor;
1316 1335
1317 /* Top is the object that our object (op) is going to get inserted above. 1336 /* Top is the object that our object (op) is going to get inserted above.
1318 */ 1337 */
1319 1338
1320 /* First object on this space */ 1339 /* First object on this space */
1321 if (!top) 1340 if (!top)
1322 { 1341 {
1323 op->above = GET_MAP_OB (op->map, op->x, op->y); 1342 op->above = ms.bot;
1324 1343
1325 if (op->above) 1344 if (op->above)
1326 op->above->below = op; 1345 op->above->below = op;
1327 1346
1328 op->below = 0; 1347 op->below = 0;
1329 op->ms ().bot = op; 1348 ms.bot = op;
1330 } 1349 }
1331 else 1350 else
1332 { /* get inserted into the stack above top */ 1351 { /* get inserted into the stack above top */
1333 op->above = top->above; 1352 op->above = top->above;
1334 1353
… …
1338 op->below = top; 1357 op->below = top;
1339 top->above = op; 1358 top->above = op;
1340 } 1359 }
1341 1360
1342 if (!op->above) 1361 if (!op->above)
1343 op->ms ().top = op; 1362 ms.top = op;
1344 } /* else not INS_BELOW_ORIGINATOR */ 1363 } /* else not INS_BELOW_ORIGINATOR */
1345 1364
1346 if (op->type == PLAYER) 1365 if (op->type == PLAYER)
1347 { 1366 {
1348 op->contr->do_los = 1; 1367 op->contr->do_los = 1;
… …
1354 1373
1355 /* If we have a floor, we know the player, if any, will be above 1374 /* If we have a floor, we know the player, if any, will be above
1356 * it, so save a few ticks and start from there. 1375 * it, so save a few ticks and start from there.
1357 */ 1376 */
1358 if (!(flag & INS_MAP_LOAD)) 1377 if (!(flag & INS_MAP_LOAD))
1359 if (object *pl = op->ms ().player ()) 1378 if (object *pl = ms.player ())
1360 if (pl->contr->ns) 1379 if (pl->contr->ns)
1361 pl->contr->ns->floorbox_update (); 1380 pl->contr->ns->floorbox_update ();
1362 1381
1363 /* If this object glows, it may affect lighting conditions that are 1382 /* If this object glows, it may affect lighting conditions that are
1364 * visible to others on this map. But update_all_los is really 1383 * visible to others on this map. But update_all_los is really
… …
1426} 1445}
1427 1446
1428object * 1447object *
1429object::insert_at (object *where, object *originator, int flags) 1448object::insert_at (object *where, object *originator, int flags)
1430{ 1449{
1431 where->map->insert (this, where->x, where->y, originator, flags); 1450 return where->map->insert (this, where->x, where->y, originator, flags);
1432} 1451}
1433 1452
1434/* 1453/*
1435 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1454 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1436 * is returned contains nr objects, and the remaining parts contains 1455 * is returned contains nr objects, and the remaining parts contains
… …
1476 * the amount of an object. If the amount reaches 0, the object 1495 * the amount of an object. If the amount reaches 0, the object
1477 * is subsequently removed and freed. 1496 * is subsequently removed and freed.
1478 * 1497 *
1479 * Return value: 'op' if something is left, NULL if the amount reached 0 1498 * Return value: 'op' if something is left, NULL if the amount reached 0
1480 */ 1499 */
1481
1482object * 1500object *
1483decrease_ob_nr (object *op, uint32 i) 1501decrease_ob_nr (object *op, uint32 i)
1484{ 1502{
1485 object *tmp; 1503 object *tmp;
1486 1504
… …
1561 1579
1562/* 1580/*
1563 * add_weight(object, weight) adds the specified weight to an object, 1581 * add_weight(object, weight) adds the specified weight to an object,
1564 * and also updates how much the environment(s) is/are carrying. 1582 * and also updates how much the environment(s) is/are carrying.
1565 */ 1583 */
1566
1567void 1584void
1568add_weight (object *op, signed long weight) 1585add_weight (object *op, signed long weight)
1569{ 1586{
1570 while (op != NULL) 1587 while (op != NULL)
1571 { 1588 {
… …
1603 * inside the object environment. 1620 * inside the object environment.
1604 * 1621 *
1605 * The function returns now pointer to inserted item, and return value can 1622 * The function returns now pointer to inserted item, and return value can
1606 * be != op, if items are merged. -Tero 1623 * be != op, if items are merged. -Tero
1607 */ 1624 */
1608
1609object * 1625object *
1610object::insert (object *op) 1626object::insert (object *op)
1611{ 1627{
1612 object *tmp, *otmp; 1628 object *tmp, *otmp;
1613 1629
… …
1773 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1789 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1774 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1790 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1775 { 1791 {
1776 1792
1777 float 1793 float
1778 diff = tmp->move_slow_penalty * FABS (op->speed); 1794 diff = tmp->move_slow_penalty * fabs (op->speed);
1779 1795
1780 if (op->type == PLAYER) 1796 if (op->type == PLAYER)
1781 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1797 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1782 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1798 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1783 diff /= 4.0; 1799 diff /= 4.0;
… …
1990 } 2006 }
1991 2007
1992 if (!index) 2008 if (!index)
1993 return -1; 2009 return -1;
1994 2010
1995 return altern[RANDOM () % index]; 2011 return altern [rndm (index)];
1996} 2012}
1997 2013
1998/* 2014/*
1999 * find_first_free_spot(archetype, maptile, x, y) works like 2015 * find_first_free_spot(archetype, maptile, x, y) works like
2000 * find_free_spot(), but it will search max number of squares. 2016 * find_free_spot(), but it will search max number of squares.
… …
2021{ 2037{
2022 arr += begin; 2038 arr += begin;
2023 end -= begin; 2039 end -= begin;
2024 2040
2025 while (--end) 2041 while (--end)
2026 swap (arr [end], arr [RANDOM () % (end + 1)]); 2042 swap (arr [end], arr [rndm (end + 1)]);
2027} 2043}
2028 2044
2029/* new function to make monster searching more efficient, and effective! 2045/* new function to make monster searching more efficient, and effective!
2030 * This basically returns a randomized array (in the passed pointer) of 2046 * This basically returns a randomized array (in the passed pointer) of
2031 * the spaces to find monsters. In this way, it won't always look for 2047 * the spaces to find monsters. In this way, it won't always look for
… …
2165 2181
2166 return 3; 2182 return 3;
2167} 2183}
2168 2184
2169/* 2185/*
2170 * absdir(int): Returns a number between 1 and 8, which represent
2171 * the "absolute" direction of a number (it actually takes care of
2172 * "overflow" in previous calculations of a direction).
2173 */
2174
2175int
2176absdir (int d)
2177{
2178 while (d < 1)
2179 d += 8;
2180
2181 while (d > 8)
2182 d -= 8;
2183
2184 return d;
2185}
2186
2187/*
2188 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2186 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2189 * between two directions (which are expected to be absolute (see absdir()) 2187 * between two directions (which are expected to be absolute (see absdir())
2190 */ 2188 */
2191
2192int 2189int
2193dirdiff (int dir1, int dir2) 2190dirdiff (int dir1, int dir2)
2194{ 2191{
2195 int d; 2192 int d;
2196 2193
… …
2362 insert_ob_in_ob (object_create_clone (item), dst); 2359 insert_ob_in_ob (object_create_clone (item), dst);
2363 2360
2364 return dst; 2361 return dst;
2365} 2362}
2366 2363
2367/* GROS - Creates an object using a string representing its content. */
2368/* Basically, we save the content of the string to a temp file, then call */
2369/* load_object on it. I admit it is a highly inefficient way to make things, */
2370/* but it was simple to make and allows reusing the load_object function. */
2371/* Remember not to use load_object_str in a time-critical situation. */
2372/* Also remember that multiparts objects are not supported for now. */
2373object *
2374load_object_str (const char *obstr)
2375{
2376 object *op;
2377 char filename[MAX_BUF];
2378
2379 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2380
2381 FILE *tempfile = fopen (filename, "w");
2382
2383 if (tempfile == NULL)
2384 {
2385 LOG (llevError, "Error - Unable to access load object temp file\n");
2386 return NULL;
2387 }
2388
2389 fprintf (tempfile, obstr);
2390 fclose (tempfile);
2391
2392 op = object::create ();
2393
2394 object_thawer thawer (filename);
2395
2396 if (thawer)
2397 load_object (thawer, op, 0);
2398
2399 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2400 CLEAR_FLAG (op, FLAG_REMOVED);
2401
2402 return op;
2403}
2404
2405/* This returns the first object in who's inventory that 2364/* This returns the first object in who's inventory that
2406 * has the same type and subtype match. 2365 * has the same type and subtype match.
2407 * returns NULL if no match. 2366 * returns NULL if no match.
2408 */ 2367 */
2409object * 2368object *
… …
2462 if (link->key == canonical_key) 2421 if (link->key == canonical_key)
2463 return link->value; 2422 return link->value;
2464 2423
2465 return 0; 2424 return 0;
2466} 2425}
2467
2468 2426
2469/* 2427/*
2470 * Updates the canonical_key in op to value. 2428 * Updates the canonical_key in op to value.
2471 * 2429 *
2472 * canonical_key is a shared string (value doesn't have to be). 2430 * canonical_key is a shared string (value doesn't have to be).
… …
2612{ 2570{
2613 char flagdesc[512]; 2571 char flagdesc[512];
2614 char info2[256 * 4]; 2572 char info2[256 * 4];
2615 char *p = info; 2573 char *p = info;
2616 2574
2617 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2575 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2618 count, uuid.seq, 2576 count, uuid.seq,
2619 &name, 2577 &name,
2620 title ? "\",title:" : "", 2578 title ? "\",title:\"" : "",
2621 title ? (const char *)title : "", 2579 title ? (const char *)title : "",
2622 flag_desc (flagdesc, 512), type); 2580 flag_desc (flagdesc, 512), type);
2623 2581
2624 if (env) 2582 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2583 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2635{ 2593{
2636 static char info[256 * 4]; 2594 static char info[256 * 4];
2637 return debug_desc (info); 2595 return debug_desc (info);
2638} 2596}
2639 2597
2598const char *
2599object::debug_desc2 () const
2600{
2601 static char info[256 * 4];
2602 return debug_desc (info);
2603}
2604
2605struct region *
2606object::region () const
2607{
2608 return map ? map->region (x, y)
2609 : region::default_region ();
2610}
2611
2612const materialtype_t *
2613object::dominant_material () const
2614{
2615 if (materialtype_t *mat = name_to_material (materialname))
2616 return mat;
2617
2618 // omfg this is slow, this has to be temporary :)
2619 shstr unknown ("unknown");
2620
2621 return name_to_material (unknown);
2622}
2623
2624void
2625object::open_container (object *new_container)
2626{
2627 if (container == new_container)
2628 return;
2629
2630 if (object *old_container = container)
2631 {
2632 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2633 return;
2634
2635#if 0
2636 // remove the "Close old_container" object.
2637 if (object *closer = old_container->inv)
2638 if (closer->type == CLOSE_CON)
2639 closer->destroy ();
2640#endif
2641
2642 old_container->flag [FLAG_APPLIED] = 0;
2643 container = 0;
2644
2645 esrv_update_item (UPD_FLAGS, this, old_container);
2646 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2647 }
2648
2649 if (new_container)
2650 {
2651 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2652 return;
2653
2654 // TODO: this does not seem to serve any purpose anymore?
2655#if 0
2656 // insert the "Close Container" object.
2657 if (archetype *closer = new_container->other_arch)
2658 {
2659 object *closer = arch_to_object (new_container->other_arch);
2660 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2661 new_container->insert (closer);
2662 }
2663#endif
2664
2665 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2666
2667 new_container->flag [FLAG_APPLIED] = 1;
2668 container = new_container;
2669
2670 esrv_update_item (UPD_FLAGS, this, new_container);
2671 esrv_send_inventory (this, new_container);
2672 }
2673}
2674
2675

Diff Legend

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