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.63 by root, Tue Dec 12 20:53:02 2006 UTC vs.
Revision 1.261 by root, Wed Oct 1 16:04:16 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 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 (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27#include <global.h> 24#include <global.h>
28#include <stdio.h> 25#include <stdio.h>
29#include <sys/types.h> 26#include <sys/types.h>
30#include <sys/uio.h> 27#include <sys/uio.h>
31#include <object.h> 28#include <object.h>
32#include <funcpoint.h> 29#include <sproto.h>
33#include <loader.h> 30#include <loader.h>
34 31
35int nrofallocobjects = 0; 32#include <bitset>
36static UUID uuid; 33
34UUID UUID::cur;
35static uint64_t seq_next_save;
37const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
38 37
39object *active_objects; /* List of active objects that need to be processed */ 38objectvec objects;
39activevec actives;
40 40
41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = {
42 0,
43 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,
42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 45 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43}; 46};
44short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 47short freearr_y[SIZEOFFREE] = {
48 0,
49 -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,
45 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 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
46}; 52};
47int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 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,
48 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 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
49}; 58};
50int freedir[SIZEOFFREE] = { 59int freedir[SIZEOFFREE] = {
51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 0,
61 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,
52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 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
53}; 64};
54 65
55static void 66static void
56write_uuid (void) 67write_uuid (uval64 skip, bool sync)
57{ 68{
58 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
59 70 CALL_ARG_SV (newSVval64 (skip));
60 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
61 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
62 73 CALL_END;
63 FILE *fp;
64
65 if (!(fp = fopen (filename2, "w")))
66 {
67 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
68 return;
69 }
70
71 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
72 fclose (fp);
73 rename (filename2, filename1);
74} 74}
75 75
76static void 76static void
77read_uuid (void) 77read_uuid (void)
78{ 78{
79 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
80 80
81 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 seq_next_save = 0;
82 84
83 FILE *fp; 85 FILE *fp;
84 86
85 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
86 { 88 {
87 if (errno == ENOENT) 89 if (errno == ENOENT)
88 { 90 {
89 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
90 uuid.seq = 0; 92 UUID::cur.seq = 0;
91 write_uuid (); 93 write_uuid (UUID_GAP, true);
92 return; 94 return;
93 } 95 }
94 96
95 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
96 _exit (1); 98 _exit (1);
97 } 99 }
98 100
99 int version; 101 UUID::BUF buf;
100 unsigned long long uid; 102 buf[0] = 0;
101 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
102 { 106 {
103 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
104 _exit (1); 108 _exit (1);
105 } 109 }
106 110
107 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
108 write_uuid (); 112
109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
110 fclose (fp); 114 fclose (fp);
111} 115}
112 116
113UUID 117UUID
114gen_uuid () 118UUID::gen ()
115{ 119{
116 UUID uid; 120 UUID uid;
117 121
118 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
119 123
120 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
121 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
122 130
123 return uid; 131 return uid;
124} 132}
125 133
126void 134void
127init_uuid () 135UUID::init ()
128{ 136{
129 read_uuid (); 137 read_uuid ();
130} 138}
131 139
132/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
133static int 141static bool
134compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
135{ 143{
136 key_value *wants_field;
137
138 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 144 /* n-squared behaviour (see kv_get), but I'm hoping both
139 * objects with lists are rare, and lists stay short. If not, use a 145 * objects with lists are rare, and lists stay short. If not, use a
140 * different structure or at least keep the lists sorted... 146 * different structure or at least keep the lists sorted...
141 */ 147 */
142 148
143 /* For each field in wants, */ 149 /* For each field in wants, */
144 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 150 for (key_value *kv = wants->key_values; kv; kv = kv->next)
145 { 151 if (has->kv_get (kv->key) != kv->value)
146 key_value *has_field; 152 return false;
147
148 /* Look for a field in has with the same key. */
149 has_field = get_ob_key_link (has, wants_field->key);
150
151 if (has_field == NULL)
152 {
153 /* No field with that name. */
154 return FALSE;
155 }
156
157 /* Found the matching field. */
158 if (has_field->value != wants_field->value)
159 {
160 /* Values don't match, so this half of the comparison is false. */
161 return FALSE;
162 }
163
164 /* If we get here, we found a match. Now for the next field in wants. */
165 }
166 153
167 /* If we get here, every field in wants has a matching field in has. */ 154 /* If we get here, every field in wants has a matching field in has. */
168 return TRUE; 155 return true;
169} 156}
170 157
171/* Returns TRUE if ob1 has the same key_values as ob2. */ 158/* Returns TRUE if ob1 has the same key_values as ob2. */
172static int 159static bool
173compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_ob_value_lists (const object *ob1, const object *ob2)
174{ 161{
175 /* However, there may be fields in has which aren't partnered in wants, 162 /* However, there may be fields in has which aren't partnered in wants,
176 * so we need to run the comparison *twice*. :( 163 * so we need to run the comparison *twice*. :(
177 */ 164 */
178 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 165 return compare_ob_value_lists_one (ob1, ob2)
166 && compare_ob_value_lists_one (ob2, ob1);
179} 167}
180 168
181/* Function examines the 2 objects given to it, and returns true if 169/* Function examines the 2 objects given to it, and returns true if
182 * they can be merged together. 170 * they can be merged together.
183 * 171 *
184 * Note that this function appears a lot longer than the macro it 172 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 173 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 174 * reduce this to the same efficiency.
187 * 175 *
188 * Check nrof variable *before* calling CAN_MERGE() 176 * Check nrof variable *before* calling can_merge()
189 * 177 *
190 * Improvements made with merge: Better checking on potion, and also 178 * Improvements made with merge: Better checking on potion, and also
191 * check weight 179 * check weight
192 */ 180 */
193
194bool object::can_merge (object *ob1, object *ob2) 181bool object::can_merge_slow (object *ob1, object *ob2)
195{ 182{
196 /* A couple quicksanity checks */ 183 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 184 if (ob1 == ob2
185 || ob1->type != ob2->type
186 || ob1->speed != ob2->speed
187 || ob1->value != ob2->value
188 || ob1->name != ob2->name)
198 return 0; 189 return 0;
199 190
200 if (ob1->speed != ob2->speed) 191 /* Do not merge objects if nrof would overflow, assume nrof
192 * is always 0 .. 2**31-1 */
193 if (ob1->nrof > 0x7fffffff - ob2->nrof)
201 return 0; 194 return 0;
202 195
203 /* 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
205 * used to store nrof).
206 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31)
208 return 0;
209
210 /* If the objects have been identified, set the BEEN_APPLIED flag. 196 /* If the objects have been identified, set the BEEN_APPLIED flag.
211 * This is to the comparison of the flags below will be OK. We 197 * This is to the comparison of the flags below will be OK. We
212 * just can't ignore the been applied or identified flags, as they 198 * just can't ignore the been applied or identified flags, as they
213 * are not equal - just if it has been identified, the been_applied 199 * are not equal - just if it has been identified, the been_applied
214 * flags lose any meaning. 200 * flags lose any meaning.
215 */ 201 */
216 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 202 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 203 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 204
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 205 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 207
222 208 if (ob1->arch->archname != ob2->arch->archname
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
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) || 209 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 210 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 211 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 212 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||
238 (ob1->attacktype != ob2->attacktype) || 213 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 214 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 215 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 216 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 217 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 218 || ob1->animation_id != ob2->animation_id
219 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
244 (ob1->client_type != ob2->client_type) || 220 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 221 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 222 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 223 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 224 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 225 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 226 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 227 || 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)) 228 || ob1->move_off != ob2->move_off
229 || ob1->move_slow != ob2->move_slow
230 || ob1->move_slow_penalty != ob2->move_slow_penalty
231 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253 return 0; 233 return 0;
254 234
235 if ((ob1->flag ^ ob2->flag)
236 .reset (FLAG_INV_LOCKED)
237 .reset (FLAG_REMOVED)
238 .any ())
239 return 0;
240
255 /* This is really a spellbook check - really, we should 241 /* This is really a spellbook check - we should in general
256 * check all objects in the inventory. 242 * not merge objects with real inventories, as splitting them
243 * is hard.
257 */ 244 */
258 if (ob1->inv || ob2->inv) 245 if (ob1->inv || ob2->inv)
259 { 246 {
260 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0;
263
264 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 247 if (!(ob1->inv && ob2->inv))
266 return 0; 248 return 0; /* inventories differ in length */
249
250 if (ob1->inv->below || ob2->inv->below)
251 return 0; /* more than one object in inv */
252
253 if (!object::can_merge (ob1->inv, ob2->inv))
254 return 0; /* inventory objects differ */
267 255
268 /* inventory ok - still need to check rest of this object to see 256 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 257 * if it is valid.
270 */ 258 */
271 } 259 }
279 267
280 /* Note sure why the following is the case - either the object has to 268 /* Note sure why the following is the case - either the object has to
281 * be animated or have a very low speed. Is this an attempted monster 269 * be animated or have a very low speed. Is this an attempted monster
282 * check? 270 * check?
283 */ 271 */
284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 272 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
285 return 0; 273 return 0;
286 274
287 switch (ob1->type) 275 switch (ob1->type)
288 { 276 {
289 case SCROLL: 277 case SCROLL:
290 if (ob1->level != ob2->level) 278 if (ob1->level != ob2->level)
291 return 0; 279 return 0;
292 break; 280 break;
293 } 281 }
294 282
295 if (ob1->key_values != NULL || ob2->key_values != NULL) 283 if (ob1->key_values || ob2->key_values)
296 { 284 {
297 /* At least one of these has key_values. */ 285 /* At least one of these has key_values. */
298 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 286 if ((!ob1->key_values) != (!ob2->key_values))
299 /* One has fields, but the other one doesn't. */ 287 return 0; /* One has fields, but the other one doesn't. */
288
289 if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 290 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0;
303 } 291 }
304 292
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 293 if (ob1->self || ob2->self)
307 { 294 {
308 ob1->optimise (); 295 ob1->optimise ();
309 ob2->optimise (); 296 ob2->optimise ();
310 297
311 if (ob1->self || ob2->self) 298 if (ob1->self || ob2->self)
299 {
300 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
301 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
302
303 if (k1 != k2)
312 return 0; 304 return 0;
305
306 if (k1 == 0)
307 return 1;
308
309 if (!cfperl_can_merge (ob1, ob2))
310 return 0;
311 }
313 } 312 }
314 313
315 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
316 return 1; 315 return 1;
317} 316}
318 317
318// find player who can see this object
319object *
320object::visible_to () const
321{
322 if (client_visible () && !flag [FLAG_REMOVED])
323 {
324 // see if we are in a container of sorts
325 if (env)
326 {
327 // the player inventory itself is always visible
328 if (env->type == PLAYER)
329 return env;
330
331 // else a player could have our env open
332 object *envest = env->outer_env ();
333
334 // the player itself is always on a map, so we will find him here
335 // even if our inv is in a player.
336 if (envest->is_on_map ())
337 if (object *pl = envest->ms ().player ())
338 if (pl->container == env)
339 return pl;
340 }
341 else
342 {
343 // maybe there is a player standing on the same mapspace
344 // this will catch the case where "this" is a player
345 if (object *pl = ms ().player ())
346 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
347 || this == pl->container)
348 return pl;
349 }
350 }
351
352 return 0;
353}
354
355// adjust weight per container type ("of holding")
356static sint32
357weight_adjust_for (object *op, sint32 weight)
358{
359 return op->type == CONTAINER
360 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
361 : weight;
362}
363
319/* 364/*
365 * adjust_weight(object, weight) adds the specified weight to an object,
366 * and also updates how much the environment(s) is/are carrying.
367 */
368static void
369adjust_weight (object *op, sint32 weight)
370{
371 while (op)
372 {
373 // adjust by actual difference to account for rounding errors
374 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375 weight = weight_adjust_for (op, op->carrying)
376 - weight_adjust_for (op, op->carrying - weight);
377
378 if (!weight)
379 return;
380
381 op->carrying += weight;
382
383 if (object *pl = op->visible_to ())
384 if (pl != op) // player is handled lazily
385 esrv_update_item (UPD_WEIGHT, pl, op);
386
387 op = op->env;
388 }
389}
390
391/*
320 * sum_weight() is a recursive function which calculates the weight 392 * this is a recursive function which calculates the weight
321 * an object is carrying. It goes through in figures out how much 393 * an object is carrying. It goes through op and figures out how much
322 * containers are carrying, and sums it up. 394 * containers are carrying, and sums it up.
323 */ 395 */
324long 396void
325sum_weight (object *op) 397object::update_weight ()
326{ 398{
327 long sum; 399 sint32 sum = 0;
328 object *inv;
329 400
330 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 401 for (object *op = inv; op; op = op->below)
331 { 402 {
332 if (inv->inv) 403 if (op->inv)
333 sum_weight (inv); 404 op->update_weight ();
334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 405
406 sum += op->total_weight ();
407 }
408
409 sum = weight_adjust_for (this, sum);
410
411 if (sum != carrying)
335 } 412 {
336
337 if (op->type == CONTAINER && op->stats.Str)
338 sum = (sum * (100 - op->stats.Str)) / 100;
339
340 if (op->carrying != sum)
341 op->carrying = sum; 413 carrying = sum;
342 414
343 return sum; 415 if (object *pl = visible_to ())
416 if (pl != this) // player is handled lazily
417 esrv_update_item (UPD_WEIGHT, pl, this);
418 }
344} 419}
345 420
346/** 421/*
347 * Return the outermost environment object for a given object. 422 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
348 */ 423 */
349
350object *
351object_get_env_recursive (object *op)
352{
353 while (op->env != NULL)
354 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;
371}
372
373/*
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages.
376 * The result of the dump is stored in the static global errmsg array.
377 */
378
379char * 424char *
380dump_object (object *op) 425dump_object (object *op)
381{ 426{
382 if (!op) 427 if (!op)
383 return strdup ("[NULLOBJ]"); 428 return strdup ("[NULLOBJ]");
384 429
385 object_freezer freezer; 430 object_freezer freezer;
386 save_object (freezer, op, 3); 431 op->write (freezer);
387 return freezer.as_string (); 432 return freezer.as_string ();
388} 433}
389 434
390/* 435/*
391 * get_nearest_part(multi-object, object 2) returns the part of the 436 * get_nearest_part(multi-object, object 2) returns the part of the
392 * multi-object 1 which is closest to the second object. 437 * multi-object 1 which is closest to the second object.
393 * If it's not a multi-object, it is returned. 438 * If it's not a multi-object, it is returned.
394 */ 439 */
395
396object * 440object *
397get_nearest_part (object *op, const object *pl) 441get_nearest_part (object *op, const object *pl)
398{ 442{
399 object *tmp, *closest; 443 object *tmp, *closest;
400 int last_dist, i; 444 int last_dist, i;
401 445
402 if (op->more == NULL) 446 if (!op->more)
403 return op; 447 return op;
448
404 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 449 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
450 tmp;
451 tmp = tmp->more)
405 if ((i = distance (tmp, pl)) < last_dist) 452 if ((i = distance (tmp, pl)) < last_dist)
406 closest = tmp, last_dist = i; 453 closest = tmp, last_dist = i;
454
407 return closest; 455 return closest;
408} 456}
409 457
410/* 458/*
411 * Returns the object which has the count-variable equal to the argument. 459 * Returns the object which has the count-variable equal to the argument.
460 * VERRRY slow.
412 */ 461 */
413
414object * 462object *
415find_object (tag_t i) 463find_object (tag_t i)
416{ 464{
417 for (object *op = object::first; op; op = op->next) 465 for_all_objects (op)
418 if (op->count == i) 466 if (op->count == i)
419 return op; 467 return op;
420 468
421 return 0; 469 return 0;
422} 470}
423 471
424/* 472/*
425 * Returns the first object which has a name equal to the argument. 473 * Returns the first object which has a name equal to the argument.
426 * Used only by the patch command, but not all that useful. 474 * Used only by the patch command, but not all that useful.
427 * Enables features like "patch <name-of-other-player> food 999" 475 * Enables features like "patch <name-of-other-player> food 999"
428 */ 476 */
429
430object * 477object *
431find_object_name (const char *str) 478find_object_name (const char *str)
432{ 479{
433 shstr_cmp str_ (str); 480 shstr_cmp str_ (str);
434 object *op;
435 481
436 for (op = object::first; op != NULL; op = op->next) 482 if (str_)
483 for_all_objects (op)
437 if (op->name == str_) 484 if (op->name == str_)
438 break; 485 return op;
439 486
440 return op; 487 return 0;
441}
442
443void
444free_all_object_data ()
445{
446 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
447} 488}
448 489
449/* 490/*
450 * Sets the owner and sets the skill and exp pointers to owner's current 491 * Sets the owner and sets the skill and exp pointers to owner's current
451 * skill and experience objects. 492 * skill and experience objects.
493 * ACTUALLY NO! investigate! TODO
452 */ 494 */
453void 495void
454object::set_owner (object *owner) 496object::set_owner (object *owner)
455{ 497{
498 // allow objects which own objects
456 if (!owner) 499 if (owner)
457 return;
458
459 /* next line added to allow objects which own objects */
460 /* Add a check for ownercounts in here, as I got into an endless loop
461 * with the fireball owning a poison cloud which then owned the
462 * fireball. I believe that was caused by one of the objects getting
463 * freed and then another object replacing it. Since the ownercounts
464 * didn't match, this check is valid and I believe that cause is valid.
465 */
466 while (owner->owner) 500 while (owner->owner)
467 owner = owner->owner; 501 owner = owner->owner;
502
503 if (flag [FLAG_FREED])
504 {
505 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
506 return;
507 }
468 508
469 this->owner = owner; 509 this->owner = owner;
510}
511
512int
513object::slottype () const
514{
515 if (type == SKILL)
516 {
517 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
518 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
519 }
520 else
521 {
522 if (slot [body_combat].info) return slot_combat;
523 if (slot [body_range ].info) return slot_ranged;
524 }
525
526 return slot_none;
527}
528
529bool
530object::change_weapon (object *ob)
531{
532 if (current_weapon == ob)
533 return true;
534
535 if (chosen_skill)
536 chosen_skill->flag [FLAG_APPLIED] = false;
537
538 current_weapon = ob;
539 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
540
541 if (chosen_skill)
542 chosen_skill->flag [FLAG_APPLIED] = true;
543
544 update_stats ();
545
546 if (ob)
547 {
548 // now check wether any body locations became invalid, in which case
549 // we cannot apply the weapon at the moment.
550 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
551 if (slot[i].used < 0)
552 {
553 current_weapon = chosen_skill = 0;
554 update_stats ();
555
556 new_draw_info_format (NDI_UNIQUE, 0, this,
557 "You try to balance all your items at once, "
558 "but the %s is just too much for your body. "
559 "[You need to unapply some items first.]", &ob->name);
560 return false;
561 }
562
563 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564 }
565 else
566 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
567
568 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
569 {
570 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
571 &name, ob->debug_desc ());
572 return false;
573 }
574
575 return true;
470} 576}
471 577
472/* Zero the key_values on op, decrementing the shared-string 578/* Zero the key_values on op, decrementing the shared-string
473 * refcounts and freeing the links. 579 * refcounts and freeing the links.
474 */ 580 */
475static void 581static void
476free_key_values (object *op) 582free_key_values (object *op)
477{ 583{
478 for (key_value *i = op->key_values; i != 0;) 584 for (key_value *i = op->key_values; i; )
479 { 585 {
480 key_value *next = i->next; 586 key_value *next = i->next;
481 delete i; 587 delete i;
482 588
483 i = next; 589 i = next;
484 } 590 }
485 591
486 op->key_values = 0; 592 op->key_values = 0;
487} 593}
488 594
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
531void object::clone (object *destination)
532{
533 *(object_copy *)destination = *this;
534 *(object_pod *)destination = *this;
535
536 if (self || cb)
537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538}
539
540/* 595/*
541 * copy object first frees everything allocated by the second object, 596 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 597 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 598 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 599 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
545 * if the first object is freed, the pointers in the new object 600 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 601 * will point at garbage.
547 */ 602 */
548void 603void
549copy_object (object *op2, object *op) 604object::copy_to (object *dst)
550{ 605{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 606 dst->remove ();
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 607 *(object_copy *)dst = *this;
553 608 dst->flag [FLAG_REMOVED] = true;
554 op2->clone (op);
555
556 if (is_freed)
557 SET_FLAG (op, FLAG_FREED);
558
559 if (is_removed)
560 SET_FLAG (op, FLAG_REMOVED);
561
562 if (op2->speed < 0)
563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
564 609
565 /* Copy over key_values, if any. */ 610 /* Copy over key_values, if any. */
566 if (op2->key_values) 611 if (key_values)
567 { 612 {
568 key_value *tail = 0; 613 key_value *tail = 0;
569 key_value *i;
570
571 op->key_values = 0; 614 dst->key_values = 0;
572 615
573 for (i = op2->key_values; i; i = i->next) 616 for (key_value *i = key_values; i; i = i->next)
574 { 617 {
575 key_value *new_link = new key_value; 618 key_value *new_link = new key_value;
576 619
577 new_link->next = 0; 620 new_link->next = 0;
578 new_link->key = i->key; 621 new_link->key = i->key;
579 new_link->value = i->value; 622 new_link->value = i->value;
580 623
581 /* Try and be clever here, too. */ 624 /* Try and be clever here, too. */
582 if (!op->key_values) 625 if (!dst->key_values)
583 { 626 {
584 op->key_values = new_link; 627 dst->key_values = new_link;
585 tail = new_link; 628 tail = new_link;
586 } 629 }
587 else 630 else
588 { 631 {
589 tail->next = new_link; 632 tail->next = new_link;
590 tail = new_link; 633 tail = new_link;
591 } 634 }
592 } 635 }
593 } 636 }
594 637
595 update_ob_speed (op); 638 if (speed < 0)
639 dst->speed_left -= rndm ();
640
641 dst->activate ();
642}
643
644void
645object::instantiate ()
646{
647 if (!uuid.seq) // HACK
648 uuid = UUID::gen ();
649
650 speed_left = -0.1f;
651 /* copy the body_info to the body_used - this is only really
652 * need for monsters, but doesn't hurt to do it for everything.
653 * by doing so, when a monster is created, it has good starting
654 * values for the body_used info, so when items are created
655 * for it, they can be properly equipped.
656 */
657 for (int i = NUM_BODY_LOCATIONS; i--; )
658 slot[i].used = slot[i].info;
659
660 attachable::instantiate ();
661}
662
663object *
664object::clone ()
665{
666 object *neu = create ();
667 copy_to (neu);
668 neu->map = map; // not copied by copy_to
669 return neu;
596} 670}
597 671
598/* 672/*
599 * If an object with the IS_TURNABLE() flag needs to be turned due 673 * If an object with the IS_TURNABLE() flag needs to be turned due
600 * to the closest player being on the other side, this function can 674 * to the closest player being on the other side, this function can
601 * be called to update the face variable, _and_ how it looks on the map. 675 * be called to update the face variable, _and_ how it looks on the map.
602 */ 676 */
603
604void 677void
605update_turn_face (object *op) 678update_turn_face (object *op)
606{ 679{
607 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 680 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
608 return; 681 return;
682
609 SET_ANIMATION (op, op->direction); 683 SET_ANIMATION (op, op->direction);
610 update_object (op, UP_OBJ_FACE); 684 update_object (op, UP_OBJ_FACE);
611} 685}
612 686
613/* 687/*
614 * Updates the speed of an object. If the speed changes from 0 to another 688 * Updates the speed of an object. If the speed changes from 0 to another
615 * value, or vice versa, then add/remove the object from the active list. 689 * value, or vice versa, then add/remove the object from the active list.
616 * This function needs to be called whenever the speed of an object changes. 690 * This function needs to be called whenever the speed of an object changes.
617 */ 691 */
618void 692void
619update_ob_speed (object *op) 693object::set_speed (float speed)
620{ 694{
621 extern int arch_init; 695 if (flag [FLAG_FREED] && speed)
622
623 /* No reason putting the archetypes objects on the speed list,
624 * since they never really need to be updated.
625 */
626
627 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
628 { 696 {
629 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 697 LOG (llevError, "Object %s is freed but has speed.\n", &name);
630#ifdef MANY_CORES
631 abort ();
632#else
633 op->speed = 0; 698 speed = 0;
634#endif
635 }
636
637 if (arch_init)
638 return;
639
640 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
641 { 699 }
642 /* If already on active list, don't do anything */
643 if (op->active_next || op->active_prev || op == active_objects)
644 return;
645 700
646 /* process_events() expects us to insert the object at the beginning 701 this->speed = speed;
647 * of the list. */
648 op->active_next = active_objects;
649 702
650 if (op->active_next != NULL) 703 if (has_active_speed ())
651 op->active_next->active_prev = op; 704 activate ();
652
653 active_objects = op;
654 }
655 else 705 else
656 { 706 deactivate ();
657 /* If not on the active list, nothing needs to be done */
658 if (!op->active_next && !op->active_prev && op != active_objects)
659 return;
660
661 if (op->active_prev == NULL)
662 {
663 active_objects = op->active_next;
664
665 if (op->active_next != NULL)
666 op->active_next->active_prev = NULL;
667 }
668 else
669 {
670 op->active_prev->active_next = op->active_next;
671
672 if (op->active_next)
673 op->active_next->active_prev = op->active_prev;
674 }
675
676 op->active_next = NULL;
677 op->active_prev = NULL;
678 }
679} 707}
680 708
681/* This function removes object 'op' from the list of active
682 * objects.
683 * This should only be used for style maps or other such
684 * reference maps where you don't want an object that isn't
685 * in play chewing up cpu time getting processed.
686 * The reverse of this is to call update_ob_speed, which
687 * will do the right thing based on the speed of the object.
688 */
689void
690remove_from_active_list (object *op)
691{
692 /* If not on the active list, nothing needs to be done */
693 if (!op->active_next && !op->active_prev && op != active_objects)
694 return;
695
696 if (op->active_prev == NULL)
697 {
698 active_objects = op->active_next;
699 if (op->active_next != NULL)
700 op->active_next->active_prev = NULL;
701 }
702 else
703 {
704 op->active_prev->active_next = op->active_next;
705 if (op->active_next)
706 op->active_next->active_prev = op->active_prev;
707 }
708 op->active_next = NULL;
709 op->active_prev = NULL;
710}
711
712/* 709/*
713 * update_object() updates the array which represents the map. 710 * update_object() updates the the map.
714 * It takes into account invisible objects (and represent squares covered 711 * It takes into account invisible objects (and represent squares covered
715 * by invisible objects by whatever is below them (unless it's another 712 * by invisible objects by whatever is below them (unless it's another
716 * invisible object, etc...) 713 * invisible object, etc...)
717 * If the object being updated is beneath a player, the look-window 714 * If the object being updated is beneath a player, the look-window
718 * of that player is updated (this might be a suboptimal way of 715 * of that player is updated (this might be a suboptimal way of
719 * updating that window, though, since update_object() is called _often_) 716 * updating that window, though, since update_object() is called _often_)
720 * 717 *
721 * action is a hint of what the caller believes need to be done. 718 * action is a hint of what the caller believes need to be done.
722 * For example, if the only thing that has changed is the face (due to
723 * an animation), we don't need to call update_position until that actually
724 * comes into view of a player. OTOH, many other things, like addition/removal
725 * of walls or living creatures may need us to update the flags now.
726 * current action are: 719 * current action are:
727 * UP_OBJ_INSERT: op was inserted 720 * UP_OBJ_INSERT: op was inserted
728 * UP_OBJ_REMOVE: op was removed 721 * UP_OBJ_REMOVE: op was removed
729 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 722 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
730 * as that is easier than trying to look at what may have changed. 723 * as that is easier than trying to look at what may have changed.
731 * UP_OBJ_FACE: only the objects face has changed. 724 * UP_OBJ_FACE: only the objects face has changed.
732 */ 725 */
733
734void 726void
735update_object (object *op, int action) 727update_object (object *op, int action)
736{ 728{
737 int update_now = 0, flags; 729 if (!op)
738 MoveType move_on, move_off, move_block, move_slow;
739
740 if (op == NULL)
741 { 730 {
742 /* this should never happen */ 731 /* this should never happen */
743 LOG (llevDebug, "update_object() called for NULL object.\n"); 732 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
744 return; 733 return;
745 } 734 }
746 735
747 if (op->env != NULL) 736 if (!op->is_on_map ())
748 { 737 {
749 /* Animation is currently handled by client, so nothing 738 /* Animation is currently handled by client, so nothing
750 * to do in this case. 739 * to do in this case.
751 */ 740 */
752 return; 741 return;
753 } 742 }
754 743
755 /* If the map is saving, don't do anything as everything is
756 * going to get freed anyways.
757 */
758 if (!op->map || op->map->in_memory == MAP_SAVING)
759 return;
760
761 /* make sure the object is within map boundaries */ 744 /* make sure the object is within map boundaries */
762 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 745 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
763 { 746 {
764 LOG (llevError, "update_object() called for object out of map!\n"); 747 LOG (llevError, "update_object() called for object out of map!\n");
765#ifdef MANY_CORES 748#ifdef MANY_CORES
766 abort (); 749 abort ();
767#endif 750#endif
768 return; 751 return;
769 } 752 }
770 753
771 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 754 mapspace &m = op->ms ();
772 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
773 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
774 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
775 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
776 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
777 755
756 if (!(m.flags_ & P_UPTODATE))
757 /* nop */;
778 if (action == UP_OBJ_INSERT) 758 else if (action == UP_OBJ_INSERT)
779 { 759 {
760 // this is likely overkill, TODO: revisit (schmorp)
780 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
781 update_now = 1;
782
783 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
784 update_now = 1; 763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
785 764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
786 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
787 update_now = 1;
788
789 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
790 update_now = 1;
791
792 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
793 update_now = 1;
794
795 if ((move_on | op->move_on) != move_on) 767 || (m.move_on | op->move_on ) != m.move_on
796 update_now = 1;
797
798 if ((move_off | op->move_off) != move_off) 768 || (m.move_off | op->move_off ) != m.move_off
799 update_now = 1; 769 || (m.move_slow | op->move_slow) != m.move_slow
800
801 /* This isn't perfect, but I don't expect a lot of objects to 770 /* This isn't perfect, but I don't expect a lot of objects to
802 * to have move_allow right now. 771 * have move_allow right now.
803 */ 772 */
804 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 773 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
805 update_now = 1; 774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
806 775 m.flags_ = 0;
807 if ((move_slow | op->move_slow) != move_slow)
808 update_now = 1;
809 } 776 }
810
811 /* if the object is being removed, we can't make intelligent 777 /* if the object is being removed, we can't make intelligent
812 * decisions, because remove_ob can't really pass the object 778 * decisions, because remove_ob can't really pass the object
813 * that is being removed. 779 * that is being removed.
814 */ 780 */
815 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 781 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
816 update_now = 1; 782 m.flags_ = 0;
817 else if (action == UP_OBJ_FACE) 783 else if (action == UP_OBJ_FACE)
818 /* Nothing to do for that case */ ; 784 /* Nothing to do for that case */ ;
819 else 785 else
820 LOG (llevError, "update_object called with invalid action: %d\n", action); 786 LOG (llevError, "update_object called with invalid action: %d\n", action);
821 787
822 if (update_now)
823 {
824 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
825 update_position (op->map, op->x, op->y);
826 }
827
828 if (op->more != NULL) 788 if (op->more)
829 update_object (op->more, action); 789 update_object (op->more, action);
830}
831
832object::vector object::mortals;
833object::vector object::objects; // not yet used
834object *object::first;
835
836void object::free_mortals ()
837{
838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
839 if ((*i)->refcnt)
840 ++i; // further delay freeing
841 else
842 {
843 delete *i;
844 mortals.erase (i);
845 }
846} 790}
847 791
848object::object () 792object::object ()
849{ 793{
850 SET_FLAG (this, FLAG_REMOVED); 794 SET_FLAG (this, FLAG_REMOVED);
853 face = blank_face; 797 face = blank_face;
854} 798}
855 799
856object::~object () 800object::~object ()
857{ 801{
802 unlink ();
803
858 free_key_values (this); 804 free_key_values (this);
859} 805}
860 806
807static int object_count;
808
861void object::link () 809void object::link ()
862{ 810{
811 assert (!index);//D
812 uuid = UUID::gen ();
863 count = ++ob_count; 813 count = ++object_count;
864 uuid = gen_uuid ();
865 814
866 prev = 0; 815 refcnt_inc ();
867 next = object::first; 816 objects.insert (this);
868
869 if (object::first)
870 object::first->prev = this;
871
872 object::first = this;
873} 817}
874 818
875void object::unlink () 819void object::unlink ()
876{ 820{
877 if (this == object::first) 821 if (!index)
878 object::first = next; 822 return;
879 823
880 /* Remove this object from the list of used objects */ 824 objects.erase (this);
881 if (prev) prev->next = next; 825 refcnt_dec ();
882 if (next) next->prev = prev; 826}
883 827
884 prev = 0; 828void
885 next = 0; 829object::activate ()
830{
831 /* If already on active list, don't do anything */
832 if (active)
833 return;
834
835 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838 if (has_active_speed ())
839 actives.insert (this);
840}
841
842void
843object::activate_recursive ()
844{
845 activate ();
846
847 for (object *op = inv; op; op = op->below)
848 op->activate_recursive ();
849}
850
851/* This function removes object 'op' from the list of active
852 * objects.
853 * This should only be used for style maps or other such
854 * reference maps where you don't want an object that isn't
855 * in play chewing up cpu time getting processed.
856 * The reverse of this is to call update_ob_speed, which
857 * will do the right thing based on the speed of the object.
858 */
859void
860object::deactivate ()
861{
862 /* If not on the active list, nothing needs to be done */
863 if (!active)
864 return;
865
866 actives.erase (this);
867}
868
869void
870object::deactivate_recursive ()
871{
872 for (object *op = inv; op; op = op->below)
873 op->deactivate_recursive ();
874
875 deactivate ();
876}
877
878void
879object::set_flag_inv (int flag, int value)
880{
881 for (object *op = inv; op; op = op->below)
882 {
883 op->flag [flag] = value;
884 op->set_flag_inv (flag, value);
885 }
886}
887
888/*
889 * Remove and free all objects in the inventory of the given object.
890 * object.c ?
891 */
892void
893object::destroy_inv (bool drop_to_ground)
894{
895 // need to check first, because the checks below might segfault
896 // as we might be on an invalid mapspace and crossfire code
897 // is too buggy to ensure that the inventory is empty.
898 // corollary: if you create arrows etc. with stuff in its inventory,
899 // cf will crash below with off-map x and y
900 if (!inv)
901 return;
902
903 /* Only if the space blocks everything do we not process -
904 * if some form of movement is allowed, let objects
905 * drop on that space.
906 */
907 if (!drop_to_ground
908 || !map
909 || map->in_memory != MAP_ACTIVE
910 || map->no_drop
911 || ms ().move_block == MOVE_ALL)
912 {
913 while (inv)
914 inv->destroy ();
915 }
916 else
917 { /* Put objects in inventory onto this space */
918 while (inv)
919 {
920 object *op = inv;
921
922 if (op->flag [FLAG_STARTEQUIP]
923 || op->flag [FLAG_NO_DROP]
924 || op->type == RUNE
925 || op->type == TRAP
926 || op->flag [FLAG_IS_A_TEMPLATE]
927 || op->flag [FLAG_DESTROY_ON_DEATH])
928 op->destroy ();
929 else
930 map->insert (op, x, y);
931 }
932 }
886} 933}
887 934
888object *object::create () 935object *object::create ()
889{ 936{
890 object *op = new object; 937 object *op = new object;
891 op->link (); 938 op->link ();
892 return op; 939 return op;
893} 940}
894 941
895/* 942static struct freed_map : maptile
896 * free_object() frees everything allocated by an object, removes
897 * it from the list of used objects, and puts it on the list of
898 * free objects. The IS_FREED() flag is set in the object.
899 * The object must have been removed by remove_ob() first for
900 * this function to succeed.
901 *
902 * If destroy_inventory is set, free inventory as well. Else drop items in
903 * inventory to the ground.
904 */
905void object::destroy (bool destroy_inventory)
906{ 943{
907 if (QUERY_FLAG (this, FLAG_FREED)) 944 freed_map ()
945 {
946 path = "<freed objects map>";
947 name = "/internal/freed_objects_map";
948 width = 3;
949 height = 3;
950 no_drop = 1;
951 no_reset = 1;
952
953 alloc ();
954 in_memory = MAP_ACTIVE;
955 }
956
957 ~freed_map ()
958 {
959 destroy ();
960 }
961} freed_map; // freed objects are moved here to avoid crashes
962
963void
964object::do_destroy ()
965{
966 if (flag [FLAG_IS_LINKED])
967 remove_button_link (this);
968
969 if (flag [FLAG_FRIENDLY])
970 remove_friendly_object (this);
971
972 remove ();
973
974 attachable::do_destroy ();
975
976 deactivate ();
977 unlink ();
978
979 flag [FLAG_FREED] = 1;
980
981 // hack to ensure that freed objects still have a valid map
982 map = &freed_map;
983 x = 1;
984 y = 1;
985
986 if (more)
987 {
988 more->destroy ();
989 more = 0;
990 }
991
992 head = 0;
993
994 // clear those pointers that likely might cause circular references
995 owner = 0;
996 enemy = 0;
997 attacked_by = 0;
998 current_weapon = 0;
999}
1000
1001void
1002object::destroy ()
1003{
1004 if (destroyed ())
908 return; 1005 return;
909 1006
910 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 1007 if (!is_head () && !head->destroyed ())
911 remove_friendly_object (this);
912
913 if (!QUERY_FLAG (this, FLAG_REMOVED))
914 remove ();
915
916 SET_FLAG (this, FLAG_FREED);
917
918 if (more)
919 {
920 more->destroy (destroy_inventory);
921 more = 0;
922 }
923
924 if (inv)
925 {
926 /* Only if the space blocks everything do we not process -
927 * if some form of movement is allowed, let objects
928 * drop on that space.
929 */
930 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
931 {
932 object *op = inv;
933
934 while (op)
935 {
936 object *tmp = op->below;
937 op->destroy (destroy_inventory);
938 op = tmp;
939 }
940 }
941 else
942 { /* Put objects in inventory onto this space */
943 object *op = inv;
944
945 while (op)
946 {
947 object *tmp = op->below;
948
949 op->remove ();
950
951 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
952 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
953 op->destroy (0);
954 else
955 {
956 op->x = x;
957 op->y = y;
958 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
959 }
960
961 op = tmp;
962 }
963 }
964 }
965
966 // hack to ensure that freed objects still have a valid map
967 {
968 static maptile *freed_map; // freed objects are moved here to avoid crashes
969
970 if (!freed_map)
971 { 1008 {
972 freed_map = new maptile; 1009 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
973 1010 head->destroy ();
974 freed_map->name = "/internal/freed_objects_map"; 1011 return;
975 freed_map->width = 3;
976 freed_map->height = 3;
977
978 freed_map->allocate ();
979 } 1012 }
980 1013
981 map = freed_map; 1014 destroy_inv (false);
982 x = 1;
983 y = 1;
984 }
985 1015
986 // clear those pointers that likely might have circular references to us 1016 if (is_head ())
987 owner = 0; 1017 if (sound_destroy)
988 enemy = 0; 1018 play_sound (sound_destroy);
989 attacked_by = 0; 1019 else if (flag [FLAG_MONSTER])
1020 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
990 1021
991 // only relevant for players(?), but make sure of it anyways 1022 attachable::destroy ();
992 contr = 0;
993
994 /* Remove object from the active list */
995 speed = 0;
996 update_ob_speed (this);
997
998 unlink ();
999
1000 mortals.push_back (this);
1001}
1002
1003/*
1004 * sub_weight() recursively (outwards) subtracts a number from the
1005 * weight of an object (and what is carried by it's environment(s)).
1006 */
1007void
1008sub_weight (object *op, signed long weight)
1009{
1010 while (op != NULL)
1011 {
1012 if (op->type == CONTAINER)
1013 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1014
1015 op->carrying -= weight;
1016 op = op->env;
1017 }
1018} 1023}
1019 1024
1020/* op->remove (): 1025/* op->remove ():
1021 * This function removes the object op from the linked list of objects 1026 * This function removes the object op from the linked list of objects
1022 * which it is currently tied to. When this function is done, the 1027 * which it is currently tied to. When this function is done, the
1023 * object will have no environment. If the object previously had an 1028 * object will have no environment. If the object previously had an
1024 * environment, the x and y coordinates will be updated to 1029 * environment, the x and y coordinates will be updated to
1025 * the previous environment. 1030 * the previous environment.
1026 * Beware: This function is called from the editor as well!
1027 */ 1031 */
1028void 1032void
1029object::remove () 1033object::do_remove ()
1030{ 1034{
1031 object *tmp, *last = 0; 1035 object *tmp, *last = 0;
1032 object *otmp; 1036 object *otmp;
1033 1037
1034 int check_walk_off; 1038 if (flag [FLAG_REMOVED])
1035
1036 if (QUERY_FLAG (this, FLAG_REMOVED))
1037 return; 1039 return;
1038 1040
1039 SET_FLAG (this, FLAG_REMOVED); 1041 INVOKE_OBJECT (REMOVE, this);
1042
1043 flag [FLAG_REMOVED] = true;
1040 1044
1041 if (more) 1045 if (more)
1042 more->remove (); 1046 more->remove ();
1043 1047
1044 /* 1048 /*
1045 * In this case, the object to be removed is in someones 1049 * In this case, the object to be removed is in someones
1046 * inventory. 1050 * inventory.
1047 */ 1051 */
1048 if (env) 1052 if (env)
1049 { 1053 {
1050 if (nrof) 1054 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1051 sub_weight (env, weight * nrof); 1055 if (object *pl = visible_to ())
1052 else 1056 esrv_del_item (pl->contr, count);
1053 sub_weight (env, weight + carrying); 1057 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058
1059 adjust_weight (env, -total_weight ());
1060
1061 /* we set up values so that it could be inserted into
1062 * the map, but we don't actually do that - it is up
1063 * to the caller to decide what we want to do.
1064 */
1065 map = env->map;
1066 x = env->x;
1067 y = env->y;
1068
1069 // make sure cmov optimisation is applicable
1070 *(above ? &above->below : &env->inv) = below;
1071 *(below ? &below->above : &above ) = above; // &above is just a dummy
1072
1073 above = 0;
1074 below = 0;
1075 env = 0;
1054 1076
1055 /* NO_FIX_PLAYER is set when a great many changes are being 1077 /* NO_FIX_PLAYER is set when a great many changes are being
1056 * made to players inventory. If set, avoiding the call 1078 * made to players inventory. If set, avoiding the call
1057 * to save cpu time. 1079 * to save cpu time.
1058 */ 1080 */
1059 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1081 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1060 fix_player (otmp); 1082 otmp->update_stats ();
1061
1062 if (above != NULL)
1063 above->below = below;
1064 else
1065 env->inv = below;
1066
1067 if (below != NULL)
1068 below->above = above;
1069
1070 /* we set up values so that it could be inserted into
1071 * the map, but we don't actually do that - it is up
1072 * to the caller to decide what we want to do.
1073 */
1074 x = env->x, y = env->y;
1075 map = env->map;
1076 above = 0, below = 0;
1077 env = 0;
1078 } 1083 }
1079 else if (map) 1084 else if (map)
1080 { 1085 {
1081 /* Re did the following section of code - it looks like it had 1086 map->dirty = true;
1082 * lots of logic for things we no longer care about 1087 mapspace &ms = this->ms ();
1088
1089 if (object *pl = ms.player ())
1083 */ 1090 {
1091 if (type == PLAYER) // this == pl(!)
1092 {
1093 // leaving a spot always closes any open container on the ground
1094 if (container && !container->env)
1095 // this causes spurious floorbox updates, but it ensures
1096 // that the CLOSE event is being sent.
1097 close_container ();
1098
1099 --map->players;
1100 map->touch ();
1101 }
1102 else if (pl->container == this)
1103 {
1104 // removing a container should close it
1105 close_container ();
1106 }
1107
1108 esrv_del_item (pl->contr, count);
1109 }
1084 1110
1085 /* link the object above us */ 1111 /* link the object above us */
1086 if (above) 1112 // re-link, make sure compiler can easily use cmove
1087 above->below = below; 1113 *(above ? &above->below : &ms.top) = below;
1088 else 1114 *(below ? &below->above : &ms.bot) = above;
1089 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1090
1091 /* Relink the object below us, if there is one */
1092 if (below)
1093 below->above = above;
1094 else
1095 {
1096 /* Nothing below, which means we need to relink map object for this space
1097 * use translated coordinates in case some oddness with map tiling is
1098 * evident
1099 */
1100 if (GET_MAP_OB (map, x, y) != this)
1101 {
1102 char *dump = dump_object (this);
1103 LOG (llevError,
1104 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1105 free (dump);
1106 dump = dump_object (GET_MAP_OB (map, x, y));
1107 LOG (llevError, "%s\n", dump);
1108 free (dump);
1109 }
1110
1111 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1112 }
1113 1115
1114 above = 0; 1116 above = 0;
1115 below = 0; 1117 below = 0;
1116 1118
1119 ms.flags_ = 0;
1120
1117 if (map->in_memory == MAP_SAVING) 1121 if (map->in_memory == MAP_SAVING)
1118 return; 1122 return;
1119 1123
1120 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1124 int check_walk_off = !flag [FLAG_NO_APPLY];
1121 1125
1126 if (object *pl = ms.player ())
1127 {
1128 if (pl->container == this)
1129 /* If a container that the player is currently using somehow gets
1130 * removed (most likely destroyed), update the player view
1131 * appropriately.
1132 */
1133 pl->close_container ();
1134
1135 //TODO: the floorbox prev/next might need updating
1136 //esrv_del_item (pl->contr, count);
1137 //TODO: update floorbox to preserve ordering
1138 if (pl->contr->ns)
1139 pl->contr->ns->floorbox_update ();
1140 }
1141
1122 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1142 for (tmp = ms.bot; tmp; tmp = tmp->above)
1123 { 1143 {
1124 /* No point updating the players look faces if he is the object 1144 /* No point updating the players look faces if he is the object
1125 * being removed. 1145 * being removed.
1126 */ 1146 */
1127 1147
1128 if (tmp->type == PLAYER && tmp != this)
1129 {
1130 /* If a container that the player is currently using somehow gets
1131 * removed (most likely destroyed), update the player view
1132 * appropriately.
1133 */
1134 if (tmp->container == this)
1135 {
1136 CLEAR_FLAG (this, FLAG_APPLIED);
1137 tmp->container = 0;
1138 }
1139
1140 tmp->contr->socket.update_look = 1;
1141 }
1142
1143 /* See if player moving off should effect something */ 1148 /* See if object moving off should effect something */
1144 if (check_walk_off 1149 if (check_walk_off
1145 && ((move_type & tmp->move_off) 1150 && ((move_type & tmp->move_off)
1146 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1151 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1147 { 1152 {
1148 move_apply (tmp, this, 0); 1153 move_apply (tmp, this, 0);
1149 1154
1150 if (destroyed ()) 1155 if (destroyed ())
1151 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1156 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1152 } 1157 }
1153 1158
1154 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1155
1156 if (tmp->above == tmp)
1157 tmp->above = 0;
1158
1159 last = tmp; 1159 last = tmp;
1160 } 1160 }
1161 1161
1162 /* last == NULL of there are no objects on this space */
1163 if (!last)
1164 {
1165 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1166 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1167 * those out anyways, and if there are any flags set right now, they won't
1168 * be correct anyways.
1169 */
1170 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1171 update_position (map, x, y);
1172 }
1173 else
1174 update_object (last, UP_OBJ_REMOVE);
1175
1176 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1162 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1177 update_all_los (map, x, y); 1163 update_all_los (map, x, y);
1178 } 1164 }
1179} 1165}
1180 1166
1181/* 1167/*
1190merge_ob (object *op, object *top) 1176merge_ob (object *op, object *top)
1191{ 1177{
1192 if (!op->nrof) 1178 if (!op->nrof)
1193 return 0; 1179 return 0;
1194 1180
1195 if (top == NULL) 1181 if (!top)
1196 for (top = op; top != NULL && top->above != NULL; top = top->above); 1182 for (top = op; top && top->above; top = top->above)
1183 ;
1197 1184
1198 for (; top != NULL; top = top->below) 1185 for (; top; top = top->below)
1199 { 1186 if (object::can_merge (op, top))
1200 if (top == op)
1201 continue;
1202 if (CAN_MERGE (op, top))
1203 { 1187 {
1204 top->nrof += op->nrof; 1188 top->nrof += op->nrof;
1205 1189
1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1190 if (object *pl = top->visible_to ())
1207 op->weight = 0; /* Don't want any adjustements now */ 1191 esrv_update_item (UPD_NROF, pl, top);
1208 op->remove (); 1192
1193 op->weight = 0; // cancel the addition above
1194 op->carrying = 0; // must be 0 already
1195
1209 op->destroy (0); 1196 op->destroy ();
1197
1210 return top; 1198 return top;
1211 } 1199 }
1212 }
1213 1200
1214 return 0; 1201 return 0;
1215} 1202}
1216 1203
1204void
1205object::expand_tail ()
1206{
1207 if (more)
1208 return;
1209
1210 object *prev = this;
1211
1212 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1213 {
1214 object *op = arch_to_object (at);
1215
1216 op->name = name;
1217 op->name_pl = name_pl;
1218 op->title = title;
1219
1220 op->head = this;
1221 prev->more = op;
1222
1223 prev = op;
1224 }
1225}
1226
1217/* 1227/*
1218 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1228 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1219 * job preparing multi-part monsters 1229 * job preparing multi-part monsters.
1220 */ 1230 */
1221object * 1231object *
1222insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1232insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1223{ 1233{
1224 object *tmp; 1234 op->remove ();
1225 1235
1226 if (op->head)
1227 op = op->head;
1228
1229 for (tmp = op; tmp; tmp = tmp->more) 1236 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1230 { 1237 {
1231 tmp->x = x + tmp->arch->clone.x; 1238 tmp->x = x + tmp->arch->x;
1232 tmp->y = y + tmp->arch->clone.y; 1239 tmp->y = y + tmp->arch->y;
1233 } 1240 }
1234 1241
1235 return insert_ob_in_map (op, m, originator, flag); 1242 return insert_ob_in_map (op, m, originator, flag);
1236} 1243}
1237 1244
1253 * Return value: 1260 * Return value:
1254 * new object if 'op' was merged with other object 1261 * new object if 'op' was merged with other object
1255 * NULL if 'op' was destroyed 1262 * NULL if 'op' was destroyed
1256 * just 'op' otherwise 1263 * just 'op' otherwise
1257 */ 1264 */
1258
1259object * 1265object *
1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1266insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1261{ 1267{
1262 object *tmp, *top, *floor = NULL; 1268 op->remove ();
1263 sint16 x, y;
1264 1269
1265 if (QUERY_FLAG (op, FLAG_FREED)) 1270 if (m == &freed_map)//D TODO: remove soon
1266 { 1271 {//D
1267 LOG (llevError, "Trying to insert freed object!\n"); 1272 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1268 return NULL;
1269 } 1273 }//D
1270
1271 if (m == NULL)
1272 {
1273 char *dump = dump_object (op);
1274 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1275 free (dump);
1276 return op;
1277 }
1278
1279 if (out_of_map (m, op->x, op->y))
1280 {
1281 char *dump = dump_object (op);
1282 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1283#ifdef MANY_CORES
1284 /* Better to catch this here, as otherwise the next use of this object
1285 * is likely to cause a crash. Better to find out where it is getting
1286 * improperly inserted.
1287 */
1288 abort ();
1289#endif
1290 free (dump);
1291 return op;
1292 }
1293
1294 if (!QUERY_FLAG (op, FLAG_REMOVED))
1295 {
1296 char *dump = dump_object (op);
1297 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1298 free (dump);
1299 return op;
1300 }
1301
1302 if (op->more != NULL)
1303 {
1304 /* The part may be on a different map. */
1305
1306 object *more = op->more;
1307
1308 /* We really need the caller to normalize coordinates - if
1309 * we set the map, that doesn't work if the location is within
1310 * a map and this is straddling an edge. So only if coordinate
1311 * is clear wrong do we normalize it.
1312 */
1313 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1314 more->map = get_map_from_coord (m, &more->x, &more->y);
1315 else if (!more->map)
1316 {
1317 /* For backwards compatibility - when not dealing with tiled maps,
1318 * more->map should always point to the parent.
1319 */
1320 more->map = m;
1321 }
1322
1323 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1324 {
1325 if (!op->head)
1326 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1327
1328 return NULL;
1329 }
1330 }
1331
1332 CLEAR_FLAG (op, FLAG_REMOVED);
1333 1274
1334 /* Ideally, the caller figures this out. However, it complicates a lot 1275 /* Ideally, the caller figures this out. However, it complicates a lot
1335 * of areas of callers (eg, anything that uses find_free_spot would now 1276 * of areas of callers (eg, anything that uses find_free_spot would now
1336 * need extra work 1277 * need extra work
1337 */ 1278 */
1338 op->map = get_map_from_coord (m, &op->x, &op->y); 1279 if (!xy_normalise (m, op->x, op->y))
1339 x = op->x; 1280 {
1340 y = op->y; 1281 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1282 return 0;
1283 }
1284
1285 if (object *more = op->more)
1286 if (!insert_ob_in_map (more, m, originator, flag))
1287 return 0;
1288
1289 CLEAR_FLAG (op, FLAG_REMOVED);
1290
1291 op->map = m;
1292 mapspace &ms = op->ms ();
1341 1293
1342 /* this has to be done after we translate the coordinates. 1294 /* this has to be done after we translate the coordinates.
1343 */ 1295 */
1344 if (op->nrof && !(flag & INS_NO_MERGE)) 1296 if (op->nrof && !(flag & INS_NO_MERGE))
1345 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1346 if (CAN_MERGE (op, tmp)) 1298 if (object::can_merge (op, tmp))
1347 { 1299 {
1300 // TODO: we actually want to update tmp, not op,
1301 // but some caller surely breaks when we return tmp
1302 // from here :/
1348 op->nrof += tmp->nrof; 1303 op->nrof += tmp->nrof;
1349 tmp->remove ();
1350 tmp->destroy (0); 1304 tmp->destroy ();
1351 } 1305 }
1352 1306
1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1307 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1354 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1308 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1355 1309
1362 { 1316 {
1363 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1317 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1364 abort (); 1318 abort ();
1365 } 1319 }
1366 1320
1321 if (!originator->is_on_map ())
1322 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1323 op->debug_desc (), originator->debug_desc ());
1324
1367 op->above = originator; 1325 op->above = originator;
1368 op->below = originator->below; 1326 op->below = originator->below;
1369
1370 if (op->below)
1371 op->below->above = op;
1372 else
1373 SET_MAP_OB (op->map, op->x, op->y, op);
1374
1375 /* since *below* originator, no need to update top */
1376 originator->below = op; 1327 originator->below = op;
1328
1329 *(op->below ? &op->below->above : &ms.bot) = op;
1377 } 1330 }
1378 else 1331 else
1379 { 1332 {
1333 object *floor = 0;
1334 object *top = ms.top;
1335
1380 /* If there are other objects, then */ 1336 /* If there are other objects, then */
1381 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1337 if (top)
1382 { 1338 {
1383 object *last = NULL;
1384
1385 /* 1339 /*
1386 * If there are multiple objects on this space, we do some trickier handling. 1340 * If there are multiple objects on this space, we do some trickier handling.
1387 * We've already dealt with merging if appropriate. 1341 * We've already dealt with merging if appropriate.
1388 * Generally, we want to put the new object on top. But if 1342 * Generally, we want to put the new object on top. But if
1389 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1343 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1392 * once we get to them. This reduces the need to traverse over all of 1346 * once we get to them. This reduces the need to traverse over all of
1393 * them when adding another one - this saves quite a bit of cpu time 1347 * them when adding another one - this saves quite a bit of cpu time
1394 * when lots of spells are cast in one area. Currently, it is presumed 1348 * when lots of spells are cast in one area. Currently, it is presumed
1395 * that flying non pickable objects are spell objects. 1349 * that flying non pickable objects are spell objects.
1396 */ 1350 */
1397 1351 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1398 while (top != NULL)
1399 { 1352 {
1400 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1353 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1401 floor = top; 1354 floor = tmp;
1402 1355
1403 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1356 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1404 { 1357 {
1405 /* We insert above top, so we want this object below this */ 1358 /* We insert above top, so we want this object below this */
1406 top = top->below; 1359 top = tmp->below;
1407 break; 1360 break;
1408 } 1361 }
1409 1362
1410 last = top;
1411 top = top->above; 1363 top = tmp;
1412 } 1364 }
1413
1414 /* Don't want top to be NULL, so set it to the last valid object */
1415 top = last;
1416 1365
1417 /* We let update_position deal with figuring out what the space 1366 /* We let update_position deal with figuring out what the space
1418 * looks like instead of lots of conditions here. 1367 * looks like instead of lots of conditions here.
1419 * makes things faster, and effectively the same result. 1368 * makes things faster, and effectively the same result.
1420 */ 1369 */
1421 1370
1422 /* Have object 'fall below' other objects that block view. 1371 /* Have object 'fall below' other objects that block view.
1423 * Unless those objects are exits, type 66 1372 * Unless those objects are exits.
1424 * If INS_ON_TOP is used, don't do this processing 1373 * If INS_ON_TOP is used, don't do this processing
1425 * Need to find the object that in fact blocks view, otherwise 1374 * Need to find the object that in fact blocks view, otherwise
1426 * stacking is a bit odd. 1375 * stacking is a bit odd.
1427 */ 1376 */
1428 if (!(flag & INS_ON_TOP) && 1377 if (!(flag & INS_ON_TOP)
1429 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1378 && ms.flags () & P_BLOCKSVIEW
1379 && (op->face && !faces [op->face].visibility))
1430 { 1380 {
1381 object *last;
1382
1431 for (last = top; last != floor; last = last->below) 1383 for (last = top; last != floor; last = last->below)
1432 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1384 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1433 break; 1385 break;
1386
1434 /* Check to see if we found the object that blocks view, 1387 /* Check to see if we found the object that blocks view,
1435 * and make sure we have a below pointer for it so that 1388 * and make sure we have a below pointer for it so that
1436 * we can get inserted below this one, which requires we 1389 * we can get inserted below this one, which requires we
1437 * set top to the object below us. 1390 * set top to the object below us.
1438 */ 1391 */
1439 if (last && last->below && last != floor) 1392 if (last && last->below && last != floor)
1440 top = last->below; 1393 top = last->below;
1441 } 1394 }
1442 } /* If objects on this space */ 1395 } /* If objects on this space */
1443 1396
1444 if (flag & INS_MAP_LOAD)
1445 top = GET_MAP_TOP (op->map, op->x, op->y);
1446
1447 if (flag & INS_ABOVE_FLOOR_ONLY) 1397 if (flag & INS_ABOVE_FLOOR_ONLY)
1448 top = floor; 1398 top = floor;
1449 1399
1450 /* Top is the object that our object (op) is going to get inserted above. 1400 // insert object above top, or bottom-most if top = 0
1451 */
1452
1453 /* First object on this space */
1454 if (!top) 1401 if (!top)
1455 { 1402 {
1456 op->above = GET_MAP_OB (op->map, op->x, op->y);
1457
1458 if (op->above)
1459 op->above->below = op;
1460
1461 op->below = NULL; 1403 op->below = 0;
1462 SET_MAP_OB (op->map, op->x, op->y, op); 1404 op->above = ms.bot;
1405 ms.bot = op;
1406
1407 *(op->above ? &op->above->below : &ms.top) = op;
1463 } 1408 }
1464 else 1409 else
1465 { /* get inserted into the stack above top */ 1410 {
1466 op->above = top->above; 1411 op->above = top->above;
1467
1468 if (op->above)
1469 op->above->below = op; 1412 top->above = op;
1470 1413
1471 op->below = top; 1414 op->below = top;
1472 top->above = op; 1415 *(op->above ? &op->above->below : &ms.top) = op;
1473 } 1416 }
1474 1417 }
1475 if (op->above == NULL)
1476 SET_MAP_TOP (op->map, op->x, op->y, op);
1477 } /* else not INS_BELOW_ORIGINATOR */
1478 1418
1479 if (op->type == PLAYER) 1419 if (op->type == PLAYER)
1420 {
1480 op->contr->do_los = 1; 1421 op->contr->do_los = 1;
1422 ++op->map->players;
1423 op->map->touch ();
1424 }
1481 1425
1482 /* If we have a floor, we know the player, if any, will be above 1426 op->map->dirty = true;
1483 * it, so save a few ticks and start from there. 1427
1484 */ 1428 if (object *pl = ms.player ())
1485 if (!(flag & INS_MAP_LOAD)) 1429 //TODO: the floorbox prev/next might need updating
1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1430 //esrv_send_item (pl, op);
1487 if (tmp->type == PLAYER) 1431 //TODO: update floorbox to preserve ordering
1488 tmp->contr->socket.update_look = 1; 1432 if (pl->contr->ns)
1433 pl->contr->ns->floorbox_update ();
1489 1434
1490 /* If this object glows, it may affect lighting conditions that are 1435 /* If this object glows, it may affect lighting conditions that are
1491 * visible to others on this map. But update_all_los is really 1436 * visible to others on this map. But update_all_los is really
1492 * an inefficient way to do this, as it means los for all players 1437 * an inefficient way to do this, as it means los for all players
1493 * on the map will get recalculated. The players could very well 1438 * on the map will get recalculated. The players could very well
1494 * be far away from this change and not affected in any way - 1439 * be far away from this change and not affected in any way -
1495 * this should get redone to only look for players within range, 1440 * this should get redone to only look for players within range,
1496 * or just updating the P_NEED_UPDATE for spaces within this area 1441 * or just updating the P_UPTODATE for spaces within this area
1497 * of effect may be sufficient. 1442 * of effect may be sufficient.
1498 */ 1443 */
1499 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1444 if (op->map->darkness && (op->glow_radius != 0))
1500 update_all_los (op->map, op->x, op->y); 1445 update_all_los (op->map, op->x, op->y);
1501 1446
1502 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1447 /* updates flags (blocked, alive, no magic, etc) for this map space */
1503 update_object (op, UP_OBJ_INSERT); 1448 update_object (op, UP_OBJ_INSERT);
1504 1449
1450 INVOKE_OBJECT (INSERT, op);
1451
1505 /* Don't know if moving this to the end will break anything. However, 1452 /* Don't know if moving this to the end will break anything. However,
1506 * we want to have update_look set above before calling this. 1453 * we want to have floorbox_update called before calling this.
1507 * 1454 *
1508 * check_move_on() must be after this because code called from 1455 * check_move_on() must be after this because code called from
1509 * check_move_on() depends on correct map flags (so functions like 1456 * check_move_on() depends on correct map flags (so functions like
1510 * blocked() and wall() work properly), and these flags are updated by 1457 * blocked() and wall() work properly), and these flags are updated by
1511 * update_object(). 1458 * update_object().
1512 */ 1459 */
1513 1460
1514 /* if this is not the head or flag has been passed, don't check walk on status */ 1461 /* if this is not the head or flag has been passed, don't check walk on status */
1515 if (!(flag & INS_NO_WALK_ON) && !op->head) 1462 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1516 { 1463 {
1517 if (check_move_on (op, originator)) 1464 if (check_move_on (op, originator))
1518 return NULL; 1465 return 0;
1519 1466
1520 /* If we are a multi part object, lets work our way through the check 1467 /* If we are a multi part object, lets work our way through the check
1521 * walk on's. 1468 * walk on's.
1522 */ 1469 */
1523 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1470 for (object *tmp = op->more; tmp; tmp = tmp->more)
1524 if (check_move_on (tmp, originator)) 1471 if (check_move_on (tmp, originator))
1525 return NULL; 1472 return 0;
1526 } 1473 }
1527 1474
1528 return op; 1475 return op;
1529} 1476}
1530 1477
1531/* this function inserts an object in the map, but if it 1478/* this function inserts an object in the map, but if it
1532 * finds an object of its own type, it'll remove that one first. 1479 * finds an object of its own type, it'll remove that one first.
1533 * op is the object to insert it under: supplies x and the map. 1480 * op is the object to insert it under: supplies x and the map.
1534 */ 1481 */
1535void 1482void
1536replace_insert_ob_in_map (const char *arch_string, object *op) 1483replace_insert_ob_in_map (const char *arch_string, object *op)
1537{ 1484{
1538 object *
1539 tmp;
1540 object *
1541 tmp1;
1542
1543 /* first search for itself and remove any old instances */ 1485 /* first search for itself and remove any old instances */
1544 1486
1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1487 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1546 {
1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1488 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1548 {
1549 tmp->remove ();
1550 tmp->destroy (0); 1489 tmp->destroy ();
1551 }
1552 }
1553 1490
1554 tmp1 = arch_to_object (archetype::find (arch_string)); 1491 object *tmp = arch_to_object (archetype::find (arch_string));
1555 1492
1556 tmp1->x = op->x; 1493 tmp->x = op->x;
1557 tmp1->y = op->y; 1494 tmp->y = op->y;
1495
1558 insert_ob_in_map (tmp1, op->map, op, 0); 1496 insert_ob_in_map (tmp, op->map, op, 0);
1559} 1497}
1560
1561/*
1562 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1563 * is returned contains nr objects, and the remaining parts contains
1564 * the rest (or is removed and freed if that number is 0).
1565 * On failure, NULL is returned, and the reason put into the
1566 * global static errmsg array.
1567 */
1568 1498
1569object * 1499object *
1570get_split_ob (object *orig_ob, uint32 nr) 1500object::insert_at (object *where, object *originator, int flags)
1571{ 1501{
1572 object * 1502 if (where->env)
1573 newob; 1503 return where->env->insert (this);
1574 int 1504 else
1575 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1505 return where->map->insert (this, where->x, where->y, originator, flags);
1576
1577 if (orig_ob->nrof < nr)
1578 {
1579 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1580 return NULL;
1581 }
1582
1583 newob = object_create_clone (orig_ob);
1584
1585 if ((orig_ob->nrof -= nr) < 1)
1586 orig_ob->destroy (1);
1587 else if (!is_removed)
1588 {
1589 if (orig_ob->env != NULL)
1590 sub_weight (orig_ob->env, orig_ob->weight * nr);
1591 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1592 {
1593 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1594 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1595 return NULL;
1596 }
1597 }
1598
1599 newob->nrof = nr;
1600
1601 return newob;
1602} 1506}
1603 1507
1604/* 1508/*
1605 * decrease_ob_nr(object, number) decreases a specified number from 1509 * decrease(object, number) decreases a specified number from
1606 * the amount of an object. If the amount reaches 0, the object 1510 * the amount of an object. If the amount reaches 0, the object
1607 * is subsequently removed and freed. 1511 * is subsequently removed and freed.
1608 * 1512 *
1609 * Return value: 'op' if something is left, NULL if the amount reached 0 1513 * Return value: 'op' if something is left, NULL if the amount reached 0
1610 */ 1514 */
1515bool
1516object::decrease (sint32 nr)
1517{
1518 if (!nr)
1519 return true;
1611 1520
1521 nr = min (nr, nrof);
1522
1523 if (nrof > nr)
1524 {
1525 nrof -= nr;
1526 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1527
1528 if (object *pl = visible_to ())
1529 esrv_update_item (UPD_NROF, pl, this);
1530
1531 return true;
1532 }
1533 else
1534 {
1535 destroy ();
1536 return false;
1537 }
1538}
1539
1540/*
1541 * split(ob,nr) splits up ob into two parts. The part which
1542 * is returned contains nr objects, and the remaining parts contains
1543 * the rest (or is removed and returned if that number is 0).
1544 * On failure, NULL is returned.
1545 */
1612object * 1546object *
1613decrease_ob_nr (object *op, uint32 i) 1547object::split (sint32 nr)
1614{ 1548{
1615 object *tmp; 1549 int have = number_of ();
1616 player *pl;
1617 1550
1618 if (i == 0) /* objects with op->nrof require this check */ 1551 if (have < nr)
1619 return op; 1552 return 0;
1620 1553 else if (have == nr)
1621 if (i > op->nrof)
1622 i = op->nrof;
1623
1624 if (QUERY_FLAG (op, FLAG_REMOVED))
1625 op->nrof -= i;
1626 else if (op->env != NULL)
1627 { 1554 {
1628 /* is this object in the players inventory, or sub container
1629 * therein?
1630 */
1631 tmp = is_player_inv (op->env);
1632 /* nope. Is this a container the player has opened?
1633 * If so, set tmp to that player.
1634 * IMO, searching through all the players will mostly
1635 * likely be quicker than following op->env to the map,
1636 * and then searching the map for a player.
1637 */
1638 if (!tmp)
1639 {
1640 for (pl = first_player; pl; pl = pl->next)
1641 if (pl->ob->container == op->env)
1642 break;
1643 if (pl)
1644 tmp = pl->ob;
1645 else
1646 tmp = NULL;
1647 }
1648
1649 if (i < op->nrof)
1650 {
1651 sub_weight (op->env, op->weight * i);
1652 op->nrof -= i;
1653 if (tmp)
1654 {
1655 esrv_send_item (tmp, op);
1656 }
1657 }
1658 else
1659 {
1660 op->remove (); 1555 remove ();
1661 op->nrof = 0; 1556 return this;
1662 if (tmp)
1663 {
1664 esrv_del_item (tmp->contr, op->count);
1665 }
1666 }
1667 } 1557 }
1668 else 1558 else
1669 { 1559 {
1670 object *above = op->above; 1560 decrease (nr);
1671 1561
1672 if (i < op->nrof) 1562 object *op = deep_clone ();
1673 op->nrof -= i; 1563 op->nrof = nr;
1674 else
1675 {
1676 op->remove ();
1677 op->nrof = 0;
1678 }
1679
1680 /* Since we just removed op, op->above is null */
1681 for (tmp = above; tmp != NULL; tmp = tmp->above)
1682 if (tmp->type == PLAYER)
1683 {
1684 if (op->nrof)
1685 esrv_send_item (tmp, op);
1686 else
1687 esrv_del_item (tmp->contr, op->count);
1688 }
1689 }
1690
1691 if (op->nrof)
1692 return op; 1564 return op;
1693 else
1694 {
1695 op->destroy (0);
1696 return NULL;
1697 }
1698}
1699
1700/*
1701 * add_weight(object, weight) adds the specified weight to an object,
1702 * and also updates how much the environment(s) is/are carrying.
1703 */
1704
1705void
1706add_weight (object *op, signed long weight)
1707{
1708 while (op != NULL)
1709 {
1710 if (op->type == CONTAINER)
1711 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1712
1713 op->carrying += weight;
1714 op = op->env;
1715 } 1565 }
1716} 1566}
1717 1567
1718object * 1568object *
1719insert_ob_in_ob (object *op, object *where) 1569insert_ob_in_ob (object *op, object *where)
1724 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1574 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1725 free (dump); 1575 free (dump);
1726 return op; 1576 return op;
1727 } 1577 }
1728 1578
1729 if (where->head) 1579 if (where->head_ () != where)
1730 { 1580 {
1731 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1581 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1732 where = where->head; 1582 where = where->head;
1733 } 1583 }
1734 1584
1735 return where->insert (op); 1585 return where->insert (op);
1736} 1586}
1741 * inside the object environment. 1591 * inside the object environment.
1742 * 1592 *
1743 * The function returns now pointer to inserted item, and return value can 1593 * The function returns now pointer to inserted item, and return value can
1744 * be != op, if items are merged. -Tero 1594 * be != op, if items are merged. -Tero
1745 */ 1595 */
1746
1747object * 1596object *
1748object::insert (object *op) 1597object::insert (object *op)
1749{ 1598{
1750 object *tmp, *otmp;
1751
1752 if (!QUERY_FLAG (op, FLAG_REMOVED))
1753 op->remove ();
1754
1755 if (op->more) 1599 if (op->more)
1756 { 1600 {
1757 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1601 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1758 return op; 1602 return op;
1759 } 1603 }
1760 1604
1761 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1605 op->remove ();
1762 CLEAR_FLAG (op, FLAG_REMOVED); 1606
1607 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1608
1763 if (op->nrof) 1609 if (op->nrof)
1764 {
1765 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1610 for (object *tmp = inv; tmp; tmp = tmp->below)
1766 if (CAN_MERGE (tmp, op)) 1611 if (object::can_merge (tmp, op))
1767 { 1612 {
1768 /* return the original object and remove inserted object 1613 /* return the original object and remove inserted object
1769 (client needs the original object) */ 1614 (client needs the original object) */
1770 tmp->nrof += op->nrof; 1615 tmp->nrof += op->nrof;
1771 /* Weight handling gets pretty funky. Since we are adding to 1616
1772 * tmp->nrof, we need to increase the weight. 1617 if (object *pl = tmp->visible_to ())
1773 */ 1618 esrv_update_item (UPD_NROF, pl, tmp);
1619
1774 add_weight (this, op->weight * op->nrof); 1620 adjust_weight (this, op->total_weight ());
1775 SET_FLAG (op, FLAG_REMOVED); 1621
1776 op->destroy (); /* free the inserted object */ 1622 op->destroy ();
1777 op = tmp; 1623 op = tmp;
1778 op->remove (); /* and fix old object's links */ 1624 goto inserted;
1779 CLEAR_FLAG (op, FLAG_REMOVED);
1780 break;
1781 } 1625 }
1782 1626
1783 /* I assume combined objects have no inventory 1627 op->owner = 0; // it's his/hers now. period.
1784 * We add the weight - this object could have just been removed
1785 * (if it was possible to merge). calling remove_ob will subtract
1786 * the weight, so we need to add it in again, since we actually do
1787 * the linking below
1788 */
1789 add_weight (this, op->weight * op->nrof);
1790 }
1791 else
1792 add_weight (this, (op->weight + op->carrying));
1793
1794 otmp = is_player_inv (this);
1795 if (otmp && otmp->contr)
1796 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1797 fix_player (otmp);
1798
1799 op->map = NULL; 1628 op->map = 0;
1629 op->x = 0;
1630 op->y = 0;
1631
1632 op->above = 0;
1633 op->below = inv;
1800 op->env = this; 1634 op->env = this;
1801 op->above = NULL;
1802 op->below = NULL;
1803 op->x = 0, op->y = 0;
1804 1635
1636 if (inv)
1637 inv->above = op;
1638
1639 inv = op;
1640
1641 op->flag [FLAG_REMOVED] = 0;
1642
1643 if (object *pl = op->visible_to ())
1644 esrv_send_item (pl, op);
1645
1646 adjust_weight (this, op->total_weight ());
1647
1648inserted:
1805 /* reset the light list and los of the players on the map */ 1649 /* reset the light list and los of the players on the map */
1806 if ((op->glow_radius != 0) && map) 1650 if (op->glow_radius && map && map->darkness)
1807 {
1808#ifdef DEBUG_LIGHTS
1809 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1810#endif /* DEBUG_LIGHTS */
1811 if (MAP_DARKNESS (map))
1812 update_all_los (map, x, y); 1651 update_all_los (map, x, y);
1813 }
1814 1652
1815 /* Client has no idea of ordering so lets not bother ordering it here. 1653 // if this is a player's inventory, update stats
1816 * It sure simplifies this function... 1654 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1817 */ 1655 update_stats ();
1818 if (!inv) 1656
1819 inv = op; 1657 INVOKE_OBJECT (INSERT, this);
1820 else
1821 {
1822 op->below = inv;
1823 op->below->above = op;
1824 inv = op;
1825 }
1826 1658
1827 return op; 1659 return op;
1828} 1660}
1829 1661
1830/* 1662/*
1845 * 1677 *
1846 * MSW 2001-07-08: Check all objects on space, not just those below 1678 * MSW 2001-07-08: Check all objects on space, not just those below
1847 * object being inserted. insert_ob_in_map may not put new objects 1679 * object being inserted. insert_ob_in_map may not put new objects
1848 * on top. 1680 * on top.
1849 */ 1681 */
1850
1851int 1682int
1852check_move_on (object *op, object *originator) 1683check_move_on (object *op, object *originator)
1853{ 1684{
1854 object *tmp; 1685 object *tmp;
1855 maptile *m = op->map; 1686 maptile *m = op->map;
1882 1713
1883 /* The objects have to be checked from top to bottom. 1714 /* The objects have to be checked from top to bottom.
1884 * Hence, we first go to the top: 1715 * Hence, we first go to the top:
1885 */ 1716 */
1886 1717
1887 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1718 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1888 { 1719 {
1889 /* Trim the search when we find the first other spell effect 1720 /* Trim the search when we find the first other spell effect
1890 * this helps performance so that if a space has 50 spell objects, 1721 * this helps performance so that if a space has 50 spell objects,
1891 * we don't need to check all of them. 1722 * we don't need to check all of them.
1892 */ 1723 */
1910 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1741 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1911 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1742 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1912 { 1743 {
1913 1744
1914 float 1745 float
1915 diff = tmp->move_slow_penalty * FABS (op->speed); 1746 diff = tmp->move_slow_penalty * fabs (op->speed);
1916 1747
1917 if (op->type == PLAYER) 1748 if (op->type == PLAYER)
1918 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1749 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1919 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1750 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1920 diff /= 4.0; 1751 diff /= 4.0;
1947/* 1778/*
1948 * present_arch(arch, map, x, y) searches for any objects with 1779 * present_arch(arch, map, x, y) searches for any objects with
1949 * a matching archetype at the given map and coordinates. 1780 * a matching archetype at the given map and coordinates.
1950 * The first matching object is returned, or NULL if none. 1781 * The first matching object is returned, or NULL if none.
1951 */ 1782 */
1952
1953object * 1783object *
1954present_arch (const archetype *at, maptile *m, int x, int y) 1784present_arch (const archetype *at, maptile *m, int x, int y)
1955{ 1785{
1956 object *
1957 tmp;
1958
1959 if (m == NULL || out_of_map (m, x, y)) 1786 if (!m || out_of_map (m, x, y))
1960 { 1787 {
1961 LOG (llevError, "Present_arch called outside map.\n"); 1788 LOG (llevError, "Present_arch called outside map.\n");
1962 return NULL; 1789 return NULL;
1963 } 1790 }
1964 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1791
1965 if (tmp->arch == at) 1792 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1793 if (tmp->arch->archname == at->archname)
1966 return tmp; 1794 return tmp;
1795
1967 return NULL; 1796 return NULL;
1968} 1797}
1969 1798
1970/* 1799/*
1971 * present(type, map, x, y) searches for any objects with 1800 * present(type, map, x, y) searches for any objects with
1972 * a matching type variable at the given map and coordinates. 1801 * a matching type variable at the given map and coordinates.
1973 * The first matching object is returned, or NULL if none. 1802 * The first matching object is returned, or NULL if none.
1974 */ 1803 */
1975
1976object * 1804object *
1977present (unsigned char type, maptile *m, int x, int y) 1805present (unsigned char type, maptile *m, int x, int y)
1978{ 1806{
1979 object *
1980 tmp;
1981
1982 if (out_of_map (m, x, y)) 1807 if (out_of_map (m, x, y))
1983 { 1808 {
1984 LOG (llevError, "Present called outside map.\n"); 1809 LOG (llevError, "Present called outside map.\n");
1985 return NULL; 1810 return NULL;
1986 } 1811 }
1987 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1812
1813 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1988 if (tmp->type == type) 1814 if (tmp->type == type)
1989 return tmp; 1815 return tmp;
1816
1990 return NULL; 1817 return NULL;
1991} 1818}
1992 1819
1993/* 1820/*
1994 * present_in_ob(type, object) searches for any objects with 1821 * present_in_ob(type, object) searches for any objects with
1995 * a matching type variable in the inventory of the given object. 1822 * a matching type variable in the inventory of the given object.
1996 * The first matching object is returned, or NULL if none. 1823 * The first matching object is returned, or NULL if none.
1997 */ 1824 */
1998
1999object * 1825object *
2000present_in_ob (unsigned char type, const object *op) 1826present_in_ob (unsigned char type, const object *op)
2001{ 1827{
2002 object *
2003 tmp;
2004
2005 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1828 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2006 if (tmp->type == type) 1829 if (tmp->type == type)
2007 return tmp; 1830 return tmp;
1831
2008 return NULL; 1832 return NULL;
2009} 1833}
2010 1834
2011/* 1835/*
2012 * present_in_ob (type, str, object) searches for any objects with 1836 * present_in_ob (type, str, object) searches for any objects with
2020 * str is the string to match against. Note that we match against 1844 * str is the string to match against. Note that we match against
2021 * the object name, not the archetype name. this is so that the 1845 * the object name, not the archetype name. this is so that the
2022 * spell code can use one object type (force), but change it's name 1846 * spell code can use one object type (force), but change it's name
2023 * to be unique. 1847 * to be unique.
2024 */ 1848 */
2025
2026object * 1849object *
2027present_in_ob_by_name (int type, const char *str, const object *op) 1850present_in_ob_by_name (int type, const char *str, const object *op)
2028{ 1851{
2029 object *
2030 tmp;
2031
2032 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1852 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2033 {
2034 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1853 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2035 return tmp; 1854 return tmp;
2036 } 1855
2037 return NULL; 1856 return 0;
2038} 1857}
2039 1858
2040/* 1859/*
2041 * present_arch_in_ob(archetype, object) searches for any objects with 1860 * present_arch_in_ob(archetype, object) searches for any objects with
2042 * a matching archetype in the inventory of the given object. 1861 * a matching archetype in the inventory of the given object.
2043 * The first matching object is returned, or NULL if none. 1862 * The first matching object is returned, or NULL if none.
2044 */ 1863 */
2045
2046object * 1864object *
2047present_arch_in_ob (const archetype *at, const object *op) 1865present_arch_in_ob (const archetype *at, const object *op)
2048{ 1866{
2049 object *
2050 tmp;
2051
2052 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1867 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2053 if (tmp->arch == at) 1868 if (tmp->arch->archname == at->archname)
2054 return tmp; 1869 return tmp;
1870
2055 return NULL; 1871 return NULL;
2056} 1872}
2057 1873
2058/* 1874/*
2059 * activate recursively a flag on an object inventory 1875 * activate recursively a flag on an object inventory
2060 */ 1876 */
2061void 1877void
2062flag_inv (object *op, int flag) 1878flag_inv (object *op, int flag)
2063{ 1879{
2064 object *
2065 tmp;
2066
2067 if (op->inv)
2068 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1880 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2069 { 1881 {
2070 SET_FLAG (tmp, flag); 1882 SET_FLAG (tmp, flag);
2071 flag_inv (tmp, flag); 1883 flag_inv (tmp, flag);
2072 } 1884 }
2073} /* 1885}
1886
1887/*
2074 * desactivate recursively a flag on an object inventory 1888 * deactivate recursively a flag on an object inventory
2075 */ 1889 */
2076void 1890void
2077unflag_inv (object *op, int flag) 1891unflag_inv (object *op, int flag)
2078{ 1892{
2079 object *
2080 tmp;
2081
2082 if (op->inv)
2083 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1893 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2084 { 1894 {
2085 CLEAR_FLAG (tmp, flag); 1895 CLEAR_FLAG (tmp, flag);
2086 unflag_inv (tmp, flag); 1896 unflag_inv (tmp, flag);
2087 } 1897 }
2088}
2089
2090/*
2091 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2092 * all it's inventory (recursively).
2093 * If checksums are used, a player will get set_cheat called for
2094 * him/her-self and all object carried by a call to this function.
2095 */
2096
2097void
2098set_cheat (object *op)
2099{
2100 SET_FLAG (op, FLAG_WAS_WIZ);
2101 flag_inv (op, FLAG_WAS_WIZ);
2102} 1898}
2103 1899
2104/* 1900/*
2105 * find_free_spot(object, map, x, y, start, stop) will search for 1901 * find_free_spot(object, map, x, y, start, stop) will search for
2106 * a spot at the given map and coordinates which will be able to contain 1902 * a spot at the given map and coordinates which will be able to contain
2108 * to search (see the freearr_x/y[] definition). 1904 * to search (see the freearr_x/y[] definition).
2109 * It returns a random choice among the alternatives found. 1905 * It returns a random choice among the alternatives found.
2110 * start and stop are where to start relative to the free_arr array (1,9 1906 * start and stop are where to start relative to the free_arr array (1,9
2111 * does all 4 immediate directions). This returns the index into the 1907 * does all 4 immediate directions). This returns the index into the
2112 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1908 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2113 * Note - this only checks to see if there is space for the head of the
2114 * object - if it is a multispace object, this should be called for all
2115 * pieces.
2116 * Note2: This function does correctly handle tiled maps, but does not 1909 * Note: This function does correctly handle tiled maps, but does not
2117 * inform the caller. However, insert_ob_in_map will update as 1910 * inform the caller. However, insert_ob_in_map will update as
2118 * necessary, so the caller shouldn't need to do any special work. 1911 * necessary, so the caller shouldn't need to do any special work.
2119 * Note - updated to take an object instead of archetype - this is necessary 1912 * Note - updated to take an object instead of archetype - this is necessary
2120 * because arch_blocked (now ob_blocked) needs to know the movement type 1913 * because arch_blocked (now ob_blocked) needs to know the movement type
2121 * to know if the space in question will block the object. We can't use 1914 * to know if the space in question will block the object. We can't use
2122 * the archetype because that isn't correct if the monster has been 1915 * the archetype because that isn't correct if the monster has been
2123 * customized, changed states, etc. 1916 * customized, changed states, etc.
2124 */ 1917 */
2125
2126int 1918int
2127find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1919find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2128{ 1920{
2129 int
2130 i,
2131 index = 0, flag;
2132 static int
2133 altern[SIZEOFFREE]; 1921 int altern[SIZEOFFREE];
1922 int index = 0, flag;
2134 1923
2135 for (i = start; i < stop; i++) 1924 for (int i = start; i < stop; i++)
2136 { 1925 {
2137 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1926 mapxy pos (m, x, y); pos.move (i);
2138 if (!flag) 1927
1928 if (!pos.normalise ())
1929 continue;
1930
1931 mapspace &ms = *pos;
1932
1933 if (ms.flags () & P_IS_ALIVE)
1934 continue;
1935
1936 /* However, often
1937 * ob doesn't have any move type (when used to place exits)
1938 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1939 */
1940 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1941 {
2139 altern[index++] = i; 1942 altern [index++] = i;
1943 continue;
1944 }
2140 1945
2141 /* Basically, if we find a wall on a space, we cut down the search size. 1946 /* Basically, if we find a wall on a space, we cut down the search size.
2142 * In this way, we won't return spaces that are on another side of a wall. 1947 * In this way, we won't return spaces that are on another side of a wall.
2143 * This mostly work, but it cuts down the search size in all directions - 1948 * This mostly work, but it cuts down the search size in all directions -
2144 * if the space being examined only has a wall to the north and empty 1949 * if the space being examined only has a wall to the north and empty
2145 * spaces in all the other directions, this will reduce the search space 1950 * spaces in all the other directions, this will reduce the search space
2146 * to only the spaces immediately surrounding the target area, and 1951 * to only the spaces immediately surrounding the target area, and
2147 * won't look 2 spaces south of the target space. 1952 * won't look 2 spaces south of the target space.
2148 */ 1953 */
2149 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 1954 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1955 {
2150 stop = maxfree[i]; 1956 stop = maxfree[i];
1957 continue;
1958 }
1959
1960 /* Note it is intentional that we check ob - the movement type of the
1961 * head of the object should correspond for the entire object.
1962 */
1963 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1964 continue;
1965
1966 if (ob->blocked (m, pos.x, pos.y))
1967 continue;
1968
1969 altern [index++] = i;
2151 } 1970 }
1971
2152 if (!index) 1972 if (!index)
2153 return -1; 1973 return -1;
1974
2154 return altern[RANDOM () % index]; 1975 return altern [rndm (index)];
2155} 1976}
2156 1977
2157/* 1978/*
2158 * find_first_free_spot(archetype, maptile, x, y) works like 1979 * find_first_free_spot(archetype, maptile, x, y) works like
2159 * find_free_spot(), but it will search max number of squares. 1980 * find_free_spot(), but it will search max number of squares.
2160 * But it will return the first available spot, not a random choice. 1981 * But it will return the first available spot, not a random choice.
2161 * Changed 0.93.2: Have it return -1 if there is no free spot available. 1982 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2162 */ 1983 */
2163
2164int 1984int
2165find_first_free_spot (const object *ob, maptile *m, int x, int y) 1985find_first_free_spot (const object *ob, maptile *m, int x, int y)
2166{ 1986{
2167 int
2168 i;
2169
2170 for (i = 0; i < SIZEOFFREE; i++) 1987 for (int i = 0; i < SIZEOFFREE; i++)
2171 {
2172 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 1988 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2173 return i; 1989 return i;
2174 } 1990
2175 return -1; 1991 return -1;
2176} 1992}
2177 1993
2178/* 1994/*
2179 * The function permute(arr, begin, end) randomly reorders the array 1995 * The function permute(arr, begin, end) randomly reorders the array
2180 * arr[begin..end-1]. 1996 * arr[begin..end-1].
1997 * now uses a fisher-yates shuffle, old permute was broken
2181 */ 1998 */
2182static void 1999static void
2183permute (int *arr, int begin, int end) 2000permute (int *arr, int begin, int end)
2184{ 2001{
2185 int 2002 arr += begin;
2186 i,
2187 j,
2188 tmp,
2189 len;
2190
2191 len = end - begin; 2003 end -= begin;
2192 for (i = begin; i < end; i++)
2193 {
2194 j = begin + RANDOM () % len;
2195 2004
2196 tmp = arr[i]; 2005 while (--end)
2197 arr[i] = arr[j]; 2006 swap (arr [end], arr [rndm (end + 1)]);
2198 arr[j] = tmp;
2199 }
2200} 2007}
2201 2008
2202/* new function to make monster searching more efficient, and effective! 2009/* new function to make monster searching more efficient, and effective!
2203 * This basically returns a randomized array (in the passed pointer) of 2010 * This basically returns a randomized array (in the passed pointer) of
2204 * the spaces to find monsters. In this way, it won't always look for 2011 * the spaces to find monsters. In this way, it won't always look for
2207 * the 3x3 area will be searched, just not in a predictable order. 2014 * the 3x3 area will be searched, just not in a predictable order.
2208 */ 2015 */
2209void 2016void
2210get_search_arr (int *search_arr) 2017get_search_arr (int *search_arr)
2211{ 2018{
2212 int 2019 int i;
2213 i;
2214 2020
2215 for (i = 0; i < SIZEOFFREE; i++) 2021 for (i = 0; i < SIZEOFFREE; i++)
2216 {
2217 search_arr[i] = i; 2022 search_arr[i] = i;
2218 }
2219 2023
2220 permute (search_arr, 1, SIZEOFFREE1 + 1); 2024 permute (search_arr, 1, SIZEOFFREE1 + 1);
2221 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2025 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2222 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2026 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2223} 2027}
2232 * Perhaps incorrectly, but I'm making the assumption that exclude 2036 * Perhaps incorrectly, but I'm making the assumption that exclude
2233 * is actually want is going to try and move there. We need this info 2037 * is actually want is going to try and move there. We need this info
2234 * because we have to know what movement the thing looking to move 2038 * because we have to know what movement the thing looking to move
2235 * there is capable of. 2039 * there is capable of.
2236 */ 2040 */
2237
2238int 2041int
2239find_dir (maptile *m, int x, int y, object *exclude) 2042find_dir (maptile *m, int x, int y, object *exclude)
2240{ 2043{
2241 int
2242 i,
2243 max = SIZEOFFREE, mflags; 2044 int i, max = SIZEOFFREE, mflags;
2244 2045
2245 sint16 nx, ny; 2046 sint16 nx, ny;
2246 object * 2047 object *tmp;
2247 tmp;
2248 maptile * 2048 maptile *mp;
2249 mp;
2250 2049
2251 MoveType blocked, move_type; 2050 MoveType blocked, move_type;
2252 2051
2253 if (exclude && exclude->head) 2052 if (exclude && exclude->head_ () != exclude)
2254 { 2053 {
2255 exclude = exclude->head; 2054 exclude = exclude->head;
2256 move_type = exclude->move_type; 2055 move_type = exclude->move_type;
2257 } 2056 }
2258 else 2057 else
2266 mp = m; 2065 mp = m;
2267 nx = x + freearr_x[i]; 2066 nx = x + freearr_x[i];
2268 ny = y + freearr_y[i]; 2067 ny = y + freearr_y[i];
2269 2068
2270 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2069 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2070
2271 if (mflags & P_OUT_OF_MAP) 2071 if (mflags & P_OUT_OF_MAP)
2272 {
2273 max = maxfree[i]; 2072 max = maxfree[i];
2274 }
2275 else 2073 else
2276 { 2074 {
2277 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2075 mapspace &ms = mp->at (nx, ny);
2076
2077 blocked = ms.move_block;
2278 2078
2279 if ((move_type & blocked) == move_type) 2079 if ((move_type & blocked) == move_type)
2280 {
2281 max = maxfree[i]; 2080 max = maxfree[i];
2282 }
2283 else if (mflags & P_IS_ALIVE) 2081 else if (mflags & P_IS_ALIVE)
2284 { 2082 {
2285 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2083 for (tmp = ms.bot; tmp; tmp = tmp->above)
2286 { 2084 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2287 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2085 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2288 {
2289 break; 2086 break;
2290 } 2087
2291 }
2292 if (tmp) 2088 if (tmp)
2293 {
2294 return freedir[i]; 2089 return freedir[i];
2295 }
2296 } 2090 }
2297 } 2091 }
2298 } 2092 }
2093
2299 return 0; 2094 return 0;
2300} 2095}
2301 2096
2302/* 2097/*
2303 * distance(object 1, object 2) will return the square of the 2098 * distance(object 1, object 2) will return the square of the
2304 * distance between the two given objects. 2099 * distance between the two given objects.
2305 */ 2100 */
2306
2307int 2101int
2308distance (const object *ob1, const object *ob2) 2102distance (const object *ob1, const object *ob2)
2309{ 2103{
2310 int
2311 i;
2312
2313 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2104 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2314 return i;
2315} 2105}
2316 2106
2317/* 2107/*
2318 * find_dir_2(delta-x,delta-y) will return a direction in which 2108 * find_dir_2(delta-x,delta-y) will return a direction in which
2319 * an object which has subtracted the x and y coordinates of another 2109 * an object which has subtracted the x and y coordinates of another
2320 * object, needs to travel toward it. 2110 * object, needs to travel toward it.
2321 */ 2111 */
2322
2323int 2112int
2324find_dir_2 (int x, int y) 2113find_dir_2 (int x, int y)
2325{ 2114{
2326 int 2115 int q;
2327 q;
2328 2116
2329 if (y) 2117 if (y)
2330 q = x * 100 / y; 2118 q = x * 100 / y;
2331 else if (x) 2119 else if (x)
2332 q = -300 * x; 2120 q = -300 * x;
2357 2145
2358 return 3; 2146 return 3;
2359} 2147}
2360 2148
2361/* 2149/*
2362 * absdir(int): Returns a number between 1 and 8, which represent
2363 * the "absolute" direction of a number (it actually takes care of
2364 * "overflow" in previous calculations of a direction).
2365 */
2366
2367int
2368absdir (int d)
2369{
2370 while (d < 1)
2371 d += 8;
2372 while (d > 8)
2373 d -= 8;
2374 return d;
2375}
2376
2377/*
2378 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2150 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2379 * between two directions (which are expected to be absolute (see absdir()) 2151 * between two directions (which are expected to be absolute (see absdir())
2380 */ 2152 */
2381
2382int 2153int
2383dirdiff (int dir1, int dir2) 2154dirdiff (int dir1, int dir2)
2384{ 2155{
2385 int 2156 int d;
2386 d;
2387 2157
2388 d = abs (dir1 - dir2); 2158 d = abs (dir1 - dir2);
2389 if (d > 4) 2159 if (d > 4)
2390 d = 8 - d; 2160 d = 8 - d;
2161
2391 return d; 2162 return d;
2392} 2163}
2393 2164
2394/* peterm: 2165/* peterm:
2395 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2166 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2398 * This basically means that if direction is 15, then it could either go 2169 * This basically means that if direction is 15, then it could either go
2399 * direction 4, 14, or 16 to get back to where we are. 2170 * direction 4, 14, or 16 to get back to where we are.
2400 * Moved from spell_util.c to object.c with the other related direction 2171 * Moved from spell_util.c to object.c with the other related direction
2401 * functions. 2172 * functions.
2402 */ 2173 */
2403
2404int
2405 reduction_dir[SIZEOFFREE][3] = { 2174int reduction_dir[SIZEOFFREE][3] = {
2406 {0, 0, 0}, /* 0 */ 2175 {0, 0, 0}, /* 0 */
2407 {0, 0, 0}, /* 1 */ 2176 {0, 0, 0}, /* 1 */
2408 {0, 0, 0}, /* 2 */ 2177 {0, 0, 0}, /* 2 */
2409 {0, 0, 0}, /* 3 */ 2178 {0, 0, 0}, /* 3 */
2410 {0, 0, 0}, /* 4 */ 2179 {0, 0, 0}, /* 4 */
2458 * find a path to that monster that we found. If not, 2227 * find a path to that monster that we found. If not,
2459 * we don't bother going toward it. Returns 1 if we 2228 * we don't bother going toward it. Returns 1 if we
2460 * can see a direct way to get it 2229 * can see a direct way to get it
2461 * Modified to be map tile aware -.MSW 2230 * Modified to be map tile aware -.MSW
2462 */ 2231 */
2463
2464
2465int 2232int
2466can_see_monsterP (maptile *m, int x, int y, int dir) 2233can_see_monsterP (maptile *m, int x, int y, int dir)
2467{ 2234{
2468 sint16 dx, dy; 2235 sint16 dx, dy;
2469 int
2470 mflags; 2236 int mflags;
2471 2237
2472 if (dir < 0) 2238 if (dir < 0)
2473 return 0; /* exit condition: invalid direction */ 2239 return 0; /* exit condition: invalid direction */
2474 2240
2475 dx = x + freearr_x[dir]; 2241 dx = x + freearr_x[dir];
2488 return 0; 2254 return 0;
2489 2255
2490 /* yes, can see. */ 2256 /* yes, can see. */
2491 if (dir < 9) 2257 if (dir < 9)
2492 return 1; 2258 return 1;
2259
2493 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2260 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2494 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2261 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2262 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2495} 2263}
2496
2497
2498 2264
2499/* 2265/*
2500 * can_pick(picker, item): finds out if an object is possible to be 2266 * can_pick(picker, item): finds out if an object is possible to be
2501 * picked up by the picker. Returnes 1 if it can be 2267 * picked up by the picker. Returnes 1 if it can be
2502 * picked up, otherwise 0. 2268 * picked up, otherwise 0.
2504 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2270 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2505 * core dumps if they do. 2271 * core dumps if they do.
2506 * 2272 *
2507 * Add a check so we can't pick up invisible objects (0.93.8) 2273 * Add a check so we can't pick up invisible objects (0.93.8)
2508 */ 2274 */
2509
2510int 2275int
2511can_pick (const object *who, const object *item) 2276can_pick (const object *who, const object *item)
2512{ 2277{
2513 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2278 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2514 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2279 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2515 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2280 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2516} 2281}
2517 2282
2518
2519/* 2283/*
2520 * create clone from object to another 2284 * create clone from object to another
2521 */ 2285 */
2522object * 2286object *
2523object_create_clone (object *asrc) 2287object::deep_clone ()
2524{ 2288{
2525 object *dst = 0, *tmp, *src, *part, *prev, *item; 2289 assert (("deep_clone called on non-head object", is_head ()));
2526 2290
2527 if (!asrc) 2291 object *dst = clone ();
2528 return 0;
2529 2292
2530 src = asrc; 2293 object *prev = dst;
2531 if (src->head)
2532 src = src->head;
2533
2534 prev = 0;
2535 for (part = src; part; part = part->more) 2294 for (object *part = this->more; part; part = part->more)
2536 { 2295 {
2537 tmp = get_object (); 2296 object *tmp = part->clone ();
2538 copy_object (part, tmp);
2539 tmp->x -= src->x;
2540 tmp->y -= src->y;
2541
2542 if (!part->head)
2543 {
2544 dst = tmp;
2545 tmp->head = 0;
2546 }
2547 else
2548 {
2549 tmp->head = dst; 2297 tmp->head = dst;
2550 }
2551
2552 tmp->more = 0;
2553
2554 if (prev)
2555 prev->more = tmp; 2298 prev->more = tmp;
2556
2557 prev = tmp; 2299 prev = tmp;
2558 } 2300 }
2559 2301
2560 for (item = src->inv; item; item = item->below) 2302 for (object *item = inv; item; item = item->below)
2561 insert_ob_in_ob (object_create_clone (item), dst); 2303 insert_ob_in_ob (item->deep_clone (), dst);
2562 2304
2563 return dst; 2305 return dst;
2564}
2565
2566/* GROS - Creates an object using a string representing its content. */
2567/* Basically, we save the content of the string to a temp file, then call */
2568/* load_object on it. I admit it is a highly inefficient way to make things, */
2569/* but it was simple to make and allows reusing the load_object function. */
2570/* Remember not to use load_object_str in a time-critical situation. */
2571/* Also remember that multiparts objects are not supported for now. */
2572
2573object *
2574load_object_str (const char *obstr)
2575{
2576 object *op;
2577 char filename[MAX_BUF];
2578
2579 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2580
2581 FILE *tempfile = fopen (filename, "w");
2582
2583 if (tempfile == NULL)
2584 {
2585 LOG (llevError, "Error - Unable to access load object temp file\n");
2586 return NULL;
2587 }
2588
2589 fprintf (tempfile, obstr);
2590 fclose (tempfile);
2591
2592 op = get_object ();
2593
2594 object_thawer thawer (filename);
2595
2596 if (thawer)
2597 load_object (thawer, op, 0);
2598
2599 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2600 CLEAR_FLAG (op, FLAG_REMOVED);
2601
2602 return op;
2603} 2306}
2604 2307
2605/* This returns the first object in who's inventory that 2308/* This returns the first object in who's inventory that
2606 * has the same type and subtype match. 2309 * has the same type and subtype match.
2607 * returns NULL if no match. 2310 * returns NULL if no match.
2608 */ 2311 */
2609object * 2312object *
2610find_obj_by_type_subtype (const object *who, int type, int subtype) 2313find_obj_by_type_subtype (const object *who, int type, int subtype)
2611{ 2314{
2612 object *tmp;
2613
2614 for (tmp = who->inv; tmp; tmp = tmp->below) 2315 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2615 if (tmp->type == type && tmp->subtype == subtype) 2316 if (tmp->type == type && tmp->subtype == subtype)
2616 return tmp; 2317 return tmp;
2617 2318
2618 return NULL;
2619}
2620
2621/* If ob has a field named key, return the link from the list,
2622 * otherwise return NULL.
2623 *
2624 * key must be a passed in shared string - otherwise, this won't
2625 * do the desired thing.
2626 */
2627key_value *
2628get_ob_key_link (const object *ob, const char *key)
2629{
2630 key_value *link;
2631
2632 for (link = ob->key_values; link != NULL; link = link->next)
2633 if (link->key == key)
2634 return link;
2635
2636 return NULL;
2637}
2638
2639/*
2640 * Returns the value of op has an extra_field for key, or NULL.
2641 *
2642 * The argument doesn't need to be a shared string.
2643 *
2644 * The returned string is shared.
2645 */
2646const char *
2647get_ob_key_value (const object *op, const char *const key)
2648{
2649 key_value *link;
2650 shstr_cmp canonical_key (key);
2651
2652 if (!canonical_key)
2653 {
2654 /* 1. There being a field named key on any object
2655 * implies there'd be a shared string to find.
2656 * 2. Since there isn't, no object has this field.
2657 * 3. Therefore, *this* object doesn't have this field.
2658 */
2659 return 0;
2660 }
2661
2662 /* This is copied from get_ob_key_link() above -
2663 * only 4 lines, and saves the function call overhead.
2664 */
2665 for (link = op->key_values; link; link = link->next)
2666 if (link->key == canonical_key)
2667 return link->value;
2668
2669 return 0; 2319 return 0;
2670} 2320}
2671 2321
2672 2322const shstr &
2673/* 2323object::kv_get (const shstr &key) const
2674 * Updates the canonical_key in op to value.
2675 *
2676 * canonical_key is a shared string (value doesn't have to be).
2677 *
2678 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2679 * keys.
2680 *
2681 * Returns TRUE on success.
2682 */
2683int
2684set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2685{ 2324{
2686 key_value * 2325 for (key_value *kv = key_values; kv; kv = kv->next)
2687 field = NULL, *last = NULL; 2326 if (kv->key == key)
2327 return kv->value;
2688 2328
2689 for (field = op->key_values; field != NULL; field = field->next) 2329 return shstr_null;
2690 { 2330}
2691 if (field->key != canonical_key) 2331
2332void
2333object::kv_set (const shstr &key, const shstr &value)
2334{
2335 for (key_value *kv = key_values; kv; kv = kv->next)
2336 if (kv->key == key)
2692 { 2337 {
2693 last = field; 2338 kv->value = value;
2694 continue; 2339 return;
2695 } 2340 }
2696 2341
2697 if (value) 2342 key_value *kv = new key_value;
2698 field->value = value; 2343
2699 else 2344 kv->next = key_values;
2345 kv->key = key;
2346 kv->value = value;
2347
2348 key_values = kv;
2349}
2350
2351void
2352object::kv_del (const shstr &key)
2353{
2354 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2355 if ((*kvp)->key == key)
2700 { 2356 {
2701 /* Basically, if the archetype has this key set, 2357 key_value *kv = *kvp;
2702 * we need to store the null value so when we save 2358 *kvp = (*kvp)->next;
2703 * it, we save the empty value so that when we load, 2359 delete kv;
2704 * we get this value back again. 2360 return;
2705 */
2706 if (get_ob_key_link (&op->arch->clone, canonical_key))
2707 field->value = 0;
2708 else
2709 {
2710 if (last)
2711 last->next = field->next;
2712 else
2713 op->key_values = field->next;
2714
2715 delete field;
2716 }
2717 } 2361 }
2718 return TRUE;
2719 }
2720 /* IF we get here, key doesn't exist */
2721
2722 /* No field, we'll have to add it. */
2723
2724 if (!add_key)
2725 {
2726 return FALSE;
2727 }
2728 /* There isn't any good reason to store a null
2729 * value in the key/value list. If the archetype has
2730 * this key, then we should also have it, so shouldn't
2731 * be here. If user wants to store empty strings,
2732 * should pass in ""
2733 */
2734 if (value == NULL)
2735 return TRUE;
2736
2737 field = new key_value;
2738
2739 field->key = canonical_key;
2740 field->value = value;
2741 /* Usual prepend-addition. */
2742 field->next = op->key_values;
2743 op->key_values = field;
2744
2745 return TRUE;
2746}
2747
2748/*
2749 * Updates the key in op to value.
2750 *
2751 * If add_key is FALSE, this will only update existing keys,
2752 * and not add new ones.
2753 * In general, should be little reason FALSE is ever passed in for add_key
2754 *
2755 * Returns TRUE on success.
2756 */
2757int
2758set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2759{
2760 shstr key_ (key);
2761
2762 return set_ob_key_value_s (op, key_, value, add_key);
2763} 2362}
2764 2363
2765object::depth_iterator::depth_iterator (object *container) 2364object::depth_iterator::depth_iterator (object *container)
2766: iterator_base (container) 2365: iterator_base (container)
2767{ 2366{
2781 } 2380 }
2782 else 2381 else
2783 item = item->env; 2382 item = item->env;
2784} 2383}
2785 2384
2385const char *
2386object::flag_desc (char *desc, int len) const
2387{
2388 char *p = desc;
2389 bool first = true;
2390
2391 *p = 0;
2392
2393 for (int i = 0; i < NUM_FLAGS; i++)
2394 {
2395 if (len <= 10) // magic constant!
2396 {
2397 snprintf (p, len, ",...");
2398 break;
2399 }
2400
2401 if (flag [i])
2402 {
2403 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2404 len -= cnt;
2405 p += cnt;
2406 first = false;
2407 }
2408 }
2409
2410 return desc;
2411}
2412
2786// return a suitable string describing an objetc in enough detail to find it 2413// return a suitable string describing an object in enough detail to find it
2787const char * 2414const char *
2788object::debug_desc (char *info) const 2415object::debug_desc (char *info) const
2789{ 2416{
2417 char flagdesc[512];
2790 char info2[256 * 3]; 2418 char info2[256 * 4];
2791 char *p = info; 2419 char *p = info;
2792 2420
2793 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2421 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2794 count, 2422 count,
2423 uuid.c_str (),
2795 &name, 2424 &name,
2796 title ? " " : "", 2425 title ? ",title:\"" : "",
2797 title ? (const char *)title : ""); 2426 title ? (const char *)title : "",
2427 title ? "\"" : "",
2428 flag_desc (flagdesc, 512), type);
2798 2429
2799 if (env) 2430 if (!flag[FLAG_REMOVED] && env)
2800 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2431 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2801 2432
2802 if (map) 2433 if (map)
2803 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2434 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2804 2435
2805 return info; 2436 return info;
2806} 2437}
2807 2438
2808const char * 2439const char *
2809object::debug_desc () const 2440object::debug_desc () const
2810{ 2441{
2811 static char info[256 * 3]; 2442 static char info[3][256 * 4];
2443 static int info_idx;
2444
2812 return debug_desc (info); 2445 return debug_desc (info [++info_idx % 3]);
2813} 2446}
2814 2447
2448struct region *
2449object::region () const
2450{
2451 return map ? map->region (x, y)
2452 : region::default_region ();
2453}
2454
2455const materialtype_t *
2456object::dominant_material () const
2457{
2458 if (materialtype_t *mt = name_to_material (materialname))
2459 return mt;
2460
2461 return name_to_material (shstr_unknown);
2462}
2463
2464void
2465object::open_container (object *new_container)
2466{
2467 if (container == new_container)
2468 return;
2469
2470 object *old_container = container;
2471
2472 if (old_container)
2473 {
2474 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2475 return;
2476
2477#if 0
2478 // remove the "Close old_container" object.
2479 if (object *closer = old_container->inv)
2480 if (closer->type == CLOSE_CON)
2481 closer->destroy ();
2482#endif
2483
2484 // make sure the container is available
2485 esrv_send_item (this, old_container);
2486
2487 old_container->flag [FLAG_APPLIED] = false;
2488 container = 0;
2489
2490 // client needs item update to make it work, client bug requires this to be separate
2491 esrv_update_item (UPD_FLAGS, this, old_container);
2492
2493 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2494 play_sound (sound_find ("chest_close"));
2495 }
2496
2497 if (new_container)
2498 {
2499 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2500 return;
2501
2502 // TODO: this does not seem to serve any purpose anymore?
2503#if 0
2504 // insert the "Close Container" object.
2505 if (archetype *closer = new_container->other_arch)
2506 {
2507 object *closer = arch_to_object (new_container->other_arch);
2508 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2509 new_container->insert (closer);
2510 }
2511#endif
2512
2513 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2514
2515 // make sure the container is available, client bug requires this to be separate
2516 esrv_send_item (this, new_container);
2517
2518 new_container->flag [FLAG_APPLIED] = true;
2519 container = new_container;
2520
2521 // client needs flag change
2522 esrv_update_item (UPD_FLAGS, this, new_container);
2523 esrv_send_inventory (this, new_container);
2524 play_sound (sound_find ("chest_open"));
2525 }
2526// else if (!old_container->env && contr && contr->ns)
2527// contr->ns->floorbox_reset ();
2528}
2529
2530object *
2531object::force_find (const shstr name)
2532{
2533 /* cycle through his inventory to look for the MARK we want to
2534 * place
2535 */
2536 for (object *tmp = inv; tmp; tmp = tmp->below)
2537 if (tmp->type == FORCE && tmp->slaying == name)
2538 return splay (tmp);
2539
2540 return 0;
2541}
2542
2543void
2544object::force_add (const shstr name, int duration)
2545{
2546 if (object *force = force_find (name))
2547 force->destroy ();
2548
2549 object *force = get_archetype (FORCE_NAME);
2550
2551 force->slaying = name;
2552 force->stats.food = 1;
2553 force->speed_left = -1.f;
2554
2555 force->set_speed (duration ? 1.f / duration : 0.f);
2556 force->flag [FLAG_IS_USED_UP] = true;
2557 force->flag [FLAG_APPLIED] = true;
2558
2559 insert (force);
2560}
2561
2562void
2563object::play_sound (faceidx sound)
2564{
2565 if (!sound)
2566 return;
2567
2568 if (flag [FLAG_REMOVED])
2569 return;
2570
2571 if (env)
2572 {
2573 if (object *pl = in_player ())
2574 pl->contr->play_sound (sound);
2575 }
2576 else
2577 map->play_sound (sound, x, y);
2578}
2579

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines