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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines