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

Diff Legend

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