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.38 by root, Wed Sep 13 01:09:24 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 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. */
…		…
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 <loader.h>	33	#include <loader.h>
35		34
		35	#include <bitset>
		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
37		40
38	object *objects; /* Pointer to the list of used objects */
39	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 */
40		42
41	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,
42	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
43	};	45	};
…		…
50	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
51	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,
52	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
53	};	55	};
54		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
55	/* 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. */
56	static int	135	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	137	{
59	key_value *wants_field;	138	key_value *wants_field;
…		…
106	*	185	*
107	* 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
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
110	*	189	*
111	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
112	*	191	*
113	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
114	* check weight	193	* check weight
115	*/	194	*/
116		195
117	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	197	{
119	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
120	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)
121	return 0;	204	return 0;
122		205
123	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* 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
127	* 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
128	* used to store nrof).	209	* used to store nrof).
129	*/	210	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
140	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141		222
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		225
145		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
146	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
147	* being locked in inventory should prevent merging.
148	* 0x4 in flags3 is CLIENT_SENT
149	*/
150	if ((ob1->arch != ob2->arch) ||
151	(ob1->flags[0] != ob2->flags[0]) ||
152	(ob1->flags[1] != ob2->flags[1]) ||
153	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
154	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
155	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
156	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
157	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
158	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
159	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
160	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
161	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
162	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
163	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
164	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
165	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
166	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
167	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
168	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
169	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
170	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
171	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
172	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
173	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
174	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
175	(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)
176	return 0;	251	return 0;
177		252
178	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
179	* check all objects in the inventory.	254	* check all objects in the inventory.
180	*/	255	*/
…		…
183	/* 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 */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	260	return 0;
186		261
187	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	264	return 0;
190		265
191	/* 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
192	* if it is valid.	267	* if it is valid.
193	*/	268	*/
…		…
277	op = op->env;	352	op = op->env;
278	return op;	353	return op;
279	}	354	}
280		355
281	/*	356	/*
282	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
283	* a better check. We basically keeping traversing up until we can't
284	* or find a player.
285	*/
286
287	object *
288	is_player_inv (object *op)
289	{
290	for (; op != NULL && op->type != PLAYER; op = op->env)
291	if (op->env == op)
292	op->env = NULL;
293	return op;
294	}
295
296	/*
297	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
298	* Some error messages.	358	* Some error messages.
299	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
300	*/	360	*/
301		361
302	void	362	char *
303	dump_object2 (object *op)
304	{
305	errmsg[0] = 0;
306	return;
307	//TODO//D#d#
308	#if 0
309	char *cp;
310
311	/* object *tmp;*/
312
313	if (op->arch != NULL)
314	{
315	strcat (errmsg, "arch ");
316	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
317	strcat (errmsg, "\n");
318	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
319	strcat (errmsg, cp);
320	# if 0
321	/* Don't dump player diffs - they are too long, mostly meaningless, and
322	* will overflow the buffer.
323	* Changed so that we don't dump inventory either. This may
324	* also overflow the buffer.
325	*/
326	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
327	strcat (errmsg, cp);
328	for (tmp = op->inv; tmp; tmp = tmp->below)
329	dump_object2 (tmp);
330	# endif
331	strcat (errmsg, "end\n");
332	}
333	else
334	{
335	strcat (errmsg, "Object ");
336	if (op->name == NULL)
337	strcat (errmsg, "(null)");
338	else
339	strcat (errmsg, op->name);
340	strcat (errmsg, "\n");
341	# if 0
342	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
343	strcat (errmsg, cp);
344	for (tmp = op->inv; tmp; tmp = tmp->below)
345	dump_object2 (tmp);
346	# endif
347	strcat (errmsg, "end\n");
348	}
349	#endif
350	}
351
352	/*
353	* Dumps an object. Returns output in the static global errmsg array.
354	*/
355
356	void
357	dump_object (object *op)	363	dump_object (object *op)
358	{	364	{
359	if (op == NULL)	365	if (!op)
360	{	366	return strdup ("[NULLOBJ]");
361	strcpy (errmsg, "[NULL pointer]");
362	return;
363	}
364	errmsg[0] = '\0';
365	dump_object2 (op);
366	}
367		367
368	void	368	object_freezer freezer;
369	dump_all_objects (void)	369	save_object (freezer, op, 3);
370	{	370	return freezer.as_string ();
371	object *op;
372
373	for (op = objects; op != NULL; op = op->next)
374	{
375	dump_object (op);
376	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
377	}
378	}	371	}
379		372
380	/*	373	/*
381	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
382	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
402	*/	395	*/
403		396
404	object *	397	object *
405	find_object (tag_t i)	398	find_object (tag_t i)
406	{	399	{
407	object *op;	400	for (object *op = object::first; op; op = op->next)
408
409	for (op = objects; op != NULL; op = op->next)
410	if (op->count == i)	401	if (op->count == i)
411	break;	402	return op;
		403
412	return op;	404	return 0;
413	}	405	}
414		406
415	/*	407	/*
416	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
417	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
422	find_object_name (const char *str)	414	find_object_name (const char *str)
423	{	415	{
424	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
425	object *op;	417	object *op;
426		418
427	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
428	if (op->name == str_)	420	if (op->name == str_)
429	break;	421	break;
430		422
431	return op;	423	return op;
432	}	424	}
433		425
434	void	426	void
435	free_all_object_data ()	427	free_all_object_data ()
436	{	428	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}
439
440	/*
441	* Returns the object which this object marks as being the owner.
442	* A id-scheme is used to avoid pointing to objects which have been
443	* freed and are now reused. If this is detected, the owner is
444	* set to NULL, and NULL is returned.
445	* Changed 2004-02-12 - if the player is setting at the play again
446	* prompt, he is removed, and we don't want to treat him as an owner of
447	* anything, so check removed flag. I don't expect that this should break
448	* anything - once an object is removed, it is basically dead anyways.
449	*/
450	object *
451	object::get_owner ()
452	{
453	if (!owner
454	|| QUERY_FLAG (owner, FLAG_FREED)
455	|| QUERY_FLAG (owner, FLAG_REMOVED))
456	owner = 0;
457
458	return owner;
459	}	430	}
460		431
461	/*	432	/*
462	* Sets the owner and sets the skill and exp pointers to owner's current	433	* Sets the owner and sets the skill and exp pointers to owner's current
463	* skill and experience objects.	434	* skill and experience objects.
…		…
533		504
534	/* What is not cleared is next, prev, and count */	505	/* What is not cleared is next, prev, and count */
535		506
536	expmul = 1.0;	507	expmul = 1.0;
537	face = blank_face;	508	face = blank_face;
538	attacked_by_count = -1;
539		509
540	if (settings.casting_time)	510	if (settings.casting_time)
541	casting_time = -1;	511	casting_time = -1;
542	}	512	}
543		513
544	void object::clone (object *destination)
545	{
546	*(object_copy *)destination = *this;
547	*(object_pod *)destination = *this;
548
549	if (self || cb)
550	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
551	}
552
553	/*	514	/*
554	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
555	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
556	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
557	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
558	* if the first object is freed, the pointers in the new object	519	* if the first object is freed, the pointers in the new object
559	* will point at garbage.	520	* will point at garbage.
560	*/	521	*/
561	void	522	void
562	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
563	{	524	{
564	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
565	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
566		527
567	op2->clone (op);	528	*(object_copy *)dst = *this;
		529	*(object_pod *)dst = *this;
		530
		531	if (self || cb)
		532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
568		533
569	if (is_freed)	534	if (is_freed)
570	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
571	if (is_removed)	537	if (is_removed)
572	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
573		539
574	if (op2->speed < 0)	540	if (speed < 0)
575	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
576		542
577	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
578	if (op2->key_values)	544	if (key_values)
579	{	545	{
580	key_value *tail = 0;	546	key_value *tail = 0;
581	key_value *i;	547	key_value *i;
582		548
583	op->key_values = 0;	549	dst->key_values = 0;
584		550
585	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
586	{	552	{
587	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
588		554
589	new_link->next = 0;	555	new_link->next = 0;
590	new_link->key = i->key;	556	new_link->key = i->key;
591	new_link->value = i->value;	557	new_link->value = i->value;
592		558
593	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
594	if (!op->key_values)	560	if (!dst->key_values)
595	{	561	{
596	op->key_values = new_link;	562	dst->key_values = new_link;
597	tail = new_link;	563	tail = new_link;
598	}	564	}
599	else	565	else
600	{	566	{
601	tail->next = new_link;	567	tail->next = new_link;
602	tail = new_link;	568	tail = new_link;
603	}	569	}
604	}	570	}
605	}	571	}
606		572
607	update_ob_speed (op);	573	update_ob_speed (dst);
		574	}
		575
		576	object *
		577	object::clone ()
		578	{
		579	object *neu = create ();
		580	copy_to (neu);
		581	return neu;
608	}	582	}
609		583
610	/*	584	/*
611	* If an object with the IS_TURNABLE() flag needs to be turned due	585	* If an object with the IS_TURNABLE() flag needs to be turned due
612	* to the closest player being on the other side, this function can	586	* to the closest player being on the other side, this function can
…		…
817	update_now = 1;	791	update_now = 1;
818		792
819	if ((move_slow | op->move_slow) != move_slow)	793	if ((move_slow | op->move_slow) != move_slow)
820	update_now = 1;	794	update_now = 1;
821	}	795	}
		796
822	/* if the object is being removed, we can't make intelligent	797	/* if the object is being removed, we can't make intelligent
823	* decisions, because remove_ob can't really pass the object	798	* decisions, because remove_ob can't really pass the object
824	* that is being removed.	799	* that is being removed.
825	*/	800	*/
826	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
838		813
839	if (op->more != NULL)	814	if (op->more != NULL)
840	update_object (op->more, action);	815	update_object (op->more, action);
841	}	816	}
842		817
843	static unordered_vector<object *> mortals;	818	object::vector object::mortals;
844	static std::vector<object *, slice_allocator <object *> > freed;	819	object::vector object::objects; // not yet used
		820	object *object::first;
845		821
846	void object::free_mortals ()	822	void object::free_mortals ()
847	{	823	{
848	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849	if ((*i)->refcnt)	825	if ((*i)->refcnt)
850	++i; // further delay freeing	826	++i; // further delay freeing
851	else	827	else
852	{	828	{
853	freed.push_back (*i);//D
854	//delete *i;	829	delete *i;
855	mortals.erase (i);	830	mortals.erase (i);
856	}	831	}
857
858	if (mortals.size() && 0)//D
859	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
860	}	832	}
861		833
862	object::object ()	834	object::object ()
863	{	835	{
864	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
865		837
866	expmul = 1.0;	838	expmul = 1.0;
867	face = blank_face;	839	face = blank_face;
868	attacked_by_count = -1;
869	}	840	}
870		841
871	object::~object ()	842	object::~object ()
872	{	843	{
873	free_key_values (this);	844	free_key_values (this);
874	}	845	}
875		846
876	void object::link ()	847	void object::link ()
877	{	848	{
878	count = ++ob_count;	849	count = ++ob_count;
		850	uuid = gen_uuid ();
879		851
880	prev = 0;	852	prev = 0;
881	next = objects;	853	next = object::first;
882		854
883	if (objects)	855	if (object::first)
884	objects->prev = this;	856	object::first->prev = this;
885		857
886	objects = this;	858	object::first = this;
887	}	859	}
888		860
889	void object::unlink ()	861	void object::unlink ()
890	{	862	{
891	count = 0;
892
893	if (this == objects)	863	if (this == object::first)
894	objects = next;	864	object::first = next;
895		865
896	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
897	if (prev)
898	{
899	prev->next = next;	867	if (prev) prev->next = next;
		868	if (next) next->prev = prev;
		869
900	prev = 0;	870	prev = 0;
901	}
902
903	if (next)
904	{
905	next->prev = prev;
906	next = 0;	871	next = 0;
907	}
908	}	872	}
909		873
910	object *object::create ()	874	object *object::create ()
911	{	875	{
912	object *op;
913
914	if (freed.empty ())
915	op = new object;	876	object *op = new object;
916	else
917	{
918	// highly annoying, but the only way to get it stable right now
919	op = freed.back ();
920	freed.pop_back ();
921	op->~object ();
922	new ((void *) op) object;
923	}
924
925	op->link ();	877	op->link ();
926	return op;	878	return op;
927	}	879	}
928		880
929	/*	881	/*
…		…
931	* it from the list of used objects, and puts it on the list of	883	* it from the list of used objects, and puts it on the list of
932	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
933	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
934	* this function to succeed.	886	* this function to succeed.
935	*	887	*
936	* If free_inventory is set, free inventory as well. Else drop items in	888	* If destroy_inventory is set, free inventory as well. Else drop items in
937	* inventory to the ground.	889	* inventory to the ground.
938	*/	890	*/
939	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
940	{	892	{
941	if (QUERY_FLAG (this, FLAG_FREED))	893	if (QUERY_FLAG (this, FLAG_FREED))
942	return;	894	return;
943		895
944	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
945	remove_friendly_object (this);	897	remove_friendly_object (this);
946		898
947	if (!QUERY_FLAG (this, FLAG_REMOVED))	899	if (!QUERY_FLAG (this, FLAG_REMOVED))
948	remove_ob (this);	900	remove ();
949		901
950	SET_FLAG (this, FLAG_FREED);	902	SET_FLAG (this, FLAG_FREED);
951		903
952	if (more)	904	if (more)
953	{	905	{
954	more->free (free_inventory);	906	more->destroy (destroy_inventory);
955	more = 0;	907	more = 0;
956	}	908	}
957		909
958	if (inv)	910	if (inv)
959	{	911	{
960	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
961	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
962	* drop on that space.	914	* drop on that space.
963	*/	915	*/
964	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
965	{	917	{
966	object *op = inv;	918	object *op = inv;
967		919
968	while (op)	920	while (op)
969	{	921	{
970	object *tmp = op->below;	922	object *tmp = op->below;
971	op->free (free_inventory);	923	op->destroy (destroy_inventory);
972	op = tmp;	924	op = tmp;
973	}	925	}
974	}	926	}
975	else	927	else
976	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
…		…
978		930
979	while (op)	931	while (op)
980	{	932	{
981	object *tmp = op->below;	933	object *tmp = op->below;
982		934
983	remove_ob (op);	935	op->remove ();
984		936
985	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
986	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
987	free_object (op);	939	op->destroy ();
988	else	940	else
989	{	941	{
990	op->x = x;	942	op->x = x;
991	op->y = y;	943	op->y = y;
992	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
995	op = tmp;	947	op = tmp;
996	}	948	}
997	}	949	}
998	}	950	}
999		951
		952	// hack to ensure that freed objects still have a valid map
		953	{
		954	static maptile *freed_map; // freed objects are moved here to avoid crashes
		955
		956	if (!freed_map)
		957	{
		958	freed_map = new maptile;
		959
		960	freed_map->name = "/internal/freed_objects_map";
		961	freed_map->width = 3;
		962	freed_map->height = 3;
		963
		964	freed_map->allocate ();
		965	}
		966
		967	map = freed_map;
		968	x = 1;
		969	y = 1;
		970	}
		971
		972	// clear those pointers that likely might have circular references to us
1000	owner = 0;	973	owner = 0;
		974	enemy = 0;
		975	attacked_by = 0;
		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
1001		979
1002	/* Remove object from the active list */	980	/* Remove object from the active list */
1003	speed = 0;	981	speed = 0;
1004	update_ob_speed (this);	982	update_ob_speed (this);
1005		983
…		…
1010		988
1011	/*	989	/*
1012	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1013	* weight of an object (and what is carried by it's environment(s)).	991	* weight of an object (and what is carried by it's environment(s)).
1014	*/	992	*/
1015
1016	void	993	void
1017	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1018	{	995	{
1019	while (op != NULL)	996	while (op != NULL)
1020	{	997	{
1021	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1022	{
1023	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024	}	1000
1025	op->carrying -= weight;	1001	op->carrying -= weight;
1026	op = op->env;	1002	op = op->env;
1027	}	1003	}
1028	}	1004	}
1029		1005
1030	/* remove_ob(op):	1006	/* op->remove ():
1031	* This function removes the object op from the linked list of objects	1007	* This function removes the object op from the linked list of objects
1032	* which it is currently tied to. When this function is done, the	1008	* which it is currently tied to. When this function is done, the
1033	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1034	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1035	* the previous environment.	1011	* the previous environment.
1036	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1037	*/	1013	*/
1038
1039	void	1014	void
1040	remove_ob (object *op)	1015	object::remove ()
1041	{	1016	{
		1017	object *tmp, *last = 0;
1042	object *	1018	object *otmp;
1043	tmp, *
1044	last = NULL;
1045	object *
1046	otmp;
1047		1019
1048	tag_t
1049	tag;
1050	int
1051	check_walk_off;	1020	int check_walk_off;
1052	mapstruct *
1053	m;
1054		1021
1055	sint16
1056	x,
1057	y;
1058
1059	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1060	return;	1023	return;
1061		1024
1062	SET_FLAG (op, FLAG_REMOVED);	1025	SET_FLAG (this, FLAG_REMOVED);
1063		1026
1064	if (op->more != NULL)	1027	if (more)
1065	remove_ob (op->more);	1028	more->remove ();
1066		1029
1067	/*	1030	/*
1068	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1069	* inventory.	1032	* inventory.
1070	*/	1033	*/
1071	if (op->env != NULL)	1034	if (env)
1072	{	1035	{
1073	if (op->nrof)	1036	if (nrof)
1074	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1075	else	1038	else
1076	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1077		1040
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1043	* to save cpu time.
1081	*/	1044	*/
1082	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1083	fix_player (otmp);	1046	fix_player (otmp);
1084		1047
1085	if (op->above != NULL)	1048	if (above != NULL)
1086	op->above->below = op->below;	1049	above->below = below;
1087	else	1050	else
1088	op->env->inv = op->below;	1051	env->inv = below;
1089		1052
1090	if (op->below != NULL)	1053	if (below != NULL)
1091	op->below->above = op->above;	1054	below->above = above;
1092		1055
1093	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1094	* the map, but we don't actually do that - it is up	1057	* the map, but we don't actually do that - it is up
1095	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1096	*/	1059	*/
1097	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1098	op->map = op->env->map;	1061	map = env->map;
1099	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1100	op->env = NULL;	1063	env = 0;
1101	}	1064	}
1102	else if (op->map)	1065	else if (map)
1103	{	1066	{
1104	x = op->x;
1105	y = op->y;
1106	m = get_map_from_coord (op->map, &x, &y);
1107
1108	if (!m)
1109	{
1110	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1111	op->map->path, op->x, op->y);
1112	/* in old days, we used to set x and y to 0 and continue.
1113	* it seems if we get into this case, something is probablye
1114	* screwed up and should be fixed.
1115	*/
1116	abort ();
1117	}
1118
1119	if (op->map != m)
1120	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1121	op->map->path, m->path, op->x, op->y, x, y);
1122
1123	/* Re did the following section of code - it looks like it had	1067	/* Re did the following section of code - it looks like it had
1124	* lots of logic for things we no longer care about	1068	* lots of logic for things we no longer care about
1125	*/	1069	*/
1126		1070
1127	/* link the object above us */	1071	/* link the object above us */
1128	if (op->above)	1072	if (above)
1129	op->above->below = op->below;	1073	above->below = below;
1130	else	1074	else
1131	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1132		1076
1133	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1134	if (op->below)	1078	if (below)
1135	op->below->above = op->above;	1079	below->above = above;
1136	else	1080	else
1137	{	1081	{
1138	/* Nothing below, which means we need to relink map object for this space	1082	/* Nothing below, which means we need to relink map object for this space
1139	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1140	* evident	1084	* evident
1141	*/	1085	*/
1142	if (GET_MAP_OB (m, x, y) != op)	1086	if (GET_MAP_OB (map, x, y) != this)
1143	{	1087	{
1144	dump_object (op);	1088	char *dump = dump_object (this);
1145	LOG (llevError,	1089	LOG (llevError,
1146	"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);	1090	"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);
		1091	free (dump);
1147	dump_object (GET_MAP_OB (m, x, y));	1092	dump = dump_object (GET_MAP_OB (map, x, y));
1148	LOG (llevError, "%s\n", errmsg);	1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1149	}	1095	}
1150		1096
1151	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1152	}	1098	}
1153		1099
1154	op->above = 0;	1100	above = 0;
1155	op->below = 0;	1101	below = 0;
1156		1102
1157	if (op->map->in_memory == MAP_SAVING)	1103	if (map->in_memory == MAP_SAVING)
1158	return;	1104	return;
1159		1105
1160	tag = op->count;
1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1162		1107
1163	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1164	{	1109	{
1165	/* No point updating the players look faces if he is the object	1110	/* No point updating the players look faces if he is the object
1166	* being removed.	1111	* being removed.
1167	*/	1112	*/
1168		1113
1169	if (tmp->type == PLAYER && tmp != op)	1114	if (tmp->type == PLAYER && tmp != this)
1170	{	1115	{
1171	/* If a container that the player is currently using somehow gets	1116	/* If a container that the player is currently using somehow gets
1172	* removed (most likely destroyed), update the player view	1117	* removed (most likely destroyed), update the player view
1173	* appropriately.	1118	* appropriately.
1174	*/	1119	*/
1175	if (tmp->container == op)	1120	if (tmp->container == this)
1176	{	1121	{
1177	CLEAR_FLAG (op, FLAG_APPLIED);	1122	CLEAR_FLAG (this, FLAG_APPLIED);
1178	tmp->container = NULL;	1123	tmp->container = 0;
1179	}	1124	}
1180		1125
1181	tmp->contr->socket.update_look = 1;	1126	tmp->contr->socket->floorbox_update ();
1182	}	1127	}
1183		1128
1184	/* See if player moving off should effect something */	1129	/* See if player moving off should effect something */
1185	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1130	if (check_walk_off
		1131	&& ((move_type & tmp->move_off)
		1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186	{	1133	{
1187	move_apply (tmp, op, NULL);	1134	move_apply (tmp, this, 0);
1188		1135
1189	if (was_destroyed (op, tag))	1136	if (destroyed ())
1190	{
1191	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192	}
1193	}	1138	}
1194		1139
1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196		1141
1197	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1198	tmp->above = NULL;	1143	tmp->above = 0;
1199		1144
1200	last = tmp;	1145	last = tmp;
1201	}	1146	}
1202		1147
1203	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1204	if (last == NULL)	1149	if (!last)
1205	{	1150	{
1206	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1207	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1208	* those out anyways, and if there are any flags set right now, they won't	1153	* those out anyways, and if there are any flags set right now, they won't
1209	* be correct anyways.	1154	* be correct anyways.
1210	*/	1155	*/
1211	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1212	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1213	}	1158	}
1214	else	1159	else
1215	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1216		1161
1217	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1218	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
1219	}	1164	}
1220	}	1165	}
1221		1166
1222	/*	1167	/*
1223	* merge_ob(op,top):	1168	* merge_ob(op,top):
…		…
1238		1183
1239	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1240	{	1185	{
1241	if (top == op)	1186	if (top == op)
1242	continue;	1187	continue;
1243	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1244	{	1190	{
1245	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1246		1192
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1195	op->destroy ();
1250	free_object (op);
1251	return top;	1196	return top;
1252	}	1197	}
1253	}	1198	}
1254		1199
1255	return NULL;	1200	return 0;
1256	}	1201	}
1257		1202
1258	/*	1203	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1204	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1261	*/	1206	*/
1262	object *	1207	object *
1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264	{	1209	{
1265	object *tmp;	1210	object *tmp;
1266		1211
1267	if (op->head)	1212	if (op->head)
1268	op = op->head;	1213	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1242	* just 'op' otherwise
1298	*/	1243	*/
1299		1244
1300	object *	1245	object *
1301	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1246	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302	{	1247	{
1303	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1249	sint16 x, y;
1305		1250
1306	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1254	return NULL;
1310	}	1255	}
1311		1256
1312	if (m == NULL)	1257	if (m == NULL)
1313	{	1258	{
1314	dump_object (op);	1259	char *dump = dump_object (op);
1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1260	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1261	free (dump);
1316	return op;	1262	return op;
1317	}	1263	}
1318		1264
1319	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1320	{	1266	{
1321	dump_object (op);	1267	char *dump = dump_object (op);
1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1324	/* Better to catch this here, as otherwise the next use of this object	1270	/* 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	1271	* is likely to cause a crash. Better to find out where it is getting
1326	* improperly inserted.	1272	* improperly inserted.
1327	*/	1273	*/
1328	abort ();	1274	abort ();
1329	#endif	1275	#endif
		1276	free (dump);
1330	return op;	1277	return op;
1331	}	1278	}
1332		1279
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1281	{
1335	dump_object (op);	1282	char *dump = dump_object (op);
1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1284	free (dump);
1337	return op;	1285	return op;
1338	}	1286	}
1339		1287
1340	if (op->more != NULL)	1288	if (op->more != NULL)
1341	{	1289	{
…		…
1379		1327
1380	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1381	*/	1329	*/
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1383	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1384	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1385	{	1333	{
1386	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1335	tmp->destroy ();
1388	free_object (tmp);
1389	}	1336	}
1390		1337
1391	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1340
…		…
1521	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1522	*/	1469	*/
1523	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1524	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1525	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1526	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1527		1474
1528	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1529	* visible to others on this map. But update_all_los is really	1476	* 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	1477	* 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	1478	* on the map will get recalculated. The players could very well
…		…
1539		1486
1540	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1541	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1542		1489
1543	/* Don't know if moving this to the end will break anything. However,	1490	/* Don't know if moving this to the end will break anything. However,
1544	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1545	*	1492	*
1546	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1547	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1548	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1549	* update_object().	1496	* update_object().
…		…
1579	tmp1;	1526	tmp1;
1580		1527
1581	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1582		1529
1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1530	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 */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1532	tmp->destroy ();
1587	remove_ob (tmp);
1588	free_object (tmp);
1589	}
1590	}
1591		1533
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1535
1594	tmp1->x = op->x;	1536	tmp1->x = op->x;
1595	tmp1->y = op->y;	1537	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1539	}
…		…
1605	*/	1547	*/
1606		1548
1607	object *	1549	object *
1608	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1609	{	1551	{
1610	object *	1552	object *newob;
1611	newob;
1612	int
1613	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614		1554
1615	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1616	{	1556	{
1617	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1557	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1618	return NULL;	1558	return NULL;
1619	}	1559	}
1620		1560
1621	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
1622		1562
1623	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1624	{	1564	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)	1565	else if (!is_removed)
1630	{	1566	{
1631	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1569	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1663	if (i > op->nrof)	1599	if (i > op->nrof)
1664	i = op->nrof;	1600	i = op->nrof;
1665		1601
1666	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1667	op->nrof -= i;	1603	op->nrof -= i;
1668	else if (op->env != NULL)	1604	else if (op->env)
1669	{	1605	{
1670	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1671	* therein?	1607	* therein?
1672	*/	1608	*/
1673	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1674	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1675	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1676	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1677	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1678	* and then searching the map for a player.	1614	* and then searching the map for a player.
1679	*/	1615	*/
1680	if (!tmp)	1616	if (!tmp)
1681	{	1617	{
1682	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1683	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1684	break;	1622	break;
1685	if (pl)	1623	}
1686	tmp = pl->ob;
1687	else
1688	tmp = NULL;
1689	}	1624	}
1690		1625
1691	if (i < op->nrof)	1626	if (i < op->nrof)
1692	{	1627	{
1693	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1694	op->nrof -= i;	1629	op->nrof -= i;
1695	if (tmp)	1630	if (tmp)
1696	{
1697	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1698	}
1699	}	1632	}
1700	else	1633	else
1701	{	1634	{
1702	remove_ob (op);	1635	op->remove ();
1703	op->nrof = 0;	1636	op->nrof = 0;
1704	if (tmp)	1637	if (tmp)
1705	{
1706	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1707	}
1708	}	1639	}
1709	}	1640	}
1710	else	1641	else
1711	{	1642	{
1712	object *above = op->above;	1643	object *above = op->above;
1713		1644
1714	if (i < op->nrof)	1645	if (i < op->nrof)
1715	op->nrof -= i;	1646	op->nrof -= i;
1716	else	1647	else
1717	{	1648	{
1718	remove_ob (op);	1649	op->remove ();
1719	op->nrof = 0;	1650	op->nrof = 0;
1720	}	1651	}
1721		1652
1722	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1724	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1725	{	1656	{
1726	if (op->nrof)	1657	if (op->nrof)
1727	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1728	else	1659	else
…		…
1732		1663
1733	if (op->nrof)	1664	if (op->nrof)
1734	return op;	1665	return op;
1735	else	1666	else
1736	{	1667	{
1737	free_object (op);	1668	op->destroy ();
1738	return NULL;	1669	return 0;
1739	}	1670	}
1740	}	1671	}
1741		1672
1742	/*	1673	/*
1743	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1755	op->carrying += weight;	1686	op->carrying += weight;
1756	op = op->env;	1687	op = op->env;
1757	}	1688	}
1758	}	1689	}
1759		1690
		1691	object *
		1692	insert_ob_in_ob (object *op, object *where)
		1693	{
		1694	if (!where)
		1695	{
		1696	char *dump = dump_object (op);
		1697	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1698	free (dump);
		1699	return op;
		1700	}
		1701
		1702	if (where->head)
		1703	{
		1704	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1705	where = where->head;
		1706	}
		1707
		1708	return where->insert (op);
		1709	}
		1710
1760	/*	1711	/*
1761	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1762	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1763	* inside the object environment.	1714	* inside the object environment.
1764	*	1715	*
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	1716	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1772	*/	1718	*/
1773		1719
1774	object *	1720	object *
1775	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1776	{	1722	{
1777	object *	1723	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1724
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1726	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		1727
1801	if (op->more)	1728	if (op->more)
1802	{	1729	{
1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1730	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804	return op;	1731	return op;
…		…
1806		1733
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1736	if (op->nrof)
1810	{	1737	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1813	{	1740	{
1814	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1815	(client needs the original object) */	1742	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1819	*/	1746	*/
1820	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1823	op = tmp;	1750	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1753	break;
1827	}	1754	}
1828		1755
1829	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1758	* (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	1759	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1760	* the linking below
1834	*/	1761	*/
1835	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1836	}	1763	}
1837	else	1764	else
1838	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1839		1766
1840	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1841	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1770	fix_player (otmp);
1845	}
1846		1771
1847	op->map = NULL;	1772	op->map = 0;
1848	op->env = where;	1773	op->env = this;
1849	op->above = NULL;	1774	op->above = 0;
1850	op->below = NULL;	1775	op->below = 0;
1851	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1852		1777
1853	/* reset the light list and los of the players on the map */	1778	/* reset the light list and los of the players on the map */
1854	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1855	{	1780	{
1856	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1857	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1782	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1860	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1861	}	1786	}
1862		1787
1863	/* Client has no idea of ordering so lets not bother ordering it here.	1788	/* Client has no idea of ordering so lets not bother ordering it here.
1864	* It sure simplifies this function...	1789	* It sure simplifies this function...
1865	*/	1790	*/
1866	if (where->inv == NULL)	1791	if (!inv)
1867	where->inv = op;	1792	inv = op;
1868	else	1793	else
1869	{	1794	{
1870	op->below = where->inv;	1795	op->below = inv;
1871	op->below->above = op;	1796	op->below->above = op;
1872	where->inv = op;	1797	inv = op;
1873	}	1798	}
		1799
1874	return op;	1800	return op;
1875	}	1801	}
1876		1802
1877	/*	1803	/*
1878	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1896	*/	1822	*/
1897		1823
1898	int	1824	int
1899	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1900	{	1826	{
1901	object *	1827	object *tmp;
1902	tmp;	1828	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
1909		1830
1910	MoveType	1831	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1832
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1834	return 0;
1917
1918	tag = op->count;
1919		1835
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1836	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);	1837	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);	1838	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1839
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	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))	1901	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1902	{
1987	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
1988		1904
1989	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
1990	return 1;	1906	return 1;
1991		1907
1992	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2008	*/	1924	*/
2009		1925
2010	object *	1926	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1928	{
2013	object *	1929	object *
2014	tmp;	1930	tmp;
2015		1931
2016	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2031	*/	1947	*/
2032		1948
2033	object *	1949	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2035	{	1951	{
2036	object *	1952	object *
2037	tmp;	1953	tmp;
2038		1954
2039	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2095	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2096	* customized, changed states, etc.
2181	*/	2097	*/
2182		2098
2183	int	2099	int
2184	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2100	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185	{	2101	{
2186	int	2102	int
2187	i,	2103	i,
2188	index = 0, flag;	2104	index = 0, flag;
2189	static int	2105	static int
…		…
2201	* if the space being examined only has a wall to the north and empty	2117	* if the space being examined only has a wall to the north and empty
2202	* spaces in all the other directions, this will reduce the search space	2118	* spaces in all the other directions, this will reduce the search space
2203	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2204	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2205	*/	2121	*/
2206	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2207	stop = maxfree[i];	2123	stop = maxfree[i];
2208	}	2124	}
		2125
2209	if (!index)	2126	if (!index)
2210	return -1;	2127	return -1;
		2128
2211	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2212	}	2130	}
2213		2131
2214	/*	2132	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2135	* 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.	2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2137	*/
2220		2138
2221	int	2139	int
2222	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2140	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223	{	2141	{
2224	int	2142	int
2225	i;	2143	i;
2226		2144
2227	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2209	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2210	* there is capable of.
2293	*/	2211	*/
2294		2212
2295	int	2213	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2215	{
2298	int	2216	int
2299	i,	2217	i,
2300	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2301		2219
2302	sint16 nx, ny;	2220	sint16 nx, ny;
2303	object *	2221	object *
2304	tmp;	2222	tmp;
2305	mapstruct *	2223	maptile *
2306	mp;	2224	mp;
2307		2225
2308	MoveType blocked, move_type;	2226	MoveType blocked, move_type;
2309		2227
2310	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2519	*/	2437	*/
2520		2438
2521		2439
2522	int	2440	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2442	{
2525	sint16 dx, dy;	2443	sint16 dx, dy;
2526	int	2444	int
2527	mflags;	2445	mflags;
2528		2446
…		…
2577	* create clone from object to another	2495	* create clone from object to another
2578	*/	2496	*/
2579	object *	2497	object *
2580	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2581	{	2499	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2501
2585	if (!asrc)	2502	if (!asrc)
2586	return NULL;	2503	return 0;
		2504
2587	src = asrc;	2505	src = asrc;
2588	if (src->head)	2506	if (src->head)
2589	src = src->head;	2507	src = src->head;
2590		2508
2591	prev = NULL;	2509	prev = 0;
2592	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2593	{	2511	{
2594	tmp = get_object ();	2512	tmp = part->clone ();
2595	copy_object (part, tmp);
2596	tmp->x -= src->x;	2513	tmp->x -= src->x;
2597	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2598	if (!part->head)	2516	if (!part->head)
2599	{	2517	{
2600	dst = tmp;	2518	dst = tmp;
2601	tmp->head = NULL;	2519	tmp->head = 0;
2602	}	2520	}
2603	else	2521	else
2604	{	2522	{
2605	tmp->head = dst;	2523	tmp->head = dst;
2606	}	2524	}
		2525
2607	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2608	if (prev)	2528	if (prev)
2609	prev->more = tmp;	2529	prev->more = tmp;
		2530
2610	prev = tmp;	2531	prev = tmp;
2611	}	2532	}
2612		2533
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2536
2619	return dst;	2537	return dst;
2620	}	2538	}
2621		2539
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. */	2540	/* 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 */	2541	/* 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, */	2542	/* 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. */	2543	/* 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. */	2544	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2642		2546
2643	object *	2547	object *
2644	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2645	{	2549	{
2646	object *	2550	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2650		2552
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2554
2653	FILE *
2654	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2655		2556
2656	if (tempfile == NULL)	2557	if (tempfile == NULL)
2657	{	2558	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2560	return NULL;
2660	};	2561	}
		2562
2661	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2564	fclose (tempfile);
2663		2565
2664	op = get_object ();	2566	op = object::create ();
2665		2567
2666	object_thawer thawer (filename);	2568	object_thawer thawer (filename);
2667		2569
2668	if (thawer)	2570	if (thawer)
2669	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
…		…
2679	* returns NULL if no match.	2581	* returns NULL if no match.
2680	*/	2582	*/
2681	object *	2583	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2584	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2585	{
2684	object *	2586	object *tmp;
2685	tmp;
2686		2587
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2590	return tmp;
2690		2591
…		…
2698	* do the desired thing.	2599	* do the desired thing.
2699	*/	2600	*/
2700	key_value *	2601	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2702	{	2603	{
2703	key_value *	2604	key_value *link;
2704	link;
2705		2605
2706	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2607	if (link->key == key)
2709	{
2710	return link;	2608	return link;
2711	}
2712	}
2713		2609
2714	return NULL;	2610	return NULL;
2715	}	2611	}
2716		2612
2717	/*	2613	/*

Diff Legend

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