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.255 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.302 by root, Tue Nov 10 00:01:31 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
32#include <bitset> 33#include <bitset>
33 34
34UUID UUID::cur; 35UUID UUID::cur;
35static uint64_t seq_next_save; 36static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
38uint32_t mapspace::smellcount = 10000;
37 39
38objectvec objects; 40objectvec objects;
39activevec actives; 41activevec actives;
42
43//+GPL
40 44
41short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
42 0, 46 0,
43 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
44 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,
… …
48 0, 52 0,
49 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
50 -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,
51 -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
52}; 56};
53int maxfree[SIZEOFFREE] = {
54 0,
55 9, 10, 13, 14, 17, 18, 21, 22,
56 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58};
59int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
60 0, 58 0,
61 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
62 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,
63 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
64}; 69};
65 70
66static void 71static void
67write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
68{ 73{
… …
96 101
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 103 _exit (1);
99 } 104 }
100 105
101 UUID::BUF buf; 106 char buf [UUID::MAX_LEN];
102 buf[0] = 0; 107 buf[0] = 0;
103 fgets (buf, sizeof (buf), fp); 108 fgets (buf, sizeof (buf), fp);
104 109
105 if (!UUID::cur.parse (buf)) 110 if (!UUID::cur.parse (buf))
106 { 111 {
… …
133 138
134void 139void
135UUID::init () 140UUID::init ()
136{ 141{
137 read_uuid (); 142 read_uuid ();
143}
144
145bool
146UUID::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
170char *
171UUID::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
202char *
203UUID::c_str () const
204{
205 static char buf [MAX_LEN];
206 *append (buf) = 0;
207 return buf;
138} 208}
139 209
140/* 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. */
141static bool 211static bool
142compare_ob_value_lists_one (const object *wants, const object *has) 212compare_ob_value_lists_one (const object *wants, const object *has)
… …
181bool object::can_merge_slow (object *ob1, object *ob2) 251bool object::can_merge_slow (object *ob1, object *ob2)
182{ 252{
183 /* A couple quicksanity checks */ 253 /* A couple quicksanity checks */
184 if (ob1 == ob2 254 if (ob1 == ob2
185 || ob1->type != ob2->type 255 || ob1->type != ob2->type
186 || ob1->speed != ob2->speed 256 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
187 || ob1->value != ob2->value 257 || ob1->value != ob2->value
188 || ob1->name != ob2->name) 258 || ob1->name != ob2->name)
189 return 0; 259 return 0;
190 260
191 /* Do not merge objects if nrof would overflow, assume nrof 261 /* Do not merge objects if nrof would overflow, assume nrof
… …
225 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
226 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
227 || ob1->move_on != ob2->move_on 297 || ob1->move_on != ob2->move_on
228 || ob1->move_off != ob2->move_off 298 || ob1->move_off != ob2->move_off
229 || ob1->move_slow != ob2->move_slow 299 || ob1->move_slow != ob2->move_slow
230 || ob1->move_slow_penalty != ob2->move_slow_penalty 300 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
231 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 301 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 302 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233 return 0; 303 return 0;
234 304
235 if ((ob1->flag ^ ob2->flag) 305 if ((ob1->flag ^ ob2->flag)
… …
323 { 393 {
324 // see if we are in a container of sorts 394 // see if we are in a container of sorts
325 if (env) 395 if (env)
326 { 396 {
327 // the player inventory itself is always visible 397 // the player inventory itself is always visible
328 if (env->type == PLAYER) 398 if (env->is_player ())
329 return env; 399 return env;
330 400
331 // else a player could have our env open 401 // else a player could have our env open
332 object *envest = env->outer_env (); 402 object *envest = env->outer_env_or_self ();
333 403
334 // 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
335 // even if our inv is in a player. 405 // even if our inv is in a player.
336 if (envest->is_on_map ()) 406 if (envest->is_on_map ())
337 if (object *pl = envest->ms ().player ()) 407 if (object *pl = envest->ms ().player ())
338 if (pl->container == env) 408 if (pl->container_ () == env)
339 return pl; 409 return pl;
340 } 410 }
341 else 411 else
342 { 412 {
343 // maybe there is a player standing on the same mapspace 413 // maybe there is a player standing on the same mapspace
344 // this will catch the case where "this" is a player 414 // this will catch the case where "this" is a player
345 if (object *pl = ms ().player ()) 415 if (object *pl = ms ().player ())
346 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 416 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
347 || this == pl->container) 417 || pl->container_ () == this)
348 return pl; 418 return pl;
349 } 419 }
350 } 420 }
351 421
352 return 0; 422 return 0;
… …
430 object_freezer freezer; 500 object_freezer freezer;
431 op->write (freezer); 501 op->write (freezer);
432 return freezer.as_string (); 502 return freezer.as_string ();
433} 503}
434 504
435/* 505char *
436 * get_nearest_part(multi-object, object 2) returns the part of the 506object::as_string ()
437 * multi-object 1 which is closest to the second object.
438 * If it's not a multi-object, it is returned.
439 */
440object *
441get_nearest_part (object *op, const object *pl)
442{ 507{
443 object *tmp, *closest; 508 return dump_object (this);
444 int last_dist, i;
445
446 if (!op->more)
447 return op;
448
449 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
450 tmp;
451 tmp = tmp->more)
452 if ((i = distance (tmp, pl)) < last_dist)
453 closest = tmp, last_dist = i;
454
455 return closest;
456} 509}
457 510
458/* 511/*
459 * 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.
460 * VERRRY slow. 513 * VERRRY slow.
… …
554 update_stats (); 607 update_stats ();
555 608
556 new_draw_info_format (NDI_UNIQUE, 0, this, 609 new_draw_info_format (NDI_UNIQUE, 0, this,
557 "You try to balance all your items at once, " 610 "You try to balance all your items at once, "
558 "but the %s is just too much for your body. " 611 "but the %s is just too much for your body. "
559 "[You need to unapply some items first.]", &ob->name); 612 "[You need to unapply some items first - use the 'body' command to see "
613 "how many items you cna wera on a specific body part.]", &ob->name);
560 return false; 614 return false;
561 } 615 }
562 616
563 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 617 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564 } 618 }
… …
636 } 690 }
637 691
638 if (speed < 0) 692 if (speed < 0)
639 dst->speed_left -= rndm (); 693 dst->speed_left -= rndm ();
640 694
641 dst->set_speed (dst->speed); 695 dst->activate ();
642} 696}
643 697
644void 698void
645object::instantiate () 699object::instantiate ()
646{ 700{
… …
690 * This function needs to be called whenever the speed of an object changes. 744 * This function needs to be called whenever the speed of an object changes.
691 */ 745 */
692void 746void
693object::set_speed (float speed) 747object::set_speed (float speed)
694{ 748{
695 if (flag [FLAG_FREED] && speed)
696 {
697 LOG (llevError, "Object %s is freed but has speed.\n", &name);
698 speed = 0;
699 }
700
701 this->speed = speed; 749 this->speed = speed;
702 750
703 if (has_active_speed ()) 751 if (has_active_speed ())
704 activate (); 752 activate ();
705 else 753 else
… …
755 803
756 if (!(m.flags_ & P_UPTODATE)) 804 if (!(m.flags_ & P_UPTODATE))
757 /* nop */; 805 /* nop */;
758 else if (action == UP_OBJ_INSERT) 806 else if (action == UP_OBJ_INSERT)
759 { 807 {
808#if 0
760 // this is likely overkill, TODO: revisit (schmorp) 809 // this is likely overkill, TODO: revisit (schmorp)
761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 810 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 811 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 812 || (op->is_player () && !(m.flags_ & P_PLAYER))
764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 813 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 814 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 815 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767 || (m.move_on | op->move_on ) != m.move_on 816 || (m.move_on | op->move_on ) != m.move_on
768 || (m.move_off | op->move_off ) != m.move_off 817 || (m.move_off | op->move_off ) != m.move_off
769 || (m.move_slow | op->move_slow) != m.move_slow 818 || (m.move_slow | op->move_slow) != m.move_slow
770 /* This isn't perfect, but I don't expect a lot of objects to 819 /* This isn't perfect, but I don't expect a lot of objects to
771 * have move_allow right now. 820 * have move_allow right now.
772 */ 821 */
773 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 822 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
823 m.invalidate ();
824#else
774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 825 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
775 m.flags_ = 0; 826 m.invalidate ();
827#endif
776 } 828 }
777 /* if the object is being removed, we can't make intelligent 829 /* if the object is being removed, we can't make intelligent
778 * decisions, because remove_ob can't really pass the object 830 * decisions, because remove_ob can't really pass the object
779 * that is being removed. 831 * that is being removed.
780 */ 832 */
781 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 833 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
782 m.flags_ = 0; 834 m.invalidate ();
783 else if (action == UP_OBJ_FACE) 835 else if (action == UP_OBJ_FACE)
784 /* Nothing to do for that case */ ; 836 /* Nothing to do for that case */ ;
785 else 837 else
786 LOG (llevError, "update_object called with invalid action: %d\n", action); 838 LOG (llevError, "update_object called with invalid action: %d\n", action);
787 839
… …
791 843
792object::object () 844object::object ()
793{ 845{
794 SET_FLAG (this, FLAG_REMOVED); 846 SET_FLAG (this, FLAG_REMOVED);
795 847
796 expmul = 1.0; 848 //expmul = 1.0; declared const for the time being
797 face = blank_face; 849 face = blank_face;
798} 850}
799 851
800object::~object () 852object::~object ()
801{ 853{
… …
831 /* If already on active list, don't do anything */ 883 /* If already on active list, don't do anything */
832 if (active) 884 if (active)
833 return; 885 return;
834 886
835 if (has_active_speed ()) 887 if (has_active_speed ())
888 {
889 if (flag [FLAG_FREED])
890 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
891
836 actives.insert (this); 892 actives.insert (this);
893 }
837} 894}
838 895
839void 896void
840object::activate_recursive () 897object::activate_recursive ()
841{ 898{
… …
906 || map->in_memory != MAP_ACTIVE 963 || map->in_memory != MAP_ACTIVE
907 || map->no_drop 964 || map->no_drop
908 || ms ().move_block == MOVE_ALL) 965 || ms ().move_block == MOVE_ALL)
909 { 966 {
910 while (inv) 967 while (inv)
911 inv->destroy (true); 968 inv->destroy ();
912 } 969 }
913 else 970 else
914 { /* Put objects in inventory onto this space */ 971 { /* Put objects in inventory onto this space */
915 while (inv) 972 while (inv)
916 { 973 {
… …
920 || op->flag [FLAG_NO_DROP] 977 || op->flag [FLAG_NO_DROP]
921 || op->type == RUNE 978 || op->type == RUNE
922 || op->type == TRAP 979 || op->type == TRAP
923 || op->flag [FLAG_IS_A_TEMPLATE] 980 || op->flag [FLAG_IS_A_TEMPLATE]
924 || op->flag [FLAG_DESTROY_ON_DEATH]) 981 || op->flag [FLAG_DESTROY_ON_DEATH])
925 op->destroy (true); 982 op->destroy ();
926 else 983 else
927 map->insert (op, x, y); 984 map->insert (op, x, y);
928 } 985 }
929 } 986 }
930} 987}
… …
959 1016
960void 1017void
961object::do_destroy () 1018object::do_destroy ()
962{ 1019{
963 if (flag [FLAG_IS_LINKED]) 1020 if (flag [FLAG_IS_LINKED])
964 remove_button_link (this); 1021 remove_link ();
965 1022
966 if (flag [FLAG_FRIENDLY]) 1023 if (flag [FLAG_FRIENDLY])
967 remove_friendly_object (this); 1024 remove_friendly_object (this);
968 1025
969 remove (); 1026 remove ();
… …
994 attacked_by = 0; 1051 attacked_by = 0;
995 current_weapon = 0; 1052 current_weapon = 0;
996} 1053}
997 1054
998void 1055void
999object::destroy (bool destroy_inventory) 1056object::destroy ()
1000{ 1057{
1001 if (destroyed ()) 1058 if (destroyed ())
1002 return; 1059 return;
1003 1060
1004 if (!is_head () && !head->destroyed ()) 1061 if (!is_head () && !head->destroyed ())
1005 { 1062 {
1006 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1063 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1007 head->destroy (destroy_inventory); 1064 head->destroy ();
1008 return; 1065 return;
1009 } 1066 }
1010 1067
1011 destroy_inv (!destroy_inventory); 1068 destroy_inv (false);
1012 1069
1013 if (is_head ()) 1070 if (is_head ())
1014 if (sound_destroy) 1071 if (sound_destroy)
1015 play_sound (sound_destroy); 1072 play_sound (sound_destroy);
1016 else if (flag [FLAG_MONSTER]) 1073 else if (flag [FLAG_MONSTER])
… …
1027 * the previous environment. 1084 * the previous environment.
1028 */ 1085 */
1029void 1086void
1030object::do_remove () 1087object::do_remove ()
1031{ 1088{
1032 object *tmp, *last = 0;
1033 object *otmp;
1034
1035 if (flag [FLAG_REMOVED]) 1089 if (flag [FLAG_REMOVED])
1036 return; 1090 return;
1037 1091
1038 INVOKE_OBJECT (REMOVE, this); 1092 INVOKE_OBJECT (REMOVE, this);
1039 1093
… …
1052 if (object *pl = visible_to ()) 1106 if (object *pl = visible_to ())
1053 esrv_del_item (pl->contr, count); 1107 esrv_del_item (pl->contr, count);
1054 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1108 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1055 1109
1056 adjust_weight (env, -total_weight ()); 1110 adjust_weight (env, -total_weight ());
1111
1112 object *pl = in_player ();
1057 1113
1058 /* we set up values so that it could be inserted into 1114 /* we set up values so that it could be inserted into
1059 * the map, but we don't actually do that - it is up 1115 * the map, but we don't actually do that - it is up
1060 * to the caller to decide what we want to do. 1116 * to the caller to decide what we want to do.
1061 */ 1117 */
… …
1073 1129
1074 /* NO_FIX_PLAYER is set when a great many changes are being 1130 /* NO_FIX_PLAYER is set when a great many changes are being
1075 * made to players inventory. If set, avoiding the call 1131 * made to players inventory. If set, avoiding the call
1076 * to save cpu time. 1132 * to save cpu time.
1077 */ 1133 */
1078 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1134 if (pl)
1135 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1136 {
1079 otmp->update_stats (); 1137 pl->update_stats ();
1138
1139 if (glow_radius && pl->is_on_map ())
1140 update_all_los (pl->map, pl->x, pl->y);
1141 }
1080 } 1142 }
1081 else if (map) 1143 else if (map)
1082 { 1144 {
1083 map->dirty = true; 1145 map->dirty = true;
1084 mapspace &ms = this->ms (); 1146 mapspace &ms = this->ms ();
1085 1147
1086 if (object *pl = ms.player ()) 1148 if (object *pl = ms.player ())
1087 { 1149 {
1088 if (type == PLAYER) // this == pl(!) 1150 if (is_player ())
1089 { 1151 {
1152 if (!flag [FLAG_WIZPASS])
1153 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1154
1090 // leaving a spot always closes any open container on the ground 1155 // leaving a spot always closes any open container on the ground
1091 if (container && !container->env) 1156 if (container && !container->env)
1092 // this causes spurious floorbox updates, but it ensures 1157 // this causes spurious floorbox updates, but it ensures
1093 // that the CLOSE event is being sent. 1158 // that the CLOSE event is being sent.
1094 close_container (); 1159 close_container ();
1095 1160
1096 --map->players; 1161 --map->players;
1097 map->touch (); 1162 map->touch ();
1098 } 1163 }
1099 else if (pl->container == this) 1164 else if (pl->container_ () == this)
1100 { 1165 {
1101 // removing a container should close it 1166 // removing a container should close it
1102 close_container (); 1167 close_container ();
1103 } 1168 }
1104 1169
… …
1111 *(below ? &below->above : &ms.bot) = above; 1176 *(below ? &below->above : &ms.bot) = above;
1112 1177
1113 above = 0; 1178 above = 0;
1114 below = 0; 1179 below = 0;
1115 1180
1116 ms.flags_ = 0; 1181 ms.invalidate ();
1117 1182
1118 if (map->in_memory == MAP_SAVING) 1183 if (map->in_memory == MAP_SAVING)
1119 return; 1184 return;
1120 1185
1121 int check_walk_off = !flag [FLAG_NO_APPLY]; 1186 int check_walk_off = !flag [FLAG_NO_APPLY];
1122 1187
1123 if (object *pl = ms.player ()) 1188 if (object *pl = ms.player ())
1124 { 1189 {
1125 if (pl->container == this) 1190 if (pl->container_ () == this)
1126 /* If a container that the player is currently using somehow gets 1191 /* If a container that the player is currently using somehow gets
1127 * removed (most likely destroyed), update the player view 1192 * removed (most likely destroyed), update the player view
1128 * appropriately. 1193 * appropriately.
1129 */ 1194 */
1130 pl->close_container (); 1195 pl->close_container ();
… …
1134 //TODO: update floorbox to preserve ordering 1199 //TODO: update floorbox to preserve ordering
1135 if (pl->contr->ns) 1200 if (pl->contr->ns)
1136 pl->contr->ns->floorbox_update (); 1201 pl->contr->ns->floorbox_update ();
1137 } 1202 }
1138 1203
1204 if (check_walk_off)
1139 for (tmp = ms.bot; tmp; tmp = tmp->above) 1205 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1140 { 1206 {
1207 above = tmp->above;
1208
1141 /* No point updating the players look faces if he is the object 1209 /* No point updating the players look faces if he is the object
1142 * being removed. 1210 * being removed.
1143 */ 1211 */
1144 1212
1145 /* See if object moving off should effect something */ 1213 /* See if object moving off should effect something */
1146 if (check_walk_off
1147 && ((move_type & tmp->move_off) 1214 if ((move_type & tmp->move_off)
1148 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1215 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1149 {
1150 move_apply (tmp, this, 0); 1216 move_apply (tmp, this, 0);
1151
1152 if (destroyed ())
1153 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1154 } 1217 }
1155 1218
1156 last = tmp; 1219 if (affects_los ())
1157 }
1158
1159 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1160 update_all_los (map, x, y); 1220 update_all_los (map, x, y);
1161 } 1221 }
1162} 1222}
1163 1223
1164/* 1224/*
… …
1188 esrv_update_item (UPD_NROF, pl, top); 1248 esrv_update_item (UPD_NROF, pl, top);
1189 1249
1190 op->weight = 0; // cancel the addition above 1250 op->weight = 0; // cancel the addition above
1191 op->carrying = 0; // must be 0 already 1251 op->carrying = 0; // must be 0 already
1192 1252
1193 op->destroy (1); 1253 op->destroy ();
1194 1254
1195 return top; 1255 return top;
1196 } 1256 }
1197 1257
1198 return 0; 1258 return 0;
… …
1260 * just 'op' otherwise 1320 * just 'op' otherwise
1261 */ 1321 */
1262object * 1322object *
1263insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1323insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1264{ 1324{
1265 if (op->is_on_map ())
1266 {
1267 LOG (llevError, "insert_ob_in_map called for object already on map");
1268 abort ();
1269 }
1270
1271 if (op->env)
1272 {
1273 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1274 op->remove (); 1325 op->remove ();
1275 }
1276 1326
1277 if (op->face && !face_info (op->face))//D TODO: remove soon 1327 if (m == &freed_map)//D TODO: remove soon
1278 {//D 1328 {//D
1279 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D 1329 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1280 op->face = 1;//D
1281 }//D 1330 }//D
1282 1331
1283 /* Ideally, the caller figures this out. However, it complicates a lot 1332 /* Ideally, the caller figures this out. However, it complicates a lot
1284 * of areas of callers (eg, anything that uses find_free_spot would now 1333 * of areas of callers (eg, anything that uses find_free_spot would now
1285 * need extra work 1334 * need extra work
1286 */ 1335 */
1336 maptile *newmap = m;
1287 if (!xy_normalise (m, op->x, op->y)) 1337 if (!xy_normalise (newmap, op->x, op->y))
1288 { 1338 {
1289 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1339 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1290 return 0; 1340 return 0;
1291 } 1341 }
1292 1342
1293 if (object *more = op->more) 1343 if (object *more = op->more)
1294 if (!insert_ob_in_map (more, m, originator, flag)) 1344 if (!insert_ob_in_map (more, m, originator, flag))
1295 return 0; 1345 return 0;
1296 1346
1297 CLEAR_FLAG (op, FLAG_REMOVED); 1347 op->flag [FLAG_REMOVED] = false;
1298 1348 op->env = 0;
1299 op->map = m; 1349 op->map = newmap;
1350
1300 mapspace &ms = op->ms (); 1351 mapspace &ms = op->ms ();
1301 1352
1302 /* this has to be done after we translate the coordinates. 1353 /* this has to be done after we translate the coordinates.
1303 */ 1354 */
1304 if (op->nrof && !(flag & INS_NO_MERGE)) 1355 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1307 { 1358 {
1308 // TODO: we actually want to update tmp, not op, 1359 // TODO: we actually want to update tmp, not op,
1309 // but some caller surely breaks when we return tmp 1360 // but some caller surely breaks when we return tmp
1310 // from here :/ 1361 // from here :/
1311 op->nrof += tmp->nrof; 1362 op->nrof += tmp->nrof;
1312 tmp->destroy (1); 1363 tmp->destroy ();
1313 } 1364 }
1314 1365
1315 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1366 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1316 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1367 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1317 1368
… …
1325 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1376 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1326 abort (); 1377 abort ();
1327 } 1378 }
1328 1379
1329 if (!originator->is_on_map ()) 1380 if (!originator->is_on_map ())
1381 {
1330 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1382 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1331 op->debug_desc (), originator->debug_desc ()); 1383 op->debug_desc (), originator->debug_desc ());
1384 abort ();
1385 }
1332 1386
1333 op->above = originator; 1387 op->above = originator;
1334 op->below = originator->below; 1388 op->below = originator->below;
1335 originator->below = op; 1389 originator->below = op;
1336 1390
… …
1422 op->below = top; 1476 op->below = top;
1423 *(op->above ? &op->above->below : &ms.top) = op; 1477 *(op->above ? &op->above->below : &ms.top) = op;
1424 } 1478 }
1425 } 1479 }
1426 1480
1427 if (op->type == PLAYER) 1481 if (op->is_player ())
1428 { 1482 {
1429 op->contr->do_los = 1; 1483 op->contr->do_los = 1;
1430 ++op->map->players; 1484 ++op->map->players;
1431 op->map->touch (); 1485 op->map->touch ();
1432 } 1486 }
… …
1447 * be far away from this change and not affected in any way - 1501 * be far away from this change and not affected in any way -
1448 * this should get redone to only look for players within range, 1502 * this should get redone to only look for players within range,
1449 * or just updating the P_UPTODATE for spaces within this area 1503 * or just updating the P_UPTODATE for spaces within this area
1450 * of effect may be sufficient. 1504 * of effect may be sufficient.
1451 */ 1505 */
1452 if (op->map->darkness && (op->glow_radius != 0)) 1506 if (op->affects_los ())
1507 {
1508 op->ms ().invalidate ();
1453 update_all_los (op->map, op->x, op->y); 1509 update_all_los (op->map, op->x, op->y);
1510 }
1454 1511
1455 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1512 /* updates flags (blocked, alive, no magic, etc) for this map space */
1456 update_object (op, UP_OBJ_INSERT); 1513 update_object (op, UP_OBJ_INSERT);
1457 1514
1458 INVOKE_OBJECT (INSERT, op); 1515 INVOKE_OBJECT (INSERT, op);
… …
1465 * blocked() and wall() work properly), and these flags are updated by 1522 * blocked() and wall() work properly), and these flags are updated by
1466 * update_object(). 1523 * update_object().
1467 */ 1524 */
1468 1525
1469 /* if this is not the head or flag has been passed, don't check walk on status */ 1526 /* if this is not the head or flag has been passed, don't check walk on status */
1470 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1527 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1471 { 1528 {
1472 if (check_move_on (op, originator)) 1529 if (check_move_on (op, originator))
1473 return 0; 1530 return 0;
1474 1531
1475 /* If we are a multi part object, lets work our way through the check 1532 /* If we are a multi part object, lets work our way through the check
… …
1486/* this function inserts an object in the map, but if it 1543/* this function inserts an object in the map, but if it
1487 * finds an object of its own type, it'll remove that one first. 1544 * finds an object of its own type, it'll remove that one first.
1488 * op is the object to insert it under: supplies x and the map. 1545 * op is the object to insert it under: supplies x and the map.
1489 */ 1546 */
1490void 1547void
1491replace_insert_ob_in_map (const char *arch_string, object *op) 1548replace_insert_ob_in_map (shstr_tmp archname, object *op)
1492{ 1549{
1493 /* first search for itself and remove any old instances */ 1550 /* first search for itself and remove any old instances */
1494 1551
1495 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1552 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1496 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1553 if (tmp->arch->archname == archname) /* same archetype */
1497 tmp->destroy (1); 1554 tmp->destroy ();
1498 1555
1499 object *tmp = arch_to_object (archetype::find (arch_string)); 1556 object *tmp = arch_to_object (archetype::find (archname));
1500 1557
1501 tmp->x = op->x; 1558 tmp->x = op->x;
1502 tmp->y = op->y; 1559 tmp->y = op->y;
1503 1560
1504 insert_ob_in_map (tmp, op->map, op, 0); 1561 insert_ob_in_map (tmp, op->map, op, 0);
… …
1509{ 1566{
1510 if (where->env) 1567 if (where->env)
1511 return where->env->insert (this); 1568 return where->env->insert (this);
1512 else 1569 else
1513 return where->map->insert (this, where->x, where->y, originator, flags); 1570 return where->map->insert (this, where->x, where->y, originator, flags);
1571}
1572
1573// check whether we can put this into the map, respect max_volume, max_items
1574bool
1575object::can_drop_at (maptile *m, int x, int y, object *originator)
1576{
1577 mapspace &ms = m->at (x, y);
1578
1579 int items = ms.items ();
1580
1581 if (!items // testing !items ensures we can drop at least one item
1582 || (items < m->max_items
1583 && ms.volume () < m->max_volume))
1584 return true;
1585
1586 if (originator && originator->is_player ())
1587 originator->contr->failmsg (format (
1588 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1589 query_name ()
1590 ));
1591
1592 return false;
1514} 1593}
1515 1594
1516/* 1595/*
1517 * decrease(object, number) decreases a specified number from 1596 * decrease(object, number) decreases a specified number from
1518 * the amount of an object. If the amount reaches 0, the object 1597 * the amount of an object. If the amount reaches 0, the object
… …
1625 if (object *pl = tmp->visible_to ()) 1704 if (object *pl = tmp->visible_to ())
1626 esrv_update_item (UPD_NROF, pl, tmp); 1705 esrv_update_item (UPD_NROF, pl, tmp);
1627 1706
1628 adjust_weight (this, op->total_weight ()); 1707 adjust_weight (this, op->total_weight ());
1629 1708
1630 op->destroy (1); 1709 op->destroy ();
1631 op = tmp; 1710 op = tmp;
1632 goto inserted; 1711 goto inserted;
1633 } 1712 }
1634 1713
1635 op->owner = 0; // it's his/hers now. period. 1714 op->owner = 0; // it's his/hers now. period.
… …
1653 1732
1654 adjust_weight (this, op->total_weight ()); 1733 adjust_weight (this, op->total_weight ());
1655 1734
1656inserted: 1735inserted:
1657 /* reset the light list and los of the players on the map */ 1736 /* reset the light list and los of the players on the map */
1658 if (op->glow_radius && map && map->darkness) 1737 if (op->glow_radius && is_on_map ())
1738 {
1739 update_stats ();
1659 update_all_los (map, x, y); 1740 update_all_los (map, x, y);
1660 1741 }
1742 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1661 // if this is a player's inventory, update stats 1743 // if this is a player's inventory, update stats
1662 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1663 update_stats (); 1744 update_stats ();
1664 1745
1665 INVOKE_OBJECT (INSERT, this); 1746 INVOKE_OBJECT (INSERT, this);
1666 1747
1667 return op; 1748 return op;
… …
1688 * on top. 1769 * on top.
1689 */ 1770 */
1690int 1771int
1691check_move_on (object *op, object *originator) 1772check_move_on (object *op, object *originator)
1692{ 1773{
1774 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1775 return 0;
1776
1693 object *tmp; 1777 object *tmp;
1694 maptile *m = op->map; 1778 maptile *m = op->map;
1695 int x = op->x, y = op->y; 1779 int x = op->x, y = op->y;
1696 1780
1697 MoveType move_on, move_slow, move_block; 1781 mapspace &ms = m->at (x, y);
1698 1782
1699 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1783 ms.update ();
1700 return 0;
1701 1784
1702 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1785 MoveType move_on = ms.move_on;
1703 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1786 MoveType move_slow = ms.move_slow;
1704 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1787 MoveType move_block = ms.move_block;
1705 1788
1706 /* if nothing on this space will slow op down or be applied, 1789 /* if nothing on this space will slow op down or be applied,
1707 * no need to do checking below. have to make sure move_type 1790 * no need to do checking below. have to make sure move_type
1708 * is set, as lots of objects don't have it set - we treat that 1791 * is set, as lots of objects don't have it set - we treat that
1709 * as walking. 1792 * as walking.
… …
1720 return 0; 1803 return 0;
1721 1804
1722 /* The objects have to be checked from top to bottom. 1805 /* The objects have to be checked from top to bottom.
1723 * Hence, we first go to the top: 1806 * Hence, we first go to the top:
1724 */ 1807 */
1725 1808 for (object *next, *tmp = ms.top; tmp; tmp = next)
1726 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1727 {
1728 /* Trim the search when we find the first other spell effect
1729 * this helps performance so that if a space has 50 spell objects,
1730 * we don't need to check all of them.
1731 */
1732 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1733 break;
1734 } 1809 {
1810 next = tmp->below;
1735 1811
1736 for (; tmp; tmp = tmp->below)
1737 {
1738 if (tmp == op) 1812 if (tmp == op)
1739 continue; /* Can't apply yourself */ 1813 continue; /* Can't apply yourself */
1740 1814
1741 /* Check to see if one of the movement types should be slowed down. 1815 /* Check to see if one of the movement types should be slowed down.
1742 * Second check makes sure that the movement types not being slowed 1816 * Second check makes sure that the movement types not being slowed
… …
1747 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1821 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1748 { 1822 {
1749 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1823 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1750 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1824 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1751 { 1825 {
1752
1753 float
1754 diff = tmp->move_slow_penalty * fabs (op->speed); 1826 float diff = tmp->move_slow_penalty * fabs (op->speed);
1755 1827
1756 if (op->type == PLAYER) 1828 if (op->is_player ())
1757 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1829 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1758 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1830 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1759 diff /= 4.0; 1831 diff /= 4.0;
1760 1832
1761 op->speed_left -= diff; 1833 op->speed_left -= diff;
1762 } 1834 }
1763 } 1835 }
… …
1969 * head of the object should correspond for the entire object. 2041 * head of the object should correspond for the entire object.
1970 */ 2042 */
1971 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2043 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1972 continue; 2044 continue;
1973 2045
1974 if (ob->blocked (m, pos.x, pos.y)) 2046 if (ob->blocked (pos.m, pos.x, pos.y))
1975 continue; 2047 continue;
1976 2048
1977 altern [index++] = i; 2049 altern [index++] = i;
1978 } 2050 }
1979 2051
… …
2047 * there is capable of. 2119 * there is capable of.
2048 */ 2120 */
2049int 2121int
2050find_dir (maptile *m, int x, int y, object *exclude) 2122find_dir (maptile *m, int x, int y, object *exclude)
2051{ 2123{
2052 int i, max = SIZEOFFREE, mflags; 2124 int max = SIZEOFFREE, mflags;
2053
2054 sint16 nx, ny;
2055 object *tmp;
2056 maptile *mp;
2057
2058 MoveType blocked, move_type; 2125 MoveType move_type;
2059 2126
2060 if (exclude && exclude->head_ () != exclude) 2127 if (exclude && exclude->head_ () != exclude)
2061 { 2128 {
2062 exclude = exclude->head; 2129 exclude = exclude->head;
2063 move_type = exclude->move_type; 2130 move_type = exclude->move_type;
… …
2066 { 2133 {
2067 /* If we don't have anything, presume it can use all movement types. */ 2134 /* If we don't have anything, presume it can use all movement types. */
2068 move_type = MOVE_ALL; 2135 move_type = MOVE_ALL;
2069 } 2136 }
2070 2137
2071 for (i = 1; i < max; i++) 2138 for (int i = 1; i < max; i++)
2072 { 2139 {
2073 mp = m; 2140 mapxy pos (m, x, y);
2074 nx = x + freearr_x[i]; 2141 pos.move (i);
2075 ny = y + freearr_y[i];
2076 2142
2077 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2143 if (!pos.normalise ())
2078
2079 if (mflags & P_OUT_OF_MAP)
2080 max = maxfree[i]; 2144 max = maxfree[i];
2081 else 2145 else
2082 { 2146 {
2083 mapspace &ms = mp->at (nx, ny); 2147 mapspace &ms = *pos;
2084 2148
2085 blocked = ms.move_block;
2086
2087 if ((move_type & blocked) == move_type) 2149 if ((move_type & ms.move_block) == move_type)
2088 max = maxfree[i]; 2150 max = maxfree [i];
2089 else if (mflags & P_IS_ALIVE) 2151 else if (ms.flags () & P_IS_ALIVE)
2090 { 2152 {
2091 for (tmp = ms.bot; tmp; tmp = tmp->above) 2153 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2092 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2154 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2093 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2155 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2094 break;
2095
2096 if (tmp)
2097 return freedir[i]; 2156 return freedir [i];
2098 } 2157 }
2099 } 2158 }
2100 } 2159 }
2101 2160
2102 return 0; 2161 return 0;
… …
2177 * This basically means that if direction is 15, then it could either go 2236 * This basically means that if direction is 15, then it could either go
2178 * direction 4, 14, or 16 to get back to where we are. 2237 * direction 4, 14, or 16 to get back to where we are.
2179 * Moved from spell_util.c to object.c with the other related direction 2238 * Moved from spell_util.c to object.c with the other related direction
2180 * functions. 2239 * functions.
2181 */ 2240 */
2182int reduction_dir[SIZEOFFREE][3] = { 2241static const int reduction_dir[SIZEOFFREE][3] = {
2183 {0, 0, 0}, /* 0 */ 2242 {0, 0, 0}, /* 0 */
2184 {0, 0, 0}, /* 1 */ 2243 {0, 0, 0}, /* 1 */
2185 {0, 0, 0}, /* 2 */ 2244 {0, 0, 0}, /* 2 */
2186 {0, 0, 0}, /* 3 */ 2245 {0, 0, 0}, /* 3 */
2187 {0, 0, 0}, /* 4 */ 2246 {0, 0, 0}, /* 4 */
… …
2283int 2342int
2284can_pick (const object *who, const object *item) 2343can_pick (const object *who, const object *item)
2285{ 2344{
2286 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2345 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2287 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2346 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2288 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2347 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2289} 2348}
2290 2349
2291/* 2350/*
2292 * create clone from object to another 2351 * create clone from object to another
2293 */ 2352 */
… …
2325 return tmp; 2384 return tmp;
2326 2385
2327 return 0; 2386 return 0;
2328} 2387}
2329 2388
2330const shstr & 2389shstr_tmp
2331object::kv_get (const shstr &key) const 2390object::kv_get (shstr_tmp key) const
2332{ 2391{
2333 for (key_value *kv = key_values; kv; kv = kv->next) 2392 for (key_value *kv = key_values; kv; kv = kv->next)
2334 if (kv->key == key) 2393 if (kv->key == key)
2335 return kv->value; 2394 return kv->value;
2336 2395
2337 return shstr_null; 2396 return shstr ();
2338} 2397}
2339 2398
2340void 2399void
2341object::kv_set (const shstr &key, const shstr &value) 2400object::kv_set (shstr_tmp key, shstr_tmp value)
2342{ 2401{
2343 for (key_value *kv = key_values; kv; kv = kv->next) 2402 for (key_value *kv = key_values; kv; kv = kv->next)
2344 if (kv->key == key) 2403 if (kv->key == key)
2345 { 2404 {
2346 kv->value = value; 2405 kv->value = value;
… …
2355 2414
2356 key_values = kv; 2415 key_values = kv;
2357} 2416}
2358 2417
2359void 2418void
2360object::kv_del (const shstr &key) 2419object::kv_del (shstr_tmp key)
2361{ 2420{
2362 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2421 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2363 if ((*kvp)->key == key) 2422 if ((*kvp)->key == key)
2364 { 2423 {
2365 key_value *kv = *kvp; 2424 key_value *kv = *kvp;
… …
2458{ 2517{
2459 return map ? map->region (x, y) 2518 return map ? map->region (x, y)
2460 : region::default_region (); 2519 : region::default_region ();
2461} 2520}
2462 2521
2463const materialtype_t *
2464object::dominant_material () const
2465{
2466 if (materialtype_t *mt = name_to_material (materialname))
2467 return mt;
2468
2469 return name_to_material (shstr_unknown);
2470}
2471
2472void 2522void
2473object::open_container (object *new_container) 2523object::open_container (object *new_container)
2474{ 2524{
2475 if (container == new_container) 2525 if (container == new_container)
2476 return; 2526 return;
… …
2496 container = 0; 2546 container = 0;
2497 2547
2498 // client needs item update to make it work, client bug requires this to be separate 2548 // client needs item update to make it work, client bug requires this to be separate
2499 esrv_update_item (UPD_FLAGS, this, old_container); 2549 esrv_update_item (UPD_FLAGS, this, old_container);
2500 2550
2501 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2551 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2502 play_sound (sound_find ("chest_close")); 2552 play_sound (sound_find ("chest_close"));
2503 } 2553 }
2504 2554
2505 if (new_container) 2555 if (new_container)
2506 { 2556 {
… …
2516 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2566 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2517 new_container->insert (closer); 2567 new_container->insert (closer);
2518 } 2568 }
2519#endif 2569#endif
2520 2570
2521 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2571 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2522 2572
2523 // make sure the container is available, client bug requires this to be separate 2573 // make sure the container is available, client bug requires this to be separate
2524 esrv_send_item (this, new_container); 2574 esrv_send_item (this, new_container);
2525 2575
2526 new_container->flag [FLAG_APPLIED] = true; 2576 new_container->flag [FLAG_APPLIED] = true;
… …
2534// else if (!old_container->env && contr && contr->ns) 2584// else if (!old_container->env && contr && contr->ns)
2535// contr->ns->floorbox_reset (); 2585// contr->ns->floorbox_reset ();
2536} 2586}
2537 2587
2538object * 2588object *
2539object::force_find (const shstr name) 2589object::force_find (shstr_tmp name)
2540{ 2590{
2541 /* cycle through his inventory to look for the MARK we want to 2591 /* cycle through his inventory to look for the MARK we want to
2542 * place 2592 * place
2543 */ 2593 */
2544 for (object *tmp = inv; tmp; tmp = tmp->below) 2594 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2546 return splay (tmp); 2596 return splay (tmp);
2547 2597
2548 return 0; 2598 return 0;
2549} 2599}
2550 2600
2601//-GPL
2602
2551void 2603void
2604object::force_set_timer (int duration)
2605{
2606 this->duration = 1;
2607 this->speed_left = -1.f;
2608
2609 this->set_speed (duration ? 1.f / duration : 0.f);
2610}
2611
2612object *
2552object::force_add (const shstr name, int duration) 2613object::force_add (shstr_tmp name, int duration)
2553{ 2614{
2554 if (object *force = force_find (name)) 2615 if (object *force = force_find (name))
2555 force->destroy (); 2616 force->destroy ();
2556 2617
2557 object *force = get_archetype (FORCE_NAME); 2618 object *force = get_archetype (FORCE_NAME);
2558 2619
2559 force->slaying = name; 2620 force->slaying = name;
2560 force->stats.food = 1; 2621 force->force_set_timer (duration);
2561 force->speed_left = -1.f;
2562
2563 force->set_speed (duration ? 1.f / duration : 0.f);
2564 force->flag [FLAG_IS_USED_UP] = true;
2565 force->flag [FLAG_APPLIED] = true; 2622 force->flag [FLAG_APPLIED] = true;
2566 2623
2567 insert (force); 2624 return insert (force);
2568} 2625}
2569 2626
2570void 2627void
2571object::play_sound (faceidx sound) 2628object::play_sound (faceidx sound) const
2572{ 2629{
2573 if (!sound) 2630 if (!sound)
2574 return; 2631 return;
2575 2632
2576 if (flag [FLAG_REMOVED]) 2633 if (is_on_map ())
2634 map->play_sound (sound, x, y);
2635 else if (object *pl = in_player ())
2636 pl->contr->play_sound (sound);
2637}
2638
2639void
2640object::say_msg (const char *msg) const
2641{
2642 if (is_on_map ())
2643 map->say_msg (msg, x, y);
2644 else if (object *pl = in_player ())
2645 pl->contr->play_sound (sound);
2646}
2647
2648void
2649object::make_noise ()
2650{
2651 // we do not model noise in the map, so instead put
2652 // a temporary light into the noise source
2653 // could use the map instead, but that's less reliable for our
2654 // goal, which is to make invisibility a bit harder to exploit
2655
2656 // currently only works sensibly for players
2657 if (!is_player ())
2577 return; 2658 return;
2578 2659
2579 if (env) 2660 // find old force, or create new one
2580 { 2661 object *force = force_find (shstr_noise_force);
2581 if (object *pl = in_player ()) 2662
2582 pl->contr->play_sound (sound); 2663 if (force)
2583 } 2664 force->speed_left = -1.f; // patch old speed up
2584 else 2665 else
2585 map->play_sound (sound, x, y); 2666 {
2586} 2667 force = archetype::get (shstr_noise_force);
2587 2668
2669 force->slaying = shstr_noise_force;
2670 force->stats.food = 1;
2671 force->speed_left = -1.f;
2672
2673 force->set_speed (1.f / 4.f);
2674 force->flag [FLAG_IS_USED_UP] = true;
2675 force->flag [FLAG_APPLIED] = true;
2676
2677 insert (force);
2678 }
2679}
2680

Diff Legend

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