ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.69 by root, Mon Dec 18 03:00:02 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
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>
42	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
		36
43	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
44		40
45	object *objects; /* Pointer to the list of used objects */
46	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
47		42
48	short 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,	43	short 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	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
50	};	45	};
…		…
57	int freedir[SIZEOFFREE] = {	52	int 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,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
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	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
60	};	55	};
61		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	135	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	137	{
66	key_value *wants_field;	138	key_value *wants_field;
…		…
113	*	185	*
114	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
117	*	189	*
118	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
119	*	191	*
120	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
121	* check weight	193	* check weight
122	*/	194	*/
123		195
124	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	197	{
126	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
127	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
128	return 0;	204	return 0;
129		205
130	if (ob1->speed != ob2->speed)	206	//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	207	/* 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	208	* value could not be stored in a sint32 (which unfortunately sometimes is
135	* used to store nrof).	209	* used to store nrof).
136	*/	210	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
147	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
148		222
149	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
150	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
151		225
152		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
153	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| 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) ||	228	|| ob1->name != ob2->name
163	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
164	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
165	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
166	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
167	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
168	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
169	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
170	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
171	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
172	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
173	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
174	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
175	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
176	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
177	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
178	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
179	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
180	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
181	(ob1->move_on != ob2->move_on) ||	247	|| 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))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
183	return 0;	251	return 0;
184		252
185	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
186	* check all objects in the inventory.	254	* check all objects in the inventory.
187	*/	255	*/
…		…
190	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;	260	return 0;
193		261
194	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
196	return 0;	264	return 0;
197		265
198	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
199	* if it is valid.	267	* if it is valid.
200	*/	268	*/
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	283	return 0;
216		284
217	switch (ob1->type)	285	switch (ob1->type)
218	{	286	{
219	case SCROLL:	287	case SCROLL:
220	if (ob1->level != ob2->level)	288	if (ob1->level != ob2->level)
221	return 0;	289	return 0;
222	break;	290	break;
223	}	291	}
224		292
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	293	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	294	{
227	/* At least one of these has key_values. */	295	/* At least one of these has key_values. */
…		…
249	/*	317	/*
250	* sum_weight() is a recursive function which calculates the weight	318	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	319	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	320	* containers are carrying, and sums it up.
253	*/	321	*/
254	signed long	322	long
255	sum_weight (object *op)	323	sum_weight (object *op)
256	{	324	{
257	signed long sum;	325	long sum;
258	object *inv;	326	object *inv;
259		327
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	329	{
262	if (inv->inv)	330	if (inv->inv)
263	sum_weight (inv);	331	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	333	}
		334
266	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
268	if (op->carrying != sum)	338	if (op->carrying != sum)
269	op->carrying = sum;	339	op->carrying = sum;
		340
270	return sum;	341	return sum;
271	}	342	}
272		343
273	/**	344	/**
274	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	373	* Some error messages.
303	* The result of the dump is stored in the static global errmsg array.	374	* The result of the dump is stored in the static global errmsg array.
304	*/	375	*/
305		376
306	void	377	char *
307	dump_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
360	void
361	dump_object (object *op)	378	dump_object (object *op)
362	{	379	{
363	if (op == NULL)	380	if (!op)
364	{	381	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		382
372	void	383	object_freezer freezer;
373	dump_all_objects (void)	384	save_object (freezer, op, 3);
374	{	385	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	}	386	}
383		387
384	/*	388	/*
385	* get_nearest_part(multi-object, object 2) returns the part of the	389	* get_nearest_part(multi-object, object 2) returns the part of the
386	* multi-object 1 which is closest to the second object.	390	* multi-object 1 which is closest to the second object.
…		…
406	*/	410	*/
407		411
408	object *	412	object *
409	find_object (tag_t i)	413	find_object (tag_t i)
410	{	414	{
411	object *op;	415	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	416	if (op->count == i)
415	break;	417	return op;
		418
416	return op;	419	return 0;
417	}	420	}
418		421
419	/*	422	/*
420	* Returns the first object which has a name equal to the argument.	423	* Returns the first object which has a name equal to the argument.
421	* Used only by the patch command, but not all that useful.	424	* Used only by the patch command, but not all that useful.
…		…
423	*/	426	*/
424		427
425	object *	428	object *
426	find_object_name (const char *str)	429	find_object_name (const char *str)
427	{	430	{
428	const char *name = shstr::find (str);	431	shstr_cmp str_ (str);
429	object *op;	432	object *op;
430		433
431	for (op = objects; op != NULL; op = op->next)	434	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	435	if (op->name == str_)
433	break;	436	break;
434		437
435	return op;	438	return op;
436	}	439	}
437		440
…		…
440	{	443	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	444	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	445	}
443		446
444	/*	447	/*
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
455	object *
456	get_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
469	void
470	clear_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	448	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	449	* skill and experience objects.
485	*/	450	*/
486	void	451	void
487	set_owner (object *op, object *owner)	452	object::set_owner (object *owner)
488	{	453	{
489	if (owner == NULL || op == NULL)	454	if (!owner)
490	return;	455	return;
491		456
492	/* next line added to allow objects which own objects */	457	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	458	/* 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	459	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	460	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	461	* 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.	462	* didn't match, this check is valid and I believe that cause is valid.
498	*/	463	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	464	while (owner->owner)
500	owner = owner->owner;	465	owner = owner->owner;
501		466
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;	467	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	468	}
542		469
543	/* Zero the key_values on op, decrementing the shared-string	470	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	471	* refcounts and freeing the links.
545	*/	472	*/
…		…
561	{	488	{
562	attachable_base::clear ();	489	attachable_base::clear ();
563		490
564	free_key_values (this);	491	free_key_values (this);
565		492
566	clear_owner (this);	493	owner = 0;
567
568	name = 0;	494	name = 0;
569	name_pl = 0;	495	name_pl = 0;
570	title = 0;	496	title = 0;
571	race = 0;	497	race = 0;
572	slaying = 0;	498	slaying = 0;
573	skill = 0;	499	skill = 0;
574	msg = 0;	500	msg = 0;
575	lore = 0;	501	lore = 0;
576	custom_name = 0;	502	custom_name = 0;
577	materialname = 0;	503	materialname = 0;
		504	contr = 0;
		505	below = 0;
		506	above = 0;
		507	inv = 0;
		508	container = 0;
		509	env = 0;
		510	more = 0;
		511	head = 0;
		512	map = 0;
		513	active_next = 0;
		514	active_prev = 0;
578		515
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	516	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		517
581	SET_FLAG (this, FLAG_REMOVED);	518	SET_FLAG (this, FLAG_REMOVED);
582	}
583		519
584	void object::clone (object *destination)
585	{
586	*(object_copy *) destination = *this;
587	*(object_pod *) destination = *this;
588
589	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */	520	/* What is not cleared is next, prev, and count */
616		521
617	op->expmul = 1.0;	522	expmul = 1.0;
618	op->face = blank_face;	523	face = blank_face;
619	op->attacked_by_count = -1;
620		524
621	if (settings.casting_time)	525	if (settings.casting_time)
622	op->casting_time = -1;	526	casting_time = -1;
623	}	527	}
624		528
625	/*	529	/*
626	* copy object first frees everything allocated by the second object,	530	* copy_to first frees everything allocated by the dst object,
627	* and then copies the contends of the first object into the second	531	* and then copies the contents of itself into the second
628	* object, allocating what needs to be allocated. Basically, any	532	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	533	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	534	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	535	* will point at garbage.
632	*/	536	*/
633
634	void	537	void
635	copy_object (object *op2, object *op)	538	object::copy_to (object *dst)
636	{	539	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
639		542
640	op2->clone (op);	543	*(object_copy *)dst = *this;
		544	*(object_pod *)dst = *this;
		545
		546	if (self || cb)
		547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
641		548
642	if (is_freed)	549	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	550	SET_FLAG (dst, FLAG_FREED);
		551
644	if (is_removed)	552	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	553	SET_FLAG (dst, FLAG_REMOVED);
646		554
647	if (op2->speed < 0)	555	if (speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
649		557
650	/* Copy over key_values, if any. */	558	/* Copy over key_values, if any. */
651	if (op2->key_values)	559	if (key_values)
652	{	560	{
653	key_value *tail = 0;	561	key_value *tail = 0;
654	key_value *i;	562	key_value *i;
655		563
656	op->key_values = 0;	564	dst->key_values = 0;
657		565
658	for (i = op2->key_values; i; i = i->next)	566	for (i = key_values; i; i = i->next)
659	{	567	{
660	key_value *new_link = new key_value;	568	key_value *new_link = new key_value;
661		569
662	new_link->next = 0;	570	new_link->next = 0;
663	new_link->key = i->key;	571	new_link->key = i->key;
664	new_link->value = i->value;	572	new_link->value = i->value;
665		573
666	/* Try and be clever here, too. */	574	/* Try and be clever here, too. */
667	if (!op->key_values)	575	if (!dst->key_values)
668	{	576	{
669	op->key_values = new_link;	577	dst->key_values = new_link;
670	tail = new_link;	578	tail = new_link;
671	}	579	}
672	else	580	else
673	{	581	{
674	tail->next = new_link;	582	tail->next = new_link;
675	tail = new_link;	583	tail = new_link;
676	}	584	}
677	}	585	}
678	}	586	}
679		587
680	update_ob_speed (op);	588	update_ob_speed (dst);
		589	}
		590
		591	object *
		592	object::clone ()
		593	{
		594	object *neu = create ();
		595	copy_to (neu);
		596	return neu;
681	}	597	}
682		598
683	/*	599	/*
684	* If an object with the IS_TURNABLE() flag needs to be turned due	600	* If an object with the IS_TURNABLE() flag needs to be turned due
685	* to the closest player being on the other side, this function can	601	* to the closest player being on the other side, this function can
…		…
698	/*	614	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	615	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	616	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	617	* This function needs to be called whenever the speed of an object changes.
702	*/	618	*/
703
704	void	619	void
705	update_ob_speed (object *op)	620	update_ob_speed (object *op)
706	{	621	{
707	extern int arch_init;	622	extern int arch_init;
708		623
…		…
717	abort ();	632	abort ();
718	#else	633	#else
719	op->speed = 0;	634	op->speed = 0;
720	#endif	635	#endif
721	}	636	}
		637
722	if (arch_init)	638	if (arch_init)
723	{
724	return;	639	return;
725	}	640
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	642	{
728	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
730	return;	645	return;
731		646
732	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	648	* of the list. */
734	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
735	if (op->active_next != NULL)	651	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
737	active_objects = op;	654	active_objects = op;
738	}	655	}
739	else	656	else
740	{	657	{
741	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
743	return;	660	return;
744		661
745	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
746	{	663	{
747	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
748	if (op->active_next != NULL)	666	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
750	}	668	}
751	else	669	else
752	{	670	{
753	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
754	if (op->active_next)	673	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
756	}	675	}
		676
757	op->active_next = NULL;	677	op->active_next = NULL;
758	op->active_prev = NULL;	678	op->active_prev = NULL;
759	}	679	}
760	}	680	}
761		681
…		…
886	update_now = 1;	806	update_now = 1;
887		807
888	if ((move_slow | op->move_slow) != move_slow)	808	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	809	update_now = 1;
890	}	810	}
		811
891	/* if the object is being removed, we can't make intelligent	812	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	813	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	814	* that is being removed.
894	*/	815	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	817	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	818	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	819	/* Nothing to do for that case */ ;
902	}
903	else	820	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	821	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		822
908	if (update_now)	823	if (update_now)
909	{	824	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	825	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	826	update_position (op->map, op->x, op->y);
…		…
913		828
914	if (op->more != NULL)	829	if (op->more != NULL)
915	update_object (op->more, action);	830	update_object (op->more, action);
916	}	831	}
917		832
918	static unordered_vector<object *> mortals;	833	object::vector object::mortals;
919	static std::vector<object *> freed;	834	object::vector object::objects; // not yet used
		835	object *object::first;
920		836
921	void object::free_mortals ()	837	void object::free_mortals ()
922	{	838	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	840	if ((*i)->refcnt)
		841	++i; // further delay freeing
		842	else
925	{	843	{
926	freed.push_back (*i);	844	delete *i;
927	mortals.erase (i);	845	mortals.erase (i);
928	}	846	}
929	else
930	++i;
931	}	847	}
932		848
933	object::object ()	849	object::object ()
934	{	850	{
935	SET_FLAG (this, FLAG_REMOVED);	851	SET_FLAG (this, FLAG_REMOVED);
936		852
937	expmul = 1.0;	853	expmul = 1.0;
938	face = blank_face;	854	face = blank_face;
939	attacked_by_count = -1;
940	}	855	}
941		856
942	object::~object ()	857	object::~object ()
943	{	858	{
944	free_key_values (this);	859	free_key_values (this);
945	}	860	}
946		861
947	void object::link ()	862	void object::link ()
948	{	863	{
949	count = ++ob_count;	864	count = ++ob_count;
		865	uuid = gen_uuid ();
950		866
951	prev = 0;	867	prev = 0;
952	next = objects;	868	next = object::first;
953		869
954	if (objects)	870	if (object::first)
955	objects->prev = this;	871	object::first->prev = this;
956		872
957	objects = this;	873	object::first = this;
958	}	874	}
959		875
960	void object::unlink ()	876	void object::unlink ()
961	{	877	{
962	count = 0;	878	if (this == object::first)
		879	object::first = next;
963		880
964	/* Remove this object from the list of used objects */	881	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	882	if (prev) prev->next = next;
		883	if (next) next->prev = prev;
		884
968	prev = 0;	885	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	886	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	887	}
980		888
981	object *object::create ()	889	object *object::create ()
982	{	890	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	891	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	892	op->link ();
996	return op;	893	return op;
997	}	894	}
998		895
999	/*	896	/*
…		…
1001	* it from the list of used objects, and puts it on the list of	898	* it from the list of used objects, and puts it on the list of
1002	* free objects. The IS_FREED() flag is set in the object.	899	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	900	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	901	* this function to succeed.
1005	*	902	*
1006	* If free_inventory is set, free inventory as well. Else drop items in	903	* If destroy_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	904	* inventory to the ground.
1008	*/	905	*/
1009	void object::free (bool free_inventory)	906	void object::destroy (bool destroy_inventory)
1010	{	907	{
		908	if (QUERY_FLAG (this, FLAG_FREED))
		909	return;
		910
		911	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		912	remove_friendly_object (this);
		913
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	914	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	915	remove ();
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		916
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	917	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		918
1033	if (more)	919	if (more)
1034	{	920	{
1035	more->free (free_inventory);	921	more->destroy (destroy_inventory);
1036	more = 0;	922	more = 0;
1037	}	923	}
1038		924
1039	if (inv)	925	if (inv)
1040	{	926	{
1041	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
1043	* drop on that space.	929	* drop on that space.
1044	*/	930	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	931	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	932	{
1047	object *	933	object *op = inv;
1048	op = inv;
1049		934
1050	while (op)	935	while (op)
1051	{	936	{
1052	object *
1053	tmp = op->below;	937	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	938	op->destroy (destroy_inventory);
1057	op = tmp;	939	op = tmp;
1058	}	940	}
1059	}	941	}
1060	else	942	else
1061	{ /* Put objects in inventory onto this space */	943	{ /* Put objects in inventory onto this space */
1062	object *	944	object *op = inv;
1063	op = inv;
1064		945
1065	while (op)	946	while (op)
1066	{	947	{
1067	object *
1068	tmp = op->below;	948	object *tmp = op->below;
1069		949
1070	remove_ob (op);	950	op->remove ();
1071		951
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	953	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1074	free_object (op);	954	op->destroy ();
1075	else	955	else
1076	{	956	{
1077	op->x = x;	957	op->x = x;
1078	op->y = y;	958	op->y = y;
1079	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	959	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1082	op = tmp;	962	op = tmp;
1083	}	963	}
1084	}	964	}
1085	}	965	}
1086		966
1087	clear_owner (this);	967	// hack to ensure that freed objects still have a valid map
		968	{
		969	static maptile *freed_map; // freed objects are moved here to avoid crashes
		970
		971	if (!freed_map)
		972	{
		973	freed_map = new maptile;
		974
		975	freed_map->name = "/internal/freed_objects_map";
		976	freed_map->width = 3;
		977	freed_map->height = 3;
		978
		979	freed_map->allocate ();
		980	}
		981
		982	map = freed_map;
		983	x = 1;
		984	y = 1;
		985	}
		986
		987	// clear those pointers that likely might have circular references to us
		988	owner = 0;
		989	enemy = 0;
		990	attacked_by = 0;
		991
		992	// only relevant for players(?), but make sure of it anyways
		993	contr = 0;
1088		994
1089	/* Remove object from the active list */	995	/* Remove object from the active list */
1090	speed = 0;	996	speed = 0;
1091	update_ob_speed (this);	997	update_ob_speed (this);
1092		998
1093	unlink ();	999	unlink ();
1094		1000
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1001	mortals.push_back (this);
1098	}	1002	}
1099		1003
1100	/*	1004	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1005	* sub_weight() recursively (outwards) subtracts a number from the
1102	* weight of an object (and what is carried by it's environment(s)).	1006	* weight of an object (and what is carried by it's environment(s)).
1103	*/	1007	*/
1104
1105	void	1008	void
1106	sub_weight (object *op, signed long weight)	1009	sub_weight (object *op, signed long weight)
1107	{	1010	{
1108	while (op != NULL)	1011	while (op != NULL)
1109	{	1012	{
1110	if (op->type == CONTAINER)	1013	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1014	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1015
1114	op->carrying -= weight;	1016	op->carrying -= weight;
1115	op = op->env;	1017	op = op->env;
1116	}	1018	}
1117	}	1019	}
1118		1020
1119	/* remove_ob(op):	1021	/* op->remove ():
1120	* This function removes the object op from the linked list of objects	1022	* This function removes the object op from the linked list of objects
1121	* which it is currently tied to. When this function is done, the	1023	* which it is currently tied to. When this function is done, the
1122	* object will have no environment. If the object previously had an	1024	* object will have no environment. If the object previously had an
1123	* environment, the x and y coordinates will be updated to	1025	* environment, the x and y coordinates will be updated to
1124	* the previous environment.	1026	* the previous environment.
1125	* Beware: This function is called from the editor as well!	1027	* Beware: This function is called from the editor as well!
1126	*/	1028	*/
1127
1128	void	1029	void
1129	remove_ob (object *op)	1030	object::remove ()
1130	{	1031	{
		1032	object *tmp, *last = 0;
1131	object *	1033	object *otmp;
1132	tmp, *	1034
1133	last = NULL;
1134	object *
1135	otmp;
1136	tag_t
1137	tag;
1138	int
1139	check_walk_off;	1035	int check_walk_off;
1140	mapstruct *
1141	m;
1142	sint16
1143	x,
1144	y;
1145		1036
1146
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1037	if (QUERY_FLAG (this, FLAG_REMOVED))
1148	{	1038	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1039
1152	/* Changed it to always dump core in this case. As has been learned
1153	* in the past, trying to recover from errors almost always
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)
1165	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);	1040	SET_FLAG (this, FLAG_REMOVED);
		1041
		1042	if (more)
		1043	more->remove ();
1168		1044
1169	/*	1045	/*
1170	* In this case, the object to be removed is in someones	1046	* In this case, the object to be removed is in someones
1171	* inventory.	1047	* inventory.
1172	*/	1048	*/
1173	if (op->env != NULL)	1049	if (env)
1174	{	1050	{
1175	if (op->nrof)	1051	if (nrof)
1176	sub_weight (op->env, op->weight * op->nrof);	1052	sub_weight (env, weight * nrof);
1177	else	1053	else
1178	sub_weight (op->env, op->weight + op->carrying);	1054	sub_weight (env, weight + carrying);
1179		1055
1180	/* NO_FIX_PLAYER is set when a great many changes are being	1056	/* NO_FIX_PLAYER is set when a great many changes are being
1181	* made to players inventory. If set, avoiding the call	1057	* made to players inventory. If set, avoiding the call
1182	* to save cpu time.	1058	* to save cpu time.
1183	*/	1059	*/
1184	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1060	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1185	fix_player (otmp);	1061	fix_player (otmp);
1186		1062
1187	if (op->above != NULL)	1063	if (above != NULL)
1188	op->above->below = op->below;	1064	above->below = below;
1189	else	1065	else
1190	op->env->inv = op->below;	1066	env->inv = below;
1191		1067
1192	if (op->below != NULL)	1068	if (below != NULL)
1193	op->below->above = op->above;	1069	below->above = above;
1194		1070
1195	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1196	* the map, but we don't actually do that - it is up	1072	* the map, but we don't actually do that - it is up
1197	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1198	*/	1074	*/
1199	op->x = op->env->x, op->y = op->env->y;	1075	x = env->x, y = env->y;
1200	op->map = op->env->map;	1076	map = env->map;
1201	op->above = NULL, op->below = NULL;	1077	above = 0, below = 0;
1202	op->env = NULL;	1078	env = 0;
1203	return;
1204	}
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;
1211	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);
1213
1214	if (!m)
1215	{	1079	}
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1080	else if (map)
1217	op->map->path, op->x, op->y);	1081	{
1218	/* in old days, we used to set x and y to 0 and continue.	1082	/* Re did the following section of code - it looks like it had
1219	* it seems if we get into this case, something is probablye	1083	* lots of logic for things we no longer care about
1220	* screwed up and should be fixed.
1221	*/	1084	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1085
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1086	/* link the object above us */
1235	if (op->above)	1087	if (above)
1236	op->above->below = op->below;	1088	above->below = below;
1237	else	1089	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1090	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1239		1091
1240	/* Relink the object below us, if there is one */	1092	/* Relink the object below us, if there is one */
1241	if (op->below)	1093	if (below)
1242	{
1243	op->below->above = op->above;	1094	below->above = above;
1244	}
1245	else	1095	else
1246	{	1096	{
1247	/* Nothing below, which means we need to relink map object for this space	1097	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is	1098	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1099	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	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",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1100	*/
1281	if (tmp->container == op)	1101	if (GET_MAP_OB (map, x, y) != this)
1282	{	1102	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1103	char *dump = dump_object (this);
1284	tmp->container = NULL;	1104	LOG (llevError,
		1105	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1106	free (dump);
		1107	dump = dump_object (GET_MAP_OB (map, x, y));
		1108	LOG (llevError, "%s\n", dump);
		1109	free (dump);
1285	}	1110	}
1286	tmp->contr->socket.update_look = 1;	1111
1287	}	1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1113	}
1291		1114
1292	move_apply (tmp, op, NULL);	1115	above = 0;
1293	if (was_destroyed (op, tag))	1116	below = 0;
		1117
		1118	if (map->in_memory == MAP_SAVING)
		1119	return;
		1120
		1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1122
		1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1124	{
		1125	/* No point updating the players look faces if he is the object
		1126	* being removed.
		1127	*/
		1128
		1129	if (tmp->type == PLAYER && tmp != this)
1294	{	1130	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1131	/* If a container that the player is currently using somehow gets
		1132	* removed (most likely destroyed), update the player view
		1133	* appropriately.
		1134	*/
		1135	if (tmp->container == this)
		1136	{
		1137	CLEAR_FLAG (this, FLAG_APPLIED);
		1138	tmp->container = 0;
		1139	}
		1140
		1141	tmp->contr->socket->update_look = 1;
1296	}	1142	}
		1143
		1144	/* See if player moving off should effect something */
		1145	if (check_walk_off
		1146	&& ((move_type & tmp->move_off)
		1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1148	{
		1149	move_apply (tmp, this, 0);
		1150
		1151	if (destroyed ())
		1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1297	}	1153	}
1298		1154
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1156
1301	if (tmp->above == tmp)	1157	if (tmp->above == tmp)
1302	tmp->above = NULL;	1158	tmp->above = 0;
		1159
1303	last = tmp;	1160	last = tmp;
1304	}	1161	}
		1162
1305	/* last == NULL of there are no objects on this space */	1163	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1164	if (!last)
1307	{	1165	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1167	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't	1168	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.	1169	* be correct anyways.
1312	*/	1170	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1172	update_position (map, x, y);
1315	}	1173	}
1316	else	1174	else
1317	update_object (last, UP_OBJ_REMOVE);	1175	update_object (last, UP_OBJ_REMOVE);
1318		1176
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1320	update_all_los (op->map, op->x, op->y);	1178	update_all_los (map, x, y);
1321		1179	}
1322	}	1180	}
1323		1181
1324	/*	1182	/*
1325	* merge_ob(op,top):	1183	* merge_ob(op,top):
1326	*	1184	*
1327	* This function goes through all objects below and including top, and	1185	* This function goes through all objects below and including top, and
1328	* merges op to the first matching object.	1186	* merges op to the first matching object.
1329	* If top is NULL, it is calculated.	1187	* If top is NULL, it is calculated.
1330	* Returns pointer to object if it succeded in the merge, otherwise NULL	1188	* Returns pointer to object if it succeded in the merge, otherwise NULL
1331	*/	1189	*/
1332
1333	object *	1190	object *
1334	merge_ob (object *op, object *top)	1191	merge_ob (object *op, object *top)
1335	{	1192	{
1336	if (!op->nrof)	1193	if (!op->nrof)
1337	return 0;	1194	return 0;
		1195
1338	if (top == NULL)	1196	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1197	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1198
1340	for (; top != NULL; top = top->below)	1199	for (; top != NULL; top = top->below)
1341	{	1200	{
1342	if (top == op)	1201	if (top == op)
1343	continue;	1202	continue;
1344	if (CAN_MERGE (op, top))	1203
		1204	if (object::can_merge (op, top))
1345	{	1205	{
1346	top->nrof += op->nrof;	1206	top->nrof += op->nrof;
1347		1207
1348	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1208	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1349	op->weight = 0; /* Don't want any adjustements now */	1209	op->weight = 0; /* Don't want any adjustements now */
1350	remove_ob (op);	1210	op->destroy ();
1351	free_object (op);
1352	return top;	1211	return top;
1353	}	1212	}
1354	}	1213	}
		1214
1355	return NULL;	1215	return 0;
1356	}	1216	}
1357		1217
1358	/*	1218	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1219	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1220	* job preparing multi-part monsters
1361	*/	1221	*/
1362	object *	1222	object *
1363	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1223	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1364	{	1224	{
1365	object *	1225	object *tmp;
1366	tmp;
1367		1226
1368	if (op->head)	1227	if (op->head)
1369	op = op->head;	1228	op = op->head;
		1229
1370	for (tmp = op; tmp; tmp = tmp->more)	1230	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1231	{
1372	tmp->x = x + tmp->arch->clone.x;	1232	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1233	tmp->y = y + tmp->arch->clone.y;
1374	}	1234	}
		1235
1375	return insert_ob_in_map (op, m, originator, flag);	1236	return insert_ob_in_map (op, m, originator, flag);
1376	}	1237	}
1377		1238
1378	/*	1239	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1240	* insert_ob_in_map (op, map, originator, flag):
…		…
1395	* NULL if 'op' was destroyed	1256	* NULL if 'op' was destroyed
1396	* just 'op' otherwise	1257	* just 'op' otherwise
1397	*/	1258	*/
1398		1259
1399	object *	1260	object *
1400	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1261	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1401	{	1262	{
1402	object *tmp, *top, *floor = NULL;	1263	object *tmp, *top, *floor = NULL;
1403	sint16 x, y;	1264	sint16 x, y;
1404		1265
1405	if (QUERY_FLAG (op, FLAG_FREED))	1266	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1408	return NULL;	1269	return NULL;
1409	}	1270	}
1410		1271
1411	if (m == NULL)	1272	if (m == NULL)
1412	{	1273	{
1413	dump_object (op);	1274	char *dump = dump_object (op);
1414	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1275	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1276	free (dump);
1415	return op;	1277	return op;
1416	}	1278	}
1417		1279
1418	if (out_of_map (m, op->x, op->y))	1280	if (out_of_map (m, op->x, op->y))
1419	{	1281	{
1420	dump_object (op);	1282	char *dump = dump_object (op);
1421	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1422	#ifdef MANY_CORES	1284	#ifdef MANY_CORES
1423	/* Better to catch this here, as otherwise the next use of this object	1285	/* Better to catch this here, as otherwise the next use of this object
1424	* is likely to cause a crash. Better to find out where it is getting	1286	* is likely to cause a crash. Better to find out where it is getting
1425	* improperly inserted.	1287	* improperly inserted.
1426	*/	1288	*/
1427	abort ();	1289	abort ();
1428	#endif	1290	#endif
		1291	free (dump);
1429	return op;	1292	return op;
1430	}	1293	}
1431		1294
1432	if (!QUERY_FLAG (op, FLAG_REMOVED))	1295	if (!QUERY_FLAG (op, FLAG_REMOVED))
1433	{	1296	{
1434	dump_object (op);	1297	char *dump = dump_object (op);
1435	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1298	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1299	free (dump);
1436	return op;	1300	return op;
1437	}	1301	}
1438		1302
1439	if (op->more != NULL)	1303	if (op->more != NULL)
1440	{	1304	{
1441	/* The part may be on a different map. */	1305	/* The part may be on a different map. */
1442		1306
1443	object *
1444	more = op->more;	1307	object *more = op->more;
1445		1308
1446	/* We really need the caller to normalize coordinates - if	1309	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1310	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1311	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1312	* is clear wrong do we normalize it.
1450	*/	1313	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1314	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1315	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1316	else if (!more->map)
1456	{	1317	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1318	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1319	* more->map should always point to the parent.
1459	*/	1320	*/
…		…
1462		1323
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1324	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1325	{
1465	if (!op->head)	1326	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1327	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1328
1467	return NULL;	1329	return NULL;
1468	}	1330	}
1469	}	1331	}
1470		1332
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1333	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1480		1342
1481	/* this has to be done after we translate the coordinates.	1343	/* this has to be done after we translate the coordinates.
1482	*/	1344	*/
1483	if (op->nrof && !(flag & INS_NO_MERGE))	1345	if (op->nrof && !(flag & INS_NO_MERGE))
1484	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1346	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1485	if (CAN_MERGE (op, tmp))	1347	if (object::can_merge (op, tmp))
1486	{	1348	{
1487	op->nrof += tmp->nrof;	1349	op->nrof += tmp->nrof;
1488	remove_ob (tmp);	1350	tmp->destroy ();
1489	free_object (tmp);
1490	}	1351	}
1491		1352
1492	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1493	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1494		1355
…		…
1536		1397
1537	while (top != NULL)	1398	while (top != NULL)
1538	{	1399	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1400	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1401	floor = top;
		1402
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1403	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1404	{
1543	/* We insert above top, so we want this object below this */	1405	/* We insert above top, so we want this object below this */
1544	top = top->below;	1406	top = top->below;
1545	break;	1407	break;
1546	}	1408	}
		1409
1547	last = top;	1410	last = top;
1548	top = top->above;	1411	top = top->above;
1549	}	1412	}
		1413
1550	/* Don't want top to be NULL, so set it to the last valid object */	1414	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1415	top = last;
1552		1416
1553	/* We let update_position deal with figuring out what the space	1417	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1418	* looks like instead of lots of conditions here.
…		…
1619	* it, so save a few ticks and start from there.	1483	* it, so save a few ticks and start from there.
1620	*/	1484	*/
1621	if (!(flag & INS_MAP_LOAD))	1485	if (!(flag & INS_MAP_LOAD))
1622	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1623	if (tmp->type == PLAYER)	1487	if (tmp->type == PLAYER)
1624	tmp->contr->socket.update_look = 1;	1488	tmp->contr->socket->update_look = 1;
1625		1489
1626	/* If this object glows, it may affect lighting conditions that are	1490	/* If this object glows, it may affect lighting conditions that are
1627	* visible to others on this map. But update_all_los is really	1491	* visible to others on this map. But update_all_los is really
1628	* an inefficient way to do this, as it means los for all players	1492	* an inefficient way to do this, as it means los for all players
1629	* on the map will get recalculated. The players could very well	1493	* on the map will get recalculated. The players could very well
…		…
1633	* of effect may be sufficient.	1497	* of effect may be sufficient.
1634	*/	1498	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1499	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1500	update_all_los (op->map, op->x, op->y);
1637		1501
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1502	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1503	update_object (op, UP_OBJ_INSERT);
1641
1642		1504
1643	/* Don't know if moving this to the end will break anything. However,	1505	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1506	* we want to have update_look set above before calling this.
1645	*	1507	*
1646	* check_move_on() must be after this because code called from	1508	* check_move_on() must be after this because code called from
…		…
1671	* op is the object to insert it under: supplies x and the map.	1533	* op is the object to insert it under: supplies x and the map.
1672	*/	1534	*/
1673	void	1535	void
1674	replace_insert_ob_in_map (const char *arch_string, object *op)	1536	replace_insert_ob_in_map (const char *arch_string, object *op)
1675	{	1537	{
1676	object *tmp;	1538	object *
		1539	tmp;
1677	object *tmp1;	1540	object *
		1541	tmp1;
1678		1542
1679	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1680		1544
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{
1683	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1684	{	1547	tmp->destroy ();
1685	remove_ob (tmp);
1686	free_object (tmp);
1687	}
1688	}
1689		1548
1690	tmp1 = arch_to_object (find_archetype (arch_string));	1549	tmp1 = arch_to_object (archetype::find (arch_string));
1691		1550
1692	tmp1->x = op->x;	1551	tmp1->x = op->x;
1693	tmp1->y = op->y;	1552	tmp1->y = op->y;
1694	insert_ob_in_map (tmp1, op->map, op, 0);	1553	insert_ob_in_map (tmp1, op->map, op, 0);
1695	}	1554	}
…		…
1703	*/	1562	*/
1704		1563
1705	object *	1564	object *
1706	get_split_ob (object *orig_ob, uint32 nr)	1565	get_split_ob (object *orig_ob, uint32 nr)
1707	{	1566	{
1708	object *	1567	object *newob;
1709	newob;
1710	int
1711	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1712		1569
1713	if (orig_ob->nrof < nr)	1570	if (orig_ob->nrof < nr)
1714	{	1571	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1572	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1573	return NULL;
1717	}	1574	}
		1575
1718	newob = object_create_clone (orig_ob);	1576	newob = object_create_clone (orig_ob);
		1577
1719	if ((orig_ob->nrof -= nr) < 1)	1578	if ((orig_ob->nrof -= nr) < 1)
1720	{	1579	orig_ob->destroy (1);
1721	if (!is_removed)
1722	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);
1724	}
1725	else if (!is_removed)	1580	else if (!is_removed)
1726	{	1581	{
1727	if (orig_ob->env != NULL)	1582	if (orig_ob->env != NULL)
1728	sub_weight (orig_ob->env, orig_ob->weight * nr);	1583	sub_weight (orig_ob->env, orig_ob->weight * nr);
1729	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1584	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1586	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1587	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1588	return NULL;
1734	}	1589	}
1735	}	1590	}
		1591
1736	newob->nrof = nr;	1592	newob->nrof = nr;
1737		1593
1738	return newob;	1594	return newob;
1739	}	1595	}
1740		1596
…		…
1747	*/	1603	*/
1748		1604
1749	object *	1605	object *
1750	decrease_ob_nr (object *op, uint32 i)	1606	decrease_ob_nr (object *op, uint32 i)
1751	{	1607	{
1752	object *	1608	object *tmp;
1753	tmp;
1754	player *	1609	player *pl;
1755	pl;
1756		1610
1757	if (i == 0) /* objects with op->nrof require this check */	1611	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1612	return op;
1759		1613
1760	if (i > op->nrof)	1614	if (i > op->nrof)
1761	i = op->nrof;	1615	i = op->nrof;
1762		1616
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1617	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1618	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1619	else if (op->env != NULL)
1768	{	1620	{
1769	/* is this object in the players inventory, or sub container	1621	/* is this object in the players inventory, or sub container
1770	* therein?	1622	* therein?
1771	*/	1623	*/
…		…
1796	esrv_send_item (tmp, op);	1648	esrv_send_item (tmp, op);
1797	}	1649	}
1798	}	1650	}
1799	else	1651	else
1800	{	1652	{
1801	remove_ob (op);	1653	op->remove ();
1802	op->nrof = 0;	1654	op->nrof = 0;
1803	if (tmp)	1655	if (tmp)
1804	{	1656	{
1805	esrv_del_item (tmp->contr, op->count);	1657	esrv_del_item (tmp->contr, op->count);
1806	}	1658	}
1807	}	1659	}
1808	}	1660	}
1809	else	1661	else
1810	{	1662	{
1811	object *
1812	above = op->above;	1663	object *above = op->above;
1813		1664
1814	if (i < op->nrof)	1665	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1666	op->nrof -= i;
1817	}
1818	else	1667	else
1819	{	1668	{
1820	remove_ob (op);	1669	op->remove ();
1821	op->nrof = 0;	1670	op->nrof = 0;
1822	}	1671	}
		1672
1823	/* Since we just removed op, op->above is null */	1673	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1674	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1675	if (tmp->type == PLAYER)
1826	{	1676	{
1827	if (op->nrof)	1677	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1680	esrv_del_item (tmp->contr, op->count);
1831	}	1681	}
1832	}	1682	}
1833		1683
1834	if (op->nrof)	1684	if (op->nrof)
1835	{
1836	return op;	1685	return op;
1837	}
1838	else	1686	else
1839	{	1687	{
1840	free_object (op);	1688	op->destroy ();
1841	return NULL;	1689	return NULL;
1842	}	1690	}
1843	}	1691	}
1844		1692
1845	/*	1693	/*
…		…
1851	add_weight (object *op, signed long weight)	1699	add_weight (object *op, signed long weight)
1852	{	1700	{
1853	while (op != NULL)	1701	while (op != NULL)
1854	{	1702	{
1855	if (op->type == CONTAINER)	1703	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1704	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1705
1859	op->carrying += weight;	1706	op->carrying += weight;
1860	op = op->env;	1707	op = op->env;
1861	}	1708	}
1862	}	1709	}
1863		1710
		1711	object *
		1712	insert_ob_in_ob (object *op, object *where)
		1713	{
		1714	if (!where)
		1715	{
		1716	char *dump = dump_object (op);
		1717	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1718	free (dump);
		1719	return op;
		1720	}
		1721
		1722	if (where->head)
		1723	{
		1724	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1725	where = where->head;
		1726	}
		1727
		1728	return where->insert (op);
		1729	}
		1730
1864	/*	1731	/*
1865	* insert_ob_in_ob(op,environment):	1732	* env->insert (op)
1866	* This function inserts the object op in the linked list	1733	* This function inserts the object op in the linked list
1867	* inside the object environment.	1734	* inside the object environment.
1868	*	1735	*
1869	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1870	* the inventory at the last position or next to other objects of the same
1871	* type.
1872	* Frank: Now sorted by type, archetype and magic!
1873	*
1874	* The function returns now pointer to inserted item, and return value can	1736	* The function returns now pointer to inserted item, and return value can
1875	* be != op, if items are merged. -Tero	1737	* be != op, if items are merged. -Tero
1876	*/	1738	*/
1877		1739
1878	object *	1740	object *
1879	insert_ob_in_ob (object *op, object *where)	1741	object::insert (object *op)
1880	{	1742	{
1881	object *	1743	object *tmp, *otmp;
1882	tmp, *
1883	otmp;
1884		1744
1885	if (!QUERY_FLAG (op, FLAG_REMOVED))	1745	if (!QUERY_FLAG (op, FLAG_REMOVED))
1886	{	1746	op->remove ();
1887	dump_object (op);	1747
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889	return op;
1890	}
1891	if (where == NULL)
1892	{
1893	dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895	return op;
1896	}
1897	if (where->head)
1898	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;
1901	}
1902	if (op->more)	1748	if (op->more)
1903	{	1749	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1750	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1751	return op;
1906	}	1752	}
		1753
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1754	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1755	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1756	if (op->nrof)
1910	{	1757	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1758	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1912	if (CAN_MERGE (tmp, op))	1759	if (object::can_merge (tmp, op))
1913	{	1760	{
1914	/* return the original object and remove inserted object	1761	/* return the original object and remove inserted object
1915	(client needs the original object) */	1762	(client needs the original object) */
1916	tmp->nrof += op->nrof;	1763	tmp->nrof += op->nrof;
1917	/* Weight handling gets pretty funky. Since we are adding to	1764	/* Weight handling gets pretty funky. Since we are adding to
1918	* tmp->nrof, we need to increase the weight.	1765	* tmp->nrof, we need to increase the weight.
1919	*/	1766	*/
1920	add_weight (where, op->weight * op->nrof);	1767	add_weight (this, op->weight * op->nrof);
1921	SET_FLAG (op, FLAG_REMOVED);	1768	SET_FLAG (op, FLAG_REMOVED);
1922	free_object (op); /* free the inserted object */	1769	op->destroy (); /* free the inserted object */
1923	op = tmp;	1770	op = tmp;
1924	remove_ob (op); /* and fix old object's links */	1771	op->remove (); /* and fix old object's links */
1925	CLEAR_FLAG (op, FLAG_REMOVED);	1772	CLEAR_FLAG (op, FLAG_REMOVED);
1926	break;	1773	break;
1927	}	1774	}
1928		1775
1929	/* I assume combined objects have no inventory	1776	/* I assume combined objects have no inventory
1930	* We add the weight - this object could have just been removed	1777	* We add the weight - this object could have just been removed
1931	* (if it was possible to merge). calling remove_ob will subtract	1778	* (if it was possible to merge). calling remove_ob will subtract
1932	* the weight, so we need to add it in again, since we actually do	1779	* the weight, so we need to add it in again, since we actually do
1933	* the linking below	1780	* the linking below
1934	*/	1781	*/
1935	add_weight (where, op->weight * op->nrof);	1782	add_weight (this, op->weight * op->nrof);
1936	}	1783	}
1937	else	1784	else
1938	add_weight (where, (op->weight + op->carrying));	1785	add_weight (this, (op->weight + op->carrying));
1939		1786
1940	otmp = is_player_inv (where);	1787	otmp = is_player_inv (this);
1941	if (otmp && otmp->contr != NULL)	1788	if (otmp && otmp->contr)
1942	{
1943	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1789	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1944	fix_player (otmp);	1790	fix_player (otmp);
1945	}
1946		1791
1947	op->map = NULL;	1792	op->map = NULL;
1948	op->env = where;	1793	op->env = this;
1949	op->above = NULL;	1794	op->above = NULL;
1950	op->below = NULL;	1795	op->below = NULL;
1951	op->x = 0, op->y = 0;	1796	op->x = 0, op->y = 0;
1952		1797
1953	/* reset the light list and los of the players on the map */	1798	/* reset the light list and los of the players on the map */
1954	if ((op->glow_radius != 0) && where->map)	1799	if ((op->glow_radius != 0) && map)
1955	{	1800	{
1956	#ifdef DEBUG_LIGHTS	1801	#ifdef DEBUG_LIGHTS
1957	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1802	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1958	#endif /* DEBUG_LIGHTS */	1803	#endif /* DEBUG_LIGHTS */
1959	if (MAP_DARKNESS (where->map))	1804	if (MAP_DARKNESS (map))
1960	update_all_los (where->map, where->x, where->y);	1805	update_all_los (map, x, y);
1961	}	1806	}
1962		1807
1963	/* Client has no idea of ordering so lets not bother ordering it here.	1808	/* Client has no idea of ordering so lets not bother ordering it here.
1964	* It sure simplifies this function...	1809	* It sure simplifies this function...
1965	*/	1810	*/
1966	if (where->inv == NULL)	1811	if (!inv)
1967	where->inv = op;	1812	inv = op;
1968	else	1813	else
1969	{	1814	{
1970	op->below = where->inv;	1815	op->below = inv;
1971	op->below->above = op;	1816	op->below->above = op;
1972	where->inv = op;	1817	inv = op;
1973	}	1818	}
		1819
1974	return op;	1820	return op;
1975	}	1821	}
1976		1822
1977	/*	1823	/*
1978	* Checks if any objects has a move_type that matches objects	1824	* Checks if any objects has a move_type that matches objects
…		…
1996	*/	1842	*/
1997		1843
1998	int	1844	int
1999	check_move_on (object *op, object *originator)	1845	check_move_on (object *op, object *originator)
2000	{	1846	{
2001	object *	1847	object *tmp;
2002	tmp;	1848	maptile *m = op->map;
2003	tag_t
2004	tag;
2005	mapstruct *
2006	m = op->map;
2007	int
2008	x = op->x, y = op->y;	1849	int x = op->x, y = op->y;
2009	MoveType	1850
2010	move_on,	1851	MoveType move_on, move_slow, move_block;
2011	move_slow,
2012	move_block;
2013		1852
2014	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1853	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2015	return 0;	1854	return 0;
2016
2017	tag = op->count;
2018		1855
2019	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1856	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2020	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1857	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2021	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1858	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2022		1859
…		…
2047	* we don't need to check all of them.	1884	* we don't need to check all of them.
2048	*/	1885	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1886	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	1887	break;
2051	}	1888	}
		1889
2052	for (; tmp != NULL; tmp = tmp->below)	1890	for (; tmp; tmp = tmp->below)
2053	{	1891	{
2054	if (tmp == op)	1892	if (tmp == op)
2055	continue; /* Can't apply yourself */	1893	continue; /* Can't apply yourself */
2056		1894
2057	/* Check to see if one of the movement types should be slowed down.	1895	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1903	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1904	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	1905	{
2068		1906
2069	float	1907	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	1908	diff = tmp->move_slow_penalty * FABS (op->speed);
		1909
2073	if (op->type == PLAYER)	1910	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1911	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1912	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	1913	diff /= 4.0;
2079	}	1914
2080	}
2081	op->speed_left -= diff;	1915	op->speed_left -= diff;
2082	}	1916	}
2083	}	1917	}
2084		1918
2085	/* Basically same logic as above, except now for actual apply. */	1919	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1920	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1921	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	1922	{
2089
2090	move_apply (tmp, op, originator);	1923	move_apply (tmp, op, originator);
		1924
2091	if (was_destroyed (op, tag))	1925	if (op->destroyed ())
2092	return 1;	1926	return 1;
2093		1927
2094	/* what the person/creature stepped onto has moved the object	1928	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	1929	* someplace new. Don't process any further - if we did,
2096	* have a feeling strange problems would result.	1930	* have a feeling strange problems would result.
2097	*/	1931	*/
2098	if (op->map != m || op->x != x || op->y != y)	1932	if (op->map != m || op->x != x || op->y != y)
2099	return 0;	1933	return 0;
2100	}	1934	}
2101	}	1935	}
		1936
2102	return 0;	1937	return 0;
2103	}	1938	}
2104		1939
2105	/*	1940	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	1941	* present_arch(arch, map, x, y) searches for any objects with
2107	* a matching archetype at the given map and coordinates.	1942	* a matching archetype at the given map and coordinates.
2108	* The first matching object is returned, or NULL if none.	1943	* The first matching object is returned, or NULL if none.
2109	*/	1944	*/
2110		1945
2111	object *	1946	object *
2112	present_arch (const archetype *at, mapstruct *m, int x, int y)	1947	present_arch (const archetype *at, maptile *m, int x, int y)
2113	{	1948	{
2114	object *	1949	object *
2115	tmp;	1950	tmp;
2116		1951
2117	if (m == NULL || out_of_map (m, x, y))	1952	if (m == NULL || out_of_map (m, x, y))
…		…
2130	* a matching type variable at the given map and coordinates.	1965	* a matching type variable at the given map and coordinates.
2131	* The first matching object is returned, or NULL if none.	1966	* The first matching object is returned, or NULL if none.
2132	*/	1967	*/
2133		1968
2134	object *	1969	object *
2135	present (unsigned char type, mapstruct *m, int x, int y)	1970	present (unsigned char type, maptile *m, int x, int y)
2136	{	1971	{
2137	object *	1972	object *
2138	tmp;	1973	tmp;
2139		1974
2140	if (out_of_map (m, x, y))	1975	if (out_of_map (m, x, y))
…		…
2280	* the archetype because that isn't correct if the monster has been	2115	* the archetype because that isn't correct if the monster has been
2281	* customized, changed states, etc.	2116	* customized, changed states, etc.
2282	*/	2117	*/
2283		2118
2284	int	2119	int
2285	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2120	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2286	{	2121	{
2287	int	2122	int
2288	i,	2123	i,
2289	index = 0, flag;	2124	index = 0, flag;
2290	static int	2125	static int
…		…
2311	return -1;	2146	return -1;
2312	return altern[RANDOM () % index];	2147	return altern[RANDOM () % index];
2313	}	2148	}
2314		2149
2315	/*	2150	/*
2316	* find_first_free_spot(archetype, mapstruct, x, y) works like	2151	* find_first_free_spot(archetype, maptile, x, y) works like
2317	* find_free_spot(), but it will search max number of squares.	2152	* find_free_spot(), but it will search max number of squares.
2318	* But it will return the first available spot, not a random choice.	2153	* But it will return the first available spot, not a random choice.
2319	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2154	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2320	*/	2155	*/
2321		2156
2322	int	2157	int
2323	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2158	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2324	{	2159	{
2325	int	2160	int
2326	i;	2161	i;
2327		2162
2328	for (i = 0; i < SIZEOFFREE; i++)	2163	for (i = 0; i < SIZEOFFREE; i++)
…		…
2392	* because we have to know what movement the thing looking to move	2227	* because we have to know what movement the thing looking to move
2393	* there is capable of.	2228	* there is capable of.
2394	*/	2229	*/
2395		2230
2396	int	2231	int
2397	find_dir (mapstruct *m, int x, int y, object *exclude)	2232	find_dir (maptile *m, int x, int y, object *exclude)
2398	{	2233	{
2399	int	2234	int
2400	i,	2235	i,
2401	max = SIZEOFFREE, mflags;	2236	max = SIZEOFFREE, mflags;
2402	sint16	2237
2403	nx,	2238	sint16 nx, ny;
2404	ny;
2405	object *	2239	object *
2406	tmp;	2240	tmp;
2407	mapstruct *	2241	maptile *
2408	mp;	2242	mp;
2409	MoveType	2243
2410	blocked,	2244	MoveType blocked, move_type;
2411	move_type;
2412		2245
2413	if (exclude && exclude->head)	2246	if (exclude && exclude->head)
2414	{	2247	{
2415	exclude = exclude->head;	2248	exclude = exclude->head;
2416	move_type = exclude->move_type;	2249	move_type = exclude->move_type;
…		…
2621	* Modified to be map tile aware -.MSW	2454	* Modified to be map tile aware -.MSW
2622	*/	2455	*/
2623		2456
2624		2457
2625	int	2458	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2459	can_see_monsterP (maptile *m, int x, int y, int dir)
2627	{	2460	{
2628	sint16	2461	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2462	int
2632	mflags;	2463	mflags;
2633		2464
2634	if (dir < 0)	2465	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2466	return 0; /* exit condition: invalid direction */
…		…
2682	* create clone from object to another	2513	* create clone from object to another
2683	*/	2514	*/
2684	object *	2515	object *
2685	object_create_clone (object *asrc)	2516	object_create_clone (object *asrc)
2686	{	2517	{
2687	object *
2688	dst = NULL, *tmp, *src, *part, *prev, *item;	2518	object *dst = 0, *tmp, *src, *part, *prev, *item;
2689		2519
2690	if (!asrc)	2520	if (!asrc)
2691	return NULL;	2521	return 0;
		2522
2692	src = asrc;	2523	src = asrc;
2693	if (src->head)	2524	if (src->head)
2694	src = src->head;	2525	src = src->head;
2695		2526
2696	prev = NULL;	2527	prev = 0;
2697	for (part = src; part; part = part->more)	2528	for (part = src; part; part = part->more)
2698	{	2529	{
2699	tmp = get_object ();	2530	tmp = part->clone ();
2700	copy_object (part, tmp);
2701	tmp->x -= src->x;	2531	tmp->x -= src->x;
2702	tmp->y -= src->y;	2532	tmp->y -= src->y;
		2533
2703	if (!part->head)	2534	if (!part->head)
2704	{	2535	{
2705	dst = tmp;	2536	dst = tmp;
2706	tmp->head = NULL;	2537	tmp->head = 0;
2707	}	2538	}
2708	else	2539	else
2709	{	2540	{
2710	tmp->head = dst;	2541	tmp->head = dst;
2711	}	2542	}
		2543
2712	tmp->more = NULL;	2544	tmp->more = 0;
		2545
2713	if (prev)	2546	if (prev)
2714	prev->more = tmp;	2547	prev->more = tmp;
		2548
2715	prev = tmp;	2549	prev = tmp;
2716	}	2550	}
2717		2551
2718	/*** copy inventory ***/
2719	for (item = src->inv; item; item = item->below)	2552	for (item = src->inv; item; item = item->below)
2720	{
2721	(void) insert_ob_in_ob (object_create_clone (item), dst);	2553	insert_ob_in_ob (object_create_clone (item), dst);
2722	}
2723		2554
2724	return dst;	2555	return dst;
2725	}	2556	}
2726		2557
2727	/* return true if the object was destroyed, 0 otherwise */
2728	int
2729	was_destroyed (const object *op, tag_t old_tag)
2730	{
2731	/* checking for FLAG_FREED isn't necessary, but makes this function more
2732	* robust */
2733	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2734	}
2735
2736	/* GROS - Creates an object using a string representing its content. */	2558	/* GROS - Creates an object using a string representing its content. */
2737
2738	/* Basically, we save the content of the string to a temp file, then call */	2559	/* Basically, we save the content of the string to a temp file, then call */
2739
2740	/* load_object on it. I admit it is a highly inefficient way to make things, */	2560	/* load_object on it. I admit it is a highly inefficient way to make things, */
2741
2742	/* but it was simple to make and allows reusing the load_object function. */	2561	/* but it was simple to make and allows reusing the load_object function. */
2743
2744	/* Remember not to use load_object_str in a time-critical situation. */	2562	/* Remember not to use load_object_str in a time-critical situation. */
2745
2746	/* Also remember that multiparts objects are not supported for now. */	2563	/* Also remember that multiparts objects are not supported for now. */
2747		2564
2748	object *	2565	object *
2749	load_object_str (const char *obstr)	2566	load_object_str (const char *obstr)
2750	{	2567	{
2751	object *	2568	object *op;
2752	op;
2753	char
2754	filename[MAX_BUF];	2569	char filename[MAX_BUF];
2755		2570
2756	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2571	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2757		2572
2758	FILE *
2759	tempfile = fopen (filename, "w");	2573	FILE *tempfile = fopen (filename, "w");
2760		2574
2761	if (tempfile == NULL)	2575	if (tempfile == NULL)
2762	{	2576	{
2763	LOG (llevError, "Error - Unable to access load object temp file\n");	2577	LOG (llevError, "Error - Unable to access load object temp file\n");
2764	return NULL;	2578	return NULL;
2765	};	2579	}
		2580
2766	fprintf (tempfile, obstr);	2581	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2582	fclose (tempfile);
2768		2583
2769	op = get_object ();	2584	op = object::create ();
2770		2585
2771	object_thawer	2586	object_thawer thawer (filename);
2772	thawer (filename);
2773		2587
2774	if (thawer)	2588	if (thawer)
2775	load_object (thawer, op, 0);	2589	load_object (thawer, op, 0);
2776		2590
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2591	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2785	* returns NULL if no match.	2599	* returns NULL if no match.
2786	*/	2600	*/
2787	object *	2601	object *
2788	find_obj_by_type_subtype (const object *who, int type, int subtype)	2602	find_obj_by_type_subtype (const object *who, int type, int subtype)
2789	{	2603	{
2790	object *	2604	object *tmp;
2791	tmp;
2792		2605
2793	for (tmp = who->inv; tmp; tmp = tmp->below)	2606	for (tmp = who->inv; tmp; tmp = tmp->below)
2794	if (tmp->type == type && tmp->subtype == subtype)	2607	if (tmp->type == type && tmp->subtype == subtype)
2795	return tmp;	2608	return tmp;
2796		2609
…		…
2804	* do the desired thing.	2617	* do the desired thing.
2805	*/	2618	*/
2806	key_value *	2619	key_value *
2807	get_ob_key_link (const object *ob, const char *key)	2620	get_ob_key_link (const object *ob, const char *key)
2808	{	2621	{
2809	key_value *	2622	key_value *link;
2810	link;
2811		2623
2812	for (link = ob->key_values; link != NULL; link = link->next)	2624	for (link = ob->key_values; link != NULL; link = link->next)
2813	{
2814	if (link->key == key)	2625	if (link->key == key)
2815	{
2816	return link;	2626	return link;
2817	}
2818	}
2819		2627
2820	return NULL;	2628	return NULL;
2821	}	2629	}
2822		2630
2823	/*	2631	/*
…		…
2828	* The returned string is shared.	2636	* The returned string is shared.
2829	*/	2637	*/
2830	const char *	2638	const char *
2831	get_ob_key_value (const object *op, const char *const key)	2639	get_ob_key_value (const object *op, const char *const key)
2832	{	2640	{
2833	key_value *	2641	key_value *link;
2834	link;	2642	shstr_cmp canonical_key (key);
2835	const char *
2836	canonical_key;
2837		2643
2838	canonical_key = shstr::find (key);
2839
2840	if (canonical_key == NULL)	2644	if (!canonical_key)
2841	{	2645	{
2842	/* 1. There being a field named key on any object	2646	/* 1. There being a field named key on any object
2843	* implies there'd be a shared string to find.	2647	* implies there'd be a shared string to find.
2844	* 2. Since there isn't, no object has this field.	2648	* 2. Since there isn't, no object has this field.
2845	* 3. Therefore, *this* object doesn't have this field.	2649	* 3. Therefore, *this* object doesn't have this field.
2846	*/	2650	*/
2847	return NULL;	2651	return 0;
2848	}	2652	}
2849		2653
2850	/* This is copied from get_ob_key_link() above -	2654	/* This is copied from get_ob_key_link() above -
2851	* only 4 lines, and saves the function call overhead.	2655	* only 4 lines, and saves the function call overhead.
2852	*/	2656	*/
2853	for (link = op->key_values; link != NULL; link = link->next)	2657	for (link = op->key_values; link; link = link->next)
2854	{
2855	if (link->key == canonical_key)	2658	if (link->key == canonical_key)
2856	{
2857	return link->value;	2659	return link->value;
2858	}	2660
2859	}
2860	return NULL;	2661	return 0;
2861	}	2662	}
2862		2663
2863		2664
2864	/*	2665	/*
2865	* Updates the canonical_key in op to value.	2666	* Updates the canonical_key in op to value.
…		…
2901	if (last)	2702	if (last)
2902	last->next = field->next;	2703	last->next = field->next;
2903	else	2704	else
2904	op->key_values = field->next;	2705	op->key_values = field->next;
2905		2706
2906	delete
2907	field;	2707	delete field;
2908	}	2708	}
2909	}	2709	}
2910	return TRUE;	2710	return TRUE;
2911	}	2711	}
2912	/* IF we get here, key doesn't exist */	2712	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2747	* Returns TRUE on success.
2948	*/	2748	*/
2949	int	2749	int
2950	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2750	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2951	{	2751	{
2952	shstr
2953	key_ (key);	2752	shstr key_ (key);
2954		2753
2955	return set_ob_key_value_s (op, key_, value, add_key);	2754	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2755	}
		2756
		2757	object::depth_iterator::depth_iterator (object *container)
		2758	: iterator_base (container)
		2759	{
		2760	while (item->inv)
		2761	item = item->inv;
		2762	}
		2763
		2764	void
		2765	object::depth_iterator::next ()
		2766	{
		2767	if (item->below)
		2768	{
		2769	item = item->below;
		2770
		2771	while (item->inv)
		2772	item = item->inv;
		2773	}
		2774	else
		2775	item = item->env;
		2776	}
		2777
		2778	// return a suitable string describing an objetc in enough detail to find it
		2779	const char *
		2780	object::debug_desc (char *info) const
		2781	{
		2782	char info2[256 * 3];
		2783	char *p = info;
		2784
		2785	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2786	count,
		2787	&name,
		2788	title ? " " : "",
		2789	title ? (const char *)title : "");
		2790
		2791	if (env)
		2792	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2793
		2794	if (map)
		2795	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2796
		2797	return info;
		2798	}
		2799
		2800	const char *
		2801	object::debug_desc () const
		2802	{
		2803	static char info[256 * 3];
		2804	return debug_desc (info);
		2805	}
		2806

Diff Legend

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