ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.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
…		…
623	/*	599	/*
624	* Updates the speed of an object. If the speed changes from 0 to another	600	* Updates the speed of an object. If the speed changes from 0 to another
625	* value, or vice versa, then add/remove the object from the active list.	601	* value, or vice versa, then add/remove the object from the active list.
626	* This function needs to be called whenever the speed of an object changes.	602	* This function needs to be called whenever the speed of an object changes.
627	*/	603	*/
628
629	void	604	void
630	update_ob_speed (object *op)	605	update_ob_speed (object *op)
631	{	606	{
632	extern int arch_init;	607	extern int arch_init;
633		608
…		…
642	abort ();	617	abort ();
643	#else	618	#else
644	op->speed = 0;	619	op->speed = 0;
645	#endif	620	#endif
646	}	621	}
		622
647	if (arch_init)	623	if (arch_init)
648	{
649	return;	624	return;
650	}	625
651	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
652	{	627	{
653	/* If already on active list, don't do anything */	628	/* If already on active list, don't do anything */
654	if (op->active_next || op->active_prev || op == active_objects)	629	if (op->active_next || op->active_prev || op == active_objects)
655	return;	630	return;
656		631
657	/* process_events() expects us to insert the object at the beginning	632	/* process_events() expects us to insert the object at the beginning
658	* of the list. */	633	* of the list. */
659	op->active_next = active_objects;	634	op->active_next = active_objects;
		635
660	if (op->active_next != NULL)	636	if (op->active_next != NULL)
661	op->active_next->active_prev = op;	637	op->active_next->active_prev = op;
		638
662	active_objects = op;	639	active_objects = op;
663	}	640	}
664	else	641	else
665	{	642	{
666	/* If not on the active list, nothing needs to be done */	643	/* If not on the active list, nothing needs to be done */
…		…
668	return;	645	return;
669		646
670	if (op->active_prev == NULL)	647	if (op->active_prev == NULL)
671	{	648	{
672	active_objects = op->active_next;	649	active_objects = op->active_next;
		650
673	if (op->active_next != NULL)	651	if (op->active_next != NULL)
674	op->active_next->active_prev = NULL;	652	op->active_next->active_prev = NULL;
675	}	653	}
676	else	654	else
677	{	655	{
678	op->active_prev->active_next = op->active_next;	656	op->active_prev->active_next = op->active_next;
		657
679	if (op->active_next)	658	if (op->active_next)
680	op->active_next->active_prev = op->active_prev;	659	op->active_next->active_prev = op->active_prev;
681	}	660	}
		661
682	op->active_next = NULL;	662	op->active_next = NULL;
683	op->active_prev = NULL;	663	op->active_prev = NULL;
684	}	664	}
685	}	665	}
686		666
…		…
714	op->active_next = NULL;	694	op->active_next = NULL;
715	op->active_prev = NULL;	695	op->active_prev = NULL;
716	}	696	}
717		697
718	/*	698	/*
719	* update_object() updates the array which represents the map.	699	* update_object() updates the the map.
720	* It takes into account invisible objects (and represent squares covered	700	* It takes into account invisible objects (and represent squares covered
721	* 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
722	* invisible object, etc...)	702	* invisible object, etc...)
723	* 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
724	* 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
725	* updating that window, though, since update_object() is called _often_)	705	* updating that window, though, since update_object() is called _often_)
726	*	706	*
727	* 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.
728	* For example, if the only thing that has changed is the face (due to
729	* an animation), we don't need to call update_position until that actually
730	* comes into view of a player. OTOH, many other things, like addition/removal
731	* of walls or living creatures may need us to update the flags now.
732	* current action are:	708	* current action are:
733	* UP_OBJ_INSERT: op was inserted	709	* UP_OBJ_INSERT: op was inserted
734	* UP_OBJ_REMOVE: op was removed	710	* UP_OBJ_REMOVE: op was removed
735	* 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
736	* 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.
737	* UP_OBJ_FACE: only the objects face has changed.	713	* UP_OBJ_FACE: only the objects face has changed.
738	*/	714	*/
739
740	void	715	void
741	update_object (object *op, int action)	716	update_object (object *op, int action)
742	{	717	{
743	int update_now = 0, flags;
744	MoveType move_on, move_off, move_block, move_slow;	718	MoveType move_on, move_off, move_block, move_slow;
745		719
746	if (op == NULL)	720	if (op == NULL)
747	{	721	{
748	/* this should never happen */	722	/* this should never happen */
749	LOG (llevDebug, "update_object() called for NULL object.\n");	723	LOG (llevDebug, "update_object() called for NULL object.\n");
750	return;	724	return;
751	}	725	}
752		726
753	if (op->env != NULL)	727	if (op->env)
754	{	728	{
755	/* Animation is currently handled by client, so nothing	729	/* Animation is currently handled by client, so nothing
756	* to do in this case.	730	* to do in this case.
757	*/	731	*/
758	return;	732	return;
…		…
772	abort ();	746	abort ();
773	#endif	747	#endif
774	return;	748	return;
775	}	749	}
776		750
777	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	751	mapspace &m = op->ms ();
778	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
779	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
780	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
781	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
782	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
783		752
		753	if (m.flags_ & P_NEED_UPDATE)
		754	/* nop */;
784	if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
785	{	756	{
		757	// this is likely overkill, TODO: revisit (schmorp)
786	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
787	update_now = 1;
788
789	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	759	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
790	update_now = 1;	760	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
791		761	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		762	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
792	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	763	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
793	update_now = 1;
794
795	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
796	update_now = 1;
797
798	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
799	update_now = 1;
800
801	if ((move_on | op->move_on) != move_on)	764	|| (m.move_on | op->move_on ) != m.move_on
802	update_now = 1;
803
804	if ((move_off | op->move_off) != move_off)	765	|| (m.move_off | op->move_off ) != m.move_off
805	update_now = 1;	766	|| (m.move_slow | op->move_slow) != m.move_slow
806
807	/* 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
808	* to have move_allow right now.	768	* to have move_allow right now.
809	*/	769	*/
810	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
811	update_now = 1;	771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
812		772	m.flags_ = P_NEED_UPDATE;
813	if ((move_slow | op->move_slow) != move_slow)
814	update_now = 1;
815	}	773	}
816	/* if the object is being removed, we can't make intelligent	774	/* if the object is being removed, we can't make intelligent
817	* decisions, because remove_ob can't really pass the object	775	* decisions, because remove_ob can't really pass the object
818	* that is being removed.	776	* that is being removed.
819	*/	777	*/
820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
821	update_now = 1;	779	m.flags_ = P_NEED_UPDATE;
822	else if (action == UP_OBJ_FACE)	780	else if (action == UP_OBJ_FACE)
823	/* Nothing to do for that case */ ;	781	/* Nothing to do for that case */ ;
824	else	782	else
825	LOG (llevError, "update_object called with invalid action: %d\n", action);	783	LOG (llevError, "update_object called with invalid action: %d\n", action);
826		784
827	if (update_now)
828	{
829	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
830	update_position (op->map, op->x, op->y);
831	}
832
833	if (op->more != NULL)	785	if (op->more)
834	update_object (op->more, action);	786	update_object (op->more, action);
835	}	787	}
836		788
837	static unordered_vector<object *> mortals;	789	object::vector object::mortals;
838	static std::vector<object *> freed;	790	object::vector object::objects; // not yet used
		791	object *object::first;
839		792
840	void object::free_mortals ()	793	void object::free_mortals ()
841	{	794	{
842	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
843	if ((*i)->refcnt)	796	if ((*i)->refcnt)
844	++i; // further delay freeing	797	++i; // further delay freeing
845	else	798	else
846	{	799	{
847	freed.push_back (*i);//D
848	//delete *i;	800	delete *i;
849	mortals.erase (i);	801	mortals.erase (i);
850	}	802	}
851
852	if (mortals.size())//D
853	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
854	}	803	}
855		804
856	object::object ()	805	object::object ()
857	{	806	{
858	SET_FLAG (this, FLAG_REMOVED);	807	SET_FLAG (this, FLAG_REMOVED);
859		808
860	expmul = 1.0;	809	expmul = 1.0;
861	face = blank_face;	810	face = blank_face;
862	attacked_by_count = -1;
863	}	811	}
864		812
865	object::~object ()	813	object::~object ()
866	{	814	{
867	free_key_values (this);	815	free_key_values (this);
868	}	816	}
869		817
870	void object::link ()	818	void object::link ()
871	{	819	{
872	count = ++ob_count;	820	count = ++ob_count;
		821	uuid = gen_uuid ();
873		822
874	prev = 0;	823	prev = 0;
875	next = objects;	824	next = object::first;
876		825
877	if (objects)	826	if (object::first)
878	objects->prev = this;	827	object::first->prev = this;
879		828
880	objects = this;	829	object::first = this;
881	}	830	}
882		831
883	void object::unlink ()	832	void object::unlink ()
884	{	833	{
885	count = 0;	834	if (this == object::first)
		835	object::first = next;
886		836
887	/* Remove this object from the list of used objects */	837	/* Remove this object from the list of used objects */
888	if (prev)
889	{
890	prev->next = next;	838	if (prev) prev->next = next;
		839	if (next) next->prev = prev;
		840
891	prev = 0;	841	prev = 0;
892	}
893
894	if (next)
895	{
896	next->prev = prev;
897	next = 0;	842	next = 0;
898	}
899
900	if (this == objects)
901	objects = next;
902	}	843	}
903		844
904	object *object::create ()	845	object *object::create ()
905	{	846	{
906	object *
907	op;
908
909	if (freed.empty ())
910	op = new object;	847	object *op = new object;
911	else
912	{
913	// highly annoying, but the only way to get it stable right now
914	op = freed.back ();
915	freed.pop_back ();
916	op->~object ();
917	new ((void *) op) object;
918	}
919
920	op->link ();	848	op->link ();
921	return op;	849	return op;
922	}	850	}
923		851
924	/*	852	/*
…		…
926	* 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
927	* free objects. The IS_FREED() flag is set in the object.	855	* free objects. The IS_FREED() flag is set in the object.
928	* The object must have been removed by remove_ob() first for	856	* The object must have been removed by remove_ob() first for
929	* this function to succeed.	857	* this function to succeed.
930	*	858	*
931	* 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
932	* inventory to the ground.	860	* inventory to the ground.
933	*/	861	*/
934	void object::free (bool free_inventory)	862	void object::destroy (bool destroy_inventory)
935	{	863	{
936	if (QUERY_FLAG (this, FLAG_FREED))	864	if (QUERY_FLAG (this, FLAG_FREED))
937	return;	865	return;
938		866
939	if (!QUERY_FLAG (this, FLAG_REMOVED))
940	remove_ob (this);
941
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
		870	if (!QUERY_FLAG (this, FLAG_REMOVED))
		871	remove ();
		872
945	SET_FLAG (this, FLAG_FREED);	873	SET_FLAG (this, FLAG_FREED);
946		874
947	if (more)	875	if (more)
948	{	876	{
949	more->free (free_inventory);	877	more->destroy (destroy_inventory);
950	more = 0;	878	more = 0;
951	}	879	}
952		880
953	if (inv)	881	if (inv)
954	{	882	{
955	/* Only if the space blocks everything do we not process -	883	/* Only if the space blocks everything do we not process -
956	* if some form of movement is allowed, let objects	884	* if some form of movement is allowed, let objects
957	* drop on that space.	885	* drop on that space.
958	*/	886	*/
959	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)
960	{	888	{
961	object *op = inv;	889	object *op = inv;
962		890
963	while (op)	891	while (op)
964	{	892	{
965	object *tmp = op->below;	893	object *tmp = op->below;
966	op->free (free_inventory);	894	op->destroy (destroy_inventory);
967	op = tmp;	895	op = tmp;
968	}	896	}
969	}	897	}
970	else	898	else
971	{ /* Put objects in inventory onto this space */	899	{ /* Put objects in inventory onto this space */
…		…
973		901
974	while (op)	902	while (op)
975	{	903	{
976	object *tmp = op->below;	904	object *tmp = op->below;
977		905
978	remove_ob (op);	906	op->remove ();
979		907
980	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
981	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
982	free_object (op);	910	op->destroy ();
983	else	911	else
984	{	912	{
985	op->x = x;	913	op->x = x;
986	op->y = y;	914	op->y = y;
987	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 */
…		…
990	op = tmp;	918	op = tmp;
991	}	919	}
992	}	920	}
993	}	921	}
994		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
995	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;
996		950
997	/* Remove object from the active list */	951	/* Remove object from the active list */
998	speed = 0;	952	speed = 0;
999	update_ob_speed (this);	953	update_ob_speed (this);
1000		954
…		…
1005		959
1006	/*	960	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1008	* 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)).
1009	*/	963	*/
1010
1011	void	964	void
1012	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1013	{	966	{
1014	while (op != NULL)	967	while (op != NULL)
1015	{	968	{
1016	if (op->type == CONTAINER)	969	if (op->type == CONTAINER)
1017	{
1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	970	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019	}	971
1020	op->carrying -= weight;	972	op->carrying -= weight;
1021	op = op->env;	973	op = op->env;
1022	}	974	}
1023	}	975	}
1024		976
1025	/* remove_ob(op):	977	/* op->remove ():
1026	* 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
1027	* 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
1028	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1029	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1030	* the previous environment.	982	* the previous environment.
1031	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1032	*/	984	*/
1033
1034	void	985	void
1035	remove_ob (object *op)	986	object::remove ()
1036	{	987	{
		988	object *tmp, *last = 0;
1037	object *	989	object *otmp;
1038	tmp, *
1039	last = NULL;
1040	object *
1041	otmp;
1042		990
1043	tag_t
1044	tag;
1045	int
1046	check_walk_off;	991	int check_walk_off;
1047	mapstruct *
1048	m;
1049		992
1050	sint16
1051	x,
1052	y;
1053
1054	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1055	return;	994	return;
1056		995
1057	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
1058		997
1059	if (op->more != NULL)	998	if (more)
1060	remove_ob (op->more);	999	more->remove ();
1061		1000
1062	/*	1001	/*
1063	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1064	* inventory.	1003	* inventory.
1065	*/	1004	*/
1066	if (op->env != NULL)	1005	if (env)
1067	{	1006	{
1068	if (op->nrof)	1007	if (nrof)
1069	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1070	else	1009	else
1071	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1072		1011
1073	/* 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
1074	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1075	* to save cpu time.	1014	* to save cpu time.
1076	*/	1015	*/
1077	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))
1078	fix_player (otmp);	1017	fix_player (otmp);
1079		1018
1080	if (op->above != NULL)	1019	if (above != NULL)
1081	op->above->below = op->below;	1020	above->below = below;
1082	else	1021	else
1083	op->env->inv = op->below;	1022	env->inv = below;
1084		1023
1085	if (op->below != NULL)	1024	if (below != NULL)
1086	op->below->above = op->above;	1025	below->above = above;
1087		1026
1088	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1089	* 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
1090	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1091	*/	1030	*/
1092	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1093	op->map = op->env->map;	1032	map = env->map;
1094	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1095	op->env = NULL;	1034	env = 0;
1096	}	1035	}
1097	else if (op->map)	1036	else if (map)
1098	{	1037	{
1099	x = op->x;
1100	y = op->y;
1101	m = get_map_from_coord (op->map, &x, &y);
1102
1103	if (!m)
1104	{
1105	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1106	op->map->path, op->x, op->y);
1107	/* in old days, we used to set x and y to 0 and continue.
1108	* it seems if we get into this case, something is probablye
1109	* screwed up and should be fixed.
1110	*/
1111	abort ();
1112	}
1113
1114	if (op->map != m)
1115	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1116	op->map->path, m->path, op->x, op->y, x, y);
1117
1118	/* Re did the following section of code - it looks like it had	1038	/* Re did the following section of code - it looks like it had
1119	* lots of logic for things we no longer care about	1039	* lots of logic for things we no longer care about
1120	*/	1040	*/
1121		1041
1122	/* link the object above us */	1042	/* link the object above us */
1123	if (op->above)	1043	if (above)
1124	op->above->below = op->below;	1044	above->below = below;
1125	else	1045	else
1126	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 */
1127		1047
1128	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1129	if (op->below)	1049	if (below)
1130	op->below->above = op->above;	1050	below->above = above;
1131	else	1051	else
1132	{	1052	{
1133	/* 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
1134	* use translated coordinates in case some oddness with map tiling is	1054	* use translated coordinates in case some oddness with map tiling is
1135	* evident	1055	* evident
1136	*/	1056	*/
1137	if (GET_MAP_OB (m, x, y) != op)	1057	if (GET_MAP_OB (map, x, y) != this)
1138	{	1058	{
1139	dump_object (op);	1059	char *dump = dump_object (this);
1140	LOG (llevError,	1060	LOG (llevError,
1141	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	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);
1142	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1143	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
1144	}	1066	}
1145		1067
1146	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1068	map->at (x, y).bottom = above; /* goes on above it. */
1147	}	1069	}
1148		1070
1149	op->above = 0;	1071	above = 0;
1150	op->below = 0;	1072	below = 0;
1151		1073
1152	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1153	return;	1075	return;
1154		1076
1155	tag = op->count;
1156	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1157		1078
1158	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)
1159	{	1080	{
1160	/* 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
1161	* being removed.	1082	* being removed.
1162	*/	1083	*/
1163		1084
1164	if (tmp->type == PLAYER && tmp != op)	1085	if (tmp->type == PLAYER && tmp != this)
1165	{	1086	{
1166	/* If a container that the player is currently using somehow gets	1087	/* If a container that the player is currently using somehow gets
1167	* removed (most likely destroyed), update the player view	1088	* removed (most likely destroyed), update the player view
1168	* appropriately.	1089	* appropriately.
1169	*/	1090	*/
1170	if (tmp->container == op)	1091	if (tmp->container == this)
1171	{	1092	{
1172	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1173	tmp->container = NULL;	1094	tmp->container = 0;
1174	}	1095	}
1175		1096
1176	tmp->contr->socket.update_look = 1;	1097	tmp->contr->socket->floorbox_update ();
1177	}	1098	}
1178		1099
1179	/* See if player moving off should effect something */	1100	/* See if player moving off should effect something */
1180	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1101	if (check_walk_off
		1102	&& ((move_type & tmp->move_off)
		1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181	{	1104	{
1182	move_apply (tmp, op, NULL);	1105	move_apply (tmp, this, 0);
1183		1106
1184	if (was_destroyed (op, tag))	1107	if (destroyed ())
1185	{
1186	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 ());
1187	}
1188	}	1109	}
1189		1110
1190	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191		1112
1192	if (tmp->above == tmp)	1113	if (tmp->above == tmp)
1193	tmp->above = NULL;	1114	tmp->above = 0;
1194		1115
1195	last = tmp;	1116	last = tmp;
1196	}	1117	}
1197		1118
1198	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1199	if (last == NULL)	1120	if (!last)
1200	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1201	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1202	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1203	* those out anyways, and if there are any flags set right now, they won't
1204	* be correct anyways.
1205	*/
1206	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1207	update_position (op->map, op->x, op->y);
1208	}
1209	else	1122	else
1210	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1211		1124
1212	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1213	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1214	}	1127	}
1215	}	1128	}
1216		1129
1217	/*	1130	/*
1218	* merge_ob(op,top):	1131	* merge_ob(op,top):
…		…
1220	* This function goes through all objects below and including top, and	1133	* This function goes through all objects below and including top, and
1221	* merges op to the first matching object.	1134	* merges op to the first matching object.
1222	* If top is NULL, it is calculated.	1135	* If top is NULL, it is calculated.
1223	* 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
1224	*/	1137	*/
1225
1226	object *	1138	object *
1227	merge_ob (object *op, object *top)	1139	merge_ob (object *op, object *top)
1228	{	1140	{
1229	if (!op->nrof)	1141	if (!op->nrof)
1230	return 0;	1142	return 0;
…		…
1234		1146
1235	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1236	{	1148	{
1237	if (top == op)	1149	if (top == op)
1238	continue;	1150	continue;
1239	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1240	{	1153	{
1241	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1242		1155
1243	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1244	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1245	remove_ob (op);	1158	op->destroy ();
1246	free_object (op);
1247	return top;	1159	return top;
1248	}	1160	}
1249	}	1161	}
1250		1162
1251	return NULL;	1163	return 0;
1252	}	1164	}
1253		1165
1254	/*	1166	/*
1255	* 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
1256	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1257	*/	1169	*/
1258	object *	1170	object *
1259	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)
1260	{	1172	{
1261	object *tmp;	1173	object *tmp;
1262		1174
1263	if (op->head)	1175	if (op->head)
1264	op = op->head;	1176	op = op->head;
…		…
1292	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1293	* just 'op' otherwise	1205	* just 'op' otherwise
1294	*/	1206	*/
1295		1207
1296	object *	1208	object *
1297	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)
1298	{	1210	{
1299	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1300	sint16 x, y;	1212	sint16 x, y;
1301		1213
1302	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1305	return NULL;	1217	return NULL;
1306	}	1218	}
1307		1219
1308	if (m == NULL)	1220	if (m == NULL)
1309	{	1221	{
1310	dump_object (op);	1222	char *dump = dump_object (op);
1311	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);
1312	return op;	1225	return op;
1313	}	1226	}
1314		1227
1315	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1316	{	1229	{
1317	dump_object (op);	1230	char *dump = dump_object (op);
1318	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);
1319	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1320	/* 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
1321	* 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
1322	* improperly inserted.	1235	* improperly inserted.
1323	*/	1236	*/
1324	abort ();	1237	abort ();
1325	#endif	1238	#endif
		1239	free (dump);
1326	return op;	1240	return op;
1327	}	1241	}
1328		1242
1329	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1330	{	1244	{
1331	dump_object (op);	1245	char *dump = dump_object (op);
1332	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);
1333	return op;	1248	return op;
1334	}	1249	}
1335		1250
1336	if (op->more != NULL)	1251	if (op->more != NULL)
1337	{	1252	{
…		…
1375		1290
1376	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1377	*/	1292	*/
1378	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1379	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)
1380	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1381	{	1296	{
1382	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1383	remove_ob (tmp);	1298	tmp->destroy ();
1384	free_object (tmp);
1385	}	1299	}
1386		1300
1387	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 */
1388	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1389		1303
…		…
1402	op->below = originator->below;	1316	op->below = originator->below;
1403		1317
1404	if (op->below)	1318	if (op->below)
1405	op->below->above = op;	1319	op->below->above = op;
1406	else	1320	else
1407	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->ms ().bottom = op;
1408		1322
1409	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1410	originator->below = op;	1324	originator->below = op;
1411	}	1325	}
1412	else	1326	else
…		…
1458	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1459	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1460	* stacking is a bit odd.	1374	* stacking is a bit odd.
1461	*/	1375	*/
1462	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1463	(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))
1464	{	1378	{
1465	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1466	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1467	break;	1381	break;
1468	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1491		1405
1492	if (op->above)	1406	if (op->above)
1493	op->above->below = op;	1407	op->above->below = op;
1494		1408
1495	op->below = NULL;	1409	op->below = NULL;
1496	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->ms ().bottom = op;
1497	}	1411	}
1498	else	1412	else
1499	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1500	op->above = top->above;	1414	op->above = top->above;
1501		1415
…		…
1505	op->below = top;	1419	op->below = top;
1506	top->above = op;	1420	top->above = op;
1507	}	1421	}
1508		1422
1509	if (op->above == NULL)	1423	if (op->above == NULL)
1510	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->ms ().top = op;
1511	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1512		1426
1513	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1514	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1515		1429
1516	/* 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
1517	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1518	*/	1432	*/
1519	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1520	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 ())
1521	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1522	tmp->contr->socket.update_look = 1;
1523		1436
1524	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1525	* 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
1526	* 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
1527	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1535		1448
1536	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1537	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1538		1451
1539	/* 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,
1540	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1541	*	1454	*
1542	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1543	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1544	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1545	* update_object().	1458	* update_object().
…		…
1561		1474
1562	return op;	1475	return op;
1563	}	1476	}
1564		1477
1565	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1566	* 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.
1567	* 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.
1568	*/	1481	*/
1569	void	1482	void
1570	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1571	{	1484	{
1572	object *	1485	object *tmp, *tmp1;
1573	tmp;
1574	object *
1575	tmp1;
1576		1486
1577	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1578		1488
1579	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)
1580	{
1581	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1582	{	1491	tmp->destroy ();
1583	remove_ob (tmp);
1584	free_object (tmp);
1585	}
1586	}
1587		1492
1588	tmp1 = arch_to_object (find_archetype (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1589		1494
1590	tmp1->x = op->x;	1495	tmp1->x = op->x;
1591	tmp1->y = op->y;	1496	tmp1->y = op->y;
1592	insert_ob_in_map (tmp1, op->map, op, 0);	1497	insert_ob_in_map (tmp1, op->map, op, 0);
1593	}	1498	}
…		…
1601	*/	1506	*/
1602		1507
1603	object *	1508	object *
1604	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1605	{	1510	{
1606	object *	1511	object *newob;
1607	newob;
1608	int
1609	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1610		1513
1611	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1612	{	1515	{
1613	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);
1614	return NULL;	1517	return NULL;
1615	}	1518	}
1616		1519
1617	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
1618		1521
1619	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1620	{	1523	orig_ob->destroy (1);
1621	if (!is_removed)
1622	remove_ob (orig_ob);
1623	free_object2 (orig_ob, 1);
1624	}
1625	else if (!is_removed)	1524	else if (!is_removed)
1626	{	1525	{
1627	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1628	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1629	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)
…		…
1659	if (i > op->nrof)	1558	if (i > op->nrof)
1660	i = op->nrof;	1559	i = op->nrof;
1661		1560
1662	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1663	op->nrof -= i;	1562	op->nrof -= i;
1664	else if (op->env != NULL)	1563	else if (op->env)
1665	{	1564	{
1666	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1667	* therein?	1566	* therein?
1668	*/	1567	*/
1669	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1670	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1671	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1672	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1673	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1674	* and then searching the map for a player.	1573	* and then searching the map for a player.
1675	*/	1574	*/
1676	if (!tmp)	1575	if (!tmp)
1677	{	1576	{
1678	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1679	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1680	break;	1581	break;
1681	if (pl)	1582	}
1682	tmp = pl->ob;
1683	else
1684	tmp = NULL;
1685	}	1583	}
1686		1584
1687	if (i < op->nrof)	1585	if (i < op->nrof)
1688	{	1586	{
1689	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1690	op->nrof -= i;	1588	op->nrof -= i;
1691	if (tmp)	1589	if (tmp)
1692	{
1693	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1694	}
1695	}	1591	}
1696	else	1592	else
1697	{	1593	{
1698	remove_ob (op);	1594	op->remove ();
1699	op->nrof = 0;	1595	op->nrof = 0;
1700	if (tmp)	1596	if (tmp)
1701	{
1702	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1703	}
1704	}	1598	}
1705	}	1599	}
1706	else	1600	else
1707	{	1601	{
1708	object *above = op->above;	1602	object *above = op->above;
1709		1603
1710	if (i < op->nrof)	1604	if (i < op->nrof)
1711	op->nrof -= i;	1605	op->nrof -= i;
1712	else	1606	else
1713	{	1607	{
1714	remove_ob (op);	1608	op->remove ();
1715	op->nrof = 0;	1609	op->nrof = 0;
1716	}	1610	}
1717		1611
1718	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1719	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1720	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1721	{	1615	{
1722	if (op->nrof)	1616	if (op->nrof)
1723	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1724	else	1618	else
…		…
1728		1622
1729	if (op->nrof)	1623	if (op->nrof)
1730	return op;	1624	return op;
1731	else	1625	else
1732	{	1626	{
1733	free_object (op);	1627	op->destroy ();
1734	return NULL;	1628	return 0;
1735	}	1629	}
1736	}	1630	}
1737		1631
1738	/*	1632	/*
1739	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1751	op->carrying += weight;	1645	op->carrying += weight;
1752	op = op->env;	1646	op = op->env;
1753	}	1647	}
1754	}	1648	}
1755		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
1756	/*	1670	/*
1757	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1758	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1759	* inside the object environment.	1673	* inside the object environment.
1760	*	1674	*
1761	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1762	* the inventory at the last position or next to other objects of the same
1763	* type.
1764	* Frank: Now sorted by type, archetype and magic!
1765	*
1766	* The function returns now pointer to inserted item, and return value can	1675	* The function returns now pointer to inserted item, and return value can
1767	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1768	*/	1677	*/
1769		1678
1770	object *	1679	object *
1771	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1772	{	1681	{
1773	object *	1682	object *tmp, *otmp;
1774	tmp, *
1775	otmp;
1776		1683
1777	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1778	{	1685	op->remove ();
1779	dump_object (op);
1780	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1781	return op;
1782	}
1783
1784	if (where == NULL)
1785	{
1786	dump_object (op);
1787	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1788	return op;
1789	}
1790
1791	if (where->head)
1792	{
1793	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1794	where = where->head;
1795	}
1796		1686
1797	if (op->more)	1687	if (op->more)
1798	{	1688	{
1799	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);
1800	return op;	1690	return op;
…		…
1802		1692
1803	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1804	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1805	if (op->nrof)	1695	if (op->nrof)
1806	{	1696	{
1807	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1808	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1809	{	1699	{
1810	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1811	(client needs the original object) */	1701	(client needs the original object) */
1812	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1813	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1814	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1815	*/	1705	*/
1816	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1817	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1818	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1819	op = tmp;	1709	op = tmp;
1820	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1821	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1822	break;	1712	break;
1823	}	1713	}
1824		1714
1825	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1826	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1827	* (if it was possible to merge). calling remove_ob will subtract	1717	* (if it was possible to merge). calling remove_ob will subtract
1828	* the weight, so we need to add it in again, since we actually do	1718	* the weight, so we need to add it in again, since we actually do
1829	* the linking below	1719	* the linking below
1830	*/	1720	*/
1831	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1832	}	1722	}
1833	else	1723	else
1834	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1835		1725
1836	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1837	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1838	{
1839	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1840	fix_player (otmp);	1729	fix_player (otmp);
1841	}
1842		1730
1843	op->map = NULL;	1731	op->map = 0;
1844	op->env = where;	1732	op->env = this;
1845	op->above = NULL;	1733	op->above = 0;
1846	op->below = NULL;	1734	op->below = 0;
1847	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1848		1736
1849	/* 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 */
1850	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1851	{	1739	{
1852	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1853	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);
1854	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1855	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1856	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1857	}	1745	}
1858		1746
1859	/* 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.
1860	* It sure simplifies this function...	1748	* It sure simplifies this function...
1861	*/	1749	*/
1862	if (where->inv == NULL)	1750	if (!inv)
1863	where->inv = op;	1751	inv = op;
1864	else	1752	else
1865	{	1753	{
1866	op->below = where->inv;	1754	op->below = inv;
1867	op->below->above = op;	1755	op->below->above = op;
1868	where->inv = op;	1756	inv = op;
1869	}	1757	}
		1758
1870	return op;	1759	return op;
1871	}	1760	}
1872		1761
1873	/*	1762	/*
1874	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1892	*/	1781	*/
1893		1782
1894	int	1783	int
1895	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
1896	{	1785	{
1897	object *	1786	object *tmp;
1898	tmp;	1787	maptile *m = op->map;
1899	tag_t
1900	tag;
1901	mapstruct *
1902	m = op->map;
1903	int
1904	x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
1905		1789
1906	MoveType	1790	MoveType move_on, move_slow, move_block;
1907	move_on,
1908	move_slow,
1909	move_block;
1910		1791
1911	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912	return 0;	1793	return 0;
1913
1914	tag = op->count;
1915		1794
1916	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);
1917	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);
1918	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);
1919		1798
…		…
1980	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1859	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1981	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1860	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982	{	1861	{
1983	move_apply (tmp, op, originator);	1862	move_apply (tmp, op, originator);
1984		1863
1985	if (was_destroyed (op, tag))	1864	if (op->destroyed ())
1986	return 1;	1865	return 1;
1987		1866
1988	/* what the person/creature stepped onto has moved the object	1867	/* what the person/creature stepped onto has moved the object
1989	* someplace new. Don't process any further - if we did,	1868	* someplace new. Don't process any further - if we did,
1990	* have a feeling strange problems would result.	1869	* have a feeling strange problems would result.
…		…
2002	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2003	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2004	*/	1883	*/
2005		1884
2006	object *	1885	object *
2007	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2008	{	1887	{
2009	object *	1888	object *
2010	tmp;	1889	tmp;
2011		1890
2012	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2025	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2026	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2027	*/	1906	*/
2028		1907
2029	object *	1908	object *
2030	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2031	{	1910	{
2032	object *	1911	object *
2033	tmp;	1912	tmp;
2034		1913
2035	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2175	* 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
2176	* customized, changed states, etc.	2055	* customized, changed states, etc.
2177	*/	2056	*/
2178		2057
2179	int	2058	int
2180	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)
2181	{	2060	{
2182	int	2061	int
2183	i,	2062	i,
2184	index = 0, flag;	2063	index = 0, flag;
2185	static int	2064	static int
…		…
2197	* 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
2198	* 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
2199	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2200	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2201	*/	2080	*/
2202	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2203	stop = maxfree[i];	2082	stop = maxfree[i];
2204	}	2083	}
		2084
2205	if (!index)	2085	if (!index)
2206	return -1;	2086	return -1;
		2087
2207	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2208	}	2089	}
2209		2090
2210	/*	2091	/*
2211	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2212	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2213	* 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.
2214	* 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.
2215	*/	2096	*/
2216		2097
2217	int	2098	int
2218	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)
2219	{	2100	{
2220	int	2101	int
2221	i;	2102	i;
2222		2103
2223	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2287	* 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
2288	* there is capable of.	2169	* there is capable of.
2289	*/	2170	*/
2290		2171
2291	int	2172	int
2292	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2293	{	2174	{
2294	int	2175	int
2295	i,	2176	i,
2296	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2297		2178
2298	sint16 nx, ny;	2179	sint16 nx, ny;
2299	object *	2180	object *
2300	tmp;	2181	tmp;
2301	mapstruct *	2182	maptile *
2302	mp;	2183	mp;
2303		2184
2304	MoveType blocked, move_type;	2185	MoveType blocked, move_type;
2305		2186
2306	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
…		…
2319	mp = m;	2200	mp = m;
2320	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2321	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2322		2203
2323	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2324	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2325	{
2326	max = maxfree[i];	2207	max = maxfree[i];
2327	}
2328	else	2208	else
2329	{	2209	{
2330	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2331		2211
2332	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2333	{
2334	max = maxfree[i];	2213	max = maxfree[i];
2335	}
2336	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2337	{	2215	{
2338	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)
2339	{
2340	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)))
2341	{
2342	break;	2218	break;
2343	}	2219
2344	}
2345	if (tmp)	2220	if (tmp)
2346	{
2347	return freedir[i];	2221	return freedir[i];
2348	}
2349	}	2222	}
2350	}	2223	}
2351	}	2224	}
		2225
2352	return 0;	2226	return 0;
2353	}	2227	}
2354		2228
2355	/*	2229	/*
2356	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2358	*/	2232	*/
2359		2233
2360	int	2234	int
2361	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2362	{	2236	{
2363	int	2237	int i;
2364	i;
2365		2238
2366	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);
2367	return i;	2240	return i;
2368	}	2241	}
2369		2242
…		…
2374	*/	2247	*/
2375		2248
2376	int	2249	int
2377	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2378	{	2251	{
2379	int	2252	int q;
2380	q;
2381		2253
2382	if (y)	2254	if (y)
2383	q = x * 100 / y;	2255	q = x * 100 / y;
2384	else if (x)	2256	else if (x)
2385	q = -300 * x;	2257	q = -300 * x;
…		…
2511	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2512	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2513	* can see a direct way to get it	2385	* can see a direct way to get it
2514	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2515	*/	2387	*/
2516
2517
2518	int	2388	int
2519	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2520	{	2390	{
2521	sint16 dx, dy;	2391	sint16 dx, dy;
2522	int
2523	mflags;	2392	int mflags;
2524		2393
2525	if (dir < 0)	2394	if (dir < 0)
2526	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2527		2396
2528	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2541	return 0;	2410	return 0;
2542		2411
2543	/* yes, can see. */	2412	/* yes, can see. */
2544	if (dir < 9)	2413	if (dir < 9)
2545	return 1;	2414	return 1;
		2415
2546	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2547	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]);
2548	}	2419	}
2549
2550
2551		2420
2552	/*	2421	/*
2553	* 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
2554	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2555	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2566	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2567	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2568	!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));
2569	}	2438	}
2570		2439
2571
2572	/*	2440	/*
2573	* create clone from object to another	2441	* create clone from object to another
2574	*/	2442	*/
2575	object *	2443	object *
2576	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2577	{	2445	{
2578	object *
2579	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2580		2447
2581	if (!asrc)	2448	if (!asrc)
2582	return NULL;	2449	return 0;
		2450
2583	src = asrc;	2451	src = asrc;
2584	if (src->head)	2452	if (src->head)
2585	src = src->head;	2453	src = src->head;
2586		2454
2587	prev = NULL;	2455	prev = 0;
2588	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2589	{	2457	{
2590	tmp = get_object ();	2458	tmp = part->clone ();
2591	copy_object (part, tmp);
2592	tmp->x -= src->x;	2459	tmp->x -= src->x;
2593	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2594	if (!part->head)	2462	if (!part->head)
2595	{	2463	{
2596	dst = tmp;	2464	dst = tmp;
2597	tmp->head = NULL;	2465	tmp->head = 0;
2598	}	2466	}
2599	else	2467	else
2600	{
2601	tmp->head = dst;	2468	tmp->head = dst;
2602	}	2469
2603	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2604	if (prev)	2472	if (prev)
2605	prev->more = tmp;	2473	prev->more = tmp;
		2474
2606	prev = tmp;	2475	prev = tmp;
2607	}	2476	}
2608		2477
2609	/*** copy inventory ***/
2610	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2611	{
2612	(void) insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
2613	}
2614		2480
2615	return dst;	2481	return dst;
2616	}	2482	}
2617		2483
2618	/* return true if the object was destroyed, 0 otherwise */
2619	int
2620	was_destroyed (const object *op, tag_t old_tag)
2621	{
2622	/* checking for FLAG_FREED isn't necessary, but makes this function more
2623	* robust */
2624	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2625	}
2626
2627	/* GROS - Creates an object using a string representing its content. */	2484	/* GROS - Creates an object using a string representing its content. */
2628
2629	/* Basically, we save the content of the string to a temp file, then call */	2485	/* Basically, we save the content of the string to a temp file, then call */
2630
2631	/* load_object on it. I admit it is a highly inefficient way to make things, */	2486	/* load_object on it. I admit it is a highly inefficient way to make things, */
2632
2633	/* but it was simple to make and allows reusing the load_object function. */	2487	/* but it was simple to make and allows reusing the load_object function. */
2634
2635	/* Remember not to use load_object_str in a time-critical situation. */	2488	/* Remember not to use load_object_str in a time-critical situation. */
2636
2637	/* Also remember that multiparts objects are not supported for now. */	2489	/* Also remember that multiparts objects are not supported for now. */
2638		2490
2639	object *	2491	object *
2640	load_object_str (const char *obstr)	2492	load_object_str (const char *obstr)
2641	{	2493	{
2642	object *	2494	object *op;
2643	op;
2644	char
2645	filename[MAX_BUF];	2495	char filename[MAX_BUF];
2646		2496
2647	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648		2498
2649	FILE *
2650	tempfile = fopen (filename, "w");	2499	FILE *tempfile = fopen (filename, "w");
2651		2500
2652	if (tempfile == NULL)	2501	if (tempfile == NULL)
2653	{	2502	{
2654	LOG (llevError, "Error - Unable to access load object temp file\n");	2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2655	return NULL;	2504	return NULL;
2656	};	2505	}
		2506
2657	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2658	fclose (tempfile);	2508	fclose (tempfile);
2659		2509
2660	op = get_object ();	2510	op = object::create ();
2661		2511
2662	object_thawer thawer (filename);	2512	object_thawer thawer (filename);
2663		2513
2664	if (thawer)	2514	if (thawer)
2665	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);
…		…
2675	* returns NULL if no match.	2525	* returns NULL if no match.
2676	*/	2526	*/
2677	object *	2527	object *
2678	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)
2679	{	2529	{
2680	object *	2530	object *tmp;
2681	tmp;
2682		2531
2683	for (tmp = who->inv; tmp; tmp = tmp->below)	2532	for (tmp = who->inv; tmp; tmp = tmp->below)
2684	if (tmp->type == type && tmp->subtype == subtype)	2533	if (tmp->type == type && tmp->subtype == subtype)
2685	return tmp;	2534	return tmp;
2686		2535
…		…
2694	* do the desired thing.	2543	* do the desired thing.
2695	*/	2544	*/
2696	key_value *	2545	key_value *
2697	get_ob_key_link (const object *ob, const char *key)	2546	get_ob_key_link (const object *ob, const char *key)
2698	{	2547	{
2699	key_value *	2548	key_value *link;
2700	link;
2701		2549
2702	for (link = ob->key_values; link != NULL; link = link->next)	2550	for (link = ob->key_values; link != NULL; link = link->next)
2703	{
2704	if (link->key == key)	2551	if (link->key == key)
2705	{
2706	return link;	2552	return link;
2707	}
2708	}
2709		2553
2710	return NULL;	2554	return NULL;
2711	}	2555	}
2712		2556
2713	/*	2557	/*
…		…
2718	* The returned string is shared.	2562	* The returned string is shared.
2719	*/	2563	*/
2720	const char *	2564	const char *
2721	get_ob_key_value (const object *op, const char *const key)	2565	get_ob_key_value (const object *op, const char *const key)
2722	{	2566	{
2723	key_value *	2567	key_value *link;
2724	link;	2568	shstr_cmp canonical_key (key);
2725	const char *
2726	canonical_key;
2727		2569
2728	canonical_key = shstr::find (key);
2729
2730	if (canonical_key == NULL)	2570	if (!canonical_key)
2731	{	2571	{
2732	/* 1. There being a field named key on any object	2572	/* 1. There being a field named key on any object
2733	* implies there'd be a shared string to find.	2573	* implies there'd be a shared string to find.
2734	* 2. Since there isn't, no object has this field.	2574	* 2. Since there isn't, no object has this field.
2735	* 3. Therefore, *this* object doesn't have this field.	2575	* 3. Therefore, *this* object doesn't have this field.
2736	*/	2576	*/
2737	return NULL;	2577	return 0;
2738	}	2578	}
2739		2579
2740	/* This is copied from get_ob_key_link() above -	2580	/* This is copied from get_ob_key_link() above -
2741	* only 4 lines, and saves the function call overhead.	2581	* only 4 lines, and saves the function call overhead.
2742	*/	2582	*/
2743	for (link = op->key_values; link != NULL; link = link->next)	2583	for (link = op->key_values; link; link = link->next)
2744	{
2745	if (link->key == canonical_key)	2584	if (link->key == canonical_key)
2746	{
2747	return link->value;	2585	return link->value;
2748	}	2586
2749	}
2750	return NULL;	2587	return 0;
2751	}	2588	}
2752		2589
2753		2590
2754	/*	2591	/*
2755	* Updates the canonical_key in op to value.	2592	* Updates the canonical_key in op to value.
…		…
2840	{	2677	{
2841	shstr key_ (key);	2678	shstr key_ (key);
2842		2679
2843	return set_ob_key_value_s (op, key_, value, add_key);	2680	return set_ob_key_value_s (op, key_, value, add_key);
2844	}	2681	}
		2682
		2683	object::depth_iterator::depth_iterator (object *container)
		2684	: iterator_base (container)
		2685	{
		2686	while (item->inv)
		2687	item = item->inv;
		2688	}
		2689
		2690	void
		2691	object::depth_iterator::next ()
		2692	{
		2693	if (item->below)
		2694	{
		2695	item = item->below;
		2696
		2697	while (item->inv)
		2698	item = item->inv;
		2699	}
		2700	else
		2701	item = item->env;
		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