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.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.73 by root, Wed Dec 20 01:19:11 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.24 2006/09/10 16:00:23 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.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	373	* Some error messages.
303	* The result of the dump is stored in the static global errmsg array.	374	* The result of the dump is stored in the static global errmsg array.
304	*/	375	*/
305		376
306	void	377	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)	378	dump_object (object *op)
362	{	379	{
363	if (op == NULL)	380	if (!op)
364	{	381	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		382
372	void	383	object_freezer freezer;
373	dump_all_objects (void)	384	save_object (freezer, op, 3);
374	{	385	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	}	386	}
383		387
384	/*	388	/*
385	* get_nearest_part(multi-object, object 2) returns the part of the	389	* get_nearest_part(multi-object, object 2) returns the part of the
386	* multi-object 1 which is closest to the second object.	390	* multi-object 1 which is closest to the second object.
…		…
406	*/	410	*/
407		411
408	object *	412	object *
409	find_object (tag_t i)	413	find_object (tag_t i)
410	{	414	{
411	object *op;	415	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	416	if (op->count == i)
415	break;	417	return op;
		418
416	return op;	419	return 0;
417	}	420	}
418		421
419	/*	422	/*
420	* Returns the first object which has a name equal to the argument.	423	* Returns the first object which has a name equal to the argument.
421	* Used only by the patch command, but not all that useful.	424	* Used only by the patch command, but not all that useful.
…		…
423	*/	426	*/
424		427
425	object *	428	object *
426	find_object_name (const char *str)	429	find_object_name (const char *str)
427	{	430	{
428	const char *name = shstr::find (str);	431	shstr_cmp str_ (str);
429	object *op;	432	object *op;
430		433
431	for (op = objects; op != NULL; op = op->next)	434	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	435	if (op->name == str_)
433	break;	436	break;
434		437
435	return op;	438	return op;
436	}	439	}
437		440
…		…
440	{	443	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	444	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	445	}
443		446
444	/*	447	/*
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	448	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	449	* skill and experience objects.
485	*/	450	*/
486	void	451	void
487	set_owner (object *op, object *owner)	452	object::set_owner (object *owner)
488	{	453	{
489	if (owner == NULL || op == NULL)	454	if (!owner)
490	return;	455	return;
491		456
492	/* next line added to allow objects which own objects */	457	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	458	/* 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	459	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	460	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	461	* 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.	462	* didn't match, this check is valid and I believe that cause is valid.
498	*/	463	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	464	while (owner->owner)
500	owner = owner->owner;	465	owner = owner->owner;
501		466
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;	467	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512
513	}
514
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{
532	/* players don't have owners - they own themselves. Update
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;
539	}
540	set_owner (op, owner);
541
542	}	468	}
543		469
544	/* Zero the key_values on op, decrementing the shared-string	470	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	471	* refcounts and freeing the links.
546	*/	472	*/
…		…
562	{	488	{
563	attachable_base::clear ();	489	attachable_base::clear ();
564		490
565	free_key_values (this);	491	free_key_values (this);
566		492
		493	owner = 0;
567	name = 0;	494	name = 0;
568	name_pl = 0;	495	name_pl = 0;
569	title = 0;	496	title = 0;
570	race = 0;	497	race = 0;
571	slaying = 0;	498	slaying = 0;
572	skill = 0;	499	skill = 0;
573	msg = 0;	500	msg = 0;
574	lore = 0;	501	lore = 0;
575	custom_name = 0;	502	custom_name = 0;
576	materialname = 0;	503	materialname = 0;
		504	contr = 0;
		505	below = 0;
		506	above = 0;
		507	inv = 0;
		508	container = 0;
		509	env = 0;
		510	more = 0;
		511	head = 0;
		512	map = 0;
		513	active_next = 0;
		514	active_prev = 0;
577		515
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	516	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
579		517
580	SET_FLAG (this, FLAG_REMOVED);	518	SET_FLAG (this, FLAG_REMOVED);
581	}
582		519
583	void object::clone (object *destination)
584	{
585	*(object_copy *) destination = *this;
586	*(object_pod *) destination = *this;
587
588	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */	520	/* What is not cleared is next, prev, and count */
615		521
616	op->expmul = 1.0;	522	expmul = 1.0;
617	op->face = blank_face;	523	face = blank_face;
618	op->attacked_by_count = -1;
619		524
620	if (settings.casting_time)	525	if (settings.casting_time)
621	op->casting_time = -1;	526	casting_time = -1;
622	}	527	}
623		528
624	/*	529	/*
625	* copy object first frees everything allocated by the second object,	530	* copy_to first frees everything allocated by the dst object,
626	* and then copies the contends of the first object into the second	531	* and then copies the contents of itself into the second
627	* object, allocating what needs to be allocated. Basically, any	532	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	533	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
629	* if the first object is freed, the pointers in the new object	534	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	535	* will point at garbage.
631	*/	536	*/
632
633	void	537	void
634	copy_object (object *op2, object *op)	538	object::copy_to (object *dst)
635	{	539	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
638		542
639	op2->clone (op);	543	*(object_copy *)dst = *this;
		544	*(object_pod *)dst = *this;
		545
		546	if (self || cb)
		547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
640		548
641	if (is_freed)	549	if (is_freed)
642	SET_FLAG (op, FLAG_FREED);	550	SET_FLAG (dst, FLAG_FREED);
		551
643	if (is_removed)	552	if (is_removed)
644	SET_FLAG (op, FLAG_REMOVED);	553	SET_FLAG (dst, FLAG_REMOVED);
645		554
646	if (op2->speed < 0)	555	if (speed < 0)
647	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
648		557
649	/* Copy over key_values, if any. */	558	/* Copy over key_values, if any. */
650	if (op2->key_values)	559	if (key_values)
651	{	560	{
652	key_value *tail = 0;	561	key_value *tail = 0;
653	key_value *i;	562	key_value *i;
654		563
655	op->key_values = 0;	564	dst->key_values = 0;
656		565
657	for (i = op2->key_values; i; i = i->next)	566	for (i = key_values; i; i = i->next)
658	{	567	{
659	key_value *new_link = new key_value;	568	key_value *new_link = new key_value;
660		569
661	new_link->next = 0;	570	new_link->next = 0;
662	new_link->key = i->key;	571	new_link->key = i->key;
663	new_link->value = i->value;	572	new_link->value = i->value;
664		573
665	/* Try and be clever here, too. */	574	/* Try and be clever here, too. */
666	if (!op->key_values)	575	if (!dst->key_values)
667	{	576	{
668	op->key_values = new_link;	577	dst->key_values = new_link;
669	tail = new_link;	578	tail = new_link;
670	}	579	}
671	else	580	else
672	{	581	{
673	tail->next = new_link;	582	tail->next = new_link;
674	tail = new_link;	583	tail = new_link;
675	}	584	}
676	}	585	}
677	}	586	}
678		587
679	update_ob_speed (op);	588	update_ob_speed (dst);
		589	}
		590
		591	object *
		592	object::clone ()
		593	{
		594	object *neu = create ();
		595	copy_to (neu);
		596	return neu;
680	}	597	}
681		598
682	/*	599	/*
683	* If an object with the IS_TURNABLE() flag needs to be turned due	600	* If an object with the IS_TURNABLE() flag needs to be turned due
684	* to the closest player being on the other side, this function can	601	* to the closest player being on the other side, this function can
…		…
697	/*	614	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	615	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	616	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	617	* This function needs to be called whenever the speed of an object changes.
701	*/	618	*/
702
703	void	619	void
704	update_ob_speed (object *op)	620	update_ob_speed (object *op)
705	{	621	{
706	extern int arch_init;	622	extern int arch_init;
707		623
…		…
716	abort ();	632	abort ();
717	#else	633	#else
718	op->speed = 0;	634	op->speed = 0;
719	#endif	635	#endif
720	}	636	}
		637
721	if (arch_init)	638	if (arch_init)
722	{
723	return;	639	return;
724	}	640
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	642	{
727	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
729	return;	645	return;
730		646
731	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	648	* of the list. */
733	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
734	if (op->active_next != NULL)	651	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
736	active_objects = op;	654	active_objects = op;
737	}	655	}
738	else	656	else
739	{	657	{
740	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
742	return;	660	return;
743		661
744	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
745	{	663	{
746	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
747	if (op->active_next != NULL)	666	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
749	}	668	}
750	else	669	else
751	{	670	{
752	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
753	if (op->active_next)	673	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
755	}	675	}
		676
756	op->active_next = NULL;	677	op->active_next = NULL;
757	op->active_prev = NULL;	678	op->active_prev = NULL;
758	}	679	}
759	}	680	}
760		681
…		…
885	update_now = 1;	806	update_now = 1;
886		807
887	if ((move_slow | op->move_slow) != move_slow)	808	if ((move_slow | op->move_slow) != move_slow)
888	update_now = 1;	809	update_now = 1;
889	}	810	}
		811
890	/* if the object is being removed, we can't make intelligent	812	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	813	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	814	* that is being removed.
893	*/	815	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{
896	update_now = 1;	817	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	818	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	819	/* Nothing to do for that case */ ;
901	}
902	else	820	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	821	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		822
907	if (update_now)	823	if (update_now)
908	{	824	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	825	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
910	update_position (op->map, op->x, op->y);	826	update_position (op->map, op->x, op->y);
…		…
912		828
913	if (op->more != NULL)	829	if (op->more != NULL)
914	update_object (op->more, action);	830	update_object (op->more, action);
915	}	831	}
916		832
917	static	833	object::vector object::mortals;
918	std::vector < object *>	834	object::vector object::objects; // not yet used
919	mortals;	835	object *object::first;
920		836
921	void object::free_mortals ()	837	void object::free_mortals ()
922	{	838	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	delete *	840	if ((*i)->refcnt)
		841	++i; // further delay freeing
		842	else
925	i;	843	{
926		844	delete *i;
927	mortals.clear ();	845	mortals.erase (i);
		846	}
928	}	847	}
929		848
930	object::object ()	849	object::object ()
931	{	850	{
932	SET_FLAG (this, FLAG_REMOVED);	851	SET_FLAG (this, FLAG_REMOVED);
933		852
934	expmul = 1.0;	853	expmul = 1.0;
935	face = blank_face;	854	face = blank_face;
936	attacked_by_count = -1;
937	}	855	}
938		856
939	object::~object ()	857	object::~object ()
940	{	858	{
941	free_key_values (this);	859	free_key_values (this);
942	}	860	}
943		861
944	void object::link ()	862	void object::link ()
945	{	863	{
946	count = ++ob_count;	864	count = ++ob_count;
		865	uuid = gen_uuid ();
947		866
948	prev = 0;	867	prev = 0;
949	next = objects;	868	next = object::first;
950		869
951	if (objects)	870	if (object::first)
952	objects->prev = this;	871	object::first->prev = this;
953		872
954	objects = this;	873	object::first = this;
955	}	874	}
956		875
957	void object::unlink ()	876	void object::unlink ()
958	{	877	{
959	count = 0;	878	if (this == object::first)
		879	object::first = next;
960		880
961	/* Remove this object from the list of used objects */	881	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;	882	if (prev) prev->next = next;
964	if (next)
965	next->prev = prev;	883	if (next) next->prev = prev;
966	if (this == objects)	884
967	objects = next;	885	prev = 0;
		886	next = 0;
968	}	887	}
969		888
970	object *object::create ()	889	object *object::create ()
971	{	890	{
972	object *
973	op = new object;	891	object *op = new object;
974
975	op->link ();	892	op->link ();
976	return op;	893	return op;
977	}	894	}
978		895
979	/*	896	/*
…		…
981	* it from the list of used objects, and puts it on the list of	898	* it from the list of used objects, and puts it on the list of
982	* free objects. The IS_FREED() flag is set in the object.	899	* free objects. The IS_FREED() flag is set in the object.
983	* The object must have been removed by remove_ob() first for	900	* The object must have been removed by remove_ob() first for
984	* this function to succeed.	901	* this function to succeed.
985	*	902	*
986	* If free_inventory is set, free inventory as well. Else drop items in	903	* If destroy_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.	904	* inventory to the ground.
988	*/	905	*/
989	void object::free (bool free_inventory)	906	void object::destroy (bool destroy_inventory)
990	{	907	{
		908	if (QUERY_FLAG (this, FLAG_FREED))
		909	return;
		910
		911	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		912	remove_friendly_object (this);
		913
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	914	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	915	remove ();
993	LOG (llevDebug, "Free object called with non removed object\n");
994	dump_object (this);
995	#ifdef MANY_CORES
996	abort ();
997	#endif
998	}
999		916
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1001	{
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1003	remove_friendly_object (this);
1004	}
1005
1006	if (QUERY_FLAG (this, FLAG_FREED))	917	SET_FLAG (this, FLAG_FREED);
1007	{
1008	dump_object (this);
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1010	return;
1011	}
1012		918
1013	if (more)	919	if (more)
1014	{	920	{
1015	more->free (free_inventory);	921	more->destroy (destroy_inventory);
1016	more = 0;	922	more = 0;
1017	}	923	}
1018		924
1019	if (inv)	925	if (inv)
1020	{	926	{
1021	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
1023	* drop on that space.	929	* drop on that space.
1024	*/	930	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	931	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1026	{	932	{
1027	object *	933	object *op = inv;
1028	op = inv;
1029		934
1030	while (op)	935	while (op)
1031	{	936	{
1032	object *
1033	tmp = op->below;	937	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	938	op->destroy (destroy_inventory);
1037	op = tmp;	939	op = tmp;
1038	}	940	}
1039	}	941	}
1040	else	942	else
1041	{ /* Put objects in inventory onto this space */	943	{ /* Put objects in inventory onto this space */
1042	object *	944	object *op = inv;
1043	op = inv;
1044		945
1045	while (op)	946	while (op)
1046	{	947	{
1047	object *
1048	tmp = op->below;	948	object *tmp = op->below;
1049		949
1050	remove_ob (op);	950	op->remove ();
1051		951
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	953	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1054	free_object (op);	954	op->destroy ();
1055	else	955	else
1056	{	956	{
1057	op->x = x;	957	op->x = x;
1058	op->y = y;	958	op->y = y;
1059	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	959	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1062	op = tmp;	962	op = tmp;
1063	}	963	}
1064	}	964	}
1065	}	965	}
1066		966
		967	// hack to ensure that freed objects still have a valid map
		968	{
		969	static maptile *freed_map; // freed objects are moved here to avoid crashes
		970
		971	if (!freed_map)
		972	{
		973	freed_map = new maptile;
		974
		975	freed_map->name = "/internal/freed_objects_map";
		976	freed_map->width = 3;
		977	freed_map->height = 3;
		978
		979	freed_map->allocate ();
		980	}
		981
		982	map = freed_map;
		983	x = 1;
		984	y = 1;
		985	}
		986
		987	// clear those pointers that likely might have circular references to us
		988	owner = 0;
		989	enemy = 0;
		990	attacked_by = 0;
		991
		992	// only relevant for players(?), but make sure of it anyways
		993	contr = 0;
		994
1067	/* Remove object from the active list */	995	/* Remove object from the active list */
1068	speed = 0;	996	speed = 0;
1069	update_ob_speed (this);	997	update_ob_speed (this);
1070		998
1071	unlink ();	999	unlink ();
1072		1000
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);	1001	mortals.push_back (this);
1076	}	1002	}
1077		1003
1078	/*	1004	/*
1079	* sub_weight() recursively (outwards) subtracts a number from the	1005	* sub_weight() recursively (outwards) subtracts a number from the
1080	* weight of an object (and what is carried by it's environment(s)).	1006	* weight of an object (and what is carried by it's environment(s)).
1081	*/	1007	*/
1082
1083	void	1008	void
1084	sub_weight (object *op, signed long weight)	1009	sub_weight (object *op, signed long weight)
1085	{	1010	{
1086	while (op != NULL)	1011	while (op != NULL)
1087	{	1012	{
1088	if (op->type == CONTAINER)	1013	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1014	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}	1015
1092	op->carrying -= weight;	1016	op->carrying -= weight;
1093	op = op->env;	1017	op = op->env;
1094	}	1018	}
1095	}	1019	}
1096		1020
1097	/* remove_ob(op):	1021	/* op->remove ():
1098	* This function removes the object op from the linked list of objects	1022	* This function removes the object op from the linked list of objects
1099	* which it is currently tied to. When this function is done, the	1023	* which it is currently tied to. When this function is done, the
1100	* object will have no environment. If the object previously had an	1024	* object will have no environment. If the object previously had an
1101	* environment, the x and y coordinates will be updated to	1025	* environment, the x and y coordinates will be updated to
1102	* the previous environment.	1026	* the previous environment.
1103	* Beware: This function is called from the editor as well!	1027	* Beware: This function is called from the editor as well!
1104	*/	1028	*/
1105
1106	void	1029	void
1107	remove_ob (object *op)	1030	object::remove ()
1108	{	1031	{
		1032	object *tmp, *last = 0;
1109	object *	1033	object *otmp;
1110	tmp, *	1034
1111	last = NULL;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	1035	int check_walk_off;
1118	mapstruct *
1119	m;
1120	sint16
1121	x,
1122	y;
1123		1036
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1037	if (QUERY_FLAG (this, FLAG_REMOVED))
1126	{	1038	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1039
1130	/* Changed it to always dump core in this case. As has been learned
1131	* in the past, trying to recover from errors almost always
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)
1143	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);	1040	SET_FLAG (this, FLAG_REMOVED);
		1041
		1042	if (more)
		1043	more->remove ();
1146		1044
1147	/*	1045	/*
1148	* In this case, the object to be removed is in someones	1046	* In this case, the object to be removed is in someones
1149	* inventory.	1047	* inventory.
1150	*/	1048	*/
1151	if (op->env != NULL)	1049	if (env)
1152	{	1050	{
1153	if (op->nrof)	1051	if (nrof)
1154	sub_weight (op->env, op->weight * op->nrof);	1052	sub_weight (env, weight * nrof);
1155	else	1053	else
1156	sub_weight (op->env, op->weight + op->carrying);	1054	sub_weight (env, weight + carrying);
1157		1055
1158	/* NO_FIX_PLAYER is set when a great many changes are being	1056	/* NO_FIX_PLAYER is set when a great many changes are being
1159	* made to players inventory. If set, avoiding the call	1057	* made to players inventory. If set, avoiding the call
1160	* to save cpu time.	1058	* to save cpu time.
1161	*/	1059	*/
1162	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1060	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163	fix_player (otmp);	1061	fix_player (otmp);
1164		1062
1165	if (op->above != NULL)	1063	if (above != NULL)
1166	op->above->below = op->below;	1064	above->below = below;
1167	else	1065	else
1168	op->env->inv = op->below;	1066	env->inv = below;
1169		1067
1170	if (op->below != NULL)	1068	if (below != NULL)
1171	op->below->above = op->above;	1069	below->above = above;
1172		1070
1173	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1174	* the map, but we don't actually do that - it is up	1072	* the map, but we don't actually do that - it is up
1175	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1176	*/	1074	*/
1177	op->x = op->env->x, op->y = op->env->y;	1075	x = env->x, y = env->y;
1178	op->map = op->env->map;	1076	map = env->map;
1179	op->above = NULL, op->below = NULL;	1077	above = 0, below = 0;
1180	op->env = NULL;	1078	env = 0;
1181	return;
1182	}
1183
1184	/* If we get here, we are removing it from a map */
1185	if (op->map == NULL)
1186	return;
1187
1188	x = op->x;
1189	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);
1191
1192	if (!m)
1193	{	1079	}
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1080	else if (map)
1195	op->map->path, op->x, op->y);	1081	{
1196	/* in old days, we used to set x and y to 0 and continue.	1082	/* Re did the following section of code - it looks like it had
1197	* it seems if we get into this case, something is probablye	1083	* lots of logic for things we no longer care about
1198	* screwed up and should be fixed.
1199	*/	1084	*/
1200	abort ();
1201	}
1202	if (op->map != m)
1203	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1205	op->map->path, m->path, op->x, op->y, x, y);
1206	}
1207		1085
1208	/* Re did the following section of code - it looks like it had
1209	* lots of logic for things we no longer care about
1210	*/
1211
1212	/* link the object above us */	1086	/* link the object above us */
1213	if (op->above)	1087	if (above)
1214	op->above->below = op->below;	1088	above->below = below;
1215	else	1089	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1090	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1217		1091
1218	/* Relink the object below us, if there is one */	1092	/* Relink the object below us, if there is one */
1219	if (op->below)	1093	if (below)
1220	{
1221	op->below->above = op->above;	1094	below->above = above;
1222	}
1223	else	1095	else
1224	{	1096	{
1225	/* Nothing below, which means we need to relink map object for this space	1097	/* Nothing below, which means we need to relink map object for this space
1226	* use translated coordinates in case some oddness with map tiling is	1098	* use translated coordinates in case some oddness with map tiling is
1227	* evident	1099	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{
1231	dump_object (op);
1232	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",
1233	errmsg);
1234	dump_object (GET_MAP_OB (m, x, y));
1235	LOG (llevError, "%s\n", errmsg);
1236	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241
1242	if (op->map->in_memory == MAP_SAVING)
1243	return;
1244
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1248	{
1249	/* No point updating the players look faces if he is the object
1250	* being removed.
1251	*/
1252
1253	if (tmp->type == PLAYER && tmp != op)
1254	{
1255	/* If a container that the player is currently using somehow gets
1256	* removed (most likely destroyed), update the player view
1257	* appropriately.
1258	*/	1100	*/
1259	if (tmp->container == op)	1101	if (GET_MAP_OB (map, x, y) != this)
1260	{	1102	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1103	char *dump = dump_object (this);
1262	tmp->container = NULL;	1104	LOG (llevError,
		1105	"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);
		1106	free (dump);
		1107	dump = dump_object (GET_MAP_OB (map, x, y));
		1108	LOG (llevError, "%s\n", dump);
		1109	free (dump);
1263	}	1110	}
1264	tmp->contr->socket.update_look = 1;	1111
1265	}	1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1266	/* See if player moving off should effect something */
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1268	{	1113	}
1269		1114
1270	move_apply (tmp, op, NULL);	1115	above = 0;
1271	if (was_destroyed (op, tag))	1116	below = 0;
		1117
		1118	if (map->in_memory == MAP_SAVING)
		1119	return;
		1120
		1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1122
		1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1124	{
		1125	/* No point updating the players look faces if he is the object
		1126	* being removed.
		1127	*/
		1128
		1129	if (tmp->type == PLAYER && tmp != this)
1272	{	1130	{
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1131	/* If a container that the player is currently using somehow gets
		1132	* removed (most likely destroyed), update the player view
		1133	* appropriately.
		1134	*/
		1135	if (tmp->container == this)
		1136	{
		1137	CLEAR_FLAG (this, FLAG_APPLIED);
		1138	tmp->container = 0;
		1139	}
		1140
		1141	tmp->contr->socket->floorbox_update ();
1274	}	1142	}
		1143
		1144	/* See if player moving off should effect something */
		1145	if (check_walk_off
		1146	&& ((move_type & tmp->move_off)
		1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1148	{
		1149	move_apply (tmp, this, 0);
		1150
		1151	if (destroyed ())
		1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1275	}	1153	}
1276		1154
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1156
1279	if (tmp->above == tmp)	1157	if (tmp->above == tmp)
1280	tmp->above = NULL;	1158	tmp->above = 0;
		1159
1281	last = tmp;	1160	last = tmp;
1282	}	1161	}
		1162
1283	/* last == NULL of there are no objects on this space */	1163	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1164	if (!last)
1285	{	1165	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1167	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't	1168	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1169	* be correct anyways.
1290	*/	1170	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1172	update_position (map, x, y);
1293	}	1173	}
1294	else	1174	else
1295	update_object (last, UP_OBJ_REMOVE);	1175	update_object (last, UP_OBJ_REMOVE);
1296		1176
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1298	update_all_los (op->map, op->x, op->y);	1178	update_all_los (map, x, y);
1299		1179	}
1300	}	1180	}
1301		1181
1302	/*	1182	/*
1303	* merge_ob(op,top):	1183	* merge_ob(op,top):
1304	*	1184	*
1305	* This function goes through all objects below and including top, and	1185	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1186	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1187	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1188	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1189	*/
1310
1311	object *	1190	object *
1312	merge_ob (object *op, object *top)	1191	merge_ob (object *op, object *top)
1313	{	1192	{
1314	if (!op->nrof)	1193	if (!op->nrof)
1315	return 0;	1194	return 0;
		1195
1316	if (top == NULL)	1196	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1197	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1198
1318	for (; top != NULL; top = top->below)	1199	for (; top != NULL; top = top->below)
1319	{	1200	{
1320	if (top == op)	1201	if (top == op)
1321	continue;	1202	continue;
1322	if (CAN_MERGE (op, top))	1203
		1204	if (object::can_merge (op, top))
1323	{	1205	{
1324	top->nrof += op->nrof;	1206	top->nrof += op->nrof;
1325		1207
1326	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1208	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1327	op->weight = 0; /* Don't want any adjustements now */	1209	op->weight = 0; /* Don't want any adjustements now */
1328	remove_ob (op);	1210	op->destroy ();
1329	free_object (op);
1330	return top;	1211	return top;
1331	}	1212	}
1332	}	1213	}
		1214
1333	return NULL;	1215	return 0;
1334	}	1216	}
1335		1217
1336	/*	1218	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1219	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1220	* job preparing multi-part monsters
1339	*/	1221	*/
1340	object *	1222	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1223	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342	{	1224	{
1343	object *	1225	object *tmp;
1344	tmp;
1345		1226
1346	if (op->head)	1227	if (op->head)
1347	op = op->head;	1228	op = op->head;
		1229
1348	for (tmp = op; tmp; tmp = tmp->more)	1230	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1231	{
1350	tmp->x = x + tmp->arch->clone.x;	1232	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1233	tmp->y = y + tmp->arch->clone.y;
1352	}	1234	}
		1235
1353	return insert_ob_in_map (op, m, originator, flag);	1236	return insert_ob_in_map (op, m, originator, flag);
1354	}	1237	}
1355		1238
1356	/*	1239	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1240	* insert_ob_in_map (op, map, originator, flag):
…		…
1373	* NULL if 'op' was destroyed	1256	* NULL if 'op' was destroyed
1374	* just 'op' otherwise	1257	* just 'op' otherwise
1375	*/	1258	*/
1376		1259
1377	object *	1260	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1261	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1379	{	1262	{
1380	object *	1263	object *tmp, *top, *floor = NULL;
1381	tmp, *	1264	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1265
1388	if (QUERY_FLAG (op, FLAG_FREED))	1266	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1267	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1268	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1269	return NULL;
1392	}	1270	}
		1271
1393	if (m == NULL)	1272	if (m == NULL)
1394	{	1273	{
1395	dump_object (op);	1274	char *dump = dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1275	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1276	free (dump);
1397	return op;	1277	return op;
1398	}	1278	}
		1279
1399	if (out_of_map (m, op->x, op->y))	1280	if (out_of_map (m, op->x, op->y))
1400	{	1281	{
1401	dump_object (op);	1282	char *dump = dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403	#ifdef MANY_CORES	1284	#ifdef MANY_CORES
1404	/* Better to catch this here, as otherwise the next use of this object	1285	/* Better to catch this here, as otherwise the next use of this object
1405	* is likely to cause a crash. Better to find out where it is getting	1286	* is likely to cause a crash. Better to find out where it is getting
1406	* improperly inserted.	1287	* improperly inserted.
1407	*/	1288	*/
1408	abort ();	1289	abort ();
1409	#endif	1290	#endif
		1291	free (dump);
1410	return op;	1292	return op;
1411	}	1293	}
		1294
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1295	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1296	{
1414	dump_object (op);	1297	char *dump = dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1298	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1299	free (dump);
1416	return op;	1300	return op;
1417	}	1301	}
		1302
1418	if (op->more != NULL)	1303	if (op->more != NULL)
1419	{	1304	{
1420	/* The part may be on a different map. */	1305	/* The part may be on a different map. */
1421		1306
1422	object *
1423	more = op->more;	1307	object *more = op->more;
1424		1308
1425	/* We really need the caller to normalize coordinates - if	1309	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1310	* we set the map, that doesn't work if the location is within
1427	* a map and this is straddling an edge. So only if coordinate	1311	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1312	* is clear wrong do we normalize it.
1429	*/	1313	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1314	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1315	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1316	else if (!more->map)
1435	{	1317	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1318	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1319	* more->map should always point to the parent.
1438	*/	1320	*/
…		…
1441		1323
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1324	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1325	{
1444	if (!op->head)	1326	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1327	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1328
1446	return NULL;	1329	return NULL;
1447	}	1330	}
1448	}	1331	}
		1332
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1333	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1334
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1335	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1336	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1337	* need extra work
…		…
1457	y = op->y;	1341	y = op->y;
1458		1342
1459	/* this has to be done after we translate the coordinates.	1343	/* this has to be done after we translate the coordinates.
1460	*/	1344	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1345	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1346	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1347	if (object::can_merge (op, tmp))
1465	{	1348	{
1466	op->nrof += tmp->nrof;	1349	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1350	tmp->destroy ();
1468	free_object (tmp);
1469	}	1351	}
1470	}
1471		1352
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1355
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1356	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1357	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1358
1477	if (flag & INS_BELOW_ORIGINATOR)	1359	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1360	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1361	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1362	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1363	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1364	abort ();
1483	}	1365	}
		1366
1484	op->above = originator;	1367	op->above = originator;
1485	op->below = originator->below;	1368	op->below = originator->below;
		1369
1486	if (op->below)	1370	if (op->below)
1487	op->below->above = op;	1371	op->below->above = op;
1488	else	1372	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1373	SET_MAP_OB (op->map, op->x, op->y, op);
		1374
1490	/* since *below* originator, no need to update top */	1375	/* since *below* originator, no need to update top */
1491	originator->below = op;	1376	originator->below = op;
1492	}	1377	}
1493	else	1378	else
1494	{	1379	{
1495	/* If there are other objects, then */	1380	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1381	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1382	{
1498	object *
1499	last = NULL;	1383	object *last = NULL;
1500		1384
1501	/*	1385	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1386	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1387	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1388	* Generally, we want to put the new object on top. But if
…		…
1513		1397
1514	while (top != NULL)	1398	while (top != NULL)
1515	{	1399	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1400	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1401	floor = top;
		1402
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1403	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1404	{
1520	/* We insert above top, so we want this object below this */	1405	/* We insert above top, so we want this object below this */
1521	top = top->below;	1406	top = top->below;
1522	break;	1407	break;
1523	}	1408	}
		1409
1524	last = top;	1410	last = top;
1525	top = top->above;	1411	top = top->above;
1526	}	1412	}
		1413
1527	/* Don't want top to be NULL, so set it to the last valid object */	1414	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1415	top = last;
1529		1416
1530	/* We let update_position deal with figuring out what the space	1417	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1418	* looks like instead of lots of conditions here.
…		…
1551	*/	1438	*/
1552	if (last && last->below && last != floor)	1439	if (last && last->below && last != floor)
1553	top = last->below;	1440	top = last->below;
1554	}	1441	}
1555	} /* If objects on this space */	1442	} /* If objects on this space */
		1443
1556	if (flag & INS_MAP_LOAD)	1444	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1445	top = GET_MAP_TOP (op->map, op->x, op->y);
		1446
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1447	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1448	top = floor;
1560		1449
1561	/* Top is the object that our object (op) is going to get inserted above.	1450	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1451	*/
1563		1452
1564	/* First object on this space */	1453	/* First object on this space */
1565	if (!top)	1454	if (!top)
1566	{	1455	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1456	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1457
1568	if (op->above)	1458	if (op->above)
1569	op->above->below = op;	1459	op->above->below = op;
		1460
1570	op->below = NULL;	1461	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1462	SET_MAP_OB (op->map, op->x, op->y, op);
1572	}	1463	}
1573	else	1464	else
1574	{ /* get inserted into the stack above top */	1465	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1466	op->above = top->above;
		1467
1576	if (op->above)	1468	if (op->above)
1577	op->above->below = op;	1469	op->above->below = op;
		1470
1578	op->below = top;	1471	op->below = top;
1579	top->above = op;	1472	top->above = op;
1580	}	1473	}
		1474
1581	if (op->above == NULL)	1475	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1476	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */	1477	} /* else not INS_BELOW_ORIGINATOR */
1584		1478
1585	if (op->type == PLAYER)	1479	if (op->type == PLAYER)
…		…
1588	/* If we have a floor, we know the player, if any, will be above	1482	/* If we have a floor, we know the player, if any, will be above
1589	* it, so save a few ticks and start from there.	1483	* it, so save a few ticks and start from there.
1590	*/	1484	*/
1591	if (!(flag & INS_MAP_LOAD))	1485	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)	1487	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;	1488	tmp->contr->socket->floorbox_update ();
1596	}
1597		1489
1598	/* If this object glows, it may affect lighting conditions that are	1490	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1491	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1492	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1493	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1497	* of effect may be sufficient.
1606	*/	1498	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1499	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1500	update_all_los (op->map, op->x, op->y);
1609		1501
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1502	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1503	update_object (op, UP_OBJ_INSERT);
1613		1504
1614
1615	/* Don't know if moving this to the end will break anything. However,	1505	/* Don't know if moving this to the end will break anything. However,
1616	* we want to have update_look set above before calling this.	1506	* we want to have floorbox_update called before calling this.
1617	*	1507	*
1618	* check_move_on() must be after this because code called from	1508	* check_move_on() must be after this because code called from
1619	* check_move_on() depends on correct map flags (so functions like	1509	* check_move_on() depends on correct map flags (so functions like
1620	* blocked() and wall() work properly), and these flags are updated by	1510	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1511	* update_object().
1622	*/	1512	*/
1623		1513
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1514	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1515	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1516	{
1628	if (check_move_on (op, originator))	1517	if (check_move_on (op, originator))
1629	return NULL;	1518	return NULL;
1630		1519
…		…
1633	*/	1522	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1523	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1524	if (check_move_on (tmp, originator))
1636	return NULL;	1525	return NULL;
1637	}	1526	}
		1527
1638	return op;	1528	return op;
1639	}	1529	}
1640		1530
1641	/* this function inserts an object in the map, but if it	1531	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1532	* finds an object of its own type, it'll remove that one first.
…		…
1651	tmp1;	1541	tmp1;
1652		1542
1653	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1654		1544
1655	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1656	{
1657	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1658	{	1547	tmp->destroy ();
1659	remove_ob (tmp);
1660	free_object (tmp);
1661	}
1662	}
1663		1548
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1549	tmp1 = arch_to_object (archetype::find (arch_string));
1665
1666		1550
1667	tmp1->x = op->x;	1551	tmp1->x = op->x;
1668	tmp1->y = op->y;	1552	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1553	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1554	}
…		…
1678	*/	1562	*/
1679		1563
1680	object *	1564	object *
1681	get_split_ob (object *orig_ob, uint32 nr)	1565	get_split_ob (object *orig_ob, uint32 nr)
1682	{	1566	{
1683	object *	1567	object *newob;
1684	newob;
1685	int
1686	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1687		1569
1688	if (orig_ob->nrof < nr)	1570	if (orig_ob->nrof < nr)
1689	{	1571	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1572	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1573	return NULL;
1692	}	1574	}
		1575
1693	newob = object_create_clone (orig_ob);	1576	newob = object_create_clone (orig_ob);
		1577
1694	if ((orig_ob->nrof -= nr) < 1)	1578	if ((orig_ob->nrof -= nr) < 1)
1695	{	1579	orig_ob->destroy (1);
1696	if (!is_removed)
1697	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);
1699	}
1700	else if (!is_removed)	1580	else if (!is_removed)
1701	{	1581	{
1702	if (orig_ob->env != NULL)	1582	if (orig_ob->env != NULL)
1703	sub_weight (orig_ob->env, orig_ob->weight * nr);	1583	sub_weight (orig_ob->env, orig_ob->weight * nr);
1704	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1584	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1586	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1707	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1587	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1588	return NULL;
1709	}	1589	}
1710	}	1590	}
		1591
1711	newob->nrof = nr;	1592	newob->nrof = nr;
1712		1593
1713	return newob;	1594	return newob;
1714	}	1595	}
1715		1596
…		…
1722	*/	1603	*/
1723		1604
1724	object *	1605	object *
1725	decrease_ob_nr (object *op, uint32 i)	1606	decrease_ob_nr (object *op, uint32 i)
1726	{	1607	{
1727	object *	1608	object *tmp;
1728	tmp;
1729	player *	1609	player *pl;
1730	pl;
1731		1610
1732	if (i == 0) /* objects with op->nrof require this check */	1611	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1612	return op;
1734		1613
1735	if (i > op->nrof)	1614	if (i > op->nrof)
1736	i = op->nrof;	1615	i = op->nrof;
1737		1616
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1617	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1618	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1619	else if (op->env)
1743	{	1620	{
1744	/* is this object in the players inventory, or sub container	1621	/* is this object in the players inventory, or sub container
1745	* therein?	1622	* therein?
1746	*/	1623	*/
1747	tmp = is_player_inv (op->env);	1624	tmp = is_player_inv (op->env);
…		…
1753	*/	1630	*/
1754	if (!tmp)	1631	if (!tmp)
1755	{	1632	{
1756	for (pl = first_player; pl; pl = pl->next)	1633	for (pl = first_player; pl; pl = pl->next)
1757	if (pl->ob->container == op->env)	1634	if (pl->ob->container == op->env)
		1635	{
		1636	tmp = pl->ob;
1758	break;	1637	break;
1759	if (pl)	1638	}
1760	tmp = pl->ob;
1761	else
1762	tmp = NULL;
1763	}	1639	}
1764		1640
1765	if (i < op->nrof)	1641	if (i < op->nrof)
1766	{	1642	{
1767	sub_weight (op->env, op->weight * i);	1643	sub_weight (op->env, op->weight * i);
1768	op->nrof -= i;	1644	op->nrof -= i;
1769	if (tmp)	1645	if (tmp)
1770	{
1771	esrv_send_item (tmp, op);	1646	esrv_send_item (tmp, op);
1772	}
1773	}	1647	}
1774	else	1648	else
1775	{	1649	{
1776	remove_ob (op);	1650	op->remove ();
1777	op->nrof = 0;	1651	op->nrof = 0;
1778	if (tmp)	1652	if (tmp)
1779	{
1780	esrv_del_item (tmp->contr, op->count);	1653	esrv_del_item (tmp->contr, op->count);
1781	}
1782	}	1654	}
1783	}	1655	}
1784	else	1656	else
1785	{	1657	{
1786	object *
1787	above = op->above;	1658	object *above = op->above;
1788		1659
1789	if (i < op->nrof)	1660	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1661	op->nrof -= i;
1792	}
1793	else	1662	else
1794	{	1663	{
1795	remove_ob (op);	1664	op->remove ();
1796	op->nrof = 0;	1665	op->nrof = 0;
1797	}	1666	}
		1667
1798	/* Since we just removed op, op->above is null */	1668	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1669	for (tmp = above; tmp; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1670	if (tmp->type == PLAYER)
1801	{	1671	{
1802	if (op->nrof)	1672	if (op->nrof)
1803	esrv_send_item (tmp, op);	1673	esrv_send_item (tmp, op);
1804	else	1674	else
1805	esrv_del_item (tmp->contr, op->count);	1675	esrv_del_item (tmp->contr, op->count);
1806	}	1676	}
1807	}	1677	}
1808		1678
1809	if (op->nrof)	1679	if (op->nrof)
1810	{
1811	return op;	1680	return op;
1812	}
1813	else	1681	else
1814	{	1682	{
1815	free_object (op);	1683	op->destroy ();
1816	return NULL;	1684	return 0;
1817	}	1685	}
1818	}	1686	}
1819		1687
1820	/*	1688	/*
1821	* add_weight(object, weight) adds the specified weight to an object,	1689	* add_weight(object, weight) adds the specified weight to an object,
…		…
1826	add_weight (object *op, signed long weight)	1694	add_weight (object *op, signed long weight)
1827	{	1695	{
1828	while (op != NULL)	1696	while (op != NULL)
1829	{	1697	{
1830	if (op->type == CONTAINER)	1698	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1699	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1700
1834	op->carrying += weight;	1701	op->carrying += weight;
1835	op = op->env;	1702	op = op->env;
1836	}	1703	}
1837	}	1704	}
1838		1705
		1706	object *
		1707	insert_ob_in_ob (object *op, object *where)
		1708	{
		1709	if (!where)
		1710	{
		1711	char *dump = dump_object (op);
		1712	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1713	free (dump);
		1714	return op;
		1715	}
		1716
		1717	if (where->head)
		1718	{
		1719	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1720	where = where->head;
		1721	}
		1722
		1723	return where->insert (op);
		1724	}
		1725
1839	/*	1726	/*
1840	* insert_ob_in_ob(op,environment):	1727	* env->insert (op)
1841	* This function inserts the object op in the linked list	1728	* This function inserts the object op in the linked list
1842	* inside the object environment.	1729	* inside the object environment.
1843	*	1730	*
1844	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1845	* the inventory at the last position or next to other objects of the same
1846	* type.
1847	* Frank: Now sorted by type, archetype and magic!
1848	*
1849	* The function returns now pointer to inserted item, and return value can	1731	* The function returns now pointer to inserted item, and return value can
1850	* be != op, if items are merged. -Tero	1732	* be != op, if items are merged. -Tero
1851	*/	1733	*/
1852		1734
1853	object *	1735	object *
1854	insert_ob_in_ob (object *op, object *where)	1736	object::insert (object *op)
1855	{	1737	{
1856	object *	1738	object *tmp, *otmp;
1857	tmp, *
1858	otmp;
1859		1739
1860	if (!QUERY_FLAG (op, FLAG_REMOVED))	1740	if (!QUERY_FLAG (op, FLAG_REMOVED))
1861	{	1741	op->remove ();
1862	dump_object (op);	1742
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;
1865	}
1866	if (where == NULL)
1867	{
1868	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;
1871	}
1872	if (where->head)
1873	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;
1876	}
1877	if (op->more)	1743	if (op->more)
1878	{	1744	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1745	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1746	return op;
1881	}	1747	}
		1748
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1749	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1750	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1751	if (op->nrof)
1885	{	1752	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1753	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1887	if (CAN_MERGE (tmp, op))	1754	if (object::can_merge (tmp, op))
1888	{	1755	{
1889	/* return the original object and remove inserted object	1756	/* return the original object and remove inserted object
1890	(client needs the original object) */	1757	(client needs the original object) */
1891	tmp->nrof += op->nrof;	1758	tmp->nrof += op->nrof;
1892	/* Weight handling gets pretty funky. Since we are adding to	1759	/* Weight handling gets pretty funky. Since we are adding to
1893	* tmp->nrof, we need to increase the weight.	1760	* tmp->nrof, we need to increase the weight.
1894	*/	1761	*/
1895	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1896	SET_FLAG (op, FLAG_REMOVED);	1763	SET_FLAG (op, FLAG_REMOVED);
1897	free_object (op); /* free the inserted object */	1764	op->destroy (); /* free the inserted object */
1898	op = tmp;	1765	op = tmp;
1899	remove_ob (op); /* and fix old object's links */	1766	op->remove (); /* and fix old object's links */
1900	CLEAR_FLAG (op, FLAG_REMOVED);	1767	CLEAR_FLAG (op, FLAG_REMOVED);
1901	break;	1768	break;
1902	}	1769	}
1903		1770
1904	/* I assume combined objects have no inventory	1771	/* I assume combined objects have no inventory
1905	* We add the weight - this object could have just been removed	1772	* We add the weight - this object could have just been removed
1906	* (if it was possible to merge). calling remove_ob will subtract	1773	* (if it was possible to merge). calling remove_ob will subtract
1907	* the weight, so we need to add it in again, since we actually do	1774	* the weight, so we need to add it in again, since we actually do
1908	* the linking below	1775	* the linking below
1909	*/	1776	*/
1910	add_weight (where, op->weight * op->nrof);	1777	add_weight (this, op->weight * op->nrof);
1911	}	1778	}
1912	else	1779	else
1913	add_weight (where, (op->weight + op->carrying));	1780	add_weight (this, (op->weight + op->carrying));
1914		1781
1915	otmp = is_player_inv (where);	1782	otmp = is_player_inv (this);
1916	if (otmp && otmp->contr != NULL)	1783	if (otmp && otmp->contr)
1917	{
1918	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1784	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1919	fix_player (otmp);	1785	fix_player (otmp);
1920	}
1921		1786
1922	op->map = NULL;	1787	op->map = NULL;
1923	op->env = where;	1788	op->env = this;
1924	op->above = NULL;	1789	op->above = NULL;
1925	op->below = NULL;	1790	op->below = NULL;
1926	op->x = 0, op->y = 0;	1791	op->x = 0, op->y = 0;
1927		1792
1928	/* reset the light list and los of the players on the map */	1793	/* reset the light list and los of the players on the map */
1929	if ((op->glow_radius != 0) && where->map)	1794	if ((op->glow_radius != 0) && map)
1930	{	1795	{
1931	#ifdef DEBUG_LIGHTS	1796	#ifdef DEBUG_LIGHTS
1932	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1797	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1933	#endif /* DEBUG_LIGHTS */	1798	#endif /* DEBUG_LIGHTS */
1934	if (MAP_DARKNESS (where->map))	1799	if (MAP_DARKNESS (map))
1935	update_all_los (where->map, where->x, where->y);	1800	update_all_los (map, x, y);
1936	}	1801	}
1937		1802
1938	/* Client has no idea of ordering so lets not bother ordering it here.	1803	/* Client has no idea of ordering so lets not bother ordering it here.
1939	* It sure simplifies this function...	1804	* It sure simplifies this function...
1940	*/	1805	*/
1941	if (where->inv == NULL)	1806	if (!inv)
1942	where->inv = op;	1807	inv = op;
1943	else	1808	else
1944	{	1809	{
1945	op->below = where->inv;	1810	op->below = inv;
1946	op->below->above = op;	1811	op->below->above = op;
1947	where->inv = op;	1812	inv = op;
1948	}	1813	}
		1814
1949	return op;	1815	return op;
1950	}	1816	}
1951		1817
1952	/*	1818	/*
1953	* Checks if any objects has a move_type that matches objects	1819	* Checks if any objects has a move_type that matches objects
…		…
1971	*/	1837	*/
1972		1838
1973	int	1839	int
1974	check_move_on (object *op, object *originator)	1840	check_move_on (object *op, object *originator)
1975	{	1841	{
1976	object *	1842	object *tmp;
1977	tmp;	1843	maptile *m = op->map;
1978	tag_t
1979	tag;
1980	mapstruct *
1981	m = op->map;
1982	int
1983	x = op->x, y = op->y;	1844	int x = op->x, y = op->y;
1984	MoveType	1845
1985	move_on,	1846	MoveType move_on, move_slow, move_block;
1986	move_slow,
1987	move_block;
1988		1847
1989	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1848	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1990	return 0;	1849	return 0;
1991
1992	tag = op->count;
1993		1850
1994	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1851	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1995	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1852	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1996	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1853	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1997		1854
…		…
2022	* we don't need to check all of them.	1879	* we don't need to check all of them.
2023	*/	1880	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1881	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1882	break;
2026	}	1883	}
		1884
2027	for (; tmp != NULL; tmp = tmp->below)	1885	for (; tmp; tmp = tmp->below)
2028	{	1886	{
2029	if (tmp == op)	1887	if (tmp == op)
2030	continue; /* Can't apply yourself */	1888	continue; /* Can't apply yourself */
2031		1889
2032	/* Check to see if one of the movement types should be slowed down.	1890	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1898	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1899	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	1900	{
2043		1901
2044	float	1902	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1903	diff = tmp->move_slow_penalty * FABS (op->speed);
		1904
2048	if (op->type == PLAYER)	1905	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1906	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1907	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	1908	diff /= 4.0;
2054	}	1909
2055	}
2056	op->speed_left -= diff;	1910	op->speed_left -= diff;
2057	}	1911	}
2058	}	1912	}
2059		1913
2060	/* Basically same logic as above, except now for actual apply. */	1914	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1915	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1916	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	1917	{
2064
2065	move_apply (tmp, op, originator);	1918	move_apply (tmp, op, originator);
		1919
2066	if (was_destroyed (op, tag))	1920	if (op->destroyed ())
2067	return 1;	1921	return 1;
2068		1922
2069	/* what the person/creature stepped onto has moved the object	1923	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	1924	* someplace new. Don't process any further - if we did,
2071	* have a feeling strange problems would result.	1925	* have a feeling strange problems would result.
2072	*/	1926	*/
2073	if (op->map != m || op->x != x || op->y != y)	1927	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	1928	return 0;
2075	}	1929	}
2076	}	1930	}
		1931
2077	return 0;	1932	return 0;
2078	}	1933	}
2079		1934
2080	/*	1935	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	1936	* present_arch(arch, map, x, y) searches for any objects with
2082	* a matching archetype at the given map and coordinates.	1937	* a matching archetype at the given map and coordinates.
2083	* The first matching object is returned, or NULL if none.	1938	* The first matching object is returned, or NULL if none.
2084	*/	1939	*/
2085		1940
2086	object *	1941	object *
2087	present_arch (const archetype *at, mapstruct *m, int x, int y)	1942	present_arch (const archetype *at, maptile *m, int x, int y)
2088	{	1943	{
2089	object *	1944	object *
2090	tmp;	1945	tmp;
2091		1946
2092	if (m == NULL || out_of_map (m, x, y))	1947	if (m == NULL || out_of_map (m, x, y))
…		…
2105	* a matching type variable at the given map and coordinates.	1960	* a matching type variable at the given map and coordinates.
2106	* The first matching object is returned, or NULL if none.	1961	* The first matching object is returned, or NULL if none.
2107	*/	1962	*/
2108		1963
2109	object *	1964	object *
2110	present (unsigned char type, mapstruct *m, int x, int y)	1965	present (unsigned char type, maptile *m, int x, int y)
2111	{	1966	{
2112	object *	1967	object *
2113	tmp;	1968	tmp;
2114		1969
2115	if (out_of_map (m, x, y))	1970	if (out_of_map (m, x, y))
…		…
2255	* the archetype because that isn't correct if the monster has been	2110	* the archetype because that isn't correct if the monster has been
2256	* customized, changed states, etc.	2111	* customized, changed states, etc.
2257	*/	2112	*/
2258		2113
2259	int	2114	int
2260	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2115	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2261	{	2116	{
2262	int	2117	int
2263	i,	2118	i,
2264	index = 0, flag;	2119	index = 0, flag;
2265	static int	2120	static int
…		…
2286	return -1;	2141	return -1;
2287	return altern[RANDOM () % index];	2142	return altern[RANDOM () % index];
2288	}	2143	}
2289		2144
2290	/*	2145	/*
2291	* find_first_free_spot(archetype, mapstruct, x, y) works like	2146	* find_first_free_spot(archetype, maptile, x, y) works like
2292	* find_free_spot(), but it will search max number of squares.	2147	* find_free_spot(), but it will search max number of squares.
2293	* But it will return the first available spot, not a random choice.	2148	* But it will return the first available spot, not a random choice.
2294	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2149	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2295	*/	2150	*/
2296		2151
2297	int	2152	int
2298	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2153	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2299	{	2154	{
2300	int	2155	int
2301	i;	2156	i;
2302		2157
2303	for (i = 0; i < SIZEOFFREE; i++)	2158	for (i = 0; i < SIZEOFFREE; i++)
…		…
2367	* because we have to know what movement the thing looking to move	2222	* because we have to know what movement the thing looking to move
2368	* there is capable of.	2223	* there is capable of.
2369	*/	2224	*/
2370		2225
2371	int	2226	int
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2227	find_dir (maptile *m, int x, int y, object *exclude)
2373	{	2228	{
2374	int	2229	int
2375	i,	2230	i,
2376	max = SIZEOFFREE, mflags;	2231	max = SIZEOFFREE, mflags;
2377	sint16	2232
2378	nx,	2233	sint16 nx, ny;
2379	ny;
2380	object *	2234	object *
2381	tmp;	2235	tmp;
2382	mapstruct *	2236	maptile *
2383	mp;	2237	mp;
2384	MoveType	2238
2385	blocked,	2239	MoveType blocked, move_type;
2386	move_type;
2387		2240
2388	if (exclude && exclude->head)	2241	if (exclude && exclude->head)
2389	{	2242	{
2390	exclude = exclude->head;	2243	exclude = exclude->head;
2391	move_type = exclude->move_type;	2244	move_type = exclude->move_type;
…		…
2596	* Modified to be map tile aware -.MSW	2449	* Modified to be map tile aware -.MSW
2597	*/	2450	*/
2598		2451
2599		2452
2600	int	2453	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2454	can_see_monsterP (maptile *m, int x, int y, int dir)
2602	{	2455	{
2603	sint16	2456	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int	2457	int
2607	mflags;	2458	mflags;
2608		2459
2609	if (dir < 0)	2460	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2461	return 0; /* exit condition: invalid direction */
…		…
2657	* create clone from object to another	2508	* create clone from object to another
2658	*/	2509	*/
2659	object *	2510	object *
2660	object_create_clone (object *asrc)	2511	object_create_clone (object *asrc)
2661	{	2512	{
2662	object *
2663	dst = NULL, *tmp, *src, *part, *prev, *item;	2513	object *dst = 0, *tmp, *src, *part, *prev, *item;
2664		2514
2665	if (!asrc)	2515	if (!asrc)
2666	return NULL;	2516	return 0;
		2517
2667	src = asrc;	2518	src = asrc;
2668	if (src->head)	2519	if (src->head)
2669	src = src->head;	2520	src = src->head;
2670		2521
2671	prev = NULL;	2522	prev = 0;
2672	for (part = src; part; part = part->more)	2523	for (part = src; part; part = part->more)
2673	{	2524	{
2674	tmp = get_object ();	2525	tmp = part->clone ();
2675	copy_object (part, tmp);
2676	tmp->x -= src->x;	2526	tmp->x -= src->x;
2677	tmp->y -= src->y;	2527	tmp->y -= src->y;
		2528
2678	if (!part->head)	2529	if (!part->head)
2679	{	2530	{
2680	dst = tmp;	2531	dst = tmp;
2681	tmp->head = NULL;	2532	tmp->head = 0;
2682	}	2533	}
2683	else	2534	else
2684	{	2535	{
2685	tmp->head = dst;	2536	tmp->head = dst;
2686	}	2537	}
		2538
2687	tmp->more = NULL;	2539	tmp->more = 0;
		2540
2688	if (prev)	2541	if (prev)
2689	prev->more = tmp;	2542	prev->more = tmp;
		2543
2690	prev = tmp;	2544	prev = tmp;
2691	}	2545	}
2692		2546
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2547	for (item = src->inv; item; item = item->below)
2695	{
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);	2548	insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2549
2699	return dst;	2550	return dst;
2700	}	2551	}
2701		2552
2702	/* return true if the object was destroyed, 0 otherwise */
2703	int
2704	was_destroyed (const object *op, tag_t old_tag)
2705	{
2706	/* checking for FLAG_FREED isn't necessary, but makes this function more
2707	* robust */
2708	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709	}
2710
2711	/* GROS - Creates an object using a string representing its content. */	2553	/* GROS - Creates an object using a string representing its content. */
2712
2713	/* Basically, we save the content of the string to a temp file, then call */	2554	/* Basically, we save the content of the string to a temp file, then call */
2714
2715	/* load_object on it. I admit it is a highly inefficient way to make things, */	2555	/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717	/* but it was simple to make and allows reusing the load_object function. */	2556	/* but it was simple to make and allows reusing the load_object function. */
2718
2719	/* Remember not to use load_object_str in a time-critical situation. */	2557	/* Remember not to use load_object_str in a time-critical situation. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */	2558	/* Also remember that multiparts objects are not supported for now. */
2722		2559
2723	object *	2560	object *
2724	load_object_str (const char *obstr)	2561	load_object_str (const char *obstr)
2725	{	2562	{
2726	object *	2563	object *op;
2727	op;
2728	char
2729	filename[MAX_BUF];	2564	char filename[MAX_BUF];
2730		2565
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2566	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732		2567
2733	FILE *
2734	tempfile = fopen (filename, "w");	2568	FILE *tempfile = fopen (filename, "w");
2735		2569
2736	if (tempfile == NULL)	2570	if (tempfile == NULL)
2737	{	2571	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2572	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2573	return NULL;
2740	};	2574	}
		2575
2741	fprintf (tempfile, obstr);	2576	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2577	fclose (tempfile);
2743		2578
2744	op = get_object ();	2579	op = object::create ();
2745		2580
2746	object_thawer	2581	object_thawer thawer (filename);
2747	thawer (filename);
2748		2582
2749	if (thawer)	2583	if (thawer)
2750	load_object (thawer, op, 0);	2584	load_object (thawer, op, 0);
2751		2585
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2586	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2760	* returns NULL if no match.	2594	* returns NULL if no match.
2761	*/	2595	*/
2762	object *	2596	object *
2763	find_obj_by_type_subtype (const object *who, int type, int subtype)	2597	find_obj_by_type_subtype (const object *who, int type, int subtype)
2764	{	2598	{
2765	object *	2599	object *tmp;
2766	tmp;
2767		2600
2768	for (tmp = who->inv; tmp; tmp = tmp->below)	2601	for (tmp = who->inv; tmp; tmp = tmp->below)
2769	if (tmp->type == type && tmp->subtype == subtype)	2602	if (tmp->type == type && tmp->subtype == subtype)
2770	return tmp;	2603	return tmp;
2771		2604
…		…
2779	* do the desired thing.	2612	* do the desired thing.
2780	*/	2613	*/
2781	key_value *	2614	key_value *
2782	get_ob_key_link (const object *ob, const char *key)	2615	get_ob_key_link (const object *ob, const char *key)
2783	{	2616	{
2784	key_value *	2617	key_value *link;
2785	link;
2786		2618
2787	for (link = ob->key_values; link != NULL; link = link->next)	2619	for (link = ob->key_values; link != NULL; link = link->next)
2788	{
2789	if (link->key == key)	2620	if (link->key == key)
2790	{
2791	return link;	2621	return link;
2792	}
2793	}
2794		2622
2795	return NULL;	2623	return NULL;
2796	}	2624	}
2797		2625
2798	/*	2626	/*
…		…
2803	* The returned string is shared.	2631	* The returned string is shared.
2804	*/	2632	*/
2805	const char *	2633	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2634	get_ob_key_value (const object *op, const char *const key)
2807	{	2635	{
2808	key_value *	2636	key_value *link;
2809	link;	2637	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2638
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2639	if (!canonical_key)
2816	{	2640	{
2817	/* 1. There being a field named key on any object	2641	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2642	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2643	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2644	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2645	*/
2822	return NULL;	2646	return 0;
2823	}	2647	}
2824		2648
2825	/* This is copied from get_ob_key_link() above -	2649	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2650	* only 4 lines, and saves the function call overhead.
2827	*/	2651	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2652	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2653	if (link->key == canonical_key)
2831	{
2832	return link->value;	2654	return link->value;
2833	}	2655
2834	}
2835	return NULL;	2656	return 0;
2836	}	2657	}
2837		2658
2838		2659
2839	/*	2660	/*
2840	* Updates the canonical_key in op to value.	2661	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2697	if (last)
2877	last->next = field->next;	2698	last->next = field->next;
2878	else	2699	else
2879	op->key_values = field->next;	2700	op->key_values = field->next;
2880		2701
2881	delete
2882	field;	2702	delete field;
2883	}	2703	}
2884	}	2704	}
2885	return TRUE;	2705	return TRUE;
2886	}	2706	}
2887	/* IF we get here, key doesn't exist */	2707	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2742	* Returns TRUE on success.
2923	*/	2743	*/
2924	int	2744	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2745	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2746	{
2927	shstr
2928	key_ (key);	2747	shstr key_ (key);
2929		2748
2930	return set_ob_key_value_s (op, key_, value, add_key);	2749	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2750	}
		2751
		2752	object::depth_iterator::depth_iterator (object *container)
		2753	: iterator_base (container)
		2754	{
		2755	while (item->inv)
		2756	item = item->inv;
		2757	}
		2758
		2759	void
		2760	object::depth_iterator::next ()
		2761	{
		2762	if (item->below)
		2763	{
		2764	item = item->below;
		2765
		2766	while (item->inv)
		2767	item = item->inv;
		2768	}
		2769	else
		2770	item = item->env;
		2771	}
		2772
		2773	// return a suitable string describing an objetc in enough detail to find it
		2774	const char *
		2775	object::debug_desc (char *info) const
		2776	{
		2777	char info2[256 * 3];
		2778	char *p = info;
		2779
		2780	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2781	count,
		2782	&name,
		2783	title ? " " : "",
		2784	title ? (const char *)title : "");
		2785
		2786	if (env)
		2787	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2788
		2789	if (map)
		2790	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2791
		2792	return info;
		2793	}
		2794
		2795	const char *
		2796	object::debug_desc () const
		2797	{
		2798	static char info[256 * 3];
		2799	return debug_desc (info);
		2800	}
		2801

Diff Legend

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