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.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.26 2006/09/11 11:46:52 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->flags ^ ob2->flags).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	*/
…		…
561	{	473	{
562	attachable_base::clear ();	474	attachable_base::clear ();
563		475
564	free_key_values (this);	476	free_key_values (this);
565		477
566	clear_owner (this);	478	owner = 0;
567
568	name = 0;	479	name = 0;
569	name_pl = 0;	480	name_pl = 0;
570	title = 0;	481	title = 0;
571	race = 0;	482	race = 0;
572	slaying = 0;	483	slaying = 0;
573	skill = 0;	484	skill = 0;
574	msg = 0;	485	msg = 0;
575	lore = 0;	486	lore = 0;
576	custom_name = 0;	487	custom_name = 0;
577	materialname = 0;	488	materialname = 0;
		489	contr = 0;
		490	below = 0;
		491	above = 0;
		492	inv = 0;
		493	container = 0;
		494	env = 0;
		495	more = 0;
		496	head = 0;
		497	map = 0;
		498	active_next = 0;
		499	active_prev = 0;
578		500
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		502
581	SET_FLAG (this, FLAG_REMOVED);	503	SET_FLAG (this, FLAG_REMOVED);
582	}
583		504
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	/*
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 */	505	/* What is not cleared is next, prev, and count */
616		506
617	op->expmul = 1.0;	507	expmul = 1.0;
618	op->face = blank_face;	508	face = blank_face;
619	op->attacked_by_count = -1;
620		509
621	if (settings.casting_time)	510	if (settings.casting_time)
622	op->casting_time = -1;	511	casting_time = -1;
623	}	512	}
624		513
625	/*	514	/*
626	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
627	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
628	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	519	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	520	* will point at garbage.
632	*/	521	*/
633
634	void	522	void
635	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
636	{	524	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
639		527
640	op2->clone (op);	528	*(object_copy *)dst = *this;
		529	*(object_pod *)dst = *this;
		530
		531	if (self || cb)
		532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
641		533
642	if (is_freed)	534	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
644	if (is_removed)	537	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
646		539
647	if (op2->speed < 0)	540	if (speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
649		542
650	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
651	if (op2->key_values)	544	if (key_values)
652	{	545	{
653	key_value *tail = 0;	546	key_value *tail = 0;
654	key_value *i;	547	key_value *i;
655		548
656	op->key_values = 0;	549	dst->key_values = 0;
657		550
658	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
659	{	552	{
660	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
661		554
662	new_link->next = 0;	555	new_link->next = 0;
663	new_link->key = i->key;	556	new_link->key = i->key;
664	new_link->value = i->value;	557	new_link->value = i->value;
665		558
666	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
667	if (!op->key_values)	560	if (!dst->key_values)
668	{	561	{
669	op->key_values = new_link;	562	dst->key_values = new_link;
670	tail = new_link;	563	tail = new_link;
671	}	564	}
672	else	565	else
673	{	566	{
674	tail->next = new_link;	567	tail->next = new_link;
675	tail = new_link;	568	tail = new_link;
676	}	569	}
677	}	570	}
678	}	571	}
679		572
680	update_ob_speed (op);	573	update_ob_speed (dst);
		574	}
		575
		576	object *
		577	object::clone ()
		578	{
		579	object *neu = create ();
		580	copy_to (neu);
		581	return neu;
681	}	582	}
682		583
683	/*	584	/*
684	* If an object with the IS_TURNABLE() flag needs to be turned due	585	* If an object with the IS_TURNABLE() flag needs to be turned due
685	* to the closest player being on the other side, this function can	586	* to the closest player being on the other side, this function can
…		…
698	/*	599	/*
699	* Updates the speed of an object. If the speed changes from 0 to another	600	* Updates the speed of an object. If the speed changes from 0 to another
700	* value, or vice versa, then add/remove the object from the active list.	601	* value, or vice versa, then add/remove the object from the active list.
701	* This function needs to be called whenever the speed of an object changes.	602	* This function needs to be called whenever the speed of an object changes.
702	*/	603	*/
703
704	void	604	void
705	update_ob_speed (object *op)	605	update_ob_speed (object *op)
706	{	606	{
707	extern int arch_init;	607	extern int arch_init;
708		608
…		…
717	abort ();	617	abort ();
718	#else	618	#else
719	op->speed = 0;	619	op->speed = 0;
720	#endif	620	#endif
721	}	621	}
		622
722	if (arch_init)	623	if (arch_init)
723	{
724	return;	624	return;
725	}	625
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	627	{
728	/* If already on active list, don't do anything */	628	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	629	if (op->active_next || op->active_prev || op == active_objects)
730	return;	630	return;
731		631
732	/* process_events() expects us to insert the object at the beginning	632	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	633	* of the list. */
734	op->active_next = active_objects;	634	op->active_next = active_objects;
		635
735	if (op->active_next != NULL)	636	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	637	op->active_next->active_prev = op;
		638
737	active_objects = op;	639	active_objects = op;
738	}	640	}
739	else	641	else
740	{	642	{
741	/* If not on the active list, nothing needs to be done */	643	/* If not on the active list, nothing needs to be done */
…		…
743	return;	645	return;
744		646
745	if (op->active_prev == NULL)	647	if (op->active_prev == NULL)
746	{	648	{
747	active_objects = op->active_next;	649	active_objects = op->active_next;
		650
748	if (op->active_next != NULL)	651	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	652	op->active_next->active_prev = NULL;
750	}	653	}
751	else	654	else
752	{	655	{
753	op->active_prev->active_next = op->active_next;	656	op->active_prev->active_next = op->active_next;
		657
754	if (op->active_next)	658	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	659	op->active_next->active_prev = op->active_prev;
756	}	660	}
		661
757	op->active_next = NULL;	662	op->active_next = NULL;
758	op->active_prev = NULL;	663	op->active_prev = NULL;
759	}	664	}
760	}	665	}
761		666
…		…
886	update_now = 1;	791	update_now = 1;
887		792
888	if ((move_slow | op->move_slow) != move_slow)	793	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	794	update_now = 1;
890	}	795	}
		796
891	/* if the object is being removed, we can't make intelligent	797	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	798	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	799	* that is being removed.
894	*/	800	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	802	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	803	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	804	/* Nothing to do for that case */ ;
902	}
903	else	805	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	806	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		807
908	if (update_now)	808	if (update_now)
909	{	809	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	810	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	811	update_position (op->map, op->x, op->y);
…		…
913		813
914	if (op->more != NULL)	814	if (op->more != NULL)
915	update_object (op->more, action);	815	update_object (op->more, action);
916	}	816	}
917		817
918	static unordered_vector<object *> mortals;	818	object::vector object::mortals;
919	static std::vector<object *> freed;	819	object::vector object::objects; // not yet used
		820	object *object::first;
920		821
921	void object::free_mortals ()	822	void object::free_mortals ()
922	{	823	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	825	if ((*i)->refcnt)
		826	++i; // further delay freeing
		827	else
925	{	828	{
926	freed.push_back (*i);	829	delete *i;
927	mortals.erase (i);	830	mortals.erase (i);
928	}	831	}
929	else
930	++i;
931	}	832	}
932		833
933	object::object ()	834	object::object ()
934	{	835	{
935	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
936		837
937	expmul = 1.0;	838	expmul = 1.0;
938	face = blank_face;	839	face = blank_face;
939	attacked_by_count = -1;
940	}	840	}
941		841
942	object::~object ()	842	object::~object ()
943	{	843	{
944	free_key_values (this);	844	free_key_values (this);
945	}	845	}
946		846
947	void object::link ()	847	void object::link ()
948	{	848	{
949	count = ++ob_count;	849	count = ++ob_count;
		850	uuid = gen_uuid ();
950		851
951	prev = 0;	852	prev = 0;
952	next = objects;	853	next = object::first;
953		854
954	if (objects)	855	if (object::first)
955	objects->prev = this;	856	object::first->prev = this;
956		857
957	objects = this;	858	object::first = this;
958	}	859	}
959		860
960	void object::unlink ()	861	void object::unlink ()
961	{	862	{
962	count = 0;	863	if (this == object::first)
		864	object::first = next;
963		865
964	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	867	if (prev) prev->next = next;
		868	if (next) next->prev = prev;
		869
968	prev = 0;	870	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	871	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	872	}
980		873
981	object *object::create ()	874	object *object::create ()
982	{	875	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	876	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	877	op->link ();
996	return op;	878	return op;
997	}	879	}
998		880
999	/*	881	/*
…		…
1001	* it from the list of used objects, and puts it on the list of	883	* it from the list of used objects, and puts it on the list of
1002	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	886	* this function to succeed.
1005	*	887	*
1006	* If free_inventory is set, free inventory as well. Else drop items in	888	* If destroy_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	889	* inventory to the ground.
1008	*/	890	*/
1009	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
1010	{	892	{
		893	if (QUERY_FLAG (this, FLAG_FREED))
		894	return;
		895
		896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		897	remove_friendly_object (this);
		898
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	899	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	900	remove ();
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		901
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	902	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		903
1033	if (more)	904	if (more)
1034	{	905	{
1035	more->free (free_inventory);	906	more->destroy (destroy_inventory);
1036	more = 0;	907	more = 0;
1037	}	908	}
1038		909
1039	if (inv)	910	if (inv)
1040	{	911	{
1041	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
1043	* drop on that space.	914	* drop on that space.
1044	*/	915	*/
1045	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046	{	917	{
1047	object *	918	object *op = inv;
1048	op = inv;
1049		919
1050	while (op)	920	while (op)
1051	{	921	{
1052	object *
1053	tmp = op->below;	922	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	923	op->destroy (destroy_inventory);
1057	op = tmp;	924	op = tmp;
1058	}	925	}
1059	}	926	}
1060	else	927	else
1061	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
1062	object *	929	object *op = inv;
1063	op = inv;
1064		930
1065	while (op)	931	while (op)
1066	{	932	{
1067	object *
1068	tmp = op->below;	933	object *tmp = op->below;
1069		934
1070	remove_ob (op);	935	op->remove ();
1071		936
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1074	free_object (op);	939	op->destroy ();
1075	else	940	else
1076	{	941	{
1077	op->x = x;	942	op->x = x;
1078	op->y = y;	943	op->y = y;
1079	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1082	op = tmp;	947	op = tmp;
1083	}	948	}
1084	}	949	}
1085	}	950	}
1086		951
1087	clear_owner (this);	952	// hack to ensure that freed objects still have a valid map
		953	{
		954	static maptile *freed_map; // freed objects are moved here to avoid crashes
		955
		956	if (!freed_map)
		957	{
		958	freed_map = new maptile;
		959
		960	freed_map->name = "/internal/freed_objects_map";
		961	freed_map->width = 3;
		962	freed_map->height = 3;
		963
		964	freed_map->allocate ();
		965	}
		966
		967	map = freed_map;
		968	x = 1;
		969	y = 1;
		970	}
		971
		972	// clear those pointers that likely might have circular references to us
		973	owner = 0;
		974	enemy = 0;
		975	attacked_by = 0;
		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
1088		979
1089	/* Remove object from the active list */	980	/* Remove object from the active list */
1090	speed = 0;	981	speed = 0;
1091	update_ob_speed (this);	982	update_ob_speed (this);
1092		983
1093	unlink ();	984	unlink ();
1094		985
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	986	mortals.push_back (this);
1098	}	987	}
1099		988
1100	/*	989	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1102	* weight of an object (and what is carried by it's environment(s)).	991	* weight of an object (and what is carried by it's environment(s)).
1103	*/	992	*/
1104
1105	void	993	void
1106	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1107	{	995	{
1108	while (op != NULL)	996	while (op != NULL)
1109	{	997	{
1110	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1000
1114	op->carrying -= weight;	1001	op->carrying -= weight;
1115	op = op->env;	1002	op = op->env;
1116	}	1003	}
1117	}	1004	}
1118		1005
1119	/* remove_ob(op):	1006	/* op->remove ():
1120	* This function removes the object op from the linked list of objects	1007	* This function removes the object op from the linked list of objects
1121	* which it is currently tied to. When this function is done, the	1008	* which it is currently tied to. When this function is done, the
1122	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1123	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1124	* the previous environment.	1011	* the previous environment.
1125	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1126	*/	1013	*/
1127
1128	void	1014	void
1129	remove_ob (object *op)	1015	object::remove ()
1130	{	1016	{
1131	object *tmp, *last = NULL;	1017	object *tmp, *last = 0;
1132	object *otmp;	1018	object *otmp;
1133		1019
1134	tag_t tag;
1135	int check_walk_off;	1020	int check_walk_off;
1136	mapstruct *m;
1137		1021
1138	sint16 x, y;
1139
1140	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1141	{	1023	return;
1142	dump_object (op);
1143	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1144		1024
1145	/* Changed it to always dump core in this case. As has been learned
1146	* in the past, trying to recover from errors almost always
1147	* make things worse, and this is a real error here - something
1148	* that should not happen.
1149	* Yes, if this was a mission critical app, trying to do something
1150	* to recover may make sense, but that is because failure of the app
1151	* may have other disastrous problems. Cf runs out of a script
1152	* so is easily enough restarted without any real problems.
1153	* MSW 2001-07-01
1154	*/
1155	abort ();
1156	}
1157
1158	if (op->more != NULL)
1159	remove_ob (op->more);
1160
1161	SET_FLAG (op, FLAG_REMOVED);	1025	SET_FLAG (this, FLAG_REMOVED);
		1026
		1027	if (more)
		1028	more->remove ();
1162		1029
1163	/*	1030	/*
1164	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1165	* inventory.	1032	* inventory.
1166	*/	1033	*/
1167	if (op->env != NULL)	1034	if (env)
1168	{	1035	{
1169	if (op->nrof)	1036	if (nrof)
1170	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1171	else	1038	else
1172	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1173		1040
1174	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1175	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1176	* to save cpu time.	1043	* to save cpu time.
1177	*/	1044	*/
1178	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1179	fix_player (otmp);	1046	fix_player (otmp);
1180		1047
1181	if (op->above != NULL)	1048	if (above != NULL)
1182	op->above->below = op->below;	1049	above->below = below;
1183	else	1050	else
1184	op->env->inv = op->below;	1051	env->inv = below;
1185		1052
1186	if (op->below != NULL)	1053	if (below != NULL)
1187	op->below->above = op->above;	1054	below->above = above;
1188		1055
1189	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1190	* the map, but we don't actually do that - it is up	1057	* the map, but we don't actually do that - it is up
1191	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1192	*/	1059	*/
1193	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1194	op->map = op->env->map;	1061	map = env->map;
1195	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1196	op->env = NULL;	1063	env = 0;
1197	return;
1198	}
1199
1200	/* If we get here, we are removing it from a map */
1201	if (op->map == NULL)
1202	return;
1203
1204	x = op->x;
1205	y = op->y;
1206	m = get_map_from_coord (op->map, &x, &y);
1207
1208	if (!m)
1209	{	1064	}
1210	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1065	else if (map)
1211	op->map->path, op->x, op->y);	1066	{
1212	/* in old days, we used to set x and y to 0 and continue.	1067	/* Re did the following section of code - it looks like it had
1213	* it seems if we get into this case, something is probablye	1068	* lots of logic for things we no longer care about
1214	* screwed up and should be fixed.
1215	*/	1069	*/
1216	abort ();
1217	}
1218	if (op->map != m)
1219	{
1220	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1221	op->map->path, m->path, op->x, op->y, x, y);
1222	}
1223		1070
1224	/* Re did the following section of code - it looks like it had
1225	* lots of logic for things we no longer care about
1226	*/
1227
1228	/* link the object above us */	1071	/* link the object above us */
1229	if (op->above)	1072	if (above)
1230	op->above->below = op->below;	1073	above->below = below;
1231	else	1074	else
1232	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1233		1076
1234	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1235	if (op->below)	1078	if (below)
1236	op->below->above = op->above;	1079	below->above = above;
1237	else	1080	else
1238	{	1081	{
1239	/* Nothing below, which means we need to relink map object for this space	1082	/* Nothing below, which means we need to relink map object for this space
1240	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1241	* evident	1084	* evident
1242	*/
1243	if (GET_MAP_OB (m, x, y) != op)
1244	{
1245	dump_object (op);
1246	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",
1247	errmsg);
1248	dump_object (GET_MAP_OB (m, x, y));
1249	LOG (llevError, "%s\n", errmsg);
1250	}
1251
1252	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1253	}
1254
1255	op->above = NULL;
1256	op->below = NULL;
1257
1258	if (op->map->in_memory == MAP_SAVING)
1259	return;
1260
1261	tag = op->count;
1262	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1263
1264	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1265	{
1266	/* No point updating the players look faces if he is the object
1267	* being removed.
1268	*/
1269
1270	if (tmp->type == PLAYER && tmp != op)
1271	{
1272	/* If a container that the player is currently using somehow gets
1273	* removed (most likely destroyed), update the player view
1274	* appropriately.
1275	*/	1085	*/
1276	if (tmp->container == op)	1086	if (GET_MAP_OB (map, x, y) != this)
1277	{	1087	{
1278	CLEAR_FLAG (op, FLAG_APPLIED);	1088	char *dump = dump_object (this);
1279	tmp->container = NULL;	1089	LOG (llevError,
		1090	"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);
		1091	free (dump);
		1092	dump = dump_object (GET_MAP_OB (map, x, y));
		1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1280	}	1095	}
1281		1096
1282	tmp->contr->socket.update_look = 1;	1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1283	}
1284	/* See if player moving off should effect something */
1285	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1286	{	1098	}
1287	move_apply (tmp, op, NULL);
1288		1099
1289	if (was_destroyed (op, tag))	1100	above = 0;
		1101	below = 0;
		1102
		1103	if (map->in_memory == MAP_SAVING)
		1104	return;
		1105
		1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1107
		1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1109	{
		1110	/* No point updating the players look faces if he is the object
		1111	* being removed.
		1112	*/
		1113
		1114	if (tmp->type == PLAYER && tmp != this)
1290	{	1115	{
1291	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1116	/* If a container that the player is currently using somehow gets
		1117	* removed (most likely destroyed), update the player view
		1118	* appropriately.
		1119	*/
		1120	if (tmp->container == this)
		1121	{
		1122	CLEAR_FLAG (this, FLAG_APPLIED);
		1123	tmp->container = 0;
		1124	}
		1125
		1126	tmp->contr->socket->floorbox_update ();
1292	}	1127	}
		1128
		1129	/* See if player moving off should effect something */
		1130	if (check_walk_off
		1131	&& ((move_type & tmp->move_off)
		1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1133	{
		1134	move_apply (tmp, this, 0);
		1135
		1136	if (destroyed ())
		1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1293	}	1138	}
1294		1139
1295	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1296		1141
1297	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1298	tmp->above = NULL;	1143	tmp->above = 0;
1299		1144
1300	last = tmp;	1145	last = tmp;
1301	}	1146	}
1302		1147
1303	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1304	if (last == NULL)	1149	if (!last)
1305	{	1150	{
1306	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1307	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1308	* those out anyways, and if there are any flags set right now, they won't	1153	* those out anyways, and if there are any flags set right now, they won't
1309	* be correct anyways.	1154	* be correct anyways.
1310	*/	1155	*/
1311	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1312	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1313	}	1158	}
1314	else	1159	else
1315	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1316		1161
1317	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1318	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
		1164	}
1319	}	1165	}
1320		1166
1321	/*	1167	/*
1322	* merge_ob(op,top):	1168	* merge_ob(op,top):
1323	*	1169	*
1324	* This function goes through all objects below and including top, and	1170	* This function goes through all objects below and including top, and
1325	* merges op to the first matching object.	1171	* merges op to the first matching object.
1326	* If top is NULL, it is calculated.	1172	* If top is NULL, it is calculated.
1327	* Returns pointer to object if it succeded in the merge, otherwise NULL	1173	* Returns pointer to object if it succeded in the merge, otherwise NULL
1328	*/	1174	*/
1329
1330	object *	1175	object *
1331	merge_ob (object *op, object *top)	1176	merge_ob (object *op, object *top)
1332	{	1177	{
1333	if (!op->nrof)	1178	if (!op->nrof)
1334	return 0;	1179	return 0;
		1180
1335	if (top == NULL)	1181	if (top == NULL)
1336	for (top = op; top != NULL && top->above != NULL; top = top->above);	1182	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1183
1337	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1338	{	1185	{
1339	if (top == op)	1186	if (top == op)
1340	continue;	1187	continue;
1341	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1342	{	1190	{
1343	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1344		1192
1345	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1346	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1347	remove_ob (op);	1195	op->destroy ();
1348	free_object (op);
1349	return top;	1196	return top;
1350	}	1197	}
1351	}	1198	}
		1199
1352	return NULL;	1200	return 0;
1353	}	1201	}
1354		1202
1355	/*	1203	/*
1356	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1204	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1357	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1358	*/	1206	*/
1359	object *	1207	object *
1360	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1361	{	1209	{
1362	object *	1210	object *tmp;
1363	tmp;
1364		1211
1365	if (op->head)	1212	if (op->head)
1366	op = op->head;	1213	op = op->head;
		1214
1367	for (tmp = op; tmp; tmp = tmp->more)	1215	for (tmp = op; tmp; tmp = tmp->more)
1368	{	1216	{
1369	tmp->x = x + tmp->arch->clone.x;	1217	tmp->x = x + tmp->arch->clone.x;
1370	tmp->y = y + tmp->arch->clone.y;	1218	tmp->y = y + tmp->arch->clone.y;
1371	}	1219	}
		1220
1372	return insert_ob_in_map (op, m, originator, flag);	1221	return insert_ob_in_map (op, m, originator, flag);
1373	}	1222	}
1374		1223
1375	/*	1224	/*
1376	* insert_ob_in_map (op, map, originator, flag):	1225	* insert_ob_in_map (op, map, originator, flag):
…		…
1392	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1393	* just 'op' otherwise	1242	* just 'op' otherwise
1394	*/	1243	*/
1395		1244
1396	object *	1245	object *
1397	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1246	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1398	{	1247	{
1399	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1400	sint16 x, y;	1249	sint16 x, y;
1401		1250
1402	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1405	return NULL;	1254	return NULL;
1406	}	1255	}
1407		1256
1408	if (m == NULL)	1257	if (m == NULL)
1409	{	1258	{
1410	dump_object (op);	1259	char *dump = dump_object (op);
1411	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1260	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1261	free (dump);
1412	return op;	1262	return op;
1413	}	1263	}
1414		1264
1415	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1416	{	1266	{
1417	dump_object (op);	1267	char *dump = dump_object (op);
1418	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1419	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1420	/* Better to catch this here, as otherwise the next use of this object	1270	/* Better to catch this here, as otherwise the next use of this object
1421	* is likely to cause a crash. Better to find out where it is getting	1271	* is likely to cause a crash. Better to find out where it is getting
1422	* improperly inserted.	1272	* improperly inserted.
1423	*/	1273	*/
1424	abort ();	1274	abort ();
1425	#endif	1275	#endif
		1276	free (dump);
1426	return op;	1277	return op;
1427	}	1278	}
1428		1279
1429	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1430	{	1281	{
1431	dump_object (op);	1282	char *dump = dump_object (op);
1432	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1284	free (dump);
1433	return op;	1285	return op;
1434	}	1286	}
1435		1287
1436	if (op->more != NULL)	1288	if (op->more != NULL)
1437	{	1289	{
…		…
1475		1327
1476	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1477	*/	1329	*/
1478	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1479	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1480	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1481	{	1333	{
1482	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1483	remove_ob (tmp);	1335	tmp->destroy ();
1484	free_object (tmp);
1485	}	1336	}
1486		1337
1487	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1488	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1489		1340
…		…
1617	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1618	*/	1469	*/
1619	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1620	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1621	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1622	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1623		1474
1624	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1625	* visible to others on this map. But update_all_los is really	1476	* visible to others on this map. But update_all_los is really
1626	* an inefficient way to do this, as it means los for all players	1477	* an inefficient way to do this, as it means los for all players
1627	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1635		1486
1636	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1637	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1638		1489
1639	/* Don't know if moving this to the end will break anything. However,	1490	/* Don't know if moving this to the end will break anything. However,
1640	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1641	*	1492	*
1642	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1643	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1644	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1645	* update_object().	1496	* update_object().
…		…
1667	* op is the object to insert it under: supplies x and the map.	1518	* op is the object to insert it under: supplies x and the map.
1668	*/	1519	*/
1669	void	1520	void
1670	replace_insert_ob_in_map (const char *arch_string, object *op)	1521	replace_insert_ob_in_map (const char *arch_string, object *op)
1671	{	1522	{
1672	object *tmp;	1523	object *
		1524	tmp;
1673	object *tmp1;	1525	object *
		1526	tmp1;
1674		1527
1675	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1676		1529
1677	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1530	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1678	{
1679	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1680	{	1532	tmp->destroy ();
1681	remove_ob (tmp);
1682	free_object (tmp);
1683	}
1684	}
1685		1533
1686	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1687		1535
1688	tmp1->x = op->x;	1536	tmp1->x = op->x;
1689	tmp1->y = op->y;	1537	tmp1->y = op->y;
1690	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1691	}	1539	}
…		…
1699	*/	1547	*/
1700		1548
1701	object *	1549	object *
1702	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1703	{	1551	{
1704	object *	1552	object *newob;
1705	newob;
1706	int
1707	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1708		1554
1709	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1710	{	1556	{
1711	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1557	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1712	return NULL;	1558	return NULL;
1713	}	1559	}
		1560
1714	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
		1562
1715	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1716	{	1564	orig_ob->destroy (1);
1717	if (!is_removed)
1718	remove_ob (orig_ob);
1719	free_object2 (orig_ob, 1);
1720	}
1721	else if (!is_removed)	1565	else if (!is_removed)
1722	{	1566	{
1723	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1724	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1725	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1569	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1727	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1571	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1728	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1572	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1729	return NULL;	1573	return NULL;
1730	}	1574	}
1731	}	1575	}
		1576
1732	newob->nrof = nr;	1577	newob->nrof = nr;
1733		1578
1734	return newob;	1579	return newob;
1735	}	1580	}
1736		1581
…		…
1743	*/	1588	*/
1744		1589
1745	object *	1590	object *
1746	decrease_ob_nr (object *op, uint32 i)	1591	decrease_ob_nr (object *op, uint32 i)
1747	{	1592	{
1748	object *	1593	object *tmp;
1749	tmp;
1750	player *	1594	player *pl;
1751	pl;
1752		1595
1753	if (i == 0) /* objects with op->nrof require this check */	1596	if (i == 0) /* objects with op->nrof require this check */
1754	return op;	1597	return op;
1755		1598
1756	if (i > op->nrof)	1599	if (i > op->nrof)
1757	i = op->nrof;	1600	i = op->nrof;
1758		1601
1759	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1760	{
1761	op->nrof -= i;	1603	op->nrof -= i;
1762	}
1763	else if (op->env != NULL)	1604	else if (op->env)
1764	{	1605	{
1765	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1766	* therein?	1607	* therein?
1767	*/	1608	*/
1768	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1769	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1770	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1771	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1772	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1773	* and then searching the map for a player.	1614	* and then searching the map for a player.
1774	*/	1615	*/
1775	if (!tmp)	1616	if (!tmp)
1776	{	1617	{
1777	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1778	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1779	break;	1622	break;
1780	if (pl)	1623	}
1781	tmp = pl->ob;
1782	else
1783	tmp = NULL;
1784	}	1624	}
1785		1625
1786	if (i < op->nrof)	1626	if (i < op->nrof)
1787	{	1627	{
1788	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1789	op->nrof -= i;	1629	op->nrof -= i;
1790	if (tmp)	1630	if (tmp)
1791	{
1792	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1793	}
1794	}	1632	}
1795	else	1633	else
1796	{	1634	{
1797	remove_ob (op);	1635	op->remove ();
1798	op->nrof = 0;	1636	op->nrof = 0;
1799	if (tmp)	1637	if (tmp)
1800	{
1801	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1802	}
1803	}	1639	}
1804	}	1640	}
1805	else	1641	else
1806	{	1642	{
1807	object *
1808	above = op->above;	1643	object *above = op->above;
1809		1644
1810	if (i < op->nrof)	1645	if (i < op->nrof)
1811	{
1812	op->nrof -= i;	1646	op->nrof -= i;
1813	}
1814	else	1647	else
1815	{	1648	{
1816	remove_ob (op);	1649	op->remove ();
1817	op->nrof = 0;	1650	op->nrof = 0;
1818	}	1651	}
		1652
1819	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1820	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1821	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1822	{	1656	{
1823	if (op->nrof)	1657	if (op->nrof)
1824	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1825	else	1659	else
1826	esrv_del_item (tmp->contr, op->count);	1660	esrv_del_item (tmp->contr, op->count);
1827	}	1661	}
1828	}	1662	}
1829		1663
1830	if (op->nrof)	1664	if (op->nrof)
1831	{
1832	return op;	1665	return op;
1833	}
1834	else	1666	else
1835	{	1667	{
1836	free_object (op);	1668	op->destroy ();
1837	return NULL;	1669	return 0;
1838	}	1670	}
1839	}	1671	}
1840		1672
1841	/*	1673	/*
1842	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1847	add_weight (object *op, signed long weight)	1679	add_weight (object *op, signed long weight)
1848	{	1680	{
1849	while (op != NULL)	1681	while (op != NULL)
1850	{	1682	{
1851	if (op->type == CONTAINER)	1683	if (op->type == CONTAINER)
1852	{
1853	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1684	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1854	}	1685
1855	op->carrying += weight;	1686	op->carrying += weight;
1856	op = op->env;	1687	op = op->env;
1857	}	1688	}
1858	}	1689	}
1859		1690
		1691	object *
		1692	insert_ob_in_ob (object *op, object *where)
		1693	{
		1694	if (!where)
		1695	{
		1696	char *dump = dump_object (op);
		1697	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1698	free (dump);
		1699	return op;
		1700	}
		1701
		1702	if (where->head)
		1703	{
		1704	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1705	where = where->head;
		1706	}
		1707
		1708	return where->insert (op);
		1709	}
		1710
1860	/*	1711	/*
1861	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1862	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1863	* inside the object environment.	1714	* inside the object environment.
1864	*	1715	*
1865	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1866	* the inventory at the last position or next to other objects of the same
1867	* type.
1868	* Frank: Now sorted by type, archetype and magic!
1869	*
1870	* The function returns now pointer to inserted item, and return value can	1716	* The function returns now pointer to inserted item, and return value can
1871	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1872	*/	1718	*/
1873		1719
1874	object *	1720	object *
1875	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1876	{	1722	{
1877	object *	1723	object *tmp, *otmp;
1878	tmp, *
1879	otmp;
1880		1724
1881	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1882	{	1726	op->remove ();
1883	dump_object (op);	1727
1884	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1885	return op;
1886	}
1887	if (where == NULL)
1888	{
1889	dump_object (op);
1890	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1891	return op;
1892	}
1893	if (where->head)
1894	{
1895	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1896	where = where->head;
1897	}
1898	if (op->more)	1728	if (op->more)
1899	{	1729	{
1900	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1730	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1901	return op;	1731	return op;
1902	}	1732	}
		1733
1903	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1904	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1905	if (op->nrof)	1736	if (op->nrof)
1906	{	1737	{
1907	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1908	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1909	{	1740	{
1910	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1911	(client needs the original object) */	1742	(client needs the original object) */
1912	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1913	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1914	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1915	*/	1746	*/
1916	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1917	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1918	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1919	op = tmp;	1750	op = tmp;
1920	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1921	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1922	break;	1753	break;
1923	}	1754	}
1924		1755
1925	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1926	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1927	* (if it was possible to merge). calling remove_ob will subtract	1758	* (if it was possible to merge). calling remove_ob will subtract
1928	* the weight, so we need to add it in again, since we actually do	1759	* the weight, so we need to add it in again, since we actually do
1929	* the linking below	1760	* the linking below
1930	*/	1761	*/
1931	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1932	}	1763	}
1933	else	1764	else
1934	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1935		1766
1936	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1937	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1938	{
1939	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1940	fix_player (otmp);	1770	fix_player (otmp);
1941	}
1942		1771
1943	op->map = NULL;	1772	op->map = 0;
1944	op->env = where;	1773	op->env = this;
1945	op->above = NULL;	1774	op->above = 0;
1946	op->below = NULL;	1775	op->below = 0;
1947	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1948		1777
1949	/* reset the light list and los of the players on the map */	1778	/* reset the light list and los of the players on the map */
1950	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1951	{	1780	{
1952	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1953	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1782	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1954	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1955	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1956	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1957	}	1786	}
1958		1787
1959	/* Client has no idea of ordering so lets not bother ordering it here.	1788	/* Client has no idea of ordering so lets not bother ordering it here.
1960	* It sure simplifies this function...	1789	* It sure simplifies this function...
1961	*/	1790	*/
1962	if (where->inv == NULL)	1791	if (!inv)
1963	where->inv = op;	1792	inv = op;
1964	else	1793	else
1965	{	1794	{
1966	op->below = where->inv;	1795	op->below = inv;
1967	op->below->above = op;	1796	op->below->above = op;
1968	where->inv = op;	1797	inv = op;
1969	}	1798	}
		1799
1970	return op;	1800	return op;
1971	}	1801	}
1972		1802
1973	/*	1803	/*
1974	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1993		1823
1994	int	1824	int
1995	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1996	{	1826	{
1997	object *tmp;	1827	object *tmp;
1998	tag_t tag;
1999	mapstruct *m = op->map;	1828	maptile *m = op->map;
2000	int x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
2001		1830
2002	MoveType move_on, move_slow, move_block;	1831	MoveType move_on, move_slow, move_block;
2003		1832
2004	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2005	return 0;	1834	return 0;
2006
2007	tag = op->count;
2008		1835
2009	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1836	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2010	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1837	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2011	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1838	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2012		1839
…		…
2055	{	1882	{
2056	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1883	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2057	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1884	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2058	{	1885	{
2059		1886
		1887	float
2060	float diff = tmp->move_slow_penalty * FABS (op->speed);	1888	diff = tmp->move_slow_penalty * FABS (op->speed);
2061		1889
2062	if (op->type == PLAYER)	1890	if (op->type == PLAYER)
2063	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1891	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2064	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1892	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2065	diff /= 4.0;	1893	diff /= 4.0;
…		…
2072	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2073	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1901	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2074	{	1902	{
2075	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
2076		1904
2077	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
2078	return 1;	1906	return 1;
2079		1907
2080	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
2081	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
2082	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2094	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2095	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2096	*/	1924	*/
2097		1925
2098	object *	1926	object *
2099	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2100	{	1928	{
2101	object *	1929	object *
2102	tmp;	1930	tmp;
2103		1931
2104	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2117	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2118	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2119	*/	1947	*/
2120		1948
2121	object *	1949	object *
2122	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2123	{	1951	{
2124	object *	1952	object *
2125	tmp;	1953	tmp;
2126		1954
2127	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2267	* the archetype because that isn't correct if the monster has been	2095	* the archetype because that isn't correct if the monster has been
2268	* customized, changed states, etc.	2096	* customized, changed states, etc.
2269	*/	2097	*/
2270		2098
2271	int	2099	int
2272	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2100	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2273	{	2101	{
2274	int	2102	int
2275	i,	2103	i,
2276	index = 0, flag;	2104	index = 0, flag;
2277	static int	2105	static int
…		…
2289	* if the space being examined only has a wall to the north and empty	2117	* if the space being examined only has a wall to the north and empty
2290	* spaces in all the other directions, this will reduce the search space	2118	* spaces in all the other directions, this will reduce the search space
2291	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2292	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2293	*/	2121	*/
2294	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2295	stop = maxfree[i];	2123	stop = maxfree[i];
2296	}	2124	}
		2125
2297	if (!index)	2126	if (!index)
2298	return -1;	2127	return -1;
		2128
2299	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2300	}	2130	}
2301		2131
2302	/*	2132	/*
2303	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2304	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2305	* But it will return the first available spot, not a random choice.	2135	* But it will return the first available spot, not a random choice.
2306	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2307	*/	2137	*/
2308		2138
2309	int	2139	int
2310	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2140	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2311	{	2141	{
2312	int	2142	int
2313	i;	2143	i;
2314		2144
2315	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2379	* because we have to know what movement the thing looking to move	2209	* because we have to know what movement the thing looking to move
2380	* there is capable of.	2210	* there is capable of.
2381	*/	2211	*/
2382		2212
2383	int	2213	int
2384	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2385	{	2215	{
2386	int	2216	int
2387	i,	2217	i,
2388	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2389	sint16	2219
2390	nx,	2220	sint16 nx, ny;
2391	ny;
2392	object *	2221	object *
2393	tmp;	2222	tmp;
2394	mapstruct *	2223	maptile *
2395	mp;	2224	mp;
2396	MoveType	2225
2397	blocked,	2226	MoveType blocked, move_type;
2398	move_type;
2399		2227
2400	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
2401	{	2229	{
2402	exclude = exclude->head;	2230	exclude = exclude->head;
2403	move_type = exclude->move_type;	2231	move_type = exclude->move_type;
…		…
2608	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2609	*/	2437	*/
2610		2438
2611		2439
2612	int	2440	int
2613	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2614	{	2442	{
2615	sint16	2443	sint16 dx, dy;
2616	dx,
2617	dy;
2618	int	2444	int
2619	mflags;	2445	mflags;
2620		2446
2621	if (dir < 0)	2447	if (dir < 0)
2622	return 0; /* exit condition: invalid direction */	2448	return 0; /* exit condition: invalid direction */
…		…
2669	* create clone from object to another	2495	* create clone from object to another
2670	*/	2496	*/
2671	object *	2497	object *
2672	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2673	{	2499	{
2674	object *
2675	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2676		2501
2677	if (!asrc)	2502	if (!asrc)
2678	return NULL;	2503	return 0;
		2504
2679	src = asrc;	2505	src = asrc;
2680	if (src->head)	2506	if (src->head)
2681	src = src->head;	2507	src = src->head;
2682		2508
2683	prev = NULL;	2509	prev = 0;
2684	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2685	{	2511	{
2686	tmp = get_object ();	2512	tmp = part->clone ();
2687	copy_object (part, tmp);
2688	tmp->x -= src->x;	2513	tmp->x -= src->x;
2689	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2690	if (!part->head)	2516	if (!part->head)
2691	{	2517	{
2692	dst = tmp;	2518	dst = tmp;
2693	tmp->head = NULL;	2519	tmp->head = 0;
2694	}	2520	}
2695	else	2521	else
2696	{	2522	{
2697	tmp->head = dst;	2523	tmp->head = dst;
2698	}	2524	}
		2525
2699	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2700	if (prev)	2528	if (prev)
2701	prev->more = tmp;	2529	prev->more = tmp;
		2530
2702	prev = tmp;	2531	prev = tmp;
2703	}	2532	}
2704		2533
2705	/*** copy inventory ***/
2706	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2707	{
2708	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2709	}
2710		2536
2711	return dst;	2537	return dst;
2712	}	2538	}
2713		2539
2714	/* return true if the object was destroyed, 0 otherwise */
2715	int
2716	was_destroyed (const object *op, tag_t old_tag)
2717	{
2718	/* checking for FLAG_FREED isn't necessary, but makes this function more
2719	* robust */
2720	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2721	}
2722
2723	/* GROS - Creates an object using a string representing its content. */	2540	/* GROS - Creates an object using a string representing its content. */
2724
2725	/* Basically, we save the content of the string to a temp file, then call */	2541	/* Basically, we save the content of the string to a temp file, then call */
2726
2727	/* load_object on it. I admit it is a highly inefficient way to make things, */	2542	/* load_object on it. I admit it is a highly inefficient way to make things, */
2728
2729	/* but it was simple to make and allows reusing the load_object function. */	2543	/* but it was simple to make and allows reusing the load_object function. */
2730
2731	/* Remember not to use load_object_str in a time-critical situation. */	2544	/* Remember not to use load_object_str in a time-critical situation. */
2732
2733	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2734		2546
2735	object *	2547	object *
2736	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2737	{	2549	{
2738	object *	2550	object *op;
2739	op;
2740	char
2741	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2742		2552
2743	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2744		2554
2745	FILE *
2746	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2747		2556
2748	if (tempfile == NULL)	2557	if (tempfile == NULL)
2749	{	2558	{
2750	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2751	return NULL;	2560	return NULL;
2752	};	2561	}
		2562
2753	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2754	fclose (tempfile);	2564	fclose (tempfile);
2755		2565
2756	op = get_object ();	2566	op = object::create ();
2757		2567
2758	object_thawer	2568	object_thawer thawer (filename);
2759	thawer (filename);
2760		2569
2761	if (thawer)	2570	if (thawer)
2762	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
2763		2572
2764	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2573	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2772	* returns NULL if no match.	2581	* returns NULL if no match.
2773	*/	2582	*/
2774	object *	2583	object *
2775	find_obj_by_type_subtype (const object *who, int type, int subtype)	2584	find_obj_by_type_subtype (const object *who, int type, int subtype)
2776	{	2585	{
2777	object *	2586	object *tmp;
2778	tmp;
2779		2587
2780	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2781	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2782	return tmp;	2590	return tmp;
2783		2591
…		…
2791	* do the desired thing.	2599	* do the desired thing.
2792	*/	2600	*/
2793	key_value *	2601	key_value *
2794	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2795	{	2603	{
2796	key_value *	2604	key_value *link;
2797	link;
2798		2605
2799	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2800	{
2801	if (link->key == key)	2607	if (link->key == key)
2802	{
2803	return link;	2608	return link;
2804	}
2805	}
2806		2609
2807	return NULL;	2610	return NULL;
2808	}	2611	}
2809		2612
2810	/*	2613	/*
…		…
2815	* The returned string is shared.	2618	* The returned string is shared.
2816	*/	2619	*/
2817	const char *	2620	const char *
2818	get_ob_key_value (const object *op, const char *const key)	2621	get_ob_key_value (const object *op, const char *const key)
2819	{	2622	{
2820	key_value *	2623	key_value *link;
2821	link;	2624	shstr_cmp canonical_key (key);
2822	const char *
2823	canonical_key;
2824		2625
2825	canonical_key = shstr::find (key);
2826
2827	if (canonical_key == NULL)	2626	if (!canonical_key)
2828	{	2627	{
2829	/* 1. There being a field named key on any object	2628	/* 1. There being a field named key on any object
2830	* implies there'd be a shared string to find.	2629	* implies there'd be a shared string to find.
2831	* 2. Since there isn't, no object has this field.	2630	* 2. Since there isn't, no object has this field.
2832	* 3. Therefore, *this* object doesn't have this field.	2631	* 3. Therefore, *this* object doesn't have this field.
2833	*/	2632	*/
2834	return NULL;	2633	return 0;
2835	}	2634	}
2836		2635
2837	/* This is copied from get_ob_key_link() above -	2636	/* This is copied from get_ob_key_link() above -
2838	* only 4 lines, and saves the function call overhead.	2637	* only 4 lines, and saves the function call overhead.
2839	*/	2638	*/
2840	for (link = op->key_values; link != NULL; link = link->next)	2639	for (link = op->key_values; link; link = link->next)
2841	{
2842	if (link->key == canonical_key)	2640	if (link->key == canonical_key)
2843	{
2844	return link->value;	2641	return link->value;
2845	}	2642
2846	}
2847	return NULL;	2643	return 0;
2848	}	2644	}
2849		2645
2850		2646
2851	/*	2647	/*
2852	* Updates the canonical_key in op to value.	2648	* Updates the canonical_key in op to value.
…		…
2888	if (last)	2684	if (last)
2889	last->next = field->next;	2685	last->next = field->next;
2890	else	2686	else
2891	op->key_values = field->next;	2687	op->key_values = field->next;
2892		2688
2893	delete
2894	field;	2689	delete field;
2895	}	2690	}
2896	}	2691	}
2897	return TRUE;	2692	return TRUE;
2898	}	2693	}
2899	/* IF we get here, key doesn't exist */	2694	/* IF we get here, key doesn't exist */
…		…
2934	* Returns TRUE on success.	2729	* Returns TRUE on success.
2935	*/	2730	*/
2936	int	2731	int
2937	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2732	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2938	{	2733	{
2939	shstr
2940	key_ (key);	2734	shstr key_ (key);
2941		2735
2942	return set_ob_key_value_s (op, key_, value, add_key);	2736	return set_ob_key_value_s (op, key_, value, add_key);
2943	}	2737	}
		2738
		2739	object::depth_iterator::depth_iterator (object *container)
		2740	: iterator_base (container)
		2741	{
		2742	while (item->inv)
		2743	item = item->inv;
		2744	}
		2745
		2746	void
		2747	object::depth_iterator::next ()
		2748	{
		2749	if (item->below)
		2750	{
		2751	item = item->below;
		2752
		2753	while (item->inv)
		2754	item = item->inv;
		2755	}
		2756	else
		2757	item = item->env;
		2758	}
		2759
		2760	// return a suitable string describing an objetc in enough detail to find it
		2761	const char *
		2762	object::debug_desc (char *info) const
		2763	{
		2764	char info2[256 * 3];
		2765	char *p = info;
		2766
		2767	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2768	count,
		2769	&name,
		2770	title ? " " : "",
		2771	title ? (const char *)title : "");
		2772
		2773	if (env)
		2774	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2775
		2776	if (map)
		2777	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2778
		2779	return info;
		2780	}
		2781
		2782	const char *
		2783	object::debug_desc () const
		2784	{
		2785	static char info[256 * 3];
		2786	return debug_desc (info);
		2787	}
		2788

Diff Legend

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