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.71 by elmex, Tue Dec 19 13:41:45 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.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	373	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	374	* The result of the dump is stored in the static global errmsg array.
298	*/	375	*/
299		376
300	void	377	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)	378	dump_object (object *op)
356	{	379	{
357	if (op == NULL)	380	if (!op)
358	{	381	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		382
366	void	383	object_freezer freezer;
367	dump_all_objects (void)	384	save_object (freezer, op, 3);
368	{	385	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	}	386	}
377		387
378	/*	388	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	389	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	390	* multi-object 1 which is closest to the second object.
…		…
400	*/	410	*/
401		411
402	object *	412	object *
403	find_object (tag_t i)	413	find_object (tag_t i)
404	{	414	{
405	object *op;	415	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	416	if (op->count == i)
409	break;	417	return op;
		418
410	return op;	419	return 0;
411	}	420	}
412		421
413	/*	422	/*
414	* Returns the first object which has a name equal to the argument.	423	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	424	* Used only by the patch command, but not all that useful.
…		…
417	*/	426	*/
418		427
419	object *	428	object *
420	find_object_name (const char *str)	429	find_object_name (const char *str)
421	{	430	{
422	const char *name = shstr::find (str);	431	shstr_cmp str_ (str);
423	object *op;	432	object *op;
424		433
425	for (op = objects; op != NULL; op = op->next)	434	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	435	if (op->name == str_)
427	break;	436	break;
428		437
429	return op;	438	return op;
430	}	439	}
431		440
…		…
434	{	443	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	444	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}	445	}
437		446
438	/*	447	/*
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	448	* Sets the owner and sets the skill and exp pointers to owner's current
478	* skill and experience objects.	449	* skill and experience objects.
479	*/	450	*/
480	void	451	void
481	set_owner (object *op, object *owner)	452	object::set_owner (object *owner)
482	{	453	{
483	if (owner == NULL || op == NULL)	454	if (!owner)
484	return;	455	return;
485		456
486	/* next line added to allow objects which own objects */	457	/* next line added to allow objects which own objects */
487	/* Add a check for ownercounts in here, as I got into an endless loop	458	/* 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	459	* with the fireball owning a poison cloud which then owned the
489	* fireball. I believe that was caused by one of the objects getting	460	* fireball. I believe that was caused by one of the objects getting
490	* freed and then another object replacing it. Since the ownercounts	461	* 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.	462	* didn't match, this check is valid and I believe that cause is valid.
492	*/	463	*/
493	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	464	while (owner->owner)
494	owner = owner->owner;	465	owner = owner->owner;
495		466
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;	467	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	}	468	}
536		469
537	/* Zero the key_values on op, decrementing the shared-string	470	/* Zero the key_values on op, decrementing the shared-string
538	* refcounts and freeing the links.	471	* refcounts and freeing the links.
539	*/	472	*/
…		…
555	{	488	{
556	attachable_base::clear ();	489	attachable_base::clear ();
557		490
558	free_key_values (this);	491	free_key_values (this);
559		492
560	clear_owner (this);	493	owner = 0;
561
562	name = 0;	494	name = 0;
563	name_pl = 0;	495	name_pl = 0;
564	title = 0;	496	title = 0;
565	race = 0;	497	race = 0;
566	slaying = 0;	498	slaying = 0;
567	skill = 0;	499	skill = 0;
568	msg = 0;	500	msg = 0;
569	lore = 0;	501	lore = 0;
570	custom_name = 0;	502	custom_name = 0;
571	materialname = 0;	503	materialname = 0;
		504	contr = 0;
		505	below = 0;
		506	above = 0;
		507	inv = 0;
		508	container = 0;
		509	env = 0;
		510	more = 0;
		511	head = 0;
		512	map = 0;
		513	active_next = 0;
		514	active_prev = 0;
572		515
573	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	516	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
574		517
575	SET_FLAG (this, FLAG_REMOVED);	518	SET_FLAG (this, FLAG_REMOVED);
576	}
577		519
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 */	520	/* What is not cleared is next, prev, and count */
610		521
611	op->expmul = 1.0;	522	expmul = 1.0;
612	op->face = blank_face;	523	face = blank_face;
613	op->attacked_by_count = -1;
614		524
615	if (settings.casting_time)	525	if (settings.casting_time)
616	op->casting_time = -1;	526	casting_time = -1;
617	}	527	}
618		528
619	/*	529	/*
620	* copy object first frees everything allocated by the second object,	530	* copy_to first frees everything allocated by the dst object,
621	* and then copies the contends of the first object into the second	531	* and then copies the contents of itself into the second
622	* object, allocating what needs to be allocated. Basically, any	532	* object, allocating what needs to be allocated. Basically, any
623	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	533	* 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	534	* if the first object is freed, the pointers in the new object
625	* will point at garbage.	535	* will point at garbage.
626	*/	536	*/
627
628	void	537	void
629	copy_object (object *op2, object *op)	538	object::copy_to (object *dst)
630	{	539	{
631	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
632	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
633		542
634	op2->clone (op);	543	*(object_copy *)dst = *this;
		544	*(object_pod *)dst = *this;
		545
		546	if (self || cb)
		547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
635		548
636	if (is_freed)	549	if (is_freed)
637	SET_FLAG (op, FLAG_FREED);	550	SET_FLAG (dst, FLAG_FREED);
		551
638	if (is_removed)	552	if (is_removed)
639	SET_FLAG (op, FLAG_REMOVED);	553	SET_FLAG (dst, FLAG_REMOVED);
640		554
641	if (op2->speed < 0)	555	if (speed < 0)
642	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
643		557
644	/* Copy over key_values, if any. */	558	/* Copy over key_values, if any. */
645	if (op2->key_values)	559	if (key_values)
646	{	560	{
647	key_value *tail = 0;	561	key_value *tail = 0;
648	key_value *i;	562	key_value *i;
649		563
650	op->key_values = 0;	564	dst->key_values = 0;
651		565
652	for (i = op2->key_values; i; i = i->next)	566	for (i = key_values; i; i = i->next)
653	{	567	{
654	key_value *new_link = new key_value;	568	key_value *new_link = new key_value;
655		569
656	new_link->next = 0;	570	new_link->next = 0;
657	new_link->key = i->key;	571	new_link->key = i->key;
658	new_link->value = i->value;	572	new_link->value = i->value;
659		573
660	/* Try and be clever here, too. */	574	/* Try and be clever here, too. */
661	if (!op->key_values)	575	if (!dst->key_values)
662	{	576	{
663	op->key_values = new_link;	577	dst->key_values = new_link;
664	tail = new_link;	578	tail = new_link;
665	}	579	}
666	else	580	else
667	{	581	{
668	tail->next = new_link;	582	tail->next = new_link;
669	tail = new_link;	583	tail = new_link;
670	}	584	}
671	}	585	}
672	}	586	}
673		587
674	update_ob_speed (op);	588	update_ob_speed (dst);
		589	}
		590
		591	object *
		592	object::clone ()
		593	{
		594	object *neu = create ();
		595	copy_to (neu);
		596	return neu;
675	}	597	}
676		598
677	/*	599	/*
678	* If an object with the IS_TURNABLE() flag needs to be turned due	600	* 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	601	* to the closest player being on the other side, this function can
…		…
692	/*	614	/*
693	* Updates the speed of an object. If the speed changes from 0 to another	615	* 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.	616	* 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.	617	* This function needs to be called whenever the speed of an object changes.
696	*/	618	*/
697
698	void	619	void
699	update_ob_speed (object *op)	620	update_ob_speed (object *op)
700	{	621	{
701	extern int arch_init;	622	extern int arch_init;
702		623
…		…
711	abort ();	632	abort ();
712	#else	633	#else
713	op->speed = 0;	634	op->speed = 0;
714	#endif	635	#endif
715	}	636	}
		637
716	if (arch_init)	638	if (arch_init)
717	{
718	return;	639	return;
719	}	640
720	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721	{	642	{
722	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
723	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
724	return;	645	return;
725		646
726	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
727	* of the list. */	648	* of the list. */
728	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
729	if (op->active_next != NULL)	651	if (op->active_next != NULL)
730	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
731	active_objects = op;	654	active_objects = op;
732	}	655	}
733	else	656	else
734	{	657	{
735	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
737	return;	660	return;
738		661
739	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
740	{	663	{
741	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
742	if (op->active_next != NULL)	666	if (op->active_next != NULL)
743	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
744	}	668	}
745	else	669	else
746	{	670	{
747	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
748	if (op->active_next)	673	if (op->active_next)
749	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
750	}	675	}
		676
751	op->active_next = NULL;	677	op->active_next = NULL;
752	op->active_prev = NULL;	678	op->active_prev = NULL;
753	}	679	}
754	}	680	}
755		681
…		…
880	update_now = 1;	806	update_now = 1;
881		807
882	if ((move_slow | op->move_slow) != move_slow)	808	if ((move_slow | op->move_slow) != move_slow)
883	update_now = 1;	809	update_now = 1;
884	}	810	}
		811
885	/* if the object is being removed, we can't make intelligent	812	/* if the object is being removed, we can't make intelligent
886	* decisions, because remove_ob can't really pass the object	813	* decisions, because remove_ob can't really pass the object
887	* that is being removed.	814	* that is being removed.
888	*/	815	*/
889	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
901		828
902	if (op->more != NULL)	829	if (op->more != NULL)
903	update_object (op->more, action);	830	update_object (op->more, action);
904	}	831	}
905		832
906	static unordered_vector < object *>mortals;	833	object::vector object::mortals;
907	static	834	object::vector object::objects; // not yet used
908	std::vector < object *>	835	object *object::first;
909	freed;
910		836
911	void object::free_mortals ()	837	void object::free_mortals ()
912	{	838	{
913	for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)	839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914	if (!(*i)->refcount)	840	if ((*i)->refcnt)
		841	++i; // further delay freeing
		842	else
915	{	843	{
916	freed.push_back (*i);	844	delete *i;
917	mortals.erase (i);	845	mortals.erase (i);
918	}	846	}
919	else
920	++i;
921	}	847	}
922		848
923	object::object ()	849	object::object ()
924	{	850	{
925	SET_FLAG (this, FLAG_REMOVED);	851	SET_FLAG (this, FLAG_REMOVED);
926		852
927	expmul = 1.0;	853	expmul = 1.0;
928	face = blank_face;	854	face = blank_face;
929	attacked_by_count = -1;
930	}	855	}
931		856
932	object::~object ()	857	object::~object ()
933	{	858	{
934	free_key_values (this);	859	free_key_values (this);
935	}	860	}
936		861
937	void object::link ()	862	void object::link ()
938	{	863	{
939	count = ++ob_count;	864	count = ++ob_count;
		865	uuid = gen_uuid ();
940		866
941	prev = 0;	867	prev = 0;
942	next = objects;	868	next = object::first;
943		869
944	if (objects)	870	if (object::first)
945	objects->prev = this;	871	object::first->prev = this;
946		872
947	objects = this;	873	object::first = this;
948	}	874	}
949		875
950	void object::unlink ()	876	void object::unlink ()
951	{	877	{
952	count = 0;	878	if (this == object::first)
		879	object::first = next;
953		880
954	/* Remove this object from the list of used objects */	881	/* Remove this object from the list of used objects */
955	if (prev)
956	{
957	prev->next = next;	882	if (prev) prev->next = next;
		883	if (next) next->prev = prev;
		884
958	prev = 0;	885	prev = 0;
959	}
960
961	if (next)
962	{
963	next->prev = prev;
964	next = 0;	886	next = 0;
965	}
966
967	if (this == objects)
968	objects = next;
969	}	887	}
970		888
971	object *object::create ()	889	object *object::create ()
972	{	890	{
973	object *
974	op;
975
976	if (freed.empty ())
977	op = new object;	891	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 ();	892	op->link ();
989	return op;	893	return op;
990	}	894	}
991		895
992	/*	896	/*
…		…
994	* it from the list of used objects, and puts it on the list of	898	* 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.	899	* free objects. The IS_FREED() flag is set in the object.
996	* The object must have been removed by remove_ob() first for	900	* The object must have been removed by remove_ob() first for
997	* this function to succeed.	901	* this function to succeed.
998	*	902	*
999	* If free_inventory is set, free inventory as well. Else drop items in	903	* If destroy_inventory is set, free inventory as well. Else drop items in
1000	* inventory to the ground.	904	* inventory to the ground.
1001	*/	905	*/
1002	void object::free (bool free_inventory)	906	void object::destroy (bool destroy_inventory)
1003	{	907	{
1004	if (QUERY_FLAG (this, FLAG_FREED))	908	if (QUERY_FLAG (this, FLAG_FREED))
1005	return;	909	return;
1006		910
1007	if (!QUERY_FLAG (this, FLAG_REMOVED))
1008	remove_ob (this);
1009
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))	911	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);	912	remove_friendly_object (this);
1012		913
		914	if (!QUERY_FLAG (this, FLAG_REMOVED))
		915	remove ();
		916
1013	SET_FLAG (this, FLAG_FREED);	917	SET_FLAG (this, FLAG_FREED);
1014		918
1015	if (more)	919	if (more)
1016	{	920	{
1017	more->free (free_inventory);	921	more->destroy (destroy_inventory);
1018	more = 0;	922	more = 0;
1019	}	923	}
1020		924
1021	if (inv)	925	if (inv)
1022	{	926	{
1023	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
1024	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
1025	* drop on that space.	929	* drop on that space.
1026	*/	930	*/
1027	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	931	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1028	{	932	{
1029	object *op = inv;	933	object *op = inv;
1030		934
1031	while (op)	935	while (op)
1032	{	936	{
1033	object *tmp = op->below;	937	object *tmp = op->below;
1034	op->free (free_inventory);	938	op->destroy (destroy_inventory);
1035	op = tmp;	939	op = tmp;
1036	}	940	}
1037	}	941	}
1038	else	942	else
1039	{ /* Put objects in inventory onto this space */	943	{ /* Put objects in inventory onto this space */
…		…
1041		945
1042	while (op)	946	while (op)
1043	{	947	{
1044	object *tmp = op->below;	948	object *tmp = op->below;
1045		949
1046	remove_ob (op);	950	op->remove ();
1047		951
1048	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	952	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))	953	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1050	free_object (op);	954	op->destroy ();
1051	else	955	else
1052	{	956	{
1053	op->x = x;	957	op->x = x;
1054	op->y = y;	958	op->y = y;
1055	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	959	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1058	op = tmp;	962	op = tmp;
1059	}	963	}
1060	}	964	}
1061	}	965	}
1062		966
1063	clear_owner (this);	967	// hack to ensure that freed objects still have a valid map
		968	{
		969	static maptile *freed_map; // freed objects are moved here to avoid crashes
		970
		971	if (!freed_map)
		972	{
		973	freed_map = new maptile;
		974
		975	freed_map->name = "/internal/freed_objects_map";
		976	freed_map->width = 3;
		977	freed_map->height = 3;
		978
		979	freed_map->allocate ();
		980	}
		981
		982	map = freed_map;
		983	x = 1;
		984	y = 1;
		985	}
		986
		987	// clear those pointers that likely might have circular references to us
		988	owner = 0;
		989	enemy = 0;
		990	attacked_by = 0;
		991
		992	// only relevant for players(?), but make sure of it anyways
		993	contr = 0;
1064		994
1065	/* Remove object from the active list */	995	/* Remove object from the active list */
1066	speed = 0;	996	speed = 0;
1067	update_ob_speed (this);	997	update_ob_speed (this);
1068		998
…		…
1073		1003
1074	/*	1004	/*
1075	* sub_weight() recursively (outwards) subtracts a number from the	1005	* sub_weight() recursively (outwards) subtracts a number from the
1076	* weight of an object (and what is carried by it's environment(s)).	1006	* weight of an object (and what is carried by it's environment(s)).
1077	*/	1007	*/
1078
1079	void	1008	void
1080	sub_weight (object *op, signed long weight)	1009	sub_weight (object *op, signed long weight)
1081	{	1010	{
1082	while (op != NULL)	1011	while (op != NULL)
1083	{	1012	{
1084	if (op->type == CONTAINER)	1013	if (op->type == CONTAINER)
1085	{
1086	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1014	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087	}	1015
1088	op->carrying -= weight;	1016	op->carrying -= weight;
1089	op = op->env;	1017	op = op->env;
1090	}	1018	}
1091	}	1019	}
1092		1020
1093	/* remove_ob(op):	1021	/* op->remove ():
1094	* This function removes the object op from the linked list of objects	1022	* 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	1023	* which it is currently tied to. When this function is done, the
1096	* object will have no environment. If the object previously had an	1024	* object will have no environment. If the object previously had an
1097	* environment, the x and y coordinates will be updated to	1025	* environment, the x and y coordinates will be updated to
1098	* the previous environment.	1026	* the previous environment.
1099	* Beware: This function is called from the editor as well!	1027	* Beware: This function is called from the editor as well!
1100	*/	1028	*/
1101
1102	void	1029	void
1103	remove_ob (object *op)	1030	object::remove ()
1104	{	1031	{
		1032	object *tmp, *last = 0;
1105	object *	1033	object *otmp;
1106	tmp, *
1107	last = NULL;
1108	object *
1109	otmp;
1110		1034
1111	tag_t
1112	tag;
1113	int
1114	check_walk_off;	1035	int check_walk_off;
1115	mapstruct *
1116	m;
1117		1036
1118	sint16
1119	x,
1120	y;
1121
1122	if (QUERY_FLAG (op, FLAG_REMOVED))	1037	if (QUERY_FLAG (this, FLAG_REMOVED))
1123	return;	1038	return;
1124		1039
1125	SET_FLAG (op, FLAG_REMOVED);	1040	SET_FLAG (this, FLAG_REMOVED);
1126		1041
1127	if (op->more != NULL)	1042	if (more)
1128	remove_ob (op->more);	1043	more->remove ();
1129		1044
1130	/*	1045	/*
1131	* In this case, the object to be removed is in someones	1046	* In this case, the object to be removed is in someones
1132	* inventory.	1047	* inventory.
1133	*/	1048	*/
1134	if (op->env != NULL)	1049	if (env)
1135	{	1050	{
1136	if (op->nrof)	1051	if (nrof)
1137	sub_weight (op->env, op->weight * op->nrof);	1052	sub_weight (env, weight * nrof);
1138	else	1053	else
1139	sub_weight (op->env, op->weight + op->carrying);	1054	sub_weight (env, weight + carrying);
1140		1055
1141	/* NO_FIX_PLAYER is set when a great many changes are being	1056	/* NO_FIX_PLAYER is set when a great many changes are being
1142	* made to players inventory. If set, avoiding the call	1057	* made to players inventory. If set, avoiding the call
1143	* to save cpu time.	1058	* to save cpu time.
1144	*/	1059	*/
1145	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1060	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1146	fix_player (otmp);	1061	fix_player (otmp);
1147		1062
1148	if (op->above != NULL)	1063	if (above != NULL)
1149	op->above->below = op->below;	1064	above->below = below;
1150	else	1065	else
1151	op->env->inv = op->below;	1066	env->inv = below;
1152		1067
1153	if (op->below != NULL)	1068	if (below != NULL)
1154	op->below->above = op->above;	1069	below->above = above;
1155		1070
1156	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1157	* the map, but we don't actually do that - it is up	1072	* the map, but we don't actually do that - it is up
1158	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1159	*/	1074	*/
1160	op->x = op->env->x, op->y = op->env->y;	1075	x = env->x, y = env->y;
1161	op->map = op->env->map;	1076	map = env->map;
1162	op->above = NULL, op->below = NULL;	1077	above = 0, below = 0;
1163	op->env = NULL;	1078	env = 0;
1164	}	1079	}
1165	else if (op->map)	1080	else if (map)
1166	{	1081	{
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	1082	/* Re did the following section of code - it looks like it had
1187	* lots of logic for things we no longer care about	1083	* lots of logic for things we no longer care about
1188	*/	1084	*/
1189		1085
1190	/* link the object above us */	1086	/* link the object above us */
1191	if (op->above)	1087	if (above)
1192	op->above->below = op->below;	1088	above->below = below;
1193	else	1089	else
1194	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1090	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1195		1091
1196	/* Relink the object below us, if there is one */	1092	/* Relink the object below us, if there is one */
1197	if (op->below)	1093	if (below)
1198	op->below->above = op->above;	1094	below->above = above;
1199	else	1095	else
1200	{	1096	{
1201	/* Nothing below, which means we need to relink map object for this space	1097	/* 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	1098	* use translated coordinates in case some oddness with map tiling is
1203	* evident	1099	* evident
1204	*/	1100	*/
1205	if (GET_MAP_OB (m, x, y) != op)	1101	if (GET_MAP_OB (map, x, y) != this)
1206	{	1102	{
1207	dump_object (op);	1103	char *dump = dump_object (this);
1208	LOG (llevError,	1104	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);	1105	"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);
		1106	free (dump);
1210	dump_object (GET_MAP_OB (m, x, y));	1107	dump = dump_object (GET_MAP_OB (map, x, y));
1211	LOG (llevError, "%s\n", errmsg);	1108	LOG (llevError, "%s\n", dump);
		1109	free (dump);
1212	}	1110	}
1213		1111
1214	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1215	}	1113	}
1216		1114
1217	op->above = 0;	1115	above = 0;
1218	op->below = 0;	1116	below = 0;
1219		1117
1220	if (op->map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1221	return;	1119	return;
1222		1120
1223	tag = op->count;
1224	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1225		1122
1226	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1227	{	1124	{
1228	/* No point updating the players look faces if he is the object	1125	/* No point updating the players look faces if he is the object
1229	* being removed.	1126	* being removed.
1230	*/	1127	*/
1231		1128
1232	if (tmp->type == PLAYER && tmp != op)	1129	if (tmp->type == PLAYER && tmp != this)
1233	{	1130	{
1234	/* If a container that the player is currently using somehow gets	1131	/* If a container that the player is currently using somehow gets
1235	* removed (most likely destroyed), update the player view	1132	* removed (most likely destroyed), update the player view
1236	* appropriately.	1133	* appropriately.
1237	*/	1134	*/
1238	if (tmp->container == op)	1135	if (tmp->container == this)
1239	{	1136	{
1240	CLEAR_FLAG (op, FLAG_APPLIED);	1137	CLEAR_FLAG (this, FLAG_APPLIED);
1241	tmp->container = NULL;	1138	tmp->container = 0;
1242	}	1139	}
1243		1140
1244	tmp->contr->socket.update_look = 1;	1141	tmp->contr->socket->floorbox_update ();
1245	}	1142	}
1246		1143
1247	/* See if player moving off should effect something */	1144	/* 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))	1145	if (check_walk_off
		1146	&& ((move_type & tmp->move_off)
		1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249	{	1148	{
1250	move_apply (tmp, op, NULL);	1149	move_apply (tmp, this, 0, false);
1251		1150
1252	if (was_destroyed (op, tag))	1151	if (destroyed ())
1253	{
1254	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1255	}
1256	}	1153	}
1257		1154
1258	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259		1156
1260	if (tmp->above == tmp)	1157	if (tmp->above == tmp)
1261	tmp->above = NULL;	1158	tmp->above = 0;
1262		1159
1263	last = tmp;	1160	last = tmp;
1264	}	1161	}
1265		1162
1266	/* last == NULL of there are no objects on this space */	1163	/* last == NULL of there are no objects on this space */
1267	if (last == NULL)	1164	if (!last)
1268	{	1165	{
1269	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1270	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1167	* 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	1168	* those out anyways, and if there are any flags set right now, they won't
1272	* be correct anyways.	1169	* be correct anyways.
1273	*/	1170	*/
1274	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1275	update_position (op->map, op->x, op->y);	1172	update_position (map, x, y);
1276	}	1173	}
1277	else	1174	else
1278	update_object (last, UP_OBJ_REMOVE);	1175	update_object (last, UP_OBJ_REMOVE);
1279		1176
1280	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1281	update_all_los (op->map, op->x, op->y);	1178	update_all_los (map, x, y);
1282	}	1179	}
1283	}	1180	}
1284		1181
1285	/*	1182	/*
1286	* merge_ob(op,top):	1183	* merge_ob(op,top):
…		…
1288	* This function goes through all objects below and including top, and	1185	* This function goes through all objects below and including top, and
1289	* merges op to the first matching object.	1186	* merges op to the first matching object.
1290	* If top is NULL, it is calculated.	1187	* If top is NULL, it is calculated.
1291	* Returns pointer to object if it succeded in the merge, otherwise NULL	1188	* Returns pointer to object if it succeded in the merge, otherwise NULL
1292	*/	1189	*/
1293
1294	object *	1190	object *
1295	merge_ob (object *op, object *top)	1191	merge_ob (object *op, object *top)
1296	{	1192	{
1297	if (!op->nrof)	1193	if (!op->nrof)
1298	return 0;	1194	return 0;
…		…
1302		1198
1303	for (; top != NULL; top = top->below)	1199	for (; top != NULL; top = top->below)
1304	{	1200	{
1305	if (top == op)	1201	if (top == op)
1306	continue;	1202	continue;
1307	if (CAN_MERGE (op, top))	1203
		1204	if (object::can_merge (op, top))
1308	{	1205	{
1309	top->nrof += op->nrof;	1206	top->nrof += op->nrof;
1310		1207
1311	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1208	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1312	op->weight = 0; /* Don't want any adjustements now */	1209	op->weight = 0; /* Don't want any adjustements now */
1313	remove_ob (op);	1210	op->destroy ();
1314	free_object (op);
1315	return top;	1211	return top;
1316	}	1212	}
1317	}	1213	}
1318		1214
1319	return NULL;	1215	return 0;
1320	}	1216	}
1321		1217
1322	/*	1218	/*
1323	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1219	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1324	* job preparing multi-part monsters	1220	* job preparing multi-part monsters
1325	*/	1221	*/
1326	object *	1222	object *
1327	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1223	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1328	{	1224	{
1329	object *tmp;	1225	object *tmp;
1330		1226
1331	if (op->head)	1227	if (op->head)
1332	op = op->head;	1228	op = op->head;
…		…
1360	* NULL if 'op' was destroyed	1256	* NULL if 'op' was destroyed
1361	* just 'op' otherwise	1257	* just 'op' otherwise
1362	*/	1258	*/
1363		1259
1364	object *	1260	object *
1365	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1261	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366	{	1262	{
1367	object *tmp, *top, *floor = NULL;	1263	object *tmp, *top, *floor = NULL;
1368	sint16 x, y;	1264	sint16 x, y;
1369		1265
1370	if (QUERY_FLAG (op, FLAG_FREED))	1266	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1373	return NULL;	1269	return NULL;
1374	}	1270	}
1375		1271
1376	if (m == NULL)	1272	if (m == NULL)
1377	{	1273	{
1378	dump_object (op);	1274	char *dump = dump_object (op);
1379	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1275	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1276	free (dump);
1380	return op;	1277	return op;
1381	}	1278	}
1382		1279
1383	if (out_of_map (m, op->x, op->y))	1280	if (out_of_map (m, op->x, op->y))
1384	{	1281	{
1385	dump_object (op);	1282	char *dump = dump_object (op);
1386	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1387	#ifdef MANY_CORES	1284	#ifdef MANY_CORES
1388	/* Better to catch this here, as otherwise the next use of this object	1285	/* 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	1286	* is likely to cause a crash. Better to find out where it is getting
1390	* improperly inserted.	1287	* improperly inserted.
1391	*/	1288	*/
1392	abort ();	1289	abort ();
1393	#endif	1290	#endif
		1291	free (dump);
1394	return op;	1292	return op;
1395	}	1293	}
1396		1294
1397	if (!QUERY_FLAG (op, FLAG_REMOVED))	1295	if (!QUERY_FLAG (op, FLAG_REMOVED))
1398	{	1296	{
1399	dump_object (op);	1297	char *dump = dump_object (op);
1400	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1298	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1299	free (dump);
1401	return op;	1300	return op;
1402	}	1301	}
1403		1302
1404	if (op->more != NULL)	1303	if (op->more != NULL)
1405	{	1304	{
…		…
1443		1342
1444	/* this has to be done after we translate the coordinates.	1343	/* this has to be done after we translate the coordinates.
1445	*/	1344	*/
1446	if (op->nrof && !(flag & INS_NO_MERGE))	1345	if (op->nrof && !(flag & INS_NO_MERGE))
1447	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1346	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1448	if (CAN_MERGE (op, tmp))	1347	if (object::can_merge (op, tmp))
1449	{	1348	{
1450	op->nrof += tmp->nrof;	1349	op->nrof += tmp->nrof;
1451	remove_ob (tmp);	1350	tmp->destroy ();
1452	free_object (tmp);
1453	}	1351	}
1454		1352
1455	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1456	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1457		1355
…		…
1585	* it, so save a few ticks and start from there.	1483	* it, so save a few ticks and start from there.
1586	*/	1484	*/
1587	if (!(flag & INS_MAP_LOAD))	1485	if (!(flag & INS_MAP_LOAD))
1588	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1589	if (tmp->type == PLAYER)	1487	if (tmp->type == PLAYER)
1590	tmp->contr->socket.update_look = 1;	1488	tmp->contr->socket->floorbox_update ();
1591		1489
1592	/* If this object glows, it may affect lighting conditions that are	1490	/* If this object glows, it may affect lighting conditions that are
1593	* visible to others on this map. But update_all_los is really	1491	* 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	1492	* 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	1493	* on the map will get recalculated. The players could very well
…		…
1603		1501
1604	/* updates flags (blocked, alive, no magic, etc) for this map space */	1502	/* updates flags (blocked, alive, no magic, etc) for this map space */
1605	update_object (op, UP_OBJ_INSERT);	1503	update_object (op, UP_OBJ_INSERT);
1606		1504
1607	/* Don't know if moving this to the end will break anything. However,	1505	/* 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.	1506	* we want to have floorbox_update called before calling this.
1609	*	1507	*
1610	* check_move_on() must be after this because code called from	1508	* check_move_on() must be after this because code called from
1611	* check_move_on() depends on correct map flags (so functions like	1509	* check_move_on() depends on correct map flags (so functions like
1612	* blocked() and wall() work properly), and these flags are updated by	1510	* blocked() and wall() work properly), and these flags are updated by
1613	* update_object().	1511	* update_object().
…		…
1643	tmp1;	1541	tmp1;
1644		1542
1645	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1646		1544
1647	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	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 */	1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1650	{	1547	tmp->destroy ();
1651	remove_ob (tmp);
1652	free_object (tmp);
1653	}
1654	}
1655		1548
1656	tmp1 = arch_to_object (find_archetype (arch_string));	1549	tmp1 = arch_to_object (archetype::find (arch_string));
1657		1550
1658	tmp1->x = op->x;	1551	tmp1->x = op->x;
1659	tmp1->y = op->y;	1552	tmp1->y = op->y;
1660	insert_ob_in_map (tmp1, op->map, op, 0);	1553	insert_ob_in_map (tmp1, op->map, op, 0);
1661	}	1554	}
…		…
1669	*/	1562	*/
1670		1563
1671	object *	1564	object *
1672	get_split_ob (object *orig_ob, uint32 nr)	1565	get_split_ob (object *orig_ob, uint32 nr)
1673	{	1566	{
1674	object *	1567	object *newob;
1675	newob;
1676	int
1677	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1678		1569
1679	if (orig_ob->nrof < nr)	1570	if (orig_ob->nrof < nr)
1680	{	1571	{
1681	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1572	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1682	return NULL;	1573	return NULL;
1683	}	1574	}
1684		1575
1685	newob = object_create_clone (orig_ob);	1576	newob = object_create_clone (orig_ob);
1686		1577
1687	if ((orig_ob->nrof -= nr) < 1)	1578	if ((orig_ob->nrof -= nr) < 1)
1688	{	1579	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)	1580	else if (!is_removed)
1694	{	1581	{
1695	if (orig_ob->env != NULL)	1582	if (orig_ob->env != NULL)
1696	sub_weight (orig_ob->env, orig_ob->weight * nr);	1583	sub_weight (orig_ob->env, orig_ob->weight * nr);
1697	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1584	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1761	esrv_send_item (tmp, op);	1648	esrv_send_item (tmp, op);
1762	}	1649	}
1763	}	1650	}
1764	else	1651	else
1765	{	1652	{
1766	remove_ob (op);	1653	op->remove ();
1767	op->nrof = 0;	1654	op->nrof = 0;
1768	if (tmp)	1655	if (tmp)
1769	{	1656	{
1770	esrv_del_item (tmp->contr, op->count);	1657	esrv_del_item (tmp->contr, op->count);
1771	}	1658	}
…		…
1777		1664
1778	if (i < op->nrof)	1665	if (i < op->nrof)
1779	op->nrof -= i;	1666	op->nrof -= i;
1780	else	1667	else
1781	{	1668	{
1782	remove_ob (op);	1669	op->remove ();
1783	op->nrof = 0;	1670	op->nrof = 0;
1784	}	1671	}
1785		1672
1786	/* Since we just removed op, op->above is null */	1673	/* Since we just removed op, op->above is null */
1787	for (tmp = above; tmp != NULL; tmp = tmp->above)	1674	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1796		1683
1797	if (op->nrof)	1684	if (op->nrof)
1798	return op;	1685	return op;
1799	else	1686	else
1800	{	1687	{
1801	free_object (op);	1688	op->destroy ();
1802	return NULL;	1689	return NULL;
1803	}	1690	}
1804	}	1691	}
1805		1692
1806	/*	1693	/*
…		…
1819	op->carrying += weight;	1706	op->carrying += weight;
1820	op = op->env;	1707	op = op->env;
1821	}	1708	}
1822	}	1709	}
1823		1710
		1711	object *
		1712	insert_ob_in_ob (object *op, object *where)
		1713	{
		1714	if (!where)
		1715	{
		1716	char *dump = dump_object (op);
		1717	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1718	free (dump);
		1719	return op;
		1720	}
		1721
		1722	if (where->head)
		1723	{
		1724	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1725	where = where->head;
		1726	}
		1727
		1728	return where->insert (op);
		1729	}
		1730
1824	/*	1731	/*
1825	* insert_ob_in_ob(op,environment):	1732	* env->insert (op)
1826	* This function inserts the object op in the linked list	1733	* This function inserts the object op in the linked list
1827	* inside the object environment.	1734	* inside the object environment.
1828	*	1735	*
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	1736	* The function returns now pointer to inserted item, and return value can
1835	* be != op, if items are merged. -Tero	1737	* be != op, if items are merged. -Tero
1836	*/	1738	*/
1837		1739
1838	object *	1740	object *
1839	insert_ob_in_ob (object *op, object *where)	1741	object::insert (object *op)
1840	{	1742	{
1841	object *	1743	object *tmp, *otmp;
1842	tmp, *
1843	otmp;
1844		1744
1845	if (!QUERY_FLAG (op, FLAG_REMOVED))	1745	if (!QUERY_FLAG (op, FLAG_REMOVED))
1846	{	1746	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		1747
1865	if (op->more)	1748	if (op->more)
1866	{	1749	{
1867	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1750	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1868	return op;	1751	return op;
…		…
1870		1753
1871	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1754	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1872	CLEAR_FLAG (op, FLAG_REMOVED);	1755	CLEAR_FLAG (op, FLAG_REMOVED);
1873	if (op->nrof)	1756	if (op->nrof)
1874	{	1757	{
1875	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1758	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1876	if (CAN_MERGE (tmp, op))	1759	if (object::can_merge (tmp, op))
1877	{	1760	{
1878	/* return the original object and remove inserted object	1761	/* return the original object and remove inserted object
1879	(client needs the original object) */	1762	(client needs the original object) */
1880	tmp->nrof += op->nrof;	1763	tmp->nrof += op->nrof;
1881	/* Weight handling gets pretty funky. Since we are adding to	1764	/* Weight handling gets pretty funky. Since we are adding to
1882	* tmp->nrof, we need to increase the weight.	1765	* tmp->nrof, we need to increase the weight.
1883	*/	1766	*/
1884	add_weight (where, op->weight * op->nrof);	1767	add_weight (this, op->weight * op->nrof);
1885	SET_FLAG (op, FLAG_REMOVED);	1768	SET_FLAG (op, FLAG_REMOVED);
1886	free_object (op); /* free the inserted object */	1769	op->destroy (); /* free the inserted object */
1887	op = tmp;	1770	op = tmp;
1888	remove_ob (op); /* and fix old object's links */	1771	op->remove (); /* and fix old object's links */
1889	CLEAR_FLAG (op, FLAG_REMOVED);	1772	CLEAR_FLAG (op, FLAG_REMOVED);
1890	break;	1773	break;
1891	}	1774	}
1892		1775
1893	/* I assume combined objects have no inventory	1776	/* I assume combined objects have no inventory
1894	* We add the weight - this object could have just been removed	1777	* We add the weight - this object could have just been removed
1895	* (if it was possible to merge). calling remove_ob will subtract	1778	* (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	1779	* the weight, so we need to add it in again, since we actually do
1897	* the linking below	1780	* the linking below
1898	*/	1781	*/
1899	add_weight (where, op->weight * op->nrof);	1782	add_weight (this, op->weight * op->nrof);
1900	}	1783	}
1901	else	1784	else
1902	add_weight (where, (op->weight + op->carrying));	1785	add_weight (this, (op->weight + op->carrying));
1903		1786
1904	otmp = is_player_inv (where);	1787	otmp = is_player_inv (this);
1905	if (otmp && otmp->contr != NULL)	1788	if (otmp && otmp->contr)
1906	{
1907	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1789	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1908	fix_player (otmp);	1790	fix_player (otmp);
1909	}
1910		1791
1911	op->map = NULL;	1792	op->map = NULL;
1912	op->env = where;	1793	op->env = this;
1913	op->above = NULL;	1794	op->above = NULL;
1914	op->below = NULL;	1795	op->below = NULL;
1915	op->x = 0, op->y = 0;	1796	op->x = 0, op->y = 0;
1916		1797
1917	/* reset the light list and los of the players on the map */	1798	/* reset the light list and los of the players on the map */
1918	if ((op->glow_radius != 0) && where->map)	1799	if ((op->glow_radius != 0) && map)
1919	{	1800	{
1920	#ifdef DEBUG_LIGHTS	1801	#ifdef DEBUG_LIGHTS
1921	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1802	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1922	#endif /* DEBUG_LIGHTS */	1803	#endif /* DEBUG_LIGHTS */
1923	if (MAP_DARKNESS (where->map))	1804	if (MAP_DARKNESS (map))
1924	update_all_los (where->map, where->x, where->y);	1805	update_all_los (map, x, y);
1925	}	1806	}
1926		1807
1927	/* Client has no idea of ordering so lets not bother ordering it here.	1808	/* Client has no idea of ordering so lets not bother ordering it here.
1928	* It sure simplifies this function...	1809	* It sure simplifies this function...
1929	*/	1810	*/
1930	if (where->inv == NULL)	1811	if (!inv)
1931	where->inv = op;	1812	inv = op;
1932	else	1813	else
1933	{	1814	{
1934	op->below = where->inv;	1815	op->below = inv;
1935	op->below->above = op;	1816	op->below->above = op;
1936	where->inv = op;	1817	inv = op;
1937	}	1818	}
		1819
1938	return op;	1820	return op;
1939	}	1821	}
1940		1822
1941	/*	1823	/*
1942	* Checks if any objects has a move_type that matches objects	1824	* Checks if any objects has a move_type that matches objects
…		…
1960	*/	1842	*/
1961		1843
1962	int	1844	int
1963	check_move_on (object *op, object *originator)	1845	check_move_on (object *op, object *originator)
1964	{	1846	{
1965	object *	1847	object *tmp;
1966	tmp;	1848	maptile *m = op->map;
1967	tag_t
1968	tag;
1969	mapstruct *
1970	m = op->map;
1971	int
1972	x = op->x, y = op->y;	1849	int x = op->x, y = op->y;
1973		1850
1974	MoveType	1851	MoveType move_on, move_slow, move_block;
1975	move_on,
1976	move_slow,
1977	move_block;
1978		1852
1979	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1853	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980	return 0;	1854	return 0;
1981
1982	tag = op->count;
1983		1855
1984	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1856	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);	1857	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);	1858	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987		1859
…		…
2046		1918
2047	/* Basically same logic as above, except now for actual apply. */	1919	/* Basically same logic as above, except now for actual apply. */
2048	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1920	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))	1921	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050	{	1922	{
2051	move_apply (tmp, op, originator);	1923	move_apply (tmp, op, originator, true);
2052		1924
2053	if (was_destroyed (op, tag))	1925	if (op->destroyed ())
2054	return 1;	1926	return 1;
2055		1927
2056	/* what the person/creature stepped onto has moved the object	1928	/* what the person/creature stepped onto has moved the object
2057	* someplace new. Don't process any further - if we did,	1929	* someplace new. Don't process any further - if we did,
2058	* have a feeling strange problems would result.	1930	* have a feeling strange problems would result.
…		…
2070	* a matching archetype at the given map and coordinates.	1942	* a matching archetype at the given map and coordinates.
2071	* The first matching object is returned, or NULL if none.	1943	* The first matching object is returned, or NULL if none.
2072	*/	1944	*/
2073		1945
2074	object *	1946	object *
2075	present_arch (const archetype *at, mapstruct *m, int x, int y)	1947	present_arch (const archetype *at, maptile *m, int x, int y)
2076	{	1948	{
2077	object *	1949	object *
2078	tmp;	1950	tmp;
2079		1951
2080	if (m == NULL || out_of_map (m, x, y))	1952	if (m == NULL || out_of_map (m, x, y))
…		…
2093	* a matching type variable at the given map and coordinates.	1965	* a matching type variable at the given map and coordinates.
2094	* The first matching object is returned, or NULL if none.	1966	* The first matching object is returned, or NULL if none.
2095	*/	1967	*/
2096		1968
2097	object *	1969	object *
2098	present (unsigned char type, mapstruct *m, int x, int y)	1970	present (unsigned char type, maptile *m, int x, int y)
2099	{	1971	{
2100	object *	1972	object *
2101	tmp;	1973	tmp;
2102		1974
2103	if (out_of_map (m, x, y))	1975	if (out_of_map (m, x, y))
…		…
2243	* the archetype because that isn't correct if the monster has been	2115	* the archetype because that isn't correct if the monster has been
2244	* customized, changed states, etc.	2116	* customized, changed states, etc.
2245	*/	2117	*/
2246		2118
2247	int	2119	int
2248	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2120	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249	{	2121	{
2250	int	2122	int
2251	i,	2123	i,
2252	index = 0, flag;	2124	index = 0, flag;
2253	static int	2125	static int
…		…
2274	return -1;	2146	return -1;
2275	return altern[RANDOM () % index];	2147	return altern[RANDOM () % index];
2276	}	2148	}
2277		2149
2278	/*	2150	/*
2279	* find_first_free_spot(archetype, mapstruct, x, y) works like	2151	* find_first_free_spot(archetype, maptile, x, y) works like
2280	* find_free_spot(), but it will search max number of squares.	2152	* find_free_spot(), but it will search max number of squares.
2281	* But it will return the first available spot, not a random choice.	2153	* 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.	2154	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2283	*/	2155	*/
2284		2156
2285	int	2157	int
2286	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2158	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287	{	2159	{
2288	int	2160	int
2289	i;	2161	i;
2290		2162
2291	for (i = 0; i < SIZEOFFREE; i++)	2163	for (i = 0; i < SIZEOFFREE; i++)
…		…
2355	* because we have to know what movement the thing looking to move	2227	* because we have to know what movement the thing looking to move
2356	* there is capable of.	2228	* there is capable of.
2357	*/	2229	*/
2358		2230
2359	int	2231	int
2360	find_dir (mapstruct *m, int x, int y, object *exclude)	2232	find_dir (maptile *m, int x, int y, object *exclude)
2361	{	2233	{
2362	int	2234	int
2363	i,	2235	i,
2364	max = SIZEOFFREE, mflags;	2236	max = SIZEOFFREE, mflags;
2365		2237
2366	sint16 nx, ny;	2238	sint16 nx, ny;
2367	object *	2239	object *
2368	tmp;	2240	tmp;
2369	mapstruct *	2241	maptile *
2370	mp;	2242	mp;
2371		2243
2372	MoveType blocked, move_type;	2244	MoveType blocked, move_type;
2373		2245
2374	if (exclude && exclude->head)	2246	if (exclude && exclude->head)
…		…
2582	* Modified to be map tile aware -.MSW	2454	* Modified to be map tile aware -.MSW
2583	*/	2455	*/
2584		2456
2585		2457
2586	int	2458	int
2587	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2459	can_see_monsterP (maptile *m, int x, int y, int dir)
2588	{	2460	{
2589	sint16 dx, dy;	2461	sint16 dx, dy;
2590	int	2462	int
2591	mflags;	2463	mflags;
2592		2464
…		…
2641	* create clone from object to another	2513	* create clone from object to another
2642	*/	2514	*/
2643	object *	2515	object *
2644	object_create_clone (object *asrc)	2516	object_create_clone (object *asrc)
2645	{	2517	{
2646	object *
2647	dst = NULL, *tmp, *src, *part, *prev, *item;	2518	object *dst = 0, *tmp, *src, *part, *prev, *item;
2648		2519
2649	if (!asrc)	2520	if (!asrc)
2650	return NULL;	2521	return 0;
		2522
2651	src = asrc;	2523	src = asrc;
2652	if (src->head)	2524	if (src->head)
2653	src = src->head;	2525	src = src->head;
2654		2526
2655	prev = NULL;	2527	prev = 0;
2656	for (part = src; part; part = part->more)	2528	for (part = src; part; part = part->more)
2657	{	2529	{
2658	tmp = get_object ();	2530	tmp = part->clone ();
2659	copy_object (part, tmp);
2660	tmp->x -= src->x;	2531	tmp->x -= src->x;
2661	tmp->y -= src->y;	2532	tmp->y -= src->y;
		2533
2662	if (!part->head)	2534	if (!part->head)
2663	{	2535	{
2664	dst = tmp;	2536	dst = tmp;
2665	tmp->head = NULL;	2537	tmp->head = 0;
2666	}	2538	}
2667	else	2539	else
2668	{	2540	{
2669	tmp->head = dst;	2541	tmp->head = dst;
2670	}	2542	}
		2543
2671	tmp->more = NULL;	2544	tmp->more = 0;
		2545
2672	if (prev)	2546	if (prev)
2673	prev->more = tmp;	2547	prev->more = tmp;
		2548
2674	prev = tmp;	2549	prev = tmp;
2675	}	2550	}
2676		2551
2677	/*** copy inventory ***/
2678	for (item = src->inv; item; item = item->below)	2552	for (item = src->inv; item; item = item->below)
2679	{
2680	(void) insert_ob_in_ob (object_create_clone (item), dst);	2553	insert_ob_in_ob (object_create_clone (item), dst);
2681	}
2682		2554
2683	return dst;	2555	return dst;
2684	}	2556	}
2685		2557
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. */	2558	/* 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 */	2559	/* 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, */	2560	/* 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. */	2561	/* 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. */	2562	/* Remember not to use load_object_str in a time-critical situation. */
2704
2705	/* Also remember that multiparts objects are not supported for now. */	2563	/* Also remember that multiparts objects are not supported for now. */
2706		2564
2707	object *	2565	object *
2708	load_object_str (const char *obstr)	2566	load_object_str (const char *obstr)
2709	{	2567	{
2710	object *	2568	object *op;
2711	op;
2712	char
2713	filename[MAX_BUF];	2569	char filename[MAX_BUF];
2714		2570
2715	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2571	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716		2572
2717	FILE *
2718	tempfile = fopen (filename, "w");	2573	FILE *tempfile = fopen (filename, "w");
2719		2574
2720	if (tempfile == NULL)	2575	if (tempfile == NULL)
2721	{	2576	{
2722	LOG (llevError, "Error - Unable to access load object temp file\n");	2577	LOG (llevError, "Error - Unable to access load object temp file\n");
2723	return NULL;	2578	return NULL;
2724	};	2579	}
		2580
2725	fprintf (tempfile, obstr);	2581	fprintf (tempfile, obstr);
2726	fclose (tempfile);	2582	fclose (tempfile);
2727		2583
2728	op = get_object ();	2584	op = object::create ();
2729		2585
2730	object_thawer thawer (filename);	2586	object_thawer thawer (filename);
2731		2587
2732	if (thawer)	2588	if (thawer)
2733	load_object (thawer, op, 0);	2589	load_object (thawer, op, 0);
…		…
2743	* returns NULL if no match.	2599	* returns NULL if no match.
2744	*/	2600	*/
2745	object *	2601	object *
2746	find_obj_by_type_subtype (const object *who, int type, int subtype)	2602	find_obj_by_type_subtype (const object *who, int type, int subtype)
2747	{	2603	{
2748	object *	2604	object *tmp;
2749	tmp;
2750		2605
2751	for (tmp = who->inv; tmp; tmp = tmp->below)	2606	for (tmp = who->inv; tmp; tmp = tmp->below)
2752	if (tmp->type == type && tmp->subtype == subtype)	2607	if (tmp->type == type && tmp->subtype == subtype)
2753	return tmp;	2608	return tmp;
2754		2609
…		…
2762	* do the desired thing.	2617	* do the desired thing.
2763	*/	2618	*/
2764	key_value *	2619	key_value *
2765	get_ob_key_link (const object *ob, const char *key)	2620	get_ob_key_link (const object *ob, const char *key)
2766	{	2621	{
2767	key_value *	2622	key_value *link;
2768	link;
2769		2623
2770	for (link = ob->key_values; link != NULL; link = link->next)	2624	for (link = ob->key_values; link != NULL; link = link->next)
2771	{
2772	if (link->key == key)	2625	if (link->key == key)
2773	{
2774	return link;	2626	return link;
2775	}
2776	}
2777		2627
2778	return NULL;	2628	return NULL;
2779	}	2629	}
2780		2630
2781	/*	2631	/*
…		…
2786	* The returned string is shared.	2636	* The returned string is shared.
2787	*/	2637	*/
2788	const char *	2638	const char *
2789	get_ob_key_value (const object *op, const char *const key)	2639	get_ob_key_value (const object *op, const char *const key)
2790	{	2640	{
2791	key_value *	2641	key_value *link;
2792	link;	2642	shstr_cmp canonical_key (key);
2793	const char *
2794	canonical_key;
2795		2643
2796	canonical_key = shstr::find (key);
2797
2798	if (canonical_key == NULL)	2644	if (!canonical_key)
2799	{	2645	{
2800	/* 1. There being a field named key on any object	2646	/* 1. There being a field named key on any object
2801	* implies there'd be a shared string to find.	2647	* implies there'd be a shared string to find.
2802	* 2. Since there isn't, no object has this field.	2648	* 2. Since there isn't, no object has this field.
2803	* 3. Therefore, *this* object doesn't have this field.	2649	* 3. Therefore, *this* object doesn't have this field.
2804	*/	2650	*/
2805	return NULL;	2651	return 0;
2806	}	2652	}
2807		2653
2808	/* This is copied from get_ob_key_link() above -	2654	/* This is copied from get_ob_key_link() above -
2809	* only 4 lines, and saves the function call overhead.	2655	* only 4 lines, and saves the function call overhead.
2810	*/	2656	*/
2811	for (link = op->key_values; link != NULL; link = link->next)	2657	for (link = op->key_values; link; link = link->next)
2812	{
2813	if (link->key == canonical_key)	2658	if (link->key == canonical_key)
2814	{
2815	return link->value;	2659	return link->value;
2816	}	2660
2817	}
2818	return NULL;	2661	return 0;
2819	}	2662	}
2820		2663
2821		2664
2822	/*	2665	/*
2823	* Updates the canonical_key in op to value.	2666	* Updates the canonical_key in op to value.
…		…
2908	{	2751	{
2909	shstr key_ (key);	2752	shstr key_ (key);
2910		2753
2911	return set_ob_key_value_s (op, key_, value, add_key);	2754	return set_ob_key_value_s (op, key_, value, add_key);
2912	}	2755	}
		2756
		2757	object::depth_iterator::depth_iterator (object *container)
		2758	: iterator_base (container)
		2759	{
		2760	while (item->inv)
		2761	item = item->inv;
		2762	}
		2763
		2764	void
		2765	object::depth_iterator::next ()
		2766	{
		2767	if (item->below)
		2768	{
		2769	item = item->below;
		2770
		2771	while (item->inv)
		2772	item = item->inv;
		2773	}
		2774	else
		2775	item = item->env;
		2776	}
		2777
		2778	// return a suitable string describing an objetc in enough detail to find it
		2779	const char *
		2780	object::debug_desc (char *info) const
		2781	{
		2782	char info2[256 * 3];
		2783	char *p = info;
		2784
		2785	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2786	count,
		2787	&name,
		2788	title ? " " : "",
		2789	title ? (const char *)title : "");
		2790
		2791	if (env)
		2792	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2793
		2794	if (map)
		2795	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2796
		2797	return info;
		2798	}
		2799
		2800	const char *
		2801	object::debug_desc () const
		2802	{
		2803	static char info[256 * 3];
		2804	return debug_desc (info);
		2805	}
		2806

Diff Legend

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