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.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.184 by root, Wed Aug 22 20:46:46 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines