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.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.82 by root, Mon Dec 25 11:25:49 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.27 2006/09/11 12:08:45 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	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
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	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>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
		36
43	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
44		40
45	object *objects; /* Pointer to the list of used objects */
46	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 */
47		42
48	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,
49	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
50	};	45	};
…		…
57	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
58	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,
59	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
60	};	55	};
61		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
62	/* 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. */
63	static int	135	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	137	{
66	key_value *wants_field;	138	key_value *wants_field;
…		…
113	*	185	*
114	* 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
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
117	*	189	*
118	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
119	*	191	*
120	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
121	* check weight	193	* check weight
122	*/	194	*/
123		195
124	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	197	{
126	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
127	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)
128	return 0;	204	return 0;
129		205
130	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
131	return 0;
132
133	/* 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
134	* 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
135	* used to store nrof).	209	* used to store nrof).
136	*/	210	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
147	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
148		222
149	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
150	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
151		225
152		226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
153	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
154	* being locked in inventory should prevent merging.
155	* 0x4 in flags3 is CLIENT_SENT
156	*/
157	if ((ob1->arch != ob2->arch) ||
158	(ob1->flags[0] != ob2->flags[0]) ||
159	(ob1->flags[1] != ob2->flags[1]) ||
160	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
161	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
162	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
163	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
164	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
165	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
166	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
167	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
168	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
169	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
170	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
171	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
172	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
173	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
174	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
175	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
176	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
177	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
178	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
179	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
180	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
181	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
182	(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)
183	return 0;	251	return 0;
184		252
185	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
186	* check all objects in the inventory.	254	* check all objects in the inventory.
187	*/	255	*/
…		…
190	/* 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 */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;	260	return 0;
193		261
194	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
196	return 0;	264	return 0;
197		265
198	/* 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
199	* if it is valid.	267	* if it is valid.
200	*/	268	*/
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	283	return 0;
216		284
217	switch (ob1->type)	285	switch (ob1->type)
218	{	286	{
219	case SCROLL:	287	case SCROLL:
220	if (ob1->level != ob2->level)	288	if (ob1->level != ob2->level)
221	return 0;	289	return 0;
222	break;	290	break;
223	}	291	}
224		292
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	293	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	294	{
227	/* At least one of these has key_values. */	295	/* At least one of these has key_values. */
…		…
249	/*	317	/*
250	* sum_weight() is a recursive function which calculates the weight	318	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	319	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	320	* containers are carrying, and sums it up.
253	*/	321	*/
254	signed long	322	long
255	sum_weight (object *op)	323	sum_weight (object *op)
256	{	324	{
257	signed long sum;	325	long sum;
258	object *inv;	326	object *inv;
259		327
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	329	{
262	if (inv->inv)	330	if (inv->inv)
263	sum_weight (inv);	331	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	333	}
		334
266	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
268	if (op->carrying != sum)	338	if (op->carrying != sum)
269	op->carrying = sum;	339	op->carrying = sum;
		340
270	return sum;	341	return sum;
271	}	342	}
272		343
273	/**	344	/**
274	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
281	op = op->env;	352	op = op->env;
282	return op;	353	return op;
283	}	354	}
284		355
285	/*	356	/*
286	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
287	* a better check. We basically keeping traversing up until we can't
288	* or find a player.
289	*/
290
291	object *
292	is_player_inv (object *op)
293	{
294	for (; op != NULL && op->type != PLAYER; op = op->env)
295	if (op->env == op)
296	op->env = NULL;
297	return op;
298	}
299
300	/*
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	358	* Some error messages.
303	* 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.
304	*/	360	*/
305		361
306	void	362	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	363	dump_object (object *op)
362	{	364	{
363	if (op == NULL)	365	if (!op)
364	{	366	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		367
372	void	368	object_freezer freezer;
373	dump_all_objects (void)	369	save_object (freezer, op, 3);
374	{	370	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	371	}
383		372
384	/*	373	/*
385	* 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
386	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
406	*/	395	*/
407		396
408	object *	397	object *
409	find_object (tag_t i)	398	find_object (tag_t i)
410	{	399	{
411	object *op;	400	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	401	if (op->count == i)
415	break;	402	return op;
		403
416	return op;	404	return 0;
417	}	405	}
418		406
419	/*	407	/*
420	* 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.
421	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
423	*/	411	*/
424		412
425	object *	413	object *
426	find_object_name (const char *str)	414	find_object_name (const char *str)
427	{	415	{
428	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
429	object *op;	417	object *op;
430		418
431	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	420	if (op->name == str_)
433	break;	421	break;
434		422
435	return op;	423	return op;
436	}	424	}
437		425
…		…
440	{	428	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	430	}
443		431
444	/*	432	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* 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
484	* skill and experience objects.	434	* skill and experience objects.
485	*/	435	*/
486	void	436	void
487	set_owner (object *op, object *owner)	437	object::set_owner (object *owner)
488	{	438	{
489	if (owner == NULL || op == NULL)	439	if (!owner)
490	return;	440	return;
491		441
492	/* next line added to allow objects which own objects */	442	/* next line added to allow objects which own objects */
493	/* 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
494	* with the fireball owning a poison cloud which then owned the	444	* with the fireball owning a poison cloud which then owned the
495	* 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
496	* freed and then another object replacing it. Since the ownercounts	446	* freed and then another object replacing it. Since the ownercounts
497	* 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.
498	*/	448	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	449	while (owner->owner)
500	owner = owner->owner;	450	owner = owner->owner;
501		451
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	452	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	453	}
542		454
543	/* Zero the key_values on op, decrementing the shared-string	455	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	456	* refcounts and freeing the links.
545	*/	457	*/
…		…
555	}	467	}
556		468
557	op->key_values = 0;	469	op->key_values = 0;
558	}	470	}
559		471
560	void object::clear ()
561	{
562	attachable_base::clear ();
563
564	free_key_values (this);
565
566	clear_owner (this);
567
568	name = 0;
569	name_pl = 0;
570	title = 0;
571	race = 0;
572	slaying = 0;
573	skill = 0;
574	msg = 0;
575	lore = 0;
576	custom_name = 0;
577	materialname = 0;
578
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));
580
581	SET_FLAG (this, FLAG_REMOVED);
582	}
583
584	void object::clone (object *destination)
585	{
586	*(object_copy *) destination = *this;
587	*(object_pod *) destination = *this;
588
589	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*	472	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}
624
625	/*
626	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
627	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
628	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
629	* 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,
630	* 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
631	* will point at garbage.	478	* will point at garbage.
632	*/	479	*/
633
634	void	480	void
635	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
636	{	482	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
639		485
640	op2->clone (op);	486	*(object_copy *)dst = *this;
641		487
642	if (is_freed)	488	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
644	if (is_removed)	491	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
646		493
647	if (op2->speed < 0)	494	if (speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
649		496
650	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
651	if (op2->key_values)	498	if (key_values)
652	{	499	{
653	key_value *tail = 0;	500	key_value *tail = 0;
654	key_value *i;	501	key_value *i;
655		502
656	op->key_values = 0;	503	dst->key_values = 0;
657		504
658	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
659	{	506	{
660	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
661		508
662	new_link->next = 0;	509	new_link->next = 0;
663	new_link->key = i->key;	510	new_link->key = i->key;
664	new_link->value = i->value;	511	new_link->value = i->value;
665		512
666	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
667	if (!op->key_values)	514	if (!dst->key_values)
668	{	515	{
669	op->key_values = new_link;	516	dst->key_values = new_link;
670	tail = new_link;	517	tail = new_link;
671	}	518	}
672	else	519	else
673	{	520	{
674	tail->next = new_link;	521	tail->next = new_link;
675	tail = new_link;	522	tail = new_link;
676	}	523	}
677	}	524	}
678	}	525	}
679		526
680	update_ob_speed (op);	527	update_ob_speed (dst);
		528	}
		529
		530	object *
		531	object::clone ()
		532	{
		533	object *neu = create ();
		534	copy_to (neu);
		535	return neu;
681	}	536	}
682		537
683	/*	538	/*
684	* 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
685	* 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
…		…
698	/*	553	/*
699	* 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
700	* 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.
701	* 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.
702	*/	557	*/
703
704	void	558	void
705	update_ob_speed (object *op)	559	update_ob_speed (object *op)
706	{	560	{
707	extern int arch_init;	561	extern int arch_init;
708		562
…		…
717	abort ();	571	abort ();
718	#else	572	#else
719	op->speed = 0;	573	op->speed = 0;
720	#endif	574	#endif
721	}	575	}
		576
722	if (arch_init)	577	if (arch_init)
723	{
724	return;	578	return;
725	}	579
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	580	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	581	{
728	/* If already on active list, don't do anything */	582	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	583	if (op->active_next || op->active_prev || op == active_objects)
730	return;	584	return;
731		585
732	/* process_events() expects us to insert the object at the beginning	586	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	587	* of the list. */
734	op->active_next = active_objects;	588	op->active_next = active_objects;
		589
735	if (op->active_next != NULL)	590	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	591	op->active_next->active_prev = op;
		592
737	active_objects = op;	593	active_objects = op;
738	}	594	}
739	else	595	else
740	{	596	{
741	/* If not on the active list, nothing needs to be done */	597	/* If not on the active list, nothing needs to be done */
…		…
743	return;	599	return;
744		600
745	if (op->active_prev == NULL)	601	if (op->active_prev == NULL)
746	{	602	{
747	active_objects = op->active_next;	603	active_objects = op->active_next;
		604
748	if (op->active_next != NULL)	605	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	606	op->active_next->active_prev = NULL;
750	}	607	}
751	else	608	else
752	{	609	{
753	op->active_prev->active_next = op->active_next;	610	op->active_prev->active_next = op->active_next;
		611
754	if (op->active_next)	612	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	613	op->active_next->active_prev = op->active_prev;
756	}	614	}
		615
757	op->active_next = NULL;	616	op->active_next = NULL;
758	op->active_prev = NULL;	617	op->active_prev = NULL;
759	}	618	}
760	}	619	}
761		620
…		…
789	op->active_next = NULL;	648	op->active_next = NULL;
790	op->active_prev = NULL;	649	op->active_prev = NULL;
791	}	650	}
792		651
793	/*	652	/*
794	* update_object() updates the array which represents the map.	653	* update_object() updates the the map.
795	* It takes into account invisible objects (and represent squares covered	654	* It takes into account invisible objects (and represent squares covered
796	* by invisible objects by whatever is below them (unless it's another	655	* by invisible objects by whatever is below them (unless it's another
797	* invisible object, etc...)	656	* invisible object, etc...)
798	* If the object being updated is beneath a player, the look-window	657	* If the object being updated is beneath a player, the look-window
799	* of that player is updated (this might be a suboptimal way of	658	* of that player is updated (this might be a suboptimal way of
800	* updating that window, though, since update_object() is called _often_)	659	* updating that window, though, since update_object() is called _often_)
801	*	660	*
802	* action is a hint of what the caller believes need to be done.	661	* action is a hint of what the caller believes need to be done.
803	* For example, if the only thing that has changed is the face (due to
804	* an animation), we don't need to call update_position until that actually
805	* comes into view of a player. OTOH, many other things, like addition/removal
806	* of walls or living creatures may need us to update the flags now.
807	* current action are:	662	* current action are:
808	* UP_OBJ_INSERT: op was inserted	663	* UP_OBJ_INSERT: op was inserted
809	* UP_OBJ_REMOVE: op was removed	664	* UP_OBJ_REMOVE: op was removed
810	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	665	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
811	* as that is easier than trying to look at what may have changed.	666	* as that is easier than trying to look at what may have changed.
812	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
813	*/	668	*/
814
815	void	669	void
816	update_object (object *op, int action)	670	update_object (object *op, int action)
817	{	671	{
818	int update_now = 0, flags;
819	MoveType move_on, move_off, move_block, move_slow;	672	MoveType move_on, move_off, move_block, move_slow;
820		673
821	if (op == NULL)	674	if (op == NULL)
822	{	675	{
823	/* this should never happen */	676	/* this should never happen */
824	LOG (llevDebug, "update_object() called for NULL object.\n");	677	LOG (llevDebug, "update_object() called for NULL object.\n");
825	return;	678	return;
826	}	679	}
827		680
828	if (op->env != NULL)	681	if (op->env)
829	{	682	{
830	/* Animation is currently handled by client, so nothing	683	/* Animation is currently handled by client, so nothing
831	* to do in this case.	684	* to do in this case.
832	*/	685	*/
833	return;	686	return;
…		…
847	abort ();	700	abort ();
848	#endif	701	#endif
849	return;	702	return;
850	}	703	}
851		704
852	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	705	mapspace &m = op->ms ();
853	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
854	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
855	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
856	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
857	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
858		706
		707	if (m.flags_ & P_NEED_UPDATE)
		708	/* nop */;
859	if (action == UP_OBJ_INSERT)	709	else if (action == UP_OBJ_INSERT)
860	{	710	{
		711	// this is likely overkill, TODO: revisit (schmorp)
861	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
862	update_now = 1;
863
864	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	713	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
865	update_now = 1;	714	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
866		715	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		716	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
867	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	717	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
868	update_now = 1;
869
870	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
871	update_now = 1;
872
873	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
874	update_now = 1;
875
876	if ((move_on | op->move_on) != move_on)	718	|| (m.move_on | op->move_on ) != m.move_on
877	update_now = 1;
878
879	if ((move_off | op->move_off) != move_off)	719	|| (m.move_off | op->move_off ) != m.move_off
880	update_now = 1;	720	|| (m.move_slow | op->move_slow) != m.move_slow
881
882	/* This isn't perfect, but I don't expect a lot of objects to	721	/* This isn't perfect, but I don't expect a lot of objects to
883	* to have move_allow right now.	722	* to have move_allow right now.
884	*/	723	*/
885	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	724	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
886	update_now = 1;	725	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
887		726	m.flags_ = P_NEED_UPDATE;
888	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;
890	}	727	}
891	/* if the object is being removed, we can't make intelligent	728	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	729	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	730	* that is being removed.
894	*/	731	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	732	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	update_now = 1;	733	m.flags_ = P_NEED_UPDATE;
897	else if (action == UP_OBJ_FACE)	734	else if (action == UP_OBJ_FACE)
898	/* Nothing to do for that case */;	735	/* Nothing to do for that case */ ;
899	else	736	else
900	LOG (llevError, "update_object called with invalid action: %d\n", action);	737	LOG (llevError, "update_object called with invalid action: %d\n", action);
901		738
902	if (update_now)
903	{
904	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
905	update_position (op->map, op->x, op->y);
906	}
907
908	if (op->more != NULL)	739	if (op->more)
909	update_object (op->more, action);	740	update_object (op->more, action);
910	}	741	}
911		742
912	static unordered_vector<object *> mortals;	743	object::vector object::objects; // not yet used
913	static std::vector<object *> freed;	744	object *object::first;
914
915	void object::free_mortals ()
916	{
917	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )
918	if (!(*i)->refcount)
919	{
920	freed.push_back (*i);
921	mortals.erase (i);
922	}
923	else
924	++i;
925	}
926		745
927	object::object ()	746	object::object ()
928	{	747	{
929	SET_FLAG (this, FLAG_REMOVED);	748	SET_FLAG (this, FLAG_REMOVED);
930		749
931	expmul = 1.0;	750	expmul = 1.0;
932	face = blank_face;	751	face = blank_face;
933	attacked_by_count = -1;
934	}	752	}
935		753
936	object::~object ()	754	object::~object ()
937	{	755	{
938	free_key_values (this);	756	free_key_values (this);
939	}	757	}
940		758
941	void object::link ()	759	void object::link ()
942	{	760	{
943	count = ++ob_count;	761	count = ++ob_count;
		762	uuid = gen_uuid ();
944		763
945	prev = 0;	764	prev = 0;
946	next = objects;	765	next = object::first;
947		766
948	if (objects)	767	if (object::first)
949	objects->prev = this;	768	object::first->prev = this;
950		769
951	objects = this;	770	object::first = this;
952	}	771	}
953		772
954	void object::unlink ()	773	void object::unlink ()
955	{	774	{
956	count = 0;	775	if (this == object::first)
		776	object::first = next;
957		777
958	/* Remove this object from the list of used objects */	778	/* Remove this object from the list of used objects */
959	if (prev)
960	{
961	prev->next = next;	779	if (prev) prev->next = next;
		780	if (next) next->prev = prev;
		781
962	prev = 0;	782	prev = 0;
963	}
964
965	if (next)
966	{
967	next->prev = prev;
968	next = 0;	783	next = 0;
969	}
970
971	if (this == objects)
972	objects = next;
973	}	784	}
974		785
975	object *object::create ()	786	object *object::create ()
976	{	787	{
977	object *op;
978
979	if (freed.empty ())
980	op = new object;	788	object *op = new object;
981	else
982	{
983	// highly annoying, but the only way to get it stable right now
984	op = freed.back (); freed.pop_back ();
985	op->~object ();
986	new ((void *)op) object;
987	}
988
989	op->link ();	789	op->link ();
990	return op;	790	return op;
991	}	791	}
992		792
993	/*	793	/*
…		…
995	* it from the list of used objects, and puts it on the list of	795	* it from the list of used objects, and puts it on the list of
996	* free objects. The IS_FREED() flag is set in the object.	796	* free objects. The IS_FREED() flag is set in the object.
997	* The object must have been removed by remove_ob() first for	797	* The object must have been removed by remove_ob() first for
998	* this function to succeed.	798	* this function to succeed.
999	*	799	*
1000	* If free_inventory is set, free inventory as well. Else drop items in	800	* If destroy_inventory is set, free inventory as well. Else drop items in
1001	* inventory to the ground.	801	* inventory to the ground.
1002	*/	802	*/
1003	void object::free (bool free_inventory)	803	void
		804	object::do_destroy ()
1004	{	805	{
1005	if (!QUERY_FLAG (this, FLAG_REMOVED))	806	attachable::do_destroy ();
1006	{
1007	LOG (llevDebug, "Free object called with non removed object\n");
1008	dump_object (this);
1009	#ifdef MANY_CORES
1010	abort ();
1011	#endif
1012	}
1013		807
1014	if (QUERY_FLAG (this, FLAG_FRIENDLY))	808	if (flag [FLAG_IS_LINKED])
1015	{	809	remove_button_link (this);
1016	LOG (llevMonster, "Warning: tried to free friendly object.\n");	810
		811	if (flag [FLAG_FRIENDLY])
1017	remove_friendly_object (this);	812	remove_friendly_object (this);
1018	}
1019		813
1020	if (QUERY_FLAG (this, FLAG_FREED))	814	if (!flag [FLAG_REMOVED])
1021	{	815	remove ();
1022	dump_object (this);	816
1023	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);	817	if (flag [FLAG_FREED])
1024	return;	818	return;
1025	}
1026		819
1027	if (more)	820	flag [FLAG_FREED] = 1;
		821
		822	// hack to ensure that freed objects still have a valid map
1028	{	823	{
1029	more->free (free_inventory);	824	static maptile *freed_map; // freed objects are moved here to avoid crashes
1030	more = 0;
1031	}
1032		825
1033	if (inv)	826	if (!freed_map)
1034	{
1035	/* Only if the space blocks everything do we not process -
1036	* if some form of movement is allowed, let objects
1037	* drop on that space.
1038	*/
1039	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1040	{	827	{
1041	object *	828	freed_map = new maptile;
1042	op = inv;
1043		829
1044	while (op)	830	freed_map->name = "/internal/freed_objects_map";
1045	{	831	freed_map->width = 3;
1046	object *	832	freed_map->height = 3;
1047	tmp = op->below;
1048		833
1049	remove_ob (op);	834	freed_map->allocate ();
1050	op->free (free_inventory);
1051	op = tmp;
1052	}
1053	}	835	}
1054	else
1055	{ /* Put objects in inventory onto this space */
1056	object *
1057	op = inv;
1058		836
1059	while (op)	837	map = freed_map;
1060	{	838	x = 1;
1061	object *	839	y = 1;
1062	tmp = op->below;
1063
1064	remove_ob (op);
1065
1066	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1067	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1068	free_object (op);
1069	else
1070	{
1071	op->x = x;
1072	op->y = y;
1073	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1074	}
1075
1076	op = tmp;
1077	}
1078	}
1079	}	840	}
1080		841
1081	clear_owner (this);	842	more = 0;
		843	head = 0;
		844	inv = 0;
		845
		846	// clear those pointers that likely might have circular references to us
		847	owner = 0;
		848	enemy = 0;
		849	attacked_by = 0;
		850
		851	// only relevant for players(?), but make sure of it anyways
		852	contr = 0;
1082		853
1083	/* Remove object from the active list */	854	/* Remove object from the active list */
1084	speed = 0;	855	speed = 0;
1085	update_ob_speed (this);	856	update_ob_speed (this);
1086		857
1087	unlink ();	858	unlink ();
		859	}
1088		860
1089	SET_FLAG (this, FLAG_FREED);	861	/*
		862	* Remove and free all objects in the inventory of the given object.
		863	* object.c ?
		864	*/
		865	void
		866	object::destroy_inv (bool drop_to_ground)
		867	{
		868	if (!inv)
		869	return;
1090		870
1091	mortals.push_back (this);	871	/* Only if the space blocks everything do we not process -
		872	* if some form of movement is allowed, let objects
		873	* drop on that space.
		874	*/
		875	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
		876	{
		877	while (inv)
		878	{
		879	inv->destroy_inv (drop_to_ground);
		880	inv->destroy ();
		881	}
		882	}
		883	else
		884	{ /* Put objects in inventory onto this space */
		885	while (inv)
		886	{
		887	object *op = inv;
		888
		889	if (op->flag [FLAG_STARTEQUIP]
		890	|| op->flag [FLAG_NO_DROP]
		891	|| op->type == RUNE
		892	|| op->type == TRAP
		893	|| op->flag [FLAG_IS_A_TEMPLATE])
		894	op->destroy ();
		895	else
		896	{
		897	op->remove ();
		898	op->x = x;
		899	op->y = y;
		900	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
		901	}
		902	}
		903	}
		904	}
		905
		906	void
		907	object::destroy (bool destroy_inventory)
		908	{
		909	if (destroyed ())
		910	return;
		911
		912	if (more)
		913	{
		914	//TODO: non-head objects must not have inventory
		915	more->destroy (destroy_inventory);
		916	more = 0;
		917	}
		918
		919	if (destroy_inventory)
		920	destroy_inv (true);
		921
		922	attachable::destroy ();
1092	}	923	}
1093		924
1094	/*	925	/*
1095	* sub_weight() recursively (outwards) subtracts a number from the	926	* sub_weight() recursively (outwards) subtracts a number from the
1096	* weight of an object (and what is carried by it's environment(s)).	927	* weight of an object (and what is carried by it's environment(s)).
1097	*/	928	*/
1098
1099	void	929	void
1100	sub_weight (object *op, signed long weight)	930	sub_weight (object *op, signed long weight)
1101	{	931	{
1102	while (op != NULL)	932	while (op != NULL)
1103	{	933	{
1104	if (op->type == CONTAINER)	934	if (op->type == CONTAINER)
1105	{
1106	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	935	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1107	}	936
1108	op->carrying -= weight;	937	op->carrying -= weight;
1109	op = op->env;	938	op = op->env;
1110	}	939	}
1111	}	940	}
1112		941
1113	/* remove_ob(op):	942	/* op->remove ():
1114	* This function removes the object op from the linked list of objects	943	* This function removes the object op from the linked list of objects
1115	* which it is currently tied to. When this function is done, the	944	* which it is currently tied to. When this function is done, the
1116	* object will have no environment. If the object previously had an	945	* object will have no environment. If the object previously had an
1117	* environment, the x and y coordinates will be updated to	946	* environment, the x and y coordinates will be updated to
1118	* the previous environment.	947	* the previous environment.
1119	* Beware: This function is called from the editor as well!	948	* Beware: This function is called from the editor as well!
1120	*/	949	*/
1121
1122	void	950	void
1123	remove_ob (object *op)	951	object::remove ()
1124	{	952	{
1125	object *tmp, *last = NULL;	953	object *tmp, *last = 0;
1126	object *otmp;	954	object *otmp;
1127		955
1128	tag_t tag;
1129	int check_walk_off;
1130	mapstruct *m;
1131
1132	sint16 x, y;
1133
1134	if (QUERY_FLAG (op, FLAG_REMOVED))	956	if (QUERY_FLAG (this, FLAG_REMOVED))
1135	{	957	return;
1136	dump_object (op);
1137	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1138		958
1139	/* Changed it to always dump core in this case. As has been learned
1140	* in the past, trying to recover from errors almost always
1141	* make things worse, and this is a real error here - something
1142	* that should not happen.
1143	* Yes, if this was a mission critical app, trying to do something
1144	* to recover may make sense, but that is because failure of the app
1145	* may have other disastrous problems. Cf runs out of a script
1146	* so is easily enough restarted without any real problems.
1147	* MSW 2001-07-01
1148	*/
1149	abort ();
1150	}
1151
1152	if (op->more != NULL)
1153	remove_ob (op->more);
1154
1155	SET_FLAG (op, FLAG_REMOVED);	959	SET_FLAG (this, FLAG_REMOVED);
		960	INVOKE_OBJECT (REMOVE, this);
		961
		962	if (more)
		963	more->remove ();
1156		964
1157	/*	965	/*
1158	* In this case, the object to be removed is in someones	966	* In this case, the object to be removed is in someones
1159	* inventory.	967	* inventory.
1160	*/	968	*/
1161	if (op->env != NULL)	969	if (env)
1162	{	970	{
1163	if (op->nrof)	971	if (nrof)
1164	sub_weight (op->env, op->weight * op->nrof);	972	sub_weight (env, weight * nrof);
1165	else	973	else
1166	sub_weight (op->env, op->weight + op->carrying);	974	sub_weight (env, weight + carrying);
1167		975
1168	/* NO_FIX_PLAYER is set when a great many changes are being	976	/* NO_FIX_PLAYER is set when a great many changes are being
1169	* made to players inventory. If set, avoiding the call	977	* made to players inventory. If set, avoiding the call
1170	* to save cpu time.	978	* to save cpu time.
1171	*/	979	*/
1172	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1173	fix_player (otmp);	981	otmp->update_stats ();
1174		982
1175	if (op->above != NULL)	983	if (above != NULL)
1176	op->above->below = op->below;	984	above->below = below;
1177	else	985	else
1178	op->env->inv = op->below;	986	env->inv = below;
1179		987
1180	if (op->below != NULL)	988	if (below != NULL)
1181	op->below->above = op->above;	989	below->above = above;
1182		990
1183	/* we set up values so that it could be inserted into	991	/* we set up values so that it could be inserted into
1184	* the map, but we don't actually do that - it is up	992	* the map, but we don't actually do that - it is up
1185	* to the caller to decide what we want to do.	993	* to the caller to decide what we want to do.
1186	*/	994	*/
1187	op->x = op->env->x, op->y = op->env->y;	995	x = env->x, y = env->y;
1188	op->map = op->env->map;	996	map = env->map;
1189	op->above = NULL, op->below = NULL;	997	above = 0, below = 0;
1190	op->env = NULL;	998	env = 0;
1191	return;
1192	}
1193
1194	/* If we get here, we are removing it from a map */
1195	if (op->map == NULL)
1196	return;
1197
1198	x = op->x;
1199	y = op->y;
1200	m = get_map_from_coord (op->map, &x, &y);
1201
1202	if (!m)
1203	{	999	}
1204	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1000	else if (map)
1205	op->map->path, op->x, op->y);	1001	{
1206	/* in old days, we used to set x and y to 0 and continue.	1002	/* Re did the following section of code - it looks like it had
1207	* it seems if we get into this case, something is probablye	1003	* lots of logic for things we no longer care about
1208	* screwed up and should be fixed.
1209	*/	1004	*/
1210	abort ();
1211	}
1212	if (op->map != m)
1213	{
1214	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1215	op->map->path, m->path, op->x, op->y, x, y);
1216	}
1217		1005
1218	/* Re did the following section of code - it looks like it had
1219	* lots of logic for things we no longer care about
1220	*/
1221
1222	/* link the object above us */	1006	/* link the object above us */
1223	if (op->above)	1007	if (above)
1224	op->above->below = op->below;	1008	above->below = below;
1225	else	1009	else
1226	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1010	map->at (x, y).top = below; /* we were top, set new top */
1227		1011
1228	/* Relink the object below us, if there is one */	1012	/* Relink the object below us, if there is one */
1229	if (op->below)	1013	if (below)
1230	op->below->above = op->above;	1014	below->above = above;
1231	else	1015	else
1232	{
1233	/* Nothing below, which means we need to relink map object for this space
1234	* use translated coordinates in case some oddness with map tiling is
1235	* evident
1236	*/
1237	if (GET_MAP_OB (m, x, y) != op)
1238	{	1016	{
1239	dump_object (op);	1017	/* Nothing below, which means we need to relink map object for this space
		1018	* use translated coordinates in case some oddness with map tiling is
		1019	* evident
		1020	*/
		1021	if (GET_MAP_OB (map, x, y) != this)
		1022	{
		1023	char *dump = dump_object (this);
		1024	LOG (llevError,
1240	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",	1025	"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);
1241	errmsg);	1026	free (dump);
1242	dump_object (GET_MAP_OB (m, x, y));	1027	dump = dump_object (GET_MAP_OB (map, x, y));
1243	LOG (llevError, "%s\n", errmsg);	1028	LOG (llevError, "%s\n", dump);
		1029	free (dump);
		1030	}
		1031
		1032	map->at (x, y).bottom = above; /* goes on above it. */
1244	}	1033	}
1245		1034
1246	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1035	above = 0;
1247	}	1036	below = 0;
1248		1037
1249	op->above = NULL;
1250	op->below = NULL;
1251
1252	if (op->map->in_memory == MAP_SAVING)	1038	if (map->in_memory == MAP_SAVING)
1253	return;	1039	return;
1254		1040
1255	tag = op->count;	1041	int check_walk_off = !flag [FLAG_NO_APPLY];
1256	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1257		1042
1258	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1259	{
1260	/* No point updating the players look faces if he is the object
1261	* being removed.
1262	*/
1263
1264	if (tmp->type == PLAYER && tmp != op)
1265	{	1044	{
1266	/* If a container that the player is currently using somehow gets	1045	/* No point updating the players look faces if he is the object
1267	* removed (most likely destroyed), update the player view	1046	* being removed.
1268	* appropriately.
1269	*/	1047	*/
1270	if (tmp->container == op)	1048
		1049	if (tmp->type == PLAYER && tmp != this)
1271	{	1050	{
1272	CLEAR_FLAG (op, FLAG_APPLIED);	1051	/* If a container that the player is currently using somehow gets
		1052	* removed (most likely destroyed), update the player view
		1053	* appropriately.
		1054	*/
		1055	if (tmp->container == this)
		1056	{
		1057	flag [FLAG_APPLIED] = 0;
1273	tmp->container = NULL;	1058	tmp->container = 0;
		1059	}
		1060
		1061	if (tmp->contr->ns)
		1062	tmp->contr->ns->floorbox_update ();
1274	}	1063	}
1275		1064
1276	tmp->contr->socket.update_look = 1;	1065	/* See if player moving off should effect something */
		1066	if (check_walk_off
		1067	&& ((move_type & tmp->move_off)
		1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1069	{
		1070	move_apply (tmp, this, 0);
		1071
		1072	if (destroyed ())
		1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
		1074	}
		1075
		1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
		1077
		1078	if (tmp->above == tmp)
		1079	tmp->above = 0;
		1080
		1081	last = tmp;
1277	}	1082	}
1278	/* See if player moving off should effect something */
1279	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1280	{
1281	move_apply (tmp, op, NULL);
1282		1083
1283	if (was_destroyed (op, tag))
1284	{
1285	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1286	}
1287	}
1288
1289	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1290
1291	if (tmp->above == tmp)
1292	tmp->above = NULL;
1293
1294	last = tmp;
1295	}
1296
1297	/* last == NULL of there are no objects on this space */	1084	/* last == NULL of there are no objects on this space */
1298	if (last == NULL)	1085	if (!last)
1299	{	1086	map->at (x, y).flags_ = P_NEED_UPDATE;
1300	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1301	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1302	* those out anyways, and if there are any flags set right now, they won't
1303	* be correct anyways.
1304	*/
1305	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1306	update_position (op->map, op->x, op->y);
1307	}
1308	else	1087	else
1309	update_object (last, UP_OBJ_REMOVE);	1088	update_object (last, UP_OBJ_REMOVE);
1310		1089
1311	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1090	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1312	update_all_los (op->map, op->x, op->y);	1091	update_all_los (map, x, y);
		1092	}
1313	}	1093	}
1314		1094
1315	/*	1095	/*
1316	* merge_ob(op,top):	1096	* merge_ob(op,top):
1317	*	1097	*
1318	* This function goes through all objects below and including top, and	1098	* This function goes through all objects below and including top, and
1319	* merges op to the first matching object.	1099	* merges op to the first matching object.
1320	* If top is NULL, it is calculated.	1100	* If top is NULL, it is calculated.
1321	* Returns pointer to object if it succeded in the merge, otherwise NULL	1101	* Returns pointer to object if it succeded in the merge, otherwise NULL
1322	*/	1102	*/
1323
1324	object *	1103	object *
1325	merge_ob (object *op, object *top)	1104	merge_ob (object *op, object *top)
1326	{	1105	{
1327	if (!op->nrof)	1106	if (!op->nrof)
1328	return 0;	1107	return 0;
1329	if (top == NULL)	1108
		1109	if (top)
1330	for (top = op; top != NULL && top->above != NULL; top = top->above);	1110	for (top = op; top && top->above; top = top->above)
		1111	;
		1112
1331	for (; top != NULL; top = top->below)	1113	for (; top; top = top->below)
1332	{	1114	{
1333	if (top == op)	1115	if (top == op)
1334	continue;	1116	continue;
1335	if (CAN_MERGE (op, top))	1117
		1118	if (object::can_merge (op, top))
1336	{	1119	{
1337	top->nrof += op->nrof;	1120	top->nrof += op->nrof;
1338		1121
1339	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1122	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1340	op->weight = 0; /* Don't want any adjustements now */	1123	op->weight = 0; /* Don't want any adjustements now */
1341	remove_ob (op);	1124	op->destroy ();
1342	free_object (op);
1343	return top;	1125	return top;
1344	}	1126	}
1345	}	1127	}
		1128
1346	return NULL;	1129	return 0;
1347	}	1130	}
1348		1131
1349	/*	1132	/*
1350	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1133	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1351	* job preparing multi-part monsters	1134	* job preparing multi-part monsters
1352	*/	1135	*/
1353	object *	1136	object *
1354	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1137	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1355	{	1138	{
1356	object *	1139	object *tmp;
1357	tmp;
1358		1140
1359	if (op->head)	1141	if (op->head)
1360	op = op->head;	1142	op = op->head;
		1143
1361	for (tmp = op; tmp; tmp = tmp->more)	1144	for (tmp = op; tmp; tmp = tmp->more)
1362	{	1145	{
1363	tmp->x = x + tmp->arch->clone.x;	1146	tmp->x = x + tmp->arch->clone.x;
1364	tmp->y = y + tmp->arch->clone.y;	1147	tmp->y = y + tmp->arch->clone.y;
1365	}	1148	}
		1149
1366	return insert_ob_in_map (op, m, originator, flag);	1150	return insert_ob_in_map (op, m, originator, flag);
1367	}	1151	}
1368		1152
1369	/*	1153	/*
1370	* insert_ob_in_map (op, map, originator, flag):	1154	* insert_ob_in_map (op, map, originator, flag):
…		…
1384	* Return value:	1168	* Return value:
1385	* new object if 'op' was merged with other object	1169	* new object if 'op' was merged with other object
1386	* NULL if 'op' was destroyed	1170	* NULL if 'op' was destroyed
1387	* just 'op' otherwise	1171	* just 'op' otherwise
1388	*/	1172	*/
1389
1390	object *	1173	object *
1391	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1174	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1392	{	1175	{
1393	object *tmp, *top, *floor = NULL;	1176	object *tmp, *top, *floor = NULL;
1394	sint16 x, y;	1177	sint16 x, y;
1395		1178
1396	if (QUERY_FLAG (op, FLAG_FREED))	1179	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1399	return NULL;	1182	return NULL;
1400	}	1183	}
1401		1184
1402	if (m == NULL)	1185	if (m == NULL)
1403	{	1186	{
1404	dump_object (op);	1187	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1188	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1189	free (dump);
1406	return op;	1190	return op;
1407	}	1191	}
1408		1192
1409	if (out_of_map (m, op->x, op->y))	1193	if (out_of_map (m, op->x, op->y))
1410	{	1194	{
1411	dump_object (op);	1195	char *dump = dump_object (op);
1412	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1196	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1413	#ifdef MANY_CORES	1197	#ifdef MANY_CORES
1414	/* Better to catch this here, as otherwise the next use of this object	1198	/* Better to catch this here, as otherwise the next use of this object
1415	* is likely to cause a crash. Better to find out where it is getting	1199	* is likely to cause a crash. Better to find out where it is getting
1416	* improperly inserted.	1200	* improperly inserted.
1417	*/	1201	*/
1418	abort ();	1202	abort ();
1419	#endif	1203	#endif
		1204	free (dump);
1420	return op;	1205	return op;
1421	}	1206	}
1422		1207
1423	if (!QUERY_FLAG (op, FLAG_REMOVED))	1208	if (!QUERY_FLAG (op, FLAG_REMOVED))
1424	{	1209	{
1425	dump_object (op);	1210	char *dump = dump_object (op);
1426	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1211	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1212	free (dump);
1427	return op;	1213	return op;
1428	}	1214	}
1429		1215
1430	if (op->more != NULL)	1216	if (op->more)
1431	{	1217	{
1432	/* The part may be on a different map. */	1218	/* The part may be on a different map. */
1433		1219
1434	object *more = op->more;	1220	object *more = op->more;
1435		1221
…		…
1451	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1237	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1452	{	1238	{
1453	if (!op->head)	1239	if (!op->head)
1454	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1240	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1455		1241
1456	return NULL;	1242	return 0;
1457	}	1243	}
1458	}	1244	}
1459		1245
1460	CLEAR_FLAG (op, FLAG_REMOVED);	1246	CLEAR_FLAG (op, FLAG_REMOVED);
1461		1247
…		…
1469		1255
1470	/* this has to be done after we translate the coordinates.	1256	/* this has to be done after we translate the coordinates.
1471	*/	1257	*/
1472	if (op->nrof && !(flag & INS_NO_MERGE))	1258	if (op->nrof && !(flag & INS_NO_MERGE))
1473	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1474	if (CAN_MERGE (op, tmp))	1260	if (object::can_merge (op, tmp))
1475	{	1261	{
1476	op->nrof += tmp->nrof;	1262	op->nrof += tmp->nrof;
1477	remove_ob (tmp);	1263	tmp->destroy ();
1478	free_object (tmp);
1479	}	1264	}
1480		1265
1481	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1266	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1482	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1267	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1483		1268
…		…
1496	op->below = originator->below;	1281	op->below = originator->below;
1497		1282
1498	if (op->below)	1283	if (op->below)
1499	op->below->above = op;	1284	op->below->above = op;
1500	else	1285	else
1501	SET_MAP_OB (op->map, op->x, op->y, op);	1286	op->ms ().bottom = op;
1502		1287
1503	/* since *below* originator, no need to update top */	1288	/* since *below* originator, no need to update top */
1504	originator->below = op;	1289	originator->below = op;
1505	}	1290	}
1506	else	1291	else
…		…
1552	* If INS_ON_TOP is used, don't do this processing	1337	* If INS_ON_TOP is used, don't do this processing
1553	* Need to find the object that in fact blocks view, otherwise	1338	* Need to find the object that in fact blocks view, otherwise
1554	* stacking is a bit odd.	1339	* stacking is a bit odd.
1555	*/	1340	*/
1556	if (!(flag & INS_ON_TOP) &&	1341	if (!(flag & INS_ON_TOP) &&
1557	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1342	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1558	{	1343	{
1559	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1560	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1561	break;	1346	break;
1562	/* Check to see if we found the object that blocks view,	1347	/* Check to see if we found the object that blocks view,
…		…
1585		1370
1586	if (op->above)	1371	if (op->above)
1587	op->above->below = op;	1372	op->above->below = op;
1588		1373
1589	op->below = NULL;	1374	op->below = NULL;
1590	SET_MAP_OB (op->map, op->x, op->y, op);	1375	op->ms ().bottom = op;
1591	}	1376	}
1592	else	1377	else
1593	{ /* get inserted into the stack above top */	1378	{ /* get inserted into the stack above top */
1594	op->above = top->above;	1379	op->above = top->above;
1595		1380
…		…
1599	op->below = top;	1384	op->below = top;
1600	top->above = op;	1385	top->above = op;
1601	}	1386	}
1602		1387
1603	if (op->above == NULL)	1388	if (op->above == NULL)
1604	SET_MAP_TOP (op->map, op->x, op->y, op);	1389	op->ms ().top = op;
1605	} /* else not INS_BELOW_ORIGINATOR */	1390	} /* else not INS_BELOW_ORIGINATOR */
1606		1391
1607	if (op->type == PLAYER)	1392	if (op->type == PLAYER)
1608	op->contr->do_los = 1;	1393	op->contr->do_los = 1;
1609		1394
1610	/* If we have a floor, we know the player, if any, will be above	1395	/* If we have a floor, we know the player, if any, will be above
1611	* it, so save a few ticks and start from there.	1396	* it, so save a few ticks and start from there.
1612	*/	1397	*/
1613	if (!(flag & INS_MAP_LOAD))	1398	if (!(flag & INS_MAP_LOAD))
1614	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1399	if (object *pl = op->ms ().player ())
1615	if (tmp->type == PLAYER)	1400	if (pl->contr->ns)
1616	tmp->contr->socket.update_look = 1;	1401	pl->contr->ns->floorbox_update ();
1617		1402
1618	/* If this object glows, it may affect lighting conditions that are	1403	/* If this object glows, it may affect lighting conditions that are
1619	* visible to others on this map. But update_all_los is really	1404	* visible to others on this map. But update_all_los is really
1620	* an inefficient way to do this, as it means los for all players	1405	* an inefficient way to do this, as it means los for all players
1621	* on the map will get recalculated. The players could very well	1406	* on the map will get recalculated. The players could very well
…		…
1628	update_all_los (op->map, op->x, op->y);	1413	update_all_los (op->map, op->x, op->y);
1629		1414
1630	/* updates flags (blocked, alive, no magic, etc) for this map space */	1415	/* updates flags (blocked, alive, no magic, etc) for this map space */
1631	update_object (op, UP_OBJ_INSERT);	1416	update_object (op, UP_OBJ_INSERT);
1632		1417
		1418	INVOKE_OBJECT (INSERT, op);
		1419
1633	/* Don't know if moving this to the end will break anything. However,	1420	/* Don't know if moving this to the end will break anything. However,
1634	* we want to have update_look set above before calling this.	1421	* we want to have floorbox_update called before calling this.
1635	*	1422	*
1636	* check_move_on() must be after this because code called from	1423	* check_move_on() must be after this because code called from
1637	* check_move_on() depends on correct map flags (so functions like	1424	* check_move_on() depends on correct map flags (so functions like
1638	* blocked() and wall() work properly), and these flags are updated by	1425	* blocked() and wall() work properly), and these flags are updated by
1639	* update_object().	1426	* update_object().
…		…
1641		1428
1642	/* if this is not the head or flag has been passed, don't check walk on status */	1429	/* if this is not the head or flag has been passed, don't check walk on status */
1643	if (!(flag & INS_NO_WALK_ON) && !op->head)	1430	if (!(flag & INS_NO_WALK_ON) && !op->head)
1644	{	1431	{
1645	if (check_move_on (op, originator))	1432	if (check_move_on (op, originator))
1646	return NULL;	1433	return 0;
1647		1434
1648	/* If we are a multi part object, lets work our way through the check	1435	/* If we are a multi part object, lets work our way through the check
1649	* walk on's.	1436	* walk on's.
1650	*/	1437	*/
1651	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1438	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1652	if (check_move_on (tmp, originator))	1439	if (check_move_on (tmp, originator))
1653	return NULL;	1440	return 0;
1654	}	1441	}
1655		1442
1656	return op;	1443	return op;
1657	}	1444	}
1658		1445
1659	/* this function inserts an object in the map, but if it	1446	/* this function inserts an object in the map, but if it
1660	* finds an object of its own type, it'll remove that one first.	1447	* finds an object of its own type, it'll remove that one first.
1661	* op is the object to insert it under: supplies x and the map.	1448	* op is the object to insert it under: supplies x and the map.
1662	*/	1449	*/
1663	void	1450	void
1664	replace_insert_ob_in_map (const char *arch_string, object *op)	1451	replace_insert_ob_in_map (const char *arch_string, object *op)
1665	{	1452	{
1666	object *tmp;
1667	object *tmp1;	1453	object *tmp, *tmp1;
1668		1454
1669	/* first search for itself and remove any old instances */	1455	/* first search for itself and remove any old instances */
1670		1456
1671	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1457	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1672	{
1673	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1674	{	1459	tmp->destroy ();
1675	remove_ob (tmp);
1676	free_object (tmp);
1677	}
1678	}
1679		1460
1680	tmp1 = arch_to_object (find_archetype (arch_string));	1461	tmp1 = arch_to_object (archetype::find (arch_string));
1681		1462
1682	tmp1->x = op->x;	1463	tmp1->x = op->x;
1683	tmp1->y = op->y;	1464	tmp1->y = op->y;
1684	insert_ob_in_map (tmp1, op->map, op, 0);	1465	insert_ob_in_map (tmp1, op->map, op, 0);
1685	}	1466	}
…		…
1693	*/	1474	*/
1694		1475
1695	object *	1476	object *
1696	get_split_ob (object *orig_ob, uint32 nr)	1477	get_split_ob (object *orig_ob, uint32 nr)
1697	{	1478	{
1698	object *	1479	object *newob;
1699	newob;
1700	int
1701	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1702		1481
1703	if (orig_ob->nrof < nr)	1482	if (orig_ob->nrof < nr)
1704	{	1483	{
1705	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1484	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1706	return NULL;	1485	return NULL;
1707	}	1486	}
		1487
1708	newob = object_create_clone (orig_ob);	1488	newob = object_create_clone (orig_ob);
		1489
1709	if ((orig_ob->nrof -= nr) < 1)	1490	if ((orig_ob->nrof -= nr) < 1)
1710	{	1491	orig_ob->destroy (1);
1711	if (!is_removed)
1712	remove_ob (orig_ob);
1713	free_object2 (orig_ob, 1);
1714	}
1715	else if (!is_removed)	1492	else if (!is_removed)
1716	{	1493	{
1717	if (orig_ob->env != NULL)	1494	if (orig_ob->env != NULL)
1718	sub_weight (orig_ob->env, orig_ob->weight * nr);	1495	sub_weight (orig_ob->env, orig_ob->weight * nr);
1719	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1496	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1721	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1498	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1722	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1499	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1723	return NULL;	1500	return NULL;
1724	}	1501	}
1725	}	1502	}
		1503
1726	newob->nrof = nr;	1504	newob->nrof = nr;
1727		1505
1728	return newob;	1506	return newob;
1729	}	1507	}
1730		1508
…		…
1737	*/	1515	*/
1738		1516
1739	object *	1517	object *
1740	decrease_ob_nr (object *op, uint32 i)	1518	decrease_ob_nr (object *op, uint32 i)
1741	{	1519	{
1742	object *	1520	object *tmp;
1743	tmp;
1744	player *
1745	pl;
1746		1521
1747	if (i == 0) /* objects with op->nrof require this check */	1522	if (i == 0) /* objects with op->nrof require this check */
1748	return op;	1523	return op;
1749		1524
1750	if (i > op->nrof)	1525	if (i > op->nrof)
1751	i = op->nrof;	1526	i = op->nrof;
1752		1527
1753	if (QUERY_FLAG (op, FLAG_REMOVED))	1528	if (QUERY_FLAG (op, FLAG_REMOVED))
1754	{
1755	op->nrof -= i;	1529	op->nrof -= i;
1756	}
1757	else if (op->env != NULL)	1530	else if (op->env)
1758	{	1531	{
1759	/* is this object in the players inventory, or sub container	1532	/* is this object in the players inventory, or sub container
1760	* therein?	1533	* therein?
1761	*/	1534	*/
1762	tmp = is_player_inv (op->env);	1535	tmp = op->in_player ();
1763	/* nope. Is this a container the player has opened?	1536	/* nope. Is this a container the player has opened?
1764	* If so, set tmp to that player.	1537	* If so, set tmp to that player.
1765	* IMO, searching through all the players will mostly	1538	* IMO, searching through all the players will mostly
1766	* likely be quicker than following op->env to the map,	1539	* likely be quicker than following op->env to the map,
1767	* and then searching the map for a player.	1540	* and then searching the map for a player.
1768	*/	1541	*/
1769	if (!tmp)	1542	if (!tmp)
1770	{	1543	for_all_players (pl)
1771	for (pl = first_player; pl; pl = pl->next)
1772	if (pl->ob->container == op->env)	1544	if (pl->ob->container == op->env)
		1545	{
		1546	tmp = pl->ob;
1773	break;	1547	break;
1774	if (pl)
1775	tmp = pl->ob;
1776	else
1777	tmp = NULL;
1778	}	1548	}
1779		1549
1780	if (i < op->nrof)	1550	if (i < op->nrof)
1781	{	1551	{
1782	sub_weight (op->env, op->weight * i);	1552	sub_weight (op->env, op->weight * i);
1783	op->nrof -= i;	1553	op->nrof -= i;
1784	if (tmp)	1554	if (tmp)
1785	{
1786	esrv_send_item (tmp, op);	1555	esrv_send_item (tmp, op);
1787	}
1788	}	1556	}
1789	else	1557	else
1790	{	1558	{
1791	remove_ob (op);	1559	op->remove ();
1792	op->nrof = 0;	1560	op->nrof = 0;
1793	if (tmp)	1561	if (tmp)
1794	{
1795	esrv_del_item (tmp->contr, op->count);	1562	esrv_del_item (tmp->contr, op->count);
1796	}
1797	}	1563	}
1798	}	1564	}
1799	else	1565	else
1800	{	1566	{
1801	object *
1802	above = op->above;	1567	object *above = op->above;
1803		1568
1804	if (i < op->nrof)	1569	if (i < op->nrof)
1805	{
1806	op->nrof -= i;	1570	op->nrof -= i;
1807	}
1808	else	1571	else
1809	{	1572	{
1810	remove_ob (op);	1573	op->remove ();
1811	op->nrof = 0;	1574	op->nrof = 0;
1812	}	1575	}
		1576
1813	/* Since we just removed op, op->above is null */	1577	/* Since we just removed op, op->above is null */
1814	for (tmp = above; tmp != NULL; tmp = tmp->above)	1578	for (tmp = above; tmp; tmp = tmp->above)
1815	if (tmp->type == PLAYER)	1579	if (tmp->type == PLAYER)
1816	{	1580	{
1817	if (op->nrof)	1581	if (op->nrof)
1818	esrv_send_item (tmp, op);	1582	esrv_send_item (tmp, op);
1819	else	1583	else
1820	esrv_del_item (tmp->contr, op->count);	1584	esrv_del_item (tmp->contr, op->count);
1821	}	1585	}
1822	}	1586	}
1823		1587
1824	if (op->nrof)	1588	if (op->nrof)
1825	{
1826	return op;	1589	return op;
1827	}
1828	else	1590	else
1829	{	1591	{
1830	free_object (op);	1592	op->destroy ();
1831	return NULL;	1593	return 0;
1832	}	1594	}
1833	}	1595	}
1834		1596
1835	/*	1597	/*
1836	* add_weight(object, weight) adds the specified weight to an object,	1598	* add_weight(object, weight) adds the specified weight to an object,
…		…
1841	add_weight (object *op, signed long weight)	1603	add_weight (object *op, signed long weight)
1842	{	1604	{
1843	while (op != NULL)	1605	while (op != NULL)
1844	{	1606	{
1845	if (op->type == CONTAINER)	1607	if (op->type == CONTAINER)
1846	{
1847	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1608	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1848	}	1609
1849	op->carrying += weight;	1610	op->carrying += weight;
1850	op = op->env;	1611	op = op->env;
1851	}	1612	}
1852	}	1613	}
1853		1614
		1615	object *
		1616	insert_ob_in_ob (object *op, object *where)
		1617	{
		1618	if (!where)
		1619	{
		1620	char *dump = dump_object (op);
		1621	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1622	free (dump);
		1623	return op;
		1624	}
		1625
		1626	if (where->head)
		1627	{
		1628	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1629	where = where->head;
		1630	}
		1631
		1632	return where->insert (op);
		1633	}
		1634
1854	/*	1635	/*
1855	* insert_ob_in_ob(op,environment):	1636	* env->insert (op)
1856	* This function inserts the object op in the linked list	1637	* This function inserts the object op in the linked list
1857	* inside the object environment.	1638	* inside the object environment.
1858	*	1639	*
1859	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1860	* the inventory at the last position or next to other objects of the same
1861	* type.
1862	* Frank: Now sorted by type, archetype and magic!
1863	*
1864	* The function returns now pointer to inserted item, and return value can	1640	* The function returns now pointer to inserted item, and return value can
1865	* be != op, if items are merged. -Tero	1641	* be != op, if items are merged. -Tero
1866	*/	1642	*/
1867		1643
1868	object *	1644	object *
1869	insert_ob_in_ob (object *op, object *where)	1645	object::insert (object *op)
1870	{	1646	{
1871	object *	1647	object *tmp, *otmp;
1872	tmp, *
1873	otmp;
1874		1648
1875	if (!QUERY_FLAG (op, FLAG_REMOVED))	1649	if (!QUERY_FLAG (op, FLAG_REMOVED))
1876	{	1650	op->remove ();
1877	dump_object (op);	1651
1878	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1879	return op;
1880	}
1881	if (where == NULL)
1882	{
1883	dump_object (op);
1884	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1885	return op;
1886	}
1887	if (where->head)
1888	{
1889	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1890	where = where->head;
1891	}
1892	if (op->more)	1652	if (op->more)
1893	{	1653	{
1894	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1654	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1895	return op;	1655	return op;
1896	}	1656	}
		1657
1897	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1658	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1898	CLEAR_FLAG (op, FLAG_REMOVED);	1659	CLEAR_FLAG (op, FLAG_REMOVED);
1899	if (op->nrof)	1660	if (op->nrof)
1900	{	1661	{
1901	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1662	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1902	if (CAN_MERGE (tmp, op))	1663	if (object::can_merge (tmp, op))
1903	{	1664	{
1904	/* return the original object and remove inserted object	1665	/* return the original object and remove inserted object
1905	(client needs the original object) */	1666	(client needs the original object) */
1906	tmp->nrof += op->nrof;	1667	tmp->nrof += op->nrof;
1907	/* Weight handling gets pretty funky. Since we are adding to	1668	/* Weight handling gets pretty funky. Since we are adding to
1908	* tmp->nrof, we need to increase the weight.	1669	* tmp->nrof, we need to increase the weight.
1909	*/	1670	*/
1910	add_weight (where, op->weight * op->nrof);	1671	add_weight (this, op->weight * op->nrof);
1911	SET_FLAG (op, FLAG_REMOVED);	1672	SET_FLAG (op, FLAG_REMOVED);
1912	free_object (op); /* free the inserted object */	1673	op->destroy (); /* free the inserted object */
1913	op = tmp;	1674	op = tmp;
1914	remove_ob (op); /* and fix old object's links */	1675	op->remove (); /* and fix old object's links */
1915	CLEAR_FLAG (op, FLAG_REMOVED);	1676	CLEAR_FLAG (op, FLAG_REMOVED);
1916	break;	1677	break;
1917	}	1678	}
1918		1679
1919	/* I assume combined objects have no inventory	1680	/* I assume combined objects have no inventory
1920	* We add the weight - this object could have just been removed	1681	* We add the weight - this object could have just been removed
1921	* (if it was possible to merge). calling remove_ob will subtract	1682	* (if it was possible to merge). calling remove_ob will subtract
1922	* the weight, so we need to add it in again, since we actually do	1683	* the weight, so we need to add it in again, since we actually do
1923	* the linking below	1684	* the linking below
1924	*/	1685	*/
1925	add_weight (where, op->weight * op->nrof);	1686	add_weight (this, op->weight * op->nrof);
1926	}	1687	}
1927	else	1688	else
1928	add_weight (where, (op->weight + op->carrying));	1689	add_weight (this, (op->weight + op->carrying));
1929		1690
1930	otmp = is_player_inv (where);	1691	otmp = this->in_player ();
1931	if (otmp && otmp->contr != NULL)	1692	if (otmp && otmp->contr)
1932	{
1933	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1693	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1934	fix_player (otmp);	1694	otmp->update_stats ();
1935	}
1936		1695
1937	op->map = NULL;	1696	op->map = 0;
1938	op->env = where;	1697	op->env = this;
1939	op->above = NULL;	1698	op->above = 0;
1940	op->below = NULL;	1699	op->below = 0;
1941	op->x = 0, op->y = 0;	1700	op->x = 0, op->y = 0;
1942		1701
1943	/* reset the light list and los of the players on the map */	1702	/* reset the light list and los of the players on the map */
1944	if ((op->glow_radius != 0) && where->map)	1703	if ((op->glow_radius != 0) && map)
1945	{	1704	{
1946	#ifdef DEBUG_LIGHTS	1705	#ifdef DEBUG_LIGHTS
1947	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1948	#endif /* DEBUG_LIGHTS */	1707	#endif /* DEBUG_LIGHTS */
1949	if (MAP_DARKNESS (where->map))	1708	if (MAP_DARKNESS (map))
1950	update_all_los (where->map, where->x, where->y);	1709	update_all_los (map, x, y);
1951	}	1710	}
1952		1711
1953	/* Client has no idea of ordering so lets not bother ordering it here.	1712	/* Client has no idea of ordering so lets not bother ordering it here.
1954	* It sure simplifies this function...	1713	* It sure simplifies this function...
1955	*/	1714	*/
1956	if (where->inv == NULL)	1715	if (!inv)
1957	where->inv = op;	1716	inv = op;
1958	else	1717	else
1959	{	1718	{
1960	op->below = where->inv;	1719	op->below = inv;
1961	op->below->above = op;	1720	op->below->above = op;
1962	where->inv = op;	1721	inv = op;
1963	}	1722	}
		1723
		1724	INVOKE_OBJECT (INSERT, this);
		1725
1964	return op;	1726	return op;
1965	}	1727	}
1966		1728
1967	/*	1729	/*
1968	* Checks if any objects has a move_type that matches objects	1730	* Checks if any objects has a move_type that matches objects
…		…
1987		1749
1988	int	1750	int
1989	check_move_on (object *op, object *originator)	1751	check_move_on (object *op, object *originator)
1990	{	1752	{
1991	object *tmp;	1753	object *tmp;
1992	tag_t tag;
1993	mapstruct *m = op->map;	1754	maptile *m = op->map;
1994	int x = op->x, y = op->y;	1755	int x = op->x, y = op->y;
1995		1756
1996	MoveType move_on, move_slow, move_block;	1757	MoveType move_on, move_slow, move_block;
1997		1758
1998	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1759	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1999	return 0;	1760	return 0;
2000
2001	tag = op->count;
2002		1761
2003	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1762	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2004	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1763	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2005	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1764	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2006		1765
…		…
2049	{	1808	{
2050	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1809	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2051	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1810	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2052	{	1811	{
2053		1812
		1813	float
2054	float diff = tmp->move_slow_penalty * FABS (op->speed);	1814	diff = tmp->move_slow_penalty * FABS (op->speed);
2055		1815
2056	if (op->type == PLAYER)	1816	if (op->type == PLAYER)
2057	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1817	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2058	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1818	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2059	diff /= 4.0;	1819	diff /= 4.0;
…		…
2066	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1826	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2067	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1827	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2068	{	1828	{
2069	move_apply (tmp, op, originator);	1829	move_apply (tmp, op, originator);
2070		1830
2071	if (was_destroyed (op, tag))	1831	if (op->destroyed ())
2072	return 1;	1832	return 1;
2073		1833
2074	/* what the person/creature stepped onto has moved the object	1834	/* what the person/creature stepped onto has moved the object
2075	* someplace new. Don't process any further - if we did,	1835	* someplace new. Don't process any further - if we did,
2076	* have a feeling strange problems would result.	1836	* have a feeling strange problems would result.
…		…
2088	* a matching archetype at the given map and coordinates.	1848	* a matching archetype at the given map and coordinates.
2089	* The first matching object is returned, or NULL if none.	1849	* The first matching object is returned, or NULL if none.
2090	*/	1850	*/
2091		1851
2092	object *	1852	object *
2093	present_arch (const archetype *at, mapstruct *m, int x, int y)	1853	present_arch (const archetype *at, maptile *m, int x, int y)
2094	{	1854	{
2095	object *	1855	object *
2096	tmp;	1856	tmp;
2097		1857
2098	if (m == NULL || out_of_map (m, x, y))	1858	if (m == NULL || out_of_map (m, x, y))
…		…
2111	* a matching type variable at the given map and coordinates.	1871	* a matching type variable at the given map and coordinates.
2112	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
2113	*/	1873	*/
2114		1874
2115	object *	1875	object *
2116	present (unsigned char type, mapstruct *m, int x, int y)	1876	present (unsigned char type, maptile *m, int x, int y)
2117	{	1877	{
2118	object *	1878	object *
2119	tmp;	1879	tmp;
2120		1880
2121	if (out_of_map (m, x, y))	1881	if (out_of_map (m, x, y))
…		…
2159	* str is the string to match against. Note that we match against	1919	* str is the string to match against. Note that we match against
2160	* the object name, not the archetype name. this is so that the	1920	* the object name, not the archetype name. this is so that the
2161	* spell code can use one object type (force), but change it's name	1921	* spell code can use one object type (force), but change it's name
2162	* to be unique.	1922	* to be unique.
2163	*/	1923	*/
2164
2165	object *	1924	object *
2166	present_in_ob_by_name (int type, const char *str, const object *op)	1925	present_in_ob_by_name (int type, const char *str, const object *op)
2167	{	1926	{
2168	object *	1927	object *tmp;
2169	tmp;
2170		1928
2171	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1929	for (tmp = op->inv; tmp; tmp = tmp->below)
2172	{
2173	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1930	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2174	return tmp;	1931	return tmp;
2175	}	1932
2176	return NULL;	1933	return 0;
2177	}	1934	}
2178		1935
2179	/*	1936	/*
2180	* present_arch_in_ob(archetype, object) searches for any objects with	1937	* present_arch_in_ob(archetype, object) searches for any objects with
2181	* a matching archetype in the inventory of the given object.	1938	* a matching archetype in the inventory of the given object.
2182	* The first matching object is returned, or NULL if none.	1939	* The first matching object is returned, or NULL if none.
2183	*/	1940	*/
2184
2185	object *	1941	object *
2186	present_arch_in_ob (const archetype *at, const object *op)	1942	present_arch_in_ob (const archetype *at, const object *op)
2187	{	1943	{
2188	object *
2189	tmp;
2190
2191	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2192	if (tmp->arch == at)	1945	if (tmp->arch == at)
2193	return tmp;	1946	return tmp;
		1947
2194	return NULL;	1948	return NULL;
2195	}	1949	}
2196		1950
2197	/*	1951	/*
2198	* activate recursively a flag on an object inventory	1952	* activate recursively a flag on an object inventory
2199	*/	1953	*/
2200	void	1954	void
2201	flag_inv (object *op, int flag)	1955	flag_inv (object *op, int flag)
2202	{	1956	{
2203	object *
2204	tmp;
2205
2206	if (op->inv)	1957	if (op->inv)
2207	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2208	{	1959	{
2209	SET_FLAG (tmp, flag);	1960	SET_FLAG (tmp, flag);
2210	flag_inv (tmp, flag);	1961	flag_inv (tmp, flag);
2211	}	1962	}
2212	} /*	1963	}
		1964
		1965	/*
2213	* desactivate recursively a flag on an object inventory	1966	* deactivate recursively a flag on an object inventory
2214	*/	1967	*/
2215	void	1968	void
2216	unflag_inv (object *op, int flag)	1969	unflag_inv (object *op, int flag)
2217	{	1970	{
2218	object *
2219	tmp;
2220
2221	if (op->inv)	1971	if (op->inv)
2222	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2223	{	1973	{
2224	CLEAR_FLAG (tmp, flag);	1974	CLEAR_FLAG (tmp, flag);
2225	unflag_inv (tmp, flag);	1975	unflag_inv (tmp, flag);
2226	}	1976	}
2227	}	1977	}
…		…
2230	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1980	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2231	* all it's inventory (recursively).	1981	* all it's inventory (recursively).
2232	* If checksums are used, a player will get set_cheat called for	1982	* If checksums are used, a player will get set_cheat called for
2233	* him/her-self and all object carried by a call to this function.	1983	* him/her-self and all object carried by a call to this function.
2234	*/	1984	*/
2235
2236	void	1985	void
2237	set_cheat (object *op)	1986	set_cheat (object *op)
2238	{	1987	{
2239	SET_FLAG (op, FLAG_WAS_WIZ);	1988	SET_FLAG (op, FLAG_WAS_WIZ);
2240	flag_inv (op, FLAG_WAS_WIZ);	1989	flag_inv (op, FLAG_WAS_WIZ);
…		…
2259	* because arch_blocked (now ob_blocked) needs to know the movement type	2008	* because arch_blocked (now ob_blocked) needs to know the movement type
2260	* to know if the space in question will block the object. We can't use	2009	* to know if the space in question will block the object. We can't use
2261	* the archetype because that isn't correct if the monster has been	2010	* the archetype because that isn't correct if the monster has been
2262	* customized, changed states, etc.	2011	* customized, changed states, etc.
2263	*/	2012	*/
2264
2265	int	2013	int
2266	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2014	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2267	{	2015	{
2268	int
2269	i,
2270	index = 0, flag;	2016	int index = 0, flag;
2271	static int
2272	altern[SIZEOFFREE];	2017	int altern[SIZEOFFREE];
2273		2018
2274	for (i = start; i < stop; i++)	2019	for (int i = start; i < stop; i++)
2275	{	2020	{
2276	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2021	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2277	if (!flag)	2022	if (!flag)
2278	altern[index++] = i;	2023	altern [index++] = i;
2279		2024
2280	/* Basically, if we find a wall on a space, we cut down the search size.	2025	/* Basically, if we find a wall on a space, we cut down the search size.
2281	* In this way, we won't return spaces that are on another side of a wall.	2026	* In this way, we won't return spaces that are on another side of a wall.
2282	* This mostly work, but it cuts down the search size in all directions -	2027	* This mostly work, but it cuts down the search size in all directions -
2283	* if the space being examined only has a wall to the north and empty	2028	* if the space being examined only has a wall to the north and empty
2284	* spaces in all the other directions, this will reduce the search space	2029	* spaces in all the other directions, this will reduce the search space
2285	* to only the spaces immediately surrounding the target area, and	2030	* to only the spaces immediately surrounding the target area, and
2286	* won't look 2 spaces south of the target space.	2031	* won't look 2 spaces south of the target space.
2287	*/	2032	*/
2288	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2033	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2289	stop = maxfree[i];	2034	stop = maxfree[i];
2290	}	2035	}
		2036
2291	if (!index)	2037	if (!index)
2292	return -1;	2038	return -1;
		2039
2293	return altern[RANDOM () % index];	2040	return altern[RANDOM () % index];
2294	}	2041	}
2295		2042
2296	/*	2043	/*
2297	* find_first_free_spot(archetype, mapstruct, x, y) works like	2044	* find_first_free_spot(archetype, maptile, x, y) works like
2298	* find_free_spot(), but it will search max number of squares.	2045	* find_free_spot(), but it will search max number of squares.
2299	* But it will return the first available spot, not a random choice.	2046	* But it will return the first available spot, not a random choice.
2300	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2047	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2301	*/	2048	*/
2302
2303	int	2049	int
2304	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2050	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2305	{	2051	{
2306	int
2307	i;
2308
2309	for (i = 0; i < SIZEOFFREE; i++)	2052	for (int i = 0; i < SIZEOFFREE; i++)
2310	{
2311	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2053	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2312	return i;	2054	return i;
2313	}	2055
2314	return -1;	2056	return -1;
2315	}	2057	}
2316		2058
2317	/*	2059	/*
2318	* The function permute(arr, begin, end) randomly reorders the array	2060	* The function permute(arr, begin, end) randomly reorders the array
2319	* arr[begin..end-1].	2061	* arr[begin..end-1].
		2062	* now uses a fisher-yates shuffle, old permute was broken
2320	*/	2063	*/
2321	static void	2064	static void
2322	permute (int *arr, int begin, int end)	2065	permute (int *arr, int begin, int end)
2323	{	2066	{
2324	int	2067	arr += begin;
2325	i,
2326	j,
2327	tmp,
2328	len;
2329
2330	len = end - begin;	2068	end -= begin;
2331	for (i = begin; i < end; i++)
2332	{
2333	j = begin + RANDOM () % len;
2334		2069
2335	tmp = arr[i];	2070	while (--end)
2336	arr[i] = arr[j];	2071	swap (arr [end], arr [RANDOM () % (end + 1)]);
2337	arr[j] = tmp;
2338	}
2339	}	2072	}
2340		2073
2341	/* new function to make monster searching more efficient, and effective!	2074	/* new function to make monster searching more efficient, and effective!
2342	* This basically returns a randomized array (in the passed pointer) of	2075	* This basically returns a randomized array (in the passed pointer) of
2343	* the spaces to find monsters. In this way, it won't always look for	2076	* the spaces to find monsters. In this way, it won't always look for
…		…
2346	* the 3x3 area will be searched, just not in a predictable order.	2079	* the 3x3 area will be searched, just not in a predictable order.
2347	*/	2080	*/
2348	void	2081	void
2349	get_search_arr (int *search_arr)	2082	get_search_arr (int *search_arr)
2350	{	2083	{
2351	int	2084	int i;
2352	i;
2353		2085
2354	for (i = 0; i < SIZEOFFREE; i++)	2086	for (i = 0; i < SIZEOFFREE; i++)
2355	{
2356	search_arr[i] = i;	2087	search_arr[i] = i;
2357	}
2358		2088
2359	permute (search_arr, 1, SIZEOFFREE1 + 1);	2089	permute (search_arr, 1, SIZEOFFREE1 + 1);
2360	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2090	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2361	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2091	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2362	}	2092	}
…		…
2371	* Perhaps incorrectly, but I'm making the assumption that exclude	2101	* Perhaps incorrectly, but I'm making the assumption that exclude
2372	* is actually want is going to try and move there. We need this info	2102	* is actually want is going to try and move there. We need this info
2373	* because we have to know what movement the thing looking to move	2103	* because we have to know what movement the thing looking to move
2374	* there is capable of.	2104	* there is capable of.
2375	*/	2105	*/
2376
2377	int	2106	int
2378	find_dir (mapstruct *m, int x, int y, object *exclude)	2107	find_dir (maptile *m, int x, int y, object *exclude)
2379	{	2108	{
2380	int
2381	i,
2382	max = SIZEOFFREE, mflags;	2109	int i, max = SIZEOFFREE, mflags;
2383	sint16	2110
2384	nx,	2111	sint16 nx, ny;
2385	ny;
2386	object *	2112	object *tmp;
2387	tmp;	2113	maptile *mp;
2388	mapstruct *	2114
2389	mp;	2115	MoveType blocked, move_type;
2390	MoveType
2391	blocked,
2392	move_type;
2393		2116
2394	if (exclude && exclude->head)	2117	if (exclude && exclude->head)
2395	{	2118	{
2396	exclude = exclude->head;	2119	exclude = exclude->head;
2397	move_type = exclude->move_type;	2120	move_type = exclude->move_type;
…		…
2407	mp = m;	2130	mp = m;
2408	nx = x + freearr_x[i];	2131	nx = x + freearr_x[i];
2409	ny = y + freearr_y[i];	2132	ny = y + freearr_y[i];
2410		2133
2411	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2134	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2135
2412	if (mflags & P_OUT_OF_MAP)	2136	if (mflags & P_OUT_OF_MAP)
2413	{
2414	max = maxfree[i];	2137	max = maxfree[i];
2415	}
2416	else	2138	else
2417	{	2139	{
2418	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2140	mapspace &ms = mp->at (nx, ny);
		2141
		2142	blocked = ms.move_block;
2419		2143
2420	if ((move_type & blocked) == move_type)	2144	if ((move_type & blocked) == move_type)
2421	{
2422	max = maxfree[i];	2145	max = maxfree[i];
2423	}
2424	else if (mflags & P_IS_ALIVE)	2146	else if (mflags & P_IS_ALIVE)
2425	{	2147	{
2426	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2148	for (tmp = ms.bottom; tmp; tmp = tmp->above)
2427	{	2149	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2428	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2150	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2429	{
2430	break;	2151	break;
2431	}	2152
2432	}
2433	if (tmp)	2153	if (tmp)
2434	{
2435	return freedir[i];	2154	return freedir[i];
2436	}
2437	}	2155	}
2438	}	2156	}
2439	}	2157	}
		2158
2440	return 0;	2159	return 0;
2441	}	2160	}
2442		2161
2443	/*	2162	/*
2444	* distance(object 1, object 2) will return the square of the	2163	* distance(object 1, object 2) will return the square of the
2445	* distance between the two given objects.	2164	* distance between the two given objects.
2446	*/	2165	*/
2447
2448	int	2166	int
2449	distance (const object *ob1, const object *ob2)	2167	distance (const object *ob1, const object *ob2)
2450	{	2168	{
2451	int
2452	i;
2453
2454	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2169	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2455	return i;
2456	}	2170	}
2457		2171
2458	/*	2172	/*
2459	* find_dir_2(delta-x,delta-y) will return a direction in which	2173	* find_dir_2(delta-x,delta-y) will return a direction in which
2460	* an object which has subtracted the x and y coordinates of another	2174	* an object which has subtracted the x and y coordinates of another
2461	* object, needs to travel toward it.	2175	* object, needs to travel toward it.
2462	*/	2176	*/
2463
2464	int	2177	int
2465	find_dir_2 (int x, int y)	2178	find_dir_2 (int x, int y)
2466	{	2179	{
2467	int	2180	int q;
2468	q;
2469		2181
2470	if (y)	2182	if (y)
2471	q = x * 100 / y;	2183	q = x * 100 / y;
2472	else if (x)	2184	else if (x)
2473	q = -300 * x;	2185	q = -300 * x;
…		…
2508	int	2220	int
2509	absdir (int d)	2221	absdir (int d)
2510	{	2222	{
2511	while (d < 1)	2223	while (d < 1)
2512	d += 8;	2224	d += 8;
		2225
2513	while (d > 8)	2226	while (d > 8)
2514	d -= 8;	2227	d -= 8;
		2228
2515	return d;	2229	return d;
2516	}	2230	}
2517		2231
2518	/*	2232	/*
2519	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2233	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2521	*/	2235	*/
2522		2236
2523	int	2237	int
2524	dirdiff (int dir1, int dir2)	2238	dirdiff (int dir1, int dir2)
2525	{	2239	{
2526	int	2240	int d;
2527	d;
2528		2241
2529	d = abs (dir1 - dir2);	2242	d = abs (dir1 - dir2);
2530	if (d > 4)	2243	if (d > 4)
2531	d = 8 - d;	2244	d = 8 - d;
		2245
2532	return d;	2246	return d;
2533	}	2247	}
2534		2248
2535	/* peterm:	2249	/* peterm:
2536	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2250	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2539	* This basically means that if direction is 15, then it could either go	2253	* This basically means that if direction is 15, then it could either go
2540	* direction 4, 14, or 16 to get back to where we are.	2254	* direction 4, 14, or 16 to get back to where we are.
2541	* Moved from spell_util.c to object.c with the other related direction	2255	* Moved from spell_util.c to object.c with the other related direction
2542	* functions.	2256	* functions.
2543	*/	2257	*/
2544
2545	int
2546	reduction_dir[SIZEOFFREE][3] = {	2258	int reduction_dir[SIZEOFFREE][3] = {
2547	{0, 0, 0}, /* 0 */	2259	{0, 0, 0}, /* 0 */
2548	{0, 0, 0}, /* 1 */	2260	{0, 0, 0}, /* 1 */
2549	{0, 0, 0}, /* 2 */	2261	{0, 0, 0}, /* 2 */
2550	{0, 0, 0}, /* 3 */	2262	{0, 0, 0}, /* 3 */
2551	{0, 0, 0}, /* 4 */	2263	{0, 0, 0}, /* 4 */
…		…
2599	* find a path to that monster that we found. If not,	2311	* find a path to that monster that we found. If not,
2600	* we don't bother going toward it. Returns 1 if we	2312	* we don't bother going toward it. Returns 1 if we
2601	* can see a direct way to get it	2313	* can see a direct way to get it
2602	* Modified to be map tile aware -.MSW	2314	* Modified to be map tile aware -.MSW
2603	*/	2315	*/
2604
2605
2606	int	2316	int
2607	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2317	can_see_monsterP (maptile *m, int x, int y, int dir)
2608	{	2318	{
2609	sint16	2319	sint16 dx, dy;
2610	dx,
2611	dy;
2612	int
2613	mflags;	2320	int mflags;
2614		2321
2615	if (dir < 0)	2322	if (dir < 0)
2616	return 0; /* exit condition: invalid direction */	2323	return 0; /* exit condition: invalid direction */
2617		2324
2618	dx = x + freearr_x[dir];	2325	dx = x + freearr_x[dir];
…		…
2631	return 0;	2338	return 0;
2632		2339
2633	/* yes, can see. */	2340	/* yes, can see. */
2634	if (dir < 9)	2341	if (dir < 9)
2635	return 1;	2342	return 1;
		2343
2636	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2344	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2637	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2345	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2346	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2638	}	2347	}
2639
2640
2641		2348
2642	/*	2349	/*
2643	* can_pick(picker, item): finds out if an object is possible to be	2350	* can_pick(picker, item): finds out if an object is possible to be
2644	* picked up by the picker. Returnes 1 if it can be	2351	* picked up by the picker. Returnes 1 if it can be
2645	* picked up, otherwise 0.	2352	* picked up, otherwise 0.
…		…
2656	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2363	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2657	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2364	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2658	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2365	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2659	}	2366	}
2660		2367
2661
2662	/*	2368	/*
2663	* create clone from object to another	2369	* create clone from object to another
2664	*/	2370	*/
2665	object *	2371	object *
2666	object_create_clone (object *asrc)	2372	object_create_clone (object *asrc)
2667	{	2373	{
2668	object *
2669	dst = NULL, *tmp, *src, *part, *prev, *item;	2374	object *dst = 0, *tmp, *src, *part, *prev, *item;
2670		2375
2671	if (!asrc)	2376	if (!asrc)
2672	return NULL;	2377	return 0;
		2378
2673	src = asrc;	2379	src = asrc;
2674	if (src->head)	2380	if (src->head)
2675	src = src->head;	2381	src = src->head;
2676		2382
2677	prev = NULL;	2383	prev = 0;
2678	for (part = src; part; part = part->more)	2384	for (part = src; part; part = part->more)
2679	{	2385	{
2680	tmp = get_object ();	2386	tmp = part->clone ();
2681	copy_object (part, tmp);
2682	tmp->x -= src->x;	2387	tmp->x -= src->x;
2683	tmp->y -= src->y;	2388	tmp->y -= src->y;
		2389
2684	if (!part->head)	2390	if (!part->head)
2685	{	2391	{
2686	dst = tmp;	2392	dst = tmp;
2687	tmp->head = NULL;	2393	tmp->head = 0;
2688	}	2394	}
2689	else	2395	else
2690	{
2691	tmp->head = dst;	2396	tmp->head = dst;
2692	}	2397
2693	tmp->more = NULL;	2398	tmp->more = 0;
		2399
2694	if (prev)	2400	if (prev)
2695	prev->more = tmp;	2401	prev->more = tmp;
		2402
2696	prev = tmp;	2403	prev = tmp;
2697	}	2404	}
2698		2405
2699	/*** copy inventory ***/
2700	for (item = src->inv; item; item = item->below)	2406	for (item = src->inv; item; item = item->below)
2701	{
2702	(void) insert_ob_in_ob (object_create_clone (item), dst);	2407	insert_ob_in_ob (object_create_clone (item), dst);
2703	}
2704		2408
2705	return dst;	2409	return dst;
2706	}	2410	}
2707		2411
2708	/* return true if the object was destroyed, 0 otherwise */
2709	int
2710	was_destroyed (const object *op, tag_t old_tag)
2711	{
2712	/* checking for FLAG_FREED isn't necessary, but makes this function more
2713	* robust */
2714	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2715	}
2716
2717	/* GROS - Creates an object using a string representing its content. */	2412	/* GROS - Creates an object using a string representing its content. */
2718
2719	/* Basically, we save the content of the string to a temp file, then call */	2413	/* Basically, we save the content of the string to a temp file, then call */
2720
2721	/* load_object on it. I admit it is a highly inefficient way to make things, */	2414	/* load_object on it. I admit it is a highly inefficient way to make things, */
2722
2723	/* but it was simple to make and allows reusing the load_object function. */	2415	/* but it was simple to make and allows reusing the load_object function. */
2724
2725	/* Remember not to use load_object_str in a time-critical situation. */	2416	/* Remember not to use load_object_str in a time-critical situation. */
2726
2727	/* Also remember that multiparts objects are not supported for now. */	2417	/* Also remember that multiparts objects are not supported for now. */
2728
2729	object *	2418	object *
2730	load_object_str (const char *obstr)	2419	load_object_str (const char *obstr)
2731	{	2420	{
2732	object *	2421	object *op;
2733	op;
2734	char
2735	filename[MAX_BUF];	2422	char filename[MAX_BUF];
2736		2423
2737	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2424	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2738		2425
2739	FILE *
2740	tempfile = fopen (filename, "w");	2426	FILE *tempfile = fopen (filename, "w");
2741		2427
2742	if (tempfile == NULL)	2428	if (tempfile == NULL)
2743	{	2429	{
2744	LOG (llevError, "Error - Unable to access load object temp file\n");	2430	LOG (llevError, "Error - Unable to access load object temp file\n");
2745	return NULL;	2431	return NULL;
2746	};	2432	}
		2433
2747	fprintf (tempfile, obstr);	2434	fprintf (tempfile, obstr);
2748	fclose (tempfile);	2435	fclose (tempfile);
2749		2436
2750	op = get_object ();	2437	op = object::create ();
2751		2438
2752	object_thawer	2439	object_thawer thawer (filename);
2753	thawer (filename);
2754		2440
2755	if (thawer)	2441	if (thawer)
2756	load_object (thawer, op, 0);	2442	load_object (thawer, op, 0);
2757		2443
2758	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2444	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2766	* returns NULL if no match.	2452	* returns NULL if no match.
2767	*/	2453	*/
2768	object *	2454	object *
2769	find_obj_by_type_subtype (const object *who, int type, int subtype)	2455	find_obj_by_type_subtype (const object *who, int type, int subtype)
2770	{	2456	{
2771	object *
2772	tmp;
2773
2774	for (tmp = who->inv; tmp; tmp = tmp->below)	2457	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2775	if (tmp->type == type && tmp->subtype == subtype)	2458	if (tmp->type == type && tmp->subtype == subtype)
2776	return tmp;	2459	return tmp;
2777		2460
2778	return NULL;	2461	return 0;
2779	}	2462	}
2780		2463
2781	/* If ob has a field named key, return the link from the list,	2464	/* If ob has a field named key, return the link from the list,
2782	* otherwise return NULL.	2465	* otherwise return NULL.
2783	*	2466	*
…		…
2785	* do the desired thing.	2468	* do the desired thing.
2786	*/	2469	*/
2787	key_value *	2470	key_value *
2788	get_ob_key_link (const object *ob, const char *key)	2471	get_ob_key_link (const object *ob, const char *key)
2789	{	2472	{
2790	key_value *
2791	link;
2792
2793	for (link = ob->key_values; link != NULL; link = link->next)	2473	for (key_value *link = ob->key_values; link; link = link->next)
2794	{
2795	if (link->key == key)	2474	if (link->key == key)
2796	{
2797	return link;	2475	return link;
2798	}
2799	}
2800		2476
2801	return NULL;	2477	return 0;
2802	}	2478	}
2803		2479
2804	/*	2480	/*
2805	* Returns the value of op has an extra_field for key, or NULL.	2481	* Returns the value of op has an extra_field for key, or NULL.
2806	*	2482	*
…		…
2809	* The returned string is shared.	2485	* The returned string is shared.
2810	*/	2486	*/
2811	const char *	2487	const char *
2812	get_ob_key_value (const object *op, const char *const key)	2488	get_ob_key_value (const object *op, const char *const key)
2813	{	2489	{
2814	key_value *	2490	key_value *link;
2815	link;	2491	shstr_cmp canonical_key (key);
2816	const char *
2817	canonical_key;
2818		2492
2819	canonical_key = shstr::find (key);
2820
2821	if (canonical_key == NULL)	2493	if (!canonical_key)
2822	{	2494	{
2823	/* 1. There being a field named key on any object	2495	/* 1. There being a field named key on any object
2824	* implies there'd be a shared string to find.	2496	* implies there'd be a shared string to find.
2825	* 2. Since there isn't, no object has this field.	2497	* 2. Since there isn't, no object has this field.
2826	* 3. Therefore, *this* object doesn't have this field.	2498	* 3. Therefore, *this* object doesn't have this field.
2827	*/	2499	*/
2828	return NULL;	2500	return 0;
2829	}	2501	}
2830		2502
2831	/* This is copied from get_ob_key_link() above -	2503	/* This is copied from get_ob_key_link() above -
2832	* only 4 lines, and saves the function call overhead.	2504	* only 4 lines, and saves the function call overhead.
2833	*/	2505	*/
2834	for (link = op->key_values; link != NULL; link = link->next)	2506	for (link = op->key_values; link; link = link->next)
2835	{
2836	if (link->key == canonical_key)	2507	if (link->key == canonical_key)
2837	{
2838	return link->value;	2508	return link->value;
2839	}	2509
2840	}
2841	return NULL;	2510	return 0;
2842	}	2511	}
2843		2512
2844		2513
2845	/*	2514	/*
2846	* Updates the canonical_key in op to value.	2515	* Updates the canonical_key in op to value.
…		…
2853	* Returns TRUE on success.	2522	* Returns TRUE on success.
2854	*/	2523	*/
2855	int	2524	int
2856	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2525	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2857	{	2526	{
2858	key_value *
2859	field = NULL, *last = NULL;	2527	key_value *field = NULL, *last = NULL;
2860		2528
2861	for (field = op->key_values; field != NULL; field = field->next)	2529	for (field = op->key_values; field != NULL; field = field->next)
2862	{	2530	{
2863	if (field->key != canonical_key)	2531	if (field->key != canonical_key)
2864	{	2532	{
…		…
2882	if (last)	2550	if (last)
2883	last->next = field->next;	2551	last->next = field->next;
2884	else	2552	else
2885	op->key_values = field->next;	2553	op->key_values = field->next;
2886		2554
2887	delete
2888	field;	2555	delete field;
2889	}	2556	}
2890	}	2557	}
2891	return TRUE;	2558	return TRUE;
2892	}	2559	}
2893	/* IF we get here, key doesn't exist */	2560	/* IF we get here, key doesn't exist */
2894		2561
2895	/* No field, we'll have to add it. */	2562	/* No field, we'll have to add it. */
2896		2563
2897	if (!add_key)	2564	if (!add_key)
2898	{
2899	return FALSE;	2565	return FALSE;
2900	}	2566
2901	/* There isn't any good reason to store a null	2567	/* There isn't any good reason to store a null
2902	* value in the key/value list. If the archetype has	2568	* value in the key/value list. If the archetype has
2903	* this key, then we should also have it, so shouldn't	2569	* this key, then we should also have it, so shouldn't
2904	* be here. If user wants to store empty strings,	2570	* be here. If user wants to store empty strings,
2905	* should pass in ""	2571	* should pass in ""
…		…
2928	* Returns TRUE on success.	2594	* Returns TRUE on success.
2929	*/	2595	*/
2930	int	2596	int
2931	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2597	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2932	{	2598	{
2933	shstr
2934	key_ (key);	2599	shstr key_ (key);
2935		2600
2936	return set_ob_key_value_s (op, key_, value, add_key);	2601	return set_ob_key_value_s (op, key_, value, add_key);
2937	}	2602	}
		2603
		2604	object::depth_iterator::depth_iterator (object *container)
		2605	: iterator_base (container)
		2606	{
		2607	while (item->inv)
		2608	item = item->inv;
		2609	}
		2610
		2611	void
		2612	object::depth_iterator::next ()
		2613	{
		2614	if (item->below)
		2615	{
		2616	item = item->below;
		2617
		2618	while (item->inv)
		2619	item = item->inv;
		2620	}
		2621	else
		2622	item = item->env;
		2623	}
		2624
		2625	// return a suitable string describing an objetc in enough detail to find it
		2626	const char *
		2627	object::debug_desc (char *info) const
		2628	{
		2629	char info2[256 * 3];
		2630	char *p = info;
		2631
		2632	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2633	count,
		2634	&name,
		2635	title ? " " : "",
		2636	title ? (const char *)title : "");
		2637
		2638	if (env)
		2639	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2640
		2641	if (map)
		2642	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2643
		2644	return info;
		2645	}
		2646
		2647	const char *
		2648	object::debug_desc () const
		2649	{
		2650	static char info[256 * 3];
		2651	return debug_desc (info);
		2652	}
		2653

Diff Legend

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