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.90 by root, Tue Dec 26 10:14:24 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
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))
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, 1); 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
472/* 542object &
473 * copy_to first frees everything allocated by the dst object, 543object::operator =(const object &src)
474 * and then copies the contents of itself into the second
475 * object, allocating what needs to be allocated. Basically, any
476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
477 * if the first object is freed, the pointers in the new object
478 * will point at garbage.
479 */
480void
481object::copy_to (object *dst)
482{ 544{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 545 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 546 bool is_removed = flag [FLAG_REMOVED];
485 547
486 *(object_copy *)dst = *this; 548 *(object_copy *)this = src;
487 549
488 if (is_freed) 550 flag [FLAG_FREED] = is_freed;
489 SET_FLAG (dst, FLAG_FREED); 551 flag [FLAG_REMOVED] = is_removed;
490
491 if (is_removed)
492 SET_FLAG (dst, FLAG_REMOVED);
493
494 if (speed < 0)
495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496 552
497 /* Copy over key_values, if any. */ 553 /* Copy over key_values, if any. */
498 if (key_values) 554 if (src.key_values)
499 { 555 {
500 key_value *tail = 0; 556 key_value *tail = 0;
501 key_value *i;
502
503 dst->key_values = 0; 557 key_values = 0;
504 558
505 for (i = key_values; i; i = i->next) 559 for (key_value *i = src.key_values; i; i = i->next)
506 { 560 {
507 key_value *new_link = new key_value; 561 key_value *new_link = new key_value;
508 562
509 new_link->next = 0; 563 new_link->next = 0;
510 new_link->key = i->key; 564 new_link->key = i->key;
511 new_link->value = i->value; 565 new_link->value = i->value;
512 566
513 /* Try and be clever here, too. */ 567 /* Try and be clever here, too. */
514 if (!dst->key_values) 568 if (!key_values)
515 { 569 {
516 dst->key_values = new_link; 570 key_values = new_link;
517 tail = new_link; 571 tail = new_link;
518 } 572 }
519 else 573 else
520 { 574 {
521 tail->next = new_link; 575 tail->next = new_link;
522 tail = new_link; 576 tail = new_link;
523 } 577 }
524 } 578 }
525 } 579 }
580}
581
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 ();
526 597
527 dst->set_speed (dst->speed); 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 ();
528} 618}
529 619
530object * 620object *
531object::clone () 621object::clone ()
532{ 622{
538/* 628/*
539 * 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
540 * 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
541 * 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.
542 */ 632 */
543
544void 633void
545update_turn_face (object *op) 634update_turn_face (object *op)
546{ 635{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 636 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 637 return;
638
549 SET_ANIMATION (op, op->direction); 639 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 640 update_object (op, UP_OBJ_FACE);
551} 641}
552 642
553/* 643/*
556 * 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.
557 */ 647 */
558void 648void
559object::set_speed (float speed) 649object::set_speed (float speed)
560{ 650{
561 extern int arch_init;
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (flag [FLAG_FREED] && speed) 651 if (flag [FLAG_FREED] && speed)
567 { 652 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &name); 653 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 speed = 0; 654 speed = 0;
570 } 655 }
571 656
572 this->speed = speed; 657 this->speed = speed;
573 658
574 if (arch_init) 659 if (has_active_speed ())
575 return; 660 activate ();
576
577 if (FABS (speed) > MIN_ACTIVE_SPEED)
578 {
579 /* If already on active list, don't do anything */
580 if (active_next || active_prev || this == active_objects)
581 return;
582
583 /* process_events() expects us to insert the object at the beginning
584 * of the list. */
585 active_next = active_objects;
586
587 if (active_next)
588 active_next->active_prev = this;
589
590 active_objects = this;
591 }
592 else 661 else
593 { 662 deactivate ();
594 /* If not on the active list, nothing needs to be done */
595 if (!active_next && !active_prev && this != active_objects)
596 return;
597
598 if (!active_prev)
599 {
600 active_objects = active_next;
601
602 if (active_next)
603 active_next->active_prev = 0;
604 }
605 else
606 {
607 active_prev->active_next = active_next;
608
609 if (active_next)
610 active_next->active_prev = active_prev;
611 }
612
613 active_next = 0;
614 active_prev = 0;
615 }
616}
617
618/* This function removes object 'op' from the list of active
619 * objects.
620 * This should only be used for style maps or other such
621 * reference maps where you don't want an object that isn't
622 * in play chewing up cpu time getting processed.
623 * The reverse of this is to call update_ob_speed, which
624 * will do the right thing based on the speed of the object.
625 */
626void
627remove_from_active_list (object *op)
628{
629 /* If not on the active list, nothing needs to be done */
630 if (!op->active_next && !op->active_prev && op != active_objects)
631 return;
632
633 if (op->active_prev == NULL)
634 {
635 active_objects = op->active_next;
636 if (op->active_next != NULL)
637 op->active_next->active_prev = NULL;
638 }
639 else
640 {
641 op->active_prev->active_next = op->active_next;
642 if (op->active_next)
643 op->active_next->active_prev = op->active_prev;
644 }
645 op->active_next = NULL;
646 op->active_prev = NULL;
647} 663}
648 664
649/* 665/*
650 * update_object() updates the the map. 666 * update_object() updates the the map.
651 * It takes into account invisible objects (and represent squares covered 667 * It takes into account invisible objects (and represent squares covered
664 * UP_OBJ_FACE: only the objects face has changed. 680 * UP_OBJ_FACE: only the objects face has changed.
665 */ 681 */
666void 682void
667update_object (object *op, int action) 683update_object (object *op, int action)
668{ 684{
669 MoveType move_on, move_off, move_block, move_slow;
670
671 if (op == NULL) 685 if (op == NULL)
672 { 686 {
673 /* this should never happen */ 687 /* this should never happen */
674 LOG (llevDebug, "update_object() called for NULL object.\n"); 688 LOG (llevDebug, "update_object() called for NULL object.\n");
675 return; 689 return;
699 return; 713 return;
700 } 714 }
701 715
702 mapspace &m = op->ms (); 716 mapspace &m = op->ms ();
703 717
704 if (m.flags_ & P_NEED_UPDATE) 718 if (!(m.flags_ & P_UPTODATE))
705 /* nop */; 719 /* nop */;
706 else if (action == UP_OBJ_INSERT) 720 else if (action == UP_OBJ_INSERT)
707 { 721 {
708 // this is likely overkill, TODO: revisit (schmorp) 722 // this is likely overkill, TODO: revisit (schmorp)
709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 723 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
718 /* 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
719 * to have move_allow right now. 733 * to have move_allow right now.
720 */ 734 */
721 || ((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
722 || 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)
723 m.flags_ = P_NEED_UPDATE; 737 m.flags_ = 0;
724 } 738 }
725 /* if the object is being removed, we can't make intelligent 739 /* if the object is being removed, we can't make intelligent
726 * decisions, because remove_ob can't really pass the object 740 * decisions, because remove_ob can't really pass the object
727 * that is being removed. 741 * that is being removed.
728 */ 742 */
729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 743 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730 m.flags_ = P_NEED_UPDATE; 744 m.flags_ = 0;
731 else if (action == UP_OBJ_FACE) 745 else if (action == UP_OBJ_FACE)
732 /* Nothing to do for that case */ ; 746 /* Nothing to do for that case */ ;
733 else 747 else
734 LOG (llevError, "update_object called with invalid action: %d\n", action); 748 LOG (llevError, "update_object called with invalid action: %d\n", action);
735 749
736 if (op->more) 750 if (op->more)
737 update_object (op->more, action); 751 update_object (op->more, action);
738} 752}
739 753
740object::vector object::objects; // not yet used
741object *object::first;
742
743object::object () 754object::object ()
744{ 755{
745 SET_FLAG (this, FLAG_REMOVED); 756 SET_FLAG (this, FLAG_REMOVED);
746 757
747 expmul = 1.0; 758 expmul = 1.0;
748 face = blank_face; 759 face = blank_face;
749} 760}
750 761
751object::~object () 762object::~object ()
752{ 763{
764 unlink ();
765
753 free_key_values (this); 766 free_key_values (this);
754} 767}
755 768
769static int object_count;
770
756void object::link () 771void object::link ()
757{ 772{
773 assert (!index);//D
774 uuid = UUID::gen ();
758 count = ++ob_count; 775 count = ++object_count;
759 uuid = gen_uuid ();
760 776
761 prev = 0; 777 refcnt_inc ();
762 next = object::first; 778 objects.insert (this);
763
764 if (object::first)
765 object::first->prev = this;
766
767 object::first = this;
768} 779}
769 780
770void object::unlink () 781void object::unlink ()
771{ 782{
772 if (this == object::first) 783 if (!index)
773 object::first = next; 784 return;
774 785
775 /* Remove this object from the list of used objects */ 786 objects.erase (this);
776 if (prev) prev->next = next; 787 refcnt_dec ();
777 if (next) next->prev = prev; 788}
778 789
779 prev = 0; 790void
780 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 }
781} 845}
782 846
783/* 847/*
784 * Remove and free all objects in the inventory of the given object. 848 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 849 * object.c ?
786 */ 850 */
787void 851void
788object::destroy_inv (bool drop_to_ground) 852object::destroy_inv (bool drop_to_ground)
789{ 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
790 /* Only if the space blocks everything do we not process - 862 /* Only if the space blocks everything do we not process -
791 * if some form of movement is allowed, let objects 863 * if some form of movement is allowed, let objects
792 * drop on that space. 864 * drop on that space.
793 */ 865 */
794 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 866 if (!drop_to_ground
867 || !map
868 || map->in_memory != MAP_ACTIVE
869 || map->nodrop
870 || ms ().move_block == MOVE_ALL)
795 { 871 {
796 while (inv) 872 while (inv)
873 {
874 inv->destroy_inv (drop_to_ground);
797 inv->destroy (); 875 inv->destroy ();
876 }
798 } 877 }
799 else 878 else
800 { /* Put objects in inventory onto this space */ 879 { /* Put objects in inventory onto this space */
801 while (inv) 880 while (inv)
802 { 881 {
804 883
805 if (op->flag [FLAG_STARTEQUIP] 884 if (op->flag [FLAG_STARTEQUIP]
806 || op->flag [FLAG_NO_DROP] 885 || op->flag [FLAG_NO_DROP]
807 || op->type == RUNE 886 || op->type == RUNE
808 || op->type == TRAP 887 || op->type == TRAP
809 || op->flag [FLAG_IS_A_TEMPLATE]) 888 || op->flag [FLAG_IS_A_TEMPLATE]
889 || op->flag [FLAG_DESTROY_ON_DEATH])
810 op->destroy (); 890 op->destroy ();
811 else 891 else
812 { 892 map->insert (op, x, y);
813 op->remove ();
814 op->x = x;
815 op->y = y;
816 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
817 }
818 } 893 }
819 } 894 }
820} 895}
821 896
822object *object::create () 897object *object::create ()
827} 902}
828 903
829void 904void
830object::do_destroy () 905object::do_destroy ()
831{ 906{
907 attachable::do_destroy ();
908
832 if (flag [FLAG_IS_LINKED]) 909 if (flag [FLAG_IS_LINKED])
833 remove_button_link (this); 910 remove_button_link (this);
834 911
835 if (flag [FLAG_FRIENDLY]) 912 if (flag [FLAG_FRIENDLY])
836 remove_friendly_object (this); 913 remove_friendly_object (this);
837 914
838 if (!flag [FLAG_REMOVED]) 915 if (!flag [FLAG_REMOVED])
839 remove (); 916 remove ();
840 917
841 if (flag [FLAG_FREED]) 918 destroy_inv (true);
842 return; 919
920 deactivate ();
921 unlink ();
843 922
844 flag [FLAG_FREED] = 1; 923 flag [FLAG_FREED] = 1;
845
846 attachable::do_destroy ();
847
848 destroy_inv (true);
849 set_speed (0);
850 unlink ();
851 924
852 // hack to ensure that freed objects still have a valid map 925 // hack to ensure that freed objects still have a valid map
853 { 926 {
854 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
855 928
856 if (!freed_map) 929 if (!freed_map)
857 { 930 {
858 freed_map = new maptile; 931 freed_map = new maptile;
859 932
933 freed_map->path = "<freed objects map>";
860 freed_map->name = "/internal/freed_objects_map"; 934 freed_map->name = "/internal/freed_objects_map";
861 freed_map->width = 3; 935 freed_map->width = 3;
862 freed_map->height = 3; 936 freed_map->height = 3;
937 freed_map->nodrop = 1;
863 938
864 freed_map->allocate (); 939 freed_map->alloc ();
940 freed_map->in_memory = MAP_ACTIVE;
865 } 941 }
866 942
867 map = freed_map; 943 map = freed_map;
868 x = 1; 944 x = 1;
869 y = 1; 945 y = 1;
870 } 946 }
871 947
872 head = 0;
873
874 if (more) 948 if (more)
875 { 949 {
876 more->destroy (); 950 more->destroy ();
877 more = 0; 951 more = 0;
878 } 952 }
879 953
954 head = 0;
955
880 // clear those pointers that likely might have circular references to us 956 // clear those pointers that likely might cause circular references
881 owner = 0; 957 owner = 0;
882 enemy = 0; 958 enemy = 0;
883 attacked_by = 0; 959 attacked_by = 0;
884 960 current_weapon = 0;
885 // only relevant for players(?), but make sure of it anyways
886 contr = 0;
887} 961}
888 962
889void 963void
890object::destroy (bool destroy_inventory) 964object::destroy (bool destroy_inventory)
891{ 965{
892 if (destroyed ()) 966 if (destroyed ())
893 return; 967 return;
894 968
895 if (destroy_inventory) 969 if (destroy_inventory)
896 destroy_inv (false); 970 destroy_inv (false);
971
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
897 977
898 attachable::destroy (); 978 attachable::destroy ();
899} 979}
900 980
901/* 981/*
919 * 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
920 * 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
921 * object will have no environment. If the object previously had an 1001 * object will have no environment. If the object previously had an
922 * environment, the x and y coordinates will be updated to 1002 * environment, the x and y coordinates will be updated to
923 * the previous environment. 1003 * the previous environment.
924 * Beware: This function is called from the editor as well!
925 */ 1004 */
926void 1005void
927object::remove () 1006object::do_remove ()
928{ 1007{
929 object *tmp, *last = 0; 1008 object *tmp, *last = 0;
930 object *otmp; 1009 object *otmp;
931 1010
932 if (QUERY_FLAG (this, FLAG_REMOVED)) 1011 if (QUERY_FLAG (this, FLAG_REMOVED))
954 * to save cpu time. 1033 * to save cpu time.
955 */ 1034 */
956 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))
957 otmp->update_stats (); 1036 otmp->update_stats ();
958 1037
959 if (above != NULL) 1038 if (above)
960 above->below = below; 1039 above->below = below;
961 else 1040 else
962 env->inv = below; 1041 env->inv = below;
963 1042
964 if (below != NULL) 1043 if (below)
965 below->above = above; 1044 below->above = above;
966 1045
967 /* we set up values so that it could be inserted into 1046 /* we set up values so that it could be inserted into
968 * 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
969 * to the caller to decide what we want to do. 1048 * to the caller to decide what we want to do.
973 above = 0, below = 0; 1052 above = 0, below = 0;
974 env = 0; 1053 env = 0;
975 } 1054 }
976 else if (map) 1055 else if (map)
977 { 1056 {
978 /* Re did the following section of code - it looks like it had 1057 if (type == PLAYER)
979 * lots of logic for things we no longer care about
980 */ 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 ();
981 1071
982 /* link the object above us */ 1072 /* link the object above us */
983 if (above) 1073 if (above)
984 above->below = below; 1074 above->below = below;
985 else 1075 else
986 map->at (x, y).top = below; /* we were top, set new top */ 1076 ms.top = below; /* we were top, set new top */
987 1077
988 /* Relink the object below us, if there is one */ 1078 /* Relink the object below us, if there is one */
989 if (below) 1079 if (below)
990 below->above = above; 1080 below->above = above;
991 else 1081 else
993 /* 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
994 * use translated coordinates in case some oddness with map tiling is 1084 * use translated coordinates in case some oddness with map tiling is
995 * evident 1085 * evident
996 */ 1086 */
997 if (GET_MAP_OB (map, x, y) != this) 1087 if (GET_MAP_OB (map, x, y) != this)
998 {
999 char *dump = dump_object (this);
1000 LOG (llevError,
1001 "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 ());
1002 free (dump);
1003 dump = dump_object (GET_MAP_OB (map, x, y));
1004 LOG (llevError, "%s\n", dump);
1005 free (dump);
1006 }
1007 1089
1008 map->at (x, y).bot = above; /* goes on above it. */ 1090 ms.bot = above; /* goes on above it. */
1009 } 1091 }
1010 1092
1011 above = 0; 1093 above = 0;
1012 below = 0; 1094 below = 0;
1013 1095
1014 if (map->in_memory == MAP_SAVING) 1096 if (map->in_memory == MAP_SAVING)
1015 return; 1097 return;
1016 1098
1017 int check_walk_off = !flag [FLAG_NO_APPLY]; 1099 int check_walk_off = !flag [FLAG_NO_APPLY];
1018 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
1019 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1113 for (tmp = ms.bot; tmp; tmp = tmp->above)
1020 { 1114 {
1021 /* 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
1022 * being removed. 1116 * being removed.
1023 */ 1117 */
1024 1118
1025 if (tmp->type == PLAYER && tmp != this)
1026 {
1027 /* If a container that the player is currently using somehow gets
1028 * removed (most likely destroyed), update the player view
1029 * appropriately.
1030 */
1031 if (tmp->container == this)
1032 {
1033 flag [FLAG_APPLIED] = 0;
1034 tmp->container = 0;
1035 }
1036
1037 if (tmp->contr->ns)
1038 tmp->contr->ns->floorbox_update ();
1039 }
1040
1041 /* See if player moving off should effect something */ 1119 /* See if object moving off should effect something */
1042 if (check_walk_off 1120 if (check_walk_off
1043 && ((move_type & tmp->move_off) 1121 && ((move_type & tmp->move_off)
1044 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1122 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1045 { 1123 {
1046 move_apply (tmp, this, 0); 1124 move_apply (tmp, this, 0);
1047 1125
1048 if (destroyed ()) 1126 if (destroyed ())
1049 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 ());
1050 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1051 } 1128 }
1052 1129
1053 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1054
1055 if (tmp->above == tmp)
1056 tmp->above = 0;
1057
1058 last = tmp; 1130 last = tmp;
1059 } 1131 }
1060 1132
1061 /* 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?
1062 if (!last) 1135 if (!last)
1063 map->at (x, y).flags_ = P_NEED_UPDATE; 1136 map->at (x, y).flags_ = 0;
1064 else 1137 else
1065 update_object (last, UP_OBJ_REMOVE); 1138 update_object (last, UP_OBJ_REMOVE);
1066 1139
1067 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1140 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1068 update_all_los (map, x, y); 1141 update_all_los (map, x, y);
1081merge_ob (object *op, object *top) 1154merge_ob (object *op, object *top)
1082{ 1155{
1083 if (!op->nrof) 1156 if (!op->nrof)
1084 return 0; 1157 return 0;
1085 1158
1086 if (top) 1159 if (!top)
1087 for (top = op; top && top->above; top = top->above) 1160 for (top = op; top && top->above; top = top->above)
1088 ; 1161 ;
1089 1162
1090 for (; top; top = top->below) 1163 for (; top; top = top->below)
1091 { 1164 {
1104 } 1177 }
1105 1178
1106 return 0; 1179 return 0;
1107} 1180}
1108 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
1109/* 1205/*
1110 * 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
1111 * job preparing multi-part monsters 1207 * job preparing multi-part monsters.
1112 */ 1208 */
1113object * 1209object *
1114insert_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)
1115{ 1211{
1116 object *tmp;
1117
1118 if (op->head)
1119 op = op->head;
1120
1121 for (tmp = op; tmp; tmp = tmp->more) 1212 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1122 { 1213 {
1123 tmp->x = x + tmp->arch->clone.x; 1214 tmp->x = x + tmp->arch->x;
1124 tmp->y = y + tmp->arch->clone.y; 1215 tmp->y = y + tmp->arch->y;
1125 } 1216 }
1126 1217
1127 return insert_ob_in_map (op, m, originator, flag); 1218 return insert_ob_in_map (op, m, originator, flag);
1128} 1219}
1129 1220
1148 * just 'op' otherwise 1239 * just 'op' otherwise
1149 */ 1240 */
1150object * 1241object *
1151insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1242insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1152{ 1243{
1244 assert (!op->flag [FLAG_FREED]);
1245
1153 object *tmp, *top, *floor = NULL; 1246 object *top, *floor = NULL;
1154 sint16 x, y;
1155 1247
1156 if (QUERY_FLAG (op, FLAG_FREED)) 1248 op->remove ();
1157 {
1158 LOG (llevError, "Trying to insert freed object!\n");
1159 return NULL;
1160 }
1161
1162 if (m == NULL)
1163 {
1164 char *dump = dump_object (op);
1165 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1166 free (dump);
1167 return op;
1168 }
1169
1170 if (out_of_map (m, op->x, op->y))
1171 {
1172 char *dump = dump_object (op);
1173 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1174#ifdef MANY_CORES
1175 /* Better to catch this here, as otherwise the next use of this object
1176 * is likely to cause a crash. Better to find out where it is getting
1177 * improperly inserted.
1178 */
1179 abort ();
1180#endif
1181 free (dump);
1182 return op;
1183 }
1184
1185 if (!QUERY_FLAG (op, FLAG_REMOVED))
1186 {
1187 char *dump = dump_object (op);
1188 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1189 free (dump);
1190 return op;
1191 }
1192
1193 if (op->more)
1194 {
1195 /* The part may be on a different map. */
1196
1197 object *more = op->more;
1198
1199 /* We really need the caller to normalize coordinates - if
1200 * we set the map, that doesn't work if the location is within
1201 * a map and this is straddling an edge. So only if coordinate
1202 * is clear wrong do we normalize it.
1203 */
1204 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1205 more->map = get_map_from_coord (m, &more->x, &more->y);
1206 else if (!more->map)
1207 {
1208 /* For backwards compatibility - when not dealing with tiled maps,
1209 * more->map should always point to the parent.
1210 */
1211 more->map = m;
1212 }
1213
1214 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1215 {
1216 if (!op->head)
1217 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1218
1219 return 0;
1220 }
1221 }
1222
1223 CLEAR_FLAG (op, FLAG_REMOVED);
1224 1249
1225 /* Ideally, the caller figures this out. However, it complicates a lot 1250 /* Ideally, the caller figures this out. However, it complicates a lot
1226 * 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
1227 * need extra work 1252 * need extra work
1228 */ 1253 */
1229 op->map = get_map_from_coord (m, &op->x, &op->y); 1254 if (!xy_normalise (m, op->x, op->y))
1230 x = op->x; 1255 {
1231 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 ();
1232 1268
1233 /* this has to be done after we translate the coordinates. 1269 /* this has to be done after we translate the coordinates.
1234 */ 1270 */
1235 if (op->nrof && !(flag & INS_NO_MERGE)) 1271 if (op->nrof && !(flag & INS_NO_MERGE))
1236 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1272 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1237 if (object::can_merge (op, tmp)) 1273 if (object::can_merge (op, tmp))
1238 { 1274 {
1239 op->nrof += tmp->nrof; 1275 op->nrof += tmp->nrof;
1240 tmp->destroy (); 1276 tmp->destroy ();
1241 } 1277 }
1258 op->below = originator->below; 1294 op->below = originator->below;
1259 1295
1260 if (op->below) 1296 if (op->below)
1261 op->below->above = op; 1297 op->below->above = op;
1262 else 1298 else
1263 op->ms ().bot = op; 1299 ms.bot = op;
1264 1300
1265 /* since *below* originator, no need to update top */ 1301 /* since *below* originator, no need to update top */
1266 originator->below = op; 1302 originator->below = op;
1267 } 1303 }
1268 else 1304 else
1269 { 1305 {
1306 top = ms.bot;
1307
1270 /* If there are other objects, then */ 1308 /* If there are other objects, then */
1271 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1309 if (top)
1272 { 1310 {
1273 object *last = NULL; 1311 object *last = 0;
1274 1312
1275 /* 1313 /*
1276 * 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.
1277 * We've already dealt with merging if appropriate. 1315 * We've already dealt with merging if appropriate.
1278 * 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
1282 * 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
1283 * 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
1284 * 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
1285 * that flying non pickable objects are spell objects. 1323 * that flying non pickable objects are spell objects.
1286 */ 1324 */
1287 1325 for (top = ms.bot; top; top = top->above)
1288 while (top != NULL)
1289 { 1326 {
1290 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))
1291 floor = top; 1328 floor = top;
1292 1329
1293 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))
1296 top = top->below; 1333 top = top->below;
1297 break; 1334 break;
1298 } 1335 }
1299 1336
1300 last = top; 1337 last = top;
1301 top = top->above;
1302 } 1338 }
1303 1339
1304 /* 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 */
1305 top = last; 1341 top = last;
1306 1342
1308 * looks like instead of lots of conditions here. 1344 * looks like instead of lots of conditions here.
1309 * makes things faster, and effectively the same result. 1345 * makes things faster, and effectively the same result.
1310 */ 1346 */
1311 1347
1312 /* Have object 'fall below' other objects that block view. 1348 /* Have object 'fall below' other objects that block view.
1313 * Unless those objects are exits, type 66 1349 * Unless those objects are exits.
1314 * If INS_ON_TOP is used, don't do this processing 1350 * If INS_ON_TOP is used, don't do this processing
1315 * Need to find the object that in fact blocks view, otherwise 1351 * Need to find the object that in fact blocks view, otherwise
1316 * stacking is a bit odd. 1352 * stacking is a bit odd.
1317 */ 1353 */
1318 if (!(flag & INS_ON_TOP) && 1354 if (!(flag & INS_ON_TOP)
1319 (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))
1320 { 1357 {
1321 for (last = top; last != floor; last = last->below) 1358 for (last = top; last != floor; last = last->below)
1322 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1359 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1323 break; 1360 break;
1361
1324 /* Check to see if we found the object that blocks view, 1362 /* Check to see if we found the object that blocks view,
1325 * 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
1326 * we can get inserted below this one, which requires we 1364 * we can get inserted below this one, which requires we
1327 * set top to the object below us. 1365 * set top to the object below us.
1328 */ 1366 */
1329 if (last && last->below && last != floor) 1367 if (last && last->below && last != floor)
1330 top = last->below; 1368 top = last->below;
1331 } 1369 }
1332 } /* If objects on this space */ 1370 } /* If objects on this space */
1333 1371
1334 if (flag & INS_MAP_LOAD)
1335 top = GET_MAP_TOP (op->map, op->x, op->y);
1336
1337 if (flag & INS_ABOVE_FLOOR_ONLY) 1372 if (flag & INS_ABOVE_FLOOR_ONLY)
1338 top = floor; 1373 top = floor;
1339 1374
1340 /* 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.
1341 */ 1376 */
1342 1377
1343 /* First object on this space */ 1378 /* First object on this space */
1344 if (!top) 1379 if (!top)
1345 { 1380 {
1346 op->above = GET_MAP_OB (op->map, op->x, op->y); 1381 op->above = ms.bot;
1347 1382
1348 if (op->above) 1383 if (op->above)
1349 op->above->below = op; 1384 op->above->below = op;
1350 1385
1351 op->below = NULL; 1386 op->below = 0;
1352 op->ms ().bot = op; 1387 ms.bot = op;
1353 } 1388 }
1354 else 1389 else
1355 { /* get inserted into the stack above top */ 1390 { /* get inserted into the stack above top */
1356 op->above = top->above; 1391 op->above = top->above;
1357 1392
1360 1395
1361 op->below = top; 1396 op->below = top;
1362 top->above = op; 1397 top->above = op;
1363 } 1398 }
1364 1399
1365 if (op->above == NULL) 1400 if (!op->above)
1366 op->ms ().top = op; 1401 ms.top = op;
1367 } /* else not INS_BELOW_ORIGINATOR */ 1402 } /* else not INS_BELOW_ORIGINATOR */
1368 1403
1369 if (op->type == PLAYER) 1404 if (op->type == PLAYER)
1405 {
1370 op->contr->do_los = 1; 1406 op->contr->do_los = 1;
1407 ++op->map->players;
1408 op->map->touch ();
1409 }
1371 1410
1372 /* If we have a floor, we know the player, if any, will be above 1411 op->map->dirty = true;
1373 * it, so save a few ticks and start from there. 1412
1374 */
1375 if (!(flag & INS_MAP_LOAD))
1376 if (object *pl = op->ms ().player ()) 1413 if (object *pl = ms.player ())
1377 if (pl->contr->ns)
1378 pl->contr->ns->floorbox_update (); 1414 pl->contr->ns->floorbox_update ();
1379 1415
1380 /* If this object glows, it may affect lighting conditions that are 1416 /* If this object glows, it may affect lighting conditions that are
1381 * 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
1382 * 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
1383 * on the map will get recalculated. The players could very well 1419 * on the map will get recalculated. The players could very well
1384 * 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 -
1385 * this should get redone to only look for players within range, 1421 * this should get redone to only look for players within range,
1386 * or just updating the P_NEED_UPDATE for spaces within this area 1422 * or just updating the P_UPTODATE for spaces within this area
1387 * of effect may be sufficient. 1423 * of effect may be sufficient.
1388 */ 1424 */
1389 if (op->map->darkness && (op->glow_radius != 0)) 1425 if (op->map->darkness && (op->glow_radius != 0))
1390 update_all_los (op->map, op->x, op->y); 1426 update_all_los (op->map, op->x, op->y);
1391 1427
1402 * blocked() and wall() work properly), and these flags are updated by 1438 * blocked() and wall() work properly), and these flags are updated by
1403 * update_object(). 1439 * update_object().
1404 */ 1440 */
1405 1441
1406 /* 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 */
1407 if (!(flag & INS_NO_WALK_ON) && !op->head) 1443 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1408 { 1444 {
1409 if (check_move_on (op, originator)) 1445 if (check_move_on (op, originator))
1410 return 0; 1446 return 0;
1411 1447
1412 /* 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
1413 * walk on's. 1449 * walk on's.
1414 */ 1450 */
1415 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1451 for (object *tmp = op->more; tmp; tmp = tmp->more)
1416 if (check_move_on (tmp, originator)) 1452 if (check_move_on (tmp, originator))
1417 return 0; 1453 return 0;
1418 } 1454 }
1419 1455
1420 return op; 1456 return op;
1429{ 1465{
1430 object *tmp, *tmp1; 1466 object *tmp, *tmp1;
1431 1467
1432 /* first search for itself and remove any old instances */ 1468 /* first search for itself and remove any old instances */
1433 1469
1434 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)
1435 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1471 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1436 tmp->destroy (); 1472 tmp->destroy ();
1437 1473
1438 tmp1 = arch_to_object (archetype::find (arch_string)); 1474 tmp1 = arch_to_object (archetype::find (arch_string));
1439 1475
1440 tmp1->x = op->x; 1476 tmp1->x = op->x;
1441 tmp1->y = op->y; 1477 tmp1->y = op->y;
1442 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);
1443} 1488}
1444 1489
1445/* 1490/*
1446 * 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
1447 * is returned contains nr objects, and the remaining parts contains 1492 * is returned contains nr objects, and the remaining parts contains
1448 * 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).
1449 * On failure, NULL is returned, and the reason put into the 1494 * On failure, NULL is returned, and the reason put into the
1450 * global static errmsg array. 1495 * global static errmsg array.
1451 */ 1496 */
1452
1453object * 1497object *
1454get_split_ob (object *orig_ob, uint32 nr) 1498get_split_ob (object *orig_ob, uint32 nr)
1455{ 1499{
1456 object *newob; 1500 object *newob;
1457 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1501 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1468 orig_ob->destroy (1); 1512 orig_ob->destroy (1);
1469 else if (!is_removed) 1513 else if (!is_removed)
1470 { 1514 {
1471 if (orig_ob->env != NULL) 1515 if (orig_ob->env != NULL)
1472 sub_weight (orig_ob->env, orig_ob->weight * nr); 1516 sub_weight (orig_ob->env, orig_ob->weight * nr);
1473 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)
1474 { 1518 {
1475 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.");
1476 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");
1477 return NULL; 1521 return NULL;
1478 } 1522 }
1488 * 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
1489 * is subsequently removed and freed. 1533 * is subsequently removed and freed.
1490 * 1534 *
1491 * 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
1492 */ 1536 */
1493
1494object * 1537object *
1495decrease_ob_nr (object *op, uint32 i) 1538decrease_ob_nr (object *op, uint32 i)
1496{ 1539{
1497 object *tmp; 1540 object *tmp;
1498 1541
1573 1616
1574/* 1617/*
1575 * add_weight(object, weight) adds the specified weight to an object, 1618 * add_weight(object, weight) adds the specified weight to an object,
1576 * and also updates how much the environment(s) is/are carrying. 1619 * and also updates how much the environment(s) is/are carrying.
1577 */ 1620 */
1578
1579void 1621void
1580add_weight (object *op, signed long weight) 1622add_weight (object *op, signed long weight)
1581{ 1623{
1582 while (op != NULL) 1624 while (op != NULL)
1583 { 1625 {
1598 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);
1599 free (dump); 1641 free (dump);
1600 return op; 1642 return op;
1601 } 1643 }
1602 1644
1603 if (where->head) 1645 if (where->head_ () != where)
1604 { 1646 {
1605 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");
1606 where = where->head; 1648 where = where->head;
1607 } 1649 }
1608 1650
1609 return where->insert (op); 1651 return where->insert (op);
1610} 1652}
1615 * inside the object environment. 1657 * inside the object environment.
1616 * 1658 *
1617 * 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
1618 * be != op, if items are merged. -Tero 1660 * be != op, if items are merged. -Tero
1619 */ 1661 */
1620
1621object * 1662object *
1622object::insert (object *op) 1663object::insert (object *op)
1623{ 1664{
1624 object *tmp, *otmp;
1625
1626 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1627 op->remove (); 1666 op->remove ();
1628 1667
1629 if (op->more) 1668 if (op->more)
1630 { 1669 {
1632 return op; 1671 return op;
1633 } 1672 }
1634 1673
1635 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1636 CLEAR_FLAG (op, FLAG_REMOVED); 1675 CLEAR_FLAG (op, FLAG_REMOVED);
1676
1637 if (op->nrof) 1677 if (op->nrof)
1638 { 1678 {
1639 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1679 for (object *tmp = inv; tmp; tmp = tmp->below)
1640 if (object::can_merge (tmp, op)) 1680 if (object::can_merge (tmp, op))
1641 { 1681 {
1642 /* return the original object and remove inserted object 1682 /* return the original object and remove inserted object
1643 (client needs the original object) */ 1683 (client needs the original object) */
1644 tmp->nrof += op->nrof; 1684 tmp->nrof += op->nrof;
1663 add_weight (this, op->weight * op->nrof); 1703 add_weight (this, op->weight * op->nrof);
1664 } 1704 }
1665 else 1705 else
1666 add_weight (this, (op->weight + op->carrying)); 1706 add_weight (this, (op->weight + op->carrying));
1667 1707
1668 otmp = this->in_player (); 1708 if (object *otmp = this->in_player ())
1669 if (otmp && otmp->contr)
1670 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1671 otmp->update_stats (); 1710 otmp->update_stats ();
1672 1711
1712 op->owner = 0; // its his/hers now. period.
1673 op->map = 0; 1713 op->map = 0;
1674 op->env = this; 1714 op->env = this;
1675 op->above = 0; 1715 op->above = 0;
1676 op->below = 0; 1716 op->below = 0;
1677 op->x = 0, op->y = 0; 1717 op->x = op->y = 0;
1678 1718
1679 /* 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 */
1680 if ((op->glow_radius != 0) && map) 1720 if (op->glow_radius && map)
1681 { 1721 {
1682#ifdef DEBUG_LIGHTS 1722#ifdef DEBUG_LIGHTS
1683 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);
1684#endif /* DEBUG_LIGHTS */ 1724#endif /* DEBUG_LIGHTS */
1685 if (map->darkness) 1725 if (map->darkness)
1721 * 1761 *
1722 * 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
1723 * 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
1724 * on top. 1764 * on top.
1725 */ 1765 */
1726
1727int 1766int
1728check_move_on (object *op, object *originator) 1767check_move_on (object *op, object *originator)
1729{ 1768{
1730 object *tmp; 1769 object *tmp;
1731 maptile *m = op->map; 1770 maptile *m = op->map;
1758 1797
1759 /* The objects have to be checked from top to bottom. 1798 /* The objects have to be checked from top to bottom.
1760 * Hence, we first go to the top: 1799 * Hence, we first go to the top:
1761 */ 1800 */
1762 1801
1763 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1802 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764 { 1803 {
1765 /* Trim the search when we find the first other spell effect 1804 /* Trim the search when we find the first other spell effect
1766 * 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,
1767 * we don't need to check all of them. 1806 * we don't need to check all of them.
1768 */ 1807 */
1786 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1825 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1787 ((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))
1788 { 1827 {
1789 1828
1790 float 1829 float
1791 diff = tmp->move_slow_penalty * FABS (op->speed); 1830 diff = tmp->move_slow_penalty * fabs (op->speed);
1792 1831
1793 if (op->type == PLAYER) 1832 if (op->type == PLAYER)
1794 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)) ||
1795 (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)))
1796 diff /= 4.0; 1835 diff /= 4.0;
1826 * The first matching object is returned, or NULL if none. 1865 * The first matching object is returned, or NULL if none.
1827 */ 1866 */
1828object * 1867object *
1829present_arch (const archetype *at, maptile *m, int x, int y) 1868present_arch (const archetype *at, maptile *m, int x, int y)
1830{ 1869{
1831 if (m == NULL || out_of_map (m, x, y)) 1870 if (!m || out_of_map (m, x, y))
1832 { 1871 {
1833 LOG (llevError, "Present_arch called outside map.\n"); 1872 LOG (llevError, "Present_arch called outside map.\n");
1834 return NULL; 1873 return NULL;
1835 } 1874 }
1836 1875
1837 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1876 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838 if (tmp->arch == at) 1877 if (tmp->arch == at)
1839 return tmp; 1878 return tmp;
1840 1879
1841 return NULL; 1880 return NULL;
1842} 1881}
1853 { 1892 {
1854 LOG (llevError, "Present called outside map.\n"); 1893 LOG (llevError, "Present called outside map.\n");
1855 return NULL; 1894 return NULL;
1856 } 1895 }
1857 1896
1858 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1897 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859 if (tmp->type == type) 1898 if (tmp->type == type)
1860 return tmp; 1899 return tmp;
1861 1900
1862 return NULL; 1901 return NULL;
1863} 1902}
1920 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1921 */ 1960 */
1922void 1961void
1923flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1924{ 1963{
1925 if (op->inv)
1926 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1927 { 1965 {
1928 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
1929 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
1930 } 1968 }
1931} 1969}
1932 1970
1933/* 1971/*
1934 * deactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
1935 */ 1973 */
1936void 1974void
1937unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
1938{ 1976{
1939 if (op->inv)
1940 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1941 { 1978 {
1942 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
1943 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
1944 } 1981 }
1945}
1946
1947/*
1948 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1949 * all it's inventory (recursively).
1950 * If checksums are used, a player will get set_cheat called for
1951 * him/her-self and all object carried by a call to this function.
1952 */
1953void
1954set_cheat (object *op)
1955{
1956 SET_FLAG (op, FLAG_WAS_WIZ);
1957 flag_inv (op, FLAG_WAS_WIZ);
1958} 1982}
1959 1983
1960/* 1984/*
1961 * 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
1962 * 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
1964 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
1965 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
1966 * 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
1967 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
1968 * 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)
1969 * Note - this only checks to see if there is space for the head of the
1970 * object - if it is a multispace object, this should be called for all
1971 * pieces.
1972 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
1973 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
1974 * 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.
1975 * 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
1976 * 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
1977 * 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
1979 * customized, changed states, etc. 2000 * customized, changed states, etc.
1980 */ 2001 */
1981int 2002int
1982find_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)
1983{ 2004{
2005 int altern[SIZEOFFREE];
1984 int index = 0, flag; 2006 int index = 0, flag;
1985 int altern[SIZEOFFREE];
1986 2007
1987 for (int i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
1988 { 2009 {
1989 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2010 mapxy pos (m, x, y); pos.move (i);
1990 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 {
1991 altern [index++] = i; 2026 altern [index++] = i;
2027 continue;
2028 }
1992 2029
1993 /* 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.
1994 * 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.
1995 * 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 -
1996 * 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
1997 * 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
1998 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
1999 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
2000 */ 2037 */
2001 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2038 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2039 {
2002 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;
2003 } 2054 }
2004 2055
2005 if (!index) 2056 if (!index)
2006 return -1; 2057 return -1;
2007 2058
2008 return altern[RANDOM () % index]; 2059 return altern [rndm (index)];
2009} 2060}
2010 2061
2011/* 2062/*
2012 * find_first_free_spot(archetype, maptile, x, y) works like 2063 * find_first_free_spot(archetype, maptile, x, y) works like
2013 * find_free_spot(), but it will search max number of squares. 2064 * find_free_spot(), but it will search max number of squares.
2016 */ 2067 */
2017int 2068int
2018find_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)
2019{ 2070{
2020 for (int i = 0; i < SIZEOFFREE; i++) 2071 for (int i = 0; i < SIZEOFFREE; i++)
2021 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]))
2022 return i; 2073 return i;
2023 2074
2024 return -1; 2075 return -1;
2025} 2076}
2026 2077
2034{ 2085{
2035 arr += begin; 2086 arr += begin;
2036 end -= begin; 2087 end -= begin;
2037 2088
2038 while (--end) 2089 while (--end)
2039 swap (arr [end], arr [RANDOM () % (end + 1)]); 2090 swap (arr [end], arr [rndm (end + 1)]);
2040} 2091}
2041 2092
2042/* new function to make monster searching more efficient, and effective! 2093/* new function to make monster searching more efficient, and effective!
2043 * This basically returns a randomized array (in the passed pointer) of 2094 * This basically returns a randomized array (in the passed pointer) of
2044 * 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
2080 object *tmp; 2131 object *tmp;
2081 maptile *mp; 2132 maptile *mp;
2082 2133
2083 MoveType blocked, move_type; 2134 MoveType blocked, move_type;
2084 2135
2085 if (exclude && exclude->head) 2136 if (exclude && exclude->head_ () != exclude)
2086 { 2137 {
2087 exclude = exclude->head; 2138 exclude = exclude->head;
2088 move_type = exclude->move_type; 2139 move_type = exclude->move_type;
2089 } 2140 }
2090 else 2141 else
2113 max = maxfree[i]; 2164 max = maxfree[i];
2114 else if (mflags & P_IS_ALIVE) 2165 else if (mflags & P_IS_ALIVE)
2115 { 2166 {
2116 for (tmp = ms.bot; tmp; tmp = tmp->above) 2167 for (tmp = ms.bot; tmp; tmp = tmp->above)
2117 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2168 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2169 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119 break; 2170 break;
2120 2171
2121 if (tmp) 2172 if (tmp)
2122 return freedir[i]; 2173 return freedir[i];
2123 } 2174 }
2178 2229
2179 return 3; 2230 return 3;
2180} 2231}
2181 2232
2182/* 2233/*
2183 * absdir(int): Returns a number between 1 and 8, which represent
2184 * the "absolute" direction of a number (it actually takes care of
2185 * "overflow" in previous calculations of a direction).
2186 */
2187
2188int
2189absdir (int d)
2190{
2191 while (d < 1)
2192 d += 8;
2193
2194 while (d > 8)
2195 d -= 8;
2196
2197 return d;
2198}
2199
2200/*
2201 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2234 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202 * between two directions (which are expected to be absolute (see absdir()) 2235 * between two directions (which are expected to be absolute (see absdir())
2203 */ 2236 */
2204
2205int 2237int
2206dirdiff (int dir1, int dir2) 2238dirdiff (int dir1, int dir2)
2207{ 2239{
2208 int d; 2240 int d;
2209 2241
2322 * 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
2323 * core dumps if they do. 2355 * core dumps if they do.
2324 * 2356 *
2325 * 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)
2326 */ 2358 */
2327
2328int 2359int
2329can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2330{ 2361{
2331 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2332 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2337 * create clone from object to another 2368 * create clone from object to another
2338 */ 2369 */
2339object * 2370object *
2340object_create_clone (object *asrc) 2371object_create_clone (object *asrc)
2341{ 2372{
2342 object *dst = 0, *tmp, *src, *part, *prev, *item; 2373 object *dst = 0, *tmp, *src, *prev, *item;
2343 2374
2344 if (!asrc) 2375 if (!asrc)
2345 return 0; 2376 return 0;
2346 2377
2347 src = asrc;
2348 if (src->head)
2349 src = src->head; 2378 src = asrc->head_ ();
2350 2379
2351 prev = 0; 2380 prev = 0;
2352 for (part = src; part; part = part->more) 2381 for (object *part = src; part; part = part->more)
2353 { 2382 {
2354 tmp = part->clone (); 2383 tmp = part->clone ();
2355 tmp->x -= src->x; 2384 tmp->x -= src->x;
2356 tmp->y -= src->y; 2385 tmp->y -= src->y;
2357 2386
2373 2402
2374 for (item = src->inv; item; item = item->below) 2403 for (item = src->inv; item; item = item->below)
2375 insert_ob_in_ob (object_create_clone (item), dst); 2404 insert_ob_in_ob (object_create_clone (item), dst);
2376 2405
2377 return dst; 2406 return dst;
2378}
2379
2380/* GROS - Creates an object using a string representing its content. */
2381/* Basically, we save the content of the string to a temp file, then call */
2382/* load_object on it. I admit it is a highly inefficient way to make things, */
2383/* but it was simple to make and allows reusing the load_object function. */
2384/* Remember not to use load_object_str in a time-critical situation. */
2385/* Also remember that multiparts objects are not supported for now. */
2386object *
2387load_object_str (const char *obstr)
2388{
2389 object *op;
2390 char filename[MAX_BUF];
2391
2392 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394 FILE *tempfile = fopen (filename, "w");
2395
2396 if (tempfile == NULL)
2397 {
2398 LOG (llevError, "Error - Unable to access load object temp file\n");
2399 return NULL;
2400 }
2401
2402 fprintf (tempfile, obstr);
2403 fclose (tempfile);
2404
2405 op = object::create ();
2406
2407 object_thawer thawer (filename);
2408
2409 if (thawer)
2410 load_object (thawer, op, 0);
2411
2412 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413 CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415 return op;
2416} 2407}
2417 2408
2418/* This returns the first object in who's inventory that 2409/* This returns the first object in who's inventory that
2419 * has the same type and subtype match. 2410 * has the same type and subtype match.
2420 * returns NULL if no match. 2411 * returns NULL if no match.
2475 if (link->key == canonical_key) 2466 if (link->key == canonical_key)
2476 return link->value; 2467 return link->value;
2477 2468
2478 return 0; 2469 return 0;
2479} 2470}
2480
2481 2471
2482/* 2472/*
2483 * Updates the canonical_key in op to value. 2473 * Updates the canonical_key in op to value.
2484 * 2474 *
2485 * 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).
2509 /* Basically, if the archetype has this key set, 2499 /* Basically, if the archetype has this key set,
2510 * we need to store the null value so when we save 2500 * we need to store the null value so when we save
2511 * it, we save the empty value so that when we load, 2501 * it, we save the empty value so that when we load,
2512 * we get this value back again. 2502 * we get this value back again.
2513 */ 2503 */
2514 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2504 if (get_ob_key_link (op->arch, canonical_key))
2515 field->value = 0; 2505 field->value = 0;
2516 else 2506 else
2517 { 2507 {
2518 if (last) 2508 if (last)
2519 last->next = field->next; 2509 last->next = field->next;
2588 } 2578 }
2589 else 2579 else
2590 item = item->env; 2580 item = item->env;
2591} 2581}
2592 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
2593// 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
2594const char * 2612const char *
2595object::debug_desc (char *info) const 2613object::debug_desc (char *info) const
2596{ 2614{
2615 char flagdesc[512];
2597 char info2[256 * 3]; 2616 char info2[256 * 4];
2598 char *p = info; 2617 char *p = info;
2599 2618
2600 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}",
2601 count, 2620 count,
2621 uuid.c_str (),
2602 &name, 2622 &name,
2603 title ? " " : "", 2623 title ? "\",title:\"" : "",
2604 title ? (const char *)title : ""); 2624 title ? (const char *)title : "",
2625 flag_desc (flagdesc, 512), type);
2605 2626
2606 if (env) 2627 if (!this->flag[FLAG_REMOVED] && env)
2607 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2628 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2608 2629
2609 if (map) 2630 if (map)
2610 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);
2611 2632
2612 return info; 2633 return info;
2613} 2634}
2614 2635
2615const char * 2636const char *
2616object::debug_desc () const 2637object::debug_desc () const
2617{ 2638{
2618 static char info[256 * 3]; 2639 static char info[3][256 * 4];
2640 static int info_idx;
2641
2619 return debug_desc (info); 2642 return debug_desc (info [++info_idx % 3]);
2620} 2643}
2621 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