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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines