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.77 by root, Thu Dec 21 23:37:05 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
35#include <bitset> 36#include <bitset>
36 37
37int nrofallocobjects = 0; 38UUID UUID::cur;
38static UUID uuid; 39static uint64_t seq_next_save;
39const uint64 UUID_SKIP = 1<<19; 40static const uint64 UUID_GAP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short 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,
44 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
45}; 50};
46short 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,
47 -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
48}; 56};
49int 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,
50 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
51}; 62};
52int freedir[SIZEOFFREE] = { 63int freedir[SIZEOFFREE] = {
53 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,
54 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
55}; 68};
56 69
57static void 70static void
58write_uuid (void) 71write_uuid (uval64 skip, bool sync)
59{ 72{
60 char filename1[MAX_BUF], filename2[MAX_BUF]; 73 CALL_BEGIN (2);
61 74 CALL_ARG_SV (newSVval64 (skip));
62 sprintf (filename1, "%s/uuid", settings.localdir); 75 CALL_ARG_SV (boolSV (sync));
63 sprintf (filename2, "%s/uuid~", settings.localdir); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
64 77 CALL_END;
65 FILE *fp;
66
67 if (!(fp = fopen (filename2, "w")))
68 {
69 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70 return;
71 }
72
73 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74 fclose (fp);
75 rename (filename2, filename1);
76} 78}
77 79
78static void 80static void
79read_uuid (void) 81read_uuid (void)
80{ 82{
81 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
82 84
83 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
84 86
87 seq_next_save = 0;
88
85 FILE *fp; 89 FILE *fp;
86 90
87 if (!(fp = fopen (filename, "r"))) 91 if (!(fp = fopen (filename, "r")))
88 { 92 {
89 if (errno == ENOENT) 93 if (errno == ENOENT)
90 { 94 {
91 LOG (llevInfo, "RESET uid to 1\n"); 95 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0; 96 UUID::cur.seq = 0;
93 write_uuid (); 97 write_uuid (UUID_GAP, true);
94 return; 98 return;
95 } 99 }
96 100
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 102 _exit (1);
99 } 103 }
100 104
101 int version; 105 UUID::BUF buf;
102 unsigned long long uid; 106 buf[0] = 0;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
104 { 110 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106 _exit (1); 112 _exit (1);
107 } 113 }
108 114
109 uuid.seq = uid; 115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110 write_uuid (); 116
111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 117 write_uuid (UUID_GAP, true);
112 fclose (fp); 118 fclose (fp);
113} 119}
114 120
115UUID 121UUID
116gen_uuid () 122UUID::gen ()
117{ 123{
118 UUID uid; 124 UUID uid;
119 125
120 uid.seq = ++uuid.seq; 126 uid.seq = ++cur.seq;
121 127
122 if (!(uuid.seq & (UUID_SKIP - 1))) 128 if (expect_false (cur.seq >= seq_next_save))
123 write_uuid (); 129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
124 134
125 return uid; 135 return uid;
126} 136}
127 137
128void 138void
129init_uuid () 139UUID::init ()
130{ 140{
131 read_uuid (); 141 read_uuid ();
132} 142}
133 143
134/* 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. */
135static int 145static bool
136compare_ob_value_lists_one (const object *wants, const object *has) 146compare_ob_value_lists_one (const object *wants, const object *has)
137{ 147{
138 key_value *wants_field; 148 key_value *wants_field;
139 149
140 /* 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
141 * 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
142 * different structure or at least keep the lists sorted... 152 * different structure or at least keep the lists sorted...
143 */ 153 */
144 154
145 /* For each field in wants, */ 155 /* For each field in wants, */
146 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)
147 { 157 {
148 key_value *has_field; 158 key_value *has_field;
149 159
150 /* Look for a field in has with the same key. */ 160 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 161 has_field = get_ob_key_link (has, wants_field->key);
152 162
153 if (has_field == NULL) 163 if (!has_field)
154 {
155 /* No field with that name. */ 164 return 0; /* No field with that name. */
156 return FALSE;
157 }
158 165
159 /* Found the matching field. */ 166 /* Found the matching field. */
160 if (has_field->value != wants_field->value) 167 if (has_field->value != wants_field->value)
161 {
162 /* 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. */
163 return FALSE;
164 }
165 169
166 /* 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. */
167 } 171 }
168 172
169 /* 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. */
170 return TRUE; 174 return 1;
171} 175}
172 176
173/* Returns TRUE if ob1 has the same key_values as ob2. */ 177/* Returns TRUE if ob1 has the same key_values as ob2. */
174static int 178static bool
175compare_ob_value_lists (const object *ob1, const object *ob2) 179compare_ob_value_lists (const object *ob1, const object *ob2)
176{ 180{
177 /* 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,
178 * so we need to run the comparison *twice*. :( 182 * so we need to run the comparison *twice*. :(
179 */ 183 */
190 * Check nrof variable *before* calling can_merge() 194 * Check nrof variable *before* calling can_merge()
191 * 195 *
192 * Improvements made with merge: Better checking on potion, and also 196 * Improvements made with merge: Better checking on potion, and also
193 * check weight 197 * check weight
194 */ 198 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 199bool object::can_merge_slow (object *ob1, object *ob2)
197{ 200{
198 /* A couple quicksanity checks */ 201 /* A couple quicksanity checks */
199 if (ob1 == ob2 202 if (ob1 == ob2
200 || ob1->type != ob2->type 203 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed 204 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value 205 || ob1->value != ob2->value
203 || ob1->name != ob2->name) 206 || ob1->name != ob2->name)
204 return 0; 207 return 0;
205 208
206 //TODO: this ain't working well, use nicer and correct overflow check 209 /* Do not merge objects if nrof would overflow. First part checks
207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 210 * for unsigned overflow (2c), second part checks wether the result
208 * value could not be stored in a sint32 (which unfortunately sometimes is 211 * would fit into a 32 bit signed int, which is often used to hold
209 * used to store nrof). 212 * nrof values.
210 */ 213 */
211 if (ob1->nrof + ob2->nrof >= 1UL << 31) 214 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212 return 0; 215 return 0;
213 216
214 /* If the objects have been identified, set the BEEN_APPLIED flag. 217 /* If the objects have been identified, set the BEEN_APPLIED flag.
215 * 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
216 * 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
217 * 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
218 * flags lose any meaning. 221 * flags lose any meaning.
219 */ 222 */
220 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 225
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 226 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 227 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 228
226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 229 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227 || ob1->arch != ob2->arch 230 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 231 || ob1->name != ob2->name
229 || ob1->title != ob2->title 232 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 233 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 234 || ob1->weight != ob2->weight
248 || ob1->move_off != ob2->move_off 251 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow 252 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty) 253 || ob1->move_slow_penalty != ob2->move_slow_penalty)
251 return 0; 254 return 0;
252 255
253 /* This is really a spellbook check - really, we should 256 /* This is really a spellbook check - we should in general
254 * check all objects in the inventory. 257 * not merge objects with real inventories, as splitting them
258 * is hard.
255 */ 259 */
256 if (ob1->inv || ob2->inv) 260 if (ob1->inv || ob2->inv)
257 { 261 {
258 /* if one object has inventory but the other doesn't, not equiv */ 262 if (!(ob1->inv && ob2->inv))
259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 263 return 0; /* inventories differ in length */
260 return 0;
261 264
262 /* Now check to see if the two inventory objects could merge */ 265 if (ob1->inv->below || ob2->inv->below)
266 return 0; /* more than one object in inv */
267
263 if (!object::can_merge (ob1->inv, ob2->inv)) 268 if (!object::can_merge (ob1->inv, ob2->inv))
264 return 0; 269 return 0; /* inventory objects differ */
265 270
266 /* 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
267 * if it is valid. 272 * if it is valid.
268 */ 273 */
269 } 274 }
277 282
278 /* 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
279 * 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
280 * check? 285 * check?
281 */ 286 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 287 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 288 return 0;
284 289
285 switch (ob1->type) 290 switch (ob1->type)
286 { 291 {
287 case SCROLL: 292 case SCROLL:
288 if (ob1->level != ob2->level) 293 if (ob1->level != ob2->level)
289 return 0; 294 return 0;
290 break; 295 break;
291 } 296 }
292 297
293 if (ob1->key_values != NULL || ob2->key_values != NULL) 298 if (ob1->key_values || ob2->key_values)
294 { 299 {
295 /* At least one of these has key_values. */ 300 /* At least one of these has key_values. */
296 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 301 if ((!ob1->key_values) != (!ob2->key_values))
297 /* One has fields, but the other one doesn't. */ 302 /* One has fields, but the other one doesn't. */
298 return 0; 303 return 0;
299 else if (!compare_ob_value_lists (ob1, ob2)) 304 else if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 305 return 0;
301 } 306 }
302 307
303 //TODO: generate an event or call into perl for additional checks
304 if (ob1->self || ob2->self) 308 if (ob1->self || ob2->self)
305 { 309 {
306 ob1->optimise (); 310 ob1->optimise ();
307 ob2->optimise (); 311 ob2->optimise ();
308 312
309 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)
310 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 }
311 } 325 }
312 326
313 /* Everything passes, must be OK. */ 327 /* Everything passes, must be OK. */
314 return 1; 328 return 1;
315} 329}
323sum_weight (object *op) 337sum_weight (object *op)
324{ 338{
325 long sum; 339 long sum;
326 object *inv; 340 object *inv;
327 341
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 342 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 343 {
330 if (inv->inv) 344 if (inv->inv)
331 sum_weight (inv); 345 sum_weight (inv);
346
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 347 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 348 }
334 349
335 if (op->type == CONTAINER && op->stats.Str) 350 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 351 sum = (sum * (100 - op->stats.Str)) / 100;
356/* 371/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 372 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 373 * Some error messages.
359 * 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.
360 */ 375 */
361
362char * 376char *
363dump_object (object *op) 377dump_object (object *op)
364{ 378{
365 if (!op) 379 if (!op)
366 return strdup ("[NULLOBJ]"); 380 return strdup ("[NULLOBJ]");
367 381
368 object_freezer freezer; 382 object_freezer freezer;
369 save_object (freezer, op, 3); 383 op->write (freezer);
370 return freezer.as_string (); 384 return freezer.as_string ();
371} 385}
372 386
373/* 387/*
374 * 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
375 * multi-object 1 which is closest to the second object. 389 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 390 * If it's not a multi-object, it is returned.
377 */ 391 */
378
379object * 392object *
380get_nearest_part (object *op, const object *pl) 393get_nearest_part (object *op, const object *pl)
381{ 394{
382 object *tmp, *closest; 395 object *tmp, *closest;
383 int last_dist, i; 396 int last_dist, i;
391} 404}
392 405
393/* 406/*
394 * 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.
395 */ 408 */
396
397object * 409object *
398find_object (tag_t i) 410find_object (tag_t i)
399{ 411{
400 for (object *op = object::first; op; op = op->next) 412 for_all_objects (op)
401 if (op->count == i) 413 if (op->count == i)
402 return op; 414 return op;
403 415
404 return 0; 416 return 0;
405} 417}
406 418
407/* 419/*
408 * 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.
409 * Used only by the patch command, but not all that useful. 421 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 422 * Enables features like "patch <name-of-other-player> food 999"
411 */ 423 */
412
413object * 424object *
414find_object_name (const char *str) 425find_object_name (const char *str)
415{ 426{
416 shstr_cmp str_ (str); 427 shstr_cmp str_ (str);
417 object *op; 428 object *op;
418 429
419 for (op = object::first; op != NULL; op = op->next) 430 for_all_objects (op)
420 if (op->name == str_) 431 if (op->name == str_)
421 break; 432 break;
422 433
423 return op; 434 return op;
424} 435}
425 436
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 437/*
433 * 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
434 * skill and experience objects. 439 * skill and experience objects.
440 * ACTUALLY NO! investigate! TODO
435 */ 441 */
436void 442void
437object::set_owner (object *owner) 443object::set_owner (object *owner)
438{ 444{
445 // allow objects which own objects
439 if (!owner) 446 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 447 while (owner->owner)
450 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 }
451 455
452 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;
453} 523}
454 524
455/* Zero the key_values on op, decrementing the shared-string 525/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 526 * refcounts and freeing the links.
457 */ 527 */
458static void 528static void
459free_key_values (object *op) 529free_key_values (object *op)
460{ 530{
461 for (key_value *i = op->key_values; i != 0;) 531 for (key_value *i = op->key_values; i; )
462 { 532 {
463 key_value *next = i->next; 533 key_value *next = i->next;
464 delete i; 534 delete i;
465 535
466 i = next; 536 i = next;
467 } 537 }
468 538
469 op->key_values = 0; 539 op->key_values = 0;
470} 540}
471 541
472void object::clear () 542object &
543object::operator =(const object &src)
473{ 544{
474 attachable_base::clear (); 545 bool is_freed = flag [FLAG_FREED];
546 bool is_removed = flag [FLAG_REMOVED];
475 547
476 free_key_values (this);
477
478 owner = 0;
479 name = 0;
480 name_pl = 0;
481 title = 0;
482 race = 0;
483 slaying = 0;
484 skill = 0;
485 msg = 0;
486 lore = 0;
487 custom_name = 0;
488 materialname = 0;
489 contr = 0;
490 below = 0;
491 above = 0;
492 inv = 0;
493 container = 0;
494 env = 0;
495 more = 0;
496 head = 0;
497 map = 0;
498 active_next = 0;
499 active_prev = 0;
500
501 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503 SET_FLAG (this, FLAG_REMOVED);
504
505 /* What is not cleared is next, prev, and count */
506
507 expmul = 1.0;
508 face = blank_face;
509
510 if (settings.casting_time)
511 casting_time = -1;
512}
513
514/*
515 * copy_to first frees everything allocated by the dst object,
516 * and then copies the contents of itself into the second
517 * object, allocating what needs to be allocated. Basically, any
518 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
519 * if the first object is freed, the pointers in the new object
520 * will point at garbage.
521 */
522void
523object::copy_to (object *dst)
524{
525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527
528 *(object_copy *)dst = *this; 548 *(object_copy *)this = src;
529 *(object_pod *)dst = *this;
530 549
531 if (self || cb) 550 flag [FLAG_FREED] = is_freed;
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 551 flag [FLAG_REMOVED] = is_removed;
533
534 if (is_freed)
535 SET_FLAG (dst, FLAG_FREED);
536
537 if (is_removed)
538 SET_FLAG (dst, FLAG_REMOVED);
539
540 if (speed < 0)
541 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
542 552
543 /* Copy over key_values, if any. */ 553 /* Copy over key_values, if any. */
544 if (key_values) 554 if (src.key_values)
545 { 555 {
546 key_value *tail = 0; 556 key_value *tail = 0;
547 key_value *i;
548
549 dst->key_values = 0; 557 key_values = 0;
550 558
551 for (i = key_values; i; i = i->next) 559 for (key_value *i = src.key_values; i; i = i->next)
552 { 560 {
553 key_value *new_link = new key_value; 561 key_value *new_link = new key_value;
554 562
555 new_link->next = 0; 563 new_link->next = 0;
556 new_link->key = i->key; 564 new_link->key = i->key;
557 new_link->value = i->value; 565 new_link->value = i->value;
558 566
559 /* Try and be clever here, too. */ 567 /* Try and be clever here, too. */
560 if (!dst->key_values) 568 if (!key_values)
561 { 569 {
562 dst->key_values = new_link; 570 key_values = new_link;
563 tail = new_link; 571 tail = new_link;
564 } 572 }
565 else 573 else
566 { 574 {
567 tail->next = new_link; 575 tail->next = new_link;
568 tail = new_link; 576 tail = new_link;
569 } 577 }
570 } 578 }
571 } 579 }
580}
572 581
573 update_ob_speed (dst); 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 ();
574} 618}
575 619
576object * 620object *
577object::clone () 621object::clone ()
578{ 622{
584/* 628/*
585 * 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
586 * 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
587 * 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.
588 */ 632 */
589
590void 633void
591update_turn_face (object *op) 634update_turn_face (object *op)
592{ 635{
593 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 636 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594 return; 637 return;
638
595 SET_ANIMATION (op, op->direction); 639 SET_ANIMATION (op, op->direction);
596 update_object (op, UP_OBJ_FACE); 640 update_object (op, UP_OBJ_FACE);
597} 641}
598 642
599/* 643/*
600 * 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
601 * 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.
602 * 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.
603 */ 647 */
604void 648void
605update_ob_speed (object *op) 649object::set_speed (float speed)
606{ 650{
607 extern int arch_init; 651 if (flag [FLAG_FREED] && speed)
608
609 /* No reason putting the archetypes objects on the speed list,
610 * since they never really need to be updated.
611 */
612
613 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614 { 652 {
615 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 653 LOG (llevError, "Object %s is freed but has speed.\n", &name);
616#ifdef MANY_CORES
617 abort ();
618#else
619 op->speed = 0; 654 speed = 0;
620#endif
621 }
622
623 if (arch_init)
624 return;
625
626 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627 { 655 }
628 /* If already on active list, don't do anything */
629 if (op->active_next || op->active_prev || op == active_objects)
630 return;
631 656
632 /* process_events() expects us to insert the object at the beginning 657 this->speed = speed;
633 * of the list. */
634 op->active_next = active_objects;
635 658
636 if (op->active_next != NULL) 659 if (has_active_speed ())
637 op->active_next->active_prev = op; 660 activate ();
638
639 active_objects = op;
640 }
641 else 661 else
642 { 662 deactivate ();
643 /* If not on the active list, nothing needs to be done */
644 if (!op->active_next && !op->active_prev && op != active_objects)
645 return;
646
647 if (op->active_prev == NULL)
648 {
649 active_objects = op->active_next;
650
651 if (op->active_next != NULL)
652 op->active_next->active_prev = NULL;
653 }
654 else
655 {
656 op->active_prev->active_next = op->active_next;
657
658 if (op->active_next)
659 op->active_next->active_prev = op->active_prev;
660 }
661
662 op->active_next = NULL;
663 op->active_prev = NULL;
664 }
665}
666
667/* This function removes object 'op' from the list of active
668 * objects.
669 * This should only be used for style maps or other such
670 * reference maps where you don't want an object that isn't
671 * in play chewing up cpu time getting processed.
672 * The reverse of this is to call update_ob_speed, which
673 * will do the right thing based on the speed of the object.
674 */
675void
676remove_from_active_list (object *op)
677{
678 /* If not on the active list, nothing needs to be done */
679 if (!op->active_next && !op->active_prev && op != active_objects)
680 return;
681
682 if (op->active_prev == NULL)
683 {
684 active_objects = op->active_next;
685 if (op->active_next != NULL)
686 op->active_next->active_prev = NULL;
687 }
688 else
689 {
690 op->active_prev->active_next = op->active_next;
691 if (op->active_next)
692 op->active_next->active_prev = op->active_prev;
693 }
694 op->active_next = NULL;
695 op->active_prev = NULL;
696} 663}
697 664
698/* 665/*
699 * update_object() updates the the map. 666 * update_object() updates the the map.
700 * It takes into account invisible objects (and represent squares covered 667 * It takes into account invisible objects (and represent squares covered
713 * UP_OBJ_FACE: only the objects face has changed. 680 * UP_OBJ_FACE: only the objects face has changed.
714 */ 681 */
715void 682void
716update_object (object *op, int action) 683update_object (object *op, int action)
717{ 684{
718 MoveType move_on, move_off, move_block, move_slow;
719
720 if (op == NULL) 685 if (op == NULL)
721 { 686 {
722 /* this should never happen */ 687 /* this should never happen */
723 LOG (llevDebug, "update_object() called for NULL object.\n"); 688 LOG (llevDebug, "update_object() called for NULL object.\n");
724 return; 689 return;
737 */ 702 */
738 if (!op->map || op->map->in_memory == MAP_SAVING) 703 if (!op->map || op->map->in_memory == MAP_SAVING)
739 return; 704 return;
740 705
741 /* make sure the object is within map boundaries */ 706 /* make sure the object is within map boundaries */
742 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)
743 { 708 {
744 LOG (llevError, "update_object() called for object out of map!\n"); 709 LOG (llevError, "update_object() called for object out of map!\n");
745#ifdef MANY_CORES 710#ifdef MANY_CORES
746 abort (); 711 abort ();
747#endif 712#endif
748 return; 713 return;
749 } 714 }
750 715
751 mapspace &m = op->ms (); 716 mapspace &m = op->ms ();
752 717
753 if (m.flags_ & P_NEED_UPDATE) 718 if (!(m.flags_ & P_UPTODATE))
754 /* nop */; 719 /* nop */;
755 else if (action == UP_OBJ_INSERT) 720 else if (action == UP_OBJ_INSERT)
756 { 721 {
757 // this is likely overkill, TODO: revisit (schmorp) 722 // this is likely overkill, TODO: revisit (schmorp)
758 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 723 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
767 /* 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
768 * to have move_allow right now. 733 * to have move_allow right now.
769 */ 734 */
770 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 735 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
771 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 736 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
772 m.flags_ = P_NEED_UPDATE; 737 m.flags_ = 0;
773 } 738 }
774 /* if the object is being removed, we can't make intelligent 739 /* if the object is being removed, we can't make intelligent
775 * decisions, because remove_ob can't really pass the object 740 * decisions, because remove_ob can't really pass the object
776 * that is being removed. 741 * that is being removed.
777 */ 742 */
778 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 743 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
779 m.flags_ = P_NEED_UPDATE; 744 m.flags_ = 0;
780 else if (action == UP_OBJ_FACE) 745 else if (action == UP_OBJ_FACE)
781 /* Nothing to do for that case */ ; 746 /* Nothing to do for that case */ ;
782 else 747 else
783 LOG (llevError, "update_object called with invalid action: %d\n", action); 748 LOG (llevError, "update_object called with invalid action: %d\n", action);
784 749
785 if (op->more) 750 if (op->more)
786 update_object (op->more, action); 751 update_object (op->more, action);
787} 752}
788 753
789object::vector object::mortals;
790object::vector object::objects; // not yet used
791object *object::first;
792
793void object::free_mortals ()
794{
795 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796 if ((*i)->refcnt)
797 ++i; // further delay freeing
798 else
799 {
800 delete *i;
801 mortals.erase (i);
802 }
803}
804
805object::object () 754object::object ()
806{ 755{
807 SET_FLAG (this, FLAG_REMOVED); 756 SET_FLAG (this, FLAG_REMOVED);
808 757
809 expmul = 1.0; 758 expmul = 1.0;
810 face = blank_face; 759 face = blank_face;
811} 760}
812 761
813object::~object () 762object::~object ()
814{ 763{
764 unlink ();
765
815 free_key_values (this); 766 free_key_values (this);
816} 767}
817 768
769static int object_count;
770
818void object::link () 771void object::link ()
819{ 772{
773 assert (!index);//D
774 uuid = UUID::gen ();
820 count = ++ob_count; 775 count = ++object_count;
821 uuid = gen_uuid ();
822 776
823 prev = 0; 777 refcnt_inc ();
824 next = object::first; 778 objects.insert (this);
825
826 if (object::first)
827 object::first->prev = this;
828
829 object::first = this;
830} 779}
831 780
832void object::unlink () 781void object::unlink ()
833{ 782{
834 if (this == object::first) 783 if (!index)
835 object::first = next; 784 return;
836 785
837 /* Remove this object from the list of used objects */ 786 objects.erase (this);
838 if (prev) prev->next = next; 787 refcnt_dec ();
839 if (next) next->prev = prev; 788}
840 789
841 prev = 0; 790void
842 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 }
843} 895}
844 896
845object *object::create () 897object *object::create ()
846{ 898{
847 object *op = new object; 899 object *op = new object;
848 op->link (); 900 op->link ();
849 return op; 901 return op;
850} 902}
851 903
852/* 904void
853 * free_object() frees everything allocated by an object, removes 905object::do_destroy ()
854 * it from the list of used objects, and puts it on the list of
855 * free objects. The IS_FREED() flag is set in the object.
856 * The object must have been removed by remove_ob() first for
857 * this function to succeed.
858 *
859 * If destroy_inventory is set, free inventory as well. Else drop items in
860 * inventory to the ground.
861 */
862void object::destroy (bool destroy_inventory)
863{ 906{
864 if (QUERY_FLAG (this, FLAG_FREED)) 907 attachable::do_destroy ();
865 return;
866 908
867 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 909 if (flag [FLAG_IS_LINKED])
910 remove_button_link (this);
911
912 if (flag [FLAG_FRIENDLY])
868 remove_friendly_object (this); 913 remove_friendly_object (this);
869 914
870 if (!QUERY_FLAG (this, FLAG_REMOVED)) 915 if (!flag [FLAG_REMOVED])
871 remove (); 916 remove ();
872 917
873 SET_FLAG (this, FLAG_FREED); 918 destroy_inv (true);
874 919
875 if (more) 920 deactivate ();
876 { 921 unlink ();
877 more->destroy (destroy_inventory);
878 more = 0;
879 }
880 922
881 if (inv) 923 flag [FLAG_FREED] = 1;
882 {
883 /* Only if the space blocks everything do we not process -
884 * if some form of movement is allowed, let objects
885 * drop on that space.
886 */
887 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888 {
889 object *op = inv;
890
891 while (op)
892 {
893 object *tmp = op->below;
894 op->destroy (destroy_inventory);
895 op = tmp;
896 }
897 }
898 else
899 { /* Put objects in inventory onto this space */
900 object *op = inv;
901
902 while (op)
903 {
904 object *tmp = op->below;
905
906 op->remove ();
907
908 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910 op->destroy ();
911 else
912 {
913 op->x = x;
914 op->y = y;
915 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916 }
917
918 op = tmp;
919 }
920 }
921 }
922 924
923 // hack to ensure that freed objects still have a valid map 925 // hack to ensure that freed objects still have a valid map
924 { 926 {
925 static maptile *freed_map; // freed objects are moved here to avoid crashes 927 static maptile *freed_map; // freed objects are moved here to avoid crashes
926 928
927 if (!freed_map) 929 if (!freed_map)
928 { 930 {
929 freed_map = new maptile; 931 freed_map = new maptile;
930 932
933 freed_map->path = "<freed objects map>";
931 freed_map->name = "/internal/freed_objects_map"; 934 freed_map->name = "/internal/freed_objects_map";
932 freed_map->width = 3; 935 freed_map->width = 3;
933 freed_map->height = 3; 936 freed_map->height = 3;
937 freed_map->nodrop = 1;
934 938
935 freed_map->allocate (); 939 freed_map->alloc ();
940 freed_map->in_memory = MAP_ACTIVE;
936 } 941 }
937 942
938 map = freed_map; 943 map = freed_map;
939 x = 1; 944 x = 1;
940 y = 1; 945 y = 1;
941 } 946 }
942 947
948 if (more)
949 {
950 more->destroy ();
951 more = 0;
952 }
953
954 head = 0;
955
943 // clear those pointers that likely might have circular references to us 956 // clear those pointers that likely might cause circular references
944 owner = 0; 957 owner = 0;
945 enemy = 0; 958 enemy = 0;
946 attacked_by = 0; 959 attacked_by = 0;
960 current_weapon = 0;
961}
947 962
948 // only relevant for players(?), but make sure of it anyways 963void
949 contr = 0; 964object::destroy (bool destroy_inventory)
965{
966 if (destroyed ())
967 return;
950 968
951 /* Remove object from the active list */ 969 if (destroy_inventory)
952 speed = 0; 970 destroy_inv (false);
953 update_ob_speed (this);
954 971
955 unlink (); 972 if (is_head ())
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
956 977
957 mortals.push_back (this); 978 attachable::destroy ();
958} 979}
959 980
960/* 981/*
961 * sub_weight() recursively (outwards) subtracts a number from the 982 * sub_weight() recursively (outwards) subtracts a number from the
962 * 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)).
978 * 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
979 * 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
980 * object will have no environment. If the object previously had an 1001 * object will have no environment. If the object previously had an
981 * environment, the x and y coordinates will be updated to 1002 * environment, the x and y coordinates will be updated to
982 * the previous environment. 1003 * the previous environment.
983 * Beware: This function is called from the editor as well!
984 */ 1004 */
985void 1005void
986object::remove () 1006object::do_remove ()
987{ 1007{
988 object *tmp, *last = 0; 1008 object *tmp, *last = 0;
989 object *otmp; 1009 object *otmp;
990 1010
991 int check_walk_off;
992
993 if (QUERY_FLAG (this, FLAG_REMOVED)) 1011 if (QUERY_FLAG (this, FLAG_REMOVED))
994 return; 1012 return;
995 1013
996 SET_FLAG (this, FLAG_REMOVED); 1014 SET_FLAG (this, FLAG_REMOVED);
1015 INVOKE_OBJECT (REMOVE, this);
997 1016
998 if (more) 1017 if (more)
999 more->remove (); 1018 more->remove ();
1000 1019
1001 /* 1020 /*
1012 /* 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
1013 * made to players inventory. If set, avoiding the call 1032 * made to players inventory. If set, avoiding the call
1014 * to save cpu time. 1033 * to save cpu time.
1015 */ 1034 */
1016 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1035 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017 fix_player (otmp); 1036 otmp->update_stats ();
1018 1037
1019 if (above != NULL) 1038 if (above)
1020 above->below = below; 1039 above->below = below;
1021 else 1040 else
1022 env->inv = below; 1041 env->inv = below;
1023 1042
1024 if (below != NULL) 1043 if (below)
1025 below->above = above; 1044 below->above = above;
1026 1045
1027 /* we set up values so that it could be inserted into 1046 /* we set up values so that it could be inserted into
1028 * 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
1029 * to the caller to decide what we want to do. 1048 * to the caller to decide what we want to do.
1033 above = 0, below = 0; 1052 above = 0, below = 0;
1034 env = 0; 1053 env = 0;
1035 } 1054 }
1036 else if (map) 1055 else if (map)
1037 { 1056 {
1038 /* Re did the following section of code - it looks like it had 1057 if (type == PLAYER)
1039 * lots of logic for things we no longer care about
1040 */ 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 ();
1064
1065 --map->players;
1066 map->touch ();
1067 }
1068
1069 map->dirty = true;
1070 mapspace &ms = this->ms ();
1041 1071
1042 /* link the object above us */ 1072 /* link the object above us */
1043 if (above) 1073 if (above)
1044 above->below = below; 1074 above->below = below;
1045 else 1075 else
1046 map->at (x, y).top = below; /* we were top, set new top */ 1076 ms.top = below; /* we were top, set new top */
1047 1077
1048 /* Relink the object below us, if there is one */ 1078 /* Relink the object below us, if there is one */
1049 if (below) 1079 if (below)
1050 below->above = above; 1080 below->above = above;
1051 else 1081 else
1053 /* 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
1054 * use translated coordinates in case some oddness with map tiling is 1084 * use translated coordinates in case some oddness with map tiling is
1055 * evident 1085 * evident
1056 */ 1086 */
1057 if (GET_MAP_OB (map, x, y) != this) 1087 if (GET_MAP_OB (map, x, y) != this)
1058 {
1059 char *dump = dump_object (this);
1060 LOG (llevError,
1061 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 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 ());
1062 free (dump);
1063 dump = dump_object (GET_MAP_OB (map, x, y));
1064 LOG (llevError, "%s\n", dump);
1065 free (dump);
1066 }
1067 1089
1068 map->at (x, y).bottom = above; /* goes on above it. */ 1090 ms.bot = above; /* goes on above it. */
1069 } 1091 }
1070 1092
1071 above = 0; 1093 above = 0;
1072 below = 0; 1094 below = 0;
1073 1095
1074 if (map->in_memory == MAP_SAVING) 1096 if (map->in_memory == MAP_SAVING)
1075 return; 1097 return;
1076 1098
1077 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1099 int check_walk_off = !flag [FLAG_NO_APPLY];
1078 1100
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
1079 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1113 for (tmp = ms.bot; tmp; tmp = tmp->above)
1080 { 1114 {
1081 /* 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
1082 * being removed. 1116 * being removed.
1083 */ 1117 */
1084 1118
1085 if (tmp->type == PLAYER && tmp != this)
1086 {
1087 /* If a container that the player is currently using somehow gets
1088 * removed (most likely destroyed), update the player view
1089 * appropriately.
1090 */
1091 if (tmp->container == this)
1092 {
1093 CLEAR_FLAG (this, FLAG_APPLIED);
1094 tmp->container = 0;
1095 }
1096
1097 tmp->contr->ns->floorbox_update ();
1098 }
1099
1100 /* See if player moving off should effect something */ 1119 /* See if object moving off should effect something */
1101 if (check_walk_off 1120 if (check_walk_off
1102 && ((move_type & tmp->move_off) 1121 && ((move_type & tmp->move_off)
1103 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1122 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1104 { 1123 {
1105 move_apply (tmp, this, 0); 1124 move_apply (tmp, this, 0);
1106 1125
1107 if (destroyed ()) 1126 if (destroyed ())
1108 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 ());
1109 } 1128 }
1110 1129
1111 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1112
1113 if (tmp->above == tmp)
1114 tmp->above = 0;
1115
1116 last = tmp; 1130 last = tmp;
1117 } 1131 }
1118 1132
1119 /* 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?
1120 if (!last) 1135 if (!last)
1121 map->at (x, y).flags_ = P_NEED_UPDATE; 1136 map->at (x, y).flags_ = 0;
1122 else 1137 else
1123 update_object (last, UP_OBJ_REMOVE); 1138 update_object (last, UP_OBJ_REMOVE);
1124 1139
1125 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1140 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126 update_all_los (map, x, y); 1141 update_all_los (map, x, y);
1127 } 1142 }
1128} 1143}
1129 1144
1130/* 1145/*
1139merge_ob (object *op, object *top) 1154merge_ob (object *op, object *top)
1140{ 1155{
1141 if (!op->nrof) 1156 if (!op->nrof)
1142 return 0; 1157 return 0;
1143 1158
1144 if (top == NULL) 1159 if (!top)
1145 for (top = op; top != NULL && top->above != NULL; top = top->above); 1160 for (top = op; top && top->above; top = top->above)
1161 ;
1146 1162
1147 for (; top != NULL; top = top->below) 1163 for (; top; top = top->below)
1148 { 1164 {
1149 if (top == op) 1165 if (top == op)
1150 continue; 1166 continue;
1151 1167
1152 if (object::can_merge (op, top)) 1168 if (object::can_merge (op, top))
1161 } 1177 }
1162 1178
1163 return 0; 1179 return 0;
1164} 1180}
1165 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
1166/* 1205/*
1167 * 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
1168 * job preparing multi-part monsters 1207 * job preparing multi-part monsters.
1169 */ 1208 */
1170object * 1209object *
1171insert_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)
1172{ 1211{
1173 object *tmp;
1174
1175 if (op->head)
1176 op = op->head;
1177
1178 for (tmp = op; tmp; tmp = tmp->more) 1212 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179 { 1213 {
1180 tmp->x = x + tmp->arch->clone.x; 1214 tmp->x = x + tmp->arch->x;
1181 tmp->y = y + tmp->arch->clone.y; 1215 tmp->y = y + tmp->arch->y;
1182 } 1216 }
1183 1217
1184 return insert_ob_in_map (op, m, originator, flag); 1218 return insert_ob_in_map (op, m, originator, flag);
1185} 1219}
1186 1220
1202 * Return value: 1236 * Return value:
1203 * new object if 'op' was merged with other object 1237 * new object if 'op' was merged with other object
1204 * NULL if 'op' was destroyed 1238 * NULL if 'op' was destroyed
1205 * just 'op' otherwise 1239 * just 'op' otherwise
1206 */ 1240 */
1207
1208object * 1241object *
1209insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1242insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210{ 1243{
1244 assert (!op->flag [FLAG_FREED]);
1245
1211 object *tmp, *top, *floor = NULL; 1246 object *top, *floor = NULL;
1212 sint16 x, y;
1213 1247
1214 if (QUERY_FLAG (op, FLAG_FREED)) 1248 op->remove ();
1215 {
1216 LOG (llevError, "Trying to insert freed object!\n");
1217 return NULL;
1218 }
1219
1220 if (m == NULL)
1221 {
1222 char *dump = dump_object (op);
1223 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1224 free (dump);
1225 return op;
1226 }
1227
1228 if (out_of_map (m, op->x, op->y))
1229 {
1230 char *dump = dump_object (op);
1231 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1232#ifdef MANY_CORES
1233 /* Better to catch this here, as otherwise the next use of this object
1234 * is likely to cause a crash. Better to find out where it is getting
1235 * improperly inserted.
1236 */
1237 abort ();
1238#endif
1239 free (dump);
1240 return op;
1241 }
1242
1243 if (!QUERY_FLAG (op, FLAG_REMOVED))
1244 {
1245 char *dump = dump_object (op);
1246 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247 free (dump);
1248 return op;
1249 }
1250
1251 if (op->more != NULL)
1252 {
1253 /* The part may be on a different map. */
1254
1255 object *more = op->more;
1256
1257 /* We really need the caller to normalize coordinates - if
1258 * we set the map, that doesn't work if the location is within
1259 * a map and this is straddling an edge. So only if coordinate
1260 * is clear wrong do we normalize it.
1261 */
1262 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1263 more->map = get_map_from_coord (m, &more->x, &more->y);
1264 else if (!more->map)
1265 {
1266 /* For backwards compatibility - when not dealing with tiled maps,
1267 * more->map should always point to the parent.
1268 */
1269 more->map = m;
1270 }
1271
1272 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273 {
1274 if (!op->head)
1275 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276
1277 return NULL;
1278 }
1279 }
1280
1281 CLEAR_FLAG (op, FLAG_REMOVED);
1282 1249
1283 /* Ideally, the caller figures this out. However, it complicates a lot 1250 /* Ideally, the caller figures this out. However, it complicates a lot
1284 * of areas of callers (eg, anything that uses find_free_spot would now 1251 * of areas of callers (eg, anything that uses find_free_spot would now
1285 * need extra work 1252 * need extra work
1286 */ 1253 */
1287 op->map = get_map_from_coord (m, &op->x, &op->y); 1254 if (!xy_normalise (m, op->x, op->y))
1288 x = op->x; 1255 {
1289 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 ();
1290 1268
1291 /* this has to be done after we translate the coordinates. 1269 /* this has to be done after we translate the coordinates.
1292 */ 1270 */
1293 if (op->nrof && !(flag & INS_NO_MERGE)) 1271 if (op->nrof && !(flag & INS_NO_MERGE))
1294 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1272 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1295 if (object::can_merge (op, tmp)) 1273 if (object::can_merge (op, tmp))
1296 { 1274 {
1297 op->nrof += tmp->nrof; 1275 op->nrof += tmp->nrof;
1298 tmp->destroy (); 1276 tmp->destroy ();
1299 } 1277 }
1316 op->below = originator->below; 1294 op->below = originator->below;
1317 1295
1318 if (op->below) 1296 if (op->below)
1319 op->below->above = op; 1297 op->below->above = op;
1320 else 1298 else
1321 op->ms ().bottom = op; 1299 ms.bot = op;
1322 1300
1323 /* since *below* originator, no need to update top */ 1301 /* since *below* originator, no need to update top */
1324 originator->below = op; 1302 originator->below = op;
1325 } 1303 }
1326 else 1304 else
1327 { 1305 {
1306 top = ms.bot;
1307
1328 /* If there are other objects, then */ 1308 /* If there are other objects, then */
1329 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1309 if (top)
1330 { 1310 {
1331 object *last = NULL; 1311 object *last = 0;
1332 1312
1333 /* 1313 /*
1334 * 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.
1335 * We've already dealt with merging if appropriate. 1315 * We've already dealt with merging if appropriate.
1336 * 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
1340 * 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
1341 * 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
1342 * 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
1343 * that flying non pickable objects are spell objects. 1323 * that flying non pickable objects are spell objects.
1344 */ 1324 */
1345 1325 for (top = ms.bot; top; top = top->above)
1346 while (top != NULL)
1347 { 1326 {
1348 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))
1349 floor = top; 1328 floor = top;
1350 1329
1351 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))
1354 top = top->below; 1333 top = top->below;
1355 break; 1334 break;
1356 } 1335 }
1357 1336
1358 last = top; 1337 last = top;
1359 top = top->above;
1360 } 1338 }
1361 1339
1362 /* 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 */
1363 top = last; 1341 top = last;
1364 1342
1366 * looks like instead of lots of conditions here. 1344 * looks like instead of lots of conditions here.
1367 * makes things faster, and effectively the same result. 1345 * makes things faster, and effectively the same result.
1368 */ 1346 */
1369 1347
1370 /* Have object 'fall below' other objects that block view. 1348 /* Have object 'fall below' other objects that block view.
1371 * Unless those objects are exits, type 66 1349 * Unless those objects are exits.
1372 * If INS_ON_TOP is used, don't do this processing 1350 * If INS_ON_TOP is used, don't do this processing
1373 * Need to find the object that in fact blocks view, otherwise 1351 * Need to find the object that in fact blocks view, otherwise
1374 * stacking is a bit odd. 1352 * stacking is a bit odd.
1375 */ 1353 */
1376 if (!(flag & INS_ON_TOP) && 1354 if (!(flag & INS_ON_TOP)
1377 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1355 && ms.flags () & P_BLOCKSVIEW
1356 && (op->face && !faces [op->face].visibility))
1378 { 1357 {
1379 for (last = top; last != floor; last = last->below) 1358 for (last = top; last != floor; last = last->below)
1380 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1359 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1381 break; 1360 break;
1361
1382 /* Check to see if we found the object that blocks view, 1362 /* Check to see if we found the object that blocks view,
1383 * 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
1384 * we can get inserted below this one, which requires we 1364 * we can get inserted below this one, which requires we
1385 * set top to the object below us. 1365 * set top to the object below us.
1386 */ 1366 */
1387 if (last && last->below && last != floor) 1367 if (last && last->below && last != floor)
1388 top = last->below; 1368 top = last->below;
1389 } 1369 }
1390 } /* If objects on this space */ 1370 } /* If objects on this space */
1391 1371
1392 if (flag & INS_MAP_LOAD)
1393 top = GET_MAP_TOP (op->map, op->x, op->y);
1394
1395 if (flag & INS_ABOVE_FLOOR_ONLY) 1372 if (flag & INS_ABOVE_FLOOR_ONLY)
1396 top = floor; 1373 top = floor;
1397 1374
1398 /* 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.
1399 */ 1376 */
1400 1377
1401 /* First object on this space */ 1378 /* First object on this space */
1402 if (!top) 1379 if (!top)
1403 { 1380 {
1404 op->above = GET_MAP_OB (op->map, op->x, op->y); 1381 op->above = ms.bot;
1405 1382
1406 if (op->above) 1383 if (op->above)
1407 op->above->below = op; 1384 op->above->below = op;
1408 1385
1409 op->below = NULL; 1386 op->below = 0;
1410 op->ms ().bottom = op; 1387 ms.bot = op;
1411 } 1388 }
1412 else 1389 else
1413 { /* get inserted into the stack above top */ 1390 { /* get inserted into the stack above top */
1414 op->above = top->above; 1391 op->above = top->above;
1415 1392
1418 1395
1419 op->below = top; 1396 op->below = top;
1420 top->above = op; 1397 top->above = op;
1421 } 1398 }
1422 1399
1423 if (op->above == NULL) 1400 if (!op->above)
1424 op->ms ().top = op; 1401 ms.top = op;
1425 } /* else not INS_BELOW_ORIGINATOR */ 1402 } /* else not INS_BELOW_ORIGINATOR */
1426 1403
1427 if (op->type == PLAYER) 1404 if (op->type == PLAYER)
1405 {
1428 op->contr->do_los = 1; 1406 op->contr->do_los = 1;
1407 ++op->map->players;
1408 op->map->touch ();
1409 }
1429 1410
1430 /* If we have a floor, we know the player, if any, will be above 1411 op->map->dirty = true;
1431 * it, so save a few ticks and start from there. 1412
1432 */
1433 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = op->ms ().player ()) 1413 if (object *pl = ms.player ())
1435 pl->contr->ns->floorbox_update (); 1414 pl->contr->ns->floorbox_update ();
1436 1415
1437 /* If this object glows, it may affect lighting conditions that are 1416 /* If this object glows, it may affect lighting conditions that are
1438 * 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
1439 * 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
1440 * on the map will get recalculated. The players could very well 1419 * on the map will get recalculated. The players could very well
1441 * 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 -
1442 * this should get redone to only look for players within range, 1421 * this should get redone to only look for players within range,
1443 * or just updating the P_NEED_UPDATE for spaces within this area 1422 * or just updating the P_UPTODATE for spaces within this area
1444 * of effect may be sufficient. 1423 * of effect may be sufficient.
1445 */ 1424 */
1446 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1425 if (op->map->darkness && (op->glow_radius != 0))
1447 update_all_los (op->map, op->x, op->y); 1426 update_all_los (op->map, op->x, op->y);
1448 1427
1449 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1428 /* updates flags (blocked, alive, no magic, etc) for this map space */
1450 update_object (op, UP_OBJ_INSERT); 1429 update_object (op, UP_OBJ_INSERT);
1430
1431 INVOKE_OBJECT (INSERT, op);
1451 1432
1452 /* 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,
1453 * we want to have floorbox_update called before calling this. 1434 * we want to have floorbox_update called before calling this.
1454 * 1435 *
1455 * check_move_on() must be after this because code called from 1436 * check_move_on() must be after this because code called from
1457 * blocked() and wall() work properly), and these flags are updated by 1438 * blocked() and wall() work properly), and these flags are updated by
1458 * update_object(). 1439 * update_object().
1459 */ 1440 */
1460 1441
1461 /* 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 */
1462 if (!(flag & INS_NO_WALK_ON) && !op->head) 1443 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1463 { 1444 {
1464 if (check_move_on (op, originator)) 1445 if (check_move_on (op, originator))
1465 return NULL; 1446 return 0;
1466 1447
1467 /* 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
1468 * walk on's. 1449 * walk on's.
1469 */ 1450 */
1470 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1451 for (object *tmp = op->more; tmp; tmp = tmp->more)
1471 if (check_move_on (tmp, originator)) 1452 if (check_move_on (tmp, originator))
1472 return NULL; 1453 return 0;
1473 } 1454 }
1474 1455
1475 return op; 1456 return op;
1476} 1457}
1477 1458
1484{ 1465{
1485 object *tmp, *tmp1; 1466 object *tmp, *tmp1;
1486 1467
1487 /* first search for itself and remove any old instances */ 1468 /* first search for itself and remove any old instances */
1488 1469
1489 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)
1490 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1471 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1491 tmp->destroy (); 1472 tmp->destroy ();
1492 1473
1493 tmp1 = arch_to_object (archetype::find (arch_string)); 1474 tmp1 = arch_to_object (archetype::find (arch_string));
1494 1475
1495 tmp1->x = op->x; 1476 tmp1->x = op->x;
1496 tmp1->y = op->y; 1477 tmp1->y = op->y;
1497 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);
1498} 1488}
1499 1489
1500/* 1490/*
1501 * 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
1502 * is returned contains nr objects, and the remaining parts contains 1492 * is returned contains nr objects, and the remaining parts contains
1503 * 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).
1504 * On failure, NULL is returned, and the reason put into the 1494 * On failure, NULL is returned, and the reason put into the
1505 * global static errmsg array. 1495 * global static errmsg array.
1506 */ 1496 */
1507
1508object * 1497object *
1509get_split_ob (object *orig_ob, uint32 nr) 1498get_split_ob (object *orig_ob, uint32 nr)
1510{ 1499{
1511 object *newob; 1500 object *newob;
1512 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1501 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1523 orig_ob->destroy (1); 1512 orig_ob->destroy (1);
1524 else if (!is_removed) 1513 else if (!is_removed)
1525 { 1514 {
1526 if (orig_ob->env != NULL) 1515 if (orig_ob->env != NULL)
1527 sub_weight (orig_ob->env, orig_ob->weight * nr); 1516 sub_weight (orig_ob->env, orig_ob->weight * nr);
1528 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)
1529 { 1518 {
1530 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.");
1531 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");
1532 return NULL; 1521 return NULL;
1533 } 1522 }
1543 * 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
1544 * is subsequently removed and freed. 1533 * is subsequently removed and freed.
1545 * 1534 *
1546 * 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
1547 */ 1536 */
1548
1549object * 1537object *
1550decrease_ob_nr (object *op, uint32 i) 1538decrease_ob_nr (object *op, uint32 i)
1551{ 1539{
1552 object *tmp; 1540 object *tmp;
1553 player *pl;
1554 1541
1555 if (i == 0) /* objects with op->nrof require this check */ 1542 if (i == 0) /* objects with op->nrof require this check */
1556 return op; 1543 return op;
1557 1544
1558 if (i > op->nrof) 1545 if (i > op->nrof)
1571 * IMO, searching through all the players will mostly 1558 * IMO, searching through all the players will mostly
1572 * likely be quicker than following op->env to the map, 1559 * likely be quicker than following op->env to the map,
1573 * and then searching the map for a player. 1560 * and then searching the map for a player.
1574 */ 1561 */
1575 if (!tmp) 1562 if (!tmp)
1576 { 1563 for_all_players (pl)
1577 for (pl = first_player; pl; pl = pl->next)
1578 if (pl->ob->container == op->env) 1564 if (pl->ob->container == op->env)
1579 { 1565 {
1580 tmp = pl->ob; 1566 tmp = pl->ob;
1581 break; 1567 break;
1582 } 1568 }
1583 }
1584 1569
1585 if (i < op->nrof) 1570 if (i < op->nrof)
1586 { 1571 {
1587 sub_weight (op->env, op->weight * i); 1572 sub_weight (op->env, op->weight * i);
1588 op->nrof -= i; 1573 op->nrof -= i;
1631 1616
1632/* 1617/*
1633 * add_weight(object, weight) adds the specified weight to an object, 1618 * add_weight(object, weight) adds the specified weight to an object,
1634 * and also updates how much the environment(s) is/are carrying. 1619 * and also updates how much the environment(s) is/are carrying.
1635 */ 1620 */
1636
1637void 1621void
1638add_weight (object *op, signed long weight) 1622add_weight (object *op, signed long weight)
1639{ 1623{
1640 while (op != NULL) 1624 while (op != NULL)
1641 { 1625 {
1656 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1640 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1657 free (dump); 1641 free (dump);
1658 return op; 1642 return op;
1659 } 1643 }
1660 1644
1661 if (where->head) 1645 if (where->head_ () != where)
1662 { 1646 {
1663 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1647 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1664 where = where->head; 1648 where = where->head;
1665 } 1649 }
1666 1650
1667 return where->insert (op); 1651 return where->insert (op);
1668} 1652}
1673 * inside the object environment. 1657 * inside the object environment.
1674 * 1658 *
1675 * 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
1676 * be != op, if items are merged. -Tero 1660 * be != op, if items are merged. -Tero
1677 */ 1661 */
1678
1679object * 1662object *
1680object::insert (object *op) 1663object::insert (object *op)
1681{ 1664{
1682 object *tmp, *otmp;
1683
1684 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1685 op->remove (); 1666 op->remove ();
1686 1667
1687 if (op->more) 1668 if (op->more)
1688 { 1669 {
1690 return op; 1671 return op;
1691 } 1672 }
1692 1673
1693 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1694 CLEAR_FLAG (op, FLAG_REMOVED); 1675 CLEAR_FLAG (op, FLAG_REMOVED);
1676
1695 if (op->nrof) 1677 if (op->nrof)
1696 { 1678 {
1697 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1679 for (object *tmp = inv; tmp; tmp = tmp->below)
1698 if (object::can_merge (tmp, op)) 1680 if (object::can_merge (tmp, op))
1699 { 1681 {
1700 /* return the original object and remove inserted object 1682 /* return the original object and remove inserted object
1701 (client needs the original object) */ 1683 (client needs the original object) */
1702 tmp->nrof += op->nrof; 1684 tmp->nrof += op->nrof;
1721 add_weight (this, op->weight * op->nrof); 1703 add_weight (this, op->weight * op->nrof);
1722 } 1704 }
1723 else 1705 else
1724 add_weight (this, (op->weight + op->carrying)); 1706 add_weight (this, (op->weight + op->carrying));
1725 1707
1726 otmp = this->in_player (); 1708 if (object *otmp = this->in_player ())
1727 if (otmp && otmp->contr)
1728 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729 fix_player (otmp); 1710 otmp->update_stats ();
1730 1711
1712 op->owner = 0; // its his/hers now. period.
1731 op->map = 0; 1713 op->map = 0;
1732 op->env = this; 1714 op->env = this;
1733 op->above = 0; 1715 op->above = 0;
1734 op->below = 0; 1716 op->below = 0;
1735 op->x = 0, op->y = 0; 1717 op->x = op->y = 0;
1736 1718
1737 /* 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 */
1738 if ((op->glow_radius != 0) && map) 1720 if (op->glow_radius && map)
1739 { 1721 {
1740#ifdef DEBUG_LIGHTS 1722#ifdef DEBUG_LIGHTS
1741 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);
1742#endif /* DEBUG_LIGHTS */ 1724#endif /* DEBUG_LIGHTS */
1743 if (MAP_DARKNESS (map)) 1725 if (map->darkness)
1744 update_all_los (map, x, y); 1726 update_all_los (map, x, y);
1745 } 1727 }
1746 1728
1747 /* 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.
1748 * It sure simplifies this function... 1730 * It sure simplifies this function...
1753 { 1735 {
1754 op->below = inv; 1736 op->below = inv;
1755 op->below->above = op; 1737 op->below->above = op;
1756 inv = op; 1738 inv = op;
1757 } 1739 }
1740
1741 INVOKE_OBJECT (INSERT, this);
1758 1742
1759 return op; 1743 return op;
1760} 1744}
1761 1745
1762/* 1746/*
1777 * 1761 *
1778 * 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
1779 * 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
1780 * on top. 1764 * on top.
1781 */ 1765 */
1782
1783int 1766int
1784check_move_on (object *op, object *originator) 1767check_move_on (object *op, object *originator)
1785{ 1768{
1786 object *tmp; 1769 object *tmp;
1787 maptile *m = op->map; 1770 maptile *m = op->map;
1814 1797
1815 /* The objects have to be checked from top to bottom. 1798 /* The objects have to be checked from top to bottom.
1816 * Hence, we first go to the top: 1799 * Hence, we first go to the top:
1817 */ 1800 */
1818 1801
1819 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)
1820 { 1803 {
1821 /* Trim the search when we find the first other spell effect 1804 /* Trim the search when we find the first other spell effect
1822 * 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,
1823 * we don't need to check all of them. 1806 * we don't need to check all of them.
1824 */ 1807 */
1842 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1825 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1843 ((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))
1844 { 1827 {
1845 1828
1846 float 1829 float
1847 diff = tmp->move_slow_penalty * FABS (op->speed); 1830 diff = tmp->move_slow_penalty * fabs (op->speed);
1848 1831
1849 if (op->type == PLAYER) 1832 if (op->type == PLAYER)
1850 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)) ||
1851 (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)))
1852 diff /= 4.0; 1835 diff /= 4.0;
1879/* 1862/*
1880 * present_arch(arch, map, x, y) searches for any objects with 1863 * present_arch(arch, map, x, y) searches for any objects with
1881 * a matching archetype at the given map and coordinates. 1864 * a matching archetype at the given map and coordinates.
1882 * The first matching object is returned, or NULL if none. 1865 * The first matching object is returned, or NULL if none.
1883 */ 1866 */
1884
1885object * 1867object *
1886present_arch (const archetype *at, maptile *m, int x, int y) 1868present_arch (const archetype *at, maptile *m, int x, int y)
1887{ 1869{
1888 object *
1889 tmp;
1890
1891 if (m == NULL || out_of_map (m, x, y)) 1870 if (!m || out_of_map (m, x, y))
1892 { 1871 {
1893 LOG (llevError, "Present_arch called outside map.\n"); 1872 LOG (llevError, "Present_arch called outside map.\n");
1894 return NULL; 1873 return NULL;
1895 } 1874 }
1896 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)
1897 if (tmp->arch == at) 1877 if (tmp->arch == at)
1898 return tmp; 1878 return tmp;
1879
1899 return NULL; 1880 return NULL;
1900} 1881}
1901 1882
1902/* 1883/*
1903 * present(type, map, x, y) searches for any objects with 1884 * present(type, map, x, y) searches for any objects with
1904 * a matching type variable at the given map and coordinates. 1885 * a matching type variable at the given map and coordinates.
1905 * The first matching object is returned, or NULL if none. 1886 * The first matching object is returned, or NULL if none.
1906 */ 1887 */
1907
1908object * 1888object *
1909present (unsigned char type, maptile *m, int x, int y) 1889present (unsigned char type, maptile *m, int x, int y)
1910{ 1890{
1911 object *
1912 tmp;
1913
1914 if (out_of_map (m, x, y)) 1891 if (out_of_map (m, x, y))
1915 { 1892 {
1916 LOG (llevError, "Present called outside map.\n"); 1893 LOG (llevError, "Present called outside map.\n");
1917 return NULL; 1894 return NULL;
1918 } 1895 }
1919 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)
1920 if (tmp->type == type) 1898 if (tmp->type == type)
1921 return tmp; 1899 return tmp;
1900
1922 return NULL; 1901 return NULL;
1923} 1902}
1924 1903
1925/* 1904/*
1926 * present_in_ob(type, object) searches for any objects with 1905 * present_in_ob(type, object) searches for any objects with
1927 * a matching type variable in the inventory of the given object. 1906 * a matching type variable in the inventory of the given object.
1928 * The first matching object is returned, or NULL if none. 1907 * The first matching object is returned, or NULL if none.
1929 */ 1908 */
1930
1931object * 1909object *
1932present_in_ob (unsigned char type, const object *op) 1910present_in_ob (unsigned char type, const object *op)
1933{ 1911{
1934 object *
1935 tmp;
1936
1937 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1912 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938 if (tmp->type == type) 1913 if (tmp->type == type)
1939 return tmp; 1914 return tmp;
1915
1940 return NULL; 1916 return NULL;
1941} 1917}
1942 1918
1943/* 1919/*
1944 * present_in_ob (type, str, object) searches for any objects with 1920 * present_in_ob (type, str, object) searches for any objects with
1952 * 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
1953 * 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
1954 * 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
1955 * to be unique. 1931 * to be unique.
1956 */ 1932 */
1957
1958object * 1933object *
1959present_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)
1960{ 1935{
1961 object *
1962 tmp;
1963
1964 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1936 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965 {
1966 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1937 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967 return tmp; 1938 return tmp;
1968 } 1939
1969 return NULL; 1940 return 0;
1970} 1941}
1971 1942
1972/* 1943/*
1973 * present_arch_in_ob(archetype, object) searches for any objects with 1944 * present_arch_in_ob(archetype, object) searches for any objects with
1974 * a matching archetype in the inventory of the given object. 1945 * a matching archetype in the inventory of the given object.
1975 * The first matching object is returned, or NULL if none. 1946 * The first matching object is returned, or NULL if none.
1976 */ 1947 */
1977
1978object * 1948object *
1979present_arch_in_ob (const archetype *at, const object *op) 1949present_arch_in_ob (const archetype *at, const object *op)
1980{ 1950{
1981 object *
1982 tmp;
1983
1984 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1951 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985 if (tmp->arch == at) 1952 if (tmp->arch == at)
1986 return tmp; 1953 return tmp;
1954
1987 return NULL; 1955 return NULL;
1988} 1956}
1989 1957
1990/* 1958/*
1991 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1992 */ 1960 */
1993void 1961void
1994flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1995{ 1963{
1996 object *
1997 tmp;
1998
1999 if (op->inv)
2000 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2001 { 1965 {
2002 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
2003 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
2004 } 1968 }
2005} /* 1969}
1970
1971/*
2006 * desactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
2007 */ 1973 */
2008void 1974void
2009unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
2010{ 1976{
2011 object *
2012 tmp;
2013
2014 if (op->inv)
2015 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2016 { 1978 {
2017 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
2018 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
2019 } 1981 }
2020}
2021
2022/*
2023 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024 * all it's inventory (recursively).
2025 * If checksums are used, a player will get set_cheat called for
2026 * him/her-self and all object carried by a call to this function.
2027 */
2028
2029void
2030set_cheat (object *op)
2031{
2032 SET_FLAG (op, FLAG_WAS_WIZ);
2033 flag_inv (op, FLAG_WAS_WIZ);
2034} 1982}
2035 1983
2036/* 1984/*
2037 * 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
2038 * 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
2040 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
2041 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
2042 * 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
2043 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
2044 * 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)
2045 * Note - this only checks to see if there is space for the head of the
2046 * object - if it is a multispace object, this should be called for all
2047 * pieces.
2048 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
2049 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
2050 * 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.
2051 * 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
2052 * 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
2053 * 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
2054 * 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
2055 * customized, changed states, etc. 2000 * customized, changed states, etc.
2056 */ 2001 */
2057
2058int 2002int
2059find_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)
2060{ 2004{
2061 int
2062 i,
2063 index = 0, flag;
2064 static int
2065 altern[SIZEOFFREE]; 2005 int altern[SIZEOFFREE];
2006 int index = 0, flag;
2066 2007
2067 for (i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
2068 { 2009 {
2069 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2010 mapxy pos (m, x, y); pos.move (i);
2070 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 {
2071 altern[index++] = i; 2026 altern [index++] = i;
2027 continue;
2028 }
2072 2029
2073 /* 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.
2074 * 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.
2075 * 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 -
2076 * 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
2077 * 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
2078 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
2079 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
2080 */ 2037 */
2081 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2038 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2039 {
2082 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;
2083 } 2054 }
2084 2055
2085 if (!index) 2056 if (!index)
2086 return -1; 2057 return -1;
2087 2058
2088 return altern[RANDOM () % index]; 2059 return altern [rndm (index)];
2089} 2060}
2090 2061
2091/* 2062/*
2092 * find_first_free_spot(archetype, maptile, x, y) works like 2063 * find_first_free_spot(archetype, maptile, x, y) works like
2093 * find_free_spot(), but it will search max number of squares. 2064 * find_free_spot(), but it will search max number of squares.
2094 * 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.
2095 * 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.
2096 */ 2067 */
2097
2098int 2068int
2099find_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)
2100{ 2070{
2101 int
2102 i;
2103
2104 for (i = 0; i < SIZEOFFREE; i++) 2071 for (int i = 0; i < SIZEOFFREE; i++)
2105 {
2106 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]))
2107 return i; 2073 return i;
2108 } 2074
2109 return -1; 2075 return -1;
2110} 2076}
2111 2077
2112/* 2078/*
2113 * The function permute(arr, begin, end) randomly reorders the array 2079 * The function permute(arr, begin, end) randomly reorders the array
2114 * arr[begin..end-1]. 2080 * arr[begin..end-1].
2081 * now uses a fisher-yates shuffle, old permute was broken
2115 */ 2082 */
2116static void 2083static void
2117permute (int *arr, int begin, int end) 2084permute (int *arr, int begin, int end)
2118{ 2085{
2119 int 2086 arr += begin;
2120 i,
2121 j,
2122 tmp,
2123 len;
2124
2125 len = end - begin; 2087 end -= begin;
2126 for (i = begin; i < end; i++)
2127 {
2128 j = begin + RANDOM () % len;
2129 2088
2130 tmp = arr[i]; 2089 while (--end)
2131 arr[i] = arr[j]; 2090 swap (arr [end], arr [rndm (end + 1)]);
2132 arr[j] = tmp;
2133 }
2134} 2091}
2135 2092
2136/* new function to make monster searching more efficient, and effective! 2093/* new function to make monster searching more efficient, and effective!
2137 * This basically returns a randomized array (in the passed pointer) of 2094 * This basically returns a randomized array (in the passed pointer) of
2138 * 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
2141 * 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.
2142 */ 2099 */
2143void 2100void
2144get_search_arr (int *search_arr) 2101get_search_arr (int *search_arr)
2145{ 2102{
2146 int 2103 int i;
2147 i;
2148 2104
2149 for (i = 0; i < SIZEOFFREE; i++) 2105 for (i = 0; i < SIZEOFFREE; i++)
2150 {
2151 search_arr[i] = i; 2106 search_arr[i] = i;
2152 }
2153 2107
2154 permute (search_arr, 1, SIZEOFFREE1 + 1); 2108 permute (search_arr, 1, SIZEOFFREE1 + 1);
2155 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2109 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2110 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157} 2111}
2166 * Perhaps incorrectly, but I'm making the assumption that exclude 2120 * Perhaps incorrectly, but I'm making the assumption that exclude
2167 * 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
2168 * 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
2169 * there is capable of. 2123 * there is capable of.
2170 */ 2124 */
2171
2172int 2125int
2173find_dir (maptile *m, int x, int y, object *exclude) 2126find_dir (maptile *m, int x, int y, object *exclude)
2174{ 2127{
2175 int
2176 i,
2177 max = SIZEOFFREE, mflags; 2128 int i, max = SIZEOFFREE, mflags;
2178 2129
2179 sint16 nx, ny; 2130 sint16 nx, ny;
2180 object * 2131 object *tmp;
2181 tmp;
2182 maptile * 2132 maptile *mp;
2183 mp;
2184 2133
2185 MoveType blocked, move_type; 2134 MoveType blocked, move_type;
2186 2135
2187 if (exclude && exclude->head) 2136 if (exclude && exclude->head_ () != exclude)
2188 { 2137 {
2189 exclude = exclude->head; 2138 exclude = exclude->head;
2190 move_type = exclude->move_type; 2139 move_type = exclude->move_type;
2191 } 2140 }
2192 else 2141 else
2205 2154
2206 if (mflags & P_OUT_OF_MAP) 2155 if (mflags & P_OUT_OF_MAP)
2207 max = maxfree[i]; 2156 max = maxfree[i];
2208 else 2157 else
2209 { 2158 {
2210 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2159 mapspace &ms = mp->at (nx, ny);
2160
2161 blocked = ms.move_block;
2211 2162
2212 if ((move_type & blocked) == move_type) 2163 if ((move_type & blocked) == move_type)
2213 max = maxfree[i]; 2164 max = maxfree[i];
2214 else if (mflags & P_IS_ALIVE) 2165 else if (mflags & P_IS_ALIVE)
2215 { 2166 {
2216 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2167 for (tmp = ms.bot; tmp; tmp = tmp->above)
2217 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2168 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2169 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2218 break; 2170 break;
2219 2171
2220 if (tmp) 2172 if (tmp)
2221 return freedir[i]; 2173 return freedir[i];
2222 } 2174 }
2228 2180
2229/* 2181/*
2230 * distance(object 1, object 2) will return the square of the 2182 * distance(object 1, object 2) will return the square of the
2231 * distance between the two given objects. 2183 * distance between the two given objects.
2232 */ 2184 */
2233
2234int 2185int
2235distance (const object *ob1, const object *ob2) 2186distance (const object *ob1, const object *ob2)
2236{ 2187{
2237 int i;
2238
2239 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);
2240 return i;
2241} 2189}
2242 2190
2243/* 2191/*
2244 * 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
2245 * 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
2246 * object, needs to travel toward it. 2194 * object, needs to travel toward it.
2247 */ 2195 */
2248
2249int 2196int
2250find_dir_2 (int x, int y) 2197find_dir_2 (int x, int y)
2251{ 2198{
2252 int q; 2199 int q;
2253 2200
2282 2229
2283 return 3; 2230 return 3;
2284} 2231}
2285 2232
2286/* 2233/*
2287 * absdir(int): Returns a number between 1 and 8, which represent
2288 * the "absolute" direction of a number (it actually takes care of
2289 * "overflow" in previous calculations of a direction).
2290 */
2291
2292int
2293absdir (int d)
2294{
2295 while (d < 1)
2296 d += 8;
2297 while (d > 8)
2298 d -= 8;
2299 return d;
2300}
2301
2302/*
2303 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2234 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2304 * between two directions (which are expected to be absolute (see absdir()) 2235 * between two directions (which are expected to be absolute (see absdir())
2305 */ 2236 */
2306
2307int 2237int
2308dirdiff (int dir1, int dir2) 2238dirdiff (int dir1, int dir2)
2309{ 2239{
2310 int 2240 int d;
2311 d;
2312 2241
2313 d = abs (dir1 - dir2); 2242 d = abs (dir1 - dir2);
2314 if (d > 4) 2243 if (d > 4)
2315 d = 8 - d; 2244 d = 8 - d;
2245
2316 return d; 2246 return d;
2317} 2247}
2318 2248
2319/* peterm: 2249/* peterm:
2320 * 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.
2323 * 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
2324 * 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.
2325 * 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
2326 * functions. 2256 * functions.
2327 */ 2257 */
2328
2329int
2330 reduction_dir[SIZEOFFREE][3] = { 2258int reduction_dir[SIZEOFFREE][3] = {
2331 {0, 0, 0}, /* 0 */ 2259 {0, 0, 0}, /* 0 */
2332 {0, 0, 0}, /* 1 */ 2260 {0, 0, 0}, /* 1 */
2333 {0, 0, 0}, /* 2 */ 2261 {0, 0, 0}, /* 2 */
2334 {0, 0, 0}, /* 3 */ 2262 {0, 0, 0}, /* 3 */
2335 {0, 0, 0}, /* 4 */ 2263 {0, 0, 0}, /* 4 */
2426 * 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
2427 * core dumps if they do. 2355 * core dumps if they do.
2428 * 2356 *
2429 * 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)
2430 */ 2358 */
2431
2432int 2359int
2433can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2434{ 2361{
2435 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2436 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2441 * create clone from object to another 2368 * create clone from object to another
2442 */ 2369 */
2443object * 2370object *
2444object_create_clone (object *asrc) 2371object_create_clone (object *asrc)
2445{ 2372{
2446 object *dst = 0, *tmp, *src, *part, *prev, *item; 2373 object *dst = 0, *tmp, *src, *prev, *item;
2447 2374
2448 if (!asrc) 2375 if (!asrc)
2449 return 0; 2376 return 0;
2450 2377
2451 src = asrc;
2452 if (src->head)
2453 src = src->head; 2378 src = asrc->head_ ();
2454 2379
2455 prev = 0; 2380 prev = 0;
2456 for (part = src; part; part = part->more) 2381 for (object *part = src; part; part = part->more)
2457 { 2382 {
2458 tmp = part->clone (); 2383 tmp = part->clone ();
2459 tmp->x -= src->x; 2384 tmp->x -= src->x;
2460 tmp->y -= src->y; 2385 tmp->y -= src->y;
2461 2386
2479 insert_ob_in_ob (object_create_clone (item), dst); 2404 insert_ob_in_ob (object_create_clone (item), dst);
2480 2405
2481 return dst; 2406 return dst;
2482} 2407}
2483 2408
2484/* GROS - Creates an object using a string representing its content. */
2485/* Basically, we save the content of the string to a temp file, then call */
2486/* load_object on it. I admit it is a highly inefficient way to make things, */
2487/* but it was simple to make and allows reusing the load_object function. */
2488/* Remember not to use load_object_str in a time-critical situation. */
2489/* Also remember that multiparts objects are not supported for now. */
2490
2491object *
2492load_object_str (const char *obstr)
2493{
2494 object *op;
2495 char filename[MAX_BUF];
2496
2497 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2498
2499 FILE *tempfile = fopen (filename, "w");
2500
2501 if (tempfile == NULL)
2502 {
2503 LOG (llevError, "Error - Unable to access load object temp file\n");
2504 return NULL;
2505 }
2506
2507 fprintf (tempfile, obstr);
2508 fclose (tempfile);
2509
2510 op = object::create ();
2511
2512 object_thawer thawer (filename);
2513
2514 if (thawer)
2515 load_object (thawer, op, 0);
2516
2517 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2518 CLEAR_FLAG (op, FLAG_REMOVED);
2519
2520 return op;
2521}
2522
2523/* This returns the first object in who's inventory that 2409/* This returns the first object in who's inventory that
2524 * has the same type and subtype match. 2410 * has the same type and subtype match.
2525 * returns NULL if no match. 2411 * returns NULL if no match.
2526 */ 2412 */
2527object * 2413object *
2528find_obj_by_type_subtype (const object *who, int type, int subtype) 2414find_obj_by_type_subtype (const object *who, int type, int subtype)
2529{ 2415{
2530 object *tmp;
2531
2532 for (tmp = who->inv; tmp; tmp = tmp->below) 2416 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533 if (tmp->type == type && tmp->subtype == subtype) 2417 if (tmp->type == type && tmp->subtype == subtype)
2534 return tmp; 2418 return tmp;
2535 2419
2536 return NULL; 2420 return 0;
2537} 2421}
2538 2422
2539/* 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,
2540 * otherwise return NULL. 2424 * otherwise return NULL.
2541 * 2425 *
2543 * do the desired thing. 2427 * do the desired thing.
2544 */ 2428 */
2545key_value * 2429key_value *
2546get_ob_key_link (const object *ob, const char *key) 2430get_ob_key_link (const object *ob, const char *key)
2547{ 2431{
2548 key_value *link;
2549
2550 for (link = ob->key_values; link != NULL; link = link->next) 2432 for (key_value *link = ob->key_values; link; link = link->next)
2551 if (link->key == key) 2433 if (link->key == key)
2552 return link; 2434 return link;
2553 2435
2554 return NULL; 2436 return 0;
2555} 2437}
2556 2438
2557/* 2439/*
2558 * 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.
2559 * 2441 *
2584 if (link->key == canonical_key) 2466 if (link->key == canonical_key)
2585 return link->value; 2467 return link->value;
2586 2468
2587 return 0; 2469 return 0;
2588} 2470}
2589
2590 2471
2591/* 2472/*
2592 * Updates the canonical_key in op to value. 2473 * Updates the canonical_key in op to value.
2593 * 2474 *
2594 * 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).
2599 * Returns TRUE on success. 2480 * Returns TRUE on success.
2600 */ 2481 */
2601int 2482int
2602set_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)
2603{ 2484{
2604 key_value *
2605 field = NULL, *last = NULL; 2485 key_value *field = NULL, *last = NULL;
2606 2486
2607 for (field = op->key_values; field != NULL; field = field->next) 2487 for (field = op->key_values; field != NULL; field = field->next)
2608 { 2488 {
2609 if (field->key != canonical_key) 2489 if (field->key != canonical_key)
2610 { 2490 {
2619 /* Basically, if the archetype has this key set, 2499 /* Basically, if the archetype has this key set,
2620 * we need to store the null value so when we save 2500 * we need to store the null value so when we save
2621 * it, we save the empty value so that when we load, 2501 * it, we save the empty value so that when we load,
2622 * we get this value back again. 2502 * we get this value back again.
2623 */ 2503 */
2624 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2504 if (get_ob_key_link (op->arch, canonical_key))
2625 field->value = 0; 2505 field->value = 0;
2626 else 2506 else
2627 { 2507 {
2628 if (last) 2508 if (last)
2629 last->next = field->next; 2509 last->next = field->next;
2638 /* IF we get here, key doesn't exist */ 2518 /* IF we get here, key doesn't exist */
2639 2519
2640 /* No field, we'll have to add it. */ 2520 /* No field, we'll have to add it. */
2641 2521
2642 if (!add_key) 2522 if (!add_key)
2643 {
2644 return FALSE; 2523 return FALSE;
2645 } 2524
2646 /* There isn't any good reason to store a null 2525 /* There isn't any good reason to store a null
2647 * value in the key/value list. If the archetype has 2526 * value in the key/value list. If the archetype has
2648 * this key, then we should also have it, so shouldn't 2527 * this key, then we should also have it, so shouldn't
2649 * be here. If user wants to store empty strings, 2528 * be here. If user wants to store empty strings,
2650 * should pass in "" 2529 * should pass in ""
2699 } 2578 }
2700 else 2579 else
2701 item = item->env; 2580 item = item->env;
2702} 2581}
2703 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
2704// 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
2705const char * 2612const char *
2706object::debug_desc (char *info) const 2613object::debug_desc (char *info) const
2707{ 2614{
2615 char flagdesc[512];
2708 char info2[256 * 3]; 2616 char info2[256 * 4];
2709 char *p = info; 2617 char *p = info;
2710 2618
2711 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}",
2712 count, 2620 count,
2621 uuid.c_str (),
2713 &name, 2622 &name,
2714 title ? " " : "", 2623 title ? "\",title:\"" : "",
2715 title ? (const char *)title : ""); 2624 title ? (const char *)title : "",
2625 flag_desc (flagdesc, 512), type);
2716 2626
2717 if (env) 2627 if (!this->flag[FLAG_REMOVED] && env)
2718 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2628 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2719 2629
2720 if (map) 2630 if (map)
2721 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);
2722 2632
2723 return info; 2633 return info;
2724} 2634}
2725 2635
2726const char * 2636const char *
2727object::debug_desc () const 2637object::debug_desc () const
2728{ 2638{
2729 static char info[256 * 3]; 2639 static char info[3][256 * 4];
2640 static int info_idx;
2641
2730 return debug_desc (info); 2642 return debug_desc (info [++info_idx % 3]);
2731} 2643}
2732 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