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.31 by root, Mon Sep 11 23:33:27 2006 UTC vs.
Revision 1.69 by root, Mon Dec 18 03:00:02 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->flags ^ ob2->flags).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.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	373	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	374	* The result of the dump is stored in the static global errmsg array.
298	*/	375	*/
299		376
300	void	377	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)	378	dump_object (object *op)
356	{	379	{
357	if (op == NULL)	380	if (!op)
358	{	381	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		382
366	void	383	object_freezer freezer;
367	dump_all_objects (void)	384	save_object (freezer, op, 3);
368	{	385	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	}	386	}
377		387
378	/*	388	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	389	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	390	* multi-object 1 which is closest to the second object.
…		…
400	*/	410	*/
401		411
402	object *	412	object *
403	find_object (tag_t i)	413	find_object (tag_t i)
404	{	414	{
405	object *op;	415	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	416	if (op->count == i)
409	break;	417	return op;
		418
410	return op;	419	return 0;
411	}	420	}
412		421
413	/*	422	/*
414	* Returns the first object which has a name equal to the argument.	423	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	424	* Used only by the patch command, but not all that useful.
…		…
417	*/	426	*/
418		427
419	object *	428	object *
420	find_object_name (const char *str)	429	find_object_name (const char *str)
421	{	430	{
422	const char *name = shstr::find (str);	431	shstr_cmp str_ (str);
423	object *op;	432	object *op;
424		433
425	for (op = objects; op != NULL; op = op->next)	434	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	435	if (op->name == str_)
427	break;	436	break;
428		437
429	return op;	438	return op;
430	}	439	}
431		440
432	void	441	void
433	free_all_object_data ()	442	free_all_object_data ()
434	{	443	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	444	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}
437
438	/*
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	object *
449	object::get_owner ()
450	{
451	if (!owner
452	|| QUERY_FLAG (owner, FLAG_FREED)
453	|| QUERY_FLAG (owner, FLAG_REMOVED))
454	owner = 0;
455
456	return owner;
457	}	445	}
458		446
459	/*	447	/*
460	* Sets the owner and sets the skill and exp pointers to owner's current	448	* Sets the owner and sets the skill and exp pointers to owner's current
461	* skill and experience objects.	449	* skill and experience objects.
…		…
531		519
532	/* What is not cleared is next, prev, and count */	520	/* What is not cleared is next, prev, and count */
533		521
534	expmul = 1.0;	522	expmul = 1.0;
535	face = blank_face;	523	face = blank_face;
536	attacked_by_count = -1;
537		524
538	if (settings.casting_time)	525	if (settings.casting_time)
539	casting_time = -1;	526	casting_time = -1;
540	}	527	}
541		528
542	void object::clone (object *destination)
543	{
544	*(object_copy *)destination = *this;
545	*(object_pod *)destination = *this;
546
547	if (self || cb)
548	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
549	}
550
551	/*	529	/*
552	* copy object first frees everything allocated by the second object,	530	* copy_to first frees everything allocated by the dst object,
553	* and then copies the contends of the first object into the second	531	* and then copies the contents of itself into the second
554	* object, allocating what needs to be allocated. Basically, any	532	* object, allocating what needs to be allocated. Basically, any
555	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	533	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
556	* if the first object is freed, the pointers in the new object	534	* if the first object is freed, the pointers in the new object
557	* will point at garbage.	535	* will point at garbage.
558	*/	536	*/
559	void	537	void
560	copy_object (object *op2, object *op)	538	object::copy_to (object *dst)
561	{	539	{
562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
564		542
565	op2->clone (op);	543	*(object_copy *)dst = *this;
		544	*(object_pod *)dst = *this;
		545
		546	if (self || cb)
		547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
566		548
567	if (is_freed)	549	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	550	SET_FLAG (dst, FLAG_FREED);
		551
569	if (is_removed)	552	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	553	SET_FLAG (dst, FLAG_REMOVED);
571		554
572	if (op2->speed < 0)	555	if (speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
574		557
575	/* Copy over key_values, if any. */	558	/* Copy over key_values, if any. */
576	if (op2->key_values)	559	if (key_values)
577	{	560	{
578	key_value *tail = 0;	561	key_value *tail = 0;
579	key_value *i;	562	key_value *i;
580		563
581	op->key_values = 0;	564	dst->key_values = 0;
582		565
583	for (i = op2->key_values; i; i = i->next)	566	for (i = key_values; i; i = i->next)
584	{	567	{
585	key_value *new_link = new key_value;	568	key_value *new_link = new key_value;
586		569
587	new_link->next = 0;	570	new_link->next = 0;
588	new_link->key = i->key;	571	new_link->key = i->key;
589	new_link->value = i->value;	572	new_link->value = i->value;
590		573
591	/* Try and be clever here, too. */	574	/* Try and be clever here, too. */
592	if (!op->key_values)	575	if (!dst->key_values)
593	{	576	{
594	op->key_values = new_link;	577	dst->key_values = new_link;
595	tail = new_link;	578	tail = new_link;
596	}	579	}
597	else	580	else
598	{	581	{
599	tail->next = new_link;	582	tail->next = new_link;
600	tail = new_link;	583	tail = new_link;
601	}	584	}
602	}	585	}
603	}	586	}
604		587
605	update_ob_speed (op);	588	update_ob_speed (dst);
		589	}
		590
		591	object *
		592	object::clone ()
		593	{
		594	object *neu = create ();
		595	copy_to (neu);
		596	return neu;
606	}	597	}
607		598
608	/*	599	/*
609	* If an object with the IS_TURNABLE() flag needs to be turned due	600	* If an object with the IS_TURNABLE() flag needs to be turned due
610	* to the closest player being on the other side, this function can	601	* to the closest player being on the other side, this function can
…		…
815	update_now = 1;	806	update_now = 1;
816		807
817	if ((move_slow | op->move_slow) != move_slow)	808	if ((move_slow | op->move_slow) != move_slow)
818	update_now = 1;	809	update_now = 1;
819	}	810	}
		811
820	/* if the object is being removed, we can't make intelligent	812	/* if the object is being removed, we can't make intelligent
821	* decisions, because remove_ob can't really pass the object	813	* decisions, because remove_ob can't really pass the object
822	* that is being removed.	814	* that is being removed.
823	*/	815	*/
824	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
836		828
837	if (op->more != NULL)	829	if (op->more != NULL)
838	update_object (op->more, action);	830	update_object (op->more, action);
839	}	831	}
840		832
841	static unordered_vector<object *> mortals;	833	object::vector object::mortals;
842	static std::vector<object *> freed;	834	object::vector object::objects; // not yet used
		835	object *object::first;
843		836
844	void object::free_mortals ()	837	void object::free_mortals ()
845	{	838	{
846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847	if ((*i)->refcnt)	840	if ((*i)->refcnt)
848	++i; // further delay freeing	841	++i; // further delay freeing
849	else	842	else
850	{	843	{
851	freed.push_back (*i);//D
852	//delete *i;	844	delete *i;
853	mortals.erase (i);	845	mortals.erase (i);
854	}	846	}
855
856	if (mortals.size())//D
857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
858	}	847	}
859		848
860	object::object ()	849	object::object ()
861	{	850	{
862	SET_FLAG (this, FLAG_REMOVED);	851	SET_FLAG (this, FLAG_REMOVED);
863		852
864	expmul = 1.0;	853	expmul = 1.0;
865	face = blank_face;	854	face = blank_face;
866	attacked_by_count = -1;
867	}	855	}
868		856
869	object::~object ()	857	object::~object ()
870	{	858	{
871	free_key_values (this);	859	free_key_values (this);
872	}	860	}
873		861
874	void object::link ()	862	void object::link ()
875	{	863	{
876	count = ++ob_count;	864	count = ++ob_count;
		865	uuid = gen_uuid ();
877		866
878	prev = 0;	867	prev = 0;
879	next = objects;	868	next = object::first;
880		869
881	if (objects)	870	if (object::first)
882	objects->prev = this;	871	object::first->prev = this;
883		872
884	objects = this;	873	object::first = this;
885	}	874	}
886		875
887	void object::unlink ()	876	void object::unlink ()
888	{	877	{
889	count = 0;	878	if (this == object::first)
		879	object::first = next;
890		880
891	/* Remove this object from the list of used objects */	881	/* Remove this object from the list of used objects */
892	if (prev)
893	{
894	prev->next = next;	882	if (prev) prev->next = next;
		883	if (next) next->prev = prev;
		884
895	prev = 0;	885	prev = 0;
896	}
897
898	if (next)
899	{
900	next->prev = prev;
901	next = 0;	886	next = 0;
902	}
903
904	if (this == objects)
905	objects = next;
906	}	887	}
907		888
908	object *object::create ()	889	object *object::create ()
909	{	890	{
910	object *
911	op;
912
913	if (freed.empty ())
914	op = new object;	891	object *op = new object;
915	else
916	{
917	// highly annoying, but the only way to get it stable right now
918	op = freed.back ();
919	freed.pop_back ();
920	op->~object ();
921	new ((void *) op) object;
922	}
923
924	op->link ();	892	op->link ();
925	return op;	893	return op;
926	}	894	}
927		895
928	/*	896	/*
…		…
930	* it from the list of used objects, and puts it on the list of	898	* it from the list of used objects, and puts it on the list of
931	* free objects. The IS_FREED() flag is set in the object.	899	* free objects. The IS_FREED() flag is set in the object.
932	* The object must have been removed by remove_ob() first for	900	* The object must have been removed by remove_ob() first for
933	* this function to succeed.	901	* this function to succeed.
934	*	902	*
935	* If free_inventory is set, free inventory as well. Else drop items in	903	* If destroy_inventory is set, free inventory as well. Else drop items in
936	* inventory to the ground.	904	* inventory to the ground.
937	*/	905	*/
938	void object::free (bool free_inventory)	906	void object::destroy (bool destroy_inventory)
939	{	907	{
940	if (QUERY_FLAG (this, FLAG_FREED))	908	if (QUERY_FLAG (this, FLAG_FREED))
941	return;	909	return;
942		910
943	if (!QUERY_FLAG (this, FLAG_REMOVED))
944	remove_ob (this);
945
946	if (QUERY_FLAG (this, FLAG_FRIENDLY))	911	if (QUERY_FLAG (this, FLAG_FRIENDLY))
947	remove_friendly_object (this);	912	remove_friendly_object (this);
948		913
		914	if (!QUERY_FLAG (this, FLAG_REMOVED))
		915	remove ();
		916
949	SET_FLAG (this, FLAG_FREED);	917	SET_FLAG (this, FLAG_FREED);
950		918
951	if (more)	919	if (more)
952	{	920	{
953	more->free (free_inventory);	921	more->destroy (destroy_inventory);
954	more = 0;	922	more = 0;
955	}	923	}
956		924
957	if (inv)	925	if (inv)
958	{	926	{
959	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
960	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
961	* drop on that space.	929	* drop on that space.
962	*/	930	*/
963	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	931	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
964	{	932	{
965	object *op = inv;	933	object *op = inv;
966		934
967	while (op)	935	while (op)
968	{	936	{
969	object *tmp = op->below;	937	object *tmp = op->below;
970	op->free (free_inventory);	938	op->destroy (destroy_inventory);
971	op = tmp;	939	op = tmp;
972	}	940	}
973	}	941	}
974	else	942	else
975	{ /* Put objects in inventory onto this space */	943	{ /* Put objects in inventory onto this space */
…		…
977		945
978	while (op)	946	while (op)
979	{	947	{
980	object *tmp = op->below;	948	object *tmp = op->below;
981		949
982	remove_ob (op);	950	op->remove ();
983		951
984	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
985	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	953	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
986	free_object (op);	954	op->destroy ();
987	else	955	else
988	{	956	{
989	op->x = x;	957	op->x = x;
990	op->y = y;	958	op->y = y;
991	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	959	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
994	op = tmp;	962	op = tmp;
995	}	963	}
996	}	964	}
997	}	965	}
998		966
		967	// hack to ensure that freed objects still have a valid map
		968	{
		969	static maptile *freed_map; // freed objects are moved here to avoid crashes
		970
		971	if (!freed_map)
		972	{
		973	freed_map = new maptile;
		974
		975	freed_map->name = "/internal/freed_objects_map";
		976	freed_map->width = 3;
		977	freed_map->height = 3;
		978
		979	freed_map->allocate ();
		980	}
		981
		982	map = freed_map;
		983	x = 1;
		984	y = 1;
		985	}
		986
		987	// clear those pointers that likely might have circular references to us
999	owner = 0;	988	owner = 0;
		989	enemy = 0;
		990	attacked_by = 0;
		991
		992	// only relevant for players(?), but make sure of it anyways
		993	contr = 0;
1000		994
1001	/* Remove object from the active list */	995	/* Remove object from the active list */
1002	speed = 0;	996	speed = 0;
1003	update_ob_speed (this);	997	update_ob_speed (this);
1004		998
…		…
1009		1003
1010	/*	1004	/*
1011	* sub_weight() recursively (outwards) subtracts a number from the	1005	* sub_weight() recursively (outwards) subtracts a number from the
1012	* weight of an object (and what is carried by it's environment(s)).	1006	* weight of an object (and what is carried by it's environment(s)).
1013	*/	1007	*/
1014
1015	void	1008	void
1016	sub_weight (object *op, signed long weight)	1009	sub_weight (object *op, signed long weight)
1017	{	1010	{
1018	while (op != NULL)	1011	while (op != NULL)
1019	{	1012	{
1020	if (op->type == CONTAINER)	1013	if (op->type == CONTAINER)
1021	{
1022	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1014	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1023	}	1015
1024	op->carrying -= weight;	1016	op->carrying -= weight;
1025	op = op->env;	1017	op = op->env;
1026	}	1018	}
1027	}	1019	}
1028		1020
1029	/* remove_ob(op):	1021	/* op->remove ():
1030	* This function removes the object op from the linked list of objects	1022	* This function removes the object op from the linked list of objects
1031	* which it is currently tied to. When this function is done, the	1023	* which it is currently tied to. When this function is done, the
1032	* object will have no environment. If the object previously had an	1024	* object will have no environment. If the object previously had an
1033	* environment, the x and y coordinates will be updated to	1025	* environment, the x and y coordinates will be updated to
1034	* the previous environment.	1026	* the previous environment.
1035	* Beware: This function is called from the editor as well!	1027	* Beware: This function is called from the editor as well!
1036	*/	1028	*/
1037
1038	void	1029	void
1039	remove_ob (object *op)	1030	object::remove ()
1040	{	1031	{
		1032	object *tmp, *last = 0;
1041	object *	1033	object *otmp;
1042	tmp, *
1043	last = NULL;
1044	object *
1045	otmp;
1046		1034
1047	tag_t
1048	tag;
1049	int
1050	check_walk_off;	1035	int check_walk_off;
1051	mapstruct *
1052	m;
1053		1036
1054	sint16
1055	x,
1056	y;
1057
1058	if (QUERY_FLAG (op, FLAG_REMOVED))	1037	if (QUERY_FLAG (this, FLAG_REMOVED))
1059	return;	1038	return;
1060		1039
1061	SET_FLAG (op, FLAG_REMOVED);	1040	SET_FLAG (this, FLAG_REMOVED);
1062		1041
1063	if (op->more != NULL)	1042	if (more)
1064	remove_ob (op->more);	1043	more->remove ();
1065		1044
1066	/*	1045	/*
1067	* In this case, the object to be removed is in someones	1046	* In this case, the object to be removed is in someones
1068	* inventory.	1047	* inventory.
1069	*/	1048	*/
1070	if (op->env != NULL)	1049	if (env)
1071	{	1050	{
1072	if (op->nrof)	1051	if (nrof)
1073	sub_weight (op->env, op->weight * op->nrof);	1052	sub_weight (env, weight * nrof);
1074	else	1053	else
1075	sub_weight (op->env, op->weight + op->carrying);	1054	sub_weight (env, weight + carrying);
1076		1055
1077	/* NO_FIX_PLAYER is set when a great many changes are being	1056	/* NO_FIX_PLAYER is set when a great many changes are being
1078	* made to players inventory. If set, avoiding the call	1057	* made to players inventory. If set, avoiding the call
1079	* to save cpu time.	1058	* to save cpu time.
1080	*/	1059	*/
1081	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1060	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1082	fix_player (otmp);	1061	fix_player (otmp);
1083		1062
1084	if (op->above != NULL)	1063	if (above != NULL)
1085	op->above->below = op->below;	1064	above->below = below;
1086	else	1065	else
1087	op->env->inv = op->below;	1066	env->inv = below;
1088		1067
1089	if (op->below != NULL)	1068	if (below != NULL)
1090	op->below->above = op->above;	1069	below->above = above;
1091		1070
1092	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1093	* the map, but we don't actually do that - it is up	1072	* the map, but we don't actually do that - it is up
1094	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1095	*/	1074	*/
1096	op->x = op->env->x, op->y = op->env->y;	1075	x = env->x, y = env->y;
1097	op->map = op->env->map;	1076	map = env->map;
1098	op->above = NULL, op->below = NULL;	1077	above = 0, below = 0;
1099	op->env = NULL;	1078	env = 0;
1100	}	1079	}
1101	else if (op->map)	1080	else if (map)
1102	{	1081	{
1103	x = op->x;
1104	y = op->y;
1105	m = get_map_from_coord (op->map, &x, &y);
1106
1107	if (!m)
1108	{
1109	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1110	op->map->path, op->x, op->y);
1111	/* in old days, we used to set x and y to 0 and continue.
1112	* it seems if we get into this case, something is probablye
1113	* screwed up and should be fixed.
1114	*/
1115	abort ();
1116	}
1117
1118	if (op->map != m)
1119	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1120	op->map->path, m->path, op->x, op->y, x, y);
1121
1122	/* Re did the following section of code - it looks like it had	1082	/* Re did the following section of code - it looks like it had
1123	* lots of logic for things we no longer care about	1083	* lots of logic for things we no longer care about
1124	*/	1084	*/
1125		1085
1126	/* link the object above us */	1086	/* link the object above us */
1127	if (op->above)	1087	if (above)
1128	op->above->below = op->below;	1088	above->below = below;
1129	else	1089	else
1130	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1090	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1131		1091
1132	/* Relink the object below us, if there is one */	1092	/* Relink the object below us, if there is one */
1133	if (op->below)	1093	if (below)
1134	op->below->above = op->above;	1094	below->above = above;
1135	else	1095	else
1136	{	1096	{
1137	/* Nothing below, which means we need to relink map object for this space	1097	/* Nothing below, which means we need to relink map object for this space
1138	* use translated coordinates in case some oddness with map tiling is	1098	* use translated coordinates in case some oddness with map tiling is
1139	* evident	1099	* evident
1140	*/	1100	*/
1141	if (GET_MAP_OB (m, x, y) != op)	1101	if (GET_MAP_OB (map, x, y) != this)
1142	{	1102	{
1143	dump_object (op);	1103	char *dump = dump_object (this);
1144	LOG (llevError,	1104	LOG (llevError,
1145	"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);	1105	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1106	free (dump);
1146	dump_object (GET_MAP_OB (m, x, y));	1107	dump = dump_object (GET_MAP_OB (map, x, y));
1147	LOG (llevError, "%s\n", errmsg);	1108	LOG (llevError, "%s\n", dump);
		1109	free (dump);
1148	}	1110	}
1149		1111
1150	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1151	}	1113	}
1152		1114
1153	op->above = 0;	1115	above = 0;
1154	op->below = 0;	1116	below = 0;
1155		1117
1156	if (op->map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1157	return;	1119	return;
1158		1120
1159	tag = op->count;
1160	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1161		1122
1162	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1163	{	1124	{
1164	/* No point updating the players look faces if he is the object	1125	/* No point updating the players look faces if he is the object
1165	* being removed.	1126	* being removed.
1166	*/	1127	*/
1167		1128
1168	if (tmp->type == PLAYER && tmp != op)	1129	if (tmp->type == PLAYER && tmp != this)
1169	{	1130	{
1170	/* If a container that the player is currently using somehow gets	1131	/* If a container that the player is currently using somehow gets
1171	* removed (most likely destroyed), update the player view	1132	* removed (most likely destroyed), update the player view
1172	* appropriately.	1133	* appropriately.
1173	*/	1134	*/
1174	if (tmp->container == op)	1135	if (tmp->container == this)
1175	{	1136	{
1176	CLEAR_FLAG (op, FLAG_APPLIED);	1137	CLEAR_FLAG (this, FLAG_APPLIED);
1177	tmp->container = NULL;	1138	tmp->container = 0;
1178	}	1139	}
1179		1140
1180	tmp->contr->socket.update_look = 1;	1141	tmp->contr->socket->update_look = 1;
1181	}	1142	}
1182		1143
1183	/* See if player moving off should effect something */	1144	/* See if player moving off should effect something */
1184	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1145	if (check_walk_off
		1146	&& ((move_type & tmp->move_off)
		1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1185	{	1148	{
1186	move_apply (tmp, op, NULL);	1149	move_apply (tmp, this, 0);
1187		1150
1188	if (was_destroyed (op, tag))	1151	if (destroyed ())
1189	{
1190	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1191	}
1192	}	1153	}
1193		1154
1194	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1195		1156
1196	if (tmp->above == tmp)	1157	if (tmp->above == tmp)
1197	tmp->above = NULL;	1158	tmp->above = 0;
1198		1159
1199	last = tmp;	1160	last = tmp;
1200	}	1161	}
1201		1162
1202	/* last == NULL of there are no objects on this space */	1163	/* last == NULL of there are no objects on this space */
1203	if (last == NULL)	1164	if (!last)
1204	{	1165	{
1205	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1206	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1167	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1207	* those out anyways, and if there are any flags set right now, they won't	1168	* those out anyways, and if there are any flags set right now, they won't
1208	* be correct anyways.	1169	* be correct anyways.
1209	*/	1170	*/
1210	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1211	update_position (op->map, op->x, op->y);	1172	update_position (map, x, y);
1212	}	1173	}
1213	else	1174	else
1214	update_object (last, UP_OBJ_REMOVE);	1175	update_object (last, UP_OBJ_REMOVE);
1215		1176
1216	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1217	update_all_los (op->map, op->x, op->y);	1178	update_all_los (map, x, y);
1218	}	1179	}
1219	}	1180	}
1220		1181
1221	/*	1182	/*
1222	* merge_ob(op,top):	1183	* merge_ob(op,top):
…		…
1224	* This function goes through all objects below and including top, and	1185	* This function goes through all objects below and including top, and
1225	* merges op to the first matching object.	1186	* merges op to the first matching object.
1226	* If top is NULL, it is calculated.	1187	* If top is NULL, it is calculated.
1227	* Returns pointer to object if it succeded in the merge, otherwise NULL	1188	* Returns pointer to object if it succeded in the merge, otherwise NULL
1228	*/	1189	*/
1229
1230	object *	1190	object *
1231	merge_ob (object *op, object *top)	1191	merge_ob (object *op, object *top)
1232	{	1192	{
1233	if (!op->nrof)	1193	if (!op->nrof)
1234	return 0;	1194	return 0;
…		…
1238		1198
1239	for (; top != NULL; top = top->below)	1199	for (; top != NULL; top = top->below)
1240	{	1200	{
1241	if (top == op)	1201	if (top == op)
1242	continue;	1202	continue;
1243	if (CAN_MERGE (op, top))	1203
		1204	if (object::can_merge (op, top))
1244	{	1205	{
1245	top->nrof += op->nrof;	1206	top->nrof += op->nrof;
1246		1207
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1208	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1209	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1210	op->destroy ();
1250	free_object (op);
1251	return top;	1211	return top;
1252	}	1212	}
1253	}	1213	}
1254		1214
1255	return NULL;	1215	return 0;
1256	}	1216	}
1257		1217
1258	/*	1218	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1219	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1220	* job preparing multi-part monsters
1261	*/	1221	*/
1262	object *	1222	object *
1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1223	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264	{	1224	{
1265	object *tmp;	1225	object *tmp;
1266		1226
1267	if (op->head)	1227	if (op->head)
1268	op = op->head;	1228	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1256	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1257	* just 'op' otherwise
1298	*/	1258	*/
1299		1259
1300	object *	1260	object *
1301	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1261	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302	{	1262	{
1303	object *tmp, *top, *floor = NULL;	1263	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1264	sint16 x, y;
1305		1265
1306	if (QUERY_FLAG (op, FLAG_FREED))	1266	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1269	return NULL;
1310	}	1270	}
1311		1271
1312	if (m == NULL)	1272	if (m == NULL)
1313	{	1273	{
1314	dump_object (op);	1274	char *dump = dump_object (op);
1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1275	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1276	free (dump);
1316	return op;	1277	return op;
1317	}	1278	}
1318		1279
1319	if (out_of_map (m, op->x, op->y))	1280	if (out_of_map (m, op->x, op->y))
1320	{	1281	{
1321	dump_object (op);	1282	char *dump = dump_object (op);
1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323	#ifdef MANY_CORES	1284	#ifdef MANY_CORES
1324	/* Better to catch this here, as otherwise the next use of this object	1285	/* Better to catch this here, as otherwise the next use of this object
1325	* is likely to cause a crash. Better to find out where it is getting	1286	* is likely to cause a crash. Better to find out where it is getting
1326	* improperly inserted.	1287	* improperly inserted.
1327	*/	1288	*/
1328	abort ();	1289	abort ();
1329	#endif	1290	#endif
		1291	free (dump);
1330	return op;	1292	return op;
1331	}	1293	}
1332		1294
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1295	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1296	{
1335	dump_object (op);	1297	char *dump = dump_object (op);
1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1298	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1299	free (dump);
1337	return op;	1300	return op;
1338	}	1301	}
1339		1302
1340	if (op->more != NULL)	1303	if (op->more != NULL)
1341	{	1304	{
…		…
1379		1342
1380	/* this has to be done after we translate the coordinates.	1343	/* this has to be done after we translate the coordinates.
1381	*/	1344	*/
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1345	if (op->nrof && !(flag & INS_NO_MERGE))
1383	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1346	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1384	if (CAN_MERGE (op, tmp))	1347	if (object::can_merge (op, tmp))
1385	{	1348	{
1386	op->nrof += tmp->nrof;	1349	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1350	tmp->destroy ();
1388	free_object (tmp);
1389	}	1351	}
1390		1352
1391	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1355
…		…
1521	* it, so save a few ticks and start from there.	1483	* it, so save a few ticks and start from there.
1522	*/	1484	*/
1523	if (!(flag & INS_MAP_LOAD))	1485	if (!(flag & INS_MAP_LOAD))
1524	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1525	if (tmp->type == PLAYER)	1487	if (tmp->type == PLAYER)
1526	tmp->contr->socket.update_look = 1;	1488	tmp->contr->socket->update_look = 1;
1527		1489
1528	/* If this object glows, it may affect lighting conditions that are	1490	/* If this object glows, it may affect lighting conditions that are
1529	* visible to others on this map. But update_all_los is really	1491	* visible to others on this map. But update_all_los is really
1530	* an inefficient way to do this, as it means los for all players	1492	* an inefficient way to do this, as it means los for all players
1531	* on the map will get recalculated. The players could very well	1493	* on the map will get recalculated. The players could very well
…		…
1579	tmp1;	1541	tmp1;
1580		1542
1581	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1582		1544
1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1584	{
1585	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1547	tmp->destroy ();
1587	remove_ob (tmp);
1588	free_object (tmp);
1589	}
1590	}
1591		1548
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1549	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1550
1594	tmp1->x = op->x;	1551	tmp1->x = op->x;
1595	tmp1->y = op->y;	1552	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1553	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1554	}
…		…
1605	*/	1562	*/
1606		1563
1607	object *	1564	object *
1608	get_split_ob (object *orig_ob, uint32 nr)	1565	get_split_ob (object *orig_ob, uint32 nr)
1609	{	1566	{
1610	object *	1567	object *newob;
1611	newob;
1612	int
1613	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614		1569
1615	if (orig_ob->nrof < nr)	1570	if (orig_ob->nrof < nr)
1616	{	1571	{
1617	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1572	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1618	return NULL;	1573	return NULL;
1619	}	1574	}
1620		1575
1621	newob = object_create_clone (orig_ob);	1576	newob = object_create_clone (orig_ob);
1622		1577
1623	if ((orig_ob->nrof -= nr) < 1)	1578	if ((orig_ob->nrof -= nr) < 1)
1624	{	1579	orig_ob->destroy (1);
1625	if (!is_removed)
1626	remove_ob (orig_ob);
1627	free_object2 (orig_ob, 1);
1628	}
1629	else if (!is_removed)	1580	else if (!is_removed)
1630	{	1581	{
1631	if (orig_ob->env != NULL)	1582	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1583	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1584	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1697	esrv_send_item (tmp, op);	1648	esrv_send_item (tmp, op);
1698	}	1649	}
1699	}	1650	}
1700	else	1651	else
1701	{	1652	{
1702	remove_ob (op);	1653	op->remove ();
1703	op->nrof = 0;	1654	op->nrof = 0;
1704	if (tmp)	1655	if (tmp)
1705	{	1656	{
1706	esrv_del_item (tmp->contr, op->count);	1657	esrv_del_item (tmp->contr, op->count);
1707	}	1658	}
…		…
1713		1664
1714	if (i < op->nrof)	1665	if (i < op->nrof)
1715	op->nrof -= i;	1666	op->nrof -= i;
1716	else	1667	else
1717	{	1668	{
1718	remove_ob (op);	1669	op->remove ();
1719	op->nrof = 0;	1670	op->nrof = 0;
1720	}	1671	}
1721		1672
1722	/* Since we just removed op, op->above is null */	1673	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1674	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1732		1683
1733	if (op->nrof)	1684	if (op->nrof)
1734	return op;	1685	return op;
1735	else	1686	else
1736	{	1687	{
1737	free_object (op);	1688	op->destroy ();
1738	return NULL;	1689	return NULL;
1739	}	1690	}
1740	}	1691	}
1741		1692
1742	/*	1693	/*
…		…
1755	op->carrying += weight;	1706	op->carrying += weight;
1756	op = op->env;	1707	op = op->env;
1757	}	1708	}
1758	}	1709	}
1759		1710
		1711	object *
		1712	insert_ob_in_ob (object *op, object *where)
		1713	{
		1714	if (!where)
		1715	{
		1716	char *dump = dump_object (op);
		1717	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1718	free (dump);
		1719	return op;
		1720	}
		1721
		1722	if (where->head)
		1723	{
		1724	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1725	where = where->head;
		1726	}
		1727
		1728	return where->insert (op);
		1729	}
		1730
1760	/*	1731	/*
1761	* insert_ob_in_ob(op,environment):	1732	* env->insert (op)
1762	* This function inserts the object op in the linked list	1733	* This function inserts the object op in the linked list
1763	* inside the object environment.	1734	* inside the object environment.
1764	*	1735	*
1765	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1766	* the inventory at the last position or next to other objects of the same
1767	* type.
1768	* Frank: Now sorted by type, archetype and magic!
1769	*
1770	* The function returns now pointer to inserted item, and return value can	1736	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1737	* be != op, if items are merged. -Tero
1772	*/	1738	*/
1773		1739
1774	object *	1740	object *
1775	insert_ob_in_ob (object *op, object *where)	1741	object::insert (object *op)
1776	{	1742	{
1777	object *	1743	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1744
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1745	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1746	op->remove ();
1783	dump_object (op);
1784	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1785	return op;
1786	}
1787
1788	if (where == NULL)
1789	{
1790	dump_object (op);
1791	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1792	return op;
1793	}
1794
1795	if (where->head)
1796	{
1797	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1798	where = where->head;
1799	}
1800		1747
1801	if (op->more)	1748	if (op->more)
1802	{	1749	{
1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1750	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804	return op;	1751	return op;
…		…
1806		1753
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1754	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1755	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1756	if (op->nrof)
1810	{	1757	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1758	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1759	if (object::can_merge (tmp, op))
1813	{	1760	{
1814	/* return the original object and remove inserted object	1761	/* return the original object and remove inserted object
1815	(client needs the original object) */	1762	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1763	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1764	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1765	* tmp->nrof, we need to increase the weight.
1819	*/	1766	*/
1820	add_weight (where, op->weight * op->nrof);	1767	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1768	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1769	op->destroy (); /* free the inserted object */
1823	op = tmp;	1770	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1771	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1772	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1773	break;
1827	}	1774	}
1828		1775
1829	/* I assume combined objects have no inventory	1776	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1777	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1778	* (if it was possible to merge). calling remove_ob will subtract
1832	* the weight, so we need to add it in again, since we actually do	1779	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1780	* the linking below
1834	*/	1781	*/
1835	add_weight (where, op->weight * op->nrof);	1782	add_weight (this, op->weight * op->nrof);
1836	}	1783	}
1837	else	1784	else
1838	add_weight (where, (op->weight + op->carrying));	1785	add_weight (this, (op->weight + op->carrying));
1839		1786
1840	otmp = is_player_inv (where);	1787	otmp = is_player_inv (this);
1841	if (otmp && otmp->contr != NULL)	1788	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1789	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1790	fix_player (otmp);
1845	}
1846		1791
1847	op->map = NULL;	1792	op->map = NULL;
1848	op->env = where;	1793	op->env = this;
1849	op->above = NULL;	1794	op->above = NULL;
1850	op->below = NULL;	1795	op->below = NULL;
1851	op->x = 0, op->y = 0;	1796	op->x = 0, op->y = 0;
1852		1797
1853	/* reset the light list and los of the players on the map */	1798	/* reset the light list and los of the players on the map */
1854	if ((op->glow_radius != 0) && where->map)	1799	if ((op->glow_radius != 0) && map)
1855	{	1800	{
1856	#ifdef DEBUG_LIGHTS	1801	#ifdef DEBUG_LIGHTS
1857	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1802	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858	#endif /* DEBUG_LIGHTS */	1803	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1804	if (MAP_DARKNESS (map))
1860	update_all_los (where->map, where->x, where->y);	1805	update_all_los (map, x, y);
1861	}	1806	}
1862		1807
1863	/* Client has no idea of ordering so lets not bother ordering it here.	1808	/* Client has no idea of ordering so lets not bother ordering it here.
1864	* It sure simplifies this function...	1809	* It sure simplifies this function...
1865	*/	1810	*/
1866	if (where->inv == NULL)	1811	if (!inv)
1867	where->inv = op;	1812	inv = op;
1868	else	1813	else
1869	{	1814	{
1870	op->below = where->inv;	1815	op->below = inv;
1871	op->below->above = op;	1816	op->below->above = op;
1872	where->inv = op;	1817	inv = op;
1873	}	1818	}
		1819
1874	return op;	1820	return op;
1875	}	1821	}
1876		1822
1877	/*	1823	/*
1878	* Checks if any objects has a move_type that matches objects	1824	* Checks if any objects has a move_type that matches objects
…		…
1896	*/	1842	*/
1897		1843
1898	int	1844	int
1899	check_move_on (object *op, object *originator)	1845	check_move_on (object *op, object *originator)
1900	{	1846	{
1901	object *	1847	object *tmp;
1902	tmp;	1848	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1849	int x = op->x, y = op->y;
1909		1850
1910	MoveType	1851	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1852
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1853	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1854	return 0;
1917
1918	tag = op->count;
1919		1855
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1856	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1921	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1857	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1922	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1858	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1859
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1920	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1985	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1921	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1922	{
1987	move_apply (tmp, op, originator);	1923	move_apply (tmp, op, originator);
1988		1924
1989	if (was_destroyed (op, tag))	1925	if (op->destroyed ())
1990	return 1;	1926	return 1;
1991		1927
1992	/* what the person/creature stepped onto has moved the object	1928	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1929	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1930	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1942	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1943	* The first matching object is returned, or NULL if none.
2008	*/	1944	*/
2009		1945
2010	object *	1946	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1947	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1948	{
2013	object *	1949	object *
2014	tmp;	1950	tmp;
2015		1951
2016	if (m == NULL || out_of_map (m, x, y))	1952	if (m == NULL || out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	1965	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1966	* The first matching object is returned, or NULL if none.
2031	*/	1967	*/
2032		1968
2033	object *	1969	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1970	present (unsigned char type, maptile *m, int x, int y)
2035	{	1971	{
2036	object *	1972	object *
2037	tmp;	1973	tmp;
2038		1974
2039	if (out_of_map (m, x, y))	1975	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2115	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2116	* customized, changed states, etc.
2181	*/	2117	*/
2182		2118
2183	int	2119	int
2184	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2120	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185	{	2121	{
2186	int	2122	int
2187	i,	2123	i,
2188	index = 0, flag;	2124	index = 0, flag;
2189	static int	2125	static int
…		…
2210	return -1;	2146	return -1;
2211	return altern[RANDOM () % index];	2147	return altern[RANDOM () % index];
2212	}	2148	}
2213		2149
2214	/*	2150	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2151	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2152	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2153	* But it will return the first available spot, not a random choice.
2218	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2154	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2155	*/
2220		2156
2221	int	2157	int
2222	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2158	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223	{	2159	{
2224	int	2160	int
2225	i;	2161	i;
2226		2162
2227	for (i = 0; i < SIZEOFFREE; i++)	2163	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2227	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2228	* there is capable of.
2293	*/	2229	*/
2294		2230
2295	int	2231	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2232	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2233	{
2298	int	2234	int
2299	i,	2235	i,
2300	max = SIZEOFFREE, mflags;	2236	max = SIZEOFFREE, mflags;
2301		2237
2302	sint16 nx, ny;	2238	sint16 nx, ny;
2303	object *	2239	object *
2304	tmp;	2240	tmp;
2305	mapstruct *	2241	maptile *
2306	mp;	2242	mp;
2307		2243
2308	MoveType blocked, move_type;	2244	MoveType blocked, move_type;
2309		2245
2310	if (exclude && exclude->head)	2246	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2454	* Modified to be map tile aware -.MSW
2519	*/	2455	*/
2520		2456
2521		2457
2522	int	2458	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2459	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2460	{
2525	sint16 dx, dy;	2461	sint16 dx, dy;
2526	int	2462	int
2527	mflags;	2463	mflags;
2528		2464
…		…
2577	* create clone from object to another	2513	* create clone from object to another
2578	*/	2514	*/
2579	object *	2515	object *
2580	object_create_clone (object *asrc)	2516	object_create_clone (object *asrc)
2581	{	2517	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2518	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2519
2585	if (!asrc)	2520	if (!asrc)
2586	return NULL;	2521	return 0;
		2522
2587	src = asrc;	2523	src = asrc;
2588	if (src->head)	2524	if (src->head)
2589	src = src->head;	2525	src = src->head;
2590		2526
2591	prev = NULL;	2527	prev = 0;
2592	for (part = src; part; part = part->more)	2528	for (part = src; part; part = part->more)
2593	{	2529	{
2594	tmp = get_object ();	2530	tmp = part->clone ();
2595	copy_object (part, tmp);
2596	tmp->x -= src->x;	2531	tmp->x -= src->x;
2597	tmp->y -= src->y;	2532	tmp->y -= src->y;
		2533
2598	if (!part->head)	2534	if (!part->head)
2599	{	2535	{
2600	dst = tmp;	2536	dst = tmp;
2601	tmp->head = NULL;	2537	tmp->head = 0;
2602	}	2538	}
2603	else	2539	else
2604	{	2540	{
2605	tmp->head = dst;	2541	tmp->head = dst;
2606	}	2542	}
		2543
2607	tmp->more = NULL;	2544	tmp->more = 0;
		2545
2608	if (prev)	2546	if (prev)
2609	prev->more = tmp;	2547	prev->more = tmp;
		2548
2610	prev = tmp;	2549	prev = tmp;
2611	}	2550	}
2612		2551
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2552	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2553	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2554
2619	return dst;	2555	return dst;
2620	}	2556	}
2621		2557
2622	/* return true if the object was destroyed, 0 otherwise */
2623	int
2624	was_destroyed (const object *op, tag_t old_tag)
2625	{
2626	/* checking for FLAG_FREED isn't necessary, but makes this function more
2627	* robust */
2628	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2629	}
2630
2631	/* GROS - Creates an object using a string representing its content. */	2558	/* GROS - Creates an object using a string representing its content. */
2632
2633	/* Basically, we save the content of the string to a temp file, then call */	2559	/* Basically, we save the content of the string to a temp file, then call */
2634
2635	/* load_object on it. I admit it is a highly inefficient way to make things, */	2560	/* load_object on it. I admit it is a highly inefficient way to make things, */
2636
2637	/* but it was simple to make and allows reusing the load_object function. */	2561	/* but it was simple to make and allows reusing the load_object function. */
2638
2639	/* Remember not to use load_object_str in a time-critical situation. */	2562	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2563	/* Also remember that multiparts objects are not supported for now. */
2642		2564
2643	object *	2565	object *
2644	load_object_str (const char *obstr)	2566	load_object_str (const char *obstr)
2645	{	2567	{
2646	object *	2568	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2569	char filename[MAX_BUF];
2650		2570
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2571	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2572
2653	FILE *
2654	tempfile = fopen (filename, "w");	2573	FILE *tempfile = fopen (filename, "w");
2655		2574
2656	if (tempfile == NULL)	2575	if (tempfile == NULL)
2657	{	2576	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2577	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2578	return NULL;
2660	};	2579	}
		2580
2661	fprintf (tempfile, obstr);	2581	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2582	fclose (tempfile);
2663		2583
2664	op = get_object ();	2584	op = object::create ();
2665		2585
2666	object_thawer thawer (filename);	2586	object_thawer thawer (filename);
2667		2587
2668	if (thawer)	2588	if (thawer)
2669	load_object (thawer, op, 0);	2589	load_object (thawer, op, 0);
…		…
2679	* returns NULL if no match.	2599	* returns NULL if no match.
2680	*/	2600	*/
2681	object *	2601	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2602	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2603	{
2684	object *	2604	object *tmp;
2685	tmp;
2686		2605
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2606	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2607	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2608	return tmp;
2690		2609
…		…
2698	* do the desired thing.	2617	* do the desired thing.
2699	*/	2618	*/
2700	key_value *	2619	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2620	get_ob_key_link (const object *ob, const char *key)
2702	{	2621	{
2703	key_value *	2622	key_value *link;
2704	link;
2705		2623
2706	for (link = ob->key_values; link != NULL; link = link->next)	2624	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2625	if (link->key == key)
2709	{
2710	return link;	2626	return link;
2711	}
2712	}
2713		2627
2714	return NULL;	2628	return NULL;
2715	}	2629	}
2716		2630
2717	/*	2631	/*
…		…
2722	* The returned string is shared.	2636	* The returned string is shared.
2723	*/	2637	*/
2724	const char *	2638	const char *
2725	get_ob_key_value (const object *op, const char *const key)	2639	get_ob_key_value (const object *op, const char *const key)
2726	{	2640	{
2727	key_value *	2641	key_value *link;
2728	link;	2642	shstr_cmp canonical_key (key);
2729	const char *
2730	canonical_key;
2731		2643
2732	canonical_key = shstr::find (key);
2733
2734	if (canonical_key == NULL)	2644	if (!canonical_key)
2735	{	2645	{
2736	/* 1. There being a field named key on any object	2646	/* 1. There being a field named key on any object
2737	* implies there'd be a shared string to find.	2647	* implies there'd be a shared string to find.
2738	* 2. Since there isn't, no object has this field.	2648	* 2. Since there isn't, no object has this field.
2739	* 3. Therefore, *this* object doesn't have this field.	2649	* 3. Therefore, *this* object doesn't have this field.
2740	*/	2650	*/
2741	return NULL;	2651	return 0;
2742	}	2652	}
2743		2653
2744	/* This is copied from get_ob_key_link() above -	2654	/* This is copied from get_ob_key_link() above -
2745	* only 4 lines, and saves the function call overhead.	2655	* only 4 lines, and saves the function call overhead.
2746	*/	2656	*/
2747	for (link = op->key_values; link != NULL; link = link->next)	2657	for (link = op->key_values; link; link = link->next)
2748	{
2749	if (link->key == canonical_key)	2658	if (link->key == canonical_key)
2750	{
2751	return link->value;	2659	return link->value;
2752	}	2660
2753	}
2754	return NULL;	2661	return 0;
2755	}	2662	}
2756		2663
2757		2664
2758	/*	2665	/*
2759	* Updates the canonical_key in op to value.	2666	* Updates the canonical_key in op to value.
…		…
2845	shstr key_ (key);	2752	shstr key_ (key);
2846		2753
2847	return set_ob_key_value_s (op, key_, value, add_key);	2754	return set_ob_key_value_s (op, key_, value, add_key);
2848	}	2755	}
2849		2756
		2757	object::depth_iterator::depth_iterator (object *container)
		2758	: iterator_base (container)
		2759	{
		2760	while (item->inv)
		2761	item = item->inv;
		2762	}
		2763
2850	void	2764	void
2851	object::deep_iterator::next ()	2765	object::depth_iterator::next ()
2852	{	2766	{
2853	if (item->inv)
2854	item = item->inv;
2855	else if (item->below)	2767	if (item->below)
		2768	{
2856	item = item->below;	2769	item = item->below;
		2770
		2771	while (item->inv)
		2772	item = item->inv;
		2773	}
2857	else	2774	else
2858	item = item->env->below;	2775	item = item->env;
2859	}	2776	}
		2777
		2778	// return a suitable string describing an objetc in enough detail to find it
		2779	const char *
		2780	object::debug_desc (char *info) const
		2781	{
		2782	char info2[256 * 3];
		2783	char *p = info;
		2784
		2785	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2786	count,
		2787	&name,
		2788	title ? " " : "",
		2789	title ? (const char *)title : "");
		2790
		2791	if (env)
		2792	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2793
		2794	if (map)
		2795	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2796
		2797	return info;
		2798	}
		2799
		2800	const char *
		2801	object::debug_desc () const
		2802	{
		2803	static char info[256 * 3];
		2804	return debug_desc (info);
		2805	}
		2806

Diff Legend

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