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.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.76 by root, Thu Dec 21 01:33:49 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
		35	#include <bitset>
		36
37	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
38		40
39	object *objects; /* Pointer to the list of used objects */
40	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
41		42
42	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44	};	45	};
…		…
51	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
52	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54	};	55	};
55		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
56	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57	static int	135	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	137	{
60	key_value *wants_field;	138	key_value *wants_field;
…		…
107	*	185	*
108	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
109	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
110	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
111	*	189	*
112	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
113	*	191	*
114	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
115	* check weight	193	* check weight
116	*/	194	*/
117		195
118	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
119	{	197	{
120	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
121	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
122	return 0;	204	return 0;
123		205
124	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
125	return 0;
126
127	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
128	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
129	* used to store nrof).	209	* used to store nrof).
130	*/	210	*/
131	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
141	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
142		222
143	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
144	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
145		225
146		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
147	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
148	* being locked in inventory should prevent merging.
149	* 0x4 in flags3 is CLIENT_SENT
150	*/
151	if ((ob1->arch != ob2->arch) ||
152	(ob1->flags[0] != ob2->flags[0]) ||
153	(ob1->flags[1] != ob2->flags[1]) ||
154	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
155	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
156	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
157	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
158	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
159	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
160	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
161	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
162	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
163	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
164	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
165	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
166	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
167	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
168	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
169	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
170	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
171	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
172	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
173	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
174	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
175	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
176	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
177	return 0;	251	return 0;
178		252
179	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
180	* check all objects in the inventory.	254	* check all objects in the inventory.
181	*/	255	*/
…		…
184	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
185	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186	return 0;	260	return 0;
187		261
188	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
189	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
190	return 0;	264	return 0;
191		265
192	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
193	* if it is valid.	267	* if it is valid.
194	*/	268	*/
…		…
255	{	329	{
256	if (inv->inv)	330	if (inv->inv)
257	sum_weight (inv);	331	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	333	}
		334
260	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
262	if (op->carrying != sum)	338	if (op->carrying != sum)
263	op->carrying = sum;	339	op->carrying = sum;
		340
264	return sum;	341	return sum;
265	}	342	}
266		343
267	/**	344	/**
268	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
275	op = op->env;	352	op = op->env;
276	return op;	353	return op;
277	}	354	}
278		355
279	/*	356	/*
280	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
281	* a better check. We basically keeping traversing up until we can't
282	* or find a player.
283	*/
284
285	object *
286	is_player_inv (object *op)
287	{
288	for (; op != NULL && op->type != PLAYER; op = op->env)
289	if (op->env == op)
290	op->env = NULL;
291	return op;
292	}
293
294	/*
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	358	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
298	*/	360	*/
299		361
300	void	362	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object *tmp;*/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	363	dump_object (object *op)
356	{	364	{
357	if (op == NULL)	365	if (!op)
358	{	366	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		367
366	void	368	object_freezer freezer;
367	dump_all_objects (void)	369	save_object (freezer, op, 3);
368	{	370	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	371	}
377		372
378	/*	373	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
400	*/	395	*/
401		396
402	object *	397	object *
403	find_object (tag_t i)	398	find_object (tag_t i)
404	{	399	{
405	object *op;	400	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	401	if (op->count == i)
409	break;	402	return op;
		403
410	return op;	404	return 0;
411	}	405	}
412		406
413	/*	407	/*
414	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
417	*/	411	*/
418		412
419	object *	413	object *
420	find_object_name (const char *str)	414	find_object_name (const char *str)
421	{	415	{
422	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
423	object *op;	417	object *op;
424		418
425	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	420	if (op->name == str_)
427	break;	421	break;
428		422
429	return op;	423	return op;
430	}	424	}
431		425
432	void	426	void
433	free_all_object_data ()	427	free_all_object_data ()
434	{	428	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	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	}	430	}
458		431
459	/*	432	/*
460	* 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
461	* skill and experience objects.	434	* skill and experience objects.
…		…
531		504
532	/* What is not cleared is next, prev, and count */	505	/* What is not cleared is next, prev, and count */
533		506
534	expmul = 1.0;	507	expmul = 1.0;
535	face = blank_face;	508	face = blank_face;
536	attacked_by_count = -1;
537		509
538	if (settings.casting_time)	510	if (settings.casting_time)
539	casting_time = -1;	511	casting_time = -1;
540	}	512	}
541		513
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	/*	514	/*
552	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
553	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
554	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
555	* 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,
556	* 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
557	* will point at garbage.	520	* will point at garbage.
558	*/	521	*/
559	void	522	void
560	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
561	{	524	{
562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
564		527
565	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));
566		533
567	if (is_freed)	534	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
569	if (is_removed)	537	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
571		539
572	if (op2->speed < 0)	540	if (speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
574		542
575	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
576	if (op2->key_values)	544	if (key_values)
577	{	545	{
578	key_value *tail = 0;	546	key_value *tail = 0;
579	key_value *i;	547	key_value *i;
580		548
581	op->key_values = 0;	549	dst->key_values = 0;
582		550
583	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
584	{	552	{
585	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
586		554
587	new_link->next = 0;	555	new_link->next = 0;
588	new_link->key = i->key;	556	new_link->key = i->key;
589	new_link->value = i->value;	557	new_link->value = i->value;
590		558
591	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
592	if (!op->key_values)	560	if (!dst->key_values)
593	{	561	{
594	op->key_values = new_link;	562	dst->key_values = new_link;
595	tail = new_link;	563	tail = new_link;
596	}	564	}
597	else	565	else
598	{	566	{
599	tail->next = new_link;	567	tail->next = new_link;
600	tail = new_link;	568	tail = new_link;
601	}	569	}
602	}	570	}
603	}	571	}
604		572
605	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;
606	}	582	}
607		583
608	/*	584	/*
609	* 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
610	* 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
…		…
718	op->active_next = NULL;	694	op->active_next = NULL;
719	op->active_prev = NULL;	695	op->active_prev = NULL;
720	}	696	}
721		697
722	/*	698	/*
723	* update_object() updates the array which represents the map.	699	* update_object() updates the the map.
724	* It takes into account invisible objects (and represent squares covered	700	* It takes into account invisible objects (and represent squares covered
725	* by invisible objects by whatever is below them (unless it's another	701	* by invisible objects by whatever is below them (unless it's another
726	* invisible object, etc...)	702	* invisible object, etc...)
727	* If the object being updated is beneath a player, the look-window	703	* If the object being updated is beneath a player, the look-window
728	* of that player is updated (this might be a suboptimal way of	704	* of that player is updated (this might be a suboptimal way of
729	* updating that window, though, since update_object() is called _often_)	705	* updating that window, though, since update_object() is called _often_)
730	*	706	*
731	* action is a hint of what the caller believes need to be done.	707	* action is a hint of what the caller believes need to be done.
732	* For example, if the only thing that has changed is the face (due to
733	* an animation), we don't need to call update_position until that actually
734	* comes into view of a player. OTOH, many other things, like addition/removal
735	* of walls or living creatures may need us to update the flags now.
736	* current action are:	708	* current action are:
737	* UP_OBJ_INSERT: op was inserted	709	* UP_OBJ_INSERT: op was inserted
738	* UP_OBJ_REMOVE: op was removed	710	* UP_OBJ_REMOVE: op was removed
739	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	711	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
740	* as that is easier than trying to look at what may have changed.	712	* as that is easier than trying to look at what may have changed.
741	* UP_OBJ_FACE: only the objects face has changed.	713	* UP_OBJ_FACE: only the objects face has changed.
742	*/	714	*/
743
744	void	715	void
745	update_object (object *op, int action)	716	update_object (object *op, int action)
746	{	717	{
747	int update_now = 0, flags;
748	MoveType move_on, move_off, move_block, move_slow;	718	MoveType move_on, move_off, move_block, move_slow;
749		719
750	if (op == NULL)	720	if (op == NULL)
751	{	721	{
752	/* this should never happen */	722	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	723	LOG (llevDebug, "update_object() called for NULL object.\n");
754	return;	724	return;
755	}	725	}
756		726
757	if (op->env != NULL)	727	if (op->env)
758	{	728	{
759	/* Animation is currently handled by client, so nothing	729	/* Animation is currently handled by client, so nothing
760	* to do in this case.	730	* to do in this case.
761	*/	731	*/
762	return;	732	return;
…		…
776	abort ();	746	abort ();
777	#endif	747	#endif
778	return;	748	return;
779	}	749	}
780		750
781	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	751	mapspace &m = op->ms ();
782	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
783	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
784	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
785	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
786	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
787		752
		753	if (m.flags_ & P_NEED_UPDATE)
		754	/* nop */;
788	if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
789	{	756	{
		757	// this is likely overkill, TODO: revisit (schmorp)
790	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
791	update_now = 1;
792
793	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	759	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
794	update_now = 1;	760	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
795		761	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		762	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
796	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	763	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
797	update_now = 1;
798
799	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
800	update_now = 1;
801
802	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
803	update_now = 1;
804
805	if ((move_on | op->move_on) != move_on)	764	|| (m.move_on | op->move_on ) != m.move_on
806	update_now = 1;
807
808	if ((move_off | op->move_off) != move_off)	765	|| (m.move_off | op->move_off ) != m.move_off
809	update_now = 1;	766	|| (m.move_slow | op->move_slow) != m.move_slow
810
811	/* This isn't perfect, but I don't expect a lot of objects to	767	/* This isn't perfect, but I don't expect a lot of objects to
812	* to have move_allow right now.	768	* to have move_allow right now.
813	*/	769	*/
814	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
815	update_now = 1;	771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
816		772	m.flags_ = P_NEED_UPDATE;
817	if ((move_slow | op->move_slow) != move_slow)
818	update_now = 1;
819	}	773	}
820	/* if the object is being removed, we can't make intelligent	774	/* if the object is being removed, we can't make intelligent
821	* decisions, because remove_ob can't really pass the object	775	* decisions, because remove_ob can't really pass the object
822	* that is being removed.	776	* that is being removed.
823	*/	777	*/
824	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
825	update_now = 1;	779	m.flags_ = P_NEED_UPDATE;
826	else if (action == UP_OBJ_FACE)	780	else if (action == UP_OBJ_FACE)
827	/* Nothing to do for that case */ ;	781	/* Nothing to do for that case */ ;
828	else	782	else
829	LOG (llevError, "update_object called with invalid action: %d\n", action);	783	LOG (llevError, "update_object called with invalid action: %d\n", action);
830		784
831	if (update_now)
832	{
833	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
834	update_position (op->map, op->x, op->y);
835	}
836
837	if (op->more != NULL)	785	if (op->more)
838	update_object (op->more, action);	786	update_object (op->more, action);
839	}	787	}
840		788
841	static unordered_vector<object *> mortals;	789	object::vector object::mortals;
842	static std::vector<object *> freed;	790	object::vector object::objects; // not yet used
		791	object *object::first;
843		792
844	void object::free_mortals ()	793	void object::free_mortals ()
845	{	794	{
846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847	if ((*i)->refcnt)	796	if ((*i)->refcnt)
848	++i; // further delay freeing	797	++i; // further delay freeing
849	else	798	else
850	{	799	{
851	freed.push_back (*i);//D
852	//delete *i;	800	delete *i;
853	mortals.erase (i);	801	mortals.erase (i);
854	}	802	}
855
856	if (mortals.size())//D
857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
858	}	803	}
859		804
860	object::object ()	805	object::object ()
861	{	806	{
862	SET_FLAG (this, FLAG_REMOVED);	807	SET_FLAG (this, FLAG_REMOVED);
863		808
864	expmul = 1.0;	809	expmul = 1.0;
865	face = blank_face;	810	face = blank_face;
866	attacked_by_count = -1;
867	}	811	}
868		812
869	object::~object ()	813	object::~object ()
870	{	814	{
871	free_key_values (this);	815	free_key_values (this);
872	}	816	}
873		817
874	void object::link ()	818	void object::link ()
875	{	819	{
876	count = ++ob_count;	820	count = ++ob_count;
		821	uuid = gen_uuid ();
877		822
878	prev = 0;	823	prev = 0;
879	next = objects;	824	next = object::first;
880		825
881	if (objects)	826	if (object::first)
882	objects->prev = this;	827	object::first->prev = this;
883		828
884	objects = this;	829	object::first = this;
885	}	830	}
886		831
887	void object::unlink ()	832	void object::unlink ()
888	{	833	{
889	count = 0;	834	if (this == object::first)
		835	object::first = next;
890		836
891	/* Remove this object from the list of used objects */	837	/* Remove this object from the list of used objects */
892	if (prev)
893	{
894	prev->next = next;	838	if (prev) prev->next = next;
		839	if (next) next->prev = prev;
		840
895	prev = 0;	841	prev = 0;
896	}
897
898	if (next)
899	{
900	next->prev = prev;
901	next = 0;	842	next = 0;
902	}
903
904	if (this == objects)
905	objects = next;
906	}	843	}
907		844
908	object *object::create ()	845	object *object::create ()
909	{	846	{
910	object *op;
911
912	if (freed.empty ())
913	op = new object;	847	object *op = new object;
914	else
915	{
916	// highly annoying, but the only way to get it stable right now
917	op = freed.back ();
918	freed.pop_back ();
919	op->~object ();
920	new ((void *) op) object;
921	}
922
923	op->link ();	848	op->link ();
924	return op;	849	return op;
925	}	850	}
926		851
927	/*	852	/*
…		…
929	* it from the list of used objects, and puts it on the list of	854	* it from the list of used objects, and puts it on the list of
930	* free objects. The IS_FREED() flag is set in the object.	855	* free objects. The IS_FREED() flag is set in the object.
931	* The object must have been removed by remove_ob() first for	856	* The object must have been removed by remove_ob() first for
932	* this function to succeed.	857	* this function to succeed.
933	*	858	*
934	* If free_inventory is set, free inventory as well. Else drop items in	859	* If destroy_inventory is set, free inventory as well. Else drop items in
935	* inventory to the ground.	860	* inventory to the ground.
936	*/	861	*/
937	void object::free (bool free_inventory)	862	void object::destroy (bool destroy_inventory)
938	{	863	{
939	if (QUERY_FLAG (this, FLAG_FREED))	864	if (QUERY_FLAG (this, FLAG_FREED))
940	return;	865	return;
941		866
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	867	if (QUERY_FLAG (this, FLAG_FRIENDLY))
943	remove_friendly_object (this);	868	remove_friendly_object (this);
944		869
945	if (!QUERY_FLAG (this, FLAG_REMOVED))	870	if (!QUERY_FLAG (this, FLAG_REMOVED))
946	remove_ob (this);	871	remove ();
947		872
948	SET_FLAG (this, FLAG_FREED);	873	SET_FLAG (this, FLAG_FREED);
949		874
950	if (more)	875	if (more)
951	{	876	{
952	more->free (free_inventory);	877	more->destroy (destroy_inventory);
953	more = 0;	878	more = 0;
954	}	879	}
955		880
956	if (inv)	881	if (inv)
957	{	882	{
958	/* Only if the space blocks everything do we not process -	883	/* Only if the space blocks everything do we not process -
959	* if some form of movement is allowed, let objects	884	* if some form of movement is allowed, let objects
960	* drop on that space.	885	* drop on that space.
961	*/	886	*/
962	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
963	{	888	{
964	object *op = inv;	889	object *op = inv;
965		890
966	while (op)	891	while (op)
967	{	892	{
968	object *tmp = op->below;	893	object *tmp = op->below;
969	op->free (free_inventory);	894	op->destroy (destroy_inventory);
970	op = tmp;	895	op = tmp;
971	}	896	}
972	}	897	}
973	else	898	else
974	{ /* Put objects in inventory onto this space */	899	{ /* Put objects in inventory onto this space */
…		…
976		901
977	while (op)	902	while (op)
978	{	903	{
979	object *tmp = op->below;	904	object *tmp = op->below;
980		905
981	remove_ob (op);	906	op->remove ();
982		907
983	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
984	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
985	free_object (op);	910	op->destroy ();
986	else	911	else
987	{	912	{
988	op->x = x;	913	op->x = x;
989	op->y = y;	914	op->y = y;
990	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
993	op = tmp;	918	op = tmp;
994	}	919	}
995	}	920	}
996	}	921	}
997		922
		923	// hack to ensure that freed objects still have a valid map
		924	{
		925	static maptile *freed_map; // freed objects are moved here to avoid crashes
		926
		927	if (!freed_map)
		928	{
		929	freed_map = new maptile;
		930
		931	freed_map->name = "/internal/freed_objects_map";
		932	freed_map->width = 3;
		933	freed_map->height = 3;
		934
		935	freed_map->allocate ();
		936	}
		937
		938	map = freed_map;
		939	x = 1;
		940	y = 1;
		941	}
		942
		943	// clear those pointers that likely might have circular references to us
998	owner = 0;	944	owner = 0;
		945	enemy = 0;
		946	attacked_by = 0;
		947
		948	// only relevant for players(?), but make sure of it anyways
		949	contr = 0;
999		950
1000	/* Remove object from the active list */	951	/* Remove object from the active list */
1001	speed = 0;	952	speed = 0;
1002	update_ob_speed (this);	953	update_ob_speed (this);
1003		954
…		…
1008		959
1009	/*	960	/*
1010	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1011	* weight of an object (and what is carried by it's environment(s)).	962	* weight of an object (and what is carried by it's environment(s)).
1012	*/	963	*/
1013
1014	void	964	void
1015	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1016	{	966	{
1017	while (op != NULL)	967	while (op != NULL)
1018	{	968	{
1019	if (op->type == CONTAINER)	969	if (op->type == CONTAINER)
1020	{
1021	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	970	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1022	}	971
1023	op->carrying -= weight;	972	op->carrying -= weight;
1024	op = op->env;	973	op = op->env;
1025	}	974	}
1026	}	975	}
1027		976
1028	/* remove_ob(op):	977	/* op->remove ():
1029	* This function removes the object op from the linked list of objects	978	* This function removes the object op from the linked list of objects
1030	* which it is currently tied to. When this function is done, the	979	* which it is currently tied to. When this function is done, the
1031	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1032	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1033	* the previous environment.	982	* the previous environment.
1034	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1035	*/	984	*/
1036
1037	void	985	void
1038	remove_ob (object *op)	986	object::remove ()
1039	{	987	{
		988	object *tmp, *last = 0;
1040	object *	989	object *otmp;
1041	tmp, *
1042	last = NULL;
1043	object *
1044	otmp;
1045		990
1046	tag_t
1047	tag;
1048	int
1049	check_walk_off;	991	int check_walk_off;
1050	mapstruct *
1051	m;
1052		992
1053	sint16
1054	x,
1055	y;
1056
1057	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1058	return;	994	return;
1059		995
1060	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
1061		997
1062	if (op->more != NULL)	998	if (more)
1063	remove_ob (op->more);	999	more->remove ();
1064		1000
1065	/*	1001	/*
1066	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1067	* inventory.	1003	* inventory.
1068	*/	1004	*/
1069	if (op->env != NULL)	1005	if (env)
1070	{	1006	{
1071	if (op->nrof)	1007	if (nrof)
1072	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1073	else	1009	else
1074	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1075		1011
1076	/* NO_FIX_PLAYER is set when a great many changes are being	1012	/* NO_FIX_PLAYER is set when a great many changes are being
1077	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1078	* to save cpu time.	1014	* to save cpu time.
1079	*/	1015	*/
1080	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1081	fix_player (otmp);	1017	fix_player (otmp);
1082		1018
1083	if (op->above != NULL)	1019	if (above != NULL)
1084	op->above->below = op->below;	1020	above->below = below;
1085	else	1021	else
1086	op->env->inv = op->below;	1022	env->inv = below;
1087		1023
1088	if (op->below != NULL)	1024	if (below != NULL)
1089	op->below->above = op->above;	1025	below->above = above;
1090		1026
1091	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1092	* the map, but we don't actually do that - it is up	1028	* the map, but we don't actually do that - it is up
1093	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1094	*/	1030	*/
1095	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1096	op->map = op->env->map;	1032	map = env->map;
1097	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1098	op->env = NULL;	1034	env = 0;
1099	}	1035	}
1100	else if (op->map)	1036	else if (map)
1101	{	1037	{
1102	x = op->x;
1103	y = op->y;
1104	m = get_map_from_coord (op->map, &x, &y);
1105
1106	if (!m)
1107	{
1108	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1109	op->map->path, op->x, op->y);
1110	/* in old days, we used to set x and y to 0 and continue.
1111	* it seems if we get into this case, something is probablye
1112	* screwed up and should be fixed.
1113	*/
1114	abort ();
1115	}
1116
1117	if (op->map != m)
1118	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1119	op->map->path, m->path, op->x, op->y, x, y);
1120
1121	/* Re did the following section of code - it looks like it had	1038	/* Re did the following section of code - it looks like it had
1122	* lots of logic for things we no longer care about	1039	* lots of logic for things we no longer care about
1123	*/	1040	*/
1124		1041
1125	/* link the object above us */	1042	/* link the object above us */
1126	if (op->above)	1043	if (above)
1127	op->above->below = op->below;	1044	above->below = below;
1128	else	1045	else
1129	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1046	map->at (x, y).top = below; /* we were top, set new top */
1130		1047
1131	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1132	if (op->below)	1049	if (below)
1133	op->below->above = op->above;	1050	below->above = above;
1134	else	1051	else
1135	{	1052	{
1136	/* Nothing below, which means we need to relink map object for this space	1053	/* Nothing below, which means we need to relink map object for this space
1137	* use translated coordinates in case some oddness with map tiling is	1054	* use translated coordinates in case some oddness with map tiling is
1138	* evident	1055	* evident
1139	*/	1056	*/
1140	if (GET_MAP_OB (m, x, y) != op)	1057	if (GET_MAP_OB (map, x, y) != this)
1141	{	1058	{
1142	dump_object (op);	1059	char *dump = dump_object (this);
1143	LOG (llevError,	1060	LOG (llevError,
1144	"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);	1061	"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);
		1062	free (dump);
1145	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1146	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
1147	}	1066	}
1148		1067
1149	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1068	map->at (x, y).bottom = above; /* goes on above it. */
1150	}	1069	}
1151		1070
1152	op->above = 0;	1071	above = 0;
1153	op->below = 0;	1072	below = 0;
1154		1073
1155	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1156	return;	1075	return;
1157		1076
1158	tag = op->count;
1159	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1160		1078
1161	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1162	{	1080	{
1163	/* No point updating the players look faces if he is the object	1081	/* No point updating the players look faces if he is the object
1164	* being removed.	1082	* being removed.
1165	*/	1083	*/
1166		1084
1167	if (tmp->type == PLAYER && tmp != op)	1085	if (tmp->type == PLAYER && tmp != this)
1168	{	1086	{
1169	/* If a container that the player is currently using somehow gets	1087	/* If a container that the player is currently using somehow gets
1170	* removed (most likely destroyed), update the player view	1088	* removed (most likely destroyed), update the player view
1171	* appropriately.	1089	* appropriately.
1172	*/	1090	*/
1173	if (tmp->container == op)	1091	if (tmp->container == this)
1174	{	1092	{
1175	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1176	tmp->container = NULL;	1094	tmp->container = 0;
1177	}	1095	}
1178		1096
1179	tmp->contr->socket.update_look = 1;	1097	tmp->contr->socket->floorbox_update ();
1180	}	1098	}
1181		1099
1182	/* See if player moving off should effect something */	1100	/* See if player moving off should effect something */
1183	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1101	if (check_walk_off
		1102	&& ((move_type & tmp->move_off)
		1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1184	{	1104	{
1185	move_apply (tmp, op, NULL);	1105	move_apply (tmp, this, 0);
1186		1106
1187	if (was_destroyed (op, tag))	1107	if (destroyed ())
1188	{
1189	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1108	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1190	}
1191	}	1109	}
1192		1110
1193	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1194		1112
1195	if (tmp->above == tmp)	1113	if (tmp->above == tmp)
1196	tmp->above = NULL;	1114	tmp->above = 0;
1197		1115
1198	last = tmp;	1116	last = tmp;
1199	}	1117	}
1200		1118
1201	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1202	if (last == NULL)	1120	if (!last)
1203	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1204	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1205	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1206	* those out anyways, and if there are any flags set right now, they won't
1207	* be correct anyways.
1208	*/
1209	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1210	update_position (op->map, op->x, op->y);
1211	}
1212	else	1122	else
1213	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1214		1124
1215	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1216	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1217	}	1127	}
1218	}	1128	}
1219		1129
1220	/*	1130	/*
1221	* merge_ob(op,top):	1131	* merge_ob(op,top):
…		…
1223	* This function goes through all objects below and including top, and	1133	* This function goes through all objects below and including top, and
1224	* merges op to the first matching object.	1134	* merges op to the first matching object.
1225	* If top is NULL, it is calculated.	1135	* If top is NULL, it is calculated.
1226	* Returns pointer to object if it succeded in the merge, otherwise NULL	1136	* Returns pointer to object if it succeded in the merge, otherwise NULL
1227	*/	1137	*/
1228
1229	object *	1138	object *
1230	merge_ob (object *op, object *top)	1139	merge_ob (object *op, object *top)
1231	{	1140	{
1232	if (!op->nrof)	1141	if (!op->nrof)
1233	return 0;	1142	return 0;
…		…
1237		1146
1238	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1239	{	1148	{
1240	if (top == op)	1149	if (top == op)
1241	continue;	1150	continue;
1242	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1243	{	1153	{
1244	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1245		1155
1246	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1247	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1248	remove_ob (op);	1158	op->destroy ();
1249	free_object (op);
1250	return top;	1159	return top;
1251	}	1160	}
1252	}	1161	}
1253		1162
1254	return NULL;	1163	return 0;
1255	}	1164	}
1256		1165
1257	/*	1166	/*
1258	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1167	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1259	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1260	*/	1169	*/
1261	object *	1170	object *
1262	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1171	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1263	{	1172	{
1264	object *tmp;	1173	object *tmp;
1265		1174
1266	if (op->head)	1175	if (op->head)
1267	op = op->head;	1176	op = op->head;
…		…
1295	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1296	* just 'op' otherwise	1205	* just 'op' otherwise
1297	*/	1206	*/
1298		1207
1299	object *	1208	object *
1300	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1209	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1301	{	1210	{
1302	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1303	sint16 x, y;	1212	sint16 x, y;
1304		1213
1305	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1308	return NULL;	1217	return NULL;
1309	}	1218	}
1310		1219
1311	if (m == NULL)	1220	if (m == NULL)
1312	{	1221	{
1313	dump_object (op);	1222	char *dump = dump_object (op);
1314	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1223	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1224	free (dump);
1315	return op;	1225	return op;
1316	}	1226	}
1317		1227
1318	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1319	{	1229	{
1320	dump_object (op);	1230	char *dump = dump_object (op);
1321	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1231	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1322	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1323	/* Better to catch this here, as otherwise the next use of this object	1233	/* Better to catch this here, as otherwise the next use of this object
1324	* is likely to cause a crash. Better to find out where it is getting	1234	* is likely to cause a crash. Better to find out where it is getting
1325	* improperly inserted.	1235	* improperly inserted.
1326	*/	1236	*/
1327	abort ();	1237	abort ();
1328	#endif	1238	#endif
		1239	free (dump);
1329	return op;	1240	return op;
1330	}	1241	}
1331		1242
1332	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1333	{	1244	{
1334	dump_object (op);	1245	char *dump = dump_object (op);
1335	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1247	free (dump);
1336	return op;	1248	return op;
1337	}	1249	}
1338		1250
1339	if (op->more != NULL)	1251	if (op->more != NULL)
1340	{	1252	{
…		…
1378		1290
1379	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1380	*/	1292	*/
1381	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1382	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1383	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1384	{	1296	{
1385	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1386	remove_ob (tmp);	1298	tmp->destroy ();
1387	free_object (tmp);
1388	}	1299	}
1389		1300
1390	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1301	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1391	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1392		1303
…		…
1405	op->below = originator->below;	1316	op->below = originator->below;
1406		1317
1407	if (op->below)	1318	if (op->below)
1408	op->below->above = op;	1319	op->below->above = op;
1409	else	1320	else
1410	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->ms ().bottom = op;
1411		1322
1412	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1413	originator->below = op;	1324	originator->below = op;
1414	}	1325	}
1415	else	1326	else
…		…
1461	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1462	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1463	* stacking is a bit odd.	1374	* stacking is a bit odd.
1464	*/	1375	*/
1465	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1466	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1377	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1467	{	1378	{
1468	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1469	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1470	break;	1381	break;
1471	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1494		1405
1495	if (op->above)	1406	if (op->above)
1496	op->above->below = op;	1407	op->above->below = op;
1497		1408
1498	op->below = NULL;	1409	op->below = NULL;
1499	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->ms ().bottom = op;
1500	}	1411	}
1501	else	1412	else
1502	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1503	op->above = top->above;	1414	op->above = top->above;
1504		1415
…		…
1508	op->below = top;	1419	op->below = top;
1509	top->above = op;	1420	top->above = op;
1510	}	1421	}
1511		1422
1512	if (op->above == NULL)	1423	if (op->above == NULL)
1513	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->ms ().top = op;
1514	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1515		1426
1516	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1517	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1518		1429
1519	/* If we have a floor, we know the player, if any, will be above	1430	/* If we have a floor, we know the player, if any, will be above
1520	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1521	*/	1432	*/
1522	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1523	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1434	if (object *pl = op->ms ().player ())
1524	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1525	tmp->contr->socket.update_look = 1;
1526		1436
1527	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1528	* visible to others on this map. But update_all_los is really	1438	* visible to others on this map. But update_all_los is really
1529	* an inefficient way to do this, as it means los for all players	1439	* an inefficient way to do this, as it means los for all players
1530	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1538		1448
1539	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1540	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1541		1451
1542	/* Don't know if moving this to the end will break anything. However,	1452	/* Don't know if moving this to the end will break anything. However,
1543	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1544	*	1454	*
1545	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1546	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1547	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1548	* update_object().	1458	* update_object().
…		…
1564		1474
1565	return op;	1475	return op;
1566	}	1476	}
1567		1477
1568	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1569	* finds an object of its own type, it'll remove that one first.	1479	* finds an object of its own type, it'll remove that one first.
1570	* op is the object to insert it under: supplies x and the map.	1480	* op is the object to insert it under: supplies x and the map.
1571	*/	1481	*/
1572	void	1482	void
1573	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1574	{	1484	{
1575	object *	1485	object *tmp, *tmp1;
1576	tmp;
1577	object *
1578	tmp1;
1579		1486
1580	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1581		1488
1582	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1489	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1583	{
1584	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1585	{	1491	tmp->destroy ();
1586	remove_ob (tmp);
1587	free_object (tmp);
1588	}
1589	}
1590		1492
1591	tmp1 = arch_to_object (find_archetype (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1592		1494
1593	tmp1->x = op->x;	1495	tmp1->x = op->x;
1594	tmp1->y = op->y;	1496	tmp1->y = op->y;
1595	insert_ob_in_map (tmp1, op->map, op, 0);	1497	insert_ob_in_map (tmp1, op->map, op, 0);
1596	}	1498	}
…		…
1604	*/	1506	*/
1605		1507
1606	object *	1508	object *
1607	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1608	{	1510	{
1609	object *	1511	object *newob;
1610	newob;
1611	int
1612	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1613		1513
1614	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1615	{	1515	{
1616	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1516	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1617	return NULL;	1517	return NULL;
1618	}	1518	}
1619		1519
1620	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
1621		1521
1622	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1623	{	1523	orig_ob->destroy (1);
1624	if (!is_removed)
1625	remove_ob (orig_ob);
1626	free_object2 (orig_ob, 1);
1627	}
1628	else if (!is_removed)	1524	else if (!is_removed)
1629	{	1525	{
1630	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1631	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1632	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1528	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1662	if (i > op->nrof)	1558	if (i > op->nrof)
1663	i = op->nrof;	1559	i = op->nrof;
1664		1560
1665	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1666	op->nrof -= i;	1562	op->nrof -= i;
1667	else if (op->env != NULL)	1563	else if (op->env)
1668	{	1564	{
1669	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1670	* therein?	1566	* therein?
1671	*/	1567	*/
1672	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1673	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1674	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1675	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1676	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1677	* and then searching the map for a player.	1573	* and then searching the map for a player.
1678	*/	1574	*/
1679	if (!tmp)	1575	if (!tmp)
1680	{	1576	{
1681	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1682	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1683	break;	1581	break;
1684	if (pl)	1582	}
1685	tmp = pl->ob;
1686	else
1687	tmp = NULL;
1688	}	1583	}
1689		1584
1690	if (i < op->nrof)	1585	if (i < op->nrof)
1691	{	1586	{
1692	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1693	op->nrof -= i;	1588	op->nrof -= i;
1694	if (tmp)	1589	if (tmp)
1695	{
1696	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1697	}
1698	}	1591	}
1699	else	1592	else
1700	{	1593	{
1701	remove_ob (op);	1594	op->remove ();
1702	op->nrof = 0;	1595	op->nrof = 0;
1703	if (tmp)	1596	if (tmp)
1704	{
1705	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1706	}
1707	}	1598	}
1708	}	1599	}
1709	else	1600	else
1710	{	1601	{
1711	object *above = op->above;	1602	object *above = op->above;
1712		1603
1713	if (i < op->nrof)	1604	if (i < op->nrof)
1714	op->nrof -= i;	1605	op->nrof -= i;
1715	else	1606	else
1716	{	1607	{
1717	remove_ob (op);	1608	op->remove ();
1718	op->nrof = 0;	1609	op->nrof = 0;
1719	}	1610	}
1720		1611
1721	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1722	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1723	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1724	{	1615	{
1725	if (op->nrof)	1616	if (op->nrof)
1726	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1727	else	1618	else
…		…
1731		1622
1732	if (op->nrof)	1623	if (op->nrof)
1733	return op;	1624	return op;
1734	else	1625	else
1735	{	1626	{
1736	free_object (op);	1627	op->destroy ();
1737	return NULL;	1628	return 0;
1738	}	1629	}
1739	}	1630	}
1740		1631
1741	/*	1632	/*
1742	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1754	op->carrying += weight;	1645	op->carrying += weight;
1755	op = op->env;	1646	op = op->env;
1756	}	1647	}
1757	}	1648	}
1758		1649
		1650	object *
		1651	insert_ob_in_ob (object *op, object *where)
		1652	{
		1653	if (!where)
		1654	{
		1655	char *dump = dump_object (op);
		1656	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1657	free (dump);
		1658	return op;
		1659	}
		1660
		1661	if (where->head)
		1662	{
		1663	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1664	where = where->head;
		1665	}
		1666
		1667	return where->insert (op);
		1668	}
		1669
1759	/*	1670	/*
1760	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1761	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1762	* inside the object environment.	1673	* inside the object environment.
1763	*	1674	*
1764	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1765	* the inventory at the last position or next to other objects of the same
1766	* type.
1767	* Frank: Now sorted by type, archetype and magic!
1768	*
1769	* The function returns now pointer to inserted item, and return value can	1675	* The function returns now pointer to inserted item, and return value can
1770	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1771	*/	1677	*/
1772		1678
1773	object *	1679	object *
1774	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1775	{	1681	{
1776	object *	1682	object *tmp, *otmp;
1777	tmp, *
1778	otmp;
1779		1683
1780	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1781	{	1685	op->remove ();
1782	dump_object (op);
1783	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1784	return op;
1785	}
1786
1787	if (where == NULL)
1788	{
1789	dump_object (op);
1790	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1791	return op;
1792	}
1793
1794	if (where->head)
1795	{
1796	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1797	where = where->head;
1798	}
1799		1686
1800	if (op->more)	1687	if (op->more)
1801	{	1688	{
1802	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1689	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1803	return op;	1690	return op;
…		…
1805		1692
1806	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1807	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1808	if (op->nrof)	1695	if (op->nrof)
1809	{	1696	{
1810	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1811	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1812	{	1699	{
1813	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1814	(client needs the original object) */	1701	(client needs the original object) */
1815	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1816	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1817	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1818	*/	1705	*/
1819	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1820	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1821	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1822	op = tmp;	1709	op = tmp;
1823	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1824	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1825	break;	1712	break;
1826	}	1713	}
1827		1714
1828	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1829	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1830	* (if it was possible to merge). calling remove_ob will subtract	1717	* (if it was possible to merge). calling remove_ob will subtract
1831	* the weight, so we need to add it in again, since we actually do	1718	* the weight, so we need to add it in again, since we actually do
1832	* the linking below	1719	* the linking below
1833	*/	1720	*/
1834	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1835	}	1722	}
1836	else	1723	else
1837	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1838		1725
1839	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1840	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1841	{
1842	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1843	fix_player (otmp);	1729	fix_player (otmp);
1844	}
1845		1730
1846	op->map = NULL;	1731	op->map = 0;
1847	op->env = where;	1732	op->env = this;
1848	op->above = NULL;	1733	op->above = 0;
1849	op->below = NULL;	1734	op->below = 0;
1850	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1851		1736
1852	/* reset the light list and los of the players on the map */	1737	/* reset the light list and los of the players on the map */
1853	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1854	{	1739	{
1855	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1856	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1857	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1858	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1859	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1860	}	1745	}
1861		1746
1862	/* Client has no idea of ordering so lets not bother ordering it here.	1747	/* Client has no idea of ordering so lets not bother ordering it here.
1863	* It sure simplifies this function...	1748	* It sure simplifies this function...
1864	*/	1749	*/
1865	if (where->inv == NULL)	1750	if (!inv)
1866	where->inv = op;	1751	inv = op;
1867	else	1752	else
1868	{	1753	{
1869	op->below = where->inv;	1754	op->below = inv;
1870	op->below->above = op;	1755	op->below->above = op;
1871	where->inv = op;	1756	inv = op;
1872	}	1757	}
		1758
1873	return op;	1759	return op;
1874	}	1760	}
1875		1761
1876	/*	1762	/*
1877	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1895	*/	1781	*/
1896		1782
1897	int	1783	int
1898	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
1899	{	1785	{
1900	object *	1786	object *tmp;
1901	tmp;	1787	maptile *m = op->map;
1902	tag_t
1903	tag;
1904	mapstruct *
1905	m = op->map;
1906	int
1907	x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
1908		1789
1909	MoveType	1790	MoveType move_on, move_slow, move_block;
1910	move_on,
1911	move_slow,
1912	move_block;
1913		1791
1914	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1915	return 0;	1793	return 0;
1916
1917	tag = op->count;
1918		1794
1919	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1795	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1920	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1796	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1921	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1797	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1922		1798
…		…
1983	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1859	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1984	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1860	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1985	{	1861	{
1986	move_apply (tmp, op, originator);	1862	move_apply (tmp, op, originator);
1987		1863
1988	if (was_destroyed (op, tag))	1864	if (op->destroyed ())
1989	return 1;	1865	return 1;
1990		1866
1991	/* what the person/creature stepped onto has moved the object	1867	/* what the person/creature stepped onto has moved the object
1992	* someplace new. Don't process any further - if we did,	1868	* someplace new. Don't process any further - if we did,
1993	* have a feeling strange problems would result.	1869	* have a feeling strange problems would result.
…		…
2005	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2006	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2007	*/	1883	*/
2008		1884
2009	object *	1885	object *
2010	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2011	{	1887	{
2012	object *	1888	object *
2013	tmp;	1889	tmp;
2014		1890
2015	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2028	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2029	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2030	*/	1906	*/
2031		1907
2032	object *	1908	object *
2033	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2034	{	1910	{
2035	object *	1911	object *
2036	tmp;	1912	tmp;
2037		1913
2038	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2178	* the archetype because that isn't correct if the monster has been	2054	* the archetype because that isn't correct if the monster has been
2179	* customized, changed states, etc.	2055	* customized, changed states, etc.
2180	*/	2056	*/
2181		2057
2182	int	2058	int
2183	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2184	{	2060	{
2185	int	2061	int
2186	i,	2062	i,
2187	index = 0, flag;	2063	index = 0, flag;
2188	static int	2064	static int
…		…
2200	* if the space being examined only has a wall to the north and empty	2076	* if the space being examined only has a wall to the north and empty
2201	* spaces in all the other directions, this will reduce the search space	2077	* spaces in all the other directions, this will reduce the search space
2202	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2203	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2204	*/	2080	*/
2205	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2206	stop = maxfree[i];	2082	stop = maxfree[i];
2207	}	2083	}
		2084
2208	if (!index)	2085	if (!index)
2209	return -1;	2086	return -1;
		2087
2210	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2211	}	2089	}
2212		2090
2213	/*	2091	/*
2214	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2215	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2216	* But it will return the first available spot, not a random choice.	2094	* But it will return the first available spot, not a random choice.
2217	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2218	*/	2096	*/
2219		2097
2220	int	2098	int
2221	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2222	{	2100	{
2223	int	2101	int
2224	i;	2102	i;
2225		2103
2226	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2290	* because we have to know what movement the thing looking to move	2168	* because we have to know what movement the thing looking to move
2291	* there is capable of.	2169	* there is capable of.
2292	*/	2170	*/
2293		2171
2294	int	2172	int
2295	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2296	{	2174	{
2297	int	2175	int
2298	i,	2176	i,
2299	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2300		2178
2301	sint16 nx, ny;	2179	sint16 nx, ny;
2302	object *	2180	object *
2303	tmp;	2181	tmp;
2304	mapstruct *	2182	maptile *
2305	mp;	2183	mp;
2306		2184
2307	MoveType blocked, move_type;	2185	MoveType blocked, move_type;
2308		2186
2309	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
…		…
2322	mp = m;	2200	mp = m;
2323	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2324	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2325		2203
2326	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2327	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2328	{
2329	max = maxfree[i];	2207	max = maxfree[i];
2330	}
2331	else	2208	else
2332	{	2209	{
2333	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2334		2211
2335	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2336	{
2337	max = maxfree[i];	2213	max = maxfree[i];
2338	}
2339	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2340	{	2215	{
2341	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2342	{
2343	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2344	{
2345	break;	2218	break;
2346	}	2219
2347	}
2348	if (tmp)	2220	if (tmp)
2349	{
2350	return freedir[i];	2221	return freedir[i];
2351	}
2352	}	2222	}
2353	}	2223	}
2354	}	2224	}
		2225
2355	return 0;	2226	return 0;
2356	}	2227	}
2357		2228
2358	/*	2229	/*
2359	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2361	*/	2232	*/
2362		2233
2363	int	2234	int
2364	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2365	{	2236	{
2366	int	2237	int i;
2367	i;
2368		2238
2369	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2370	return i;	2240	return i;
2371	}	2241	}
2372		2242
…		…
2377	*/	2247	*/
2378		2248
2379	int	2249	int
2380	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2381	{	2251	{
2382	int	2252	int q;
2383	q;
2384		2253
2385	if (y)	2254	if (y)
2386	q = x * 100 / y;	2255	q = x * 100 / y;
2387	else if (x)	2256	else if (x)
2388	q = -300 * x;	2257	q = -300 * x;
…		…
2514	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2515	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2516	* can see a direct way to get it	2385	* can see a direct way to get it
2517	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2518	*/	2387	*/
2519
2520
2521	int	2388	int
2522	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2523	{	2390	{
2524	sint16 dx, dy;	2391	sint16 dx, dy;
2525	int
2526	mflags;	2392	int mflags;
2527		2393
2528	if (dir < 0)	2394	if (dir < 0)
2529	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2530		2396
2531	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2544	return 0;	2410	return 0;
2545		2411
2546	/* yes, can see. */	2412	/* yes, can see. */
2547	if (dir < 9)	2413	if (dir < 9)
2548	return 1;	2414	return 1;
		2415
2549	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2550	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2417	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2418	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2551	}	2419	}
2552
2553
2554		2420
2555	/*	2421	/*
2556	* can_pick(picker, item): finds out if an object is possible to be	2422	* can_pick(picker, item): finds out if an object is possible to be
2557	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2558	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2569	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2570	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2571	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2437	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2572	}	2438	}
2573		2439
2574
2575	/*	2440	/*
2576	* create clone from object to another	2441	* create clone from object to another
2577	*/	2442	*/
2578	object *	2443	object *
2579	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2580	{	2445	{
2581	object *
2582	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2583		2447
2584	if (!asrc)	2448	if (!asrc)
2585	return NULL;	2449	return 0;
		2450
2586	src = asrc;	2451	src = asrc;
2587	if (src->head)	2452	if (src->head)
2588	src = src->head;	2453	src = src->head;
2589		2454
2590	prev = NULL;	2455	prev = 0;
2591	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2592	{	2457	{
2593	tmp = get_object ();	2458	tmp = part->clone ();
2594	copy_object (part, tmp);
2595	tmp->x -= src->x;	2459	tmp->x -= src->x;
2596	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2597	if (!part->head)	2462	if (!part->head)
2598	{	2463	{
2599	dst = tmp;	2464	dst = tmp;
2600	tmp->head = NULL;	2465	tmp->head = 0;
2601	}	2466	}
2602	else	2467	else
2603	{
2604	tmp->head = dst;	2468	tmp->head = dst;
2605	}	2469
2606	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2607	if (prev)	2472	if (prev)
2608	prev->more = tmp;	2473	prev->more = tmp;
		2474
2609	prev = tmp;	2475	prev = tmp;
2610	}	2476	}
2611		2477
2612	/*** copy inventory ***/
2613	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2614	{
2615	(void) insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
2616	}
2617		2480
2618	return dst;	2481	return dst;
2619	}	2482	}
2620		2483
2621	/* return true if the object was destroyed, 0 otherwise */
2622	int
2623	was_destroyed (const object *op, tag_t old_tag)
2624	{
2625	/* checking for FLAG_FREED isn't necessary, but makes this function more
2626	* robust */
2627	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2628	}
2629
2630	/* GROS - Creates an object using a string representing its content. */	2484	/* GROS - Creates an object using a string representing its content. */
2631
2632	/* Basically, we save the content of the string to a temp file, then call */	2485	/* Basically, we save the content of the string to a temp file, then call */
2633
2634	/* load_object on it. I admit it is a highly inefficient way to make things, */	2486	/* load_object on it. I admit it is a highly inefficient way to make things, */
2635
2636	/* but it was simple to make and allows reusing the load_object function. */	2487	/* but it was simple to make and allows reusing the load_object function. */
2637
2638	/* Remember not to use load_object_str in a time-critical situation. */	2488	/* Remember not to use load_object_str in a time-critical situation. */
2639
2640	/* Also remember that multiparts objects are not supported for now. */	2489	/* Also remember that multiparts objects are not supported for now. */
2641		2490
2642	object *	2491	object *
2643	load_object_str (const char *obstr)	2492	load_object_str (const char *obstr)
2644	{	2493	{
2645	object *	2494	object *op;
2646	op;
2647	char
2648	filename[MAX_BUF];	2495	char filename[MAX_BUF];
2649		2496
2650	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2651		2498
2652	FILE *
2653	tempfile = fopen (filename, "w");	2499	FILE *tempfile = fopen (filename, "w");
2654		2500
2655	if (tempfile == NULL)	2501	if (tempfile == NULL)
2656	{	2502	{
2657	LOG (llevError, "Error - Unable to access load object temp file\n");	2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2658	return NULL;	2504	return NULL;
2659	};	2505	}
		2506
2660	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2661	fclose (tempfile);	2508	fclose (tempfile);
2662		2509
2663	op = get_object ();	2510	op = object::create ();
2664		2511
2665	object_thawer thawer (filename);	2512	object_thawer thawer (filename);
2666		2513
2667	if (thawer)	2514	if (thawer)
2668	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);
…		…
2678	* returns NULL if no match.	2525	* returns NULL if no match.
2679	*/	2526	*/
2680	object *	2527	object *
2681	find_obj_by_type_subtype (const object *who, int type, int subtype)	2528	find_obj_by_type_subtype (const object *who, int type, int subtype)
2682	{	2529	{
2683	object *	2530	object *tmp;
2684	tmp;
2685		2531
2686	for (tmp = who->inv; tmp; tmp = tmp->below)	2532	for (tmp = who->inv; tmp; tmp = tmp->below)
2687	if (tmp->type == type && tmp->subtype == subtype)	2533	if (tmp->type == type && tmp->subtype == subtype)
2688	return tmp;	2534	return tmp;
2689		2535
…		…
2697	* do the desired thing.	2543	* do the desired thing.
2698	*/	2544	*/
2699	key_value *	2545	key_value *
2700	get_ob_key_link (const object *ob, const char *key)	2546	get_ob_key_link (const object *ob, const char *key)
2701	{	2547	{
2702	key_value *	2548	key_value *link;
2703	link;
2704		2549
2705	for (link = ob->key_values; link != NULL; link = link->next)	2550	for (link = ob->key_values; link != NULL; link = link->next)
2706	{
2707	if (link->key == key)	2551	if (link->key == key)
2708	{
2709	return link;	2552	return link;
2710	}
2711	}
2712		2553
2713	return NULL;	2554	return NULL;
2714	}	2555	}
2715		2556
2716	/*	2557	/*
…		…
2721	* The returned string is shared.	2562	* The returned string is shared.
2722	*/	2563	*/
2723	const char *	2564	const char *
2724	get_ob_key_value (const object *op, const char *const key)	2565	get_ob_key_value (const object *op, const char *const key)
2725	{	2566	{
2726	key_value *	2567	key_value *link;
2727	link;	2568	shstr_cmp canonical_key (key);
2728	const char *
2729	canonical_key;
2730		2569
2731	canonical_key = shstr::find (key);
2732
2733	if (canonical_key == NULL)	2570	if (!canonical_key)
2734	{	2571	{
2735	/* 1. There being a field named key on any object	2572	/* 1. There being a field named key on any object
2736	* implies there'd be a shared string to find.	2573	* implies there'd be a shared string to find.
2737	* 2. Since there isn't, no object has this field.	2574	* 2. Since there isn't, no object has this field.
2738	* 3. Therefore, *this* object doesn't have this field.	2575	* 3. Therefore, *this* object doesn't have this field.
2739	*/	2576	*/
2740	return NULL;	2577	return 0;
2741	}	2578	}
2742		2579
2743	/* This is copied from get_ob_key_link() above -	2580	/* This is copied from get_ob_key_link() above -
2744	* only 4 lines, and saves the function call overhead.	2581	* only 4 lines, and saves the function call overhead.
2745	*/	2582	*/
2746	for (link = op->key_values; link != NULL; link = link->next)	2583	for (link = op->key_values; link; link = link->next)
2747	{
2748	if (link->key == canonical_key)	2584	if (link->key == canonical_key)
2749	{
2750	return link->value;	2585	return link->value;
2751	}	2586
2752	}
2753	return NULL;	2587	return 0;
2754	}	2588	}
2755		2589
2756		2590
2757	/*	2591	/*
2758	* Updates the canonical_key in op to value.	2592	* Updates the canonical_key in op to value.
…		…
2844	shstr key_ (key);	2678	shstr key_ (key);
2845		2679
2846	return set_ob_key_value_s (op, key_, value, add_key);	2680	return set_ob_key_value_s (op, key_, value, add_key);
2847	}	2681	}
2848		2682
		2683	object::depth_iterator::depth_iterator (object *container)
		2684	: iterator_base (container)
		2685	{
		2686	while (item->inv)
		2687	item = item->inv;
		2688	}
		2689
2849	void	2690	void
2850	object::deep_iterator::next ()	2691	object::depth_iterator::next ()
2851	{	2692	{
2852	if (item->inv)
2853	item = item->inv;
2854	else if (item->below)	2693	if (item->below)
		2694	{
2855	item = item->below;	2695	item = item->below;
		2696
		2697	while (item->inv)
		2698	item = item->inv;
		2699	}
2856	else	2700	else
2857	item = item->env->below;	2701	item = item->env;
2858	}	2702	}
		2703
		2704	// return a suitable string describing an objetc in enough detail to find it
		2705	const char *
		2706	object::debug_desc (char *info) const
		2707	{
		2708	char info2[256 * 3];
		2709	char *p = info;
		2710
		2711	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2712	count,
		2713	&name,
		2714	title ? " " : "",
		2715	title ? (const char *)title : "");
		2716
		2717	if (env)
		2718	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2719
		2720	if (map)
		2721	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2722
		2723	return info;
		2724	}
		2725
		2726	const char *
		2727	object::debug_desc () const
		2728	{
		2729	static char info[256 * 3];
		2730	return debug_desc (info);
		2731	}
		2732

Diff Legend

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