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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.81 by root, Sat Dec 23 13:56:25 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	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
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	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>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
		35	#include <bitset>
		36
37	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
38		40
39	object *objects; /* Pointer to the list of used objects */
40	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 */
41		42
42	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,
43	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
44	};	45	};
…		…
51	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
52	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,
53	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
54	};	55	};
55		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
56	/* 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. */
57	static int	135	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	137	{
60	key_value *wants_field;	138	key_value *wants_field;
…		…
107	*	185	*
108	* 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
109	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
110	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
111	*	189	*
112	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
113	*	191	*
114	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
115	* check weight	193	* check weight
116	*/	194	*/
117		195
118	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
119	{	197	{
120	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
121	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)
122	return 0;	204	return 0;
123		205
124	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
125	return 0;
126
127	/* 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
128	* 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
129	* used to store nrof).	209	* used to store nrof).
130	*/	210	*/
131	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
141	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
142		222
143	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
144	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
145		225
146		226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
147	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
148	* being locked in inventory should prevent merging.
149	* 0x4 in flags3 is CLIENT_SENT
150	*/
151	if ((ob1->arch != ob2->arch) ||
152	(ob1->flags[0] != ob2->flags[0]) ||
153	(ob1->flags[1] != ob2->flags[1]) ||
154	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
155	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
156	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
157	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
158	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
159	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
160	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
161	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
162	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
163	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
164	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
165	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
166	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
167	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
168	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
169	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
170	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
171	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
172	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
173	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
174	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
175	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
176	(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)
177	return 0;	251	return 0;
178		252
179	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
180	* check all objects in the inventory.	254	* check all objects in the inventory.
181	*/	255	*/
…		…
184	/* 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 */
185	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186	return 0;	260	return 0;
187		261
188	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
189	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
190	return 0;	264	return 0;
191		265
192	/* 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
193	* if it is valid.	267	* if it is valid.
194	*/	268	*/
…		…
255	{	329	{
256	if (inv->inv)	330	if (inv->inv)
257	sum_weight (inv);	331	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	333	}
		334
260	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
262	if (op->carrying != sum)	338	if (op->carrying != sum)
263	op->carrying = sum;	339	op->carrying = sum;
		340
264	return sum;	341	return sum;
265	}	342	}
266		343
267	/**	344	/**
268	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
275	op = op->env;	352	op = op->env;
276	return op;	353	return op;
277	}	354	}
278		355
279	/*	356	/*
280	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
281	* a better check. We basically keeping traversing up until we can't
282	* or find a player.
283	*/
284
285	object *
286	is_player_inv (object *op)
287	{
288	for (; op != NULL && op->type != PLAYER; op = op->env)
289	if (op->env == op)
290	op->env = NULL;
291	return op;
292	}
293
294	/*
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	358	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
298	*/	360	*/
299		361
300	void	362	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object *tmp;*/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	363	dump_object (object *op)
356	{	364	{
357	if (op == NULL)	365	if (!op)
358	{	366	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		367
366	void	368	object_freezer freezer;
367	dump_all_objects (void)	369	save_object (freezer, op, 3);
368	{	370	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	371	}
377		372
378	/*	373	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
400	*/	395	*/
401		396
402	object *	397	object *
403	find_object (tag_t i)	398	find_object (tag_t i)
404	{	399	{
405	object *op;	400	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	401	if (op->count == i)
409	break;	402	return op;
		403
410	return op;	404	return 0;
411	}	405	}
412		406
413	/*	407	/*
414	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
417	*/	411	*/
418		412
419	object *	413	object *
420	find_object_name (const char *str)	414	find_object_name (const char *str)
421	{	415	{
422	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
423	object *op;	417	object *op;
424		418
425	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	420	if (op->name == str_)
427	break;	421	break;
428		422
429	return op;	423	return op;
430	}	424	}
431		425
…		…
434	{	428	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}	430	}
437		431
438	/*	432	/*
439	* Returns the object which this object marks as being the owner.
440	* A id-scheme is used to avoid pointing to objects which have been
441	* freed and are now reused. If this is detected, the owner is
442	* set to NULL, and NULL is returned.
443	* Changed 2004-02-12 - if the player is setting at the play again
444	* prompt, he is removed, and we don't want to treat him as an owner of
445	* anything, so check removed flag. I don't expect that this should break
446	* anything - once an object is removed, it is basically dead anyways.
447	*/
448
449	object *
450	get_owner (object *op)
451	{
452	if (op->owner == NULL)
453	return NULL;
454
455	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
456	return op->owner;
457
458	op->owner = NULL;
459	op->ownercount = 0;
460	return NULL;
461	}
462
463	void
464	clear_owner (object *op)
465	{
466	if (!op)
467	return;
468
469	if (op->owner && op->ownercount == op->owner->count)
470	op->owner->refcount--;
471
472	op->owner = NULL;
473	op->ownercount = 0;
474	}
475
476	/*
477	* Sets the owner and sets the skill and exp pointers to owner's current	433	* Sets the owner and sets the skill and exp pointers to owner's current
478	* skill and experience objects.	434	* skill and experience objects.
479	*/	435	*/
480	void	436	void
481	set_owner (object *op, object *owner)	437	object::set_owner (object *owner)
482	{	438	{
483	if (owner == NULL || op == NULL)	439	if (!owner)
484	return;	440	return;
485		441
486	/* next line added to allow objects which own objects */	442	/* next line added to allow objects which own objects */
487	/* Add a check for ownercounts in here, as I got into an endless loop	443	/* Add a check for ownercounts in here, as I got into an endless loop
488	* with the fireball owning a poison cloud which then owned the	444	* with the fireball owning a poison cloud which then owned the
489	* fireball. I believe that was caused by one of the objects getting	445	* fireball. I believe that was caused by one of the objects getting
490	* freed and then another object replacing it. Since the ownercounts	446	* freed and then another object replacing it. Since the ownercounts
491	* didn't match, this check is valid and I believe that cause is valid.	447	* didn't match, this check is valid and I believe that cause is valid.
492	*/	448	*/
493	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	449	while (owner->owner)
494	owner = owner->owner;	450	owner = owner->owner;
495		451
496	/* IF the owner still has an owner, we did not resolve to a final owner.
497	* so lets not add to that.
498	*/
499	if (owner->owner)
500	return;
501
502	op->owner = owner;	452	this->owner = owner;
503
504	op->ownercount = owner->count;
505	owner->refcount++;
506	}
507
508	/* Set the owner to clone's current owner and set the skill and experience
509	* objects to clone's objects (typically those objects that where the owner's
510	* current skill and experience objects at the time when clone's owner was
511	* set - not the owner's current skill and experience objects).
512	*
513	* Use this function if player created an object (e.g. fire bullet, swarm
514	* spell), and this object creates further objects whose kills should be
515	* accounted for the player's original skill, even if player has changed
516	* skills meanwhile.
517	*/
518	void
519	copy_owner (object *op, object *clone)
520	{
521	object *owner = get_owner (clone);
522
523	if (owner == NULL)
524	{
525	/* players don't have owners - they own themselves. Update
526	* as appropriate.
527	*/
528	if (clone->type == PLAYER)
529	owner = clone;
530	else
531	return;
532	}
533
534	set_owner (op, owner);
535	}	453	}
536		454
537	/* Zero the key_values on op, decrementing the shared-string	455	/* Zero the key_values on op, decrementing the shared-string
538	* refcounts and freeing the links.	456	* refcounts and freeing the links.
539	*/	457	*/
…		…
549	}	467	}
550		468
551	op->key_values = 0;	469	op->key_values = 0;
552	}	470	}
553		471
554	void object::clear ()
555	{
556	attachable_base::clear ();
557
558	free_key_values (this);
559
560	clear_owner (this);
561
562	name = 0;
563	name_pl = 0;
564	title = 0;
565	race = 0;
566	slaying = 0;
567	skill = 0;
568	msg = 0;
569	lore = 0;
570	custom_name = 0;
571	materialname = 0;
572
573	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));
574
575	SET_FLAG (this, FLAG_REMOVED);
576	}
577
578	void object::clone (object *destination)
579	{
580	*(object_copy *) destination = *this;
581	*(object_pod *) destination = *this;
582
583	if (self || cb)
584	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
585	}
586
587	/*	472	/*
588	* clear_object() frees everything allocated by an object, and also
589	* clears all variables and flags to default settings.
590	*/
591
592	void
593	clear_object (object *op)
594	{
595	op->clear ();
596
597	op->contr = NULL;
598	op->below = NULL;
599	op->above = NULL;
600	op->inv = NULL;
601	op->container = NULL;
602	op->env = NULL;
603	op->more = NULL;
604	op->head = NULL;
605	op->map = NULL;
606	op->refcount = 0;
607	op->active_next = NULL;
608	op->active_prev = NULL;
609	/* What is not cleared is next, prev, and count */
610
611	op->expmul = 1.0;
612	op->face = blank_face;
613	op->attacked_by_count = -1;
614
615	if (settings.casting_time)
616	op->casting_time = -1;
617	}
618
619	/*
620	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
621	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
622	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
623	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
624	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
625	* will point at garbage.	478	* will point at garbage.
626	*/	479	*/
627
628	void	480	void
629	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
630	{	482	{
631	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
632	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
633		485
634	op2->clone (op);	486	*(object_copy *)dst = *this;
		487
		488	if (self || cb)
		489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
635		490
636	if (is_freed)	491	if (is_freed)
637	SET_FLAG (op, FLAG_FREED);	492	SET_FLAG (dst, FLAG_FREED);
		493
638	if (is_removed)	494	if (is_removed)
639	SET_FLAG (op, FLAG_REMOVED);	495	SET_FLAG (dst, FLAG_REMOVED);
640		496
641	if (op2->speed < 0)	497	if (speed < 0)
642	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
643		499
644	/* Copy over key_values, if any. */	500	/* Copy over key_values, if any. */
645	if (op2->key_values)	501	if (key_values)
646	{	502	{
647	key_value *tail = 0;	503	key_value *tail = 0;
648	key_value *i;	504	key_value *i;
649		505
650	op->key_values = 0;	506	dst->key_values = 0;
651		507
652	for (i = op2->key_values; i; i = i->next)	508	for (i = key_values; i; i = i->next)
653	{	509	{
654	key_value *new_link = new key_value;	510	key_value *new_link = new key_value;
655		511
656	new_link->next = 0;	512	new_link->next = 0;
657	new_link->key = i->key;	513	new_link->key = i->key;
658	new_link->value = i->value;	514	new_link->value = i->value;
659		515
660	/* Try and be clever here, too. */	516	/* Try and be clever here, too. */
661	if (!op->key_values)	517	if (!dst->key_values)
662	{	518	{
663	op->key_values = new_link;	519	dst->key_values = new_link;
664	tail = new_link;	520	tail = new_link;
665	}	521	}
666	else	522	else
667	{	523	{
668	tail->next = new_link;	524	tail->next = new_link;
669	tail = new_link;	525	tail = new_link;
670	}	526	}
671	}	527	}
672	}	528	}
673		529
674	update_ob_speed (op);	530	update_ob_speed (dst);
		531	}
		532
		533	object *
		534	object::clone ()
		535	{
		536	object *neu = create ();
		537	copy_to (neu);
		538	return neu;
675	}	539	}
676		540
677	/*	541	/*
678	* If an object with the IS_TURNABLE() flag needs to be turned due	542	* If an object with the IS_TURNABLE() flag needs to be turned due
679	* to the closest player being on the other side, this function can	543	* to the closest player being on the other side, this function can
…		…
692	/*	556	/*
693	* Updates the speed of an object. If the speed changes from 0 to another	557	* Updates the speed of an object. If the speed changes from 0 to another
694	* value, or vice versa, then add/remove the object from the active list.	558	* value, or vice versa, then add/remove the object from the active list.
695	* This function needs to be called whenever the speed of an object changes.	559	* This function needs to be called whenever the speed of an object changes.
696	*/	560	*/
697
698	void	561	void
699	update_ob_speed (object *op)	562	update_ob_speed (object *op)
700	{	563	{
701	extern int arch_init;	564	extern int arch_init;
702		565
…		…
711	abort ();	574	abort ();
712	#else	575	#else
713	op->speed = 0;	576	op->speed = 0;
714	#endif	577	#endif
715	}	578	}
		579
716	if (arch_init)	580	if (arch_init)
717	{
718	return;	581	return;
719	}	582
720	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	583	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721	{	584	{
722	/* If already on active list, don't do anything */	585	/* If already on active list, don't do anything */
723	if (op->active_next || op->active_prev || op == active_objects)	586	if (op->active_next || op->active_prev || op == active_objects)
724	return;	587	return;
725		588
726	/* process_events() expects us to insert the object at the beginning	589	/* process_events() expects us to insert the object at the beginning
727	* of the list. */	590	* of the list. */
728	op->active_next = active_objects;	591	op->active_next = active_objects;
		592
729	if (op->active_next != NULL)	593	if (op->active_next != NULL)
730	op->active_next->active_prev = op;	594	op->active_next->active_prev = op;
		595
731	active_objects = op;	596	active_objects = op;
732	}	597	}
733	else	598	else
734	{	599	{
735	/* If not on the active list, nothing needs to be done */	600	/* If not on the active list, nothing needs to be done */
…		…
737	return;	602	return;
738		603
739	if (op->active_prev == NULL)	604	if (op->active_prev == NULL)
740	{	605	{
741	active_objects = op->active_next;	606	active_objects = op->active_next;
		607
742	if (op->active_next != NULL)	608	if (op->active_next != NULL)
743	op->active_next->active_prev = NULL;	609	op->active_next->active_prev = NULL;
744	}	610	}
745	else	611	else
746	{	612	{
747	op->active_prev->active_next = op->active_next;	613	op->active_prev->active_next = op->active_next;
		614
748	if (op->active_next)	615	if (op->active_next)
749	op->active_next->active_prev = op->active_prev;	616	op->active_next->active_prev = op->active_prev;
750	}	617	}
		618
751	op->active_next = NULL;	619	op->active_next = NULL;
752	op->active_prev = NULL;	620	op->active_prev = NULL;
753	}	621	}
754	}	622	}
755		623
…		…
783	op->active_next = NULL;	651	op->active_next = NULL;
784	op->active_prev = NULL;	652	op->active_prev = NULL;
785	}	653	}
786		654
787	/*	655	/*
788	* update_object() updates the array which represents the map.	656	* update_object() updates the the map.
789	* It takes into account invisible objects (and represent squares covered	657	* It takes into account invisible objects (and represent squares covered
790	* by invisible objects by whatever is below them (unless it's another	658	* by invisible objects by whatever is below them (unless it's another
791	* invisible object, etc...)	659	* invisible object, etc...)
792	* If the object being updated is beneath a player, the look-window	660	* If the object being updated is beneath a player, the look-window
793	* of that player is updated (this might be a suboptimal way of	661	* of that player is updated (this might be a suboptimal way of
794	* updating that window, though, since update_object() is called _often_)	662	* updating that window, though, since update_object() is called _often_)
795	*	663	*
796	* action is a hint of what the caller believes need to be done.	664	* action is a hint of what the caller believes need to be done.
797	* For example, if the only thing that has changed is the face (due to
798	* an animation), we don't need to call update_position until that actually
799	* comes into view of a player. OTOH, many other things, like addition/removal
800	* of walls or living creatures may need us to update the flags now.
801	* current action are:	665	* current action are:
802	* UP_OBJ_INSERT: op was inserted	666	* UP_OBJ_INSERT: op was inserted
803	* UP_OBJ_REMOVE: op was removed	667	* UP_OBJ_REMOVE: op was removed
804	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	668	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
805	* as that is easier than trying to look at what may have changed.	669	* as that is easier than trying to look at what may have changed.
806	* UP_OBJ_FACE: only the objects face has changed.	670	* UP_OBJ_FACE: only the objects face has changed.
807	*/	671	*/
808
809	void	672	void
810	update_object (object *op, int action)	673	update_object (object *op, int action)
811	{	674	{
812	int update_now = 0, flags;
813	MoveType move_on, move_off, move_block, move_slow;	675	MoveType move_on, move_off, move_block, move_slow;
814		676
815	if (op == NULL)	677	if (op == NULL)
816	{	678	{
817	/* this should never happen */	679	/* this should never happen */
818	LOG (llevDebug, "update_object() called for NULL object.\n");	680	LOG (llevDebug, "update_object() called for NULL object.\n");
819	return;	681	return;
820	}	682	}
821		683
822	if (op->env != NULL)	684	if (op->env)
823	{	685	{
824	/* Animation is currently handled by client, so nothing	686	/* Animation is currently handled by client, so nothing
825	* to do in this case.	687	* to do in this case.
826	*/	688	*/
827	return;	689	return;
…		…
841	abort ();	703	abort ();
842	#endif	704	#endif
843	return;	705	return;
844	}	706	}
845		707
846	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	708	mapspace &m = op->ms ();
847	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
848	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
849	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
850	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
851	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
852		709
		710	if (m.flags_ & P_NEED_UPDATE)
		711	/* nop */;
853	if (action == UP_OBJ_INSERT)	712	else if (action == UP_OBJ_INSERT)
854	{	713	{
		714	// this is likely overkill, TODO: revisit (schmorp)
855	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
856	update_now = 1;
857
858	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	716	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
859	update_now = 1;	717	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
860		718	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		719	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
861	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	720	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
862	update_now = 1;
863
864	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
865	update_now = 1;
866
867	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
868	update_now = 1;
869
870	if ((move_on | op->move_on) != move_on)	721	|| (m.move_on | op->move_on ) != m.move_on
871	update_now = 1;
872
873	if ((move_off | op->move_off) != move_off)	722	|| (m.move_off | op->move_off ) != m.move_off
874	update_now = 1;	723	|| (m.move_slow | op->move_slow) != m.move_slow
875
876	/* This isn't perfect, but I don't expect a lot of objects to	724	/* This isn't perfect, but I don't expect a lot of objects to
877	* to have move_allow right now.	725	* to have move_allow right now.
878	*/	726	*/
879	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
880	update_now = 1;	728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
881		729	m.flags_ = P_NEED_UPDATE;
882	if ((move_slow | op->move_slow) != move_slow)
883	update_now = 1;
884	}	730	}
885	/* if the object is being removed, we can't make intelligent	731	/* if the object is being removed, we can't make intelligent
886	* decisions, because remove_ob can't really pass the object	732	* decisions, because remove_ob can't really pass the object
887	* that is being removed.	733	* that is being removed.
888	*/	734	*/
889	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
890	update_now = 1;	736	m.flags_ = P_NEED_UPDATE;
891	else if (action == UP_OBJ_FACE)	737	else if (action == UP_OBJ_FACE)
892	/* Nothing to do for that case */ ;	738	/* Nothing to do for that case */ ;
893	else	739	else
894	LOG (llevError, "update_object called with invalid action: %d\n", action);	740	LOG (llevError, "update_object called with invalid action: %d\n", action);
895		741
896	if (update_now)
897	{
898	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
899	update_position (op->map, op->x, op->y);
900	}
901
902	if (op->more != NULL)	742	if (op->more)
903	update_object (op->more, action);	743	update_object (op->more, action);
904	}	744	}
905		745
906	static unordered_vector < object *>mortals;	746	object::vector object::mortals;
907	static	747	object::vector object::objects; // not yet used
908	std::vector < object *>	748	object *object::first;
909	freed;
910		749
911	void object::free_mortals ()	750	void object::free_mortals ()
912	{	751	{
913	for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)	752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914	if (!(*i)->refcount)	753	if ((*i)->refcnt)
		754	++i; // further delay freeing
		755	else
915	{	756	{
916	freed.push_back (*i);	757	delete *i;
917	mortals.erase (i);	758	mortals.erase (i);
918	}	759	}
919	else
920	++i;
921	}	760	}
922		761
923	object::object ()	762	object::object ()
924	{	763	{
925	SET_FLAG (this, FLAG_REMOVED);	764	SET_FLAG (this, FLAG_REMOVED);
926		765
927	expmul = 1.0;	766	expmul = 1.0;
928	face = blank_face;	767	face = blank_face;
929	attacked_by_count = -1;
930	}	768	}
931		769
932	object::~object ()	770	object::~object ()
933	{	771	{
934	free_key_values (this);	772	free_key_values (this);
935	}	773	}
936		774
937	void object::link ()	775	void object::link ()
938	{	776	{
939	count = ++ob_count;	777	count = ++ob_count;
		778	uuid = gen_uuid ();
940		779
941	prev = 0;	780	prev = 0;
942	next = objects;	781	next = object::first;
943		782
944	if (objects)	783	if (object::first)
945	objects->prev = this;	784	object::first->prev = this;
946		785
947	objects = this;	786	object::first = this;
948	}	787	}
949		788
950	void object::unlink ()	789	void object::unlink ()
951	{	790	{
952	count = 0;	791	if (this == object::first)
		792	object::first = next;
953		793
954	/* Remove this object from the list of used objects */	794	/* Remove this object from the list of used objects */
955	if (prev)
956	{
957	prev->next = next;	795	if (prev) prev->next = next;
		796	if (next) next->prev = prev;
		797
958	prev = 0;	798	prev = 0;
959	}
960
961	if (next)
962	{
963	next->prev = prev;
964	next = 0;	799	next = 0;
965	}
966
967	if (this == objects)
968	objects = next;
969	}	800	}
970		801
971	object *object::create ()	802	object *object::create ()
972	{	803	{
973	object *
974	op;
975
976	if (freed.empty ())
977	op = new object;	804	object *op = new object;
978
979	else
980	{
981	// highly annoying, but the only way to get it stable right now
982	op = freed.back ();
983	freed.pop_back ();
984	op->~object ();
985	new ((void *) op) object;
986	}
987
988	op->link ();	805	op->link ();
989	return op;	806	return op;
990	}	807	}
991		808
992	/*	809	/*
…		…
994	* it from the list of used objects, and puts it on the list of	811	* it from the list of used objects, and puts it on the list of
995	* free objects. The IS_FREED() flag is set in the object.	812	* free objects. The IS_FREED() flag is set in the object.
996	* The object must have been removed by remove_ob() first for	813	* The object must have been removed by remove_ob() first for
997	* this function to succeed.	814	* this function to succeed.
998	*	815	*
999	* If free_inventory is set, free inventory as well. Else drop items in	816	* If destroy_inventory is set, free inventory as well. Else drop items in
1000	* inventory to the ground.	817	* inventory to the ground.
1001	*/	818	*/
1002	void object::free (bool free_inventory)	819	void object::destroy (bool destroy_inventory)
1003	{	820	{
1004	if (QUERY_FLAG (this, FLAG_FREED))	821	if (QUERY_FLAG (this, FLAG_FREED))
1005	return;	822	return;
1006		823
1007	if (!QUERY_FLAG (this, FLAG_REMOVED))
1008	remove_ob (this);
1009
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))	824	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);	825	remove_friendly_object (this);
1012		826
		827	if (!QUERY_FLAG (this, FLAG_REMOVED))
		828	remove ();
		829
1013	SET_FLAG (this, FLAG_FREED);	830	SET_FLAG (this, FLAG_FREED);
1014		831
1015	if (more)	832	if (more)
1016	{	833	{
1017	more->free (free_inventory);	834	more->destroy (destroy_inventory);
1018	more = 0;	835	more = 0;
1019	}	836	}
1020		837
1021	if (inv)	838	if (inv)
1022	{	839	{
1023	/* Only if the space blocks everything do we not process -	840	/* Only if the space blocks everything do we not process -
1024	* if some form of movement is allowed, let objects	841	* if some form of movement is allowed, let objects
1025	* drop on that space.	842	* drop on that space.
1026	*/	843	*/
1027	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1028	{	845	{
1029	object *op = inv;	846	object *op = inv;
1030		847
1031	while (op)	848	while (op)
1032	{	849	{
1033	object *tmp = op->below;	850	object *tmp = op->below;
1034	op->free (free_inventory);	851	op->destroy (destroy_inventory);
1035	op = tmp;	852	op = tmp;
1036	}	853	}
1037	}	854	}
1038	else	855	else
1039	{ /* Put objects in inventory onto this space */	856	{ /* Put objects in inventory onto this space */
…		…
1041		858
1042	while (op)	859	while (op)
1043	{	860	{
1044	object *tmp = op->below;	861	object *tmp = op->below;
1045		862
1046	remove_ob (op);	863	op->remove ();
1047		864
1048	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1049	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1050	free_object (op);	867	op->destroy ();
1051	else	868	else
1052	{	869	{
1053	op->x = x;	870	op->x = x;
1054	op->y = y;	871	op->y = y;
1055	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1058	op = tmp;	875	op = tmp;
1059	}	876	}
1060	}	877	}
1061	}	878	}
1062		879
1063	clear_owner (this);	880	// hack to ensure that freed objects still have a valid map
		881	{
		882	static maptile *freed_map; // freed objects are moved here to avoid crashes
		883
		884	if (!freed_map)
		885	{
		886	freed_map = new maptile;
		887
		888	freed_map->name = "/internal/freed_objects_map";
		889	freed_map->width = 3;
		890	freed_map->height = 3;
		891
		892	freed_map->allocate ();
		893	}
		894
		895	map = freed_map;
		896	x = 1;
		897	y = 1;
		898	}
		899
		900	// clear those pointers that likely might have circular references to us
		901	owner = 0;
		902	enemy = 0;
		903	attacked_by = 0;
		904
		905	// only relevant for players(?), but make sure of it anyways
		906	contr = 0;
1064		907
1065	/* Remove object from the active list */	908	/* Remove object from the active list */
1066	speed = 0;	909	speed = 0;
1067	update_ob_speed (this);	910	update_ob_speed (this);
1068		911
…		…
1073		916
1074	/*	917	/*
1075	* sub_weight() recursively (outwards) subtracts a number from the	918	* sub_weight() recursively (outwards) subtracts a number from the
1076	* weight of an object (and what is carried by it's environment(s)).	919	* weight of an object (and what is carried by it's environment(s)).
1077	*/	920	*/
1078
1079	void	921	void
1080	sub_weight (object *op, signed long weight)	922	sub_weight (object *op, signed long weight)
1081	{	923	{
1082	while (op != NULL)	924	while (op != NULL)
1083	{	925	{
1084	if (op->type == CONTAINER)	926	if (op->type == CONTAINER)
1085	{
1086	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	927	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087	}	928
1088	op->carrying -= weight;	929	op->carrying -= weight;
1089	op = op->env;	930	op = op->env;
1090	}	931	}
1091	}	932	}
1092		933
1093	/* remove_ob(op):	934	/* op->remove ():
1094	* This function removes the object op from the linked list of objects	935	* This function removes the object op from the linked list of objects
1095	* which it is currently tied to. When this function is done, the	936	* which it is currently tied to. When this function is done, the
1096	* object will have no environment. If the object previously had an	937	* object will have no environment. If the object previously had an
1097	* environment, the x and y coordinates will be updated to	938	* environment, the x and y coordinates will be updated to
1098	* the previous environment.	939	* the previous environment.
1099	* Beware: This function is called from the editor as well!	940	* Beware: This function is called from the editor as well!
1100	*/	941	*/
1101
1102	void	942	void
1103	remove_ob (object *op)	943	object::remove ()
1104	{	944	{
		945	object *tmp, *last = 0;
1105	object *	946	object *otmp;
1106	tmp, *
1107	last = NULL;
1108	object *
1109	otmp;
1110		947
1111	tag_t
1112	tag;
1113	int
1114	check_walk_off;	948	int check_walk_off;
1115	mapstruct *
1116	m;
1117		949
1118	sint16
1119	x,
1120	y;
1121
1122	if (QUERY_FLAG (op, FLAG_REMOVED))	950	if (QUERY_FLAG (this, FLAG_REMOVED))
1123	return;	951	return;
1124		952
1125	SET_FLAG (op, FLAG_REMOVED);	953	SET_FLAG (this, FLAG_REMOVED);
1126		954
1127	if (op->more != NULL)	955	if (more)
1128	remove_ob (op->more);	956	more->remove ();
1129		957
1130	/*	958	/*
1131	* In this case, the object to be removed is in someones	959	* In this case, the object to be removed is in someones
1132	* inventory.	960	* inventory.
1133	*/	961	*/
1134	if (op->env != NULL)	962	if (env)
1135	{	963	{
1136	if (op->nrof)	964	if (nrof)
1137	sub_weight (op->env, op->weight * op->nrof);	965	sub_weight (env, weight * nrof);
1138	else	966	else
1139	sub_weight (op->env, op->weight + op->carrying);	967	sub_weight (env, weight + carrying);
1140		968
1141	/* NO_FIX_PLAYER is set when a great many changes are being	969	/* NO_FIX_PLAYER is set when a great many changes are being
1142	* made to players inventory. If set, avoiding the call	970	* made to players inventory. If set, avoiding the call
1143	* to save cpu time.	971	* to save cpu time.
1144	*/	972	*/
1145	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1146	fix_player (otmp);	974	otmp->update_stats ();
1147		975
1148	if (op->above != NULL)	976	if (above != NULL)
1149	op->above->below = op->below;	977	above->below = below;
1150	else	978	else
1151	op->env->inv = op->below;	979	env->inv = below;
1152		980
1153	if (op->below != NULL)	981	if (below != NULL)
1154	op->below->above = op->above;	982	below->above = above;
1155		983
1156	/* we set up values so that it could be inserted into	984	/* we set up values so that it could be inserted into
1157	* the map, but we don't actually do that - it is up	985	* the map, but we don't actually do that - it is up
1158	* to the caller to decide what we want to do.	986	* to the caller to decide what we want to do.
1159	*/	987	*/
1160	op->x = op->env->x, op->y = op->env->y;	988	x = env->x, y = env->y;
1161	op->map = op->env->map;	989	map = env->map;
1162	op->above = NULL, op->below = NULL;	990	above = 0, below = 0;
1163	op->env = NULL;	991	env = 0;
1164	}	992	}
1165	else if (op->map)	993	else if (map)
1166	{	994	{
1167	x = op->x;
1168	y = op->y;
1169	m = get_map_from_coord (op->map, &x, &y);
1170
1171	if (!m)
1172	{
1173	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1174	op->map->path, op->x, op->y);
1175	/* in old days, we used to set x and y to 0 and continue.
1176	* it seems if we get into this case, something is probablye
1177	* screwed up and should be fixed.
1178	*/
1179	abort ();
1180	}
1181
1182	if (op->map != m)
1183	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1184	op->map->path, m->path, op->x, op->y, x, y);
1185
1186	/* Re did the following section of code - it looks like it had	995	/* Re did the following section of code - it looks like it had
1187	* lots of logic for things we no longer care about	996	* lots of logic for things we no longer care about
1188	*/	997	*/
1189		998
1190	/* link the object above us */	999	/* link the object above us */
1191	if (op->above)	1000	if (above)
1192	op->above->below = op->below;	1001	above->below = below;
1193	else	1002	else
1194	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1003	map->at (x, y).top = below; /* we were top, set new top */
1195		1004
1196	/* Relink the object below us, if there is one */	1005	/* Relink the object below us, if there is one */
1197	if (op->below)	1006	if (below)
1198	op->below->above = op->above;	1007	below->above = above;
1199	else	1008	else
1200	{	1009	{
1201	/* Nothing below, which means we need to relink map object for this space	1010	/* Nothing below, which means we need to relink map object for this space
1202	* use translated coordinates in case some oddness with map tiling is	1011	* use translated coordinates in case some oddness with map tiling is
1203	* evident	1012	* evident
1204	*/	1013	*/
1205	if (GET_MAP_OB (m, x, y) != op)	1014	if (GET_MAP_OB (map, x, y) != this)
1206	{	1015	{
1207	dump_object (op);	1016	char *dump = dump_object (this);
1208	LOG (llevError,	1017	LOG (llevError,
1209	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1018	"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);
		1019	free (dump);
1210	dump_object (GET_MAP_OB (m, x, y));	1020	dump = dump_object (GET_MAP_OB (map, x, y));
1211	LOG (llevError, "%s\n", errmsg);	1021	LOG (llevError, "%s\n", dump);
		1022	free (dump);
1212	}	1023	}
1213		1024
1214	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1025	map->at (x, y).bottom = above; /* goes on above it. */
1215	}	1026	}
1216		1027
1217	op->above = 0;	1028	above = 0;
1218	op->below = 0;	1029	below = 0;
1219		1030
1220	if (op->map->in_memory == MAP_SAVING)	1031	if (map->in_memory == MAP_SAVING)
1221	return;	1032	return;
1222		1033
1223	tag = op->count;
1224	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1225		1035
1226	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1227	{	1037	{
1228	/* No point updating the players look faces if he is the object	1038	/* No point updating the players look faces if he is the object
1229	* being removed.	1039	* being removed.
1230	*/	1040	*/
1231		1041
1232	if (tmp->type == PLAYER && tmp != op)	1042	if (tmp->type == PLAYER && tmp != this)
1233	{	1043	{
1234	/* If a container that the player is currently using somehow gets	1044	/* If a container that the player is currently using somehow gets
1235	* removed (most likely destroyed), update the player view	1045	* removed (most likely destroyed), update the player view
1236	* appropriately.	1046	* appropriately.
1237	*/	1047	*/
1238	if (tmp->container == op)	1048	if (tmp->container == this)
1239	{	1049	{
1240	CLEAR_FLAG (op, FLAG_APPLIED);	1050	CLEAR_FLAG (this, FLAG_APPLIED);
1241	tmp->container = NULL;	1051	tmp->container = 0;
1242	}	1052	}
1243		1053
1244	tmp->contr->socket.update_look = 1;	1054	tmp->contr->ns->floorbox_update ();
1245	}	1055	}
1246		1056
1247	/* See if player moving off should effect something */	1057	/* See if player moving off should effect something */
1248	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1058	if (check_walk_off
		1059	&& ((move_type & tmp->move_off)
		1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249	{	1061	{
1250	move_apply (tmp, op, NULL);	1062	move_apply (tmp, this, 0);
1251		1063
1252	if (was_destroyed (op, tag))	1064	if (destroyed ())
1253	{
1254	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1255	}
1256	}	1066	}
1257		1067
1258	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259		1069
1260	if (tmp->above == tmp)	1070	if (tmp->above == tmp)
1261	tmp->above = NULL;	1071	tmp->above = 0;
1262		1072
1263	last = tmp;	1073	last = tmp;
1264	}	1074	}
1265		1075
1266	/* last == NULL of there are no objects on this space */	1076	/* last == NULL of there are no objects on this space */
1267	if (last == NULL)	1077	if (!last)
1268	{	1078	map->at (x, y).flags_ = P_NEED_UPDATE;
1269	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1270	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1271	* those out anyways, and if there are any flags set right now, they won't
1272	* be correct anyways.
1273	*/
1274	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1275	update_position (op->map, op->x, op->y);
1276	}
1277	else	1079	else
1278	update_object (last, UP_OBJ_REMOVE);	1080	update_object (last, UP_OBJ_REMOVE);
1279		1081
1280	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1281	update_all_los (op->map, op->x, op->y);	1083	update_all_los (map, x, y);
1282	}	1084	}
1283	}	1085	}
1284		1086
1285	/*	1087	/*
1286	* merge_ob(op,top):	1088	* merge_ob(op,top):
…		…
1288	* This function goes through all objects below and including top, and	1090	* This function goes through all objects below and including top, and
1289	* merges op to the first matching object.	1091	* merges op to the first matching object.
1290	* If top is NULL, it is calculated.	1092	* If top is NULL, it is calculated.
1291	* Returns pointer to object if it succeded in the merge, otherwise NULL	1093	* Returns pointer to object if it succeded in the merge, otherwise NULL
1292	*/	1094	*/
1293
1294	object *	1095	object *
1295	merge_ob (object *op, object *top)	1096	merge_ob (object *op, object *top)
1296	{	1097	{
1297	if (!op->nrof)	1098	if (!op->nrof)
1298	return 0;	1099	return 0;
…		…
1302		1103
1303	for (; top != NULL; top = top->below)	1104	for (; top != NULL; top = top->below)
1304	{	1105	{
1305	if (top == op)	1106	if (top == op)
1306	continue;	1107	continue;
1307	if (CAN_MERGE (op, top))	1108
		1109	if (object::can_merge (op, top))
1308	{	1110	{
1309	top->nrof += op->nrof;	1111	top->nrof += op->nrof;
1310		1112
1311	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1113	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1312	op->weight = 0; /* Don't want any adjustements now */	1114	op->weight = 0; /* Don't want any adjustements now */
1313	remove_ob (op);	1115	op->destroy ();
1314	free_object (op);
1315	return top;	1116	return top;
1316	}	1117	}
1317	}	1118	}
1318		1119
1319	return NULL;	1120	return 0;
1320	}	1121	}
1321		1122
1322	/*	1123	/*
1323	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1324	* job preparing multi-part monsters	1125	* job preparing multi-part monsters
1325	*/	1126	*/
1326	object *	1127	object *
1327	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1328	{	1129	{
1329	object *tmp;	1130	object *tmp;
1330		1131
1331	if (op->head)	1132	if (op->head)
1332	op = op->head;	1133	op = op->head;
…		…
1360	* NULL if 'op' was destroyed	1161	* NULL if 'op' was destroyed
1361	* just 'op' otherwise	1162	* just 'op' otherwise
1362	*/	1163	*/
1363		1164
1364	object *	1165	object *
1365	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366	{	1167	{
1367	object *tmp, *top, *floor = NULL;	1168	object *tmp, *top, *floor = NULL;
1368	sint16 x, y;	1169	sint16 x, y;
1369		1170
1370	if (QUERY_FLAG (op, FLAG_FREED))	1171	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1373	return NULL;	1174	return NULL;
1374	}	1175	}
1375		1176
1376	if (m == NULL)	1177	if (m == NULL)
1377	{	1178	{
1378	dump_object (op);	1179	char *dump = dump_object (op);
1379	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1181	free (dump);
1380	return op;	1182	return op;
1381	}	1183	}
1382		1184
1383	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1384	{	1186	{
1385	dump_object (op);	1187	char *dump = dump_object (op);
1386	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1387	#ifdef MANY_CORES	1189	#ifdef MANY_CORES
1388	/* Better to catch this here, as otherwise the next use of this object	1190	/* Better to catch this here, as otherwise the next use of this object
1389	* is likely to cause a crash. Better to find out where it is getting	1191	* is likely to cause a crash. Better to find out where it is getting
1390	* improperly inserted.	1192	* improperly inserted.
1391	*/	1193	*/
1392	abort ();	1194	abort ();
1393	#endif	1195	#endif
		1196	free (dump);
1394	return op;	1197	return op;
1395	}	1198	}
1396		1199
1397	if (!QUERY_FLAG (op, FLAG_REMOVED))	1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1398	{	1201	{
1399	dump_object (op);	1202	char *dump = dump_object (op);
1400	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1204	free (dump);
1401	return op;	1205	return op;
1402	}	1206	}
1403		1207
1404	if (op->more != NULL)	1208	if (op->more != NULL)
1405	{	1209	{
…		…
1443		1247
1444	/* this has to be done after we translate the coordinates.	1248	/* this has to be done after we translate the coordinates.
1445	*/	1249	*/
1446	if (op->nrof && !(flag & INS_NO_MERGE))	1250	if (op->nrof && !(flag & INS_NO_MERGE))
1447	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1448	if (CAN_MERGE (op, tmp))	1252	if (object::can_merge (op, tmp))
1449	{	1253	{
1450	op->nrof += tmp->nrof;	1254	op->nrof += tmp->nrof;
1451	remove_ob (tmp);	1255	tmp->destroy ();
1452	free_object (tmp);
1453	}	1256	}
1454		1257
1455	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1258	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1456	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1259	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1457		1260
…		…
1470	op->below = originator->below;	1273	op->below = originator->below;
1471		1274
1472	if (op->below)	1275	if (op->below)
1473	op->below->above = op;	1276	op->below->above = op;
1474	else	1277	else
1475	SET_MAP_OB (op->map, op->x, op->y, op);	1278	op->ms ().bottom = op;
1476		1279
1477	/* since *below* originator, no need to update top */	1280	/* since *below* originator, no need to update top */
1478	originator->below = op;	1281	originator->below = op;
1479	}	1282	}
1480	else	1283	else
…		…
1526	* If INS_ON_TOP is used, don't do this processing	1329	* If INS_ON_TOP is used, don't do this processing
1527	* Need to find the object that in fact blocks view, otherwise	1330	* Need to find the object that in fact blocks view, otherwise
1528	* stacking is a bit odd.	1331	* stacking is a bit odd.
1529	*/	1332	*/
1530	if (!(flag & INS_ON_TOP) &&	1333	if (!(flag & INS_ON_TOP) &&
1531	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1532	{	1335	{
1533	for (last = top; last != floor; last = last->below)	1336	for (last = top; last != floor; last = last->below)
1534	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1535	break;	1338	break;
1536	/* Check to see if we found the object that blocks view,	1339	/* Check to see if we found the object that blocks view,
…		…
1559		1362
1560	if (op->above)	1363	if (op->above)
1561	op->above->below = op;	1364	op->above->below = op;
1562		1365
1563	op->below = NULL;	1366	op->below = NULL;
1564	SET_MAP_OB (op->map, op->x, op->y, op);	1367	op->ms ().bottom = op;
1565	}	1368	}
1566	else	1369	else
1567	{ /* get inserted into the stack above top */	1370	{ /* get inserted into the stack above top */
1568	op->above = top->above;	1371	op->above = top->above;
1569		1372
…		…
1573	op->below = top;	1376	op->below = top;
1574	top->above = op;	1377	top->above = op;
1575	}	1378	}
1576		1379
1577	if (op->above == NULL)	1380	if (op->above == NULL)
1578	SET_MAP_TOP (op->map, op->x, op->y, op);	1381	op->ms ().top = op;
1579	} /* else not INS_BELOW_ORIGINATOR */	1382	} /* else not INS_BELOW_ORIGINATOR */
1580		1383
1581	if (op->type == PLAYER)	1384	if (op->type == PLAYER)
1582	op->contr->do_los = 1;	1385	op->contr->do_los = 1;
1583		1386
1584	/* If we have a floor, we know the player, if any, will be above	1387	/* If we have a floor, we know the player, if any, will be above
1585	* it, so save a few ticks and start from there.	1388	* it, so save a few ticks and start from there.
1586	*/	1389	*/
1587	if (!(flag & INS_MAP_LOAD))	1390	if (!(flag & INS_MAP_LOAD))
1588	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1391	if (object *pl = op->ms ().player ())
1589	if (tmp->type == PLAYER)	1392	pl->contr->ns->floorbox_update ();
1590	tmp->contr->socket.update_look = 1;
1591		1393
1592	/* If this object glows, it may affect lighting conditions that are	1394	/* If this object glows, it may affect lighting conditions that are
1593	* visible to others on this map. But update_all_los is really	1395	* visible to others on this map. But update_all_los is really
1594	* an inefficient way to do this, as it means los for all players	1396	* an inefficient way to do this, as it means los for all players
1595	* on the map will get recalculated. The players could very well	1397	* on the map will get recalculated. The players could very well
…		…
1603		1405
1604	/* updates flags (blocked, alive, no magic, etc) for this map space */	1406	/* updates flags (blocked, alive, no magic, etc) for this map space */
1605	update_object (op, UP_OBJ_INSERT);	1407	update_object (op, UP_OBJ_INSERT);
1606		1408
1607	/* Don't know if moving this to the end will break anything. However,	1409	/* Don't know if moving this to the end will break anything. However,
1608	* we want to have update_look set above before calling this.	1410	* we want to have floorbox_update called before calling this.
1609	*	1411	*
1610	* check_move_on() must be after this because code called from	1412	* check_move_on() must be after this because code called from
1611	* check_move_on() depends on correct map flags (so functions like	1413	* check_move_on() depends on correct map flags (so functions like
1612	* blocked() and wall() work properly), and these flags are updated by	1414	* blocked() and wall() work properly), and these flags are updated by
1613	* update_object().	1415	* update_object().
…		…
1629		1431
1630	return op;	1432	return op;
1631	}	1433	}
1632		1434
1633	/* this function inserts an object in the map, but if it	1435	/* this function inserts an object in the map, but if it
1634	* finds an object of its own type, it'll remove that one first.	1436	* finds an object of its own type, it'll remove that one first.
1635	* op is the object to insert it under: supplies x and the map.	1437	* op is the object to insert it under: supplies x and the map.
1636	*/	1438	*/
1637	void	1439	void
1638	replace_insert_ob_in_map (const char *arch_string, object *op)	1440	replace_insert_ob_in_map (const char *arch_string, object *op)
1639	{	1441	{
1640	object *	1442	object *tmp, *tmp1;
1641	tmp;
1642	object *
1643	tmp1;
1644		1443
1645	/* first search for itself and remove any old instances */	1444	/* first search for itself and remove any old instances */
1646		1445
1647	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1446	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1648	{
1649	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1650	{	1448	tmp->destroy ();
1651	remove_ob (tmp);
1652	free_object (tmp);
1653	}
1654	}
1655		1449
1656	tmp1 = arch_to_object (find_archetype (arch_string));	1450	tmp1 = arch_to_object (archetype::find (arch_string));
1657		1451
1658	tmp1->x = op->x;	1452	tmp1->x = op->x;
1659	tmp1->y = op->y;	1453	tmp1->y = op->y;
1660	insert_ob_in_map (tmp1, op->map, op, 0);	1454	insert_ob_in_map (tmp1, op->map, op, 0);
1661	}	1455	}
…		…
1669	*/	1463	*/
1670		1464
1671	object *	1465	object *
1672	get_split_ob (object *orig_ob, uint32 nr)	1466	get_split_ob (object *orig_ob, uint32 nr)
1673	{	1467	{
1674	object *	1468	object *newob;
1675	newob;
1676	int
1677	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1678		1470
1679	if (orig_ob->nrof < nr)	1471	if (orig_ob->nrof < nr)
1680	{	1472	{
1681	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1473	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1682	return NULL;	1474	return NULL;
1683	}	1475	}
1684		1476
1685	newob = object_create_clone (orig_ob);	1477	newob = object_create_clone (orig_ob);
1686		1478
1687	if ((orig_ob->nrof -= nr) < 1)	1479	if ((orig_ob->nrof -= nr) < 1)
1688	{	1480	orig_ob->destroy (1);
1689	if (!is_removed)
1690	remove_ob (orig_ob);
1691	free_object2 (orig_ob, 1);
1692	}
1693	else if (!is_removed)	1481	else if (!is_removed)
1694	{	1482	{
1695	if (orig_ob->env != NULL)	1483	if (orig_ob->env != NULL)
1696	sub_weight (orig_ob->env, orig_ob->weight * nr);	1484	sub_weight (orig_ob->env, orig_ob->weight * nr);
1697	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1485	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1717		1505
1718	object *	1506	object *
1719	decrease_ob_nr (object *op, uint32 i)	1507	decrease_ob_nr (object *op, uint32 i)
1720	{	1508	{
1721	object *tmp;	1509	object *tmp;
1722	player *pl;
1723		1510
1724	if (i == 0) /* objects with op->nrof require this check */	1511	if (i == 0) /* objects with op->nrof require this check */
1725	return op;	1512	return op;
1726		1513
1727	if (i > op->nrof)	1514	if (i > op->nrof)
1728	i = op->nrof;	1515	i = op->nrof;
1729		1516
1730	if (QUERY_FLAG (op, FLAG_REMOVED))	1517	if (QUERY_FLAG (op, FLAG_REMOVED))
1731	op->nrof -= i;	1518	op->nrof -= i;
1732	else if (op->env != NULL)	1519	else if (op->env)
1733	{	1520	{
1734	/* is this object in the players inventory, or sub container	1521	/* is this object in the players inventory, or sub container
1735	* therein?	1522	* therein?
1736	*/	1523	*/
1737	tmp = is_player_inv (op->env);	1524	tmp = op->in_player ();
1738	/* nope. Is this a container the player has opened?	1525	/* nope. Is this a container the player has opened?
1739	* If so, set tmp to that player.	1526	* If so, set tmp to that player.
1740	* IMO, searching through all the players will mostly	1527	* IMO, searching through all the players will mostly
1741	* likely be quicker than following op->env to the map,	1528	* likely be quicker than following op->env to the map,
1742	* and then searching the map for a player.	1529	* and then searching the map for a player.
1743	*/	1530	*/
1744	if (!tmp)	1531	if (!tmp)
1745	{	1532	for_all_players (pl)
1746	for (pl = first_player; pl; pl = pl->next)
1747	if (pl->ob->container == op->env)	1533	if (pl->ob->container == op->env)
		1534	{
		1535	tmp = pl->ob;
1748	break;	1536	break;
1749	if (pl)
1750	tmp = pl->ob;
1751	else
1752	tmp = NULL;
1753	}	1537	}
1754		1538
1755	if (i < op->nrof)	1539	if (i < op->nrof)
1756	{	1540	{
1757	sub_weight (op->env, op->weight * i);	1541	sub_weight (op->env, op->weight * i);
1758	op->nrof -= i;	1542	op->nrof -= i;
1759	if (tmp)	1543	if (tmp)
1760	{
1761	esrv_send_item (tmp, op);	1544	esrv_send_item (tmp, op);
1762	}
1763	}	1545	}
1764	else	1546	else
1765	{	1547	{
1766	remove_ob (op);	1548	op->remove ();
1767	op->nrof = 0;	1549	op->nrof = 0;
1768	if (tmp)	1550	if (tmp)
1769	{
1770	esrv_del_item (tmp->contr, op->count);	1551	esrv_del_item (tmp->contr, op->count);
1771	}
1772	}	1552	}
1773	}	1553	}
1774	else	1554	else
1775	{	1555	{
1776	object *above = op->above;	1556	object *above = op->above;
1777		1557
1778	if (i < op->nrof)	1558	if (i < op->nrof)
1779	op->nrof -= i;	1559	op->nrof -= i;
1780	else	1560	else
1781	{	1561	{
1782	remove_ob (op);	1562	op->remove ();
1783	op->nrof = 0;	1563	op->nrof = 0;
1784	}	1564	}
1785		1565
1786	/* Since we just removed op, op->above is null */	1566	/* Since we just removed op, op->above is null */
1787	for (tmp = above; tmp != NULL; tmp = tmp->above)	1567	for (tmp = above; tmp; tmp = tmp->above)
1788	if (tmp->type == PLAYER)	1568	if (tmp->type == PLAYER)
1789	{	1569	{
1790	if (op->nrof)	1570	if (op->nrof)
1791	esrv_send_item (tmp, op);	1571	esrv_send_item (tmp, op);
1792	else	1572	else
…		…
1796		1576
1797	if (op->nrof)	1577	if (op->nrof)
1798	return op;	1578	return op;
1799	else	1579	else
1800	{	1580	{
1801	free_object (op);	1581	op->destroy ();
1802	return NULL;	1582	return 0;
1803	}	1583	}
1804	}	1584	}
1805		1585
1806	/*	1586	/*
1807	* add_weight(object, weight) adds the specified weight to an object,	1587	* add_weight(object, weight) adds the specified weight to an object,
…		…
1819	op->carrying += weight;	1599	op->carrying += weight;
1820	op = op->env;	1600	op = op->env;
1821	}	1601	}
1822	}	1602	}
1823		1603
		1604	object *
		1605	insert_ob_in_ob (object *op, object *where)
		1606	{
		1607	if (!where)
		1608	{
		1609	char *dump = dump_object (op);
		1610	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1611	free (dump);
		1612	return op;
		1613	}
		1614
		1615	if (where->head)
		1616	{
		1617	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1618	where = where->head;
		1619	}
		1620
		1621	return where->insert (op);
		1622	}
		1623
1824	/*	1624	/*
1825	* insert_ob_in_ob(op,environment):	1625	* env->insert (op)
1826	* This function inserts the object op in the linked list	1626	* This function inserts the object op in the linked list
1827	* inside the object environment.	1627	* inside the object environment.
1828	*	1628	*
1829	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1830	* the inventory at the last position or next to other objects of the same
1831	* type.
1832	* Frank: Now sorted by type, archetype and magic!
1833	*
1834	* The function returns now pointer to inserted item, and return value can	1629	* The function returns now pointer to inserted item, and return value can
1835	* be != op, if items are merged. -Tero	1630	* be != op, if items are merged. -Tero
1836	*/	1631	*/
1837		1632
1838	object *	1633	object *
1839	insert_ob_in_ob (object *op, object *where)	1634	object::insert (object *op)
1840	{	1635	{
1841	object *	1636	object *tmp, *otmp;
1842	tmp, *
1843	otmp;
1844		1637
1845	if (!QUERY_FLAG (op, FLAG_REMOVED))	1638	if (!QUERY_FLAG (op, FLAG_REMOVED))
1846	{	1639	op->remove ();
1847	dump_object (op);
1848	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1849	return op;
1850	}
1851
1852	if (where == NULL)
1853	{
1854	dump_object (op);
1855	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1856	return op;
1857	}
1858
1859	if (where->head)
1860	{
1861	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1862	where = where->head;
1863	}
1864		1640
1865	if (op->more)	1641	if (op->more)
1866	{	1642	{
1867	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1643	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1868	return op;	1644	return op;
…		…
1870		1646
1871	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1647	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1872	CLEAR_FLAG (op, FLAG_REMOVED);	1648	CLEAR_FLAG (op, FLAG_REMOVED);
1873	if (op->nrof)	1649	if (op->nrof)
1874	{	1650	{
1875	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1651	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1876	if (CAN_MERGE (tmp, op))	1652	if (object::can_merge (tmp, op))
1877	{	1653	{
1878	/* return the original object and remove inserted object	1654	/* return the original object and remove inserted object
1879	(client needs the original object) */	1655	(client needs the original object) */
1880	tmp->nrof += op->nrof;	1656	tmp->nrof += op->nrof;
1881	/* Weight handling gets pretty funky. Since we are adding to	1657	/* Weight handling gets pretty funky. Since we are adding to
1882	* tmp->nrof, we need to increase the weight.	1658	* tmp->nrof, we need to increase the weight.
1883	*/	1659	*/
1884	add_weight (where, op->weight * op->nrof);	1660	add_weight (this, op->weight * op->nrof);
1885	SET_FLAG (op, FLAG_REMOVED);	1661	SET_FLAG (op, FLAG_REMOVED);
1886	free_object (op); /* free the inserted object */	1662	op->destroy (); /* free the inserted object */
1887	op = tmp;	1663	op = tmp;
1888	remove_ob (op); /* and fix old object's links */	1664	op->remove (); /* and fix old object's links */
1889	CLEAR_FLAG (op, FLAG_REMOVED);	1665	CLEAR_FLAG (op, FLAG_REMOVED);
1890	break;	1666	break;
1891	}	1667	}
1892		1668
1893	/* I assume combined objects have no inventory	1669	/* I assume combined objects have no inventory
1894	* We add the weight - this object could have just been removed	1670	* We add the weight - this object could have just been removed
1895	* (if it was possible to merge). calling remove_ob will subtract	1671	* (if it was possible to merge). calling remove_ob will subtract
1896	* the weight, so we need to add it in again, since we actually do	1672	* the weight, so we need to add it in again, since we actually do
1897	* the linking below	1673	* the linking below
1898	*/	1674	*/
1899	add_weight (where, op->weight * op->nrof);	1675	add_weight (this, op->weight * op->nrof);
1900	}	1676	}
1901	else	1677	else
1902	add_weight (where, (op->weight + op->carrying));	1678	add_weight (this, (op->weight + op->carrying));
1903		1679
1904	otmp = is_player_inv (where);	1680	otmp = this->in_player ();
1905	if (otmp && otmp->contr != NULL)	1681	if (otmp && otmp->contr)
1906	{
1907	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1682	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1908	fix_player (otmp);	1683	otmp->update_stats ();
1909	}
1910		1684
1911	op->map = NULL;	1685	op->map = 0;
1912	op->env = where;	1686	op->env = this;
1913	op->above = NULL;	1687	op->above = 0;
1914	op->below = NULL;	1688	op->below = 0;
1915	op->x = 0, op->y = 0;	1689	op->x = 0, op->y = 0;
1916		1690
1917	/* reset the light list and los of the players on the map */	1691	/* reset the light list and los of the players on the map */
1918	if ((op->glow_radius != 0) && where->map)	1692	if ((op->glow_radius != 0) && map)
1919	{	1693	{
1920	#ifdef DEBUG_LIGHTS	1694	#ifdef DEBUG_LIGHTS
1921	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1695	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1922	#endif /* DEBUG_LIGHTS */	1696	#endif /* DEBUG_LIGHTS */
1923	if (MAP_DARKNESS (where->map))	1697	if (MAP_DARKNESS (map))
1924	update_all_los (where->map, where->x, where->y);	1698	update_all_los (map, x, y);
1925	}	1699	}
1926		1700
1927	/* Client has no idea of ordering so lets not bother ordering it here.	1701	/* Client has no idea of ordering so lets not bother ordering it here.
1928	* It sure simplifies this function...	1702	* It sure simplifies this function...
1929	*/	1703	*/
1930	if (where->inv == NULL)	1704	if (!inv)
1931	where->inv = op;	1705	inv = op;
1932	else	1706	else
1933	{	1707	{
1934	op->below = where->inv;	1708	op->below = inv;
1935	op->below->above = op;	1709	op->below->above = op;
1936	where->inv = op;	1710	inv = op;
1937	}	1711	}
		1712
1938	return op;	1713	return op;
1939	}	1714	}
1940		1715
1941	/*	1716	/*
1942	* Checks if any objects has a move_type that matches objects	1717	* Checks if any objects has a move_type that matches objects
…		…
1960	*/	1735	*/
1961		1736
1962	int	1737	int
1963	check_move_on (object *op, object *originator)	1738	check_move_on (object *op, object *originator)
1964	{	1739	{
1965	object *	1740	object *tmp;
1966	tmp;	1741	maptile *m = op->map;
1967	tag_t
1968	tag;
1969	mapstruct *
1970	m = op->map;
1971	int
1972	x = op->x, y = op->y;	1742	int x = op->x, y = op->y;
1973		1743
1974	MoveType	1744	MoveType move_on, move_slow, move_block;
1975	move_on,
1976	move_slow,
1977	move_block;
1978		1745
1979	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1746	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980	return 0;	1747	return 0;
1981
1982	tag = op->count;
1983		1748
1984	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1749	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1985	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1750	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1986	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1751	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987		1752
…		…
2048	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1813	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2049	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1814	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050	{	1815	{
2051	move_apply (tmp, op, originator);	1816	move_apply (tmp, op, originator);
2052		1817
2053	if (was_destroyed (op, tag))	1818	if (op->destroyed ())
2054	return 1;	1819	return 1;
2055		1820
2056	/* what the person/creature stepped onto has moved the object	1821	/* what the person/creature stepped onto has moved the object
2057	* someplace new. Don't process any further - if we did,	1822	* someplace new. Don't process any further - if we did,
2058	* have a feeling strange problems would result.	1823	* have a feeling strange problems would result.
…		…
2070	* a matching archetype at the given map and coordinates.	1835	* a matching archetype at the given map and coordinates.
2071	* The first matching object is returned, or NULL if none.	1836	* The first matching object is returned, or NULL if none.
2072	*/	1837	*/
2073		1838
2074	object *	1839	object *
2075	present_arch (const archetype *at, mapstruct *m, int x, int y)	1840	present_arch (const archetype *at, maptile *m, int x, int y)
2076	{	1841	{
2077	object *	1842	object *
2078	tmp;	1843	tmp;
2079		1844
2080	if (m == NULL || out_of_map (m, x, y))	1845	if (m == NULL || out_of_map (m, x, y))
…		…
2093	* a matching type variable at the given map and coordinates.	1858	* a matching type variable at the given map and coordinates.
2094	* The first matching object is returned, or NULL if none.	1859	* The first matching object is returned, or NULL if none.
2095	*/	1860	*/
2096		1861
2097	object *	1862	object *
2098	present (unsigned char type, mapstruct *m, int x, int y)	1863	present (unsigned char type, maptile *m, int x, int y)
2099	{	1864	{
2100	object *	1865	object *
2101	tmp;	1866	tmp;
2102		1867
2103	if (out_of_map (m, x, y))	1868	if (out_of_map (m, x, y))
…		…
2243	* the archetype because that isn't correct if the monster has been	2008	* the archetype because that isn't correct if the monster has been
2244	* customized, changed states, etc.	2009	* customized, changed states, etc.
2245	*/	2010	*/
2246		2011
2247	int	2012	int
2248	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2013	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249	{	2014	{
2250	int	2015	int
2251	i,	2016	i,
2252	index = 0, flag;	2017	index = 0, flag;
2253	static int	2018	static int
…		…
2265	* if the space being examined only has a wall to the north and empty	2030	* if the space being examined only has a wall to the north and empty
2266	* spaces in all the other directions, this will reduce the search space	2031	* spaces in all the other directions, this will reduce the search space
2267	* to only the spaces immediately surrounding the target area, and	2032	* to only the spaces immediately surrounding the target area, and
2268	* won't look 2 spaces south of the target space.	2033	* won't look 2 spaces south of the target space.
2269	*/	2034	*/
2270	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2035	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2271	stop = maxfree[i];	2036	stop = maxfree[i];
2272	}	2037	}
		2038
2273	if (!index)	2039	if (!index)
2274	return -1;	2040	return -1;
		2041
2275	return altern[RANDOM () % index];	2042	return altern[RANDOM () % index];
2276	}	2043	}
2277		2044
2278	/*	2045	/*
2279	* find_first_free_spot(archetype, mapstruct, x, y) works like	2046	* find_first_free_spot(archetype, maptile, x, y) works like
2280	* find_free_spot(), but it will search max number of squares.	2047	* find_free_spot(), but it will search max number of squares.
2281	* But it will return the first available spot, not a random choice.	2048	* But it will return the first available spot, not a random choice.
2282	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2049	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2283	*/	2050	*/
2284		2051
2285	int	2052	int
2286	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2053	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287	{	2054	{
2288	int	2055	int
2289	i;	2056	i;
2290		2057
2291	for (i = 0; i < SIZEOFFREE; i++)	2058	for (i = 0; i < SIZEOFFREE; i++)
…		…
2355	* because we have to know what movement the thing looking to move	2122	* because we have to know what movement the thing looking to move
2356	* there is capable of.	2123	* there is capable of.
2357	*/	2124	*/
2358		2125
2359	int	2126	int
2360	find_dir (mapstruct *m, int x, int y, object *exclude)	2127	find_dir (maptile *m, int x, int y, object *exclude)
2361	{	2128	{
2362	int	2129	int
2363	i,	2130	i,
2364	max = SIZEOFFREE, mflags;	2131	max = SIZEOFFREE, mflags;
2365		2132
2366	sint16 nx, ny;	2133	sint16 nx, ny;
2367	object *	2134	object *
2368	tmp;	2135	tmp;
2369	mapstruct *	2136	maptile *
2370	mp;	2137	mp;
2371		2138
2372	MoveType blocked, move_type;	2139	MoveType blocked, move_type;
2373		2140
2374	if (exclude && exclude->head)	2141	if (exclude && exclude->head)
…		…
2387	mp = m;	2154	mp = m;
2388	nx = x + freearr_x[i];	2155	nx = x + freearr_x[i];
2389	ny = y + freearr_y[i];	2156	ny = y + freearr_y[i];
2390		2157
2391	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2158	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2159
2392	if (mflags & P_OUT_OF_MAP)	2160	if (mflags & P_OUT_OF_MAP)
2393	{
2394	max = maxfree[i];	2161	max = maxfree[i];
2395	}
2396	else	2162	else
2397	{	2163	{
2398	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2164	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2399		2165
2400	if ((move_type & blocked) == move_type)	2166	if ((move_type & blocked) == move_type)
2401	{
2402	max = maxfree[i];	2167	max = maxfree[i];
2403	}
2404	else if (mflags & P_IS_ALIVE)	2168	else if (mflags & P_IS_ALIVE)
2405	{	2169	{
2406	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2170	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2407	{
2408	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2171	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2409	{
2410	break;	2172	break;
2411	}	2173
2412	}
2413	if (tmp)	2174	if (tmp)
2414	{
2415	return freedir[i];	2175	return freedir[i];
2416	}
2417	}	2176	}
2418	}	2177	}
2419	}	2178	}
		2179
2420	return 0;	2180	return 0;
2421	}	2181	}
2422		2182
2423	/*	2183	/*
2424	* distance(object 1, object 2) will return the square of the	2184	* distance(object 1, object 2) will return the square of the
…		…
2426	*/	2186	*/
2427		2187
2428	int	2188	int
2429	distance (const object *ob1, const object *ob2)	2189	distance (const object *ob1, const object *ob2)
2430	{	2190	{
2431	int	2191	int i;
2432	i;
2433		2192
2434	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2193	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2435	return i;	2194	return i;
2436	}	2195	}
2437		2196
…		…
2442	*/	2201	*/
2443		2202
2444	int	2203	int
2445	find_dir_2 (int x, int y)	2204	find_dir_2 (int x, int y)
2446	{	2205	{
2447	int	2206	int q;
2448	q;
2449		2207
2450	if (y)	2208	if (y)
2451	q = x * 100 / y;	2209	q = x * 100 / y;
2452	else if (x)	2210	else if (x)
2453	q = -300 * x;	2211	q = -300 * x;
…		…
2579	* find a path to that monster that we found. If not,	2337	* find a path to that monster that we found. If not,
2580	* we don't bother going toward it. Returns 1 if we	2338	* we don't bother going toward it. Returns 1 if we
2581	* can see a direct way to get it	2339	* can see a direct way to get it
2582	* Modified to be map tile aware -.MSW	2340	* Modified to be map tile aware -.MSW
2583	*/	2341	*/
2584
2585
2586	int	2342	int
2587	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2343	can_see_monsterP (maptile *m, int x, int y, int dir)
2588	{	2344	{
2589	sint16 dx, dy;	2345	sint16 dx, dy;
2590	int
2591	mflags;	2346	int mflags;
2592		2347
2593	if (dir < 0)	2348	if (dir < 0)
2594	return 0; /* exit condition: invalid direction */	2349	return 0; /* exit condition: invalid direction */
2595		2350
2596	dx = x + freearr_x[dir];	2351	dx = x + freearr_x[dir];
…		…
2609	return 0;	2364	return 0;
2610		2365
2611	/* yes, can see. */	2366	/* yes, can see. */
2612	if (dir < 9)	2367	if (dir < 9)
2613	return 1;	2368	return 1;
		2369
2614	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2370	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2615	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2371	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2372	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2616	}	2373	}
2617
2618
2619		2374
2620	/*	2375	/*
2621	* can_pick(picker, item): finds out if an object is possible to be	2376	* can_pick(picker, item): finds out if an object is possible to be
2622	* picked up by the picker. Returnes 1 if it can be	2377	* picked up by the picker. Returnes 1 if it can be
2623	* picked up, otherwise 0.	2378	* picked up, otherwise 0.
…		…
2634	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2389	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2635	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2390	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2636	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2391	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2637	}	2392	}
2638		2393
2639
2640	/*	2394	/*
2641	* create clone from object to another	2395	* create clone from object to another
2642	*/	2396	*/
2643	object *	2397	object *
2644	object_create_clone (object *asrc)	2398	object_create_clone (object *asrc)
2645	{	2399	{
2646	object *
2647	dst = NULL, *tmp, *src, *part, *prev, *item;	2400	object *dst = 0, *tmp, *src, *part, *prev, *item;
2648		2401
2649	if (!asrc)	2402	if (!asrc)
2650	return NULL;	2403	return 0;
		2404
2651	src = asrc;	2405	src = asrc;
2652	if (src->head)	2406	if (src->head)
2653	src = src->head;	2407	src = src->head;
2654		2408
2655	prev = NULL;	2409	prev = 0;
2656	for (part = src; part; part = part->more)	2410	for (part = src; part; part = part->more)
2657	{	2411	{
2658	tmp = get_object ();	2412	tmp = part->clone ();
2659	copy_object (part, tmp);
2660	tmp->x -= src->x;	2413	tmp->x -= src->x;
2661	tmp->y -= src->y;	2414	tmp->y -= src->y;
		2415
2662	if (!part->head)	2416	if (!part->head)
2663	{	2417	{
2664	dst = tmp;	2418	dst = tmp;
2665	tmp->head = NULL;	2419	tmp->head = 0;
2666	}	2420	}
2667	else	2421	else
2668	{
2669	tmp->head = dst;	2422	tmp->head = dst;
2670	}	2423
2671	tmp->more = NULL;	2424	tmp->more = 0;
		2425
2672	if (prev)	2426	if (prev)
2673	prev->more = tmp;	2427	prev->more = tmp;
		2428
2674	prev = tmp;	2429	prev = tmp;
2675	}	2430	}
2676		2431
2677	/*** copy inventory ***/
2678	for (item = src->inv; item; item = item->below)	2432	for (item = src->inv; item; item = item->below)
2679	{
2680	(void) insert_ob_in_ob (object_create_clone (item), dst);	2433	insert_ob_in_ob (object_create_clone (item), dst);
2681	}
2682		2434
2683	return dst;	2435	return dst;
2684	}	2436	}
2685		2437
2686	/* return true if the object was destroyed, 0 otherwise */
2687	int
2688	was_destroyed (const object *op, tag_t old_tag)
2689	{
2690	/* checking for FLAG_FREED isn't necessary, but makes this function more
2691	* robust */
2692	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2693	}
2694
2695	/* GROS - Creates an object using a string representing its content. */	2438	/* GROS - Creates an object using a string representing its content. */
2696
2697	/* Basically, we save the content of the string to a temp file, then call */	2439	/* Basically, we save the content of the string to a temp file, then call */
2698
2699	/* load_object on it. I admit it is a highly inefficient way to make things, */	2440	/* load_object on it. I admit it is a highly inefficient way to make things, */
2700
2701	/* but it was simple to make and allows reusing the load_object function. */	2441	/* but it was simple to make and allows reusing the load_object function. */
2702
2703	/* Remember not to use load_object_str in a time-critical situation. */	2442	/* Remember not to use load_object_str in a time-critical situation. */
2704
2705	/* Also remember that multiparts objects are not supported for now. */	2443	/* Also remember that multiparts objects are not supported for now. */
2706		2444
2707	object *	2445	object *
2708	load_object_str (const char *obstr)	2446	load_object_str (const char *obstr)
2709	{	2447	{
2710	object *	2448	object *op;
2711	op;
2712	char
2713	filename[MAX_BUF];	2449	char filename[MAX_BUF];
2714		2450
2715	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2451	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716		2452
2717	FILE *
2718	tempfile = fopen (filename, "w");	2453	FILE *tempfile = fopen (filename, "w");
2719		2454
2720	if (tempfile == NULL)	2455	if (tempfile == NULL)
2721	{	2456	{
2722	LOG (llevError, "Error - Unable to access load object temp file\n");	2457	LOG (llevError, "Error - Unable to access load object temp file\n");
2723	return NULL;	2458	return NULL;
2724	};	2459	}
		2460
2725	fprintf (tempfile, obstr);	2461	fprintf (tempfile, obstr);
2726	fclose (tempfile);	2462	fclose (tempfile);
2727		2463
2728	op = get_object ();	2464	op = object::create ();
2729		2465
2730	object_thawer thawer (filename);	2466	object_thawer thawer (filename);
2731		2467
2732	if (thawer)	2468	if (thawer)
2733	load_object (thawer, op, 0);	2469	load_object (thawer, op, 0);
…		…
2743	* returns NULL if no match.	2479	* returns NULL if no match.
2744	*/	2480	*/
2745	object *	2481	object *
2746	find_obj_by_type_subtype (const object *who, int type, int subtype)	2482	find_obj_by_type_subtype (const object *who, int type, int subtype)
2747	{	2483	{
2748	object *	2484	object *tmp;
2749	tmp;
2750		2485
2751	for (tmp = who->inv; tmp; tmp = tmp->below)	2486	for (tmp = who->inv; tmp; tmp = tmp->below)
2752	if (tmp->type == type && tmp->subtype == subtype)	2487	if (tmp->type == type && tmp->subtype == subtype)
2753	return tmp;	2488	return tmp;
2754		2489
…		…
2762	* do the desired thing.	2497	* do the desired thing.
2763	*/	2498	*/
2764	key_value *	2499	key_value *
2765	get_ob_key_link (const object *ob, const char *key)	2500	get_ob_key_link (const object *ob, const char *key)
2766	{	2501	{
2767	key_value *	2502	key_value *link;
2768	link;
2769		2503
2770	for (link = ob->key_values; link != NULL; link = link->next)	2504	for (link = ob->key_values; link != NULL; link = link->next)
2771	{
2772	if (link->key == key)	2505	if (link->key == key)
2773	{
2774	return link;	2506	return link;
2775	}
2776	}
2777		2507
2778	return NULL;	2508	return NULL;
2779	}	2509	}
2780		2510
2781	/*	2511	/*
…		…
2786	* The returned string is shared.	2516	* The returned string is shared.
2787	*/	2517	*/
2788	const char *	2518	const char *
2789	get_ob_key_value (const object *op, const char *const key)	2519	get_ob_key_value (const object *op, const char *const key)
2790	{	2520	{
2791	key_value *	2521	key_value *link;
2792	link;	2522	shstr_cmp canonical_key (key);
2793	const char *
2794	canonical_key;
2795		2523
2796	canonical_key = shstr::find (key);
2797
2798	if (canonical_key == NULL)	2524	if (!canonical_key)
2799	{	2525	{
2800	/* 1. There being a field named key on any object	2526	/* 1. There being a field named key on any object
2801	* implies there'd be a shared string to find.	2527	* implies there'd be a shared string to find.
2802	* 2. Since there isn't, no object has this field.	2528	* 2. Since there isn't, no object has this field.
2803	* 3. Therefore, *this* object doesn't have this field.	2529	* 3. Therefore, *this* object doesn't have this field.
2804	*/	2530	*/
2805	return NULL;	2531	return 0;
2806	}	2532	}
2807		2533
2808	/* This is copied from get_ob_key_link() above -	2534	/* This is copied from get_ob_key_link() above -
2809	* only 4 lines, and saves the function call overhead.	2535	* only 4 lines, and saves the function call overhead.
2810	*/	2536	*/
2811	for (link = op->key_values; link != NULL; link = link->next)	2537	for (link = op->key_values; link; link = link->next)
2812	{
2813	if (link->key == canonical_key)	2538	if (link->key == canonical_key)
2814	{
2815	return link->value;	2539	return link->value;
2816	}	2540
2817	}
2818	return NULL;	2541	return 0;
2819	}	2542	}
2820		2543
2821		2544
2822	/*	2545	/*
2823	* Updates the canonical_key in op to value.	2546	* Updates the canonical_key in op to value.
…		…
2908	{	2631	{
2909	shstr key_ (key);	2632	shstr key_ (key);
2910		2633
2911	return set_ob_key_value_s (op, key_, value, add_key);	2634	return set_ob_key_value_s (op, key_, value, add_key);
2912	}	2635	}
		2636
		2637	object::depth_iterator::depth_iterator (object *container)
		2638	: iterator_base (container)
		2639	{
		2640	while (item->inv)
		2641	item = item->inv;
		2642	}
		2643
		2644	void
		2645	object::depth_iterator::next ()
		2646	{
		2647	if (item->below)
		2648	{
		2649	item = item->below;
		2650
		2651	while (item->inv)
		2652	item = item->inv;
		2653	}
		2654	else
		2655	item = item->env;
		2656	}
		2657
		2658	// return a suitable string describing an objetc in enough detail to find it
		2659	const char *
		2660	object::debug_desc (char *info) const
		2661	{
		2662	char info2[256 * 3];
		2663	char *p = info;
		2664
		2665	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2666	count,
		2667	&name,
		2668	title ? " " : "",
		2669	title ? (const char *)title : "");
		2670
		2671	if (env)
		2672	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2673
		2674	if (map)
		2675	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2676
		2677	return info;
		2678	}
		2679
		2680	const char *
		2681	object::debug_desc () const
		2682	{
		2683	static char info[256 * 3];
		2684	return debug_desc (info);
		2685	}
		2686

Diff Legend

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