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.54 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.68 by root, Mon Dec 18 02:35:00 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)
… …
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
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
224 * being locked in inventory should prevent merging. 228 || ob1->arch != ob2->arch
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) || 229 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 230 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 231 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 232 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 235 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 236 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 237 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 238 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 239 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 240 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 241 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 242 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 243 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 244 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 245 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 246 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 247 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 248 || 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)) 249 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 252 return 0;
254 253
255 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 255 * check all objects in the inventory.
257 */ 256 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 259 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 261 return 0;
263 262
264 /* Now check to see if the two inventory objects could merge */ 263 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 265 return 0;
267 266
268 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 268 * if it is valid.
270 */ 269 */
… …
526 525
527 if (settings.casting_time) 526 if (settings.casting_time)
528 casting_time = -1; 527 casting_time = -1;
529} 528}
530 529
531void object::clone (object *destination)
532{
533 *(object_copy *)destination = *this;
534 *(object_pod *)destination = *this;
535
536 if (self || cb)
537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538}
539
540/* 530/*
541 * copy object first frees everything allocated by the second object, 531 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 532 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 533 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 534 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
545 * if the first object is freed, the pointers in the new object 535 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 536 * will point at garbage.
547 */ 537 */
548void 538void
549copy_object (object *op2, object *op) 539object::copy_to (object *dst)
550{ 540{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 541 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 542 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 543
554 op2->clone (op); 544 *(object_copy *)dst = *this;
545 *(object_pod *)dst = *this;
546
547 if (self || cb)
548 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
555 549
556 if (is_freed) 550 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 551 SET_FLAG (dst, FLAG_FREED);
552
558 if (is_removed) 553 if (is_removed)
559 SET_FLAG (op, FLAG_REMOVED); 554 SET_FLAG (dst, FLAG_REMOVED);
560 555
561 if (op2->speed < 0) 556 if (speed < 0)
562 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 557 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563 558
564 /* Copy over key_values, if any. */ 559 /* Copy over key_values, if any. */
565 if (op2->key_values) 560 if (key_values)
566 { 561 {
567 key_value *tail = 0; 562 key_value *tail = 0;
568 key_value *i; 563 key_value *i;
569 564
570 op->key_values = 0; 565 dst->key_values = 0;
571 566
572 for (i = op2->key_values; i; i = i->next) 567 for (i = key_values; i; i = i->next)
573 { 568 {
574 key_value *new_link = new key_value; 569 key_value *new_link = new key_value;
575 570
576 new_link->next = 0; 571 new_link->next = 0;
577 new_link->key = i->key; 572 new_link->key = i->key;
578 new_link->value = i->value; 573 new_link->value = i->value;
579 574
580 /* Try and be clever here, too. */ 575 /* Try and be clever here, too. */
581 if (!op->key_values) 576 if (!dst->key_values)
582 { 577 {
583 op->key_values = new_link; 578 dst->key_values = new_link;
584 tail = new_link; 579 tail = new_link;
585 } 580 }
586 else 581 else
587 { 582 {
588 tail->next = new_link; 583 tail->next = new_link;
589 tail = new_link; 584 tail = new_link;
590 } 585 }
591 } 586 }
592 } 587 }
593 588
594 update_ob_speed (op); 589 update_ob_speed (dst);
590}
591
592object *
593object::clone ()
594{
595 object *neu = create ();
596 copy_to (neu);
597 return neu;
595} 598}
596 599
597/* 600/*
598 * If an object with the IS_TURNABLE() flag needs to be turned due 601 * If an object with the IS_TURNABLE() flag needs to be turned due
599 * to the closest player being on the other side, this function can 602 * to the closest player being on the other side, this function can
… …
804 update_now = 1; 807 update_now = 1;
805 808
806 if ((move_slow | op->move_slow) != move_slow) 809 if ((move_slow | op->move_slow) != move_slow)
807 update_now = 1; 810 update_now = 1;
808 } 811 }
812
809 /* if the object is being removed, we can't make intelligent 813 /* if the object is being removed, we can't make intelligent
810 * decisions, because remove_ob can't really pass the object 814 * decisions, because remove_ob can't really pass the object
811 * that is being removed. 815 * that is being removed.
812 */ 816 */
813 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 817 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
839 else 843 else
840 { 844 {
841 delete *i; 845 delete *i;
842 mortals.erase (i); 846 mortals.erase (i);
843 } 847 }
844
845 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
852} 848}
853 849
854object::object () 850object::object ()
855{ 851{
856 SET_FLAG (this, FLAG_REMOVED); 852 SET_FLAG (this, FLAG_REMOVED);
… …
915 911
916 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 912 if (QUERY_FLAG (this, FLAG_FRIENDLY))
917 remove_friendly_object (this); 913 remove_friendly_object (this);
918 914
919 if (!QUERY_FLAG (this, FLAG_REMOVED)) 915 if (!QUERY_FLAG (this, FLAG_REMOVED))
920 remove_ob (this); 916 remove ();
921 917
922 SET_FLAG (this, FLAG_FREED); 918 SET_FLAG (this, FLAG_FREED);
923 919
924 if (more) 920 if (more)
925 { 921 {
… …
950 946
951 while (op) 947 while (op)
952 { 948 {
953 object *tmp = op->below; 949 object *tmp = op->below;
954 950
955 remove_ob (op); 951 op->remove ();
956 952
957 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 953 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
958 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 954 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
959 free_object (op); 955 op->destroy ();
960 else 956 else
961 { 957 {
962 op->x = x; 958 op->x = x;
963 op->y = y; 959 op->y = y;
964 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 960 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
967 op = tmp; 963 op = tmp;
968 } 964 }
969 } 965 }
970 } 966 }
971 967
968 // hack to ensure that freed objects still have a valid map
969 {
970 static maptile *freed_map; // freed objects are moved here to avoid crashes
971
972 if (!freed_map)
973 {
974 freed_map = new maptile;
975
976 freed_map->name = "/internal/freed_objects_map";
977 freed_map->width = 3;
978 freed_map->height = 3;
979
980 freed_map->allocate ();
981 }
982
983 map = freed_map;
984 x = 1;
985 y = 1;
986 }
987
972 // clear those pointers that likely might have circular references to us 988 // clear those pointers that likely might have circular references to us
973 owner = 0; 989 owner = 0;
974 enemy = 0; 990 enemy = 0;
975 attacked_by = 0; 991 attacked_by = 0;
976 992
… …
988 1004
989/* 1005/*
990 * sub_weight() recursively (outwards) subtracts a number from the 1006 * sub_weight() recursively (outwards) subtracts a number from the
991 * weight of an object (and what is carried by it's environment(s)). 1007 * weight of an object (and what is carried by it's environment(s)).
992 */ 1008 */
993
994void 1009void
995sub_weight (object *op, signed long weight) 1010sub_weight (object *op, signed long weight)
996{ 1011{
997 while (op != NULL) 1012 while (op != NULL)
998 { 1013 {
… …
1002 op->carrying -= weight; 1017 op->carrying -= weight;
1003 op = op->env; 1018 op = op->env;
1004 } 1019 }
1005} 1020}
1006 1021
1007/* remove_ob(op): 1022/* op->remove ():
1008 * This function removes the object op from the linked list of objects 1023 * This function removes the object op from the linked list of objects
1009 * which it is currently tied to. When this function is done, the 1024 * which it is currently tied to. When this function is done, the
1010 * object will have no environment. If the object previously had an 1025 * object will have no environment. If the object previously had an
1011 * environment, the x and y coordinates will be updated to 1026 * environment, the x and y coordinates will be updated to
1012 * the previous environment. 1027 * the previous environment.
1013 * Beware: This function is called from the editor as well! 1028 * Beware: This function is called from the editor as well!
1014 */ 1029 */
1015
1016void 1030void
1017remove_ob (object *op) 1031object::remove ()
1018{ 1032{
1019 object *tmp, *last = 0; 1033 object *tmp, *last = 0;
1020 object *otmp; 1034 object *otmp;
1021 1035
1022 int check_walk_off; 1036 int check_walk_off;
1023 maptile *m;
1024 1037
1025 sint16 x, y;
1026
1027 if (QUERY_FLAG (op, FLAG_REMOVED)) 1038 if (QUERY_FLAG (this, FLAG_REMOVED))
1028 return; 1039 return;
1029 1040
1030 SET_FLAG (op, FLAG_REMOVED); 1041 SET_FLAG (this, FLAG_REMOVED);
1031 1042
1032 if (op->more != NULL) 1043 if (more)
1033 remove_ob (op->more); 1044 more->remove ();
1034 1045
1035 /* 1046 /*
1036 * In this case, the object to be removed is in someones 1047 * In this case, the object to be removed is in someones
1037 * inventory. 1048 * inventory.
1038 */ 1049 */
1039 if (op->env != NULL) 1050 if (env)
1040 { 1051 {
1041 if (op->nrof) 1052 if (nrof)
1042 sub_weight (op->env, op->weight * op->nrof); 1053 sub_weight (env, weight * nrof);
1043 else 1054 else
1044 sub_weight (op->env, op->weight + op->carrying); 1055 sub_weight (env, weight + carrying);
1045 1056
1046 /* NO_FIX_PLAYER is set when a great many changes are being 1057 /* NO_FIX_PLAYER is set when a great many changes are being
1047 * made to players inventory. If set, avoiding the call 1058 * made to players inventory. If set, avoiding the call
1048 * to save cpu time. 1059 * to save cpu time.
1049 */ 1060 */
1050 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1061 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1051 fix_player (otmp); 1062 fix_player (otmp);
1052 1063
1053 if (op->above != NULL) 1064 if (above != NULL)
1054 op->above->below = op->below; 1065 above->below = below;
1055 else 1066 else
1056 op->env->inv = op->below; 1067 env->inv = below;
1057 1068
1058 if (op->below != NULL) 1069 if (below != NULL)
1059 op->below->above = op->above; 1070 below->above = above;
1060 1071
1061 /* we set up values so that it could be inserted into 1072 /* we set up values so that it could be inserted into
1062 * the map, but we don't actually do that - it is up 1073 * the map, but we don't actually do that - it is up
1063 * to the caller to decide what we want to do. 1074 * to the caller to decide what we want to do.
1064 */ 1075 */
1065 op->x = op->env->x, op->y = op->env->y; 1076 x = env->x, y = env->y;
1066 op->map = op->env->map; 1077 map = env->map;
1067 op->above = NULL, op->below = NULL; 1078 above = 0, below = 0;
1068 op->env = NULL; 1079 env = 0;
1069 } 1080 }
1070 else if (op->map) 1081 else if (map)
1071 { 1082 {
1072 x = op->x;
1073 y = op->y;
1074 m = get_map_from_coord (op->map, &x, &y);
1075
1076 if (!m)
1077 {
1078 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1079 op->map->path, op->x, op->y);
1080 /* in old days, we used to set x and y to 0 and continue.
1081 * it seems if we get into this case, something is probablye
1082 * screwed up and should be fixed.
1083 */
1084 abort ();
1085 }
1086
1087 if (op->map != m)
1088 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1089 op->map->path, m->path, op->x, op->y, x, y);
1090
1091 /* Re did the following section of code - it looks like it had 1083 /* Re did the following section of code - it looks like it had
1092 * lots of logic for things we no longer care about 1084 * lots of logic for things we no longer care about
1093 */ 1085 */
1094 1086
1095 /* link the object above us */ 1087 /* link the object above us */
1096 if (op->above) 1088 if (above)
1097 op->above->below = op->below; 1089 above->below = below;
1098 else 1090 else
1099 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1091 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1100 1092
1101 /* Relink the object below us, if there is one */ 1093 /* Relink the object below us, if there is one */
1102 if (op->below) 1094 if (below)
1103 op->below->above = op->above; 1095 below->above = above;
1104 else 1096 else
1105 { 1097 {
1106 /* Nothing below, which means we need to relink map object for this space 1098 /* Nothing below, which means we need to relink map object for this space
1107 * use translated coordinates in case some oddness with map tiling is 1099 * use translated coordinates in case some oddness with map tiling is
1108 * evident 1100 * evident
1109 */ 1101 */
1110 if (GET_MAP_OB (m, x, y) != op) 1102 if (GET_MAP_OB (map, x, y) != this)
1111 { 1103 {
1112 char *dump = dump_object (op); 1104 char *dump = dump_object (this);
1113 LOG (llevError, 1105 LOG (llevError,
1114 "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); 1106 "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);
1115 free (dump); 1107 free (dump);
1116 dump = dump_object (GET_MAP_OB (m, x, y)); 1108 dump = dump_object (GET_MAP_OB (map, x, y));
1117 LOG (llevError, "%s\n", dump); 1109 LOG (llevError, "%s\n", dump);
1118 free (dump); 1110 free (dump);
1119 } 1111 }
1120 1112
1121 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1113 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1122 } 1114 }
1123 1115
1124 op->above = 0; 1116 above = 0;
1125 op->below = 0; 1117 below = 0;
1126 1118
1127 if (op->map->in_memory == MAP_SAVING) 1119 if (map->in_memory == MAP_SAVING)
1128 return; 1120 return;
1129 1121
1130 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1122 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1131 1123
1132 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1124 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1133 { 1125 {
1134 /* No point updating the players look faces if he is the object 1126 /* No point updating the players look faces if he is the object
1135 * being removed. 1127 * being removed.
1136 */ 1128 */
1137 1129
1138 if (tmp->type == PLAYER && tmp != op) 1130 if (tmp->type == PLAYER && tmp != this)
1139 { 1131 {
1140 /* If a container that the player is currently using somehow gets 1132 /* If a container that the player is currently using somehow gets
1141 * removed (most likely destroyed), update the player view 1133 * removed (most likely destroyed), update the player view
1142 * appropriately. 1134 * appropriately.
1143 */ 1135 */
1144 if (tmp->container == op) 1136 if (tmp->container == this)
1145 { 1137 {
1146 CLEAR_FLAG (op, FLAG_APPLIED); 1138 CLEAR_FLAG (this, FLAG_APPLIED);
1147 tmp->container = NULL; 1139 tmp->container = 0;
1148 } 1140 }
1149 1141
1150 tmp->contr->socket.update_look = 1; 1142 tmp->contr->socket->update_look = 1;
1151 } 1143 }
1152 1144
1153 /* See if player moving off should effect something */ 1145 /* See if player moving off should effect something */
1154 if (check_walk_off 1146 if (check_walk_off
1155 && ((op->move_type & tmp->move_off) 1147 && ((move_type & tmp->move_off)
1156 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1148 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1157 { 1149 {
1158 move_apply (tmp, op, NULL); 1150 move_apply (tmp, this, 0);
1159 1151
1160 if (op->destroyed ()) 1152 if (destroyed ())
1161 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1153 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162 } 1154 }
1163 1155
1164 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1156 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1165 1157
1166 if (tmp->above == tmp) 1158 if (tmp->above == tmp)
1167 tmp->above = NULL; 1159 tmp->above = 0;
1168 1160
1169 last = tmp; 1161 last = tmp;
1170 } 1162 }
1171 1163
1172 /* last == NULL of there are no objects on this space */ 1164 /* last == NULL of there are no objects on this space */
1173 if (last == NULL) 1165 if (!last)
1174 { 1166 {
1175 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1167 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1176 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1168 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1177 * those out anyways, and if there are any flags set right now, they won't 1169 * those out anyways, and if there are any flags set right now, they won't
1178 * be correct anyways. 1170 * be correct anyways.
1179 */ 1171 */
1180 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1172 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1181 update_position (op->map, op->x, op->y); 1173 update_position (map, x, y);
1182 } 1174 }
1183 else 1175 else
1184 update_object (last, UP_OBJ_REMOVE); 1176 update_object (last, UP_OBJ_REMOVE);
1185 1177
1186 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1178 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1187 update_all_los (op->map, op->x, op->y); 1179 update_all_los (map, x, y);
1188 } 1180 }
1189} 1181}
1190 1182
1191/* 1183/*
1192 * merge_ob(op,top): 1184 * merge_ob(op,top):
… …
1207 1199
1208 for (; top != NULL; top = top->below) 1200 for (; top != NULL; top = top->below)
1209 { 1201 {
1210 if (top == op) 1202 if (top == op)
1211 continue; 1203 continue;
1212 if (CAN_MERGE (op, top)) 1204
1205 if (object::can_merge (op, top))
1213 { 1206 {
1214 top->nrof += op->nrof; 1207 top->nrof += op->nrof;
1215 1208
1216/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1209/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1217 op->weight = 0; /* Don't want any adjustements now */ 1210 op->weight = 0; /* Don't want any adjustements now */
1218 remove_ob (op); 1211 op->destroy ();
1219 free_object (op);
1220 return top; 1212 return top;
1221 } 1213 }
1222 } 1214 }
1223 1215
1224 return 0; 1216 return 0;
… …
1351 1343
1352 /* this has to be done after we translate the coordinates. 1344 /* this has to be done after we translate the coordinates.
1353 */ 1345 */
1354 if (op->nrof && !(flag & INS_NO_MERGE)) 1346 if (op->nrof && !(flag & INS_NO_MERGE))
1355 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1347 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1356 if (CAN_MERGE (op, tmp)) 1348 if (object::can_merge (op, tmp))
1357 { 1349 {
1358 op->nrof += tmp->nrof; 1350 op->nrof += tmp->nrof;
1359 remove_ob (tmp); 1351 tmp->destroy ();
1360 free_object (tmp);
1361 } 1352 }
1362 1353
1363 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1354 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1364 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1355 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1365 1356
… …
1493 * it, so save a few ticks and start from there. 1484 * it, so save a few ticks and start from there.
1494 */ 1485 */
1495 if (!(flag & INS_MAP_LOAD)) 1486 if (!(flag & INS_MAP_LOAD))
1496 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1487 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1497 if (tmp->type == PLAYER) 1488 if (tmp->type == PLAYER)
1498 tmp->contr->socket.update_look = 1; 1489 tmp->contr->socket->update_look = 1;
1499 1490
1500 /* If this object glows, it may affect lighting conditions that are 1491 /* If this object glows, it may affect lighting conditions that are
1501 * visible to others on this map. But update_all_los is really 1492 * visible to others on this map. But update_all_los is really
1502 * an inefficient way to do this, as it means los for all players 1493 * an inefficient way to do this, as it means los for all players
1503 * on the map will get recalculated. The players could very well 1494 * on the map will get recalculated. The players could very well
… …
1551 tmp1; 1542 tmp1;
1552 1543
1553 /* first search for itself and remove any old instances */ 1544 /* first search for itself and remove any old instances */
1554 1545
1555 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1546 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1556 {
1557 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1558 { 1548 tmp->destroy ();
1559 remove_ob (tmp);
1560 free_object (tmp);
1561 }
1562 }
1563 1549
1564 tmp1 = arch_to_object (archetype::find (arch_string)); 1550 tmp1 = arch_to_object (archetype::find (arch_string));
1565 1551
1566 tmp1->x = op->x; 1552 tmp1->x = op->x;
1567 tmp1->y = op->y; 1553 tmp1->y = op->y;
… …
1577 */ 1563 */
1578 1564
1579object * 1565object *
1580get_split_ob (object *orig_ob, uint32 nr) 1566get_split_ob (object *orig_ob, uint32 nr)
1581{ 1567{
1582 object * 1568 object *newob;
1583 newob;
1584 int
1585 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1586 1570
1587 if (orig_ob->nrof < nr) 1571 if (orig_ob->nrof < nr)
1588 { 1572 {
1589 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1573 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1590 return NULL; 1574 return NULL;
1591 } 1575 }
1592 1576
1593 newob = object_create_clone (orig_ob); 1577 newob = object_create_clone (orig_ob);
1594 1578
1595 if ((orig_ob->nrof -= nr) < 1) 1579 if ((orig_ob->nrof -= nr) < 1)
1596 { 1580 orig_ob->destroy (1);
1597 if (!is_removed)
1598 remove_ob (orig_ob);
1599 free_object2 (orig_ob, 1);
1600 }
1601 else if (!is_removed) 1581 else if (!is_removed)
1602 { 1582 {
1603 if (orig_ob->env != NULL) 1583 if (orig_ob->env != NULL)
1604 sub_weight (orig_ob->env, orig_ob->weight * nr); 1584 sub_weight (orig_ob->env, orig_ob->weight * nr);
1605 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1585 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1669 esrv_send_item (tmp, op); 1649 esrv_send_item (tmp, op);
1670 } 1650 }
1671 } 1651 }
1672 else 1652 else
1673 { 1653 {
1674 remove_ob (op); 1654 op->remove ();
1675 op->nrof = 0; 1655 op->nrof = 0;
1676 if (tmp) 1656 if (tmp)
1677 { 1657 {
1678 esrv_del_item (tmp->contr, op->count); 1658 esrv_del_item (tmp->contr, op->count);
1679 } 1659 }
… …
1685 1665
1686 if (i < op->nrof) 1666 if (i < op->nrof)
1687 op->nrof -= i; 1667 op->nrof -= i;
1688 else 1668 else
1689 { 1669 {
1690 remove_ob (op); 1670 op->remove ();
1691 op->nrof = 0; 1671 op->nrof = 0;
1692 } 1672 }
1693 1673
1694 /* Since we just removed op, op->above is null */ 1674 /* Since we just removed op, op->above is null */
1695 for (tmp = above; tmp != NULL; tmp = tmp->above) 1675 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1704 1684
1705 if (op->nrof) 1685 if (op->nrof)
1706 return op; 1686 return op;
1707 else 1687 else
1708 { 1688 {
1709 free_object (op); 1689 op->destroy ();
1710 return NULL; 1690 return NULL;
1711 } 1691 }
1712} 1692}
1713 1693
1714/* 1694/*
… …
1727 op->carrying += weight; 1707 op->carrying += weight;
1728 op = op->env; 1708 op = op->env;
1729 } 1709 }
1730} 1710}
1731 1711
1732/*
1733 * insert_ob_in_ob(op,environment):
1734 * This function inserts the object op in the linked list
1735 * inside the object environment.
1736 *
1737 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1738 * the inventory at the last position or next to other objects of the same
1739 * type.
1740 * Frank: Now sorted by type, archetype and magic!
1741 *
1742 * The function returns now pointer to inserted item, and return value can
1743 * be != op, if items are merged. -Tero
1744 */
1745
1746object * 1712object *
1747insert_ob_in_ob (object *op, object *where) 1713insert_ob_in_ob (object *op, object *where)
1748{ 1714{
1749 object * 1715 if (!where)
1750 tmp, *
1751 otmp;
1752
1753 if (!QUERY_FLAG (op, FLAG_REMOVED))
1754 {
1755 char *dump = dump_object (op);
1756 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757 free (dump);
1758 return op;
1759 }
1760
1761 if (where == NULL)
1762 { 1716 {
1763 char *dump = dump_object (op); 1717 char *dump = dump_object (op);
1764 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1718 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1765 free (dump); 1719 free (dump);
1766 return op; 1720 return op;
1767 } 1721 }
1768 1722
1769 if (where->head) 1723 if (where->head)
1770 { 1724 {
1771 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1725 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1772 where = where->head; 1726 where = where->head;
1773 } 1727 }
1728
1729 return where->insert (op);
1730}
1731
1732/*
1733 * env->insert (op)
1734 * This function inserts the object op in the linked list
1735 * inside the object environment.
1736 *
1737 * The function returns now pointer to inserted item, and return value can
1738 * be != op, if items are merged. -Tero
1739 */
1740
1741object *
1742object::insert (object *op)
1743{
1744 object *tmp, *otmp;
1745
1746 if (!QUERY_FLAG (op, FLAG_REMOVED))
1747 op->remove ();
1774 1748
1775 if (op->more) 1749 if (op->more)
1776 { 1750 {
1777 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1751 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1778 return op; 1752 return op;
… …
1780 1754
1781 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1755 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1782 CLEAR_FLAG (op, FLAG_REMOVED); 1756 CLEAR_FLAG (op, FLAG_REMOVED);
1783 if (op->nrof) 1757 if (op->nrof)
1784 { 1758 {
1785 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1759 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1786 if (CAN_MERGE (tmp, op)) 1760 if (object::can_merge (tmp, op))
1787 { 1761 {
1788 /* return the original object and remove inserted object 1762 /* return the original object and remove inserted object
1789 (client needs the original object) */ 1763 (client needs the original object) */
1790 tmp->nrof += op->nrof; 1764 tmp->nrof += op->nrof;
1791 /* Weight handling gets pretty funky. Since we are adding to 1765 /* Weight handling gets pretty funky. Since we are adding to
1792 * tmp->nrof, we need to increase the weight. 1766 * tmp->nrof, we need to increase the weight.
1793 */ 1767 */
1794 add_weight (where, op->weight * op->nrof); 1768 add_weight (this, op->weight * op->nrof);
1795 SET_FLAG (op, FLAG_REMOVED); 1769 SET_FLAG (op, FLAG_REMOVED);
1796 free_object (op); /* free the inserted object */ 1770 op->destroy (); /* free the inserted object */
1797 op = tmp; 1771 op = tmp;
1798 remove_ob (op); /* and fix old object's links */ 1772 op->remove (); /* and fix old object's links */
1799 CLEAR_FLAG (op, FLAG_REMOVED); 1773 CLEAR_FLAG (op, FLAG_REMOVED);
1800 break; 1774 break;
1801 } 1775 }
1802 1776
1803 /* I assume combined objects have no inventory 1777 /* I assume combined objects have no inventory
1804 * We add the weight - this object could have just been removed 1778 * We add the weight - this object could have just been removed
1805 * (if it was possible to merge). calling remove_ob will subtract 1779 * (if it was possible to merge). calling remove_ob will subtract
1806 * the weight, so we need to add it in again, since we actually do 1780 * the weight, so we need to add it in again, since we actually do
1807 * the linking below 1781 * the linking below
1808 */ 1782 */
1809 add_weight (where, op->weight * op->nrof); 1783 add_weight (this, op->weight * op->nrof);
1810 } 1784 }
1811 else 1785 else
1812 add_weight (where, (op->weight + op->carrying)); 1786 add_weight (this, (op->weight + op->carrying));
1813 1787
1814 otmp = is_player_inv (where); 1788 otmp = is_player_inv (this);
1815 if (otmp && otmp->contr != NULL) 1789 if (otmp && otmp->contr)
1816 {
1817 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1790 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1818 fix_player (otmp); 1791 fix_player (otmp);
1819 }
1820 1792
1821 op->map = NULL; 1793 op->map = NULL;
1822 op->env = where; 1794 op->env = this;
1823 op->above = NULL; 1795 op->above = NULL;
1824 op->below = NULL; 1796 op->below = NULL;
1825 op->x = 0, op->y = 0; 1797 op->x = 0, op->y = 0;
1826 1798
1827 /* reset the light list and los of the players on the map */ 1799 /* reset the light list and los of the players on the map */
1828 if ((op->glow_radius != 0) && where->map) 1800 if ((op->glow_radius != 0) && map)
1829 { 1801 {
1830#ifdef DEBUG_LIGHTS 1802#ifdef DEBUG_LIGHTS
1831 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1803 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1832#endif /* DEBUG_LIGHTS */ 1804#endif /* DEBUG_LIGHTS */
1833 if (MAP_DARKNESS (where->map)) 1805 if (MAP_DARKNESS (map))
1834 update_all_los (where->map, where->x, where->y); 1806 update_all_los (map, x, y);
1835 } 1807 }
1836 1808
1837 /* Client has no idea of ordering so lets not bother ordering it here. 1809 /* Client has no idea of ordering so lets not bother ordering it here.
1838 * It sure simplifies this function... 1810 * It sure simplifies this function...
1839 */ 1811 */
1840 if (where->inv == NULL) 1812 if (!inv)
1841 where->inv = op; 1813 inv = op;
1842 else 1814 else
1843 { 1815 {
1844 op->below = where->inv; 1816 op->below = inv;
1845 op->below->above = op; 1817 op->below->above = op;
1846 where->inv = op; 1818 inv = op;
1847 } 1819 }
1820
1848 return op; 1821 return op;
1849} 1822}
1850 1823
1851/* 1824/*
1852 * Checks if any objects has a move_type that matches objects 1825 * Checks if any objects has a move_type that matches objects
… …
2541 * create clone from object to another 2514 * create clone from object to another
2542 */ 2515 */
2543object * 2516object *
2544object_create_clone (object *asrc) 2517object_create_clone (object *asrc)
2545{ 2518{
2546 object *
2547 dst = NULL, *tmp, *src, *part, *prev, *item; 2519 object *dst = 0, *tmp, *src, *part, *prev, *item;
2548 2520
2549 if (!asrc) 2521 if (!asrc)
2550 return NULL; 2522 return 0;
2523
2551 src = asrc; 2524 src = asrc;
2552 if (src->head) 2525 if (src->head)
2553 src = src->head; 2526 src = src->head;
2554 2527
2555 prev = NULL; 2528 prev = 0;
2556 for (part = src; part; part = part->more) 2529 for (part = src; part; part = part->more)
2557 { 2530 {
2558 tmp = get_object (); 2531 tmp = part->clone ();
2559 copy_object (part, tmp);
2560 tmp->x -= src->x; 2532 tmp->x -= src->x;
2561 tmp->y -= src->y; 2533 tmp->y -= src->y;
2534
2562 if (!part->head) 2535 if (!part->head)
2563 { 2536 {
2564 dst = tmp; 2537 dst = tmp;
2565 tmp->head = NULL; 2538 tmp->head = 0;
2566 } 2539 }
2567 else 2540 else
2568 { 2541 {
2569 tmp->head = dst; 2542 tmp->head = dst;
2570 } 2543 }
2544
2571 tmp->more = NULL; 2545 tmp->more = 0;
2546
2572 if (prev) 2547 if (prev)
2573 prev->more = tmp; 2548 prev->more = tmp;
2549
2574 prev = tmp; 2550 prev = tmp;
2575 } 2551 }
2576 2552
2577 for (item = src->inv; item; item = item->below) 2553 for (item = src->inv; item; item = item->below)
2578 insert_ob_in_ob (object_create_clone (item), dst); 2554 insert_ob_in_ob (object_create_clone (item), dst);
… …
2604 } 2580 }
2605 2581
2606 fprintf (tempfile, obstr); 2582 fprintf (tempfile, obstr);
2607 fclose (tempfile); 2583 fclose (tempfile);
2608 2584
2609 op = get_object (); 2585 op = object::create ();
2610 2586
2611 object_thawer thawer (filename); 2587 object_thawer thawer (filename);
2612 2588
2613 if (thawer) 2589 if (thawer)
2614 load_object (thawer, op, 0); 2590 load_object (thawer, op, 0);

Diff Legend

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