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.74 by root, Wed Dec 20 09:14:21 2006 UTC

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

Diff Legend

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