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.52 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 2006 UTC

… …
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <loader.h> 33#include <loader.h>
34
35#include <bitset>
34 36
35int nrofallocobjects = 0; 37int nrofallocobjects = 0;
36static UUID uuid; 38static UUID uuid;
37const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
38 40
… …
104 _exit (1); 106 _exit (1);
105 } 107 }
106 108
107 uuid.seq = uid; 109 uuid.seq = uid;
108 write_uuid (); 110 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 112 fclose (fp);
111} 113}
112 114
113UUID 115UUID
114gen_uuid () 116gen_uuid ()
… …
183 * 185 *
184 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
187 * 189 *
188 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
189 * 191 *
190 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
191 * check weight 193 * check weight
192 */ 194 */
193 195
194bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
195{ 197{
196 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
198 return 0; 204 return 0;
199 205
200 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 209 * used to store nrof).
206 */ 210 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 222
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 225
222 226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
224 * being locked in inventory should prevent merging.
225 * 0x4 in flags3 is CLIENT_SENT
226 */
227 if ((ob1->arch != ob2->arch) ||
228 (ob1->flags[0] != ob2->flags[0]) ||
229 (ob1->flags[1] != ob2->flags[1]) ||
230 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
252 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 251 return 0;
254 252
255 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 254 * check all objects in the inventory.
257 */ 255 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 260 return 0;
263 261
264 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 264 return 0;
267 265
268 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 267 * if it is valid.
270 */ 268 */
… …
354 op = op->env; 352 op = op->env;
355 return op; 353 return op;
356} 354}
357 355
358/* 356/*
359 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
360 * a better check. We basically keeping traversing up until we can't
361 * or find a player.
362 */
363
364object *
365is_player_inv (object *op)
366{
367 for (; op != NULL && op->type != PLAYER; op = op->env)
368 if (op->env == op)
369 op->env = NULL;
370 return op;
371}
372
373/*
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 358 * Some error messages.
376 * The result of the dump is stored in the static global errmsg array. 359 * The result of the dump is stored in the static global errmsg array.
377 */ 360 */
378 361
379void 362char *
380dump_object2 (object *op)
381{
382 errmsg[0] = 0;
383 return;
384 //TODO//D#d#
385#if 0
386 char *cp;
387
388/* object *tmp;*/
389
390 if (op->arch != NULL)
391 {
392 strcat (errmsg, "arch ");
393 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
394 strcat (errmsg, "\n");
395 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
396 strcat (errmsg, cp);
397# if 0
398 /* Don't dump player diffs - they are too long, mostly meaningless, and
399 * will overflow the buffer.
400 * Changed so that we don't dump inventory either. This may
401 * also overflow the buffer.
402 */
403 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
404 strcat (errmsg, cp);
405 for (tmp = op->inv; tmp; tmp = tmp->below)
406 dump_object2 (tmp);
407# endif
408 strcat (errmsg, "end\n");
409 }
410 else
411 {
412 strcat (errmsg, "Object ");
413 if (op->name == NULL)
414 strcat (errmsg, "(null)");
415 else
416 strcat (errmsg, op->name);
417 strcat (errmsg, "\n");
418# if 0
419 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
420 strcat (errmsg, cp);
421 for (tmp = op->inv; tmp; tmp = tmp->below)
422 dump_object2 (tmp);
423# endif
424 strcat (errmsg, "end\n");
425 }
426#endif
427}
428
429/*
430 * Dumps an object. Returns output in the static global errmsg array.
431 */
432
433void
434dump_object (object *op) 363dump_object (object *op)
435{ 364{
436 if (op == NULL) 365 if (!op)
437 { 366 return strdup ("[NULLOBJ]");
438 strcpy (errmsg, "[NULL pointer]");
439 return;
440 }
441 errmsg[0] = '\0';
442 dump_object2 (op);
443}
444 367
445void 368 object_freezer freezer;
446dump_all_objects (void) 369 save_object (freezer, op, 3);
447{ 370 return freezer.as_string ();
448 object *op;
449
450 for (op = object::first; op != NULL; op = op->next)
451 {
452 dump_object (op);
453 fprintf (logfile, "Object %s\n", errmsg);
454 }
455} 371}
456 372
457/* 373/*
458 * 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
459 * multi-object 1 which is closest to the second object. 375 * multi-object 1 which is closest to the second object.
… …
479 */ 395 */
480 396
481object * 397object *
482find_object (tag_t i) 398find_object (tag_t i)
483{ 399{
484 object *op;
485
486 for (op = object::first; op != NULL; op = op->next) 400 for (object *op = object::first; op; op = op->next)
487 if (op->count == i) 401 if (op->count == i)
488 break; 402 return op;
489 403
490 return op; 404 return 0;
491} 405}
492 406
493/* 407/*
494 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
495 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
… …
595 509
596 if (settings.casting_time) 510 if (settings.casting_time)
597 casting_time = -1; 511 casting_time = -1;
598} 512}
599 513
600void object::clone (object *destination)
601{
602 *(object_copy *)destination = *this;
603 *(object_pod *)destination = *this;
604
605 if (self || cb)
606 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
607}
608
609/* 514/*
610 * copy object first frees everything allocated by the second object, 515 * copy_to first frees everything allocated by the dst object,
611 * and then copies the contends of the first object into the second 516 * and then copies the contents of itself into the second
612 * object, allocating what needs to be allocated. Basically, any 517 * object, allocating what needs to be allocated. Basically, any
613 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 518 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
614 * if the first object is freed, the pointers in the new object 519 * if the first object is freed, the pointers in the new object
615 * will point at garbage. 520 * will point at garbage.
616 */ 521 */
617void 522void
618copy_object (object *op2, object *op) 523object::copy_to (object *dst)
619{ 524{
620 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622 527
623 op2->clone (op); 528 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
624 533
625 if (is_freed) 534 if (is_freed)
626 SET_FLAG (op, FLAG_FREED); 535 SET_FLAG (dst, FLAG_FREED);
536
627 if (is_removed) 537 if (is_removed)
628 SET_FLAG (op, FLAG_REMOVED); 538 SET_FLAG (dst, FLAG_REMOVED);
629 539
630 if (op2->speed < 0) 540 if (speed < 0)
631 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 541 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632 542
633 /* Copy over key_values, if any. */ 543 /* Copy over key_values, if any. */
634 if (op2->key_values) 544 if (key_values)
635 { 545 {
636 key_value *tail = 0; 546 key_value *tail = 0;
637 key_value *i; 547 key_value *i;
638 548
639 op->key_values = 0; 549 dst->key_values = 0;
640 550
641 for (i = op2->key_values; i; i = i->next) 551 for (i = key_values; i; i = i->next)
642 { 552 {
643 key_value *new_link = new key_value; 553 key_value *new_link = new key_value;
644 554
645 new_link->next = 0; 555 new_link->next = 0;
646 new_link->key = i->key; 556 new_link->key = i->key;
647 new_link->value = i->value; 557 new_link->value = i->value;
648 558
649 /* Try and be clever here, too. */ 559 /* Try and be clever here, too. */
650 if (!op->key_values) 560 if (!dst->key_values)
651 { 561 {
652 op->key_values = new_link; 562 dst->key_values = new_link;
653 tail = new_link; 563 tail = new_link;
654 } 564 }
655 else 565 else
656 { 566 {
657 tail->next = new_link; 567 tail->next = new_link;
658 tail = new_link; 568 tail = new_link;
659 } 569 }
660 } 570 }
661 } 571 }
662 572
663 update_ob_speed (op); 573 update_ob_speed (dst);
574}
575
576object *
577object::clone ()
578{
579 object *neu = create ();
580 copy_to (neu);
581 return neu;
664} 582}
665 583
666/* 584/*
667 * If an object with the IS_TURNABLE() flag needs to be turned due 585 * If an object with the IS_TURNABLE() flag needs to be turned due
668 * to the closest player being on the other side, this function can 586 * to the closest player being on the other side, this function can
… …
873 update_now = 1; 791 update_now = 1;
874 792
875 if ((move_slow | op->move_slow) != move_slow) 793 if ((move_slow | op->move_slow) != move_slow)
876 update_now = 1; 794 update_now = 1;
877 } 795 }
796
878 /* if the object is being removed, we can't make intelligent 797 /* if the object is being removed, we can't make intelligent
879 * decisions, because remove_ob can't really pass the object 798 * decisions, because remove_ob can't really pass the object
880 * that is being removed. 799 * that is being removed.
881 */ 800 */
882 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 801 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
908 else 827 else
909 { 828 {
910 delete *i; 829 delete *i;
911 mortals.erase (i); 830 mortals.erase (i);
912 } 831 }
913
914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals && lastmortals > 100)//D
917 {
918 lastmortals = mortals.size ();//D
919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
921} 832}
922 833
923object::object () 834object::object ()
924{ 835{
925 SET_FLAG (this, FLAG_REMOVED); 836 SET_FLAG (this, FLAG_REMOVED);
… …
984 895
985 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 896 if (QUERY_FLAG (this, FLAG_FRIENDLY))
986 remove_friendly_object (this); 897 remove_friendly_object (this);
987 898
988 if (!QUERY_FLAG (this, FLAG_REMOVED)) 899 if (!QUERY_FLAG (this, FLAG_REMOVED))
989 remove_ob (this); 900 remove ();
990 901
991 SET_FLAG (this, FLAG_FREED); 902 SET_FLAG (this, FLAG_FREED);
992 903
993 if (more) 904 if (more)
994 { 905 {
… …
1019 930
1020 while (op) 931 while (op)
1021 { 932 {
1022 object *tmp = op->below; 933 object *tmp = op->below;
1023 934
1024 remove_ob (op); 935 op->remove ();
1025 936
1026 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 937 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1027 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 938 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1028 free_object (op); 939 op->destroy ();
1029 else 940 else
1030 { 941 {
1031 op->x = x; 942 op->x = x;
1032 op->y = y; 943 op->y = y;
1033 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 944 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1036 op = tmp; 947 op = tmp;
1037 } 948 }
1038 } 949 }
1039 } 950 }
1040 951
952 // hack to ensure that freed objects still have a valid map
953 {
954 static maptile *freed_map; // freed objects are moved here to avoid crashes
955
956 if (!freed_map)
957 {
958 freed_map = new maptile;
959
960 freed_map->name = "/internal/freed_objects_map";
961 freed_map->width = 3;
962 freed_map->height = 3;
963
964 freed_map->allocate ();
965 }
966
967 map = freed_map;
968 x = 1;
969 y = 1;
970 }
971
1041 // clear those pointers that likely might have circular references to us 972 // clear those pointers that likely might have circular references to us
1042 owner = 0; 973 owner = 0;
1043 enemy = 0; 974 enemy = 0;
1044 attacked_by = 0; 975 attacked_by = 0;
1045 976
… …
1057 988
1058/* 989/*
1059 * sub_weight() recursively (outwards) subtracts a number from the 990 * sub_weight() recursively (outwards) subtracts a number from the
1060 * weight of an object (and what is carried by it's environment(s)). 991 * weight of an object (and what is carried by it's environment(s)).
1061 */ 992 */
1062
1063void 993void
1064sub_weight (object *op, signed long weight) 994sub_weight (object *op, signed long weight)
1065{ 995{
1066 while (op != NULL) 996 while (op != NULL)
1067 { 997 {
… …
1071 op->carrying -= weight; 1001 op->carrying -= weight;
1072 op = op->env; 1002 op = op->env;
1073 } 1003 }
1074} 1004}
1075 1005
1076/* remove_ob(op): 1006/* op->remove ():
1077 * This function removes the object op from the linked list of objects 1007 * This function removes the object op from the linked list of objects
1078 * which it is currently tied to. When this function is done, the 1008 * which it is currently tied to. When this function is done, the
1079 * object will have no environment. If the object previously had an 1009 * object will have no environment. If the object previously had an
1080 * environment, the x and y coordinates will be updated to 1010 * environment, the x and y coordinates will be updated to
1081 * the previous environment. 1011 * the previous environment.
1082 * Beware: This function is called from the editor as well! 1012 * Beware: This function is called from the editor as well!
1083 */ 1013 */
1084
1085void 1014void
1086remove_ob (object *op) 1015object::remove ()
1087{ 1016{
1088 object *tmp, *last = 0; 1017 object *tmp, *last = 0;
1089 object *otmp; 1018 object *otmp;
1090 1019
1091 int check_walk_off; 1020 int check_walk_off;
1092 maptile *m;
1093 1021
1094 sint16 x, y;
1095
1096 if (QUERY_FLAG (op, FLAG_REMOVED)) 1022 if (QUERY_FLAG (this, FLAG_REMOVED))
1097 return; 1023 return;
1098 1024
1099 SET_FLAG (op, FLAG_REMOVED); 1025 SET_FLAG (this, FLAG_REMOVED);
1100 1026
1101 if (op->more != NULL) 1027 if (more)
1102 remove_ob (op->more); 1028 more->remove ();
1103 1029
1104 /* 1030 /*
1105 * In this case, the object to be removed is in someones 1031 * In this case, the object to be removed is in someones
1106 * inventory. 1032 * inventory.
1107 */ 1033 */
1108 if (op->env != NULL) 1034 if (env)
1109 { 1035 {
1110 if (op->nrof) 1036 if (nrof)
1111 sub_weight (op->env, op->weight * op->nrof); 1037 sub_weight (env, weight * nrof);
1112 else 1038 else
1113 sub_weight (op->env, op->weight + op->carrying); 1039 sub_weight (env, weight + carrying);
1114 1040
1115 /* NO_FIX_PLAYER is set when a great many changes are being 1041 /* NO_FIX_PLAYER is set when a great many changes are being
1116 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
1117 * to save cpu time. 1043 * to save cpu time.
1118 */ 1044 */
1119 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1120 fix_player (otmp); 1046 fix_player (otmp);
1121 1047
1122 if (op->above != NULL) 1048 if (above != NULL)
1123 op->above->below = op->below; 1049 above->below = below;
1124 else 1050 else
1125 op->env->inv = op->below; 1051 env->inv = below;
1126 1052
1127 if (op->below != NULL) 1053 if (below != NULL)
1128 op->below->above = op->above; 1054 below->above = above;
1129 1055
1130 /* we set up values so that it could be inserted into 1056 /* we set up values so that it could be inserted into
1131 * the map, but we don't actually do that - it is up 1057 * the map, but we don't actually do that - it is up
1132 * to the caller to decide what we want to do. 1058 * to the caller to decide what we want to do.
1133 */ 1059 */
1134 op->x = op->env->x, op->y = op->env->y; 1060 x = env->x, y = env->y;
1135 op->map = op->env->map; 1061 map = env->map;
1136 op->above = NULL, op->below = NULL; 1062 above = 0, below = 0;
1137 op->env = NULL; 1063 env = 0;
1138 } 1064 }
1139 else if (op->map) 1065 else if (map)
1140 { 1066 {
1141 x = op->x;
1142 y = op->y;
1143 m = get_map_from_coord (op->map, &x, &y);
1144
1145 if (!m)
1146 {
1147 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1148 op->map->path, op->x, op->y);
1149 /* in old days, we used to set x and y to 0 and continue.
1150 * it seems if we get into this case, something is probablye
1151 * screwed up and should be fixed.
1152 */
1153 abort ();
1154 }
1155
1156 if (op->map != m)
1157 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1158 op->map->path, m->path, op->x, op->y, x, y);
1159
1160 /* Re did the following section of code - it looks like it had 1067 /* Re did the following section of code - it looks like it had
1161 * lots of logic for things we no longer care about 1068 * lots of logic for things we no longer care about
1162 */ 1069 */
1163 1070
1164 /* link the object above us */ 1071 /* link the object above us */
1165 if (op->above) 1072 if (above)
1166 op->above->below = op->below; 1073 above->below = below;
1167 else 1074 else
1168 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1075 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1169 1076
1170 /* Relink the object below us, if there is one */ 1077 /* Relink the object below us, if there is one */
1171 if (op->below) 1078 if (below)
1172 op->below->above = op->above; 1079 below->above = above;
1173 else 1080 else
1174 { 1081 {
1175 /* Nothing below, which means we need to relink map object for this space 1082 /* Nothing below, which means we need to relink map object for this space
1176 * use translated coordinates in case some oddness with map tiling is 1083 * use translated coordinates in case some oddness with map tiling is
1177 * evident 1084 * evident
1178 */ 1085 */
1179 if (GET_MAP_OB (m, x, y) != op) 1086 if (GET_MAP_OB (map, x, y) != this)
1180 { 1087 {
1181 dump_object (op); 1088 char *dump = dump_object (this);
1182 LOG (llevError, 1089 LOG (llevError,
1183 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1090 "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);
1091 free (dump);
1184 dump_object (GET_MAP_OB (m, x, y)); 1092 dump = dump_object (GET_MAP_OB (map, x, y));
1185 LOG (llevError, "%s\n", errmsg); 1093 LOG (llevError, "%s\n", dump);
1094 free (dump);
1186 } 1095 }
1187 1096
1188 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1097 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1189 } 1098 }
1190 1099
1191 op->above = 0; 1100 above = 0;
1192 op->below = 0; 1101 below = 0;
1193 1102
1194 if (op->map->in_memory == MAP_SAVING) 1103 if (map->in_memory == MAP_SAVING)
1195 return; 1104 return;
1196 1105
1197 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1106 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1198 1107
1199 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1108 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1200 { 1109 {
1201 /* No point updating the players look faces if he is the object 1110 /* No point updating the players look faces if he is the object
1202 * being removed. 1111 * being removed.
1203 */ 1112 */
1204 1113
1205 if (tmp->type == PLAYER && tmp != op) 1114 if (tmp->type == PLAYER && tmp != this)
1206 { 1115 {
1207 /* If a container that the player is currently using somehow gets 1116 /* If a container that the player is currently using somehow gets
1208 * removed (most likely destroyed), update the player view 1117 * removed (most likely destroyed), update the player view
1209 * appropriately. 1118 * appropriately.
1210 */ 1119 */
1211 if (tmp->container == op) 1120 if (tmp->container == this)
1212 { 1121 {
1213 CLEAR_FLAG (op, FLAG_APPLIED); 1122 CLEAR_FLAG (this, FLAG_APPLIED);
1214 tmp->container = NULL; 1123 tmp->container = 0;
1215 } 1124 }
1216 1125
1217 tmp->contr->socket.update_look = 1; 1126 tmp->contr->socket->floorbox_update ();
1218 } 1127 }
1219 1128
1220 /* See if player moving off should effect something */ 1129 /* See if player moving off should effect something */
1221 if (check_walk_off 1130 if (check_walk_off
1222 && ((op->move_type & tmp->move_off) 1131 && ((move_type & tmp->move_off)
1223 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1132 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224 { 1133 {
1225 move_apply (tmp, op, NULL); 1134 move_apply (tmp, this, 0);
1226 1135
1227 if (op->destroyed ()) 1136 if (destroyed ())
1228 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1137 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1229 } 1138 }
1230 1139
1231 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1140 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1232 1141
1233 if (tmp->above == tmp) 1142 if (tmp->above == tmp)
1234 tmp->above = NULL; 1143 tmp->above = 0;
1235 1144
1236 last = tmp; 1145 last = tmp;
1237 } 1146 }
1238 1147
1239 /* last == NULL of there are no objects on this space */ 1148 /* last == NULL of there are no objects on this space */
1240 if (last == NULL) 1149 if (!last)
1241 { 1150 {
1242 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1151 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1243 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1152 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1244 * those out anyways, and if there are any flags set right now, they won't 1153 * those out anyways, and if there are any flags set right now, they won't
1245 * be correct anyways. 1154 * be correct anyways.
1246 */ 1155 */
1247 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1156 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1248 update_position (op->map, op->x, op->y); 1157 update_position (map, x, y);
1249 } 1158 }
1250 else 1159 else
1251 update_object (last, UP_OBJ_REMOVE); 1160 update_object (last, UP_OBJ_REMOVE);
1252 1161
1253 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1162 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1254 update_all_los (op->map, op->x, op->y); 1163 update_all_los (map, x, y);
1255 } 1164 }
1256} 1165}
1257 1166
1258/* 1167/*
1259 * merge_ob(op,top): 1168 * merge_ob(op,top):
… …
1274 1183
1275 for (; top != NULL; top = top->below) 1184 for (; top != NULL; top = top->below)
1276 { 1185 {
1277 if (top == op) 1186 if (top == op)
1278 continue; 1187 continue;
1279 if (CAN_MERGE (op, top)) 1188
1189 if (object::can_merge (op, top))
1280 { 1190 {
1281 top->nrof += op->nrof; 1191 top->nrof += op->nrof;
1282 1192
1283/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1193/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1284 op->weight = 0; /* Don't want any adjustements now */ 1194 op->weight = 0; /* Don't want any adjustements now */
1285 remove_ob (op); 1195 op->destroy ();
1286 free_object (op);
1287 return top; 1196 return top;
1288 } 1197 }
1289 } 1198 }
1290 1199
1291 return 0; 1200 return 0;
… …
1345 return NULL; 1254 return NULL;
1346 } 1255 }
1347 1256
1348 if (m == NULL) 1257 if (m == NULL)
1349 { 1258 {
1350 dump_object (op); 1259 char *dump = dump_object (op);
1351 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1260 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1261 free (dump);
1352 return op; 1262 return op;
1353 } 1263 }
1354 1264
1355 if (out_of_map (m, op->x, op->y)) 1265 if (out_of_map (m, op->x, op->y))
1356 { 1266 {
1357 dump_object (op); 1267 char *dump = dump_object (op);
1358 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1268 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1359#ifdef MANY_CORES 1269#ifdef MANY_CORES
1360 /* Better to catch this here, as otherwise the next use of this object 1270 /* Better to catch this here, as otherwise the next use of this object
1361 * is likely to cause a crash. Better to find out where it is getting 1271 * is likely to cause a crash. Better to find out where it is getting
1362 * improperly inserted. 1272 * improperly inserted.
1363 */ 1273 */
1364 abort (); 1274 abort ();
1365#endif 1275#endif
1276 free (dump);
1366 return op; 1277 return op;
1367 } 1278 }
1368 1279
1369 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1280 if (!QUERY_FLAG (op, FLAG_REMOVED))
1370 { 1281 {
1371 dump_object (op); 1282 char *dump = dump_object (op);
1372 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1283 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1284 free (dump);
1373 return op; 1285 return op;
1374 } 1286 }
1375 1287
1376 if (op->more != NULL) 1288 if (op->more != NULL)
1377 { 1289 {
… …
1415 1327
1416 /* this has to be done after we translate the coordinates. 1328 /* this has to be done after we translate the coordinates.
1417 */ 1329 */
1418 if (op->nrof && !(flag & INS_NO_MERGE)) 1330 if (op->nrof && !(flag & INS_NO_MERGE))
1419 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1331 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1420 if (CAN_MERGE (op, tmp)) 1332 if (object::can_merge (op, tmp))
1421 { 1333 {
1422 op->nrof += tmp->nrof; 1334 op->nrof += tmp->nrof;
1423 remove_ob (tmp); 1335 tmp->destroy ();
1424 free_object (tmp);
1425 } 1336 }
1426 1337
1427 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1338 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1428 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1339 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1429 1340
… …
1557 * it, so save a few ticks and start from there. 1468 * it, so save a few ticks and start from there.
1558 */ 1469 */
1559 if (!(flag & INS_MAP_LOAD)) 1470 if (!(flag & INS_MAP_LOAD))
1560 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1471 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1561 if (tmp->type == PLAYER) 1472 if (tmp->type == PLAYER)
1562 tmp->contr->socket.update_look = 1; 1473 tmp->contr->socket->floorbox_update ();
1563 1474
1564 /* If this object glows, it may affect lighting conditions that are 1475 /* If this object glows, it may affect lighting conditions that are
1565 * visible to others on this map. But update_all_los is really 1476 * visible to others on this map. But update_all_los is really
1566 * an inefficient way to do this, as it means los for all players 1477 * an inefficient way to do this, as it means los for all players
1567 * on the map will get recalculated. The players could very well 1478 * on the map will get recalculated. The players could very well
… …
1575 1486
1576 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1487 /* updates flags (blocked, alive, no magic, etc) for this map space */
1577 update_object (op, UP_OBJ_INSERT); 1488 update_object (op, UP_OBJ_INSERT);
1578 1489
1579 /* Don't know if moving this to the end will break anything. However, 1490 /* Don't know if moving this to the end will break anything. However,
1580 * we want to have update_look set above before calling this. 1491 * we want to have floorbox_update called before calling this.
1581 * 1492 *
1582 * check_move_on() must be after this because code called from 1493 * check_move_on() must be after this because code called from
1583 * check_move_on() depends on correct map flags (so functions like 1494 * check_move_on() depends on correct map flags (so functions like
1584 * blocked() and wall() work properly), and these flags are updated by 1495 * blocked() and wall() work properly), and these flags are updated by
1585 * update_object(). 1496 * update_object().
… …
1615 tmp1; 1526 tmp1;
1616 1527
1617 /* first search for itself and remove any old instances */ 1528 /* first search for itself and remove any old instances */
1618 1529
1619 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1530 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1620 {
1621 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1531 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1622 { 1532 tmp->destroy ();
1623 remove_ob (tmp);
1624 free_object (tmp);
1625 }
1626 }
1627 1533
1628 tmp1 = arch_to_object (archetype::find (arch_string)); 1534 tmp1 = arch_to_object (archetype::find (arch_string));
1629 1535
1630 tmp1->x = op->x; 1536 tmp1->x = op->x;
1631 tmp1->y = op->y; 1537 tmp1->y = op->y;
… …
1641 */ 1547 */
1642 1548
1643object * 1549object *
1644get_split_ob (object *orig_ob, uint32 nr) 1550get_split_ob (object *orig_ob, uint32 nr)
1645{ 1551{
1646 object * 1552 object *newob;
1647 newob;
1648 int
1649 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1553 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1650 1554
1651 if (orig_ob->nrof < nr) 1555 if (orig_ob->nrof < nr)
1652 { 1556 {
1653 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1557 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1654 return NULL; 1558 return NULL;
1655 } 1559 }
1656 1560
1657 newob = object_create_clone (orig_ob); 1561 newob = object_create_clone (orig_ob);
1658 1562
1659 if ((orig_ob->nrof -= nr) < 1) 1563 if ((orig_ob->nrof -= nr) < 1)
1660 { 1564 orig_ob->destroy (1);
1661 if (!is_removed)
1662 remove_ob (orig_ob);
1663 free_object2 (orig_ob, 1);
1664 }
1665 else if (!is_removed) 1565 else if (!is_removed)
1666 { 1566 {
1667 if (orig_ob->env != NULL) 1567 if (orig_ob->env != NULL)
1668 sub_weight (orig_ob->env, orig_ob->weight * nr); 1568 sub_weight (orig_ob->env, orig_ob->weight * nr);
1669 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1569 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1699 if (i > op->nrof) 1599 if (i > op->nrof)
1700 i = op->nrof; 1600 i = op->nrof;
1701 1601
1702 if (QUERY_FLAG (op, FLAG_REMOVED)) 1602 if (QUERY_FLAG (op, FLAG_REMOVED))
1703 op->nrof -= i; 1603 op->nrof -= i;
1704 else if (op->env != NULL) 1604 else if (op->env)
1705 { 1605 {
1706 /* is this object in the players inventory, or sub container 1606 /* is this object in the players inventory, or sub container
1707 * therein? 1607 * therein?
1708 */ 1608 */
1709 tmp = is_player_inv (op->env); 1609 tmp = op->in_player ();
1710 /* nope. Is this a container the player has opened? 1610 /* nope. Is this a container the player has opened?
1711 * If so, set tmp to that player. 1611 * If so, set tmp to that player.
1712 * IMO, searching through all the players will mostly 1612 * IMO, searching through all the players will mostly
1713 * likely be quicker than following op->env to the map, 1613 * likely be quicker than following op->env to the map,
1714 * and then searching the map for a player. 1614 * and then searching the map for a player.
1715 */ 1615 */
1716 if (!tmp) 1616 if (!tmp)
1717 { 1617 {
1718 for (pl = first_player; pl; pl = pl->next) 1618 for (pl = first_player; pl; pl = pl->next)
1719 if (pl->ob->container == op->env) 1619 if (pl->ob->container == op->env)
1620 {
1621 tmp = pl->ob;
1720 break; 1622 break;
1721 if (pl) 1623 }
1722 tmp = pl->ob;
1723 else
1724 tmp = NULL;
1725 } 1624 }
1726 1625
1727 if (i < op->nrof) 1626 if (i < op->nrof)
1728 { 1627 {
1729 sub_weight (op->env, op->weight * i); 1628 sub_weight (op->env, op->weight * i);
1730 op->nrof -= i; 1629 op->nrof -= i;
1731 if (tmp) 1630 if (tmp)
1732 {
1733 esrv_send_item (tmp, op); 1631 esrv_send_item (tmp, op);
1734 }
1735 } 1632 }
1736 else 1633 else
1737 { 1634 {
1738 remove_ob (op); 1635 op->remove ();
1739 op->nrof = 0; 1636 op->nrof = 0;
1740 if (tmp) 1637 if (tmp)
1741 {
1742 esrv_del_item (tmp->contr, op->count); 1638 esrv_del_item (tmp->contr, op->count);
1743 }
1744 } 1639 }
1745 } 1640 }
1746 else 1641 else
1747 { 1642 {
1748 object *above = op->above; 1643 object *above = op->above;
1749 1644
1750 if (i < op->nrof) 1645 if (i < op->nrof)
1751 op->nrof -= i; 1646 op->nrof -= i;
1752 else 1647 else
1753 { 1648 {
1754 remove_ob (op); 1649 op->remove ();
1755 op->nrof = 0; 1650 op->nrof = 0;
1756 } 1651 }
1757 1652
1758 /* Since we just removed op, op->above is null */ 1653 /* Since we just removed op, op->above is null */
1759 for (tmp = above; tmp != NULL; tmp = tmp->above) 1654 for (tmp = above; tmp; tmp = tmp->above)
1760 if (tmp->type == PLAYER) 1655 if (tmp->type == PLAYER)
1761 { 1656 {
1762 if (op->nrof) 1657 if (op->nrof)
1763 esrv_send_item (tmp, op); 1658 esrv_send_item (tmp, op);
1764 else 1659 else
… …
1768 1663
1769 if (op->nrof) 1664 if (op->nrof)
1770 return op; 1665 return op;
1771 else 1666 else
1772 { 1667 {
1773 free_object (op); 1668 op->destroy ();
1774 return NULL; 1669 return 0;
1775 } 1670 }
1776} 1671}
1777 1672
1778/* 1673/*
1779 * add_weight(object, weight) adds the specified weight to an object, 1674 * add_weight(object, weight) adds the specified weight to an object,
… …
1791 op->carrying += weight; 1686 op->carrying += weight;
1792 op = op->env; 1687 op = op->env;
1793 } 1688 }
1794} 1689}
1795 1690
1691object *
1692insert_ob_in_ob (object *op, object *where)
1693{
1694 if (!where)
1695 {
1696 char *dump = dump_object (op);
1697 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1698 free (dump);
1699 return op;
1700 }
1701
1702 if (where->head)
1703 {
1704 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1705 where = where->head;
1706 }
1707
1708 return where->insert (op);
1709}
1710
1796/* 1711/*
1797 * insert_ob_in_ob(op,environment): 1712 * env->insert (op)
1798 * This function inserts the object op in the linked list 1713 * This function inserts the object op in the linked list
1799 * inside the object environment. 1714 * inside the object environment.
1800 * 1715 *
1801 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1802 * the inventory at the last position or next to other objects of the same
1803 * type.
1804 * Frank: Now sorted by type, archetype and magic!
1805 *
1806 * The function returns now pointer to inserted item, and return value can 1716 * The function returns now pointer to inserted item, and return value can
1807 * be != op, if items are merged. -Tero 1717 * be != op, if items are merged. -Tero
1808 */ 1718 */
1809 1719
1810object * 1720object *
1811insert_ob_in_ob (object *op, object *where) 1721object::insert (object *op)
1812{ 1722{
1813 object * 1723 object *tmp, *otmp;
1814 tmp, *
1815 otmp;
1816 1724
1817 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1725 if (!QUERY_FLAG (op, FLAG_REMOVED))
1818 { 1726 op->remove ();
1819 dump_object (op);
1820 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1821 return op;
1822 }
1823
1824 if (where == NULL)
1825 {
1826 dump_object (op);
1827 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1828 return op;
1829 }
1830
1831 if (where->head)
1832 {
1833 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1834 where = where->head;
1835 }
1836 1727
1837 if (op->more) 1728 if (op->more)
1838 { 1729 {
1839 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1730 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1840 return op; 1731 return op;
… …
1842 1733
1843 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1734 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1844 CLEAR_FLAG (op, FLAG_REMOVED); 1735 CLEAR_FLAG (op, FLAG_REMOVED);
1845 if (op->nrof) 1736 if (op->nrof)
1846 { 1737 {
1847 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1738 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1848 if (CAN_MERGE (tmp, op)) 1739 if (object::can_merge (tmp, op))
1849 { 1740 {
1850 /* return the original object and remove inserted object 1741 /* return the original object and remove inserted object
1851 (client needs the original object) */ 1742 (client needs the original object) */
1852 tmp->nrof += op->nrof; 1743 tmp->nrof += op->nrof;
1853 /* Weight handling gets pretty funky. Since we are adding to 1744 /* Weight handling gets pretty funky. Since we are adding to
1854 * tmp->nrof, we need to increase the weight. 1745 * tmp->nrof, we need to increase the weight.
1855 */ 1746 */
1856 add_weight (where, op->weight * op->nrof); 1747 add_weight (this, op->weight * op->nrof);
1857 SET_FLAG (op, FLAG_REMOVED); 1748 SET_FLAG (op, FLAG_REMOVED);
1858 free_object (op); /* free the inserted object */ 1749 op->destroy (); /* free the inserted object */
1859 op = tmp; 1750 op = tmp;
1860 remove_ob (op); /* and fix old object's links */ 1751 op->remove (); /* and fix old object's links */
1861 CLEAR_FLAG (op, FLAG_REMOVED); 1752 CLEAR_FLAG (op, FLAG_REMOVED);
1862 break; 1753 break;
1863 } 1754 }
1864 1755
1865 /* I assume combined objects have no inventory 1756 /* I assume combined objects have no inventory
1866 * We add the weight - this object could have just been removed 1757 * We add the weight - this object could have just been removed
1867 * (if it was possible to merge). calling remove_ob will subtract 1758 * (if it was possible to merge). calling remove_ob will subtract
1868 * the weight, so we need to add it in again, since we actually do 1759 * the weight, so we need to add it in again, since we actually do
1869 * the linking below 1760 * the linking below
1870 */ 1761 */
1871 add_weight (where, op->weight * op->nrof); 1762 add_weight (this, op->weight * op->nrof);
1872 } 1763 }
1873 else 1764 else
1874 add_weight (where, (op->weight + op->carrying)); 1765 add_weight (this, (op->weight + op->carrying));
1875 1766
1876 otmp = is_player_inv (where); 1767 otmp = this->in_player ();
1877 if (otmp && otmp->contr != NULL) 1768 if (otmp && otmp->contr)
1878 {
1879 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1769 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1880 fix_player (otmp); 1770 fix_player (otmp);
1881 }
1882 1771
1883 op->map = NULL; 1772 op->map = 0;
1884 op->env = where; 1773 op->env = this;
1885 op->above = NULL; 1774 op->above = 0;
1886 op->below = NULL; 1775 op->below = 0;
1887 op->x = 0, op->y = 0; 1776 op->x = 0, op->y = 0;
1888 1777
1889 /* reset the light list and los of the players on the map */ 1778 /* reset the light list and los of the players on the map */
1890 if ((op->glow_radius != 0) && where->map) 1779 if ((op->glow_radius != 0) && map)
1891 { 1780 {
1892#ifdef DEBUG_LIGHTS 1781#ifdef DEBUG_LIGHTS
1893 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1782 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1894#endif /* DEBUG_LIGHTS */ 1783#endif /* DEBUG_LIGHTS */
1895 if (MAP_DARKNESS (where->map)) 1784 if (MAP_DARKNESS (map))
1896 update_all_los (where->map, where->x, where->y); 1785 update_all_los (map, x, y);
1897 } 1786 }
1898 1787
1899 /* Client has no idea of ordering so lets not bother ordering it here. 1788 /* Client has no idea of ordering so lets not bother ordering it here.
1900 * It sure simplifies this function... 1789 * It sure simplifies this function...
1901 */ 1790 */
1902 if (where->inv == NULL) 1791 if (!inv)
1903 where->inv = op; 1792 inv = op;
1904 else 1793 else
1905 { 1794 {
1906 op->below = where->inv; 1795 op->below = inv;
1907 op->below->above = op; 1796 op->below->above = op;
1908 where->inv = op; 1797 inv = op;
1909 } 1798 }
1799
1910 return op; 1800 return op;
1911} 1801}
1912 1802
1913/* 1803/*
1914 * Checks if any objects has a move_type that matches objects 1804 * Checks if any objects has a move_type that matches objects
… …
2227 * if the space being examined only has a wall to the north and empty 2117 * if the space being examined only has a wall to the north and empty
2228 * spaces in all the other directions, this will reduce the search space 2118 * spaces in all the other directions, this will reduce the search space
2229 * to only the spaces immediately surrounding the target area, and 2119 * to only the spaces immediately surrounding the target area, and
2230 * won't look 2 spaces south of the target space. 2120 * won't look 2 spaces south of the target space.
2231 */ 2121 */
2232 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2122 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2233 stop = maxfree[i]; 2123 stop = maxfree[i];
2234 } 2124 }
2125
2235 if (!index) 2126 if (!index)
2236 return -1; 2127 return -1;
2128
2237 return altern[RANDOM () % index]; 2129 return altern[RANDOM () % index];
2238} 2130}
2239 2131
2240/* 2132/*
2241 * find_first_free_spot(archetype, maptile, x, y) works like 2133 * find_first_free_spot(archetype, maptile, x, y) works like
… …
2603 * create clone from object to another 2495 * create clone from object to another
2604 */ 2496 */
2605object * 2497object *
2606object_create_clone (object *asrc) 2498object_create_clone (object *asrc)
2607{ 2499{
2608 object *
2609 dst = NULL, *tmp, *src, *part, *prev, *item; 2500 object *dst = 0, *tmp, *src, *part, *prev, *item;
2610 2501
2611 if (!asrc) 2502 if (!asrc)
2612 return NULL; 2503 return 0;
2504
2613 src = asrc; 2505 src = asrc;
2614 if (src->head) 2506 if (src->head)
2615 src = src->head; 2507 src = src->head;
2616 2508
2617 prev = NULL; 2509 prev = 0;
2618 for (part = src; part; part = part->more) 2510 for (part = src; part; part = part->more)
2619 { 2511 {
2620 tmp = get_object (); 2512 tmp = part->clone ();
2621 copy_object (part, tmp);
2622 tmp->x -= src->x; 2513 tmp->x -= src->x;
2623 tmp->y -= src->y; 2514 tmp->y -= src->y;
2515
2624 if (!part->head) 2516 if (!part->head)
2625 { 2517 {
2626 dst = tmp; 2518 dst = tmp;
2627 tmp->head = NULL; 2519 tmp->head = 0;
2628 } 2520 }
2629 else 2521 else
2630 { 2522 {
2631 tmp->head = dst; 2523 tmp->head = dst;
2632 } 2524 }
2525
2633 tmp->more = NULL; 2526 tmp->more = 0;
2527
2634 if (prev) 2528 if (prev)
2635 prev->more = tmp; 2529 prev->more = tmp;
2530
2636 prev = tmp; 2531 prev = tmp;
2637 } 2532 }
2638 2533
2639 for (item = src->inv; item; item = item->below) 2534 for (item = src->inv; item; item = item->below)
2640 insert_ob_in_ob (object_create_clone (item), dst); 2535 insert_ob_in_ob (object_create_clone (item), dst);
… …
2666 } 2561 }
2667 2562
2668 fprintf (tempfile, obstr); 2563 fprintf (tempfile, obstr);
2669 fclose (tempfile); 2564 fclose (tempfile);
2670 2565
2671 op = get_object (); 2566 op = object::create ();
2672 2567
2673 object_thawer thawer (filename); 2568 object_thawer thawer (filename);
2674 2569
2675 if (thawer) 2570 if (thawer)
2676 load_object (thawer, op, 0); 2571 load_object (thawer, op, 0);

Diff Legend

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