ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.90 by root, Tue Dec 26 10:14:24 2006 UTC

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

Diff Legend

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