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.87 by root, Tue Dec 26 08:54:59 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;
…		…
63	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
64	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
65	*/	143	*/
66		144
67	/* For each field in wants, */	145	/* For each field in wants, */
68	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
69	{	147	{
70	key_value *has_field;	148	key_value *has_field;
71		149
72	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
73	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
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->flag ^ ob2->flag).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, 1);
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.
…		…
494	}	467	}
495		468
496	op->key_values = 0;	469	op->key_values = 0;
497	}	470	}
498		471
499	void object::clear ()
500	{
501	attachable_base::clear ();
502
503	free_key_values (this);
504
505	owner = 0;
506	name = 0;
507	name_pl = 0;
508	title = 0;
509	race = 0;
510	slaying = 0;
511	skill = 0;
512	msg = 0;
513	lore = 0;
514	custom_name = 0;
515	materialname = 0;
516	contr = 0;
517	below = 0;
518	above = 0;
519	inv = 0;
520	container = 0;
521	env = 0;
522	more = 0;
523	head = 0;
524	map = 0;
525	active_next = 0;
526	active_prev = 0;
527
528	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
529
530	SET_FLAG (this, FLAG_REMOVED);
531
532	/* What is not cleared is next, prev, and count */
533
534	expmul = 1.0;
535	face = blank_face;
536	attacked_by_count = -1;
537
538	if (settings.casting_time)
539	casting_time = -1;
540	}
541
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	/*	472	/*
552	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
553	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
554	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
555	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* 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	477	* if the first object is freed, the pointers in the new object
557	* will point at garbage.	478	* will point at garbage.
558	*/	479	*/
559	void	480	void
560	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
561	{	482	{
562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
564		485
565	op2->clone (op);	486	*(object_copy *)dst = *this;
566		487
567	if (is_freed)	488	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
569	if (is_removed)	491	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
571		493
572	if (op2->speed < 0)	494	if (speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
574		496
575	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
576	if (op2->key_values)	498	if (key_values)
577	{	499	{
578	key_value *tail = 0;	500	key_value *tail = 0;
579	key_value *i;	501	key_value *i;
580		502
581	op->key_values = 0;	503	dst->key_values = 0;
582		504
583	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
584	{	506	{
585	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
586		508
587	new_link->next = 0;	509	new_link->next = 0;
588	new_link->key = i->key;	510	new_link->key = i->key;
589	new_link->value = i->value;	511	new_link->value = i->value;
590		512
591	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
592	if (!op->key_values)	514	if (!dst->key_values)
593	{	515	{
594	op->key_values = new_link;	516	dst->key_values = new_link;
595	tail = new_link;	517	tail = new_link;
596	}	518	}
597	else	519	else
598	{	520	{
599	tail->next = new_link;	521	tail->next = new_link;
600	tail = new_link;	522	tail = new_link;
601	}	523	}
602	}	524	}
603	}	525	}
604		526
605	update_ob_speed (op);	527	dst->set_speed (dst->speed);
		528	}
		529
		530	object *
		531	object::clone ()
		532	{
		533	object *neu = create ();
		534	copy_to (neu);
		535	return neu;
606	}	536	}
607		537
608	/*	538	/*
609	* If an object with the IS_TURNABLE() flag needs to be turned due	539	* 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	540	* to the closest player being on the other side, this function can
…		…
623	/*	553	/*
624	* Updates the speed of an object. If the speed changes from 0 to another	554	* 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.	555	* 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.	556	* This function needs to be called whenever the speed of an object changes.
627	*/	557	*/
628
629	void	558	void
630	update_ob_speed (object *op)	559	object::set_speed (float speed)
631	{	560	{
632	extern int arch_init;	561	extern int arch_init;
633		562
634	/* No reason putting the archetypes objects on the speed list,	563	/* No reason putting the archetypes objects on the speed list,
635	* since they never really need to be updated.	564	* since they never really need to be updated.
636	*/	565	*/
637		566	if (flag [FLAG_FREED] && speed)
638	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
639	{	567	{
640	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	568	LOG (llevError, "Object %s is freed but has speed.\n", &name);
641	#ifdef MANY_CORES
642	abort ();
643	#else
644	op->speed = 0;	569	speed = 0;
645	#endif
646	}	570	}
		571
		572	this->speed = speed;
		573
647	if (arch_init)	574	if (arch_init)
648	{
649	return;	575	return;
650	}	576
651	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	577	if (FABS (speed) > MIN_ACTIVE_SPEED)
652	{	578	{
653	/* If already on active list, don't do anything */	579	/* If already on active list, don't do anything */
654	if (op->active_next || op->active_prev || op == active_objects)	580	if (active_next || active_prev || this == active_objects)
655	return;	581	return;
656		582
657	/* process_events() expects us to insert the object at the beginning	583	/* process_events() expects us to insert the object at the beginning
658	* of the list. */	584	* of the list. */
659	op->active_next = active_objects;	585	active_next = active_objects;
		586
660	if (op->active_next != NULL)	587	if (active_next)
661	op->active_next->active_prev = op;	588	active_next->active_prev = this;
		589
662	active_objects = op;	590	active_objects = this;
663	}	591	}
664	else	592	else
665	{	593	{
666	/* If not on the active list, nothing needs to be done */	594	/* If not on the active list, nothing needs to be done */
667	if (!op->active_next && !op->active_prev && op != active_objects)	595	if (!active_next && !active_prev && this != active_objects)
668	return;	596	return;
669		597
670	if (op->active_prev == NULL)	598	if (!active_prev)
671	{	599	{
672	active_objects = op->active_next;	600	active_objects = active_next;
		601
673	if (op->active_next != NULL)	602	if (active_next)
674	op->active_next->active_prev = NULL;	603	active_next->active_prev = 0;
675	}	604	}
676	else	605	else
677	{	606	{
678	op->active_prev->active_next = op->active_next;	607	active_prev->active_next = active_next;
		608
679	if (op->active_next)	609	if (active_next)
680	op->active_next->active_prev = op->active_prev;	610	active_next->active_prev = active_prev;
681	}	611	}
		612
682	op->active_next = NULL;	613	active_next = 0;
683	op->active_prev = NULL;	614	active_prev = 0;
684	}	615	}
685	}	616	}
686		617
687	/* This function removes object 'op' from the list of active	618	/* This function removes object 'op' from the list of active
688	* objects.	619	* objects.
…		…
714	op->active_next = NULL;	645	op->active_next = NULL;
715	op->active_prev = NULL;	646	op->active_prev = NULL;
716	}	647	}
717		648
718	/*	649	/*
719	* update_object() updates the array which represents the map.	650	* update_object() updates the the map.
720	* It takes into account invisible objects (and represent squares covered	651	* It takes into account invisible objects (and represent squares covered
721	* by invisible objects by whatever is below them (unless it's another	652	* by invisible objects by whatever is below them (unless it's another
722	* invisible object, etc...)	653	* invisible object, etc...)
723	* If the object being updated is beneath a player, the look-window	654	* 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	655	* of that player is updated (this might be a suboptimal way of
725	* updating that window, though, since update_object() is called _often_)	656	* updating that window, though, since update_object() is called _often_)
726	*	657	*
727	* action is a hint of what the caller believes need to be done.	658	* 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:	659	* current action are:
733	* UP_OBJ_INSERT: op was inserted	660	* UP_OBJ_INSERT: op was inserted
734	* UP_OBJ_REMOVE: op was removed	661	* UP_OBJ_REMOVE: op was removed
735	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	662	* 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.	663	* as that is easier than trying to look at what may have changed.
737	* UP_OBJ_FACE: only the objects face has changed.	664	* UP_OBJ_FACE: only the objects face has changed.
738	*/	665	*/
739
740	void	666	void
741	update_object (object *op, int action)	667	update_object (object *op, int action)
742	{	668	{
743	int update_now = 0, flags;
744	MoveType move_on, move_off, move_block, move_slow;	669	MoveType move_on, move_off, move_block, move_slow;
745		670
746	if (op == NULL)	671	if (op == NULL)
747	{	672	{
748	/* this should never happen */	673	/* this should never happen */
749	LOG (llevDebug, "update_object() called for NULL object.\n");	674	LOG (llevDebug, "update_object() called for NULL object.\n");
750	return;	675	return;
751	}	676	}
752		677
753	if (op->env != NULL)	678	if (op->env)
754	{	679	{
755	/* Animation is currently handled by client, so nothing	680	/* Animation is currently handled by client, so nothing
756	* to do in this case.	681	* to do in this case.
757	*/	682	*/
758	return;	683	return;
…		…
763	*/	688	*/
764	if (!op->map || op->map->in_memory == MAP_SAVING)	689	if (!op->map || op->map->in_memory == MAP_SAVING)
765	return;	690	return;
766		691
767	/* make sure the object is within map boundaries */	692	/* make sure the object is within map boundaries */
768	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	693	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
769	{	694	{
770	LOG (llevError, "update_object() called for object out of map!\n");	695	LOG (llevError, "update_object() called for object out of map!\n");
771	#ifdef MANY_CORES	696	#ifdef MANY_CORES
772	abort ();	697	abort ();
773	#endif	698	#endif
774	return;	699	return;
775	}	700	}
776		701
777	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	702	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		703
		704	if (m.flags_ & P_NEED_UPDATE)
		705	/* nop */;
784	if (action == UP_OBJ_INSERT)	706	else if (action == UP_OBJ_INSERT)
785	{	707	{
		708	// this is likely overkill, TODO: revisit (schmorp)
786	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	709	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))	710	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
790	update_now = 1;	711	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
791		712	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		713	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
792	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	714	|| (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)	715	|| (m.move_on | op->move_on ) != m.move_on
802	update_now = 1;
803
804	if ((move_off | op->move_off) != move_off)	716	|| (m.move_off | op->move_off ) != m.move_off
805	update_now = 1;	717	|| (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	718	/* This isn't perfect, but I don't expect a lot of objects to
808	* to have move_allow right now.	719	* to have move_allow right now.
809	*/	720	*/
810	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
811	update_now = 1;	722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
812		723	m.flags_ = P_NEED_UPDATE;
813	if ((move_slow | op->move_slow) != move_slow)
814	update_now = 1;
815	}	724	}
816	/* if the object is being removed, we can't make intelligent	725	/* if the object is being removed, we can't make intelligent
817	* decisions, because remove_ob can't really pass the object	726	* decisions, because remove_ob can't really pass the object
818	* that is being removed.	727	* that is being removed.
819	*/	728	*/
820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
821	update_now = 1;	730	m.flags_ = P_NEED_UPDATE;
822	else if (action == UP_OBJ_FACE)	731	else if (action == UP_OBJ_FACE)
823	/* Nothing to do for that case */ ;	732	/* Nothing to do for that case */ ;
824	else	733	else
825	LOG (llevError, "update_object called with invalid action: %d\n", action);	734	LOG (llevError, "update_object called with invalid action: %d\n", action);
826		735
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)	736	if (op->more)
834	update_object (op->more, action);	737	update_object (op->more, action);
835	}	738	}
836		739
837	static unordered_vector<object *> mortals;	740	object::vector object::objects; // not yet used
838	static std::vector<object *> freed;	741	object *object::first;
839
840	void object::free_mortals ()
841	{
842	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
843	if ((*i)->refcnt)
844	++i; // further delay freeing
845	else
846	{
847	freed.push_back (*i);//D
848	//delete *i;
849	mortals.erase (i);
850	}
851
852	if (mortals.size())//D
853	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
854	}
855		742
856	object::object ()	743	object::object ()
857	{	744	{
858	SET_FLAG (this, FLAG_REMOVED);	745	SET_FLAG (this, FLAG_REMOVED);
859		746
860	expmul = 1.0;	747	expmul = 1.0;
861	face = blank_face;	748	face = blank_face;
862	attacked_by_count = -1;
863	}	749	}
864		750
865	object::~object ()	751	object::~object ()
866	{	752	{
867	free_key_values (this);	753	free_key_values (this);
868	}	754	}
869		755
870	void object::link ()	756	void object::link ()
871	{	757	{
872	count = ++ob_count;	758	count = ++ob_count;
		759	uuid = gen_uuid ();
873		760
874	prev = 0;	761	prev = 0;
875	next = objects;	762	next = object::first;
876		763
877	if (objects)	764	if (object::first)
878	objects->prev = this;	765	object::first->prev = this;
879		766
880	objects = this;	767	object::first = this;
881	}	768	}
882		769
883	void object::unlink ()	770	void object::unlink ()
884	{	771	{
885	count = 0;	772	if (this == object::first)
		773	object::first = next;
886		774
887	/* Remove this object from the list of used objects */	775	/* Remove this object from the list of used objects */
888	if (prev)
889	{
890	prev->next = next;	776	if (prev) prev->next = next;
		777	if (next) next->prev = prev;
		778
891	prev = 0;	779	prev = 0;
892	}
893
894	if (next)
895	{
896	next->prev = prev;
897	next = 0;	780	next = 0;
898	}
899
900	if (this == objects)
901	objects = next;
902	}	781	}
903		782
904	object *object::create ()	783	object *object::create ()
905	{	784	{
906	object *
907	op;
908
909	if (freed.empty ())
910	op = new object;	785	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 ();	786	op->link ();
921	return op;	787	return op;
922	}	788	}
923		789
924	/*	790	void
925	* free_object() frees everything allocated by an object, removes	791	object::do_destroy ()
926	* 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.
928	* The object must have been removed by remove_ob() first for
929	* this function to succeed.
930	*
931	* If free_inventory is set, free inventory as well. Else drop items in
932	* inventory to the ground.
933	*/
934	void object::free (bool free_inventory)
935	{	792	{
936	if (QUERY_FLAG (this, FLAG_FREED))	793	attachable::do_destroy ();
		794
		795	if (flag [FLAG_IS_LINKED])
		796	remove_button_link (this);
		797
		798	if (flag [FLAG_FRIENDLY])
		799	remove_friendly_object (this);
		800
		801	if (!flag [FLAG_REMOVED])
		802	remove ();
		803
		804	if (flag [FLAG_FREED])
937	return;	805	return;
938		806
939	if (!QUERY_FLAG (this, FLAG_REMOVED))	807	flag [FLAG_FREED] = 1;
940	remove_ob (this);
941		808
942	if (QUERY_FLAG (this, FLAG_FRIENDLY))	809	// hack to ensure that freed objects still have a valid map
943	remove_friendly_object (this);	810	{
		811	static maptile *freed_map; // freed objects are moved here to avoid crashes
944		812
945	SET_FLAG (this, FLAG_FREED);	813	if (!freed_map)
946
947	if (more)
948	{	814	{
949	more->free (free_inventory);	815	freed_map = new maptile;
		816
		817	freed_map->name = "/internal/freed_objects_map";
		818	freed_map->width = 3;
		819	freed_map->height = 3;
		820
		821	freed_map->allocate ();
		822	}
		823
		824	map = freed_map;
		825	x = 1;
		826	y = 1;
		827	}
		828
950	more = 0;	829	more = 0;
951	}	830	head = 0;
		831	inv = 0;
952		832
		833	// clear those pointers that likely might have circular references to us
		834	owner = 0;
		835	enemy = 0;
		836	attacked_by = 0;
		837
		838	// only relevant for players(?), but make sure of it anyways
		839	contr = 0;
		840
		841	/* Remove object from the active list */
		842	set_speed (0);
		843
		844	unlink ();
		845	}
		846
		847	/*
		848	* Remove and free all objects in the inventory of the given object.
		849	* object.c ?
		850	*/
		851	void
		852	object::destroy_inv (bool drop_to_ground)
		853	{
953	if (inv)	854	if (!inv)
954	{	855	return;
		856
955	/* Only if the space blocks everything do we not process -	857	/* Only if the space blocks everything do we not process -
956	* if some form of movement is allowed, let objects	858	* if some form of movement is allowed, let objects
957	* drop on that space.	859	* drop on that space.
958	*/	860	*/
959	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	861	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
		862	{
		863	while (inv)
		864	{
		865	inv->destroy_inv (drop_to_ground);
		866	inv->destroy ();
		867	}
		868	}
		869	else
		870	{ /* Put objects in inventory onto this space */
		871	while (inv)
960	{	872	{
961	object *op = inv;	873	object *op = inv;
962		874
963	while (op)	875	if (op->flag [FLAG_STARTEQUIP]
		876	|| op->flag [FLAG_NO_DROP]
		877	|| op->type == RUNE
		878	|| op->type == TRAP
		879	|| op->flag [FLAG_IS_A_TEMPLATE])
		880	op->destroy ();
		881	else
964	{	882	{
965	object *tmp = op->below;	883	op->remove ();
966	op->free (free_inventory);
967	op = tmp;	884	op->x = x;
		885	op->y = y;
		886	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
968	}	887	}
969	}	888	}
970	else	889	}
971	{ /* Put objects in inventory onto this space */	890	}
972	object *op = inv;
973		891
974	while (op)	892	void
975	{	893	object::destroy (bool destroy_inventory)
976	object *tmp = op->below;	894	{
		895	if (destroyed ())
		896	return;
977		897
978	remove_ob (op);	898	if (more)
979
980	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))
982	free_object (op);
983	else
984	{
985	op->x = x;
986	op->y = y;
987	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
988	}
989
990	op = tmp;
991	}
992	}
993	}	899	{
		900	//TODO: non-head objects must not have inventory
		901	more->destroy (destroy_inventory);
		902	more = 0;
		903	}
994		904
995	owner = 0;	905	if (destroy_inventory)
		906	destroy_inv (true);
996		907
997	/* Remove object from the active list */	908	attachable::destroy ();
998	speed = 0;
999	update_ob_speed (this);
1000
1001	unlink ();
1002
1003	mortals.push_back (this);
1004	}	909	}
1005		910
1006	/*	911	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the	912	* sub_weight() recursively (outwards) subtracts a number from the
1008	* weight of an object (and what is carried by it's environment(s)).	913	* weight of an object (and what is carried by it's environment(s)).
1009	*/	914	*/
1010
1011	void	915	void
1012	sub_weight (object *op, signed long weight)	916	sub_weight (object *op, signed long weight)
1013	{	917	{
1014	while (op != NULL)	918	while (op != NULL)
1015	{	919	{
1016	if (op->type == CONTAINER)	920	if (op->type == CONTAINER)
1017	{
1018	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	921	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019	}	922
1020	op->carrying -= weight;	923	op->carrying -= weight;
1021	op = op->env;	924	op = op->env;
1022	}	925	}
1023	}	926	}
1024		927
1025	/* remove_ob(op):	928	/* op->remove ():
1026	* This function removes the object op from the linked list of objects	929	* 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	930	* which it is currently tied to. When this function is done, the
1028	* object will have no environment. If the object previously had an	931	* object will have no environment. If the object previously had an
1029	* environment, the x and y coordinates will be updated to	932	* environment, the x and y coordinates will be updated to
1030	* the previous environment.	933	* the previous environment.
1031	* Beware: This function is called from the editor as well!	934	* Beware: This function is called from the editor as well!
1032	*/	935	*/
1033
1034	void	936	void
1035	remove_ob (object *op)	937	object::remove ()
1036	{	938	{
		939	object *tmp, *last = 0;
1037	object *	940	object *otmp;
1038	tmp, *
1039	last = NULL;
1040	object *
1041	otmp;
1042		941
1043	tag_t
1044	tag;
1045	int
1046	check_walk_off;
1047	mapstruct *
1048	m;
1049
1050	sint16
1051	x,
1052	y;
1053
1054	if (QUERY_FLAG (op, FLAG_REMOVED))	942	if (QUERY_FLAG (this, FLAG_REMOVED))
1055	return;	943	return;
1056		944
1057	SET_FLAG (op, FLAG_REMOVED);	945	SET_FLAG (this, FLAG_REMOVED);
		946	INVOKE_OBJECT (REMOVE, this);
1058		947
1059	if (op->more != NULL)	948	if (more)
1060	remove_ob (op->more);	949	more->remove ();
1061		950
1062	/*	951	/*
1063	* In this case, the object to be removed is in someones	952	* In this case, the object to be removed is in someones
1064	* inventory.	953	* inventory.
1065	*/	954	*/
1066	if (op->env != NULL)	955	if (env)
1067	{	956	{
1068	if (op->nrof)	957	if (nrof)
1069	sub_weight (op->env, op->weight * op->nrof);	958	sub_weight (env, weight * nrof);
1070	else	959	else
1071	sub_weight (op->env, op->weight + op->carrying);	960	sub_weight (env, weight + carrying);
1072		961
1073	/* NO_FIX_PLAYER is set when a great many changes are being	962	/* NO_FIX_PLAYER is set when a great many changes are being
1074	* made to players inventory. If set, avoiding the call	963	* made to players inventory. If set, avoiding the call
1075	* to save cpu time.	964	* to save cpu time.
1076	*/	965	*/
1077	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1078	fix_player (otmp);	967	otmp->update_stats ();
1079		968
1080	if (op->above != NULL)	969	if (above != NULL)
1081	op->above->below = op->below;	970	above->below = below;
1082	else	971	else
1083	op->env->inv = op->below;	972	env->inv = below;
1084		973
1085	if (op->below != NULL)	974	if (below != NULL)
1086	op->below->above = op->above;	975	below->above = above;
1087		976
1088	/* we set up values so that it could be inserted into	977	/* we set up values so that it could be inserted into
1089	* the map, but we don't actually do that - it is up	978	* the map, but we don't actually do that - it is up
1090	* to the caller to decide what we want to do.	979	* to the caller to decide what we want to do.
1091	*/	980	*/
1092	op->x = op->env->x, op->y = op->env->y;	981	x = env->x, y = env->y;
1093	op->map = op->env->map;	982	map = env->map;
1094	op->above = NULL, op->below = NULL;	983	above = 0, below = 0;
1095	op->env = NULL;	984	env = 0;
1096	}	985	}
1097	else if (op->map)	986	else if (map)
1098	{	987	{
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	988	/* Re did the following section of code - it looks like it had
1119	* lots of logic for things we no longer care about	989	* lots of logic for things we no longer care about
1120	*/	990	*/
1121		991
1122	/* link the object above us */	992	/* link the object above us */
1123	if (op->above)	993	if (above)
1124	op->above->below = op->below;	994	above->below = below;
1125	else	995	else
1126	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	996	map->at (x, y).top = below; /* we were top, set new top */
1127		997
1128	/* Relink the object below us, if there is one */	998	/* Relink the object below us, if there is one */
1129	if (op->below)	999	if (below)
1130	op->below->above = op->above;	1000	below->above = above;
1131	else	1001	else
1132	{	1002	{
1133	/* Nothing below, which means we need to relink map object for this space	1003	/* 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	1004	* use translated coordinates in case some oddness with map tiling is
1135	* evident	1005	* evident
1136	*/	1006	*/
1137	if (GET_MAP_OB (m, x, y) != op)	1007	if (GET_MAP_OB (map, x, y) != this)
1138	{	1008	{
1139	dump_object (op);	1009	char *dump = dump_object (this);
1140	LOG (llevError,	1010	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);	1011	"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);
		1012	free (dump);
1142	dump_object (GET_MAP_OB (m, x, y));	1013	dump = dump_object (GET_MAP_OB (map, x, y));
1143	LOG (llevError, "%s\n", errmsg);	1014	LOG (llevError, "%s\n", dump);
		1015	free (dump);
1144	}	1016	}
1145		1017
1146	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1018	map->at (x, y).bot = above; /* goes on above it. */
1147	}	1019	}
1148		1020
1149	op->above = 0;	1021	above = 0;
1150	op->below = 0;	1022	below = 0;
1151		1023
1152	if (op->map->in_memory == MAP_SAVING)	1024	if (map->in_memory == MAP_SAVING)
1153	return;	1025	return;
1154		1026
1155	tag = op->count;	1027	int check_walk_off = !flag [FLAG_NO_APPLY];
1156	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1157		1028
1158	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1029	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1159	{	1030	{
1160	/* No point updating the players look faces if he is the object	1031	/* No point updating the players look faces if he is the object
1161	* being removed.	1032	* being removed.
1162	*/	1033	*/
1163		1034
1164	if (tmp->type == PLAYER && tmp != op)	1035	if (tmp->type == PLAYER && tmp != this)
1165	{	1036	{
1166	/* If a container that the player is currently using somehow gets	1037	/* If a container that the player is currently using somehow gets
1167	* removed (most likely destroyed), update the player view	1038	* removed (most likely destroyed), update the player view
1168	* appropriately.	1039	* appropriately.
1169	*/	1040	*/
1170	if (tmp->container == op)	1041	if (tmp->container == this)
1171	{	1042	{
1172	CLEAR_FLAG (op, FLAG_APPLIED);	1043	flag [FLAG_APPLIED] = 0;
1173	tmp->container = NULL;	1044	tmp->container = 0;
1174	}	1045	}
1175		1046
1176	tmp->contr->socket.update_look = 1;	1047	if (tmp->contr->ns)
		1048	tmp->contr->ns->floorbox_update ();
1177	}	1049	}
1178		1050
1179	/* See if player moving off should effect something */	1051	/* 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))	1052	if (check_walk_off
		1053	&& ((move_type & tmp->move_off)
		1054	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181	{	1055	{
1182	move_apply (tmp, op, NULL);	1056	move_apply (tmp, this, 0);
1183		1057
1184	if (was_destroyed (op, tag))	1058	if (destroyed ())
1185	{
1186	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1059	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1187	}
1188	}	1060	}
1189		1061
1190	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1062	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191		1063
1192	if (tmp->above == tmp)	1064	if (tmp->above == tmp)
1193	tmp->above = NULL;	1065	tmp->above = 0;
1194		1066
1195	last = tmp;	1067	last = tmp;
1196	}	1068	}
1197		1069
1198	/* last == NULL of there are no objects on this space */	1070	/* last == NULL of there are no objects on this space */
1199	if (last == NULL)	1071	if (!last)
1200	{	1072	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	1073	else
1210	update_object (last, UP_OBJ_REMOVE);	1074	update_object (last, UP_OBJ_REMOVE);
1211		1075
1212	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1076	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1213	update_all_los (op->map, op->x, op->y);	1077	update_all_los (map, x, y);
1214	}	1078	}
1215	}	1079	}
1216		1080
1217	/*	1081	/*
1218	* merge_ob(op,top):	1082	* merge_ob(op,top):
…		…
1220	* This function goes through all objects below and including top, and	1084	* This function goes through all objects below and including top, and
1221	* merges op to the first matching object.	1085	* merges op to the first matching object.
1222	* If top is NULL, it is calculated.	1086	* If top is NULL, it is calculated.
1223	* Returns pointer to object if it succeded in the merge, otherwise NULL	1087	* Returns pointer to object if it succeded in the merge, otherwise NULL
1224	*/	1088	*/
1225
1226	object *	1089	object *
1227	merge_ob (object *op, object *top)	1090	merge_ob (object *op, object *top)
1228	{	1091	{
1229	if (!op->nrof)	1092	if (!op->nrof)
1230	return 0;	1093	return 0;
1231		1094
1232	if (top == NULL)	1095	if (top)
1233	for (top = op; top != NULL && top->above != NULL; top = top->above);	1096	for (top = op; top && top->above; top = top->above)
		1097	;
1234		1098
1235	for (; top != NULL; top = top->below)	1099	for (; top; top = top->below)
1236	{	1100	{
1237	if (top == op)	1101	if (top == op)
1238	continue;	1102	continue;
1239	if (CAN_MERGE (op, top))	1103
		1104	if (object::can_merge (op, top))
1240	{	1105	{
1241	top->nrof += op->nrof;	1106	top->nrof += op->nrof;
1242		1107
1243	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1108	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1244	op->weight = 0; /* Don't want any adjustements now */	1109	op->weight = 0; /* Don't want any adjustements now */
1245	remove_ob (op);	1110	op->destroy ();
1246	free_object (op);
1247	return top;	1111	return top;
1248	}	1112	}
1249	}	1113	}
1250		1114
1251	return NULL;	1115	return 0;
1252	}	1116	}
1253		1117
1254	/*	1118	/*
1255	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1119	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1256	* job preparing multi-part monsters	1120	* job preparing multi-part monsters
1257	*/	1121	*/
1258	object *	1122	object *
1259	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1123	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1260	{	1124	{
1261	object *tmp;	1125	object *tmp;
1262		1126
1263	if (op->head)	1127	if (op->head)
1264	op = op->head;	1128	op = op->head;
…		…
1290	* Return value:	1154	* Return value:
1291	* new object if 'op' was merged with other object	1155	* new object if 'op' was merged with other object
1292	* NULL if 'op' was destroyed	1156	* NULL if 'op' was destroyed
1293	* just 'op' otherwise	1157	* just 'op' otherwise
1294	*/	1158	*/
1295
1296	object *	1159	object *
1297	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1160	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298	{	1161	{
1299	object *tmp, *top, *floor = NULL;	1162	object *tmp, *top, *floor = NULL;
1300	sint16 x, y;	1163	sint16 x, y;
1301		1164
1302	if (QUERY_FLAG (op, FLAG_FREED))	1165	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1305	return NULL;	1168	return NULL;
1306	}	1169	}
1307		1170
1308	if (m == NULL)	1171	if (m == NULL)
1309	{	1172	{
1310	dump_object (op);	1173	char *dump = dump_object (op);
1311	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1174	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1175	free (dump);
1312	return op;	1176	return op;
1313	}	1177	}
1314		1178
1315	if (out_of_map (m, op->x, op->y))	1179	if (out_of_map (m, op->x, op->y))
1316	{	1180	{
1317	dump_object (op);	1181	char *dump = dump_object (op);
1318	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1182	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1319	#ifdef MANY_CORES	1183	#ifdef MANY_CORES
1320	/* Better to catch this here, as otherwise the next use of this object	1184	/* 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	1185	* is likely to cause a crash. Better to find out where it is getting
1322	* improperly inserted.	1186	* improperly inserted.
1323	*/	1187	*/
1324	abort ();	1188	abort ();
1325	#endif	1189	#endif
		1190	free (dump);
1326	return op;	1191	return op;
1327	}	1192	}
1328		1193
1329	if (!QUERY_FLAG (op, FLAG_REMOVED))	1194	if (!QUERY_FLAG (op, FLAG_REMOVED))
1330	{	1195	{
1331	dump_object (op);	1196	char *dump = dump_object (op);
1332	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1197	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1198	free (dump);
1333	return op;	1199	return op;
1334	}	1200	}
1335		1201
1336	if (op->more != NULL)	1202	if (op->more)
1337	{	1203	{
1338	/* The part may be on a different map. */	1204	/* The part may be on a different map. */
1339		1205
1340	object *more = op->more;	1206	object *more = op->more;
1341		1207
…		…
1357	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1223	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1358	{	1224	{
1359	if (!op->head)	1225	if (!op->head)
1360	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1226	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1361		1227
1362	return NULL;	1228	return 0;
1363	}	1229	}
1364	}	1230	}
1365		1231
1366	CLEAR_FLAG (op, FLAG_REMOVED);	1232	CLEAR_FLAG (op, FLAG_REMOVED);
1367		1233
…		…
1375		1241
1376	/* this has to be done after we translate the coordinates.	1242	/* this has to be done after we translate the coordinates.
1377	*/	1243	*/
1378	if (op->nrof && !(flag & INS_NO_MERGE))	1244	if (op->nrof && !(flag & INS_NO_MERGE))
1379	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1245	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1380	if (CAN_MERGE (op, tmp))	1246	if (object::can_merge (op, tmp))
1381	{	1247	{
1382	op->nrof += tmp->nrof;	1248	op->nrof += tmp->nrof;
1383	remove_ob (tmp);	1249	tmp->destroy ();
1384	free_object (tmp);
1385	}	1250	}
1386		1251
1387	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1252	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1388	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1253	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1389		1254
…		…
1402	op->below = originator->below;	1267	op->below = originator->below;
1403		1268
1404	if (op->below)	1269	if (op->below)
1405	op->below->above = op;	1270	op->below->above = op;
1406	else	1271	else
1407	SET_MAP_OB (op->map, op->x, op->y, op);	1272	op->ms ().bot = op;
1408		1273
1409	/* since *below* originator, no need to update top */	1274	/* since *below* originator, no need to update top */
1410	originator->below = op;	1275	originator->below = op;
1411	}	1276	}
1412	else	1277	else
…		…
1458	* If INS_ON_TOP is used, don't do this processing	1323	* If INS_ON_TOP is used, don't do this processing
1459	* Need to find the object that in fact blocks view, otherwise	1324	* Need to find the object that in fact blocks view, otherwise
1460	* stacking is a bit odd.	1325	* stacking is a bit odd.
1461	*/	1326	*/
1462	if (!(flag & INS_ON_TOP) &&	1327	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))	1328	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1464	{	1329	{
1465	for (last = top; last != floor; last = last->below)	1330	for (last = top; last != floor; last = last->below)
1466	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1331	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1467	break;	1332	break;
1468	/* Check to see if we found the object that blocks view,	1333	/* Check to see if we found the object that blocks view,
…		…
1491		1356
1492	if (op->above)	1357	if (op->above)
1493	op->above->below = op;	1358	op->above->below = op;
1494		1359
1495	op->below = NULL;	1360	op->below = NULL;
1496	SET_MAP_OB (op->map, op->x, op->y, op);	1361	op->ms ().bot = op;
1497	}	1362	}
1498	else	1363	else
1499	{ /* get inserted into the stack above top */	1364	{ /* get inserted into the stack above top */
1500	op->above = top->above;	1365	op->above = top->above;
1501		1366
…		…
1505	op->below = top;	1370	op->below = top;
1506	top->above = op;	1371	top->above = op;
1507	}	1372	}
1508		1373
1509	if (op->above == NULL)	1374	if (op->above == NULL)
1510	SET_MAP_TOP (op->map, op->x, op->y, op);	1375	op->ms ().top = op;
1511	} /* else not INS_BELOW_ORIGINATOR */	1376	} /* else not INS_BELOW_ORIGINATOR */
1512		1377
1513	if (op->type == PLAYER)	1378	if (op->type == PLAYER)
1514	op->contr->do_los = 1;	1379	op->contr->do_los = 1;
1515		1380
1516	/* If we have a floor, we know the player, if any, will be above	1381	/* 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.	1382	* it, so save a few ticks and start from there.
1518	*/	1383	*/
1519	if (!(flag & INS_MAP_LOAD))	1384	if (!(flag & INS_MAP_LOAD))
1520	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1385	if (object *pl = op->ms ().player ())
1521	if (tmp->type == PLAYER)	1386	if (pl->contr->ns)
1522	tmp->contr->socket.update_look = 1;	1387	pl->contr->ns->floorbox_update ();
1523		1388
1524	/* If this object glows, it may affect lighting conditions that are	1389	/* If this object glows, it may affect lighting conditions that are
1525	* visible to others on this map. But update_all_los is really	1390	* 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	1391	* 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	1392	* on the map will get recalculated. The players could very well
1528	* be far away from this change and not affected in any way -	1393	* be far away from this change and not affected in any way -
1529	* this should get redone to only look for players within range,	1394	* this should get redone to only look for players within range,
1530	* or just updating the P_NEED_UPDATE for spaces within this area	1395	* or just updating the P_NEED_UPDATE for spaces within this area
1531	* of effect may be sufficient.	1396	* of effect may be sufficient.
1532	*/	1397	*/
1533	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1398	if (op->map->darkness && (op->glow_radius != 0))
1534	update_all_los (op->map, op->x, op->y);	1399	update_all_los (op->map, op->x, op->y);
1535		1400
1536	/* updates flags (blocked, alive, no magic, etc) for this map space */	1401	/* updates flags (blocked, alive, no magic, etc) for this map space */
1537	update_object (op, UP_OBJ_INSERT);	1402	update_object (op, UP_OBJ_INSERT);
1538		1403
		1404	INVOKE_OBJECT (INSERT, op);
		1405
1539	/* Don't know if moving this to the end will break anything. However,	1406	/* 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.	1407	* we want to have floorbox_update called before calling this.
1541	*	1408	*
1542	* check_move_on() must be after this because code called from	1409	* check_move_on() must be after this because code called from
1543	* check_move_on() depends on correct map flags (so functions like	1410	* check_move_on() depends on correct map flags (so functions like
1544	* blocked() and wall() work properly), and these flags are updated by	1411	* blocked() and wall() work properly), and these flags are updated by
1545	* update_object().	1412	* update_object().
…		…
1547		1414
1548	/* if this is not the head or flag has been passed, don't check walk on status */	1415	/* if this is not the head or flag has been passed, don't check walk on status */
1549	if (!(flag & INS_NO_WALK_ON) && !op->head)	1416	if (!(flag & INS_NO_WALK_ON) && !op->head)
1550	{	1417	{
1551	if (check_move_on (op, originator))	1418	if (check_move_on (op, originator))
1552	return NULL;	1419	return 0;
1553		1420
1554	/* If we are a multi part object, lets work our way through the check	1421	/* If we are a multi part object, lets work our way through the check
1555	* walk on's.	1422	* walk on's.
1556	*/	1423	*/
1557	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1424	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1558	if (check_move_on (tmp, originator))	1425	if (check_move_on (tmp, originator))
1559	return NULL;	1426	return 0;
1560	}	1427	}
1561		1428
1562	return op;	1429	return op;
1563	}	1430	}
1564		1431
1565	/* this function inserts an object in the map, but if it	1432	/* 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.	1433	* 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.	1434	* op is the object to insert it under: supplies x and the map.
1568	*/	1435	*/
1569	void	1436	void
1570	replace_insert_ob_in_map (const char *arch_string, object *op)	1437	replace_insert_ob_in_map (const char *arch_string, object *op)
1571	{	1438	{
1572	object *	1439	object *tmp, *tmp1;
1573	tmp;
1574	object *
1575	tmp1;
1576		1440
1577	/* first search for itself and remove any old instances */	1441	/* first search for itself and remove any old instances */
1578		1442
1579	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1443	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 */	1444	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1582	{	1445	tmp->destroy ();
1583	remove_ob (tmp);
1584	free_object (tmp);
1585	}
1586	}
1587		1446
1588	tmp1 = arch_to_object (find_archetype (arch_string));	1447	tmp1 = arch_to_object (archetype::find (arch_string));
1589		1448
1590	tmp1->x = op->x;	1449	tmp1->x = op->x;
1591	tmp1->y = op->y;	1450	tmp1->y = op->y;
1592	insert_ob_in_map (tmp1, op->map, op, 0);	1451	insert_ob_in_map (tmp1, op->map, op, 0);
1593	}	1452	}
…		…
1601	*/	1460	*/
1602		1461
1603	object *	1462	object *
1604	get_split_ob (object *orig_ob, uint32 nr)	1463	get_split_ob (object *orig_ob, uint32 nr)
1605	{	1464	{
1606	object *	1465	object *newob;
1607	newob;
1608	int
1609	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1466	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1610		1467
1611	if (orig_ob->nrof < nr)	1468	if (orig_ob->nrof < nr)
1612	{	1469	{
1613	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1470	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1614	return NULL;	1471	return NULL;
1615	}	1472	}
1616		1473
1617	newob = object_create_clone (orig_ob);	1474	newob = object_create_clone (orig_ob);
1618		1475
1619	if ((orig_ob->nrof -= nr) < 1)	1476	if ((orig_ob->nrof -= nr) < 1)
1620	{	1477	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)	1478	else if (!is_removed)
1626	{	1479	{
1627	if (orig_ob->env != NULL)	1480	if (orig_ob->env != NULL)
1628	sub_weight (orig_ob->env, orig_ob->weight * nr);	1481	sub_weight (orig_ob->env, orig_ob->weight * nr);
1629	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1482	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1649		1502
1650	object *	1503	object *
1651	decrease_ob_nr (object *op, uint32 i)	1504	decrease_ob_nr (object *op, uint32 i)
1652	{	1505	{
1653	object *tmp;	1506	object *tmp;
1654	player *pl;
1655		1507
1656	if (i == 0) /* objects with op->nrof require this check */	1508	if (i == 0) /* objects with op->nrof require this check */
1657	return op;	1509	return op;
1658		1510
1659	if (i > op->nrof)	1511	if (i > op->nrof)
1660	i = op->nrof;	1512	i = op->nrof;
1661		1513
1662	if (QUERY_FLAG (op, FLAG_REMOVED))	1514	if (QUERY_FLAG (op, FLAG_REMOVED))
1663	op->nrof -= i;	1515	op->nrof -= i;
1664	else if (op->env != NULL)	1516	else if (op->env)
1665	{	1517	{
1666	/* is this object in the players inventory, or sub container	1518	/* is this object in the players inventory, or sub container
1667	* therein?	1519	* therein?
1668	*/	1520	*/
1669	tmp = is_player_inv (op->env);	1521	tmp = op->in_player ();
1670	/* nope. Is this a container the player has opened?	1522	/* nope. Is this a container the player has opened?
1671	* If so, set tmp to that player.	1523	* If so, set tmp to that player.
1672	* IMO, searching through all the players will mostly	1524	* IMO, searching through all the players will mostly
1673	* likely be quicker than following op->env to the map,	1525	* likely be quicker than following op->env to the map,
1674	* and then searching the map for a player.	1526	* and then searching the map for a player.
1675	*/	1527	*/
1676	if (!tmp)	1528	if (!tmp)
1677	{	1529	for_all_players (pl)
1678	for (pl = first_player; pl; pl = pl->next)
1679	if (pl->ob->container == op->env)	1530	if (pl->ob->container == op->env)
		1531	{
		1532	tmp = pl->ob;
1680	break;	1533	break;
1681	if (pl)
1682	tmp = pl->ob;
1683	else
1684	tmp = NULL;
1685	}	1534	}
1686		1535
1687	if (i < op->nrof)	1536	if (i < op->nrof)
1688	{	1537	{
1689	sub_weight (op->env, op->weight * i);	1538	sub_weight (op->env, op->weight * i);
1690	op->nrof -= i;	1539	op->nrof -= i;
1691	if (tmp)	1540	if (tmp)
1692	{
1693	esrv_send_item (tmp, op);	1541	esrv_send_item (tmp, op);
1694	}
1695	}	1542	}
1696	else	1543	else
1697	{	1544	{
1698	remove_ob (op);	1545	op->remove ();
1699	op->nrof = 0;	1546	op->nrof = 0;
1700	if (tmp)	1547	if (tmp)
1701	{
1702	esrv_del_item (tmp->contr, op->count);	1548	esrv_del_item (tmp->contr, op->count);
1703	}
1704	}	1549	}
1705	}	1550	}
1706	else	1551	else
1707	{	1552	{
1708	object *above = op->above;	1553	object *above = op->above;
1709		1554
1710	if (i < op->nrof)	1555	if (i < op->nrof)
1711	op->nrof -= i;	1556	op->nrof -= i;
1712	else	1557	else
1713	{	1558	{
1714	remove_ob (op);	1559	op->remove ();
1715	op->nrof = 0;	1560	op->nrof = 0;
1716	}	1561	}
1717		1562
1718	/* Since we just removed op, op->above is null */	1563	/* Since we just removed op, op->above is null */
1719	for (tmp = above; tmp != NULL; tmp = tmp->above)	1564	for (tmp = above; tmp; tmp = tmp->above)
1720	if (tmp->type == PLAYER)	1565	if (tmp->type == PLAYER)
1721	{	1566	{
1722	if (op->nrof)	1567	if (op->nrof)
1723	esrv_send_item (tmp, op);	1568	esrv_send_item (tmp, op);
1724	else	1569	else
…		…
1728		1573
1729	if (op->nrof)	1574	if (op->nrof)
1730	return op;	1575	return op;
1731	else	1576	else
1732	{	1577	{
1733	free_object (op);	1578	op->destroy ();
1734	return NULL;	1579	return 0;
1735	}	1580	}
1736	}	1581	}
1737		1582
1738	/*	1583	/*
1739	* add_weight(object, weight) adds the specified weight to an object,	1584	* add_weight(object, weight) adds the specified weight to an object,
…		…
1751	op->carrying += weight;	1596	op->carrying += weight;
1752	op = op->env;	1597	op = op->env;
1753	}	1598	}
1754	}	1599	}
1755		1600
		1601	object *
		1602	insert_ob_in_ob (object *op, object *where)
		1603	{
		1604	if (!where)
		1605	{
		1606	char *dump = dump_object (op);
		1607	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1608	free (dump);
		1609	return op;
		1610	}
		1611
		1612	if (where->head)
		1613	{
		1614	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1615	where = where->head;
		1616	}
		1617
		1618	return where->insert (op);
		1619	}
		1620
1756	/*	1621	/*
1757	* insert_ob_in_ob(op,environment):	1622	* env->insert (op)
1758	* This function inserts the object op in the linked list	1623	* This function inserts the object op in the linked list
1759	* inside the object environment.	1624	* inside the object environment.
1760	*	1625	*
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	1626	* The function returns now pointer to inserted item, and return value can
1767	* be != op, if items are merged. -Tero	1627	* be != op, if items are merged. -Tero
1768	*/	1628	*/
1769		1629
1770	object *	1630	object *
1771	insert_ob_in_ob (object *op, object *where)	1631	object::insert (object *op)
1772	{	1632	{
1773	object *	1633	object *tmp, *otmp;
1774	tmp, *
1775	otmp;
1776		1634
1777	if (!QUERY_FLAG (op, FLAG_REMOVED))	1635	if (!QUERY_FLAG (op, FLAG_REMOVED))
1778	{	1636	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		1637
1797	if (op->more)	1638	if (op->more)
1798	{	1639	{
1799	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1640	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1800	return op;	1641	return op;
…		…
1802		1643
1803	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1644	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1804	CLEAR_FLAG (op, FLAG_REMOVED);	1645	CLEAR_FLAG (op, FLAG_REMOVED);
1805	if (op->nrof)	1646	if (op->nrof)
1806	{	1647	{
1807	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1648	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1808	if (CAN_MERGE (tmp, op))	1649	if (object::can_merge (tmp, op))
1809	{	1650	{
1810	/* return the original object and remove inserted object	1651	/* return the original object and remove inserted object
1811	(client needs the original object) */	1652	(client needs the original object) */
1812	tmp->nrof += op->nrof;	1653	tmp->nrof += op->nrof;
1813	/* Weight handling gets pretty funky. Since we are adding to	1654	/* Weight handling gets pretty funky. Since we are adding to
1814	* tmp->nrof, we need to increase the weight.	1655	* tmp->nrof, we need to increase the weight.
1815	*/	1656	*/
1816	add_weight (where, op->weight * op->nrof);	1657	add_weight (this, op->weight * op->nrof);
1817	SET_FLAG (op, FLAG_REMOVED);	1658	SET_FLAG (op, FLAG_REMOVED);
1818	free_object (op); /* free the inserted object */	1659	op->destroy (); /* free the inserted object */
1819	op = tmp;	1660	op = tmp;
1820	remove_ob (op); /* and fix old object's links */	1661	op->remove (); /* and fix old object's links */
1821	CLEAR_FLAG (op, FLAG_REMOVED);	1662	CLEAR_FLAG (op, FLAG_REMOVED);
1822	break;	1663	break;
1823	}	1664	}
1824		1665
1825	/* I assume combined objects have no inventory	1666	/* I assume combined objects have no inventory
1826	* We add the weight - this object could have just been removed	1667	* We add the weight - this object could have just been removed
1827	* (if it was possible to merge). calling remove_ob will subtract	1668	* (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	1669	* the weight, so we need to add it in again, since we actually do
1829	* the linking below	1670	* the linking below
1830	*/	1671	*/
1831	add_weight (where, op->weight * op->nrof);	1672	add_weight (this, op->weight * op->nrof);
1832	}	1673	}
1833	else	1674	else
1834	add_weight (where, (op->weight + op->carrying));	1675	add_weight (this, (op->weight + op->carrying));
1835		1676
1836	otmp = is_player_inv (where);	1677	otmp = this->in_player ();
1837	if (otmp && otmp->contr != NULL)	1678	if (otmp && otmp->contr)
1838	{
1839	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1679	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1840	fix_player (otmp);	1680	otmp->update_stats ();
1841	}
1842		1681
1843	op->map = NULL;	1682	op->map = 0;
1844	op->env = where;	1683	op->env = this;
1845	op->above = NULL;	1684	op->above = 0;
1846	op->below = NULL;	1685	op->below = 0;
1847	op->x = 0, op->y = 0;	1686	op->x = 0, op->y = 0;
1848		1687
1849	/* reset the light list and los of the players on the map */	1688	/* reset the light list and los of the players on the map */
1850	if ((op->glow_radius != 0) && where->map)	1689	if ((op->glow_radius != 0) && map)
1851	{	1690	{
1852	#ifdef DEBUG_LIGHTS	1691	#ifdef DEBUG_LIGHTS
1853	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1692	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1854	#endif /* DEBUG_LIGHTS */	1693	#endif /* DEBUG_LIGHTS */
1855	if (MAP_DARKNESS (where->map))	1694	if (map->darkness)
1856	update_all_los (where->map, where->x, where->y);	1695	update_all_los (map, x, y);
1857	}	1696	}
1858		1697
1859	/* Client has no idea of ordering so lets not bother ordering it here.	1698	/* Client has no idea of ordering so lets not bother ordering it here.
1860	* It sure simplifies this function...	1699	* It sure simplifies this function...
1861	*/	1700	*/
1862	if (where->inv == NULL)	1701	if (!inv)
1863	where->inv = op;	1702	inv = op;
1864	else	1703	else
1865	{	1704	{
1866	op->below = where->inv;	1705	op->below = inv;
1867	op->below->above = op;	1706	op->below->above = op;
1868	where->inv = op;	1707	inv = op;
1869	}	1708	}
		1709
		1710	INVOKE_OBJECT (INSERT, this);
		1711
1870	return op;	1712	return op;
1871	}	1713	}
1872		1714
1873	/*	1715	/*
1874	* Checks if any objects has a move_type that matches objects	1716	* Checks if any objects has a move_type that matches objects
…		…
1892	*/	1734	*/
1893		1735
1894	int	1736	int
1895	check_move_on (object *op, object *originator)	1737	check_move_on (object *op, object *originator)
1896	{	1738	{
1897	object *	1739	object *tmp;
1898	tmp;	1740	maptile *m = op->map;
1899	tag_t
1900	tag;
1901	mapstruct *
1902	m = op->map;
1903	int
1904	x = op->x, y = op->y;	1741	int x = op->x, y = op->y;
1905		1742
1906	MoveType	1743	MoveType move_on, move_slow, move_block;
1907	move_on,
1908	move_slow,
1909	move_block;
1910		1744
1911	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1745	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912	return 0;	1746	return 0;
1913
1914	tag = op->count;
1915		1747
1916	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1748	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);	1749	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);	1750	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1919		1751
…		…
1935		1767
1936	/* The objects have to be checked from top to bottom.	1768	/* The objects have to be checked from top to bottom.
1937	* Hence, we first go to the top:	1769	* Hence, we first go to the top:
1938	*/	1770	*/
1939		1771
1940	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1772	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1941	{	1773	{
1942	/* Trim the search when we find the first other spell effect	1774	/* Trim the search when we find the first other spell effect
1943	* this helps performance so that if a space has 50 spell objects,	1775	* this helps performance so that if a space has 50 spell objects,
1944	* we don't need to check all of them.	1776	* we don't need to check all of them.
1945	*/	1777	*/
…		…
1980	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1812	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))	1813	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982	{	1814	{
1983	move_apply (tmp, op, originator);	1815	move_apply (tmp, op, originator);
1984		1816
1985	if (was_destroyed (op, tag))	1817	if (op->destroyed ())
1986	return 1;	1818	return 1;
1987		1819
1988	/* what the person/creature stepped onto has moved the object	1820	/* what the person/creature stepped onto has moved the object
1989	* someplace new. Don't process any further - if we did,	1821	* someplace new. Don't process any further - if we did,
1990	* have a feeling strange problems would result.	1822	* have a feeling strange problems would result.
…		…
2000	/*	1832	/*
2001	* present_arch(arch, map, x, y) searches for any objects with	1833	* present_arch(arch, map, x, y) searches for any objects with
2002	* a matching archetype at the given map and coordinates.	1834	* a matching archetype at the given map and coordinates.
2003	* The first matching object is returned, or NULL if none.	1835	* The first matching object is returned, or NULL if none.
2004	*/	1836	*/
2005
2006	object *	1837	object *
2007	present_arch (const archetype *at, mapstruct *m, int x, int y)	1838	present_arch (const archetype *at, maptile *m, int x, int y)
2008	{	1839	{
2009	object *
2010	tmp;
2011
2012	if (m == NULL || out_of_map (m, x, y))	1840	if (m == NULL || out_of_map (m, x, y))
2013	{	1841	{
2014	LOG (llevError, "Present_arch called outside map.\n");	1842	LOG (llevError, "Present_arch called outside map.\n");
2015	return NULL;	1843	return NULL;
2016	}	1844	}
		1845
2017	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1846	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2018	if (tmp->arch == at)	1847	if (tmp->arch == at)
2019	return tmp;	1848	return tmp;
		1849
2020	return NULL;	1850	return NULL;
2021	}	1851	}
2022		1852
2023	/*	1853	/*
2024	* present(type, map, x, y) searches for any objects with	1854	* present(type, map, x, y) searches for any objects with
2025	* a matching type variable at the given map and coordinates.	1855	* a matching type variable at the given map and coordinates.
2026	* The first matching object is returned, or NULL if none.	1856	* The first matching object is returned, or NULL if none.
2027	*/	1857	*/
2028
2029	object *	1858	object *
2030	present (unsigned char type, mapstruct *m, int x, int y)	1859	present (unsigned char type, maptile *m, int x, int y)
2031	{	1860	{
2032	object *
2033	tmp;
2034
2035	if (out_of_map (m, x, y))	1861	if (out_of_map (m, x, y))
2036	{	1862	{
2037	LOG (llevError, "Present called outside map.\n");	1863	LOG (llevError, "Present called outside map.\n");
2038	return NULL;	1864	return NULL;
2039	}	1865	}
		1866
2040	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1867	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2041	if (tmp->type == type)	1868	if (tmp->type == type)
2042	return tmp;	1869	return tmp;
		1870
2043	return NULL;	1871	return NULL;
2044	}	1872	}
2045		1873
2046	/*	1874	/*
2047	* present_in_ob(type, object) searches for any objects with	1875	* present_in_ob(type, object) searches for any objects with
2048	* a matching type variable in the inventory of the given object.	1876	* a matching type variable in the inventory of the given object.
2049	* The first matching object is returned, or NULL if none.	1877	* The first matching object is returned, or NULL if none.
2050	*/	1878	*/
2051
2052	object *	1879	object *
2053	present_in_ob (unsigned char type, const object *op)	1880	present_in_ob (unsigned char type, const object *op)
2054	{	1881	{
2055	object *
2056	tmp;
2057
2058	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1882	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2059	if (tmp->type == type)	1883	if (tmp->type == type)
2060	return tmp;	1884	return tmp;
		1885
2061	return NULL;	1886	return NULL;
2062	}	1887	}
2063		1888
2064	/*	1889	/*
2065	* present_in_ob (type, str, object) searches for any objects with	1890	* present_in_ob (type, str, object) searches for any objects with
…		…
2073	* str is the string to match against. Note that we match against	1898	* str is the string to match against. Note that we match against
2074	* the object name, not the archetype name. this is so that the	1899	* the object name, not the archetype name. this is so that the
2075	* spell code can use one object type (force), but change it's name	1900	* spell code can use one object type (force), but change it's name
2076	* to be unique.	1901	* to be unique.
2077	*/	1902	*/
2078
2079	object *	1903	object *
2080	present_in_ob_by_name (int type, const char *str, const object *op)	1904	present_in_ob_by_name (int type, const char *str, const object *op)
2081	{	1905	{
2082	object *
2083	tmp;
2084
2085	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1906	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2086	{
2087	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1907	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2088	return tmp;	1908	return tmp;
2089	}	1909
2090	return NULL;	1910	return 0;
2091	}	1911	}
2092		1912
2093	/*	1913	/*
2094	* present_arch_in_ob(archetype, object) searches for any objects with	1914	* present_arch_in_ob(archetype, object) searches for any objects with
2095	* a matching archetype in the inventory of the given object.	1915	* a matching archetype in the inventory of the given object.
2096	* The first matching object is returned, or NULL if none.	1916	* The first matching object is returned, or NULL if none.
2097	*/	1917	*/
2098
2099	object *	1918	object *
2100	present_arch_in_ob (const archetype *at, const object *op)	1919	present_arch_in_ob (const archetype *at, const object *op)
2101	{	1920	{
2102	object *
2103	tmp;
2104
2105	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1921	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2106	if (tmp->arch == at)	1922	if (tmp->arch == at)
2107	return tmp;	1923	return tmp;
		1924
2108	return NULL;	1925	return NULL;
2109	}	1926	}
2110		1927
2111	/*	1928	/*
2112	* activate recursively a flag on an object inventory	1929	* activate recursively a flag on an object inventory
2113	*/	1930	*/
2114	void	1931	void
2115	flag_inv (object *op, int flag)	1932	flag_inv (object *op, int flag)
2116	{	1933	{
2117	object *
2118	tmp;
2119
2120	if (op->inv)	1934	if (op->inv)
2121	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1935	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2122	{	1936	{
2123	SET_FLAG (tmp, flag);	1937	SET_FLAG (tmp, flag);
2124	flag_inv (tmp, flag);	1938	flag_inv (tmp, flag);
2125	}	1939	}
2126	} /*	1940	}
		1941
		1942	/*
2127	* desactivate recursively a flag on an object inventory	1943	* deactivate recursively a flag on an object inventory
2128	*/	1944	*/
2129	void	1945	void
2130	unflag_inv (object *op, int flag)	1946	unflag_inv (object *op, int flag)
2131	{	1947	{
2132	object *
2133	tmp;
2134
2135	if (op->inv)	1948	if (op->inv)
2136	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1949	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2137	{	1950	{
2138	CLEAR_FLAG (tmp, flag);	1951	CLEAR_FLAG (tmp, flag);
2139	unflag_inv (tmp, flag);	1952	unflag_inv (tmp, flag);
2140	}	1953	}
2141	}	1954	}
…		…
2144	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1957	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2145	* all it's inventory (recursively).	1958	* all it's inventory (recursively).
2146	* If checksums are used, a player will get set_cheat called for	1959	* If checksums are used, a player will get set_cheat called for
2147	* him/her-self and all object carried by a call to this function.	1960	* him/her-self and all object carried by a call to this function.
2148	*/	1961	*/
2149
2150	void	1962	void
2151	set_cheat (object *op)	1963	set_cheat (object *op)
2152	{	1964	{
2153	SET_FLAG (op, FLAG_WAS_WIZ);	1965	SET_FLAG (op, FLAG_WAS_WIZ);
2154	flag_inv (op, FLAG_WAS_WIZ);	1966	flag_inv (op, FLAG_WAS_WIZ);
…		…
2173	* because arch_blocked (now ob_blocked) needs to know the movement type	1985	* because arch_blocked (now ob_blocked) needs to know the movement type
2174	* to know if the space in question will block the object. We can't use	1986	* to know if the space in question will block the object. We can't use
2175	* the archetype because that isn't correct if the monster has been	1987	* the archetype because that isn't correct if the monster has been
2176	* customized, changed states, etc.	1988	* customized, changed states, etc.
2177	*/	1989	*/
2178
2179	int	1990	int
2180	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	1991	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2181	{	1992	{
2182	int
2183	i,
2184	index = 0, flag;	1993	int index = 0, flag;
2185	static int
2186	altern[SIZEOFFREE];	1994	int altern[SIZEOFFREE];
2187		1995
2188	for (i = start; i < stop; i++)	1996	for (int i = start; i < stop; i++)
2189	{	1997	{
2190	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1998	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2191	if (!flag)	1999	if (!flag)
2192	altern[index++] = i;	2000	altern [index++] = i;
2193		2001
2194	/* Basically, if we find a wall on a space, we cut down the search size.	2002	/* Basically, if we find a wall on a space, we cut down the search size.
2195	* In this way, we won't return spaces that are on another side of a wall.	2003	* In this way, we won't return spaces that are on another side of a wall.
2196	* This mostly work, but it cuts down the search size in all directions -	2004	* This mostly work, but it cuts down the search size in all directions -
2197	* if the space being examined only has a wall to the north and empty	2005	* 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	2006	* spaces in all the other directions, this will reduce the search space
2199	* to only the spaces immediately surrounding the target area, and	2007	* to only the spaces immediately surrounding the target area, and
2200	* won't look 2 spaces south of the target space.	2008	* won't look 2 spaces south of the target space.
2201	*/	2009	*/
2202	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2010	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2203	stop = maxfree[i];	2011	stop = maxfree[i];
2204	}	2012	}
		2013
2205	if (!index)	2014	if (!index)
2206	return -1;	2015	return -1;
		2016
2207	return altern[RANDOM () % index];	2017	return altern[RANDOM () % index];
2208	}	2018	}
2209		2019
2210	/*	2020	/*
2211	* find_first_free_spot(archetype, mapstruct, x, y) works like	2021	* find_first_free_spot(archetype, maptile, x, y) works like
2212	* find_free_spot(), but it will search max number of squares.	2022	* find_free_spot(), but it will search max number of squares.
2213	* But it will return the first available spot, not a random choice.	2023	* 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.	2024	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2215	*/	2025	*/
2216
2217	int	2026	int
2218	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2027	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2219	{	2028	{
2220	int
2221	i;
2222
2223	for (i = 0; i < SIZEOFFREE; i++)	2029	for (int i = 0; i < SIZEOFFREE; i++)
2224	{
2225	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2030	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2226	return i;	2031	return i;
2227	}	2032
2228	return -1;	2033	return -1;
2229	}	2034	}
2230		2035
2231	/*	2036	/*
2232	* The function permute(arr, begin, end) randomly reorders the array	2037	* The function permute(arr, begin, end) randomly reorders the array
2233	* arr[begin..end-1].	2038	* arr[begin..end-1].
		2039	* now uses a fisher-yates shuffle, old permute was broken
2234	*/	2040	*/
2235	static void	2041	static void
2236	permute (int *arr, int begin, int end)	2042	permute (int *arr, int begin, int end)
2237	{	2043	{
2238	int	2044	arr += begin;
2239	i,
2240	j,
2241	tmp,
2242	len;
2243
2244	len = end - begin;	2045	end -= begin;
2245	for (i = begin; i < end; i++)
2246	{
2247	j = begin + RANDOM () % len;
2248		2046
2249	tmp = arr[i];	2047	while (--end)
2250	arr[i] = arr[j];	2048	swap (arr [end], arr [RANDOM () % (end + 1)]);
2251	arr[j] = tmp;
2252	}
2253	}	2049	}
2254		2050
2255	/* new function to make monster searching more efficient, and effective!	2051	/* new function to make monster searching more efficient, and effective!
2256	* This basically returns a randomized array (in the passed pointer) of	2052	* This basically returns a randomized array (in the passed pointer) of
2257	* the spaces to find monsters. In this way, it won't always look for	2053	* the spaces to find monsters. In this way, it won't always look for
…		…
2260	* the 3x3 area will be searched, just not in a predictable order.	2056	* the 3x3 area will be searched, just not in a predictable order.
2261	*/	2057	*/
2262	void	2058	void
2263	get_search_arr (int *search_arr)	2059	get_search_arr (int *search_arr)
2264	{	2060	{
2265	int	2061	int i;
2266	i;
2267		2062
2268	for (i = 0; i < SIZEOFFREE; i++)	2063	for (i = 0; i < SIZEOFFREE; i++)
2269	{
2270	search_arr[i] = i;	2064	search_arr[i] = i;
2271	}
2272		2065
2273	permute (search_arr, 1, SIZEOFFREE1 + 1);	2066	permute (search_arr, 1, SIZEOFFREE1 + 1);
2274	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2067	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2275	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2068	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2276	}	2069	}
…		…
2285	* Perhaps incorrectly, but I'm making the assumption that exclude	2078	* Perhaps incorrectly, but I'm making the assumption that exclude
2286	* is actually want is going to try and move there. We need this info	2079	* is actually want is going to try and move there. We need this info
2287	* because we have to know what movement the thing looking to move	2080	* because we have to know what movement the thing looking to move
2288	* there is capable of.	2081	* there is capable of.
2289	*/	2082	*/
2290
2291	int	2083	int
2292	find_dir (mapstruct *m, int x, int y, object *exclude)	2084	find_dir (maptile *m, int x, int y, object *exclude)
2293	{	2085	{
2294	int
2295	i,
2296	max = SIZEOFFREE, mflags;	2086	int i, max = SIZEOFFREE, mflags;
2297		2087
2298	sint16 nx, ny;	2088	sint16 nx, ny;
2299	object *	2089	object *tmp;
2300	tmp;	2090	maptile *mp;
2301	mapstruct *
2302	mp;
2303		2091
2304	MoveType blocked, move_type;	2092	MoveType blocked, move_type;
2305		2093
2306	if (exclude && exclude->head)	2094	if (exclude && exclude->head)
2307	{	2095	{
…		…
2319	mp = m;	2107	mp = m;
2320	nx = x + freearr_x[i];	2108	nx = x + freearr_x[i];
2321	ny = y + freearr_y[i];	2109	ny = y + freearr_y[i];
2322		2110
2323	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2111	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2112
2324	if (mflags & P_OUT_OF_MAP)	2113	if (mflags & P_OUT_OF_MAP)
2325	{
2326	max = maxfree[i];	2114	max = maxfree[i];
2327	}
2328	else	2115	else
2329	{	2116	{
2330	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2117	mapspace &ms = mp->at (nx, ny);
		2118
		2119	blocked = ms.move_block;
2331		2120
2332	if ((move_type & blocked) == move_type)	2121	if ((move_type & blocked) == move_type)
2333	{
2334	max = maxfree[i];	2122	max = maxfree[i];
2335	}
2336	else if (mflags & P_IS_ALIVE)	2123	else if (mflags & P_IS_ALIVE)
2337	{	2124	{
2338	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2125	for (tmp = ms.bot; tmp; tmp = tmp->above)
2339	{	2126	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2340	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2127	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2341	{
2342	break;	2128	break;
2343	}	2129
2344	}
2345	if (tmp)	2130	if (tmp)
2346	{
2347	return freedir[i];	2131	return freedir[i];
2348	}
2349	}	2132	}
2350	}	2133	}
2351	}	2134	}
		2135
2352	return 0;	2136	return 0;
2353	}	2137	}
2354		2138
2355	/*	2139	/*
2356	* distance(object 1, object 2) will return the square of the	2140	* distance(object 1, object 2) will return the square of the
2357	* distance between the two given objects.	2141	* distance between the two given objects.
2358	*/	2142	*/
2359
2360	int	2143	int
2361	distance (const object *ob1, const object *ob2)	2144	distance (const object *ob1, const object *ob2)
2362	{	2145	{
2363	int
2364	i;
2365
2366	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2146	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2367	return i;
2368	}	2147	}
2369		2148
2370	/*	2149	/*
2371	* find_dir_2(delta-x,delta-y) will return a direction in which	2150	* find_dir_2(delta-x,delta-y) will return a direction in which
2372	* an object which has subtracted the x and y coordinates of another	2151	* an object which has subtracted the x and y coordinates of another
2373	* object, needs to travel toward it.	2152	* object, needs to travel toward it.
2374	*/	2153	*/
2375
2376	int	2154	int
2377	find_dir_2 (int x, int y)	2155	find_dir_2 (int x, int y)
2378	{	2156	{
2379	int	2157	int q;
2380	q;
2381		2158
2382	if (y)	2159	if (y)
2383	q = x * 100 / y;	2160	q = x * 100 / y;
2384	else if (x)	2161	else if (x)
2385	q = -300 * x;	2162	q = -300 * x;
…		…
2420	int	2197	int
2421	absdir (int d)	2198	absdir (int d)
2422	{	2199	{
2423	while (d < 1)	2200	while (d < 1)
2424	d += 8;	2201	d += 8;
		2202
2425	while (d > 8)	2203	while (d > 8)
2426	d -= 8;	2204	d -= 8;
		2205
2427	return d;	2206	return d;
2428	}	2207	}
2429		2208
2430	/*	2209	/*
2431	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2210	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2433	*/	2212	*/
2434		2213
2435	int	2214	int
2436	dirdiff (int dir1, int dir2)	2215	dirdiff (int dir1, int dir2)
2437	{	2216	{
2438	int	2217	int d;
2439	d;
2440		2218
2441	d = abs (dir1 - dir2);	2219	d = abs (dir1 - dir2);
2442	if (d > 4)	2220	if (d > 4)
2443	d = 8 - d;	2221	d = 8 - d;
		2222
2444	return d;	2223	return d;
2445	}	2224	}
2446		2225
2447	/* peterm:	2226	/* peterm:
2448	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2227	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2451	* This basically means that if direction is 15, then it could either go	2230	* This basically means that if direction is 15, then it could either go
2452	* direction 4, 14, or 16 to get back to where we are.	2231	* direction 4, 14, or 16 to get back to where we are.
2453	* Moved from spell_util.c to object.c with the other related direction	2232	* Moved from spell_util.c to object.c with the other related direction
2454	* functions.	2233	* functions.
2455	*/	2234	*/
2456
2457	int
2458	reduction_dir[SIZEOFFREE][3] = {	2235	int reduction_dir[SIZEOFFREE][3] = {
2459	{0, 0, 0}, /* 0 */	2236	{0, 0, 0}, /* 0 */
2460	{0, 0, 0}, /* 1 */	2237	{0, 0, 0}, /* 1 */
2461	{0, 0, 0}, /* 2 */	2238	{0, 0, 0}, /* 2 */
2462	{0, 0, 0}, /* 3 */	2239	{0, 0, 0}, /* 3 */
2463	{0, 0, 0}, /* 4 */	2240	{0, 0, 0}, /* 4 */
…		…
2511	* find a path to that monster that we found. If not,	2288	* find a path to that monster that we found. If not,
2512	* we don't bother going toward it. Returns 1 if we	2289	* we don't bother going toward it. Returns 1 if we
2513	* can see a direct way to get it	2290	* can see a direct way to get it
2514	* Modified to be map tile aware -.MSW	2291	* Modified to be map tile aware -.MSW
2515	*/	2292	*/
2516
2517
2518	int	2293	int
2519	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2294	can_see_monsterP (maptile *m, int x, int y, int dir)
2520	{	2295	{
2521	sint16 dx, dy;	2296	sint16 dx, dy;
2522	int
2523	mflags;	2297	int mflags;
2524		2298
2525	if (dir < 0)	2299	if (dir < 0)
2526	return 0; /* exit condition: invalid direction */	2300	return 0; /* exit condition: invalid direction */
2527		2301
2528	dx = x + freearr_x[dir];	2302	dx = x + freearr_x[dir];
…		…
2541	return 0;	2315	return 0;
2542		2316
2543	/* yes, can see. */	2317	/* yes, can see. */
2544	if (dir < 9)	2318	if (dir < 9)
2545	return 1;	2319	return 1;
		2320
2546	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2321	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]);	2322	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2323	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2548	}	2324	}
2549
2550
2551		2325
2552	/*	2326	/*
2553	* can_pick(picker, item): finds out if an object is possible to be	2327	* 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	2328	* picked up by the picker. Returnes 1 if it can be
2555	* picked up, otherwise 0.	2329	* picked up, otherwise 0.
…		…
2566	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2340	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2567	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2341	(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));	2342	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2569	}	2343	}
2570		2344
2571
2572	/*	2345	/*
2573	* create clone from object to another	2346	* create clone from object to another
2574	*/	2347	*/
2575	object *	2348	object *
2576	object_create_clone (object *asrc)	2349	object_create_clone (object *asrc)
2577	{	2350	{
2578	object *
2579	dst = NULL, *tmp, *src, *part, *prev, *item;	2351	object *dst = 0, *tmp, *src, *part, *prev, *item;
2580		2352
2581	if (!asrc)	2353	if (!asrc)
2582	return NULL;	2354	return 0;
		2355
2583	src = asrc;	2356	src = asrc;
2584	if (src->head)	2357	if (src->head)
2585	src = src->head;	2358	src = src->head;
2586		2359
2587	prev = NULL;	2360	prev = 0;
2588	for (part = src; part; part = part->more)	2361	for (part = src; part; part = part->more)
2589	{	2362	{
2590	tmp = get_object ();	2363	tmp = part->clone ();
2591	copy_object (part, tmp);
2592	tmp->x -= src->x;	2364	tmp->x -= src->x;
2593	tmp->y -= src->y;	2365	tmp->y -= src->y;
		2366
2594	if (!part->head)	2367	if (!part->head)
2595	{	2368	{
2596	dst = tmp;	2369	dst = tmp;
2597	tmp->head = NULL;	2370	tmp->head = 0;
2598	}	2371	}
2599	else	2372	else
2600	{
2601	tmp->head = dst;	2373	tmp->head = dst;
2602	}	2374
2603	tmp->more = NULL;	2375	tmp->more = 0;
		2376
2604	if (prev)	2377	if (prev)
2605	prev->more = tmp;	2378	prev->more = tmp;
		2379
2606	prev = tmp;	2380	prev = tmp;
2607	}	2381	}
2608		2382
2609	/*** copy inventory ***/
2610	for (item = src->inv; item; item = item->below)	2383	for (item = src->inv; item; item = item->below)
2611	{
2612	(void) insert_ob_in_ob (object_create_clone (item), dst);	2384	insert_ob_in_ob (object_create_clone (item), dst);
2613	}
2614		2385
2615	return dst;	2386	return dst;
2616	}	2387	}
2617		2388
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. */	2389	/* 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 */	2390	/* 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, */	2391	/* 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. */	2392	/* 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. */	2393	/* Remember not to use load_object_str in a time-critical situation. */
2636
2637	/* Also remember that multiparts objects are not supported for now. */	2394	/* Also remember that multiparts objects are not supported for now. */
2638
2639	object *	2395	object *
2640	load_object_str (const char *obstr)	2396	load_object_str (const char *obstr)
2641	{	2397	{
2642	object *	2398	object *op;
2643	op;
2644	char
2645	filename[MAX_BUF];	2399	char filename[MAX_BUF];
2646		2400
2647	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2401	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648		2402
2649	FILE *
2650	tempfile = fopen (filename, "w");	2403	FILE *tempfile = fopen (filename, "w");
2651		2404
2652	if (tempfile == NULL)	2405	if (tempfile == NULL)
2653	{	2406	{
2654	LOG (llevError, "Error - Unable to access load object temp file\n");	2407	LOG (llevError, "Error - Unable to access load object temp file\n");
2655	return NULL;	2408	return NULL;
2656	};	2409	}
		2410
2657	fprintf (tempfile, obstr);	2411	fprintf (tempfile, obstr);
2658	fclose (tempfile);	2412	fclose (tempfile);
2659		2413
2660	op = get_object ();	2414	op = object::create ();
2661		2415
2662	object_thawer thawer (filename);	2416	object_thawer thawer (filename);
2663		2417
2664	if (thawer)	2418	if (thawer)
2665	load_object (thawer, op, 0);	2419	load_object (thawer, op, 0);
…		…
2675	* returns NULL if no match.	2429	* returns NULL if no match.
2676	*/	2430	*/
2677	object *	2431	object *
2678	find_obj_by_type_subtype (const object *who, int type, int subtype)	2432	find_obj_by_type_subtype (const object *who, int type, int subtype)
2679	{	2433	{
2680	object *
2681	tmp;
2682
2683	for (tmp = who->inv; tmp; tmp = tmp->below)	2434	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2684	if (tmp->type == type && tmp->subtype == subtype)	2435	if (tmp->type == type && tmp->subtype == subtype)
2685	return tmp;	2436	return tmp;
2686		2437
2687	return NULL;	2438	return 0;
2688	}	2439	}
2689		2440
2690	/* If ob has a field named key, return the link from the list,	2441	/* If ob has a field named key, return the link from the list,
2691	* otherwise return NULL.	2442	* otherwise return NULL.
2692	*	2443	*
…		…
2694	* do the desired thing.	2445	* do the desired thing.
2695	*/	2446	*/
2696	key_value *	2447	key_value *
2697	get_ob_key_link (const object *ob, const char *key)	2448	get_ob_key_link (const object *ob, const char *key)
2698	{	2449	{
2699	key_value *
2700	link;
2701
2702	for (link = ob->key_values; link != NULL; link = link->next)	2450	for (key_value *link = ob->key_values; link; link = link->next)
2703	{
2704	if (link->key == key)	2451	if (link->key == key)
2705	{
2706	return link;	2452	return link;
2707	}
2708	}
2709		2453
2710	return NULL;	2454	return 0;
2711	}	2455	}
2712		2456
2713	/*	2457	/*
2714	* Returns the value of op has an extra_field for key, or NULL.	2458	* Returns the value of op has an extra_field for key, or NULL.
2715	*	2459	*
…		…
2718	* The returned string is shared.	2462	* The returned string is shared.
2719	*/	2463	*/
2720	const char *	2464	const char *
2721	get_ob_key_value (const object *op, const char *const key)	2465	get_ob_key_value (const object *op, const char *const key)
2722	{	2466	{
2723	key_value *	2467	key_value *link;
2724	link;	2468	shstr_cmp canonical_key (key);
2725	const char *
2726	canonical_key;
2727		2469
2728	canonical_key = shstr::find (key);
2729
2730	if (canonical_key == NULL)	2470	if (!canonical_key)
2731	{	2471	{
2732	/* 1. There being a field named key on any object	2472	/* 1. There being a field named key on any object
2733	* implies there'd be a shared string to find.	2473	* implies there'd be a shared string to find.
2734	* 2. Since there isn't, no object has this field.	2474	* 2. Since there isn't, no object has this field.
2735	* 3. Therefore, *this* object doesn't have this field.	2475	* 3. Therefore, *this* object doesn't have this field.
2736	*/	2476	*/
2737	return NULL;	2477	return 0;
2738	}	2478	}
2739		2479
2740	/* This is copied from get_ob_key_link() above -	2480	/* This is copied from get_ob_key_link() above -
2741	* only 4 lines, and saves the function call overhead.	2481	* only 4 lines, and saves the function call overhead.
2742	*/	2482	*/
2743	for (link = op->key_values; link != NULL; link = link->next)	2483	for (link = op->key_values; link; link = link->next)
2744	{
2745	if (link->key == canonical_key)	2484	if (link->key == canonical_key)
2746	{
2747	return link->value;	2485	return link->value;
2748	}	2486
2749	}
2750	return NULL;	2487	return 0;
2751	}	2488	}
2752		2489
2753		2490
2754	/*	2491	/*
2755	* Updates the canonical_key in op to value.	2492	* Updates the canonical_key in op to value.
…		…
2762	* Returns TRUE on success.	2499	* Returns TRUE on success.
2763	*/	2500	*/
2764	int	2501	int
2765	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2502	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2766	{	2503	{
2767	key_value *
2768	field = NULL, *last = NULL;	2504	key_value *field = NULL, *last = NULL;
2769		2505
2770	for (field = op->key_values; field != NULL; field = field->next)	2506	for (field = op->key_values; field != NULL; field = field->next)
2771	{	2507	{
2772	if (field->key != canonical_key)	2508	if (field->key != canonical_key)
2773	{	2509	{
…		…
2801	/* IF we get here, key doesn't exist */	2537	/* IF we get here, key doesn't exist */
2802		2538
2803	/* No field, we'll have to add it. */	2539	/* No field, we'll have to add it. */
2804		2540
2805	if (!add_key)	2541	if (!add_key)
2806	{
2807	return FALSE;	2542	return FALSE;
2808	}	2543
2809	/* There isn't any good reason to store a null	2544	/* There isn't any good reason to store a null
2810	* value in the key/value list. If the archetype has	2545	* value in the key/value list. If the archetype has
2811	* this key, then we should also have it, so shouldn't	2546	* this key, then we should also have it, so shouldn't
2812	* be here. If user wants to store empty strings,	2547	* be here. If user wants to store empty strings,
2813	* should pass in ""	2548	* should pass in ""
…		…
2840	{	2575	{
2841	shstr key_ (key);	2576	shstr key_ (key);
2842		2577
2843	return set_ob_key_value_s (op, key_, value, add_key);	2578	return set_ob_key_value_s (op, key_, value, add_key);
2844	}	2579	}
		2580
		2581	object::depth_iterator::depth_iterator (object *container)
		2582	: iterator_base (container)
		2583	{
		2584	while (item->inv)
		2585	item = item->inv;
		2586	}
		2587
		2588	void
		2589	object::depth_iterator::next ()
		2590	{
		2591	if (item->below)
		2592	{
		2593	item = item->below;
		2594
		2595	while (item->inv)
		2596	item = item->inv;
		2597	}
		2598	else
		2599	item = item->env;
		2600	}
		2601
		2602	// return a suitable string describing an objetc in enough detail to find it
		2603	const char *
		2604	object::debug_desc (char *info) const
		2605	{
		2606	char info2[256 * 3];
		2607	char *p = info;
		2608
		2609	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2610	count,
		2611	&name,
		2612	title ? " " : "",
		2613	title ? (const char *)title : "");
		2614
		2615	if (env)
		2616	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2617
		2618	if (map)
		2619	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2620
		2621	return info;
		2622	}
		2623
		2624	const char *
		2625	object::debug_desc () const
		2626	{
		2627	static char info[256 * 3];
		2628	return debug_desc (info);
		2629	}
		2630

Diff Legend

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