ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.92 by root, Tue Dec 26 17:39:29 2006 UTC

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

Diff Legend

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