… | |
… | |
38 | uint32_t mapspace::smellcount = 10000; |
38 | uint32_t mapspace::smellcount = 10000; |
39 | |
39 | |
40 | objectvec objects; |
40 | objectvec objects; |
41 | activevec actives; |
41 | activevec actives; |
42 | |
42 | |
|
|
43 | //+GPL |
|
|
44 | |
43 | short freearr_x[SIZEOFFREE] = { |
45 | short 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 | }; |
55 | int 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 | }; |
|
|
61 | int freedir[SIZEOFFREE] = { |
57 | int 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 |
66 | }; |
62 | }; |
67 | |
63 | |
|
|
64 | static 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 |
|
|
69 | }; |
|
|
70 | |
68 | static void |
71 | static void |
69 | write_uuid (uval64 skip, bool sync) |
72 | write_uuid (uval64 skip, bool sync) |
70 | { |
73 | { |
71 | CALL_BEGIN (2); |
74 | CALL_BEGIN (2); |
72 | CALL_ARG_SV (newSVval64 (skip)); |
75 | CALL_ARG_SV (newSVval64 (skip)); |
… | |
… | |
74 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
77 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
75 | CALL_END; |
78 | CALL_END; |
76 | } |
79 | } |
77 | |
80 | |
78 | static void |
81 | static void |
79 | read_uuid (void) |
82 | read_uuid () |
80 | { |
83 | { |
81 | char filename[MAX_BUF]; |
84 | char filename[MAX_BUF]; |
82 | |
85 | |
83 | sprintf (filename, "%s/uuid", settings.localdir); |
86 | sprintf (filename, "%s/uuid", settings.localdir); |
84 | |
87 | |
… | |
… | |
98 | |
101 | |
99 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
102 | LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); |
100 | _exit (1); |
103 | _exit (1); |
101 | } |
104 | } |
102 | |
105 | |
103 | UUID::BUF buf; |
106 | char buf [UUID::MAX_LEN]; |
104 | buf[0] = 0; |
107 | buf[0] = 0; |
105 | fgets (buf, sizeof (buf), fp); |
108 | fgets (buf, sizeof (buf), fp); |
106 | |
109 | |
107 | if (!UUID::cur.parse (buf)) |
110 | if (!UUID::cur.parse (buf)) |
108 | { |
111 | { |
… | |
… | |
135 | |
138 | |
136 | void |
139 | void |
137 | UUID::init () |
140 | UUID::init () |
138 | { |
141 | { |
139 | read_uuid (); |
142 | read_uuid (); |
|
|
143 | } |
|
|
144 | |
|
|
145 | bool |
|
|
146 | UUID::parse (const char *s) |
|
|
147 | { |
|
|
148 | if (*s++ != '<' || *s++ != '1' || *s++ != '.') |
|
|
149 | return false; |
|
|
150 | |
|
|
151 | seq = 0; |
|
|
152 | |
|
|
153 | while (*s != '>') |
|
|
154 | { |
|
|
155 | if (*s < '0') |
|
|
156 | return false; |
|
|
157 | |
|
|
158 | // this gives nice branchless code with gcc |
|
|
159 | assert ('0' < 'a' && '0' == 48 && 'a' == 97); |
|
|
160 | int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15; |
|
|
161 | |
|
|
162 | seq = (seq << 4) | digit; |
|
|
163 | |
|
|
164 | ++s; |
|
|
165 | } |
|
|
166 | |
|
|
167 | return true; |
|
|
168 | } |
|
|
169 | |
|
|
170 | char * |
|
|
171 | UUID::append (char *buf) const |
|
|
172 | { |
|
|
173 | *buf++ = '<'; |
|
|
174 | *buf++ = '1'; |
|
|
175 | *buf++ = '.'; |
|
|
176 | |
|
|
177 | uint64_t seq = this->seq; |
|
|
178 | const int bits = 64; |
|
|
179 | char nz = 0; |
|
|
180 | static const char tohex [] = "0123456789abcdef"; |
|
|
181 | |
|
|
182 | // assert (len >= 3 + bits / 4 + 1 + 1); |
|
|
183 | for (int i = bits / 4; --i; ) |
|
|
184 | { |
|
|
185 | uint8_t digit = seq >> (bits - 4); |
|
|
186 | |
|
|
187 | *buf = tohex [digit]; |
|
|
188 | nz |= digit; |
|
|
189 | buf += nz ? 1 : 0; |
|
|
190 | seq <<= 4; |
|
|
191 | } |
|
|
192 | |
|
|
193 | // last digit is special - always emit |
|
|
194 | uint8_t digit = seq >> (bits - 4); |
|
|
195 | *buf++ = tohex [digit]; |
|
|
196 | |
|
|
197 | *buf++ = '>'; |
|
|
198 | |
|
|
199 | return buf; |
|
|
200 | } |
|
|
201 | |
|
|
202 | char * |
|
|
203 | UUID::c_str () const |
|
|
204 | { |
|
|
205 | static char buf [MAX_LEN]; |
|
|
206 | *append (buf) = 0; |
|
|
207 | return buf; |
140 | } |
208 | } |
141 | |
209 | |
142 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
210 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
143 | static bool |
211 | static bool |
144 | compare_ob_value_lists_one (const object *wants, const object *has) |
212 | compare_ob_value_lists_one (const object *wants, const object *has) |
… | |
… | |
183 | bool object::can_merge_slow (object *ob1, object *ob2) |
251 | bool object::can_merge_slow (object *ob1, object *ob2) |
184 | { |
252 | { |
185 | /* A couple quicksanity checks */ |
253 | /* A couple quicksanity checks */ |
186 | if (ob1 == ob2 |
254 | if (ob1 == ob2 |
187 | || ob1->type != ob2->type |
255 | || ob1->type != ob2->type |
188 | || ob1->speed != ob2->speed |
256 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED |
189 | || ob1->value != ob2->value |
257 | || ob1->value != ob2->value |
190 | || ob1->name != ob2->name) |
258 | || ob1->name != ob2->name) |
191 | return 0; |
259 | return 0; |
192 | |
260 | |
193 | /* Do not merge objects if nrof would overflow, assume nrof |
261 | /* Do not merge objects if nrof would overflow, assume nrof |
… | |
… | |
218 | || ob1->skill != ob2->skill |
286 | || ob1->skill != ob2->skill |
219 | || ob1->value != ob2->value |
287 | || ob1->value != ob2->value |
220 | || ob1->animation_id != ob2->animation_id |
288 | || ob1->animation_id != ob2->animation_id |
221 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
289 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
222 | || ob1->client_type != ob2->client_type |
290 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
291 | || ob1->material != ob2->material |
224 | || ob1->lore != ob2->lore |
292 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
293 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
294 | || ob1->move_type != ob2->move_type |
227 | || ob1->move_block != ob2->move_block |
295 | || ob1->move_block != ob2->move_block |
228 | || ob1->move_allow != ob2->move_allow |
296 | || ob1->move_allow != ob2->move_allow |
229 | || ob1->move_on != ob2->move_on |
297 | || ob1->move_on != ob2->move_on |
230 | || ob1->move_off != ob2->move_off |
298 | || ob1->move_off != ob2->move_off |
231 | || ob1->move_slow != ob2->move_slow |
299 | || ob1->move_slow != ob2->move_slow |
232 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
300 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
233 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
301 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
234 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
302 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
235 | return 0; |
303 | return 0; |
236 | |
304 | |
237 | if ((ob1->flag ^ ob2->flag) |
305 | if ((ob1->flag ^ ob2->flag) |
… | |
… | |
335 | |
403 | |
336 | // the player itself is always on a map, so we will find him here |
404 | // the player itself is always on a map, so we will find him here |
337 | // even if our inv is in a player. |
405 | // even if our inv is in a player. |
338 | if (envest->is_on_map ()) |
406 | if (envest->is_on_map ()) |
339 | if (object *pl = envest->ms ().player ()) |
407 | if (object *pl = envest->ms ().player ()) |
340 | if (pl->container == env) |
408 | if (pl->container_ () == env) |
341 | return pl; |
409 | return pl; |
342 | } |
410 | } |
343 | else |
411 | else |
344 | { |
412 | { |
345 | // maybe there is a player standing on the same mapspace |
413 | // maybe there is a player standing on the same mapspace |
346 | // this will catch the case where "this" is a player |
414 | // this will catch the case where "this" is a player |
347 | if (object *pl = ms ().player ()) |
415 | if (object *pl = ms ().player ()) |
348 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
416 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
349 | || this == pl->container) |
417 | || pl->container_ () == this) |
350 | return pl; |
418 | return pl; |
351 | } |
419 | } |
352 | } |
420 | } |
353 | |
421 | |
354 | return 0; |
422 | return 0; |
… | |
… | |
436 | |
504 | |
437 | char * |
505 | char * |
438 | object::as_string () |
506 | object::as_string () |
439 | { |
507 | { |
440 | return dump_object (this); |
508 | return dump_object (this); |
441 | } |
|
|
442 | |
|
|
443 | /* |
|
|
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 | */ |
|
|
448 | object * |
|
|
449 | get_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 | } |
509 | } |
465 | |
510 | |
466 | /* |
511 | /* |
467 | * Returns the object which has the count-variable equal to the argument. |
512 | * Returns the object which has the count-variable equal to the argument. |
468 | * VERRRY slow. |
513 | * VERRRY slow. |
… | |
… | |
642 | tail = new_link; |
687 | tail = new_link; |
643 | } |
688 | } |
644 | } |
689 | } |
645 | } |
690 | } |
646 | |
691 | |
647 | if (speed < 0) |
|
|
648 | dst->speed_left -= rndm (); |
|
|
649 | |
|
|
650 | dst->activate (); |
692 | dst->activate (); |
651 | } |
693 | } |
652 | |
694 | |
653 | void |
695 | void |
654 | object::instantiate () |
696 | object::instantiate () |
655 | { |
697 | { |
656 | if (!uuid.seq) // HACK |
698 | if (!uuid.seq) // HACK |
657 | uuid = UUID::gen (); |
699 | uuid = UUID::gen (); |
658 | |
700 | |
|
|
701 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
|
|
702 | if (flag [FLAG_RANDOM_SPEED] && speed) |
|
|
703 | speed_left = - speed - rndm (); // TODO animation |
|
|
704 | else |
659 | speed_left = -0.1f; |
705 | speed_left = -1.; |
|
|
706 | |
660 | /* copy the body_info to the body_used - this is only really |
707 | /* copy the body_info to the body_used - this is only really |
661 | * need for monsters, but doesn't hurt to do it for everything. |
708 | * need for monsters, but doesn't hurt to do it for everything. |
662 | * by doing so, when a monster is created, it has good starting |
709 | * by doing so, when a monster is created, it has good starting |
663 | * values for the body_used info, so when items are created |
710 | * values for the body_used info, so when items are created |
664 | * for it, they can be properly equipped. |
711 | * for it, they can be properly equipped. |
… | |
… | |
672 | object * |
719 | object * |
673 | object::clone () |
720 | object::clone () |
674 | { |
721 | { |
675 | object *neu = create (); |
722 | object *neu = create (); |
676 | copy_to (neu); |
723 | copy_to (neu); |
|
|
724 | |
|
|
725 | // TODO: unclean state changes, should not be done in clone AND instantiate |
|
|
726 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
|
|
727 | neu->speed_left = - neu->speed - rndm (); // TODO animation |
|
|
728 | |
677 | neu->map = map; // not copied by copy_to |
729 | neu->map = map; // not copied by copy_to |
678 | return neu; |
730 | return neu; |
679 | } |
731 | } |
680 | |
732 | |
681 | /* |
733 | /* |
… | |
… | |
699 | * This function needs to be called whenever the speed of an object changes. |
751 | * This function needs to be called whenever the speed of an object changes. |
700 | */ |
752 | */ |
701 | void |
753 | void |
702 | object::set_speed (float speed) |
754 | object::set_speed (float speed) |
703 | { |
755 | { |
704 | if (flag [FLAG_FREED] && speed) |
|
|
705 | { |
|
|
706 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
|
|
707 | speed = 0; |
|
|
708 | } |
|
|
709 | |
|
|
710 | this->speed = speed; |
756 | this->speed = speed; |
711 | |
757 | |
712 | if (has_active_speed ()) |
758 | if (has_active_speed ()) |
713 | activate (); |
759 | activate (); |
714 | else |
760 | else |
… | |
… | |
764 | |
810 | |
765 | if (!(m.flags_ & P_UPTODATE)) |
811 | if (!(m.flags_ & P_UPTODATE)) |
766 | /* nop */; |
812 | /* nop */; |
767 | else if (action == UP_OBJ_INSERT) |
813 | else if (action == UP_OBJ_INSERT) |
768 | { |
814 | { |
|
|
815 | #if 0 |
769 | // this is likely overkill, TODO: revisit (schmorp) |
816 | // this is likely overkill, TODO: revisit (schmorp) |
770 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
817 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
771 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
818 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
772 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
819 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
773 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
820 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
… | |
… | |
778 | || (m.move_slow | op->move_slow) != m.move_slow |
825 | || (m.move_slow | op->move_slow) != m.move_slow |
779 | /* This isn't perfect, but I don't expect a lot of objects to |
826 | /* This isn't perfect, but I don't expect a lot of objects to |
780 | * have move_allow right now. |
827 | * have move_allow right now. |
781 | */ |
828 | */ |
782 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
829 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
783 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
|
|
784 | m.invalidate (); |
830 | m.invalidate (); |
|
|
831 | #else |
|
|
832 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
|
|
833 | m.invalidate (); |
|
|
834 | #endif |
785 | } |
835 | } |
786 | /* if the object is being removed, we can't make intelligent |
836 | /* if the object is being removed, we can't make intelligent |
787 | * decisions, because remove_ob can't really pass the object |
837 | * decisions, because remove_ob can't really pass the object |
788 | * that is being removed. |
838 | * that is being removed. |
789 | */ |
839 | */ |
… | |
… | |
801 | object::object () |
851 | object::object () |
802 | { |
852 | { |
803 | SET_FLAG (this, FLAG_REMOVED); |
853 | SET_FLAG (this, FLAG_REMOVED); |
804 | |
854 | |
805 | //expmul = 1.0; declared const for the time being |
855 | //expmul = 1.0; declared const for the time being |
806 | face = blank_face; |
856 | face = blank_face; |
|
|
857 | material = MATERIAL_NULL; |
807 | } |
858 | } |
808 | |
859 | |
809 | object::~object () |
860 | object::~object () |
810 | { |
861 | { |
811 | unlink (); |
862 | unlink (); |
… | |
… | |
1041 | * the previous environment. |
1092 | * the previous environment. |
1042 | */ |
1093 | */ |
1043 | void |
1094 | void |
1044 | object::do_remove () |
1095 | object::do_remove () |
1045 | { |
1096 | { |
1046 | object *tmp, *last = 0; |
|
|
1047 | object *otmp; |
|
|
1048 | |
|
|
1049 | if (flag [FLAG_REMOVED]) |
1097 | if (flag [FLAG_REMOVED]) |
1050 | return; |
1098 | return; |
1051 | |
1099 | |
1052 | INVOKE_OBJECT (REMOVE, this); |
1100 | INVOKE_OBJECT (REMOVE, this); |
1053 | |
1101 | |
… | |
… | |
1085 | |
1133 | |
1086 | above = 0; |
1134 | above = 0; |
1087 | below = 0; |
1135 | below = 0; |
1088 | env = 0; |
1136 | env = 0; |
1089 | |
1137 | |
1090 | /* NO_FIX_PLAYER is set when a great many changes are being |
1138 | if (pl && pl->is_player ()) |
1091 | * made to players inventory. If set, avoiding the call |
|
|
1092 | * to save cpu time. |
|
|
1093 | */ |
|
|
1094 | if (pl) |
|
|
1095 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1096 | { |
1139 | { |
1097 | pl->update_stats (); |
1140 | pl->contr->queue_stats_update (); |
1098 | |
1141 | |
1099 | if (glow_radius && pl->is_on_map ()) |
1142 | if (glow_radius && pl->is_on_map ()) |
1100 | update_all_los (pl->map, pl->x, pl->y); |
1143 | update_all_los (pl->map, pl->x, pl->y); |
1101 | } |
1144 | } |
1102 | } |
1145 | } |
1103 | else if (map) |
1146 | else if (map) |
1104 | { |
1147 | { |
1105 | map->dirty = true; |
1148 | map->dirty = true; |
1106 | mapspace &ms = this->ms (); |
1149 | mapspace &ms = this->ms (); |
… | |
… | |
1119 | close_container (); |
1162 | close_container (); |
1120 | |
1163 | |
1121 | --map->players; |
1164 | --map->players; |
1122 | map->touch (); |
1165 | map->touch (); |
1123 | } |
1166 | } |
1124 | else if (pl->container == this) |
1167 | else if (pl->container_ () == this) |
1125 | { |
1168 | { |
1126 | // removing a container should close it |
1169 | // removing a container should close it |
1127 | close_container (); |
1170 | close_container (); |
1128 | } |
1171 | } |
1129 | |
1172 | |
… | |
… | |
1145 | |
1188 | |
1146 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1189 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1147 | |
1190 | |
1148 | if (object *pl = ms.player ()) |
1191 | if (object *pl = ms.player ()) |
1149 | { |
1192 | { |
1150 | if (pl->container == this) |
1193 | if (pl->container_ () == this) |
1151 | /* If a container that the player is currently using somehow gets |
1194 | /* If a container that the player is currently using somehow gets |
1152 | * removed (most likely destroyed), update the player view |
1195 | * removed (most likely destroyed), update the player view |
1153 | * appropriately. |
1196 | * appropriately. |
1154 | */ |
1197 | */ |
1155 | pl->close_container (); |
1198 | pl->close_container (); |
… | |
… | |
1159 | //TODO: update floorbox to preserve ordering |
1202 | //TODO: update floorbox to preserve ordering |
1160 | if (pl->contr->ns) |
1203 | if (pl->contr->ns) |
1161 | pl->contr->ns->floorbox_update (); |
1204 | pl->contr->ns->floorbox_update (); |
1162 | } |
1205 | } |
1163 | |
1206 | |
|
|
1207 | if (check_walk_off) |
1164 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1208 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1165 | { |
1209 | { |
|
|
1210 | above = tmp->above; |
|
|
1211 | |
1166 | /* No point updating the players look faces if he is the object |
1212 | /* No point updating the players look faces if he is the object |
1167 | * being removed. |
1213 | * being removed. |
1168 | */ |
1214 | */ |
1169 | |
1215 | |
1170 | /* See if object moving off should effect something */ |
1216 | /* See if object moving off should effect something */ |
1171 | if (check_walk_off |
|
|
1172 | && ((move_type & tmp->move_off) |
1217 | if ((move_type & tmp->move_off) |
1173 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1218 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1174 | { |
|
|
1175 | move_apply (tmp, this, 0); |
1219 | 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 | } |
1220 | } |
1180 | |
|
|
1181 | last = tmp; |
|
|
1182 | } |
|
|
1183 | |
1221 | |
1184 | if (affects_los ()) |
1222 | if (affects_los ()) |
1185 | update_all_los (map, x, y); |
1223 | update_all_los (map, x, y); |
1186 | } |
1224 | } |
1187 | } |
1225 | } |
… | |
… | |
1231 | |
1269 | |
1232 | object *prev = this; |
1270 | object *prev = this; |
1233 | |
1271 | |
1234 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1272 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1235 | { |
1273 | { |
1236 | object *op = arch_to_object (at); |
1274 | object *op = at->instance (); |
1237 | |
1275 | |
1238 | op->name = name; |
1276 | op->name = name; |
1239 | op->name_pl = name_pl; |
1277 | op->name_pl = name_pl; |
1240 | op->title = title; |
1278 | op->title = title; |
1241 | |
1279 | |
… | |
… | |
1516 | |
1554 | |
1517 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1555 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1518 | if (tmp->arch->archname == archname) /* same archetype */ |
1556 | if (tmp->arch->archname == archname) /* same archetype */ |
1519 | tmp->destroy (); |
1557 | tmp->destroy (); |
1520 | |
1558 | |
1521 | object *tmp = arch_to_object (archetype::find (archname)); |
1559 | object *tmp = archetype::find (archname)->instance (); |
1522 | |
1560 | |
1523 | tmp->x = op->x; |
1561 | tmp->x = op->x; |
1524 | tmp->y = op->y; |
1562 | tmp->y = op->y; |
1525 | |
1563 | |
1526 | insert_ob_in_map (tmp, op->map, op, 0); |
1564 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1531 | { |
1569 | { |
1532 | if (where->env) |
1570 | if (where->env) |
1533 | return where->env->insert (this); |
1571 | return where->env->insert (this); |
1534 | else |
1572 | else |
1535 | return where->map->insert (this, where->x, where->y, originator, flags); |
1573 | return where->map->insert (this, where->x, where->y, originator, flags); |
|
|
1574 | } |
|
|
1575 | |
|
|
1576 | // check whether we can put this into the map, respect max_volume, max_items |
|
|
1577 | bool |
|
|
1578 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
|
|
1579 | { |
|
|
1580 | mapspace &ms = m->at (x, y); |
|
|
1581 | |
|
|
1582 | int items = ms.items (); |
|
|
1583 | |
|
|
1584 | if (!items // testing !items ensures we can drop at least one item |
|
|
1585 | || (items < m->max_items |
|
|
1586 | && ms.volume () < m->max_volume)) |
|
|
1587 | return true; |
|
|
1588 | |
|
|
1589 | if (originator && originator->is_player ()) |
|
|
1590 | originator->contr->failmsg (format ( |
|
|
1591 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
|
|
1592 | query_name () |
|
|
1593 | )); |
|
|
1594 | |
|
|
1595 | return false; |
1536 | } |
1596 | } |
1537 | |
1597 | |
1538 | /* |
1598 | /* |
1539 | * decrease(object, number) decreases a specified number from |
1599 | * decrease(object, number) decreases a specified number from |
1540 | * the amount of an object. If the amount reaches 0, the object |
1600 | * the amount of an object. If the amount reaches 0, the object |
… | |
… | |
1680 | if (op->glow_radius && is_on_map ()) |
1740 | if (op->glow_radius && is_on_map ()) |
1681 | { |
1741 | { |
1682 | update_stats (); |
1742 | update_stats (); |
1683 | update_all_los (map, x, y); |
1743 | update_all_los (map, x, y); |
1684 | } |
1744 | } |
1685 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1745 | else if (is_player ()) |
1686 | // if this is a player's inventory, update stats |
1746 | // if this is a player's inventory, update stats |
1687 | update_stats (); |
1747 | contr->queue_stats_update (); |
1688 | |
1748 | |
1689 | INVOKE_OBJECT (INSERT, this); |
1749 | INVOKE_OBJECT (INSERT, this); |
1690 | |
1750 | |
1691 | return op; |
1751 | return op; |
1692 | } |
1752 | } |
… | |
… | |
2179 | * This basically means that if direction is 15, then it could either go |
2239 | * 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. |
2240 | * 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 |
2241 | * Moved from spell_util.c to object.c with the other related direction |
2182 | * functions. |
2242 | * functions. |
2183 | */ |
2243 | */ |
2184 | const int reduction_dir[SIZEOFFREE][3] = { |
2244 | static const int reduction_dir[SIZEOFFREE][3] = { |
2185 | {0, 0, 0}, /* 0 */ |
2245 | {0, 0, 0}, /* 0 */ |
2186 | {0, 0, 0}, /* 1 */ |
2246 | {0, 0, 0}, /* 1 */ |
2187 | {0, 0, 0}, /* 2 */ |
2247 | {0, 0, 0}, /* 2 */ |
2188 | {0, 0, 0}, /* 3 */ |
2248 | {0, 0, 0}, /* 3 */ |
2189 | {0, 0, 0}, /* 4 */ |
2249 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2460 | { |
2520 | { |
2461 | return map ? map->region (x, y) |
2521 | return map ? map->region (x, y) |
2462 | : region::default_region (); |
2522 | : region::default_region (); |
2463 | } |
2523 | } |
2464 | |
2524 | |
2465 | const materialtype_t * |
|
|
2466 | object::dominant_material () const |
|
|
2467 | { |
|
|
2468 | if (materialtype_t *mt = name_to_material (materialname)) |
|
|
2469 | return mt; |
|
|
2470 | |
|
|
2471 | return name_to_material (shstr_unknown); |
|
|
2472 | } |
|
|
2473 | |
|
|
2474 | void |
2525 | void |
2475 | object::open_container (object *new_container) |
2526 | object::open_container (object *new_container) |
2476 | { |
2527 | { |
2477 | if (container == new_container) |
2528 | if (container == new_container) |
2478 | return; |
2529 | return; |
… | |
… | |
2512 | // TODO: this does not seem to serve any purpose anymore? |
2563 | // TODO: this does not seem to serve any purpose anymore? |
2513 | #if 0 |
2564 | #if 0 |
2514 | // insert the "Close Container" object. |
2565 | // insert the "Close Container" object. |
2515 | if (archetype *closer = new_container->other_arch) |
2566 | if (archetype *closer = new_container->other_arch) |
2516 | { |
2567 | { |
2517 | object *closer = arch_to_object (new_container->other_arch); |
2568 | object *closer = new_container->other_arch->instance (); |
2518 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2569 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2519 | new_container->insert (closer); |
2570 | new_container->insert (closer); |
2520 | } |
2571 | } |
2521 | #endif |
2572 | #endif |
2522 | |
2573 | |
… | |
… | |
2548 | return splay (tmp); |
2599 | return splay (tmp); |
2549 | |
2600 | |
2550 | return 0; |
2601 | return 0; |
2551 | } |
2602 | } |
2552 | |
2603 | |
|
|
2604 | //-GPL |
|
|
2605 | |
2553 | void |
2606 | void |
2554 | object::force_set_timer (int duration) |
2607 | object::force_set_timer (int duration) |
2555 | { |
2608 | { |
2556 | this->duration = 1; |
2609 | this->duration = 1; |
2557 | this->speed_left = -1.f; |
2610 | this->speed_left = -1.f; |
… | |
… | |
2566 | force->destroy (); |
2619 | force->destroy (); |
2567 | |
2620 | |
2568 | object *force = get_archetype (FORCE_NAME); |
2621 | object *force = get_archetype (FORCE_NAME); |
2569 | |
2622 | |
2570 | force->slaying = name; |
2623 | force->slaying = name; |
2571 | |
|
|
2572 | force->force_set_timer (duration); |
2624 | force->force_set_timer (duration); |
2573 | |
|
|
2574 | force->flag [FLAG_APPLIED] = true; |
2625 | force->flag [FLAG_APPLIED] = true; |
2575 | |
2626 | |
2576 | return insert (force); |
2627 | return insert (force); |
2577 | } |
2628 | } |
2578 | |
2629 | |
2579 | void |
2630 | void |