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

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