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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines