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.116 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.154 by root, Thu May 17 21:11:42 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 *
… …
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
… …
449 owner = owner->owner; 450 owner = owner->owner;
450 451
451 this->owner = owner; 452 this->owner = owner;
452} 453}
453 454
455int
456object::slottype () const
457{
458 if (type == SKILL)
459 {
460 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
461 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
462 }
463 else
464 {
465 if (slot [body_combat].info) return slot_combat;
466 if (slot [body_range ].info) return slot_ranged;
467 }
468
469 return slot_none;
470}
471
472bool
473object::change_weapon (object *ob)
474{
475 if (current_weapon == ob)
476 return true;
477
478 if (chosen_skill)
479 chosen_skill->flag [FLAG_APPLIED] = false;
480
481 current_weapon = ob;
482 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
483
484 if (chosen_skill)
485 chosen_skill->flag [FLAG_APPLIED] = true;
486
487 update_stats ();
488
489 if (ob)
490 {
491 // now check wether any body locations became invalid, in which case
492 // we cannot apply the weapon at the moment.
493 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
494 if (slot[i].used < 0)
495 {
496 current_weapon = chosen_skill = 0;
497 update_stats ();
498
499 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance your applied items all at once, but the %s is too much. "
501 "You need to unapply some items first.", &ob->name);
502 return false;
503 }
504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 }
507 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509
510 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
511 {
512 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
513 &name, ob->debug_desc ());
514 return false;
515 }
516
517 return true;
518}
519
454/* Zero the key_values on op, decrementing the shared-string 520/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 521 * refcounts and freeing the links.
456 */ 522 */
457static void 523static void
458free_key_values (object *op) 524free_key_values (object *op)
459{ 525{
460 for (key_value *i = op->key_values; i != 0;) 526 for (key_value *i = op->key_values; i; )
461 { 527 {
462 key_value *next = i->next; 528 key_value *next = i->next;
463 delete i; 529 delete i;
464 530
465 i = next; 531 i = next;
466 } 532 }
467 533
468 op->key_values = 0; 534 op->key_values = 0;
469} 535}
470 536
471/* 537object &
472 * copy_to first frees everything allocated by the dst object, 538object::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{ 539{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 540 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 541 bool is_removed = flag [FLAG_REMOVED];
484 542
485 *(object_copy *)dst = *this; 543 *(object_copy *)this = src;
486 544
487 if (is_freed) 545 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 546 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 547
496 /* Copy over key_values, if any. */ 548 /* Copy over key_values, if any. */
497 if (key_values) 549 if (src.key_values)
498 { 550 {
499 key_value *tail = 0; 551 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 552 key_values = 0;
503 553
504 for (i = key_values; i; i = i->next) 554 for (key_value *i = src.key_values; i; i = i->next)
505 { 555 {
506 key_value *new_link = new key_value; 556 key_value *new_link = new key_value;
507 557
508 new_link->next = 0; 558 new_link->next = 0;
509 new_link->key = i->key; 559 new_link->key = i->key;
510 new_link->value = i->value; 560 new_link->value = i->value;
511 561
512 /* Try and be clever here, too. */ 562 /* Try and be clever here, too. */
513 if (!dst->key_values) 563 if (!key_values)
514 { 564 {
515 dst->key_values = new_link; 565 key_values = new_link;
516 tail = new_link; 566 tail = new_link;
517 } 567 }
518 else 568 else
519 { 569 {
520 tail->next = new_link; 570 tail->next = new_link;
521 tail = new_link; 571 tail = new_link;
522 } 572 }
523 } 573 }
524 } 574 }
575}
576
577/*
578 * copy_to first frees everything allocated by the dst object,
579 * and then copies the contents of itself into the second
580 * object, allocating what needs to be allocated. Basically, any
581 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
582 * if the first object is freed, the pointers in the new object
583 * will point at garbage.
584 */
585void
586object::copy_to (object *dst)
587{
588 *dst = *this;
589
590 if (speed < 0)
591 dst->speed_left = speed_left - rndm ();
525 592
526 dst->set_speed (dst->speed); 593 dst->set_speed (dst->speed);
594}
595
596void
597object::instantiate ()
598{
599 if (!uuid.seq) // HACK
600 uuid = gen_uuid ();
601
602 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting
606 * values for the body_used info, so when items are created
607 * for it, they can be properly equipped.
608 */
609 for (int i = NUM_BODY_LOCATIONS; i--; )
610 slot[i].used = slot[i].info;
611
612 attachable::instantiate ();
527} 613}
528 614
529object * 615object *
530object::clone () 616object::clone ()
531{ 617{
… …
589 * UP_OBJ_FACE: only the objects face has changed. 675 * UP_OBJ_FACE: only the objects face has changed.
590 */ 676 */
591void 677void
592update_object (object *op, int action) 678update_object (object *op, int action)
593{ 679{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 680 if (op == NULL)
597 { 681 {
598 /* this should never happen */ 682 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 683 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 684 return;
… …
670 face = blank_face; 754 face = blank_face;
671} 755}
672 756
673object::~object () 757object::~object ()
674{ 758{
759 unlink ();
760
675 free_key_values (this); 761 free_key_values (this);
676} 762}
677 763
678static int object_count; 764static int object_count;
679 765
… …
687 objects.insert (this); 773 objects.insert (this);
688} 774}
689 775
690void object::unlink () 776void object::unlink ()
691{ 777{
692 assert (index);//D 778 if (!index)
779 return;
780
693 objects.erase (this); 781 objects.erase (this);
694 refcnt_dec (); 782 refcnt_dec ();
695} 783}
696 784
697void 785void
… …
771 * drop on that space. 859 * drop on that space.
772 */ 860 */
773 if (!drop_to_ground 861 if (!drop_to_ground
774 || !map 862 || !map
775 || map->in_memory != MAP_IN_MEMORY 863 || map->in_memory != MAP_IN_MEMORY
864 || map->nodrop
776 || ms ().move_block == MOVE_ALL) 865 || ms ().move_block == MOVE_ALL)
777 { 866 {
778 while (inv) 867 while (inv)
779 { 868 {
780 inv->destroy_inv (drop_to_ground); 869 inv->destroy_inv (drop_to_ground);
… …
896 * This function removes the object op from the linked list of objects 985 * This function removes the object op from the linked list of objects
897 * which it is currently tied to. When this function is done, the 986 * which it is currently tied to. When this function is done, the
898 * object will have no environment. If the object previously had an 987 * object will have no environment. If the object previously had an
899 * environment, the x and y coordinates will be updated to 988 * environment, the x and y coordinates will be updated to
900 * the previous environment. 989 * the previous environment.
901 * Beware: This function is called from the editor as well!
902 */ 990 */
903void 991void
904object::remove () 992object::do_remove ()
905{ 993{
906 object *tmp, *last = 0; 994 object *tmp, *last = 0;
907 object *otmp; 995 object *otmp;
908 996
909 if (QUERY_FLAG (this, FLAG_REMOVED)) 997 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
952 } 1040 }
953 else if (map) 1041 else if (map)
954 { 1042 {
955 if (type == PLAYER) 1043 if (type == PLAYER)
956 { 1044 {
1045 // leaving a spot always closes any open container on the ground
1046 if (container && !container->env)
1047 // this causes spurious floorbox updates, but it ensures
1048 // that the CLOSE event is being sent.
1049 close_container ();
1050
957 --map->players; 1051 --map->players;
958 map->touch (); 1052 map->touch ();
959 } 1053 }
960 1054
961 map->dirty = true; 1055 map->dirty = true;
1056 mapspace &ms = this->ms ();
962 1057
963 /* link the object above us */ 1058 /* link the object above us */
964 if (above) 1059 if (above)
965 above->below = below; 1060 above->below = below;
966 else 1061 else
967 map->at (x, y).top = below; /* we were top, set new top */ 1062 ms.top = below; /* we were top, set new top */
968 1063
969 /* Relink the object below us, if there is one */ 1064 /* Relink the object below us, if there is one */
970 if (below) 1065 if (below)
971 below->above = above; 1066 below->above = above;
972 else 1067 else
… …
974 /* Nothing below, which means we need to relink map object for this space 1069 /* Nothing below, which means we need to relink map object for this space
975 * use translated coordinates in case some oddness with map tiling is 1070 * use translated coordinates in case some oddness with map tiling is
976 * evident 1071 * evident
977 */ 1072 */
978 if (GET_MAP_OB (map, x, y) != this) 1073 if (GET_MAP_OB (map, x, y) != this)
979 {
980 char *dump = dump_object (this);
981 LOG (llevError,
982 "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); 1074 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 ());
983 free (dump);
984 dump = dump_object (GET_MAP_OB (map, x, y));
985 LOG (llevError, "%s\n", dump);
986 free (dump);
987 }
988 1075
989 map->at (x, y).bot = above; /* goes on above it. */ 1076 ms.bot = above; /* goes on above it. */
990 } 1077 }
991 1078
992 above = 0; 1079 above = 0;
993 below = 0; 1080 below = 0;
994 1081
995 if (map->in_memory == MAP_SAVING) 1082 if (map->in_memory == MAP_SAVING)
996 return; 1083 return;
997 1084
998 int check_walk_off = !flag [FLAG_NO_APPLY]; 1085 int check_walk_off = !flag [FLAG_NO_APPLY];
999 1086
1000 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1087 for (tmp = ms.bot; tmp; tmp = tmp->above)
1001 { 1088 {
1002 /* No point updating the players look faces if he is the object 1089 /* No point updating the players look faces if he is the object
1003 * being removed. 1090 * being removed.
1004 */ 1091 */
1005 1092
… …
1085 } 1172 }
1086 1173
1087 return 0; 1174 return 0;
1088} 1175}
1089 1176
1177void
1178object::expand_tail ()
1179{
1180 if (more)
1181 return;
1182
1183 object *prev = this;
1184
1185 for (archetype *at = arch->more; at; at = at->more)
1186 {
1187 object *op = arch_to_object (at);
1188
1189 op->name = name;
1190 op->name_pl = name_pl;
1191 op->title = title;
1192
1193 op->head = this;
1194 prev->more = op;
1195
1196 prev = op;
1197 }
1198}
1199
1090/* 1200/*
1091 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1201 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1092 * job preparing multi-part monsters 1202 * job preparing multi-part monsters.
1093 */ 1203 */
1094object * 1204object *
1095insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1205insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1096{ 1206{
1097 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1124 * just 'op' otherwise 1234 * just 'op' otherwise
1125 */ 1235 */
1126object * 1236object *
1127insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1237insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1128{ 1238{
1239 assert (!op->flag [FLAG_FREED]);
1240
1129 object *tmp, *top, *floor = NULL; 1241 object *tmp, *top, *floor = NULL;
1130 sint16 x, y;
1131 1242
1132 if (QUERY_FLAG (op, FLAG_FREED)) 1243 op->remove ();
1133 {
1134 LOG (llevError, "Trying to insert freed object!\n");
1135 return NULL;
1136 }
1137 1244
1138 if (!m) 1245#if 0
1139 { 1246 if (!m->active != !op->active)
1140 char *dump = dump_object (op); 1247 if (m->active)
1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1248 op->activate_recursive ();
1142 free (dump); 1249 else
1143 return op; 1250 op->deactivate_recursive ();
1144 } 1251#endif
1145 1252
1146 if (out_of_map (m, op->x, op->y)) 1253 if (out_of_map (m, op->x, op->y))
1147 { 1254 {
1148 char *dump = dump_object (op);
1149 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1255 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1150#ifdef MANY_CORES 1256#ifdef MANY_CORES
1151 /* Better to catch this here, as otherwise the next use of this object 1257 /* Better to catch this here, as otherwise the next use of this object
1152 * is likely to cause a crash. Better to find out where it is getting 1258 * is likely to cause a crash. Better to find out where it is getting
1153 * improperly inserted. 1259 * improperly inserted.
1154 */ 1260 */
1155 abort (); 1261 abort ();
1156#endif 1262#endif
1157 free (dump);
1158 return op; 1263 return op;
1159 } 1264 }
1160 1265
1161 if (!QUERY_FLAG (op, FLAG_REMOVED))
1162 {
1163 char *dump = dump_object (op);
1164 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1165 free (dump);
1166 return op;
1167 }
1168
1169 if (op->more)
1170 {
1171 /* The part may be on a different map. */
1172
1173 object *more = op->more; 1266 if (object *more = op->more)
1174 1267 {
1175 /* We really need the caller to normalise coordinates - if
1176 * we set the map, that doesn't work if the location is within
1177 * a map and this is straddling an edge. So only if coordinate
1178 * is clear wrong do we normalise it.
1179 */
1180 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1181 more->map = get_map_from_coord (m, &more->x, &more->y);
1182 else if (!more->map)
1183 {
1184 /* For backwards compatibility - when not dealing with tiled maps,
1185 * more->map should always point to the parent.
1186 */
1187 more->map = m;
1188 }
1189
1190 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1268 if (!insert_ob_in_map (more, m, originator, flag))
1191 { 1269 {
1192 if (!op->head) 1270 if (!op->head)
1193 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1271 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1194 1272
1195 return 0; 1273 return 0;
… …
1200 1278
1201 /* Ideally, the caller figures this out. However, it complicates a lot 1279 /* Ideally, the caller figures this out. However, it complicates a lot
1202 * of areas of callers (eg, anything that uses find_free_spot would now 1280 * of areas of callers (eg, anything that uses find_free_spot would now
1203 * need extra work 1281 * need extra work
1204 */ 1282 */
1205 op->map = get_map_from_coord (m, &op->x, &op->y); 1283 if (!xy_normalise (m, op->x, op->y))
1206 x = op->x; 1284 return 0;
1207 y = op->y; 1285
1286 op->map = m;
1287 mapspace &ms = op->ms ();
1208 1288
1209 /* this has to be done after we translate the coordinates. 1289 /* this has to be done after we translate the coordinates.
1210 */ 1290 */
1211 if (op->nrof && !(flag & INS_NO_MERGE)) 1291 if (op->nrof && !(flag & INS_NO_MERGE))
1212 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1292 for (tmp = ms.bot; tmp; tmp = tmp->above)
1213 if (object::can_merge (op, tmp)) 1293 if (object::can_merge (op, tmp))
1214 { 1294 {
1215 op->nrof += tmp->nrof; 1295 op->nrof += tmp->nrof;
1216 tmp->destroy (); 1296 tmp->destroy ();
1217 } 1297 }
… …
1234 op->below = originator->below; 1314 op->below = originator->below;
1235 1315
1236 if (op->below) 1316 if (op->below)
1237 op->below->above = op; 1317 op->below->above = op;
1238 else 1318 else
1239 op->ms ().bot = op; 1319 ms.bot = op;
1240 1320
1241 /* since *below* originator, no need to update top */ 1321 /* since *below* originator, no need to update top */
1242 originator->below = op; 1322 originator->below = op;
1243 } 1323 }
1244 else 1324 else
1245 { 1325 {
1326 top = ms.bot;
1327
1246 /* If there are other objects, then */ 1328 /* If there are other objects, then */
1247 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1329 if ((!(flag & INS_MAP_LOAD)) && top)
1248 { 1330 {
1249 object *last = 0; 1331 object *last = 0;
1250 1332
1251 /* 1333 /*
1252 * If there are multiple objects on this space, we do some trickier handling. 1334 * If there are multiple objects on this space, we do some trickier handling.
… …
1258 * once we get to them. This reduces the need to traverse over all of 1340 * once we get to them. This reduces the need to traverse over all of
1259 * them when adding another one - this saves quite a bit of cpu time 1341 * them when adding another one - this saves quite a bit of cpu time
1260 * when lots of spells are cast in one area. Currently, it is presumed 1342 * when lots of spells are cast in one area. Currently, it is presumed
1261 * that flying non pickable objects are spell objects. 1343 * that flying non pickable objects are spell objects.
1262 */ 1344 */
1263 while (top) 1345 for (top = ms.bot; top; top = top->above)
1264 { 1346 {
1265 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1347 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1266 floor = top; 1348 floor = top;
1267 1349
1268 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1350 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1271 top = top->below; 1353 top = top->below;
1272 break; 1354 break;
1273 } 1355 }
1274 1356
1275 last = top; 1357 last = top;
1276 top = top->above;
1277 } 1358 }
1278 1359
1279 /* Don't want top to be NULL, so set it to the last valid object */ 1360 /* Don't want top to be NULL, so set it to the last valid object */
1280 top = last; 1361 top = last;
1281 1362
… …
1283 * looks like instead of lots of conditions here. 1364 * looks like instead of lots of conditions here.
1284 * makes things faster, and effectively the same result. 1365 * makes things faster, and effectively the same result.
1285 */ 1366 */
1286 1367
1287 /* Have object 'fall below' other objects that block view. 1368 /* Have object 'fall below' other objects that block view.
1288 * Unless those objects are exits, type 66 1369 * Unless those objects are exits.
1289 * If INS_ON_TOP is used, don't do this processing 1370 * If INS_ON_TOP is used, don't do this processing
1290 * Need to find the object that in fact blocks view, otherwise 1371 * Need to find the object that in fact blocks view, otherwise
1291 * stacking is a bit odd. 1372 * stacking is a bit odd.
1292 */ 1373 */
1293 if (!(flag & INS_ON_TOP) && 1374 if (!(flag & INS_ON_TOP)
1294 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1375 && ms.flags () & P_BLOCKSVIEW
1376 && (op->face && !faces [op->face].visibility))
1295 { 1377 {
1296 for (last = top; last != floor; last = last->below) 1378 for (last = top; last != floor; last = last->below)
1297 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1379 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1298 break; 1380 break;
1381
1299 /* Check to see if we found the object that blocks view, 1382 /* Check to see if we found the object that blocks view,
1300 * and make sure we have a below pointer for it so that 1383 * and make sure we have a below pointer for it so that
1301 * we can get inserted below this one, which requires we 1384 * we can get inserted below this one, which requires we
1302 * set top to the object below us. 1385 * set top to the object below us.
1303 */ 1386 */
… …
1305 top = last->below; 1388 top = last->below;
1306 } 1389 }
1307 } /* If objects on this space */ 1390 } /* If objects on this space */
1308 1391
1309 if (flag & INS_MAP_LOAD) 1392 if (flag & INS_MAP_LOAD)
1310 top = GET_MAP_TOP (op->map, op->x, op->y); 1393 top = ms.top;
1311 1394
1312 if (flag & INS_ABOVE_FLOOR_ONLY) 1395 if (flag & INS_ABOVE_FLOOR_ONLY)
1313 top = floor; 1396 top = floor;
1314 1397
1315 /* Top is the object that our object (op) is going to get inserted above. 1398 /* Top is the object that our object (op) is going to get inserted above.
1316 */ 1399 */
1317 1400
1318 /* First object on this space */ 1401 /* First object on this space */
1319 if (!top) 1402 if (!top)
1320 { 1403 {
1321 op->above = GET_MAP_OB (op->map, op->x, op->y); 1404 op->above = ms.bot;
1322 1405
1323 if (op->above) 1406 if (op->above)
1324 op->above->below = op; 1407 op->above->below = op;
1325 1408
1326 op->below = 0; 1409 op->below = 0;
1327 op->ms ().bot = op; 1410 ms.bot = op;
1328 } 1411 }
1329 else 1412 else
1330 { /* get inserted into the stack above top */ 1413 { /* get inserted into the stack above top */
1331 op->above = top->above; 1414 op->above = top->above;
1332 1415
… …
1336 op->below = top; 1419 op->below = top;
1337 top->above = op; 1420 top->above = op;
1338 } 1421 }
1339 1422
1340 if (!op->above) 1423 if (!op->above)
1341 op->ms ().top = op; 1424 ms.top = op;
1342 } /* else not INS_BELOW_ORIGINATOR */ 1425 } /* else not INS_BELOW_ORIGINATOR */
1343 1426
1344 if (op->type == PLAYER) 1427 if (op->type == PLAYER)
1345 { 1428 {
1346 op->contr->do_los = 1; 1429 op->contr->do_los = 1;
… …
1352 1435
1353 /* If we have a floor, we know the player, if any, will be above 1436 /* If we have a floor, we know the player, if any, will be above
1354 * it, so save a few ticks and start from there. 1437 * it, so save a few ticks and start from there.
1355 */ 1438 */
1356 if (!(flag & INS_MAP_LOAD)) 1439 if (!(flag & INS_MAP_LOAD))
1357 if (object *pl = op->ms ().player ()) 1440 if (object *pl = ms.player ())
1358 if (pl->contr->ns) 1441 if (pl->contr->ns)
1359 pl->contr->ns->floorbox_update (); 1442 pl->contr->ns->floorbox_update ();
1360 1443
1361 /* If this object glows, it may affect lighting conditions that are 1444 /* If this object glows, it may affect lighting conditions that are
1362 * visible to others on this map. But update_all_los is really 1445 * visible to others on this map. But update_all_los is really
… …
1424} 1507}
1425 1508
1426object * 1509object *
1427object::insert_at (object *where, object *originator, int flags) 1510object::insert_at (object *where, object *originator, int flags)
1428{ 1511{
1429 where->map->insert (this, where->x, where->y, originator, flags); 1512 return where->map->insert (this, where->x, where->y, originator, flags);
1430} 1513}
1431 1514
1432/* 1515/*
1433 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1516 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1434 * is returned contains nr objects, and the remaining parts contains 1517 * is returned contains nr objects, and the remaining parts contains
… …
1474 * the amount of an object. If the amount reaches 0, the object 1557 * the amount of an object. If the amount reaches 0, the object
1475 * is subsequently removed and freed. 1558 * is subsequently removed and freed.
1476 * 1559 *
1477 * Return value: 'op' if something is left, NULL if the amount reached 0 1560 * Return value: 'op' if something is left, NULL if the amount reached 0
1478 */ 1561 */
1479
1480object * 1562object *
1481decrease_ob_nr (object *op, uint32 i) 1563decrease_ob_nr (object *op, uint32 i)
1482{ 1564{
1483 object *tmp; 1565 object *tmp;
1484 1566
… …
1559 1641
1560/* 1642/*
1561 * add_weight(object, weight) adds the specified weight to an object, 1643 * add_weight(object, weight) adds the specified weight to an object,
1562 * and also updates how much the environment(s) is/are carrying. 1644 * and also updates how much the environment(s) is/are carrying.
1563 */ 1645 */
1564
1565void 1646void
1566add_weight (object *op, signed long weight) 1647add_weight (object *op, signed long weight)
1567{ 1648{
1568 while (op != NULL) 1649 while (op != NULL)
1569 { 1650 {
… …
1584 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1665 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1585 free (dump); 1666 free (dump);
1586 return op; 1667 return op;
1587 } 1668 }
1588 1669
1589 if (where->head) 1670 if (where->head_ () != where)
1590 { 1671 {
1591 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1672 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1592 where = where->head; 1673 where = where->head;
1593 } 1674 }
1594 1675
1595 return where->insert (op); 1676 return where->insert (op);
1596} 1677}
… …
1601 * inside the object environment. 1682 * inside the object environment.
1602 * 1683 *
1603 * The function returns now pointer to inserted item, and return value can 1684 * The function returns now pointer to inserted item, and return value can
1604 * be != op, if items are merged. -Tero 1685 * be != op, if items are merged. -Tero
1605 */ 1686 */
1606
1607object * 1687object *
1608object::insert (object *op) 1688object::insert (object *op)
1609{ 1689{
1610 object *tmp, *otmp; 1690 object *tmp, *otmp;
1611 1691
… …
1771 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1851 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1772 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1852 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1773 { 1853 {
1774 1854
1775 float 1855 float
1776 diff = tmp->move_slow_penalty * FABS (op->speed); 1856 diff = tmp->move_slow_penalty * fabs (op->speed);
1777 1857
1778 if (op->type == PLAYER) 1858 if (op->type == PLAYER)
1779 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1859 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1780 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1860 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1781 diff /= 4.0; 1861 diff /= 4.0;
… …
1925 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 2005 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1926 { 2006 {
1927 CLEAR_FLAG (tmp, flag); 2007 CLEAR_FLAG (tmp, flag);
1928 unflag_inv (tmp, flag); 2008 unflag_inv (tmp, flag);
1929 } 2009 }
1930}
1931
1932/*
1933 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1934 * all it's inventory (recursively).
1935 * If checksums are used, a player will get set_cheat called for
1936 * him/her-self and all object carried by a call to this function.
1937 */
1938void
1939set_cheat (object *op)
1940{
1941 SET_FLAG (op, FLAG_WAS_WIZ);
1942 flag_inv (op, FLAG_WAS_WIZ);
1943} 2010}
1944 2011
1945/* 2012/*
1946 * find_free_spot(object, map, x, y, start, stop) will search for 2013 * find_free_spot(object, map, x, y, start, stop) will search for
1947 * a spot at the given map and coordinates which will be able to contain 2014 * a spot at the given map and coordinates which will be able to contain
… …
1988 } 2055 }
1989 2056
1990 if (!index) 2057 if (!index)
1991 return -1; 2058 return -1;
1992 2059
1993 return altern[RANDOM () % index]; 2060 return altern [rndm (index)];
1994} 2061}
1995 2062
1996/* 2063/*
1997 * find_first_free_spot(archetype, maptile, x, y) works like 2064 * find_first_free_spot(archetype, maptile, x, y) works like
1998 * find_free_spot(), but it will search max number of squares. 2065 * find_free_spot(), but it will search max number of squares.
… …
2019{ 2086{
2020 arr += begin; 2087 arr += begin;
2021 end -= begin; 2088 end -= begin;
2022 2089
2023 while (--end) 2090 while (--end)
2024 swap (arr [end], arr [RANDOM () % (end + 1)]); 2091 swap (arr [end], arr [rndm (end + 1)]);
2025} 2092}
2026 2093
2027/* new function to make monster searching more efficient, and effective! 2094/* new function to make monster searching more efficient, and effective!
2028 * This basically returns a randomized array (in the passed pointer) of 2095 * This basically returns a randomized array (in the passed pointer) of
2029 * the spaces to find monsters. In this way, it won't always look for 2096 * the spaces to find monsters. In this way, it won't always look for
… …
2341 insert_ob_in_ob (object_create_clone (item), dst); 2408 insert_ob_in_ob (object_create_clone (item), dst);
2342 2409
2343 return dst; 2410 return dst;
2344} 2411}
2345 2412
2346/* GROS - Creates an object using a string representing its content. */
2347/* Basically, we save the content of the string to a temp file, then call */
2348/* load_object on it. I admit it is a highly inefficient way to make things, */
2349/* but it was simple to make and allows reusing the load_object function. */
2350/* Remember not to use load_object_str in a time-critical situation. */
2351/* Also remember that multiparts objects are not supported for now. */
2352object *
2353load_object_str (const char *obstr)
2354{
2355 object *op;
2356 char filename[MAX_BUF];
2357
2358 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2359
2360 FILE *tempfile = fopen (filename, "w");
2361
2362 if (tempfile == NULL)
2363 {
2364 LOG (llevError, "Error - Unable to access load object temp file\n");
2365 return NULL;
2366 }
2367
2368 fprintf (tempfile, obstr);
2369 fclose (tempfile);
2370
2371 op = object::create ();
2372
2373 object_thawer thawer (filename);
2374
2375 if (thawer)
2376 load_object (thawer, op, 0);
2377
2378 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2379 CLEAR_FLAG (op, FLAG_REMOVED);
2380
2381 return op;
2382}
2383
2384/* This returns the first object in who's inventory that 2413/* This returns the first object in who's inventory that
2385 * has the same type and subtype match. 2414 * has the same type and subtype match.
2386 * returns NULL if no match. 2415 * returns NULL if no match.
2387 */ 2416 */
2388object * 2417object *
… …
2441 if (link->key == canonical_key) 2470 if (link->key == canonical_key)
2442 return link->value; 2471 return link->value;
2443 2472
2444 return 0; 2473 return 0;
2445} 2474}
2446
2447 2475
2448/* 2476/*
2449 * Updates the canonical_key in op to value. 2477 * Updates the canonical_key in op to value.
2450 * 2478 *
2451 * canonical_key is a shared string (value doesn't have to be). 2479 * canonical_key is a shared string (value doesn't have to be).
… …
2591{ 2619{
2592 char flagdesc[512]; 2620 char flagdesc[512];
2593 char info2[256 * 4]; 2621 char info2[256 * 4];
2594 char *p = info; 2622 char *p = info;
2595 2623
2596 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2624 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2597 count, uuid.seq, 2625 count, uuid.seq,
2598 &name, 2626 &name,
2599 title ? "\",title:" : "", 2627 title ? "\",title:\"" : "",
2600 title ? (const char *)title : "", 2628 title ? (const char *)title : "",
2601 flag_desc (flagdesc, 512), type); 2629 flag_desc (flagdesc, 512), type);
2602 2630
2603 if (env) 2631 if (env)
2604 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2632 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2610} 2638}
2611 2639
2612const char * 2640const char *
2613object::debug_desc () const 2641object::debug_desc () const
2614{ 2642{
2615 static char info[256 * 4]; 2643 static char info[3][256 * 4];
2644 static int info_idx;
2645
2616 return debug_desc (info); 2646 return debug_desc (info [++info_idx % 3]);
2617} 2647}
2618 2648
2619const char * 2649struct region *
2620object::debug_desc2 () const 2650object::region () const
2621{ 2651{
2622 static char info[256 * 4]; 2652 return map ? map->region (x, y)
2623 return debug_desc (info); 2653 : region::default_region ();
2624} 2654}
2625 2655
2656const materialtype_t *
2657object::dominant_material () const
2658{
2659 if (materialtype_t *mat = name_to_material (materialname))
2660 return mat;
2661
2662 // omfg this is slow, this has to be temporary :)
2663 shstr unknown ("unknown");
2664
2665 return name_to_material (unknown);
2666}
2667
2668void
2669object::open_container (object *new_container)
2670{
2671 if (container == new_container)
2672 return;
2673
2674 if (object *old_container = container)
2675 {
2676 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2677 return;
2678
2679#if 0
2680 // remove the "Close old_container" object.
2681 if (object *closer = old_container->inv)
2682 if (closer->type == CLOSE_CON)
2683 closer->destroy ();
2684#endif
2685
2686 old_container->flag [FLAG_APPLIED] = 0;
2687 container = 0;
2688
2689 esrv_update_item (UPD_FLAGS, this, old_container);
2690 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2691 }
2692
2693 if (new_container)
2694 {
2695 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2696 return;
2697
2698 // TODO: this does not seem to serve any purpose anymore?
2699#if 0
2700 // insert the "Close Container" object.
2701 if (archetype *closer = new_container->other_arch)
2702 {
2703 object *closer = arch_to_object (new_container->other_arch);
2704 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2705 new_container->insert (closer);
2706 }
2707#endif
2708
2709 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2710
2711 new_container->flag [FLAG_APPLIED] = 1;
2712 container = new_container;
2713
2714 esrv_update_item (UPD_FLAGS, this, new_container);
2715 esrv_send_inventory (this, new_container);
2716 }
2717}
2718
2719

Diff Legend

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