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

Diff Legend

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