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.232 by root, Tue May 6 18:09:42 2008 UTC vs.
Revision 1.252 by root, Mon Aug 11 23:23:41 2008 UTC

206 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207 207
208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 209 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210 210
211 if (ob1->arch->name != ob2->arch->name 211 if (ob1->arch->archname != ob2->arch->archname
212 || ob1->name != ob2->name 212 || ob1->name != ob2->name
213 || ob1->title != ob2->title 213 || ob1->title != ob2->title
214 || ob1->msg != ob2->msg 214 || ob1->msg != ob2->msg
215 || ob1->weight != ob2->weight 215 || ob1->weight != ob2->weight
216 || ob1->attacktype != ob2->attacktype 216 || ob1->attacktype != ob2->attacktype
217 || ob1->magic != ob2->magic 217 || ob1->magic != ob2->magic
218 || ob1->slaying != ob2->slaying 218 || ob1->slaying != ob2->slaying
219 || ob1->skill != ob2->skill 219 || ob1->skill != ob2->skill
220 || ob1->value != ob2->value 220 || ob1->value != ob2->value
221 || ob1->animation_id != ob2->animation_id 221 || ob1->animation_id != ob2->animation_id
222 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222 || ob1->client_type != ob2->client_type 223 || ob1->client_type != ob2->client_type
223 || ob1->materialname != ob2->materialname 224 || ob1->materialname != ob2->materialname
224 || ob1->lore != ob2->lore 225 || ob1->lore != ob2->lore
225 || ob1->subtype != ob2->subtype 226 || ob1->subtype != ob2->subtype
226 || ob1->move_type != ob2->move_type 227 || ob1->move_type != ob2->move_type
344 else 345 else
345 { 346 {
346 // maybe there is a player standing on the same mapspace 347 // maybe there is a player standing on the same mapspace
347 // this will catch the case where "this" is a player 348 // this will catch the case where "this" is a player
348 if (object *pl = ms ().player ()) 349 if (object *pl = ms ().player ())
350 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349 if (!pl->container || this == pl->container) 351 || this == pl->container)
350 return pl; 352 return pl;
351 } 353 }
352 } 354 }
353 355
354 return 0; 356 return 0;
355} 357}
356 358
357// adjust weight per container type ("of holding") 359// adjust weight per container type ("of holding")
358static sint32 360static sint32
359weight_adjust (object *op, sint32 weight) 361weight_adjust_for (object *op, sint32 weight)
360{ 362{
361 return op->type == CONTAINER 363 return op->type == CONTAINER
362 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 364 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363 : weight; 365 : weight;
364} 366}
370static void 372static void
371adjust_weight (object *op, sint32 weight) 373adjust_weight (object *op, sint32 weight)
372{ 374{
373 while (op) 375 while (op)
374 { 376 {
377 // adjust by actual difference to account for rounding errors
378 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375 weight = weight_adjust (op, weight); 379 weight = weight_adjust_for (op, op->carrying)
380 - weight_adjust_for (op, op->carrying - weight);
376 381
377 if (!weight) 382 if (!weight)
378 return; 383 return;
379 384
380 op->carrying += weight; 385 op->carrying += weight;
403 op->update_weight (); 408 op->update_weight ();
404 409
405 sum += op->total_weight (); 410 sum += op->total_weight ();
406 } 411 }
407 412
408 sum = weight_adjust (this, sum); 413 sum = weight_adjust_for (this, sum);
409 414
410 if (sum != carrying) 415 if (sum != carrying)
411 { 416 {
412 carrying = sum; 417 carrying = sum;
413 418
475 */ 480 */
476object * 481object *
477find_object_name (const char *str) 482find_object_name (const char *str)
478{ 483{
479 shstr_cmp str_ (str); 484 shstr_cmp str_ (str);
480 object *op;
481 485
486 if (str_)
482 for_all_objects (op) 487 for_all_objects (op)
483 if (op->name == str_) 488 if (op->name == str_)
484 break; 489 return op;
485 490
486 return op; 491 return 0;
487} 492}
488 493
489/* 494/*
490 * Sets the owner and sets the skill and exp pointers to owner's current 495 * Sets the owner and sets the skill and exp pointers to owner's current
491 * skill and experience objects. 496 * skill and experience objects.
757 else if (action == UP_OBJ_INSERT) 762 else if (action == UP_OBJ_INSERT)
758 { 763 {
759 // this is likely overkill, TODO: revisit (schmorp) 764 // this is likely overkill, TODO: revisit (schmorp)
760 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 765 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
761 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 766 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
762 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
763 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 767 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
764 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 768 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
765 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 769 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
766 || (m.move_on | op->move_on ) != m.move_on 770 || (m.move_on | op->move_on ) != m.move_on
767 || (m.move_off | op->move_off ) != m.move_off 771 || (m.move_off | op->move_off ) != m.move_off
768 || (m.move_slow | op->move_slow) != m.move_slow 772 || (m.move_slow | op->move_slow) != m.move_slow
769 /* This isn't perfect, but I don't expect a lot of objects to 773 /* This isn't perfect, but I don't expect a lot of objects to
770 * to have move_allow right now. 774 * have move_allow right now.
771 */ 775 */
772 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 776 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
773 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 777 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
774 m.flags_ = 0; 778 m.flags_ = 0;
775 } 779 }
901 * drop on that space. 905 * drop on that space.
902 */ 906 */
903 if (!drop_to_ground 907 if (!drop_to_ground
904 || !map 908 || !map
905 || map->in_memory != MAP_ACTIVE 909 || map->in_memory != MAP_ACTIVE
906 || map->nodrop 910 || map->no_drop
907 || ms ().move_block == MOVE_ALL) 911 || ms ().move_block == MOVE_ALL)
908 { 912 {
909 while (inv) 913 while (inv)
910 {
911 inv->destroy_inv (false);
912 inv->destroy (); 914 inv->destroy (true);
913 }
914 } 915 }
915 else 916 else
916 { /* Put objects in inventory onto this space */ 917 { /* Put objects in inventory onto this space */
917 while (inv) 918 while (inv)
918 { 919 {
940 941
941static struct freed_map : maptile 942static struct freed_map : maptile
942{ 943{
943 freed_map () 944 freed_map ()
944 { 945 {
945 path = "<freed objects map>"; 946 path = "<freed objects map>";
946 name = "/internal/freed_objects_map"; 947 name = "/internal/freed_objects_map";
947 width = 3; 948 width = 3;
948 height = 3; 949 height = 3;
949 nodrop = 1; 950 no_drop = 1;
951 no_reset = 1;
950 952
951 alloc (); 953 alloc ();
952 in_memory = MAP_ACTIVE; 954 in_memory = MAP_ACTIVE;
953 } 955 }
954 956
1053 if (object *pl = visible_to ()) 1055 if (object *pl = visible_to ())
1054 esrv_del_item (pl->contr, count); 1056 esrv_del_item (pl->contr, count);
1055 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
1056 1058
1057 adjust_weight (env, -total_weight ()); 1059 adjust_weight (env, -total_weight ());
1058
1059 *(above ? &above->below : &env->inv) = below;
1060
1061 if (below)
1062 below->above = above;
1063 1060
1064 /* we set up values so that it could be inserted into 1061 /* we set up values so that it could be inserted into
1065 * 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
1066 * to the caller to decide what we want to do. 1063 * to the caller to decide what we want to do.
1067 */ 1064 */
1068 map = env->map; 1065 map = env->map;
1069 x = env->x; 1066 x = env->x;
1070 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
1071 above = 0; 1073 above = 0;
1072 below = 0; 1074 below = 0;
1073 env = 0; 1075 env = 0;
1074 1076
1075 /* 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
1105 1107
1106 esrv_del_item (pl->contr, count); 1108 esrv_del_item (pl->contr, count);
1107 } 1109 }
1108 1110
1109 /* link the object above us */ 1111 /* link the object above us */
1110 if (above) 1112 // re-link, make sure compiler can easily use cmove
1111 above->below = below; 1113 *(above ? &above->below : &ms.top) = below;
1112 else 1114 *(below ? &below->above : &ms.bot) = above;
1113 ms.top = below; /* we were top, set new top */
1114
1115 /* Relink the object below us, if there is one */
1116 if (below)
1117 below->above = above;
1118 else
1119 {
1120 /* Nothing below, which means we need to relink map object for this space
1121 * use translated coordinates in case some oddness with map tiling is
1122 * evident
1123 */
1124 if (GET_MAP_OB (map, x, y) != this)
1125 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1126
1127 ms.bot = above; /* goes on above it. */
1128 }
1129 1115
1130 above = 0; 1116 above = 0;
1131 below = 0; 1117 below = 0;
1132 1118
1133 if (map->in_memory == MAP_SAVING) 1119 if (map->in_memory == MAP_SAVING)
1248 * job preparing multi-part monsters. 1234 * job preparing multi-part monsters.
1249 */ 1235 */
1250object * 1236object *
1251insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1237insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1252{ 1238{
1239 op->remove ();
1240
1253 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1241 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1254 { 1242 {
1255 tmp->x = x + tmp->arch->x; 1243 tmp->x = x + tmp->arch->x;
1256 tmp->y = y + tmp->arch->y; 1244 tmp->y = y + tmp->arch->y;
1257 } 1245 }
1280 * just 'op' otherwise 1268 * just 'op' otherwise
1281 */ 1269 */
1282object * 1270object *
1283insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1284{ 1272{
1285 assert (!op->flag [FLAG_FREED]); 1273 if (op->is_on_map ())
1274 {
1275 LOG (llevError, "insert_ob_in_map called for object already on map");
1276 abort ();
1277 }
1286 1278
1279 if (op->env)
1280 {
1281 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1287 op->remove (); 1282 op->remove ();
1283 }
1284
1285 if (op->face && !face_info (op->face))//D TODO: remove soon
1286 {//D
1287 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1288 op->face = 1;//D
1289 }//D
1288 1290
1289 /* Ideally, the caller figures this out. However, it complicates a lot 1291 /* Ideally, the caller figures this out. However, it complicates a lot
1290 * of areas of callers (eg, anything that uses find_free_spot would now 1292 * of areas of callers (eg, anything that uses find_free_spot would now
1291 * need extra work 1293 * need extra work
1292 */ 1294 */
1309 */ 1311 */
1310 if (op->nrof && !(flag & INS_NO_MERGE)) 1312 if (op->nrof && !(flag & INS_NO_MERGE))
1311 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1313 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1312 if (object::can_merge (op, tmp)) 1314 if (object::can_merge (op, tmp))
1313 { 1315 {
1314 // TODO: we atcually want to update tmp, not op, 1316 // TODO: we actually want to update tmp, not op,
1315 // but some caller surely breaks when we return tmp 1317 // but some caller surely breaks when we return tmp
1316 // from here :/ 1318 // from here :/
1317 op->nrof += tmp->nrof; 1319 op->nrof += tmp->nrof;
1318 tmp->destroy (1); 1320 tmp->destroy (1);
1319 } 1321 }
1330 { 1332 {
1331 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1333 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1332 abort (); 1334 abort ();
1333 } 1335 }
1334 1336
1337 if (!originator->is_on_map ())
1338 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1339 op->debug_desc (), originator->debug_desc ());
1340
1335 op->above = originator; 1341 op->above = originator;
1336 op->below = originator->below; 1342 op->below = originator->below;
1337
1338 if (op->below)
1339 op->below->above = op;
1340 else
1341 ms.bot = op;
1342
1343 /* since *below* originator, no need to update top */
1344 originator->below = op; 1343 originator->below = op;
1344
1345 *(op->below ? &op->below->above : &ms.bot) = op;
1345 } 1346 }
1346 else 1347 else
1347 { 1348 {
1348 object *top, *floor = NULL; 1349 object *floor = 0;
1349 1350 object *top = ms.top;
1350 top = ms.bot;
1351 1351
1352 /* If there are other objects, then */ 1352 /* If there are other objects, then */
1353 if (top) 1353 if (top)
1354 { 1354 {
1355 object *last = 0;
1356
1357 /* 1355 /*
1358 * If there are multiple objects on this space, we do some trickier handling. 1356 * If there are multiple objects on this space, we do some trickier handling.
1359 * We've already dealt with merging if appropriate. 1357 * We've already dealt with merging if appropriate.
1360 * Generally, we want to put the new object on top. But if 1358 * Generally, we want to put the new object on top. But if
1361 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1359 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1364 * once we get to them. This reduces the need to traverse over all of 1362 * once we get to them. This reduces the need to traverse over all of
1365 * them when adding another one - this saves quite a bit of cpu time 1363 * them when adding another one - this saves quite a bit of cpu time
1366 * when lots of spells are cast in one area. Currently, it is presumed 1364 * when lots of spells are cast in one area. Currently, it is presumed
1367 * that flying non pickable objects are spell objects. 1365 * that flying non pickable objects are spell objects.
1368 */ 1366 */
1369 for (top = ms.bot; top; top = top->above) 1367 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370 { 1368 {
1371 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1369 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1372 floor = top; 1370 floor = tmp;
1373 1371
1374 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1372 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1375 { 1373 {
1376 /* We insert above top, so we want this object below this */ 1374 /* We insert above top, so we want this object below this */
1377 top = top->below; 1375 top = tmp->below;
1378 break; 1376 break;
1379 } 1377 }
1380 1378
1381 last = top; 1379 top = tmp;
1382 } 1380 }
1383
1384 /* Don't want top to be NULL, so set it to the last valid object */
1385 top = last;
1386 1381
1387 /* We let update_position deal with figuring out what the space 1382 /* We let update_position deal with figuring out what the space
1388 * looks like instead of lots of conditions here. 1383 * looks like instead of lots of conditions here.
1389 * makes things faster, and effectively the same result. 1384 * makes things faster, and effectively the same result.
1390 */ 1385 */
1397 */ 1392 */
1398 if (!(flag & INS_ON_TOP) 1393 if (!(flag & INS_ON_TOP)
1399 && ms.flags () & P_BLOCKSVIEW 1394 && ms.flags () & P_BLOCKSVIEW
1400 && (op->face && !faces [op->face].visibility)) 1395 && (op->face && !faces [op->face].visibility))
1401 { 1396 {
1397 object *last;
1398
1402 for (last = top; last != floor; last = last->below) 1399 for (last = top; last != floor; last = last->below)
1403 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1400 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404 break; 1401 break;
1405 1402
1406 /* Check to see if we found the object that blocks view, 1403 /* Check to see if we found the object that blocks view,
1414 } /* If objects on this space */ 1411 } /* If objects on this space */
1415 1412
1416 if (flag & INS_ABOVE_FLOOR_ONLY) 1413 if (flag & INS_ABOVE_FLOOR_ONLY)
1417 top = floor; 1414 top = floor;
1418 1415
1419 /* Top is the object that our object (op) is going to get inserted above. 1416 // insert object above top, or bottom-most if top = 0
1420 */
1421
1422 /* First object on this space */
1423 if (!top) 1417 if (!top)
1424 { 1418 {
1419 op->below = 0;
1425 op->above = ms.bot; 1420 op->above = ms.bot;
1426
1427 if (op->above)
1428 op->above->below = op;
1429
1430 op->below = 0;
1431 ms.bot = op; 1421 ms.bot = op;
1422
1423 *(op->above ? &op->above->below : &ms.top) = op;
1432 } 1424 }
1433 else 1425 else
1434 { /* get inserted into the stack above top */ 1426 {
1435 op->above = top->above; 1427 op->above = top->above;
1436
1437 if (op->above)
1438 op->above->below = op; 1428 top->above = op;
1439 1429
1440 op->below = top; 1430 op->below = top;
1441 top->above = op; 1431 *(op->above ? &op->above->below : &ms.top) = op;
1442 } 1432 }
1443 1433 }
1444 if (!op->above)
1445 ms.top = op;
1446 } /* else not INS_BELOW_ORIGINATOR */
1447 1434
1448 if (op->type == PLAYER) 1435 if (op->type == PLAYER)
1449 { 1436 {
1450 op->contr->do_los = 1; 1437 op->contr->do_los = 1;
1451 ++op->map->players; 1438 ++op->map->players;
1547 if (!nr) 1534 if (!nr)
1548 return true; 1535 return true;
1549 1536
1550 nr = min (nr, nrof); 1537 nr = min (nr, nrof);
1551 1538
1539 if (nrof > nr)
1540 {
1552 nrof -= nr; 1541 nrof -= nr;
1553
1554 if (nrof)
1555 {
1556 adjust_weight (env, -weight * nr); // carrying == 0 1542 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1557 1543
1558 if (object *pl = visible_to ()) 1544 if (object *pl = visible_to ())
1559 esrv_update_item (UPD_NROF, pl, this); 1545 esrv_update_item (UPD_NROF, pl, this);
1560 1546
1561 return true; 1547 return true;
1562 } 1548 }
1563 else 1549 else
1564 { 1550 {
1565 destroy (1); 1551 destroy ();
1566 return false; 1552 return false;
1567 } 1553 }
1568} 1554}
1569 1555
1570/* 1556/*
2446{ 2432{
2447 char flagdesc[512]; 2433 char flagdesc[512];
2448 char info2[256 * 4]; 2434 char info2[256 * 4];
2449 char *p = info; 2435 char *p = info;
2450 2436
2451 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2437 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2452 count, 2438 count,
2453 uuid.c_str (), 2439 uuid.c_str (),
2454 &name, 2440 &name,
2455 title ? "\",title:\"" : "", 2441 title ? ",title:\"" : "",
2456 title ? (const char *)title : "", 2442 title ? (const char *)title : "",
2443 title ? "\"" : "",
2457 flag_desc (flagdesc, 512), type); 2444 flag_desc (flagdesc, 512), type);
2458 2445
2459 if (!flag[FLAG_REMOVED] && env) 2446 if (!flag[FLAG_REMOVED] && env)
2460 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2447 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2461 2448

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines