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.67 by root, Thu Dec 14 04:30:32 2006 UTC vs.
Revision 1.81 by root, Sat Dec 23 13:56:25 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
… …
219 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
220 222
221 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
222 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
223 225
224 226 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
226 * being locked in inventory should prevent merging.
227 * 0x4 in flags3 is CLIENT_SENT
228 */
229 if ((ob1->arch != ob2->arch) ||
230 (ob1->flags[0] != ob2->flags[0]) ||
231 (ob1->flags[1] != ob2->flags[1]) ||
232 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
235 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
236 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
237 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
238 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
241 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
242 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
243 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
244 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
245 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
246 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
247 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
248 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
249 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
250 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
251 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
252 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
253 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
254 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
255 return 0; 251 return 0;
256 252
257 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
258 * check all objects in the inventory. 254 * check all objects in the inventory.
259 */ 255 */
… …
352object * 348object *
353object_get_env_recursive (object *op) 349object_get_env_recursive (object *op)
354{ 350{
355 while (op->env != NULL) 351 while (op->env != NULL)
356 op = op->env; 352 op = op->env;
357 return op;
358}
359
360/*
361 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
362 * a better check. We basically keeping traversing up until we can't
363 * or find a player.
364 */
365
366object *
367is_player_inv (object *op)
368{
369 for (; op != NULL && op->type != PLAYER; op = op->env)
370 if (op->env == op)
371 op->env = NULL;
372 return op; 353 return op;
373} 354}
374 355
375/* 356/*
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
… …
486 } 467 }
487 468
488 op->key_values = 0; 469 op->key_values = 0;
489} 470}
490 471
491void object::clear ()
492{
493 attachable_base::clear ();
494
495 free_key_values (this);
496
497 owner = 0;
498 name = 0;
499 name_pl = 0;
500 title = 0;
501 race = 0;
502 slaying = 0;
503 skill = 0;
504 msg = 0;
505 lore = 0;
506 custom_name = 0;
507 materialname = 0;
508 contr = 0;
509 below = 0;
510 above = 0;
511 inv = 0;
512 container = 0;
513 env = 0;
514 more = 0;
515 head = 0;
516 map = 0;
517 active_next = 0;
518 active_prev = 0;
519
520 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
521
522 SET_FLAG (this, FLAG_REMOVED);
523
524 /* What is not cleared is next, prev, and count */
525
526 expmul = 1.0;
527 face = blank_face;
528
529 if (settings.casting_time)
530 casting_time = -1;
531}
532
533/* 472/*
534 * copy_to first frees everything allocated by the dst object, 473 * copy_to first frees everything allocated by the dst object,
535 * and then copies the contents of itself into the second 474 * and then copies the contents of itself into the second
536 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
537 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
… …
543{ 482{
544 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
545 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
546 485
547 *(object_copy *)dst = *this; 486 *(object_copy *)dst = *this;
548 *(object_pod *)dst = *this;
549 487
550 if (self || cb) 488 if (self || cb)
551 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 489 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
552 490
553 if (is_freed) 491 if (is_freed)
… …
713 op->active_next = NULL; 651 op->active_next = NULL;
714 op->active_prev = NULL; 652 op->active_prev = NULL;
715} 653}
716 654
717/* 655/*
718 * update_object() updates the array which represents the map. 656 * update_object() updates the the map.
719 * It takes into account invisible objects (and represent squares covered 657 * It takes into account invisible objects (and represent squares covered
720 * by invisible objects by whatever is below them (unless it's another 658 * by invisible objects by whatever is below them (unless it's another
721 * invisible object, etc...) 659 * invisible object, etc...)
722 * If the object being updated is beneath a player, the look-window 660 * If the object being updated is beneath a player, the look-window
723 * of that player is updated (this might be a suboptimal way of 661 * of that player is updated (this might be a suboptimal way of
724 * updating that window, though, since update_object() is called _often_) 662 * updating that window, though, since update_object() is called _often_)
725 * 663 *
726 * action is a hint of what the caller believes need to be done. 664 * action is a hint of what the caller believes need to be done.
727 * For example, if the only thing that has changed is the face (due to
728 * an animation), we don't need to call update_position until that actually
729 * comes into view of a player. OTOH, many other things, like addition/removal
730 * of walls or living creatures may need us to update the flags now.
731 * current action are: 665 * current action are:
732 * UP_OBJ_INSERT: op was inserted 666 * UP_OBJ_INSERT: op was inserted
733 * UP_OBJ_REMOVE: op was removed 667 * UP_OBJ_REMOVE: op was removed
734 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 668 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
735 * as that is easier than trying to look at what may have changed. 669 * as that is easier than trying to look at what may have changed.
736 * UP_OBJ_FACE: only the objects face has changed. 670 * UP_OBJ_FACE: only the objects face has changed.
737 */ 671 */
738
739void 672void
740update_object (object *op, int action) 673update_object (object *op, int action)
741{ 674{
742 int update_now = 0, flags;
743 MoveType move_on, move_off, move_block, move_slow; 675 MoveType move_on, move_off, move_block, move_slow;
744 676
745 if (op == NULL) 677 if (op == NULL)
746 { 678 {
747 /* this should never happen */ 679 /* this should never happen */
748 LOG (llevDebug, "update_object() called for NULL object.\n"); 680 LOG (llevDebug, "update_object() called for NULL object.\n");
749 return; 681 return;
750 } 682 }
751 683
752 if (op->env != NULL) 684 if (op->env)
753 { 685 {
754 /* Animation is currently handled by client, so nothing 686 /* Animation is currently handled by client, so nothing
755 * to do in this case. 687 * to do in this case.
756 */ 688 */
757 return; 689 return;
… …
771 abort (); 703 abort ();
772#endif 704#endif
773 return; 705 return;
774 } 706 }
775 707
776 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 708 mapspace &m = op->ms ();
777 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
778 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
779 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
780 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
781 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
782 709
710 if (m.flags_ & P_NEED_UPDATE)
711 /* nop */;
783 if (action == UP_OBJ_INSERT) 712 else if (action == UP_OBJ_INSERT)
784 { 713 {
714 // this is likely overkill, TODO: revisit (schmorp)
785 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 715 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
786 update_now = 1;
787
788 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 716 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
789 update_now = 1; 717 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
790 718 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
719 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
791 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 720 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
792 update_now = 1;
793
794 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
795 update_now = 1;
796
797 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
798 update_now = 1;
799
800 if ((move_on | op->move_on) != move_on) 721 || (m.move_on | op->move_on ) != m.move_on
801 update_now = 1;
802
803 if ((move_off | op->move_off) != move_off) 722 || (m.move_off | op->move_off ) != m.move_off
804 update_now = 1; 723 || (m.move_slow | op->move_slow) != m.move_slow
805
806 /* This isn't perfect, but I don't expect a lot of objects to 724 /* This isn't perfect, but I don't expect a lot of objects to
807 * to have move_allow right now. 725 * to have move_allow right now.
808 */ 726 */
809 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 727 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
810 update_now = 1; 728 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
811 729 m.flags_ = P_NEED_UPDATE;
812 if ((move_slow | op->move_slow) != move_slow)
813 update_now = 1;
814 } 730 }
815
816 /* if the object is being removed, we can't make intelligent 731 /* if the object is being removed, we can't make intelligent
817 * decisions, because remove_ob can't really pass the object 732 * decisions, because remove_ob can't really pass the object
818 * that is being removed. 733 * that is being removed.
819 */ 734 */
820 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 735 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
821 update_now = 1; 736 m.flags_ = P_NEED_UPDATE;
822 else if (action == UP_OBJ_FACE) 737 else if (action == UP_OBJ_FACE)
823 /* Nothing to do for that case */ ; 738 /* Nothing to do for that case */ ;
824 else 739 else
825 LOG (llevError, "update_object called with invalid action: %d\n", action); 740 LOG (llevError, "update_object called with invalid action: %d\n", action);
826 741
827 if (update_now)
828 {
829 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
830 update_position (op->map, op->x, op->y);
831 }
832
833 if (op->more != NULL) 742 if (op->more)
834 update_object (op->more, action); 743 update_object (op->more, action);
835} 744}
836 745
837object::vector object::mortals; 746object::vector object::mortals;
838object::vector object::objects; // not yet used 747object::vector object::objects; // not yet used
… …
1059 968
1060 /* NO_FIX_PLAYER is set when a great many changes are being 969 /* NO_FIX_PLAYER is set when a great many changes are being
1061 * made to players inventory. If set, avoiding the call 970 * made to players inventory. If set, avoiding the call
1062 * to save cpu time. 971 * to save cpu time.
1063 */ 972 */
1064 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 973 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1065 fix_player (otmp); 974 otmp->update_stats ();
1066 975
1067 if (above != NULL) 976 if (above != NULL)
1068 above->below = below; 977 above->below = below;
1069 else 978 else
1070 env->inv = below; 979 env->inv = below;
… …
1089 998
1090 /* link the object above us */ 999 /* link the object above us */
1091 if (above) 1000 if (above)
1092 above->below = below; 1001 above->below = below;
1093 else 1002 else
1094 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ 1003 map->at (x, y).top = below; /* we were top, set new top */
1095 1004
1096 /* Relink the object below us, if there is one */ 1005 /* Relink the object below us, if there is one */
1097 if (below) 1006 if (below)
1098 below->above = above; 1007 below->above = above;
1099 else 1008 else
… …
1111 dump = dump_object (GET_MAP_OB (map, x, y)); 1020 dump = dump_object (GET_MAP_OB (map, x, y));
1112 LOG (llevError, "%s\n", dump); 1021 LOG (llevError, "%s\n", dump);
1113 free (dump); 1022 free (dump);
1114 } 1023 }
1115 1024
1116 SET_MAP_OB (map, x, y, above); /* goes on above it. */ 1025 map->at (x, y).bottom = above; /* goes on above it. */
1117 } 1026 }
1118 1027
1119 above = 0; 1028 above = 0;
1120 below = 0; 1029 below = 0;
1121 1030
… …
1140 { 1049 {
1141 CLEAR_FLAG (this, FLAG_APPLIED); 1050 CLEAR_FLAG (this, FLAG_APPLIED);
1142 tmp->container = 0; 1051 tmp->container = 0;
1143 } 1052 }
1144 1053
1145 tmp->contr->socket->update_look = 1; 1054 tmp->contr->ns->floorbox_update ();
1146 } 1055 }
1147 1056
1148 /* See if player moving off should effect something */ 1057 /* See if player moving off should effect something */
1149 if (check_walk_off 1058 if (check_walk_off
1150 && ((move_type & tmp->move_off) 1059 && ((move_type & tmp->move_off)
… …
1164 last = tmp; 1073 last = tmp;
1165 } 1074 }
1166 1075
1167 /* last == NULL of there are no objects on this space */ 1076 /* last == NULL of there are no objects on this space */
1168 if (!last) 1077 if (!last)
1169 { 1078 map->at (x, y).flags_ = P_NEED_UPDATE;
1170 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1171 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1172 * those out anyways, and if there are any flags set right now, they won't
1173 * be correct anyways.
1174 */
1175 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1176 update_position (map, x, y);
1177 }
1178 else 1079 else
1179 update_object (last, UP_OBJ_REMOVE); 1080 update_object (last, UP_OBJ_REMOVE);
1180 1081
1181 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1082 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1182 update_all_los (map, x, y); 1083 update_all_los (map, x, y);
… …
1372 op->below = originator->below; 1273 op->below = originator->below;
1373 1274
1374 if (op->below) 1275 if (op->below)
1375 op->below->above = op; 1276 op->below->above = op;
1376 else 1277 else
1377 SET_MAP_OB (op->map, op->x, op->y, op); 1278 op->ms ().bottom = op;
1378 1279
1379 /* since *below* originator, no need to update top */ 1280 /* since *below* originator, no need to update top */
1380 originator->below = op; 1281 originator->below = op;
1381 } 1282 }
1382 else 1283 else
… …
1428 * If INS_ON_TOP is used, don't do this processing 1329 * If INS_ON_TOP is used, don't do this processing
1429 * Need to find the object that in fact blocks view, otherwise 1330 * Need to find the object that in fact blocks view, otherwise
1430 * stacking is a bit odd. 1331 * stacking is a bit odd.
1431 */ 1332 */
1432 if (!(flag & INS_ON_TOP) && 1333 if (!(flag & INS_ON_TOP) &&
1433 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1334 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1434 { 1335 {
1435 for (last = top; last != floor; last = last->below) 1336 for (last = top; last != floor; last = last->below)
1436 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1337 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1437 break; 1338 break;
1438 /* Check to see if we found the object that blocks view, 1339 /* Check to see if we found the object that blocks view,
… …
1461 1362
1462 if (op->above) 1363 if (op->above)
1463 op->above->below = op; 1364 op->above->below = op;
1464 1365
1465 op->below = NULL; 1366 op->below = NULL;
1466 SET_MAP_OB (op->map, op->x, op->y, op); 1367 op->ms ().bottom = op;
1467 } 1368 }
1468 else 1369 else
1469 { /* get inserted into the stack above top */ 1370 { /* get inserted into the stack above top */
1470 op->above = top->above; 1371 op->above = top->above;
1471 1372
… …
1475 op->below = top; 1376 op->below = top;
1476 top->above = op; 1377 top->above = op;
1477 } 1378 }
1478 1379
1479 if (op->above == NULL) 1380 if (op->above == NULL)
1480 SET_MAP_TOP (op->map, op->x, op->y, op); 1381 op->ms ().top = op;
1481 } /* else not INS_BELOW_ORIGINATOR */ 1382 } /* else not INS_BELOW_ORIGINATOR */
1482 1383
1483 if (op->type == PLAYER) 1384 if (op->type == PLAYER)
1484 op->contr->do_los = 1; 1385 op->contr->do_los = 1;
1485 1386
1486 /* If we have a floor, we know the player, if any, will be above 1387 /* If we have a floor, we know the player, if any, will be above
1487 * it, so save a few ticks and start from there. 1388 * it, so save a few ticks and start from there.
1488 */ 1389 */
1489 if (!(flag & INS_MAP_LOAD)) 1390 if (!(flag & INS_MAP_LOAD))
1490 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1391 if (object *pl = op->ms ().player ())
1491 if (tmp->type == PLAYER) 1392 pl->contr->ns->floorbox_update ();
1492 tmp->contr->socket->update_look = 1;
1493 1393
1494 /* If this object glows, it may affect lighting conditions that are 1394 /* If this object glows, it may affect lighting conditions that are
1495 * visible to others on this map. But update_all_los is really 1395 * visible to others on this map. But update_all_los is really
1496 * an inefficient way to do this, as it means los for all players 1396 * an inefficient way to do this, as it means los for all players
1497 * on the map will get recalculated. The players could very well 1397 * on the map will get recalculated. The players could very well
… …
1505 1405
1506 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1406 /* updates flags (blocked, alive, no magic, etc) for this map space */
1507 update_object (op, UP_OBJ_INSERT); 1407 update_object (op, UP_OBJ_INSERT);
1508 1408
1509 /* Don't know if moving this to the end will break anything. However, 1409 /* Don't know if moving this to the end will break anything. However,
1510 * we want to have update_look set above before calling this. 1410 * we want to have floorbox_update called before calling this.
1511 * 1411 *
1512 * check_move_on() must be after this because code called from 1412 * check_move_on() must be after this because code called from
1513 * check_move_on() depends on correct map flags (so functions like 1413 * check_move_on() depends on correct map flags (so functions like
1514 * blocked() and wall() work properly), and these flags are updated by 1414 * blocked() and wall() work properly), and these flags are updated by
1515 * update_object(). 1415 * update_object().
… …
1531 1431
1532 return op; 1432 return op;
1533} 1433}
1534 1434
1535/* this function inserts an object in the map, but if it 1435/* this function inserts an object in the map, but if it
1536 * finds an object of its own type, it'll remove that one first. 1436 * finds an object of its own type, it'll remove that one first.
1537 * op is the object to insert it under: supplies x and the map. 1437 * op is the object to insert it under: supplies x and the map.
1538 */ 1438 */
1539void 1439void
1540replace_insert_ob_in_map (const char *arch_string, object *op) 1440replace_insert_ob_in_map (const char *arch_string, object *op)
1541{ 1441{
1542 object * 1442 object *tmp, *tmp1;
1543 tmp;
1544 object *
1545 tmp1;
1546 1443
1547 /* first search for itself and remove any old instances */ 1444 /* first search for itself and remove any old instances */
1548 1445
1549 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1446 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1550 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1447 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
… …
1608 1505
1609object * 1506object *
1610decrease_ob_nr (object *op, uint32 i) 1507decrease_ob_nr (object *op, uint32 i)
1611{ 1508{
1612 object *tmp; 1509 object *tmp;
1613 player *pl;
1614 1510
1615 if (i == 0) /* objects with op->nrof require this check */ 1511 if (i == 0) /* objects with op->nrof require this check */
1616 return op; 1512 return op;
1617 1513
1618 if (i > op->nrof) 1514 if (i > op->nrof)
1619 i = op->nrof; 1515 i = op->nrof;
1620 1516
1621 if (QUERY_FLAG (op, FLAG_REMOVED)) 1517 if (QUERY_FLAG (op, FLAG_REMOVED))
1622 op->nrof -= i; 1518 op->nrof -= i;
1623 else if (op->env != NULL) 1519 else if (op->env)
1624 { 1520 {
1625 /* is this object in the players inventory, or sub container 1521 /* is this object in the players inventory, or sub container
1626 * therein? 1522 * therein?
1627 */ 1523 */
1628 tmp = is_player_inv (op->env); 1524 tmp = op->in_player ();
1629 /* nope. Is this a container the player has opened? 1525 /* nope. Is this a container the player has opened?
1630 * If so, set tmp to that player. 1526 * If so, set tmp to that player.
1631 * IMO, searching through all the players will mostly 1527 * IMO, searching through all the players will mostly
1632 * likely be quicker than following op->env to the map, 1528 * likely be quicker than following op->env to the map,
1633 * and then searching the map for a player. 1529 * and then searching the map for a player.
1634 */ 1530 */
1635 if (!tmp) 1531 if (!tmp)
1636 { 1532 for_all_players (pl)
1637 for (pl = first_player; pl; pl = pl->next)
1638 if (pl->ob->container == op->env) 1533 if (pl->ob->container == op->env)
1534 {
1535 tmp = pl->ob;
1639 break; 1536 break;
1640 if (pl)
1641 tmp = pl->ob;
1642 else
1643 tmp = NULL;
1644 } 1537 }
1645 1538
1646 if (i < op->nrof) 1539 if (i < op->nrof)
1647 { 1540 {
1648 sub_weight (op->env, op->weight * i); 1541 sub_weight (op->env, op->weight * i);
1649 op->nrof -= i; 1542 op->nrof -= i;
1650 if (tmp) 1543 if (tmp)
1651 {
1652 esrv_send_item (tmp, op); 1544 esrv_send_item (tmp, op);
1653 }
1654 } 1545 }
1655 else 1546 else
1656 { 1547 {
1657 op->remove (); 1548 op->remove ();
1658 op->nrof = 0; 1549 op->nrof = 0;
1659 if (tmp) 1550 if (tmp)
1660 {
1661 esrv_del_item (tmp->contr, op->count); 1551 esrv_del_item (tmp->contr, op->count);
1662 }
1663 } 1552 }
1664 } 1553 }
1665 else 1554 else
1666 { 1555 {
1667 object *above = op->above; 1556 object *above = op->above;
… …
1673 op->remove (); 1562 op->remove ();
1674 op->nrof = 0; 1563 op->nrof = 0;
1675 } 1564 }
1676 1565
1677 /* Since we just removed op, op->above is null */ 1566 /* Since we just removed op, op->above is null */
1678 for (tmp = above; tmp != NULL; tmp = tmp->above) 1567 for (tmp = above; tmp; tmp = tmp->above)
1679 if (tmp->type == PLAYER) 1568 if (tmp->type == PLAYER)
1680 { 1569 {
1681 if (op->nrof) 1570 if (op->nrof)
1682 esrv_send_item (tmp, op); 1571 esrv_send_item (tmp, op);
1683 else 1572 else
… …
1688 if (op->nrof) 1577 if (op->nrof)
1689 return op; 1578 return op;
1690 else 1579 else
1691 { 1580 {
1692 op->destroy (); 1581 op->destroy ();
1693 return NULL; 1582 return 0;
1694 } 1583 }
1695} 1584}
1696 1585
1697/* 1586/*
1698 * add_weight(object, weight) adds the specified weight to an object, 1587 * add_weight(object, weight) adds the specified weight to an object,
… …
1786 add_weight (this, op->weight * op->nrof); 1675 add_weight (this, op->weight * op->nrof);
1787 } 1676 }
1788 else 1677 else
1789 add_weight (this, (op->weight + op->carrying)); 1678 add_weight (this, (op->weight + op->carrying));
1790 1679
1791 otmp = is_player_inv (this); 1680 otmp = this->in_player ();
1792 if (otmp && otmp->contr) 1681 if (otmp && otmp->contr)
1793 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1682 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1794 fix_player (otmp); 1683 otmp->update_stats ();
1795 1684
1796 op->map = NULL; 1685 op->map = 0;
1797 op->env = this; 1686 op->env = this;
1798 op->above = NULL; 1687 op->above = 0;
1799 op->below = NULL; 1688 op->below = 0;
1800 op->x = 0, op->y = 0; 1689 op->x = 0, op->y = 0;
1801 1690
1802 /* reset the light list and los of the players on the map */ 1691 /* reset the light list and los of the players on the map */
1803 if ((op->glow_radius != 0) && map) 1692 if ((op->glow_radius != 0) && map)
1804 { 1693 {
… …
2141 * if the space being examined only has a wall to the north and empty 2030 * if the space being examined only has a wall to the north and empty
2142 * spaces in all the other directions, this will reduce the search space 2031 * spaces in all the other directions, this will reduce the search space
2143 * to only the spaces immediately surrounding the target area, and 2032 * to only the spaces immediately surrounding the target area, and
2144 * won't look 2 spaces south of the target space. 2033 * won't look 2 spaces south of the target space.
2145 */ 2034 */
2146 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2035 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2147 stop = maxfree[i]; 2036 stop = maxfree[i];
2148 } 2037 }
2038
2149 if (!index) 2039 if (!index)
2150 return -1; 2040 return -1;
2041
2151 return altern[RANDOM () % index]; 2042 return altern[RANDOM () % index];
2152} 2043}
2153 2044
2154/* 2045/*
2155 * find_first_free_spot(archetype, maptile, x, y) works like 2046 * find_first_free_spot(archetype, maptile, x, y) works like
… …
2263 mp = m; 2154 mp = m;
2264 nx = x + freearr_x[i]; 2155 nx = x + freearr_x[i];
2265 ny = y + freearr_y[i]; 2156 ny = y + freearr_y[i];
2266 2157
2267 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2158 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2159
2268 if (mflags & P_OUT_OF_MAP) 2160 if (mflags & P_OUT_OF_MAP)
2269 {
2270 max = maxfree[i]; 2161 max = maxfree[i];
2271 }
2272 else 2162 else
2273 { 2163 {
2274 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2164 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2275 2165
2276 if ((move_type & blocked) == move_type) 2166 if ((move_type & blocked) == move_type)
2277 {
2278 max = maxfree[i]; 2167 max = maxfree[i];
2279 }
2280 else if (mflags & P_IS_ALIVE) 2168 else if (mflags & P_IS_ALIVE)
2281 { 2169 {
2282 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2170 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2283 {
2284 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2171 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2285 {
2286 break; 2172 break;
2287 } 2173
2288 }
2289 if (tmp) 2174 if (tmp)
2290 {
2291 return freedir[i]; 2175 return freedir[i];
2292 }
2293 } 2176 }
2294 } 2177 }
2295 } 2178 }
2179
2296 return 0; 2180 return 0;
2297} 2181}
2298 2182
2299/* 2183/*
2300 * distance(object 1, object 2) will return the square of the 2184 * distance(object 1, object 2) will return the square of the
… …
2302 */ 2186 */
2303 2187
2304int 2188int
2305distance (const object *ob1, const object *ob2) 2189distance (const object *ob1, const object *ob2)
2306{ 2190{
2307 int 2191 int i;
2308 i;
2309 2192
2310 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2193 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2311 return i; 2194 return i;
2312} 2195}
2313 2196
… …
2318 */ 2201 */
2319 2202
2320int 2203int
2321find_dir_2 (int x, int y) 2204find_dir_2 (int x, int y)
2322{ 2205{
2323 int 2206 int q;
2324 q;
2325 2207
2326 if (y) 2208 if (y)
2327 q = x * 100 / y; 2209 q = x * 100 / y;
2328 else if (x) 2210 else if (x)
2329 q = -300 * x; 2211 q = -300 * x;
… …
2455 * find a path to that monster that we found. If not, 2337 * find a path to that monster that we found. If not,
2456 * we don't bother going toward it. Returns 1 if we 2338 * we don't bother going toward it. Returns 1 if we
2457 * can see a direct way to get it 2339 * can see a direct way to get it
2458 * Modified to be map tile aware -.MSW 2340 * Modified to be map tile aware -.MSW
2459 */ 2341 */
2460
2461
2462int 2342int
2463can_see_monsterP (maptile *m, int x, int y, int dir) 2343can_see_monsterP (maptile *m, int x, int y, int dir)
2464{ 2344{
2465 sint16 dx, dy; 2345 sint16 dx, dy;
2466 int
2467 mflags; 2346 int mflags;
2468 2347
2469 if (dir < 0) 2348 if (dir < 0)
2470 return 0; /* exit condition: invalid direction */ 2349 return 0; /* exit condition: invalid direction */
2471 2350
2472 dx = x + freearr_x[dir]; 2351 dx = x + freearr_x[dir];
… …
2485 return 0; 2364 return 0;
2486 2365
2487 /* yes, can see. */ 2366 /* yes, can see. */
2488 if (dir < 9) 2367 if (dir < 9)
2489 return 1; 2368 return 1;
2369
2490 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2370 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2491 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2371 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2372 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2492} 2373}
2493
2494
2495 2374
2496/* 2375/*
2497 * can_pick(picker, item): finds out if an object is possible to be 2376 * can_pick(picker, item): finds out if an object is possible to be
2498 * picked up by the picker. Returnes 1 if it can be 2377 * picked up by the picker. Returnes 1 if it can be
2499 * picked up, otherwise 0. 2378 * picked up, otherwise 0.
… …
2510 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2389 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2511 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2390 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2512 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2391 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2513} 2392}
2514 2393
2515
2516/* 2394/*
2517 * create clone from object to another 2395 * create clone from object to another
2518 */ 2396 */
2519object * 2397object *
2520object_create_clone (object *asrc) 2398object_create_clone (object *asrc)
… …
2539 { 2417 {
2540 dst = tmp; 2418 dst = tmp;
2541 tmp->head = 0; 2419 tmp->head = 0;
2542 } 2420 }
2543 else 2421 else
2544 {
2545 tmp->head = dst; 2422 tmp->head = dst;
2546 }
2547 2423
2548 tmp->more = 0; 2424 tmp->more = 0;
2549 2425
2550 if (prev) 2426 if (prev)
2551 prev->more = tmp; 2427 prev->more = tmp;

Diff Legend

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