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.292 by root, Mon Oct 19 21:48:49 2009 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 2009 UTC

… …
38uint32_t mapspace::smellcount = 10000; 38uint32_t mapspace::smellcount = 10000;
39 39
40objectvec objects; 40objectvec objects;
41activevec actives; 41activevec actives;
42 42
43//+GPL
44
43short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
44 0, 46 0,
45 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
46 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
… …
50 0, 52 0,
51 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
52 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
53 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
54}; 56};
55int maxfree[SIZEOFFREE] = {
56 0,
57 9, 10, 13, 14, 17, 18, 21, 22,
58 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
59 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
60};
61int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
62 0, 58 0,
63 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
64 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
65 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 61 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
62};
63
64static int maxfree[SIZEOFFREE] = {
65 0,
66 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
66}; 69};
67 70
68static void 71static void
69write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
70{ 73{
… …
439{ 442{
440 return dump_object (this); 443 return dump_object (this);
441} 444}
442 445
443/* 446/*
444 * get_nearest_part(multi-object, object 2) returns the part of the
445 * multi-object 1 which is closest to the second object.
446 * If it's not a multi-object, it is returned.
447 */
448object *
449get_nearest_part (object *op, const object *pl)
450{
451 object *tmp, *closest;
452 int last_dist, i;
453
454 if (!op->more)
455 return op;
456
457 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
458 tmp;
459 tmp = tmp->more)
460 if ((i = distance (tmp, pl)) < last_dist)
461 closest = tmp, last_dist = i;
462
463 return closest;
464}
465
466/*
467 * Returns the object which has the count-variable equal to the argument. 447 * Returns the object which has the count-variable equal to the argument.
468 * VERRRY slow. 448 * VERRRY slow.
469 */ 449 */
470object * 450object *
471find_object (tag_t i) 451find_object (tag_t i)
… …
1041 * the previous environment. 1021 * the previous environment.
1042 */ 1022 */
1043void 1023void
1044object::do_remove () 1024object::do_remove ()
1045{ 1025{
1046 object *tmp, *last = 0;
1047 object *otmp;
1048
1049 if (flag [FLAG_REMOVED]) 1026 if (flag [FLAG_REMOVED])
1050 return; 1027 return;
1051 1028
1052 INVOKE_OBJECT (REMOVE, this); 1029 INVOKE_OBJECT (REMOVE, this);
1053 1030
… …
1159 //TODO: update floorbox to preserve ordering 1136 //TODO: update floorbox to preserve ordering
1160 if (pl->contr->ns) 1137 if (pl->contr->ns)
1161 pl->contr->ns->floorbox_update (); 1138 pl->contr->ns->floorbox_update ();
1162 } 1139 }
1163 1140
1141 if (check_walk_off)
1164 for (tmp = ms.bot; tmp; tmp = tmp->above) 1142 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1165 { 1143 {
1144 above = tmp->above;
1145
1166 /* No point updating the players look faces if he is the object 1146 /* No point updating the players look faces if he is the object
1167 * being removed. 1147 * being removed.
1168 */ 1148 */
1169 1149
1170 /* See if object moving off should effect something */ 1150 /* See if object moving off should effect something */
1171 if (check_walk_off
1172 && ((move_type & tmp->move_off) 1151 if ((move_type & tmp->move_off)
1173 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1152 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1174 {
1175 move_apply (tmp, this, 0); 1153 move_apply (tmp, this, 0);
1176
1177 if (destroyed ())
1178 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1179 } 1154 }
1180
1181 last = tmp;
1182 }
1183 1155
1184 if (affects_los ()) 1156 if (affects_los ())
1185 update_all_los (map, x, y); 1157 update_all_los (map, x, y);
1186 } 1158 }
1187} 1159}
… …
2179 * This basically means that if direction is 15, then it could either go 2151 * This basically means that if direction is 15, then it could either go
2180 * direction 4, 14, or 16 to get back to where we are. 2152 * direction 4, 14, or 16 to get back to where we are.
2181 * Moved from spell_util.c to object.c with the other related direction 2153 * Moved from spell_util.c to object.c with the other related direction
2182 * functions. 2154 * functions.
2183 */ 2155 */
2184const int reduction_dir[SIZEOFFREE][3] = { 2156static const int reduction_dir[SIZEOFFREE][3] = {
2185 {0, 0, 0}, /* 0 */ 2157 {0, 0, 0}, /* 0 */
2186 {0, 0, 0}, /* 1 */ 2158 {0, 0, 0}, /* 1 */
2187 {0, 0, 0}, /* 2 */ 2159 {0, 0, 0}, /* 2 */
2188 {0, 0, 0}, /* 3 */ 2160 {0, 0, 0}, /* 3 */
2189 {0, 0, 0}, /* 4 */ 2161 {0, 0, 0}, /* 4 */
… …
2548 return splay (tmp); 2520 return splay (tmp);
2549 2521
2550 return 0; 2522 return 0;
2551} 2523}
2552 2524
2525//-GPL
2526
2553void 2527void
2554object::force_set_timer (int duration) 2528object::force_set_timer (int duration)
2555{ 2529{
2556 this->duration = 1; 2530 this->duration = 1;
2557 this->speed_left = -1.f; 2531 this->speed_left = -1.f;
… …
2566 force->destroy (); 2540 force->destroy ();
2567 2541
2568 object *force = get_archetype (FORCE_NAME); 2542 object *force = get_archetype (FORCE_NAME);
2569 2543
2570 force->slaying = name; 2544 force->slaying = name;
2571
2572 force->force_set_timer (duration); 2545 force->force_set_timer (duration);
2573
2574 force->flag [FLAG_APPLIED] = true; 2546 force->flag [FLAG_APPLIED] = true;
2575 2547
2576 return insert (force); 2548 return insert (force);
2577} 2549}
2578 2550
2579void 2551void

Diff Legend

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