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

Diff Legend

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