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

Diff Legend

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