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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.75 by root, Wed Dec 20 11:36:38 2006 UTC

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

Diff Legend

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