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.58 by pippijn, Mon Dec 4 17:48:35 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)
… …
907 911
908 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 912 if (QUERY_FLAG (this, FLAG_FRIENDLY))
909 remove_friendly_object (this); 913 remove_friendly_object (this);
910 914
911 if (!QUERY_FLAG (this, FLAG_REMOVED)) 915 if (!QUERY_FLAG (this, FLAG_REMOVED))
912 remove_ob (this); 916 remove ();
913 917
914 SET_FLAG (this, FLAG_FREED); 918 SET_FLAG (this, FLAG_FREED);
915 919
916 if (more) 920 if (more)
917 { 921 {
… …
942 946
943 while (op) 947 while (op)
944 { 948 {
945 object *tmp = op->below; 949 object *tmp = op->below;
946 950
947 remove_ob (op); 951 op->remove ();
948 952
949 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 953 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
950 || 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))
951 free_object (op); 955 op->destroy ();
952 else 956 else
953 { 957 {
954 op->x = x; 958 op->x = x;
955 op->y = y; 959 op->y = y;
956 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 */
… …
1000 1004
1001/* 1005/*
1002 * sub_weight() recursively (outwards) subtracts a number from the 1006 * sub_weight() recursively (outwards) subtracts a number from the
1003 * 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)).
1004 */ 1008 */
1005
1006void 1009void
1007sub_weight (object *op, signed long weight) 1010sub_weight (object *op, signed long weight)
1008{ 1011{
1009 while (op != NULL) 1012 while (op != NULL)
1010 { 1013 {
… …
1014 op->carrying -= weight; 1017 op->carrying -= weight;
1015 op = op->env; 1018 op = op->env;
1016 } 1019 }
1017} 1020}
1018 1021
1019/* remove_ob(op): 1022/* op->remove ():
1020 * 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
1021 * 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
1022 * object will have no environment. If the object previously had an 1025 * object will have no environment. If the object previously had an
1023 * environment, the x and y coordinates will be updated to 1026 * environment, the x and y coordinates will be updated to
1024 * the previous environment. 1027 * the previous environment.
1025 * Beware: This function is called from the editor as well! 1028 * Beware: This function is called from the editor as well!
1026 */ 1029 */
1027
1028void 1030void
1029remove_ob (object *op) 1031object::remove ()
1030{ 1032{
1031 object *tmp, *last = 0; 1033 object *tmp, *last = 0;
1032 object *otmp; 1034 object *otmp;
1033 1035
1034 int check_walk_off; 1036 int check_walk_off;
1035 maptile *m;
1036 1037
1037 sint16 x, y;
1038
1039 if (QUERY_FLAG (op, FLAG_REMOVED)) 1038 if (QUERY_FLAG (this, FLAG_REMOVED))
1040 return; 1039 return;
1041 1040
1042 SET_FLAG (op, FLAG_REMOVED); 1041 SET_FLAG (this, FLAG_REMOVED);
1043 1042
1044 if (op->more != NULL) 1043 if (more)
1045 remove_ob (op->more); 1044 more->remove ();
1046 1045
1047 /* 1046 /*
1048 * In this case, the object to be removed is in someones 1047 * In this case, the object to be removed is in someones
1049 * inventory. 1048 * inventory.
1050 */ 1049 */
1051 if (op->env != NULL) 1050 if (env)
1052 { 1051 {
1053 if (op->nrof) 1052 if (nrof)
1054 sub_weight (op->env, op->weight * op->nrof); 1053 sub_weight (env, weight * nrof);
1055 else 1054 else
1056 sub_weight (op->env, op->weight + op->carrying); 1055 sub_weight (env, weight + carrying);
1057 1056
1058 /* 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
1059 * made to players inventory. If set, avoiding the call 1058 * made to players inventory. If set, avoiding the call
1060 * to save cpu time. 1059 * to save cpu time.
1061 */ 1060 */
1062 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))
1063 fix_player (otmp); 1062 fix_player (otmp);
1064 1063
1065 if (op->above != NULL) 1064 if (above != NULL)
1066 op->above->below = op->below; 1065 above->below = below;
1067 else 1066 else
1068 op->env->inv = op->below; 1067 env->inv = below;
1069 1068
1070 if (op->below != NULL) 1069 if (below != NULL)
1071 op->below->above = op->above; 1070 below->above = above;
1072 1071
1073 /* we set up values so that it could be inserted into 1072 /* we set up values so that it could be inserted into
1074 * 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
1075 * to the caller to decide what we want to do. 1074 * to the caller to decide what we want to do.
1076 */ 1075 */
1077 op->x = op->env->x, op->y = op->env->y; 1076 x = env->x, y = env->y;
1078 op->map = op->env->map; 1077 map = env->map;
1079 op->above = NULL, op->below = NULL; 1078 above = 0, below = 0;
1080 op->env = NULL; 1079 env = 0;
1081 } 1080 }
1082 else if (op->map) 1081 else if (map)
1083 { 1082 {
1084 x = op->x;
1085 y = op->y;
1086 m = get_map_from_coord (op->map, &x, &y);
1087
1088 if (!m)
1089 {
1090 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1091 op->map->path, op->x, op->y);
1092 /* in old days, we used to set x and y to 0 and continue.
1093 * it seems if we get into this case, something is probablye
1094 * screwed up and should be fixed.
1095 */
1096 abort ();
1097 }
1098
1099 if (op->map != m)
1100 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1101 op->map->path, m->path, op->x, op->y, x, y);
1102
1103 /* 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
1104 * lots of logic for things we no longer care about 1084 * lots of logic for things we no longer care about
1105 */ 1085 */
1106 1086
1107 /* link the object above us */ 1087 /* link the object above us */
1108 if (op->above) 1088 if (above)
1109 op->above->below = op->below; 1089 above->below = below;
1110 else 1090 else
1111 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 */
1112 1092
1113 /* Relink the object below us, if there is one */ 1093 /* Relink the object below us, if there is one */
1114 if (op->below) 1094 if (below)
1115 op->below->above = op->above; 1095 below->above = above;
1116 else 1096 else
1117 { 1097 {
1118 /* 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
1119 * use translated coordinates in case some oddness with map tiling is 1099 * use translated coordinates in case some oddness with map tiling is
1120 * evident 1100 * evident
1121 */ 1101 */
1122 if (GET_MAP_OB (m, x, y) != op) 1102 if (GET_MAP_OB (map, x, y) != this)
1123 { 1103 {
1124 char *dump = dump_object (op); 1104 char *dump = dump_object (this);
1125 LOG (llevError, 1105 LOG (llevError,
1126 "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);
1127 free (dump); 1107 free (dump);
1128 dump = dump_object (GET_MAP_OB (m, x, y)); 1108 dump = dump_object (GET_MAP_OB (map, x, y));
1129 LOG (llevError, "%s\n", dump); 1109 LOG (llevError, "%s\n", dump);
1130 free (dump); 1110 free (dump);
1131 } 1111 }
1132 1112
1133 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1113 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1134 } 1114 }
1135 1115
1136 op->above = 0; 1116 above = 0;
1137 op->below = 0; 1117 below = 0;
1138 1118
1139 if (op->map->in_memory == MAP_SAVING) 1119 if (map->in_memory == MAP_SAVING)
1140 return; 1120 return;
1141 1121
1142 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1122 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1143 1123
1144 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)
1145 { 1125 {
1146 /* 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
1147 * being removed. 1127 * being removed.
1148 */ 1128 */
1149 1129
1150 if (tmp->type == PLAYER && tmp != op) 1130 if (tmp->type == PLAYER && tmp != this)
1151 { 1131 {
1152 /* If a container that the player is currently using somehow gets 1132 /* If a container that the player is currently using somehow gets
1153 * removed (most likely destroyed), update the player view 1133 * removed (most likely destroyed), update the player view
1154 * appropriately. 1134 * appropriately.
1155 */ 1135 */
1156 if (tmp->container == op) 1136 if (tmp->container == this)
1157 { 1137 {
1158 CLEAR_FLAG (op, FLAG_APPLIED); 1138 CLEAR_FLAG (this, FLAG_APPLIED);
1159 tmp->container = NULL; 1139 tmp->container = 0;
1160 } 1140 }
1161 1141
1162 tmp->contr->socket.update_look = 1; 1142 tmp->contr->socket->update_look = 1;
1163 } 1143 }
1164 1144
1165 /* See if player moving off should effect something */ 1145 /* See if player moving off should effect something */
1166 if (check_walk_off 1146 if (check_walk_off
1167 && ((op->move_type & tmp->move_off) 1147 && ((move_type & tmp->move_off)
1168 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1148 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1169 { 1149 {
1170 move_apply (tmp, op, NULL); 1150 move_apply (tmp, this, 0);
1171 1151
1172 if (op->destroyed ()) 1152 if (destroyed ())
1173 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 ());
1174 } 1154 }
1175 1155
1176 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1156 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1177 1157
1178 if (tmp->above == tmp) 1158 if (tmp->above == tmp)
1179 tmp->above = NULL; 1159 tmp->above = 0;
1180 1160
1181 last = tmp; 1161 last = tmp;
1182 } 1162 }
1183 1163
1184 /* last == NULL of there are no objects on this space */ 1164 /* last == NULL of there are no objects on this space */
1185 if (last == NULL) 1165 if (!last)
1186 { 1166 {
1187 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1167 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1188 * 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
1189 * 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
1190 * be correct anyways. 1170 * be correct anyways.
1191 */ 1171 */
1192 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1172 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1193 update_position (op->map, op->x, op->y); 1173 update_position (map, x, y);
1194 } 1174 }
1195 else 1175 else
1196 update_object (last, UP_OBJ_REMOVE); 1176 update_object (last, UP_OBJ_REMOVE);
1197 1177
1198 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1178 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1199 update_all_los (op->map, op->x, op->y); 1179 update_all_los (map, x, y);
1200 } 1180 }
1201} 1181}
1202 1182
1203/* 1183/*
1204 * merge_ob(op,top): 1184 * merge_ob(op,top):
… …
1219 1199
1220 for (; top != NULL; top = top->below) 1200 for (; top != NULL; top = top->below)
1221 { 1201 {
1222 if (top == op) 1202 if (top == op)
1223 continue; 1203 continue;
1224 if (CAN_MERGE (op, top)) 1204
1205 if (object::can_merge (op, top))
1225 { 1206 {
1226 top->nrof += op->nrof; 1207 top->nrof += op->nrof;
1227 1208
1228/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1209/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1229 op->weight = 0; /* Don't want any adjustements now */ 1210 op->weight = 0; /* Don't want any adjustements now */
1230 remove_ob (op); 1211 op->destroy ();
1231 free_object (op);
1232 return top; 1212 return top;
1233 } 1213 }
1234 } 1214 }
1235 1215
1236 return 0; 1216 return 0;
… …
1363 1343
1364 /* this has to be done after we translate the coordinates. 1344 /* this has to be done after we translate the coordinates.
1365 */ 1345 */
1366 if (op->nrof && !(flag & INS_NO_MERGE)) 1346 if (op->nrof && !(flag & INS_NO_MERGE))
1367 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)
1368 if (CAN_MERGE (op, tmp)) 1348 if (object::can_merge (op, tmp))
1369 { 1349 {
1370 op->nrof += tmp->nrof; 1350 op->nrof += tmp->nrof;
1371 remove_ob (tmp); 1351 tmp->destroy ();
1372 free_object (tmp);
1373 } 1352 }
1374 1353
1375 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 */
1376 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1355 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1377 1356
… …
1505 * it, so save a few ticks and start from there. 1484 * it, so save a few ticks and start from there.
1506 */ 1485 */
1507 if (!(flag & INS_MAP_LOAD)) 1486 if (!(flag & INS_MAP_LOAD))
1508 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)
1509 if (tmp->type == PLAYER) 1488 if (tmp->type == PLAYER)
1510 tmp->contr->socket.update_look = 1; 1489 tmp->contr->socket->update_look = 1;
1511 1490
1512 /* If this object glows, it may affect lighting conditions that are 1491 /* If this object glows, it may affect lighting conditions that are
1513 * 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
1514 * 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
1515 * on the map will get recalculated. The players could very well 1494 * on the map will get recalculated. The players could very well
… …
1563 tmp1; 1542 tmp1;
1564 1543
1565 /* first search for itself and remove any old instances */ 1544 /* first search for itself and remove any old instances */
1566 1545
1567 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)
1568 {
1569 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1570 { 1548 tmp->destroy ();
1571 remove_ob (tmp);
1572 free_object (tmp);
1573 }
1574 }
1575 1549
1576 tmp1 = arch_to_object (archetype::find (arch_string)); 1550 tmp1 = arch_to_object (archetype::find (arch_string));
1577 1551
1578 tmp1->x = op->x; 1552 tmp1->x = op->x;
1579 tmp1->y = op->y; 1553 tmp1->y = op->y;
… …
1589 */ 1563 */
1590 1564
1591object * 1565object *
1592get_split_ob (object *orig_ob, uint32 nr) 1566get_split_ob (object *orig_ob, uint32 nr)
1593{ 1567{
1594 object * 1568 object *newob;
1595 newob;
1596 int
1597 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1598 1570
1599 if (orig_ob->nrof < nr) 1571 if (orig_ob->nrof < nr)
1600 { 1572 {
1601 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);
1602 return NULL; 1574 return NULL;
1603 } 1575 }
1604 1576
1605 newob = object_create_clone (orig_ob); 1577 newob = object_create_clone (orig_ob);
1606 1578
1607 if ((orig_ob->nrof -= nr) < 1) 1579 if ((orig_ob->nrof -= nr) < 1)
1608 { 1580 orig_ob->destroy (1);
1609 if (!is_removed)
1610 remove_ob (orig_ob);
1611 free_object2 (orig_ob, 1);
1612 }
1613 else if (!is_removed) 1581 else if (!is_removed)
1614 { 1582 {
1615 if (orig_ob->env != NULL) 1583 if (orig_ob->env != NULL)
1616 sub_weight (orig_ob->env, orig_ob->weight * nr); 1584 sub_weight (orig_ob->env, orig_ob->weight * nr);
1617 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)
… …
1681 esrv_send_item (tmp, op); 1649 esrv_send_item (tmp, op);
1682 } 1650 }
1683 } 1651 }
1684 else 1652 else
1685 { 1653 {
1686 remove_ob (op); 1654 op->remove ();
1687 op->nrof = 0; 1655 op->nrof = 0;
1688 if (tmp) 1656 if (tmp)
1689 { 1657 {
1690 esrv_del_item (tmp->contr, op->count); 1658 esrv_del_item (tmp->contr, op->count);
1691 } 1659 }
… …
1697 1665
1698 if (i < op->nrof) 1666 if (i < op->nrof)
1699 op->nrof -= i; 1667 op->nrof -= i;
1700 else 1668 else
1701 { 1669 {
1702 remove_ob (op); 1670 op->remove ();
1703 op->nrof = 0; 1671 op->nrof = 0;
1704 } 1672 }
1705 1673
1706 /* Since we just removed op, op->above is null */ 1674 /* Since we just removed op, op->above is null */
1707 for (tmp = above; tmp != NULL; tmp = tmp->above) 1675 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1716 1684
1717 if (op->nrof) 1685 if (op->nrof)
1718 return op; 1686 return op;
1719 else 1687 else
1720 { 1688 {
1721 free_object (op); 1689 op->destroy ();
1722 return NULL; 1690 return NULL;
1723 } 1691 }
1724} 1692}
1725 1693
1726/* 1694/*
… …
1739 op->carrying += weight; 1707 op->carrying += weight;
1740 op = op->env; 1708 op = op->env;
1741 } 1709 }
1742} 1710}
1743 1711
1744/*
1745 * insert_ob_in_ob(op,environment):
1746 * This function inserts the object op in the linked list
1747 * inside the object environment.
1748 *
1749 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1750 * the inventory at the last position or next to other objects of the same
1751 * type.
1752 * Frank: Now sorted by type, archetype and magic!
1753 *
1754 * The function returns now pointer to inserted item, and return value can
1755 * be != op, if items are merged. -Tero
1756 */
1757
1758object * 1712object *
1759insert_ob_in_ob (object *op, object *where) 1713insert_ob_in_ob (object *op, object *where)
1760{ 1714{
1761 object * 1715 if (!where)
1762 tmp, *
1763 otmp;
1764
1765 if (!QUERY_FLAG (op, FLAG_REMOVED))
1766 {
1767 char *dump = dump_object (op);
1768 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1769 free (dump);
1770 return op;
1771 }
1772
1773 if (where == NULL)
1774 { 1716 {
1775 char *dump = dump_object (op); 1717 char *dump = dump_object (op);
1776 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);
1777 free (dump); 1719 free (dump);
1778 return op; 1720 return op;
1779 } 1721 }
1780 1722
1781 if (where->head) 1723 if (where->head)
1782 { 1724 {
1783 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");
1784 where = where->head; 1726 where = where->head;
1785 } 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 ();
1786 1748
1787 if (op->more) 1749 if (op->more)
1788 { 1750 {
1789 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);
1790 return op; 1752 return op;
… …
1792 1754
1793 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1755 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1794 CLEAR_FLAG (op, FLAG_REMOVED); 1756 CLEAR_FLAG (op, FLAG_REMOVED);
1795 if (op->nrof) 1757 if (op->nrof)
1796 { 1758 {
1797 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1759 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1798 if (CAN_MERGE (tmp, op)) 1760 if (object::can_merge (tmp, op))
1799 { 1761 {
1800 /* return the original object and remove inserted object 1762 /* return the original object and remove inserted object
1801 (client needs the original object) */ 1763 (client needs the original object) */
1802 tmp->nrof += op->nrof; 1764 tmp->nrof += op->nrof;
1803 /* Weight handling gets pretty funky. Since we are adding to 1765 /* Weight handling gets pretty funky. Since we are adding to
1804 * tmp->nrof, we need to increase the weight. 1766 * tmp->nrof, we need to increase the weight.
1805 */ 1767 */
1806 add_weight (where, op->weight * op->nrof); 1768 add_weight (this, op->weight * op->nrof);
1807 SET_FLAG (op, FLAG_REMOVED); 1769 SET_FLAG (op, FLAG_REMOVED);
1808 free_object (op); /* free the inserted object */ 1770 op->destroy (); /* free the inserted object */
1809 op = tmp; 1771 op = tmp;
1810 remove_ob (op); /* and fix old object's links */ 1772 op->remove (); /* and fix old object's links */
1811 CLEAR_FLAG (op, FLAG_REMOVED); 1773 CLEAR_FLAG (op, FLAG_REMOVED);
1812 break; 1774 break;
1813 } 1775 }
1814 1776
1815 /* I assume combined objects have no inventory 1777 /* I assume combined objects have no inventory
1816 * We add the weight - this object could have just been removed 1778 * We add the weight - this object could have just been removed
1817 * (if it was possible to merge). calling remove_ob will subtract 1779 * (if it was possible to merge). calling remove_ob will subtract
1818 * 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
1819 * the linking below 1781 * the linking below
1820 */ 1782 */
1821 add_weight (where, op->weight * op->nrof); 1783 add_weight (this, op->weight * op->nrof);
1822 } 1784 }
1823 else 1785 else
1824 add_weight (where, (op->weight + op->carrying)); 1786 add_weight (this, (op->weight + op->carrying));
1825 1787
1826 otmp = is_player_inv (where); 1788 otmp = is_player_inv (this);
1827 if (otmp && otmp->contr != NULL) 1789 if (otmp && otmp->contr)
1828 {
1829 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1790 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1830 fix_player (otmp); 1791 fix_player (otmp);
1831 }
1832 1792
1833 op->map = NULL; 1793 op->map = NULL;
1834 op->env = where; 1794 op->env = this;
1835 op->above = NULL; 1795 op->above = NULL;
1836 op->below = NULL; 1796 op->below = NULL;
1837 op->x = 0, op->y = 0; 1797 op->x = 0, op->y = 0;
1838 1798
1839 /* 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 */
1840 if ((op->glow_radius != 0) && where->map) 1800 if ((op->glow_radius != 0) && map)
1841 { 1801 {
1842#ifdef DEBUG_LIGHTS 1802#ifdef DEBUG_LIGHTS
1843 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);
1844#endif /* DEBUG_LIGHTS */ 1804#endif /* DEBUG_LIGHTS */
1845 if (MAP_DARKNESS (where->map)) 1805 if (MAP_DARKNESS (map))
1846 update_all_los (where->map, where->x, where->y); 1806 update_all_los (map, x, y);
1847 } 1807 }
1848 1808
1849 /* 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.
1850 * It sure simplifies this function... 1810 * It sure simplifies this function...
1851 */ 1811 */
1852 if (where->inv == NULL) 1812 if (!inv)
1853 where->inv = op; 1813 inv = op;
1854 else 1814 else
1855 { 1815 {
1856 op->below = where->inv; 1816 op->below = inv;
1857 op->below->above = op; 1817 op->below->above = op;
1858 where->inv = op; 1818 inv = op;
1859 } 1819 }
1820
1860 return op; 1821 return op;
1861} 1822}
1862 1823
1863/* 1824/*
1864 * Checks if any objects has a move_type that matches objects 1825 * Checks if any objects has a move_type that matches objects
… …
2553 * create clone from object to another 2514 * create clone from object to another
2554 */ 2515 */
2555object * 2516object *
2556object_create_clone (object *asrc) 2517object_create_clone (object *asrc)
2557{ 2518{
2558 object *
2559 dst = NULL, *tmp, *src, *part, *prev, *item; 2519 object *dst = 0, *tmp, *src, *part, *prev, *item;
2560 2520
2561 if (!asrc) 2521 if (!asrc)
2562 return NULL; 2522 return 0;
2523
2563 src = asrc; 2524 src = asrc;
2564 if (src->head) 2525 if (src->head)
2565 src = src->head; 2526 src = src->head;
2566 2527
2567 prev = NULL; 2528 prev = 0;
2568 for (part = src; part; part = part->more) 2529 for (part = src; part; part = part->more)
2569 { 2530 {
2570 tmp = get_object (); 2531 tmp = part->clone ();
2571 copy_object (part, tmp);
2572 tmp->x -= src->x; 2532 tmp->x -= src->x;
2573 tmp->y -= src->y; 2533 tmp->y -= src->y;
2534
2574 if (!part->head) 2535 if (!part->head)
2575 { 2536 {
2576 dst = tmp; 2537 dst = tmp;
2577 tmp->head = NULL; 2538 tmp->head = 0;
2578 } 2539 }
2579 else 2540 else
2580 { 2541 {
2581 tmp->head = dst; 2542 tmp->head = dst;
2582 } 2543 }
2544
2583 tmp->more = NULL; 2545 tmp->more = 0;
2546
2584 if (prev) 2547 if (prev)
2585 prev->more = tmp; 2548 prev->more = tmp;
2549
2586 prev = tmp; 2550 prev = tmp;
2587 } 2551 }
2588 2552
2589 for (item = src->inv; item; item = item->below) 2553 for (item = src->inv; item; item = item->below)
2590 insert_ob_in_ob (object_create_clone (item), dst); 2554 insert_ob_in_ob (object_create_clone (item), dst);
… …
2616 } 2580 }
2617 2581
2618 fprintf (tempfile, obstr); 2582 fprintf (tempfile, obstr);
2619 fclose (tempfile); 2583 fclose (tempfile);
2620 2584
2621 op = get_object (); 2585 op = object::create ();
2622 2586
2623 object_thawer thawer (filename); 2587 object_thawer thawer (filename);
2624 2588
2625 if (thawer) 2589 if (thawer)
2626 load_object (thawer, op, 0); 2590 load_object (thawer, op, 0);

Diff Legend

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