ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.31 by root, Mon Sep 11 23:33:27 2006 UTC vs.
Revision 1.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 *
911	op;
912
913	if (freed.empty ())
914	op = new object;	847	object *op = new object;
915	else
916	{
917	// highly annoying, but the only way to get it stable right now
918	op = freed.back ();
919	freed.pop_back ();
920	op->~object ();
921	new ((void *) op) object;
922	}
923
924	op->link ();	848	op->link ();
925	return op;	849	return op;
926	}	850	}
927		851
928	/*	852	/*
…		…
930	* 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
931	* free objects. The IS_FREED() flag is set in the object.	855	* free objects. The IS_FREED() flag is set in the object.
932	* The object must have been removed by remove_ob() first for	856	* The object must have been removed by remove_ob() first for
933	* this function to succeed.	857	* this function to succeed.
934	*	858	*
935	* 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
936	* inventory to the ground.	860	* inventory to the ground.
937	*/	861	*/
938	void object::free (bool free_inventory)	862	void object::destroy (bool destroy_inventory)
939	{	863	{
940	if (QUERY_FLAG (this, FLAG_FREED))	864	if (QUERY_FLAG (this, FLAG_FREED))
941	return;	865	return;
942		866
943	if (!QUERY_FLAG (this, FLAG_REMOVED))
944	remove_ob (this);
945
946	if (QUERY_FLAG (this, FLAG_FRIENDLY))	867	if (QUERY_FLAG (this, FLAG_FRIENDLY))
947	remove_friendly_object (this);	868	remove_friendly_object (this);
948		869
		870	if (!QUERY_FLAG (this, FLAG_REMOVED))
		871	remove ();
		872
949	SET_FLAG (this, FLAG_FREED);	873	SET_FLAG (this, FLAG_FREED);
950		874
951	if (more)	875	if (more)
952	{	876	{
953	more->free (free_inventory);	877	more->destroy (destroy_inventory);
954	more = 0;	878	more = 0;
955	}	879	}
956		880
957	if (inv)	881	if (inv)
958	{	882	{
959	/* Only if the space blocks everything do we not process -	883	/* Only if the space blocks everything do we not process -
960	* if some form of movement is allowed, let objects	884	* if some form of movement is allowed, let objects
961	* drop on that space.	885	* drop on that space.
962	*/	886	*/
963	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)
964	{	888	{
965	object *op = inv;	889	object *op = inv;
966		890
967	while (op)	891	while (op)
968	{	892	{
969	object *tmp = op->below;	893	object *tmp = op->below;
970	op->free (free_inventory);	894	op->destroy (destroy_inventory);
971	op = tmp;	895	op = tmp;
972	}	896	}
973	}	897	}
974	else	898	else
975	{ /* Put objects in inventory onto this space */	899	{ /* Put objects in inventory onto this space */
…		…
977		901
978	while (op)	902	while (op)
979	{	903	{
980	object *tmp = op->below;	904	object *tmp = op->below;
981		905
982	remove_ob (op);	906	op->remove ();
983		907
984	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
985	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
986	free_object (op);	910	op->destroy ();
987	else	911	else
988	{	912	{
989	op->x = x;	913	op->x = x;
990	op->y = y;	914	op->y = y;
991	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 */
…		…
994	op = tmp;	918	op = tmp;
995	}	919	}
996	}	920	}
997	}	921	}
998		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
999	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;
1000		950
1001	/* Remove object from the active list */	951	/* Remove object from the active list */
1002	speed = 0;	952	speed = 0;
1003	update_ob_speed (this);	953	update_ob_speed (this);
1004		954
…		…
1009		959
1010	/*	960	/*
1011	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1012	* 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)).
1013	*/	963	*/
1014
1015	void	964	void
1016	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1017	{	966	{
1018	while (op != NULL)	967	while (op != NULL)
1019	{	968	{
1020	if (op->type == CONTAINER)	969	if (op->type == CONTAINER)
1021	{
1022	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	970	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1023	}	971
1024	op->carrying -= weight;	972	op->carrying -= weight;
1025	op = op->env;	973	op = op->env;
1026	}	974	}
1027	}	975	}
1028		976
1029	/* remove_ob(op):	977	/* op->remove ():
1030	* 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
1031	* 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
1032	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1033	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1034	* the previous environment.	982	* the previous environment.
1035	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1036	*/	984	*/
1037
1038	void	985	void
1039	remove_ob (object *op)	986	object::remove ()
1040	{	987	{
		988	object *tmp, *last = 0;
1041	object *	989	object *otmp;
1042	tmp, *
1043	last = NULL;
1044	object *
1045	otmp;
1046		990
1047	tag_t
1048	tag;
1049	int
1050	check_walk_off;	991	int check_walk_off;
1051	mapstruct *
1052	m;
1053		992
1054	sint16
1055	x,
1056	y;
1057
1058	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1059	return;	994	return;
1060		995
1061	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
1062		997
1063	if (op->more != NULL)	998	if (more)
1064	remove_ob (op->more);	999	more->remove ();
1065		1000
1066	/*	1001	/*
1067	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1068	* inventory.	1003	* inventory.
1069	*/	1004	*/
1070	if (op->env != NULL)	1005	if (env)
1071	{	1006	{
1072	if (op->nrof)	1007	if (nrof)
1073	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1074	else	1009	else
1075	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1076		1011
1077	/* 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
1078	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1079	* to save cpu time.	1014	* to save cpu time.
1080	*/	1015	*/
1081	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))
1082	fix_player (otmp);	1017	fix_player (otmp);
1083		1018
1084	if (op->above != NULL)	1019	if (above != NULL)
1085	op->above->below = op->below;	1020	above->below = below;
1086	else	1021	else
1087	op->env->inv = op->below;	1022	env->inv = below;
1088		1023
1089	if (op->below != NULL)	1024	if (below != NULL)
1090	op->below->above = op->above;	1025	below->above = above;
1091		1026
1092	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1093	* 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
1094	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1095	*/	1030	*/
1096	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1097	op->map = op->env->map;	1032	map = env->map;
1098	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1099	op->env = NULL;	1034	env = 0;
1100	}	1035	}
1101	else if (op->map)	1036	else if (map)
1102	{	1037	{
1103	x = op->x;
1104	y = op->y;
1105	m = get_map_from_coord (op->map, &x, &y);
1106
1107	if (!m)
1108	{
1109	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1110	op->map->path, op->x, op->y);
1111	/* in old days, we used to set x and y to 0 and continue.
1112	* it seems if we get into this case, something is probablye
1113	* screwed up and should be fixed.
1114	*/
1115	abort ();
1116	}
1117
1118	if (op->map != m)
1119	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1120	op->map->path, m->path, op->x, op->y, x, y);
1121
1122	/* Re did the following section of code - it looks like it had	1038	/* Re did the following section of code - it looks like it had
1123	* lots of logic for things we no longer care about	1039	* lots of logic for things we no longer care about
1124	*/	1040	*/
1125		1041
1126	/* link the object above us */	1042	/* link the object above us */
1127	if (op->above)	1043	if (above)
1128	op->above->below = op->below;	1044	above->below = below;
1129	else	1045	else
1130	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 */
1131		1047
1132	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1133	if (op->below)	1049	if (below)
1134	op->below->above = op->above;	1050	below->above = above;
1135	else	1051	else
1136	{	1052	{
1137	/* 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
1138	* use translated coordinates in case some oddness with map tiling is	1054	* use translated coordinates in case some oddness with map tiling is
1139	* evident	1055	* evident
1140	*/	1056	*/
1141	if (GET_MAP_OB (m, x, y) != op)	1057	if (GET_MAP_OB (map, x, y) != this)
1142	{	1058	{
1143	dump_object (op);	1059	char *dump = dump_object (this);
1144	LOG (llevError,	1060	LOG (llevError,
1145	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	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);
1146	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1147	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
1148	}	1066	}
1149		1067
1150	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1068	map->at (x, y).bottom = above; /* goes on above it. */
1151	}	1069	}
1152		1070
1153	op->above = 0;	1071	above = 0;
1154	op->below = 0;	1072	below = 0;
1155		1073
1156	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1157	return;	1075	return;
1158		1076
1159	tag = op->count;
1160	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1161		1078
1162	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)
1163	{	1080	{
1164	/* 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
1165	* being removed.	1082	* being removed.
1166	*/	1083	*/
1167		1084
1168	if (tmp->type == PLAYER && tmp != op)	1085	if (tmp->type == PLAYER && tmp != this)
1169	{	1086	{
1170	/* If a container that the player is currently using somehow gets	1087	/* If a container that the player is currently using somehow gets
1171	* removed (most likely destroyed), update the player view	1088	* removed (most likely destroyed), update the player view
1172	* appropriately.	1089	* appropriately.
1173	*/	1090	*/
1174	if (tmp->container == op)	1091	if (tmp->container == this)
1175	{	1092	{
1176	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1177	tmp->container = NULL;	1094	tmp->container = 0;
1178	}	1095	}
1179		1096
1180	tmp->contr->socket.update_look = 1;	1097	tmp->contr->socket->floorbox_update ();
1181	}	1098	}
1182		1099
1183	/* See if player moving off should effect something */	1100	/* See if player moving off should effect something */
1184	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1101	if (check_walk_off
		1102	&& ((move_type & tmp->move_off)
		1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1185	{	1104	{
1186	move_apply (tmp, op, NULL);	1105	move_apply (tmp, this, 0);
1187		1106
1188	if (was_destroyed (op, tag))	1107	if (destroyed ())
1189	{
1190	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 ());
1191	}
1192	}	1109	}
1193		1110
1194	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1195		1112
1196	if (tmp->above == tmp)	1113	if (tmp->above == tmp)
1197	tmp->above = NULL;	1114	tmp->above = 0;
1198		1115
1199	last = tmp;	1116	last = tmp;
1200	}	1117	}
1201		1118
1202	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1203	if (last == NULL)	1120	if (!last)
1204	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1205	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1206	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1207	* those out anyways, and if there are any flags set right now, they won't
1208	* be correct anyways.
1209	*/
1210	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1211	update_position (op->map, op->x, op->y);
1212	}
1213	else	1122	else
1214	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1215		1124
1216	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1217	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1218	}	1127	}
1219	}	1128	}
1220		1129
1221	/*	1130	/*
1222	* merge_ob(op,top):	1131	* merge_ob(op,top):
…		…
1224	* This function goes through all objects below and including top, and	1133	* This function goes through all objects below and including top, and
1225	* merges op to the first matching object.	1134	* merges op to the first matching object.
1226	* If top is NULL, it is calculated.	1135	* If top is NULL, it is calculated.
1227	* 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
1228	*/	1137	*/
1229
1230	object *	1138	object *
1231	merge_ob (object *op, object *top)	1139	merge_ob (object *op, object *top)
1232	{	1140	{
1233	if (!op->nrof)	1141	if (!op->nrof)
1234	return 0;	1142	return 0;
…		…
1238		1146
1239	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1240	{	1148	{
1241	if (top == op)	1149	if (top == op)
1242	continue;	1150	continue;
1243	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1244	{	1153	{
1245	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1246		1155
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1158	op->destroy ();
1250	free_object (op);
1251	return top;	1159	return top;
1252	}	1160	}
1253	}	1161	}
1254		1162
1255	return NULL;	1163	return 0;
1256	}	1164	}
1257		1165
1258	/*	1166	/*
1259	* 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
1260	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1261	*/	1169	*/
1262	object *	1170	object *
1263	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)
1264	{	1172	{
1265	object *tmp;	1173	object *tmp;
1266		1174
1267	if (op->head)	1175	if (op->head)
1268	op = op->head;	1176	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1205	* just 'op' otherwise
1298	*/	1206	*/
1299		1207
1300	object *	1208	object *
1301	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)
1302	{	1210	{
1303	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1212	sint16 x, y;
1305		1213
1306	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1217	return NULL;
1310	}	1218	}
1311		1219
1312	if (m == NULL)	1220	if (m == NULL)
1313	{	1221	{
1314	dump_object (op);	1222	char *dump = dump_object (op);
1315	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);
1316	return op;	1225	return op;
1317	}	1226	}
1318		1227
1319	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1320	{	1229	{
1321	dump_object (op);	1230	char *dump = dump_object (op);
1322	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);
1323	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1324	/* 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
1325	* 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
1326	* improperly inserted.	1235	* improperly inserted.
1327	*/	1236	*/
1328	abort ();	1237	abort ();
1329	#endif	1238	#endif
		1239	free (dump);
1330	return op;	1240	return op;
1331	}	1241	}
1332		1242
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1244	{
1335	dump_object (op);	1245	char *dump = dump_object (op);
1336	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);
1337	return op;	1248	return op;
1338	}	1249	}
1339		1250
1340	if (op->more != NULL)	1251	if (op->more != NULL)
1341	{	1252	{
…		…
1379		1290
1380	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1381	*/	1292	*/
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1383	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)
1384	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1385	{	1296	{
1386	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1298	tmp->destroy ();
1388	free_object (tmp);
1389	}	1299	}
1390		1300
1391	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 */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1303
…		…
1406	op->below = originator->below;	1316	op->below = originator->below;
1407		1317
1408	if (op->below)	1318	if (op->below)
1409	op->below->above = op;	1319	op->below->above = op;
1410	else	1320	else
1411	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->ms ().bottom = op;
1412		1322
1413	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1414	originator->below = op;	1324	originator->below = op;
1415	}	1325	}
1416	else	1326	else
…		…
1462	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1463	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1464	* stacking is a bit odd.	1374	* stacking is a bit odd.
1465	*/	1375	*/
1466	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1467	(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))
1468	{	1378	{
1469	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1470	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1471	break;	1381	break;
1472	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1495		1405
1496	if (op->above)	1406	if (op->above)
1497	op->above->below = op;	1407	op->above->below = op;
1498		1408
1499	op->below = NULL;	1409	op->below = NULL;
1500	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->ms ().bottom = op;
1501	}	1411	}
1502	else	1412	else
1503	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1504	op->above = top->above;	1414	op->above = top->above;
1505		1415
…		…
1509	op->below = top;	1419	op->below = top;
1510	top->above = op;	1420	top->above = op;
1511	}	1421	}
1512		1422
1513	if (op->above == NULL)	1423	if (op->above == NULL)
1514	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->ms ().top = op;
1515	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1516		1426
1517	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1518	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1519		1429
1520	/* 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
1521	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1522	*/	1432	*/
1523	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1524	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 ())
1525	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1526	tmp->contr->socket.update_look = 1;
1527		1436
1528	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1529	* 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
1530	* 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
1531	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1539		1448
1540	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1541	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1542		1451
1543	/* 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,
1544	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1545	*	1454	*
1546	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1547	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1548	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1549	* update_object().	1458	* update_object().
…		…
1565		1474
1566	return op;	1475	return op;
1567	}	1476	}
1568		1477
1569	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1570	* 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.
1571	* 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.
1572	*/	1481	*/
1573	void	1482	void
1574	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1575	{	1484	{
1576	object *	1485	object *tmp, *tmp1;
1577	tmp;
1578	object *
1579	tmp1;
1580		1486
1581	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1582		1488
1583	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)
1584	{
1585	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1491	tmp->destroy ();
1587	remove_ob (tmp);
1588	free_object (tmp);
1589	}
1590	}
1591		1492
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1494
1594	tmp1->x = op->x;	1495	tmp1->x = op->x;
1595	tmp1->y = op->y;	1496	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1497	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1498	}
…		…
1605	*/	1506	*/
1606		1507
1607	object *	1508	object *
1608	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1609	{	1510	{
1610	object *	1511	object *newob;
1611	newob;
1612	int
1613	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614		1513
1615	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1616	{	1515	{
1617	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);
1618	return NULL;	1517	return NULL;
1619	}	1518	}
1620		1519
1621	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
1622		1521
1623	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1624	{	1523	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)	1524	else if (!is_removed)
1630	{	1525	{
1631	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	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)
…		…
1663	if (i > op->nrof)	1558	if (i > op->nrof)
1664	i = op->nrof;	1559	i = op->nrof;
1665		1560
1666	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1667	op->nrof -= i;	1562	op->nrof -= i;
1668	else if (op->env != NULL)	1563	else if (op->env)
1669	{	1564	{
1670	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1671	* therein?	1566	* therein?
1672	*/	1567	*/
1673	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1674	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1675	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1676	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1677	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1678	* and then searching the map for a player.	1573	* and then searching the map for a player.
1679	*/	1574	*/
1680	if (!tmp)	1575	if (!tmp)
1681	{	1576	{
1682	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1683	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1684	break;	1581	break;
1685	if (pl)	1582	}
1686	tmp = pl->ob;
1687	else
1688	tmp = NULL;
1689	}	1583	}
1690		1584
1691	if (i < op->nrof)	1585	if (i < op->nrof)
1692	{	1586	{
1693	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1694	op->nrof -= i;	1588	op->nrof -= i;
1695	if (tmp)	1589	if (tmp)
1696	{
1697	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1698	}
1699	}	1591	}
1700	else	1592	else
1701	{	1593	{
1702	remove_ob (op);	1594	op->remove ();
1703	op->nrof = 0;	1595	op->nrof = 0;
1704	if (tmp)	1596	if (tmp)
1705	{
1706	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1707	}
1708	}	1598	}
1709	}	1599	}
1710	else	1600	else
1711	{	1601	{
1712	object *above = op->above;	1602	object *above = op->above;
1713		1603
1714	if (i < op->nrof)	1604	if (i < op->nrof)
1715	op->nrof -= i;	1605	op->nrof -= i;
1716	else	1606	else
1717	{	1607	{
1718	remove_ob (op);	1608	op->remove ();
1719	op->nrof = 0;	1609	op->nrof = 0;
1720	}	1610	}
1721		1611
1722	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1724	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1725	{	1615	{
1726	if (op->nrof)	1616	if (op->nrof)
1727	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1728	else	1618	else
…		…
1732		1622
1733	if (op->nrof)	1623	if (op->nrof)
1734	return op;	1624	return op;
1735	else	1625	else
1736	{	1626	{
1737	free_object (op);	1627	op->destroy ();
1738	return NULL;	1628	return 0;
1739	}	1629	}
1740	}	1630	}
1741		1631
1742	/*	1632	/*
1743	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1755	op->carrying += weight;	1645	op->carrying += weight;
1756	op = op->env;	1646	op = op->env;
1757	}	1647	}
1758	}	1648	}
1759		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
1760	/*	1670	/*
1761	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1762	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1763	* inside the object environment.	1673	* inside the object environment.
1764	*	1674	*
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	1675	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1772	*/	1677	*/
1773		1678
1774	object *	1679	object *
1775	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1776	{	1681	{
1777	object *	1682	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1683
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1685	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		1686
1801	if (op->more)	1687	if (op->more)
1802	{	1688	{
1803	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);
1804	return op;	1690	return op;
…		…
1806		1692
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1695	if (op->nrof)
1810	{	1696	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1813	{	1699	{
1814	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1815	(client needs the original object) */	1701	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1819	*/	1705	*/
1820	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1823	op = tmp;	1709	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1712	break;
1827	}	1713	}
1828		1714
1829	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1717	* (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	1718	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1719	* the linking below
1834	*/	1720	*/
1835	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1836	}	1722	}
1837	else	1723	else
1838	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1839		1725
1840	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1841	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1729	fix_player (otmp);
1845	}
1846		1730
1847	op->map = NULL;	1731	op->map = 0;
1848	op->env = where;	1732	op->env = this;
1849	op->above = NULL;	1733	op->above = 0;
1850	op->below = NULL;	1734	op->below = 0;
1851	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1852		1736
1853	/* 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 */
1854	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1855	{	1739	{
1856	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1857	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);
1858	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1860	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1861	}	1745	}
1862		1746
1863	/* 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.
1864	* It sure simplifies this function...	1748	* It sure simplifies this function...
1865	*/	1749	*/
1866	if (where->inv == NULL)	1750	if (!inv)
1867	where->inv = op;	1751	inv = op;
1868	else	1752	else
1869	{	1753	{
1870	op->below = where->inv;	1754	op->below = inv;
1871	op->below->above = op;	1755	op->below->above = op;
1872	where->inv = op;	1756	inv = op;
1873	}	1757	}
		1758
1874	return op;	1759	return op;
1875	}	1760	}
1876		1761
1877	/*	1762	/*
1878	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1896	*/	1781	*/
1897		1782
1898	int	1783	int
1899	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
1900	{	1785	{
1901	object *	1786	object *tmp;
1902	tmp;	1787	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
1909		1789
1910	MoveType	1790	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1791
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1793	return 0;
1917
1918	tag = op->count;
1919		1794
1920	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);
1921	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);
1922	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);
1923		1798
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1859	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))	1860	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1861	{
1987	move_apply (tmp, op, originator);	1862	move_apply (tmp, op, originator);
1988		1863
1989	if (was_destroyed (op, tag))	1864	if (op->destroyed ())
1990	return 1;	1865	return 1;
1991		1866
1992	/* what the person/creature stepped onto has moved the object	1867	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1868	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1869	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2008	*/	1883	*/
2009		1884
2010	object *	1885	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1887	{
2013	object *	1888	object *
2014	tmp;	1889	tmp;
2015		1890
2016	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2031	*/	1906	*/
2032		1907
2033	object *	1908	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2035	{	1910	{
2036	object *	1911	object *
2037	tmp;	1912	tmp;
2038		1913
2039	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2179	* 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
2180	* customized, changed states, etc.	2055	* customized, changed states, etc.
2181	*/	2056	*/
2182		2057
2183	int	2058	int
2184	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)
2185	{	2060	{
2186	int	2061	int
2187	i,	2062	i,
2188	index = 0, flag;	2063	index = 0, flag;
2189	static int	2064	static int
…		…
2201	* 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
2202	* 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
2203	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2204	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2205	*/	2080	*/
2206	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2207	stop = maxfree[i];	2082	stop = maxfree[i];
2208	}	2083	}
		2084
2209	if (!index)	2085	if (!index)
2210	return -1;	2086	return -1;
		2087
2211	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2212	}	2089	}
2213		2090
2214	/*	2091	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2217	* 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.
2218	* 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.
2219	*/	2096	*/
2220		2097
2221	int	2098	int
2222	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)
2223	{	2100	{
2224	int	2101	int
2225	i;	2102	i;
2226		2103
2227	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* 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
2292	* there is capable of.	2169	* there is capable of.
2293	*/	2170	*/
2294		2171
2295	int	2172	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2174	{
2298	int	2175	int
2299	i,	2176	i,
2300	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2301		2178
2302	sint16 nx, ny;	2179	sint16 nx, ny;
2303	object *	2180	object *
2304	tmp;	2181	tmp;
2305	mapstruct *	2182	maptile *
2306	mp;	2183	mp;
2307		2184
2308	MoveType blocked, move_type;	2185	MoveType blocked, move_type;
2309		2186
2310	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
…		…
2323	mp = m;	2200	mp = m;
2324	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2325	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2326		2203
2327	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2328	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2329	{
2330	max = maxfree[i];	2207	max = maxfree[i];
2331	}
2332	else	2208	else
2333	{	2209	{
2334	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2335		2211
2336	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2337	{
2338	max = maxfree[i];	2213	max = maxfree[i];
2339	}
2340	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2341	{	2215	{
2342	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)
2343	{
2344	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)))
2345	{
2346	break;	2218	break;
2347	}	2219
2348	}
2349	if (tmp)	2220	if (tmp)
2350	{
2351	return freedir[i];	2221	return freedir[i];
2352	}
2353	}	2222	}
2354	}	2223	}
2355	}	2224	}
		2225
2356	return 0;	2226	return 0;
2357	}	2227	}
2358		2228
2359	/*	2229	/*
2360	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2362	*/	2232	*/
2363		2233
2364	int	2234	int
2365	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2366	{	2236	{
2367	int	2237	int i;
2368	i;
2369		2238
2370	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);
2371	return i;	2240	return i;
2372	}	2241	}
2373		2242
…		…
2378	*/	2247	*/
2379		2248
2380	int	2249	int
2381	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2382	{	2251	{
2383	int	2252	int q;
2384	q;
2385		2253
2386	if (y)	2254	if (y)
2387	q = x * 100 / y;	2255	q = x * 100 / y;
2388	else if (x)	2256	else if (x)
2389	q = -300 * x;	2257	q = -300 * x;
…		…
2515	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2516	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2517	* can see a direct way to get it	2385	* can see a direct way to get it
2518	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2519	*/	2387	*/
2520
2521
2522	int	2388	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2390	{
2525	sint16 dx, dy;	2391	sint16 dx, dy;
2526	int
2527	mflags;	2392	int mflags;
2528		2393
2529	if (dir < 0)	2394	if (dir < 0)
2530	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2531		2396
2532	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2545	return 0;	2410	return 0;
2546		2411
2547	/* yes, can see. */	2412	/* yes, can see. */
2548	if (dir < 9)	2413	if (dir < 9)
2549	return 1;	2414	return 1;
		2415
2550	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2551	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]);
2552	}	2419	}
2553
2554
2555		2420
2556	/*	2421	/*
2557	* 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
2558	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2559	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2570	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2571	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2572	!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));
2573	}	2438	}
2574		2439
2575
2576	/*	2440	/*
2577	* create clone from object to another	2441	* create clone from object to another
2578	*/	2442	*/
2579	object *	2443	object *
2580	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2581	{	2445	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2447
2585	if (!asrc)	2448	if (!asrc)
2586	return NULL;	2449	return 0;
		2450
2587	src = asrc;	2451	src = asrc;
2588	if (src->head)	2452	if (src->head)
2589	src = src->head;	2453	src = src->head;
2590		2454
2591	prev = NULL;	2455	prev = 0;
2592	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2593	{	2457	{
2594	tmp = get_object ();	2458	tmp = part->clone ();
2595	copy_object (part, tmp);
2596	tmp->x -= src->x;	2459	tmp->x -= src->x;
2597	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2598	if (!part->head)	2462	if (!part->head)
2599	{	2463	{
2600	dst = tmp;	2464	dst = tmp;
2601	tmp->head = NULL;	2465	tmp->head = 0;
2602	}	2466	}
2603	else	2467	else
2604	{
2605	tmp->head = dst;	2468	tmp->head = dst;
2606	}	2469
2607	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2608	if (prev)	2472	if (prev)
2609	prev->more = tmp;	2473	prev->more = tmp;
		2474
2610	prev = tmp;	2475	prev = tmp;
2611	}	2476	}
2612		2477
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2480
2619	return dst;	2481	return dst;
2620	}	2482	}
2621		2483
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. */	2484	/* 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 */	2485	/* 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, */	2486	/* 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. */	2487	/* 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. */	2488	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2489	/* Also remember that multiparts objects are not supported for now. */
2642		2490
2643	object *	2491	object *
2644	load_object_str (const char *obstr)	2492	load_object_str (const char *obstr)
2645	{	2493	{
2646	object *	2494	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2495	char filename[MAX_BUF];
2650		2496
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2498
2653	FILE *
2654	tempfile = fopen (filename, "w");	2499	FILE *tempfile = fopen (filename, "w");
2655		2500
2656	if (tempfile == NULL)	2501	if (tempfile == NULL)
2657	{	2502	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2504	return NULL;
2660	};	2505	}
		2506
2661	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2508	fclose (tempfile);
2663		2509
2664	op = get_object ();	2510	op = object::create ();
2665		2511
2666	object_thawer thawer (filename);	2512	object_thawer thawer (filename);
2667		2513
2668	if (thawer)	2514	if (thawer)
2669	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);
…		…
2679	* returns NULL if no match.	2525	* returns NULL if no match.
2680	*/	2526	*/
2681	object *	2527	object *
2682	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)
2683	{	2529	{
2684	object *	2530	object *tmp;
2685	tmp;
2686		2531
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2532	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2533	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2534	return tmp;
2690		2535
…		…
2698	* do the desired thing.	2543	* do the desired thing.
2699	*/	2544	*/
2700	key_value *	2545	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2546	get_ob_key_link (const object *ob, const char *key)
2702	{	2547	{
2703	key_value *	2548	key_value *link;
2704	link;
2705		2549
2706	for (link = ob->key_values; link != NULL; link = link->next)	2550	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2551	if (link->key == key)
2709	{
2710	return link;	2552	return link;
2711	}
2712	}
2713		2553
2714	return NULL;	2554	return NULL;
2715	}	2555	}
2716		2556
2717	/*	2557	/*
…		…
2722	* The returned string is shared.	2562	* The returned string is shared.
2723	*/	2563	*/
2724	const char *	2564	const char *
2725	get_ob_key_value (const object *op, const char *const key)	2565	get_ob_key_value (const object *op, const char *const key)
2726	{	2566	{
2727	key_value *	2567	key_value *link;
2728	link;	2568	shstr_cmp canonical_key (key);
2729	const char *
2730	canonical_key;
2731		2569
2732	canonical_key = shstr::find (key);
2733
2734	if (canonical_key == NULL)	2570	if (!canonical_key)
2735	{	2571	{
2736	/* 1. There being a field named key on any object	2572	/* 1. There being a field named key on any object
2737	* implies there'd be a shared string to find.	2573	* implies there'd be a shared string to find.
2738	* 2. Since there isn't, no object has this field.	2574	* 2. Since there isn't, no object has this field.
2739	* 3. Therefore, *this* object doesn't have this field.	2575	* 3. Therefore, *this* object doesn't have this field.
2740	*/	2576	*/
2741	return NULL;	2577	return 0;
2742	}	2578	}
2743		2579
2744	/* This is copied from get_ob_key_link() above -	2580	/* This is copied from get_ob_key_link() above -
2745	* only 4 lines, and saves the function call overhead.	2581	* only 4 lines, and saves the function call overhead.
2746	*/	2582	*/
2747	for (link = op->key_values; link != NULL; link = link->next)	2583	for (link = op->key_values; link; link = link->next)
2748	{
2749	if (link->key == canonical_key)	2584	if (link->key == canonical_key)
2750	{
2751	return link->value;	2585	return link->value;
2752	}	2586
2753	}
2754	return NULL;	2587	return 0;
2755	}	2588	}
2756		2589
2757		2590
2758	/*	2591	/*
2759	* Updates the canonical_key in op to value.	2592	* Updates the canonical_key in op to value.
…		…
2845	shstr key_ (key);	2678	shstr key_ (key);
2846		2679
2847	return set_ob_key_value_s (op, key_, value, add_key);	2680	return set_ob_key_value_s (op, key_, value, add_key);
2848	}	2681	}
2849		2682
		2683	object::depth_iterator::depth_iterator (object *container)
		2684	: iterator_base (container)
		2685	{
		2686	while (item->inv)
		2687	item = item->inv;
		2688	}
		2689
2850	void	2690	void
2851	object::deep_iterator::next ()	2691	object::depth_iterator::next ()
2852	{	2692	{
2853	if (item->inv)
2854	item = item->inv;
2855	else if (item->below)	2693	if (item->below)
		2694	{
2856	item = item->below;	2695	item = item->below;
		2696
		2697	while (item->inv)
		2698	item = item->inv;
		2699	}
2857	else	2700	else
2858	item = item->env->below;	2701	item = item->env;
2859	}	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