ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.78 by root, Fri Dec 22 16:34:00 2006 UTC

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

Diff Legend

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