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.235 by root, Tue May 6 20:00:12 2008 UTC vs.
Revision 1.260 by root, Mon Sep 29 10:35:36 2008 UTC

… …
186 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
187 || ob1->value != ob2->value 187 || ob1->value != ob2->value
188 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
189 return 0; 189 return 0;
190 190
191 /* Do not merge objects if nrof would overflow. First part checks 191 /* Do not merge objects if nrof would overflow, assume nrof
192 * for unsigned overflow (2c), second part checks whether the result 192 * is always 0 .. 2**31-1 */
193 * would fit into a 32 bit signed int, which is often used to hold 193 if (ob1->nrof > 0x7fffffff - ob2->nrof)
194 * nrof values.
195 */
196 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
197 return 0; 194 return 0;
198 195
199 /* If the objects have been identified, set the BEEN_APPLIED flag. 196 /* If the objects have been identified, set the BEEN_APPLIED flag.
200 * This is to the comparison of the flags below will be OK. We 197 * This is to the comparison of the flags below will be OK. We
201 * just can't ignore the been applied or identified flags, as they 198 * just can't ignore the been applied or identified flags, as they
… …
206 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 203 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207 204
208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 205 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210 207
211 if (ob1->arch->name != ob2->arch->name 208 if (ob1->arch->archname != ob2->arch->archname
212 || ob1->name != ob2->name 209 || ob1->name != ob2->name
213 || ob1->title != ob2->title 210 || ob1->title != ob2->title
214 || ob1->msg != ob2->msg 211 || ob1->msg != ob2->msg
215 || ob1->weight != ob2->weight 212 || ob1->weight != ob2->weight
216 || ob1->attacktype != ob2->attacktype 213 || ob1->attacktype != ob2->attacktype
217 || ob1->magic != ob2->magic 214 || ob1->magic != ob2->magic
218 || ob1->slaying != ob2->slaying 215 || ob1->slaying != ob2->slaying
219 || ob1->skill != ob2->skill 216 || ob1->skill != ob2->skill
220 || ob1->value != ob2->value 217 || ob1->value != ob2->value
221 || ob1->animation_id != ob2->animation_id 218 || ob1->animation_id != ob2->animation_id
219 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222 || ob1->client_type != ob2->client_type 220 || ob1->client_type != ob2->client_type
223 || ob1->materialname != ob2->materialname 221 || ob1->materialname != ob2->materialname
224 || ob1->lore != ob2->lore 222 || ob1->lore != ob2->lore
225 || ob1->subtype != ob2->subtype 223 || ob1->subtype != ob2->subtype
226 || ob1->move_type != ob2->move_type 224 || ob1->move_type != ob2->move_type
… …
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235 return 0; 233 return 0;
236 234
237 if ((ob1->flag ^ ob2->flag) 235 if ((ob1->flag ^ ob2->flag)
238 .reset (FLAG_INV_LOCKED) 236 .reset (FLAG_INV_LOCKED)
239 .reset (FLAG_CLIENT_SENT)
240 .reset (FLAG_REMOVED) 237 .reset (FLAG_REMOVED)
241 .any ()) 238 .any ())
242 return 0; 239 return 0;
243 240
244 /* This is really a spellbook check - we should in general 241 /* This is really a spellbook check - we should in general
… …
344 else 341 else
345 { 342 {
346 // maybe there is a player standing on the same mapspace 343 // maybe there is a player standing on the same mapspace
347 // this will catch the case where "this" is a player 344 // this will catch the case where "this" is a player
348 if (object *pl = ms ().player ()) 345 if (object *pl = ms ().player ())
346 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349 if (!pl->container || this == pl->container) 347 || this == pl->container)
350 return pl; 348 return pl;
351 } 349 }
352 } 350 }
353 351
354 return 0; 352 return 0;
… …
478 */ 476 */
479object * 477object *
480find_object_name (const char *str) 478find_object_name (const char *str)
481{ 479{
482 shstr_cmp str_ (str); 480 shstr_cmp str_ (str);
483 object *op;
484 481
482 if (str_)
485 for_all_objects (op) 483 for_all_objects (op)
486 if (op->name == str_) 484 if (op->name == str_)
487 break; 485 return op;
488 486
489 return op; 487 return 0;
490} 488}
491 489
492/* 490/*
493 * Sets the owner and sets the skill and exp pointers to owner's current 491 * Sets the owner and sets the skill and exp pointers to owner's current
494 * skill and experience objects. 492 * skill and experience objects.
… …
638 } 636 }
639 637
640 if (speed < 0) 638 if (speed < 0)
641 dst->speed_left -= rndm (); 639 dst->speed_left -= rndm ();
642 640
643 dst->set_speed (dst->speed); 641 dst->activate ();
644} 642}
645 643
646void 644void
647object::instantiate () 645object::instantiate ()
648{ 646{
… …
768 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769 || (m.move_on | op->move_on ) != m.move_on 767 || (m.move_on | op->move_on ) != m.move_on
770 || (m.move_off | op->move_off ) != m.move_off 768 || (m.move_off | op->move_off ) != m.move_off
771 || (m.move_slow | op->move_slow) != m.move_slow 769 || (m.move_slow | op->move_slow) != m.move_slow
772 /* This isn't perfect, but I don't expect a lot of objects to 770 /* This isn't perfect, but I don't expect a lot of objects to
773 * to have move_allow right now. 771 * have move_allow right now.
774 */ 772 */
775 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 773 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
776 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
777 m.flags_ = 0; 775 m.flags_ = 0;
778 } 776 }
… …
832{ 830{
833 /* If already on active list, don't do anything */ 831 /* If already on active list, don't do anything */
834 if (active) 832 if (active)
835 return; 833 return;
836 834
835 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
837 if (has_active_speed ()) 838 if (has_active_speed ())
838 actives.insert (this); 839 actives.insert (this);
839} 840}
840 841
841void 842void
… …
904 * drop on that space. 905 * drop on that space.
905 */ 906 */
906 if (!drop_to_ground 907 if (!drop_to_ground
907 || !map 908 || !map
908 || map->in_memory != MAP_ACTIVE 909 || map->in_memory != MAP_ACTIVE
909 || map->nodrop 910 || map->no_drop
910 || ms ().move_block == MOVE_ALL) 911 || ms ().move_block == MOVE_ALL)
911 { 912 {
912 while (inv) 913 while (inv)
913 {
914 inv->destroy_inv (false);
915 inv->destroy (); 914 inv->destroy ();
916 }
917 } 915 }
918 else 916 else
919 { /* Put objects in inventory onto this space */ 917 { /* Put objects in inventory onto this space */
920 while (inv) 918 while (inv)
921 { 919 {
… …
925 || op->flag [FLAG_NO_DROP] 923 || op->flag [FLAG_NO_DROP]
926 || op->type == RUNE 924 || op->type == RUNE
927 || op->type == TRAP 925 || op->type == TRAP
928 || op->flag [FLAG_IS_A_TEMPLATE] 926 || op->flag [FLAG_IS_A_TEMPLATE]
929 || op->flag [FLAG_DESTROY_ON_DEATH]) 927 || op->flag [FLAG_DESTROY_ON_DEATH])
930 op->destroy (true); 928 op->destroy ();
931 else 929 else
932 map->insert (op, x, y); 930 map->insert (op, x, y);
933 } 931 }
934 } 932 }
935} 933}
… …
943 941
944static struct freed_map : maptile 942static struct freed_map : maptile
945{ 943{
946 freed_map () 944 freed_map ()
947 { 945 {
948 path = "<freed objects map>"; 946 path = "<freed objects map>";
949 name = "/internal/freed_objects_map"; 947 name = "/internal/freed_objects_map";
950 width = 3; 948 width = 3;
951 height = 3; 949 height = 3;
952 nodrop = 1; 950 no_drop = 1;
951 no_reset = 1;
953 952
954 alloc (); 953 alloc ();
955 in_memory = MAP_ACTIVE; 954 in_memory = MAP_ACTIVE;
956 } 955 }
957 956
… …
998 attacked_by = 0; 997 attacked_by = 0;
999 current_weapon = 0; 998 current_weapon = 0;
1000} 999}
1001 1000
1002void 1001void
1003object::destroy (bool destroy_inventory) 1002object::destroy ()
1004{ 1003{
1005 if (destroyed ()) 1004 if (destroyed ())
1006 return; 1005 return;
1007 1006
1008 if (!is_head () && !head->destroyed ()) 1007 if (!is_head () && !head->destroyed ())
1009 { 1008 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1009 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory); 1010 head->destroy ();
1012 return; 1011 return;
1013 } 1012 }
1014 1013
1015 destroy_inv (!destroy_inventory); 1014 destroy_inv (false);
1016 1015
1017 if (is_head ()) 1016 if (is_head ())
1018 if (sound_destroy) 1017 if (sound_destroy)
1019 play_sound (sound_destroy); 1018 play_sound (sound_destroy);
1020 else if (flag [FLAG_MONSTER]) 1019 else if (flag [FLAG_MONSTER])
… …
1056 if (object *pl = visible_to ()) 1055 if (object *pl = visible_to ())
1057 esrv_del_item (pl->contr, count); 1056 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1057 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059 1058
1060 adjust_weight (env, -total_weight ()); 1059 adjust_weight (env, -total_weight ());
1061
1062 *(above ? &above->below : &env->inv) = below;
1063
1064 if (below)
1065 below->above = above;
1066 1060
1067 /* we set up values so that it could be inserted into 1061 /* we set up values so that it could be inserted into
1068 * the map, but we don't actually do that - it is up 1062 * the map, but we don't actually do that - it is up
1069 * to the caller to decide what we want to do. 1063 * to the caller to decide what we want to do.
1070 */ 1064 */
1071 map = env->map; 1065 map = env->map;
1072 x = env->x; 1066 x = env->x;
1073 y = env->y; 1067 y = env->y;
1068
1069 // make sure cmov optimisation is applicable
1070 *(above ? &above->below : &env->inv) = below;
1071 *(below ? &below->above : &above ) = above; // &above is just a dummy
1072
1074 above = 0; 1073 above = 0;
1075 below = 0; 1074 below = 0;
1076 env = 0; 1075 env = 0;
1077 1076
1078 /* NO_FIX_PLAYER is set when a great many changes are being 1077 /* NO_FIX_PLAYER is set when a great many changes are being
… …
1108 1107
1109 esrv_del_item (pl->contr, count); 1108 esrv_del_item (pl->contr, count);
1110 } 1109 }
1111 1110
1112 /* link the object above us */ 1111 /* link the object above us */
1113 if (above) 1112 // re-link, make sure compiler can easily use cmove
1114 above->below = below; 1113 *(above ? &above->below : &ms.top) = below;
1115 else 1114 *(below ? &below->above : &ms.bot) = above;
1116 ms.top = below; /* we were top, set new top */
1117
1118 /* Relink the object below us, if there is one */
1119 if (below)
1120 below->above = above;
1121 else
1122 ms.bot = above;
1123 1115
1124 above = 0; 1116 above = 0;
1125 below = 0; 1117 below = 0;
1118
1119 ms.flags_ = 0;
1126 1120
1127 if (map->in_memory == MAP_SAVING) 1121 if (map->in_memory == MAP_SAVING)
1128 return; 1122 return;
1129 1123
1130 int check_walk_off = !flag [FLAG_NO_APPLY]; 1124 int check_walk_off = !flag [FLAG_NO_APPLY];
… …
1163 } 1157 }
1164 1158
1165 last = tmp; 1159 last = tmp;
1166 } 1160 }
1167 1161
1168 /* last == NULL if there are no objects on this space */
1169 //TODO: this makes little sense, why only update the topmost object?
1170 if (!last)
1171 map->at (x, y).flags_ = 0;
1172 else
1173 update_object (last, UP_OBJ_REMOVE);
1174
1175 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1162 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1176 update_all_los (map, x, y); 1163 update_all_los (map, x, y);
1177 } 1164 }
1178} 1165}
1179 1166
… …
1204 esrv_update_item (UPD_NROF, pl, top); 1191 esrv_update_item (UPD_NROF, pl, top);
1205 1192
1206 op->weight = 0; // cancel the addition above 1193 op->weight = 0; // cancel the addition above
1207 op->carrying = 0; // must be 0 already 1194 op->carrying = 0; // must be 0 already
1208 1195
1209 op->destroy (1); 1196 op->destroy ();
1210 1197
1211 return top; 1198 return top;
1212 } 1199 }
1213 1200
1214 return 0; 1201 return 0;
… …
1242 * job preparing multi-part monsters. 1229 * job preparing multi-part monsters.
1243 */ 1230 */
1244object * 1231object *
1245insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1232insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1246{ 1233{
1234 op->remove ();
1235
1247 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1236 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1248 { 1237 {
1249 tmp->x = x + tmp->arch->x; 1238 tmp->x = x + tmp->arch->x;
1250 tmp->y = y + tmp->arch->y; 1239 tmp->y = y + tmp->arch->y;
1251 } 1240 }
… …
1274 * just 'op' otherwise 1263 * just 'op' otherwise
1275 */ 1264 */
1276object * 1265object *
1277insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1266insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1278{ 1267{
1279 assert (!op->flag [FLAG_FREED]); 1268 if (op->is_on_map ())
1269 {
1270 LOG (llevError, "insert_ob_in_map called for object already on map");
1271 abort ();
1272 }
1280 1273
1274 if (op->env)
1275 {
1276 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1281 op->remove (); 1277 op->remove ();
1278 }
1279
1280 if (m == &freed_map)//D TODO: remove soon
1281 {//D
1282 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283 }//D
1282 1284
1283 /* Ideally, the caller figures this out. However, it complicates a lot 1285 /* Ideally, the caller figures this out. However, it complicates a lot
1284 * of areas of callers (eg, anything that uses find_free_spot would now 1286 * of areas of callers (eg, anything that uses find_free_spot would now
1285 * need extra work 1287 * need extra work
1286 */ 1288 */
1287 if (!xy_normalise (m, op->x, op->y)) 1289 if (!xy_normalise (m, op->x, op->y))
1288 { 1290 {
1289 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1291 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1290 return 0; 1292 return 0;
1291 } 1293 }
1292 1294
1293 if (object *more = op->more) 1295 if (object *more = op->more)
1294 if (!insert_ob_in_map (more, m, originator, flag)) 1296 if (!insert_ob_in_map (more, m, originator, flag))
… …
1303 */ 1305 */
1304 if (op->nrof && !(flag & INS_NO_MERGE)) 1306 if (op->nrof && !(flag & INS_NO_MERGE))
1305 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1307 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1306 if (object::can_merge (op, tmp)) 1308 if (object::can_merge (op, tmp))
1307 { 1309 {
1308 // TODO: we atcually want to update tmp, not op, 1310 // TODO: we actually want to update tmp, not op,
1309 // but some caller surely breaks when we return tmp 1311 // but some caller surely breaks when we return tmp
1310 // from here :/ 1312 // from here :/
1311 op->nrof += tmp->nrof; 1313 op->nrof += tmp->nrof;
1312 tmp->destroy (1); 1314 tmp->destroy ();
1313 } 1315 }
1314 1316
1315 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1317 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1316 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1318 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1317 1319
… …
1324 { 1326 {
1325 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1327 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1326 abort (); 1328 abort ();
1327 } 1329 }
1328 1330
1331 if (!originator->is_on_map ())
1332 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1333 op->debug_desc (), originator->debug_desc ());
1334
1329 op->above = originator; 1335 op->above = originator;
1330 op->below = originator->below; 1336 op->below = originator->below;
1331
1332 if (op->below)
1333 op->below->above = op;
1334 else
1335 ms.bot = op;
1336
1337 /* since *below* originator, no need to update top */
1338 originator->below = op; 1337 originator->below = op;
1338
1339 *(op->below ? &op->below->above : &ms.bot) = op;
1339 } 1340 }
1340 else 1341 else
1341 { 1342 {
1342 object *top, *floor = NULL; 1343 object *floor = 0;
1343 1344 object *top = ms.top;
1344 top = ms.bot;
1345 1345
1346 /* If there are other objects, then */ 1346 /* If there are other objects, then */
1347 if (top) 1347 if (top)
1348 { 1348 {
1349 object *last = 0;
1350
1351 /* 1349 /*
1352 * If there are multiple objects on this space, we do some trickier handling. 1350 * If there are multiple objects on this space, we do some trickier handling.
1353 * We've already dealt with merging if appropriate. 1351 * We've already dealt with merging if appropriate.
1354 * Generally, we want to put the new object on top. But if 1352 * Generally, we want to put the new object on top. But if
1355 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1353 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1358 * once we get to them. This reduces the need to traverse over all of 1356 * once we get to them. This reduces the need to traverse over all of
1359 * them when adding another one - this saves quite a bit of cpu time 1357 * them when adding another one - this saves quite a bit of cpu time
1360 * when lots of spells are cast in one area. Currently, it is presumed 1358 * when lots of spells are cast in one area. Currently, it is presumed
1361 * that flying non pickable objects are spell objects. 1359 * that flying non pickable objects are spell objects.
1362 */ 1360 */
1363 for (top = ms.bot; top; top = top->above) 1361 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1364 { 1362 {
1365 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1363 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1366 floor = top; 1364 floor = tmp;
1367 1365
1368 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1366 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1369 { 1367 {
1370 /* We insert above top, so we want this object below this */ 1368 /* We insert above top, so we want this object below this */
1371 top = top->below; 1369 top = tmp->below;
1372 break; 1370 break;
1373 } 1371 }
1374 1372
1375 last = top; 1373 top = tmp;
1376 } 1374 }
1377
1378 /* Don't want top to be NULL, so set it to the last valid object */
1379 top = last;
1380 1375
1381 /* We let update_position deal with figuring out what the space 1376 /* We let update_position deal with figuring out what the space
1382 * looks like instead of lots of conditions here. 1377 * looks like instead of lots of conditions here.
1383 * makes things faster, and effectively the same result. 1378 * makes things faster, and effectively the same result.
1384 */ 1379 */
… …
1391 */ 1386 */
1392 if (!(flag & INS_ON_TOP) 1387 if (!(flag & INS_ON_TOP)
1393 && ms.flags () & P_BLOCKSVIEW 1388 && ms.flags () & P_BLOCKSVIEW
1394 && (op->face && !faces [op->face].visibility)) 1389 && (op->face && !faces [op->face].visibility))
1395 { 1390 {
1391 object *last;
1392
1396 for (last = top; last != floor; last = last->below) 1393 for (last = top; last != floor; last = last->below)
1397 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1394 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1398 break; 1395 break;
1399 1396
1400 /* Check to see if we found the object that blocks view, 1397 /* Check to see if we found the object that blocks view,
… …
1408 } /* If objects on this space */ 1405 } /* If objects on this space */
1409 1406
1410 if (flag & INS_ABOVE_FLOOR_ONLY) 1407 if (flag & INS_ABOVE_FLOOR_ONLY)
1411 top = floor; 1408 top = floor;
1412 1409
1413 /* Top is the object that our object (op) is going to get inserted above. 1410 // insert object above top, or bottom-most if top = 0
1414 */
1415
1416 /* First object on this space */
1417 if (!top) 1411 if (!top)
1418 { 1412 {
1413 op->below = 0;
1419 op->above = ms.bot; 1414 op->above = ms.bot;
1420
1421 if (op->above)
1422 op->above->below = op;
1423
1424 op->below = 0;
1425 ms.bot = op; 1415 ms.bot = op;
1416
1417 *(op->above ? &op->above->below : &ms.top) = op;
1426 } 1418 }
1427 else 1419 else
1428 { /* get inserted into the stack above top */ 1420 {
1429 op->above = top->above; 1421 op->above = top->above;
1430
1431 if (op->above)
1432 op->above->below = op; 1422 top->above = op;
1433 1423
1434 op->below = top; 1424 op->below = top;
1435 top->above = op; 1425 *(op->above ? &op->above->below : &ms.top) = op;
1436 } 1426 }
1437 1427 }
1438 if (!op->above)
1439 ms.top = op;
1440 } /* else not INS_BELOW_ORIGINATOR */
1441 1428
1442 if (op->type == PLAYER) 1429 if (op->type == PLAYER)
1443 { 1430 {
1444 op->contr->do_los = 1; 1431 op->contr->do_los = 1;
1445 ++op->map->players; 1432 ++op->map->players;
… …
1507{ 1494{
1508 /* first search for itself and remove any old instances */ 1495 /* first search for itself and remove any old instances */
1509 1496
1510 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1497 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1511 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1498 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1512 tmp->destroy (1); 1499 tmp->destroy ();
1513 1500
1514 object *tmp = arch_to_object (archetype::find (arch_string)); 1501 object *tmp = arch_to_object (archetype::find (arch_string));
1515 1502
1516 tmp->x = op->x; 1503 tmp->x = op->x;
1517 tmp->y = op->y; 1504 tmp->y = op->y;
… …
1541 if (!nr) 1528 if (!nr)
1542 return true; 1529 return true;
1543 1530
1544 nr = min (nr, nrof); 1531 nr = min (nr, nrof);
1545 1532
1533 if (nrof > nr)
1534 {
1546 nrof -= nr; 1535 nrof -= nr;
1547
1548 if (nrof)
1549 {
1550 adjust_weight (env, -weight * nr); // carrying == 0 1536 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1551 1537
1552 if (object *pl = visible_to ()) 1538 if (object *pl = visible_to ())
1553 esrv_update_item (UPD_NROF, pl, this); 1539 esrv_update_item (UPD_NROF, pl, this);
1554 1540
1555 return true; 1541 return true;
1556 } 1542 }
1557 else 1543 else
1558 { 1544 {
1559 destroy (1); 1545 destroy ();
1560 return false; 1546 return false;
1561 } 1547 }
1562} 1548}
1563 1549
1564/* 1550/*
… …
1641 if (object *pl = tmp->visible_to ()) 1627 if (object *pl = tmp->visible_to ())
1642 esrv_update_item (UPD_NROF, pl, tmp); 1628 esrv_update_item (UPD_NROF, pl, tmp);
1643 1629
1644 adjust_weight (this, op->total_weight ()); 1630 adjust_weight (this, op->total_weight ());
1645 1631
1646 op->destroy (1); 1632 op->destroy ();
1647 op = tmp; 1633 op = tmp;
1648 goto inserted; 1634 goto inserted;
1649 } 1635 }
1650 1636
1651 op->owner = 0; // it's his/hers now. period. 1637 op->owner = 0; // it's his/hers now. period.
… …
2440{ 2426{
2441 char flagdesc[512]; 2427 char flagdesc[512];
2442 char info2[256 * 4]; 2428 char info2[256 * 4];
2443 char *p = info; 2429 char *p = info;
2444 2430
2445 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2431 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2446 count, 2432 count,
2447 uuid.c_str (), 2433 uuid.c_str (),
2448 &name, 2434 &name,
2449 title ? "\",title:\"" : "", 2435 title ? ",title:\"" : "",
2450 title ? (const char *)title : "", 2436 title ? (const char *)title : "",
2437 title ? "\"" : "",
2451 flag_desc (flagdesc, 512), type); 2438 flag_desc (flagdesc, 512), type);
2452 2439
2453 if (!flag[FLAG_REMOVED] && env) 2440 if (!flag[FLAG_REMOVED] && env)
2454 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2441 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2455 2442

Diff Legend

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