ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.79 by root, Sat Dec 23 06:30:49 2006 UTC

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

Diff Legend

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