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.34 by root, Tue Sep 12 01:09:53 2006 UTC vs.
Revision 1.78 by root, Fri Dec 22 16:34:00 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
		35	#include <bitset>
		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
37		40
38	object *objects; /* Pointer to the list of used objects */
39	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
40		42
41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	45	};
…		…
50	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	55	};
54		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
55	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56	static int	135	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	137	{
59	key_value *wants_field;	138	key_value *wants_field;
…		…
106	*	185	*
107	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
110	*	189	*
111	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
112	*	191	*
113	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
114	* check weight	193	* check weight
115	*/	194	*/
116		195
117	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	197	{
119	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
120	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
121	return 0;	204	return 0;
122		205
123	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
127	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
128	* used to store nrof).	209	* used to store nrof).
129	*/	210	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
140	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141		222
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		225
145		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
146	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
147	* being locked in inventory should prevent merging.
148	* 0x4 in flags3 is CLIENT_SENT
149	*/
150	if ((ob1->arch != ob2->arch) ||
151	(ob1->flags[0] != ob2->flags[0]) ||
152	(ob1->flags[1] != ob2->flags[1]) ||
153	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
154	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
155	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
156	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
157	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
158	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
159	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
160	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
161	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
162	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
163	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
164	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
165	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
166	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
167	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
168	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
169	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
170	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
171	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
172	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
173	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
174	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
175	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
176	return 0;	251	return 0;
177		252
178	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
179	* check all objects in the inventory.	254	* check all objects in the inventory.
180	*/	255	*/
…		…
183	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	260	return 0;
186		261
187	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	264	return 0;
190		265
191	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
192	* if it is valid.	267	* if it is valid.
193	*/	268	*/
…		…
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
431	void	426	void
432	free_all_object_data ()	427	free_all_object_data ()
433	{	428	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}
436
437	/*
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	object *
448	object::get_owner ()
449	{
450	if (!owner
451	|| QUERY_FLAG (owner, FLAG_FREED)
452	|| QUERY_FLAG (owner, FLAG_REMOVED))
453	owner = 0;
454
455	return owner;
456	}	430	}
457		431
458	/*	432	/*
459	* 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
460	* skill and experience objects.	434	* skill and experience objects.
…		…
493	}	467	}
494		468
495	op->key_values = 0;	469	op->key_values = 0;
496	}	470	}
497		471
498	void object::clear ()
499	{
500	attachable_base::clear ();
501
502	free_key_values (this);
503
504	owner = 0;
505	name = 0;
506	name_pl = 0;
507	title = 0;
508	race = 0;
509	slaying = 0;
510	skill = 0;
511	msg = 0;
512	lore = 0;
513	custom_name = 0;
514	materialname = 0;
515	contr = 0;
516	below = 0;
517	above = 0;
518	inv = 0;
519	container = 0;
520	env = 0;
521	more = 0;
522	head = 0;
523	map = 0;
524	active_next = 0;
525	active_prev = 0;
526
527	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
528
529	SET_FLAG (this, FLAG_REMOVED);
530
531	/* What is not cleared is next, prev, and count */
532
533	expmul = 1.0;
534	face = blank_face;
535	attacked_by_count = -1;
536
537	if (settings.casting_time)
538	casting_time = -1;
539	}
540
541	void object::clone (object *destination)
542	{
543	*(object_copy *)destination = *this;
544	*(object_pod *)destination = *this;
545
546	if (self || cb)
547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
548	}
549
550	/*	472	/*
551	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
552	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
553	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
554	* 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,
555	* 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
556	* will point at garbage.	478	* will point at garbage.
557	*/	479	*/
558	void	480	void
559	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
560	{	482	{
561	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
562	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
563		485
564	op2->clone (op);	486	*(object_copy *)dst = *this;
		487	*(object_pod *)dst = *this;
		488
		489	if (self || cb)
		490	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
565		491
566	if (is_freed)	492	if (is_freed)
567	SET_FLAG (op, FLAG_FREED);	493	SET_FLAG (dst, FLAG_FREED);
		494
568	if (is_removed)	495	if (is_removed)
569	SET_FLAG (op, FLAG_REMOVED);	496	SET_FLAG (dst, FLAG_REMOVED);
570		497
571	if (op2->speed < 0)	498	if (speed < 0)
572	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	499	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
573		500
574	/* Copy over key_values, if any. */	501	/* Copy over key_values, if any. */
575	if (op2->key_values)	502	if (key_values)
576	{	503	{
577	key_value *tail = 0;	504	key_value *tail = 0;
578	key_value *i;	505	key_value *i;
579		506
580	op->key_values = 0;	507	dst->key_values = 0;
581		508
582	for (i = op2->key_values; i; i = i->next)	509	for (i = key_values; i; i = i->next)
583	{	510	{
584	key_value *new_link = new key_value;	511	key_value *new_link = new key_value;
585		512
586	new_link->next = 0;	513	new_link->next = 0;
587	new_link->key = i->key;	514	new_link->key = i->key;
588	new_link->value = i->value;	515	new_link->value = i->value;
589		516
590	/* Try and be clever here, too. */	517	/* Try and be clever here, too. */
591	if (!op->key_values)	518	if (!dst->key_values)
592	{	519	{
593	op->key_values = new_link;	520	dst->key_values = new_link;
594	tail = new_link;	521	tail = new_link;
595	}	522	}
596	else	523	else
597	{	524	{
598	tail->next = new_link;	525	tail->next = new_link;
599	tail = new_link;	526	tail = new_link;
600	}	527	}
601	}	528	}
602	}	529	}
603		530
604	update_ob_speed (op);	531	update_ob_speed (dst);
		532	}
		533
		534	object *
		535	object::clone ()
		536	{
		537	object *neu = create ();
		538	copy_to (neu);
		539	return neu;
605	}	540	}
606		541
607	/*	542	/*
608	* If an object with the IS_TURNABLE() flag needs to be turned due	543	* If an object with the IS_TURNABLE() flag needs to be turned due
609	* to the closest player being on the other side, this function can	544	* to the closest player being on the other side, this function can
…		…
717	op->active_next = NULL;	652	op->active_next = NULL;
718	op->active_prev = NULL;	653	op->active_prev = NULL;
719	}	654	}
720		655
721	/*	656	/*
722	* update_object() updates the array which represents the map.	657	* update_object() updates the the map.
723	* It takes into account invisible objects (and represent squares covered	658	* It takes into account invisible objects (and represent squares covered
724	* by invisible objects by whatever is below them (unless it's another	659	* by invisible objects by whatever is below them (unless it's another
725	* invisible object, etc...)	660	* invisible object, etc...)
726	* If the object being updated is beneath a player, the look-window	661	* If the object being updated is beneath a player, the look-window
727	* of that player is updated (this might be a suboptimal way of	662	* of that player is updated (this might be a suboptimal way of
728	* updating that window, though, since update_object() is called _often_)	663	* updating that window, though, since update_object() is called _often_)
729	*	664	*
730	* action is a hint of what the caller believes need to be done.	665	* action is a hint of what the caller believes need to be done.
731	* For example, if the only thing that has changed is the face (due to
732	* an animation), we don't need to call update_position until that actually
733	* comes into view of a player. OTOH, many other things, like addition/removal
734	* of walls or living creatures may need us to update the flags now.
735	* current action are:	666	* current action are:
736	* UP_OBJ_INSERT: op was inserted	667	* UP_OBJ_INSERT: op was inserted
737	* UP_OBJ_REMOVE: op was removed	668	* UP_OBJ_REMOVE: op was removed
738	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	669	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
739	* as that is easier than trying to look at what may have changed.	670	* as that is easier than trying to look at what may have changed.
740	* UP_OBJ_FACE: only the objects face has changed.	671	* UP_OBJ_FACE: only the objects face has changed.
741	*/	672	*/
742
743	void	673	void
744	update_object (object *op, int action)	674	update_object (object *op, int action)
745	{	675	{
746	int update_now = 0, flags;
747	MoveType move_on, move_off, move_block, move_slow;	676	MoveType move_on, move_off, move_block, move_slow;
748		677
749	if (op == NULL)	678	if (op == NULL)
750	{	679	{
751	/* this should never happen */	680	/* this should never happen */
752	LOG (llevDebug, "update_object() called for NULL object.\n");	681	LOG (llevDebug, "update_object() called for NULL object.\n");
753	return;	682	return;
754	}	683	}
755		684
756	if (op->env != NULL)	685	if (op->env)
757	{	686	{
758	/* Animation is currently handled by client, so nothing	687	/* Animation is currently handled by client, so nothing
759	* to do in this case.	688	* to do in this case.
760	*/	689	*/
761	return;	690	return;
…		…
775	abort ();	704	abort ();
776	#endif	705	#endif
777	return;	706	return;
778	}	707	}
779		708
780	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	709	mapspace &m = op->ms ();
781	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
782	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
783	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
784	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
785	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
786		710
		711	if (m.flags_ & P_NEED_UPDATE)
		712	/* nop */;
787	if (action == UP_OBJ_INSERT)	713	else if (action == UP_OBJ_INSERT)
788	{	714	{
		715	// this is likely overkill, TODO: revisit (schmorp)
789	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	716	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
790	update_now = 1;
791
792	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	717	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
793	update_now = 1;	718	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
794		719	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		720	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
795	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	721	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
796	update_now = 1;
797
798	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
799	update_now = 1;
800
801	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
802	update_now = 1;
803
804	if ((move_on | op->move_on) != move_on)	722	|| (m.move_on | op->move_on ) != m.move_on
805	update_now = 1;
806
807	if ((move_off | op->move_off) != move_off)	723	|| (m.move_off | op->move_off ) != m.move_off
808	update_now = 1;	724	|| (m.move_slow | op->move_slow) != m.move_slow
809
810	/* This isn't perfect, but I don't expect a lot of objects to	725	/* This isn't perfect, but I don't expect a lot of objects to
811	* to have move_allow right now.	726	* to have move_allow right now.
812	*/	727	*/
813	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	728	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
814	update_now = 1;	729	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
815		730	m.flags_ = P_NEED_UPDATE;
816	if ((move_slow | op->move_slow) != move_slow)
817	update_now = 1;
818	}	731	}
819	/* if the object is being removed, we can't make intelligent	732	/* if the object is being removed, we can't make intelligent
820	* decisions, because remove_ob can't really pass the object	733	* decisions, because remove_ob can't really pass the object
821	* that is being removed.	734	* that is being removed.
822	*/	735	*/
823	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	736	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
824	update_now = 1;	737	m.flags_ = P_NEED_UPDATE;
825	else if (action == UP_OBJ_FACE)	738	else if (action == UP_OBJ_FACE)
826	/* Nothing to do for that case */ ;	739	/* Nothing to do for that case */ ;
827	else	740	else
828	LOG (llevError, "update_object called with invalid action: %d\n", action);	741	LOG (llevError, "update_object called with invalid action: %d\n", action);
829		742
830	if (update_now)
831	{
832	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
833	update_position (op->map, op->x, op->y);
834	}
835
836	if (op->more != NULL)	743	if (op->more)
837	update_object (op->more, action);	744	update_object (op->more, action);
838	}	745	}
839		746
840	static unordered_vector<object *> mortals;	747	object::vector object::mortals;
841	static std::vector<object *> freed;	748	object::vector object::objects; // not yet used
		749	object *object::first;
842		750
843	void object::free_mortals ()	751	void object::free_mortals ()
844	{	752	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	753	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
846	if ((*i)->refcnt)	754	if ((*i)->refcnt)
847	++i; // further delay freeing	755	++i; // further delay freeing
848	else	756	else
849	{	757	{
850	freed.push_back (*i);//D
851	//delete *i;	758	delete *i;
852	mortals.erase (i);	759	mortals.erase (i);
853	}	760	}
854
855	if (mortals.size())//D
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857	}	761	}
858		762
859	object::object ()	763	object::object ()
860	{	764	{
861	SET_FLAG (this, FLAG_REMOVED);	765	SET_FLAG (this, FLAG_REMOVED);
862		766
863	expmul = 1.0;	767	expmul = 1.0;
864	face = blank_face;	768	face = blank_face;
865	attacked_by_count = -1;
866	}	769	}
867		770
868	object::~object ()	771	object::~object ()
869	{	772	{
870	free_key_values (this);	773	free_key_values (this);
871	}	774	}
872		775
873	void object::link ()	776	void object::link ()
874	{	777	{
875	count = ++ob_count;	778	count = ++ob_count;
		779	uuid = gen_uuid ();
876		780
877	prev = 0;	781	prev = 0;
878	next = objects;	782	next = object::first;
879		783
880	if (objects)	784	if (object::first)
881	objects->prev = this;	785	object::first->prev = this;
882		786
883	objects = this;	787	object::first = this;
884	}	788	}
885		789
886	void object::unlink ()	790	void object::unlink ()
887	{	791	{
888	count = 0;	792	if (this == object::first)
		793	object::first = next;
889		794
890	/* Remove this object from the list of used objects */	795	/* Remove this object from the list of used objects */
891	if (prev)
892	{
893	prev->next = next;	796	if (prev) prev->next = next;
		797	if (next) next->prev = prev;
		798
894	prev = 0;	799	prev = 0;
895	}
896
897	if (next)
898	{
899	next->prev = prev;
900	next = 0;	800	next = 0;
901	}
902
903	if (this == objects)
904	objects = next;
905	}	801	}
906		802
907	object *object::create ()	803	object *object::create ()
908	{	804	{
909	object *op;
910
911	if (freed.empty ())
912	op = new object;	805	object *op = new object;
913	else
914	{
915	// highly annoying, but the only way to get it stable right now
916	op = freed.back ();
917	freed.pop_back ();
918	op->~object ();
919	new ((void *) op) object;
920	}
921
922	op->link ();	806	op->link ();
923	return op;	807	return op;
924	}	808	}
925		809
926	/*	810	/*
…		…
928	* it from the list of used objects, and puts it on the list of	812	* it from the list of used objects, and puts it on the list of
929	* free objects. The IS_FREED() flag is set in the object.	813	* free objects. The IS_FREED() flag is set in the object.
930	* The object must have been removed by remove_ob() first for	814	* The object must have been removed by remove_ob() first for
931	* this function to succeed.	815	* this function to succeed.
932	*	816	*
933	* If free_inventory is set, free inventory as well. Else drop items in	817	* If destroy_inventory is set, free inventory as well. Else drop items in
934	* inventory to the ground.	818	* inventory to the ground.
935	*/	819	*/
936	void object::free (bool free_inventory)	820	void object::destroy (bool destroy_inventory)
937	{	821	{
938	if (QUERY_FLAG (this, FLAG_FREED))	822	if (QUERY_FLAG (this, FLAG_FREED))
939	return;	823	return;
940		824
941	if (QUERY_FLAG (this, FLAG_FRIENDLY))	825	if (QUERY_FLAG (this, FLAG_FRIENDLY))
942	remove_friendly_object (this);	826	remove_friendly_object (this);
943		827
944	if (!QUERY_FLAG (this, FLAG_REMOVED))	828	if (!QUERY_FLAG (this, FLAG_REMOVED))
945	remove_ob (this);	829	remove ();
946		830
947	SET_FLAG (this, FLAG_FREED);	831	SET_FLAG (this, FLAG_FREED);
948		832
949	if (more)	833	if (more)
950	{	834	{
951	more->free (free_inventory);	835	more->destroy (destroy_inventory);
952	more = 0;	836	more = 0;
953	}	837	}
954		838
955	if (inv)	839	if (inv)
956	{	840	{
957	/* Only if the space blocks everything do we not process -	841	/* Only if the space blocks everything do we not process -
958	* if some form of movement is allowed, let objects	842	* if some form of movement is allowed, let objects
959	* drop on that space.	843	* drop on that space.
960	*/	844	*/
961	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	845	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
962	{	846	{
963	object *op = inv;	847	object *op = inv;
964		848
965	while (op)	849	while (op)
966	{	850	{
967	object *tmp = op->below;	851	object *tmp = op->below;
968	op->free (free_inventory);	852	op->destroy (destroy_inventory);
969	op = tmp;	853	op = tmp;
970	}	854	}
971	}	855	}
972	else	856	else
973	{ /* Put objects in inventory onto this space */	857	{ /* Put objects in inventory onto this space */
…		…
975		859
976	while (op)	860	while (op)
977	{	861	{
978	object *tmp = op->below;	862	object *tmp = op->below;
979		863
980	remove_ob (op);	864	op->remove ();
981		865
982	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	866	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
983	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	867	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
984	free_object (op);	868	op->destroy ();
985	else	869	else
986	{	870	{
987	op->x = x;	871	op->x = x;
988	op->y = y;	872	op->y = y;
989	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	873	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
992	op = tmp;	876	op = tmp;
993	}	877	}
994	}	878	}
995	}	879	}
996		880
		881	// hack to ensure that freed objects still have a valid map
		882	{
		883	static maptile *freed_map; // freed objects are moved here to avoid crashes
		884
		885	if (!freed_map)
		886	{
		887	freed_map = new maptile;
		888
		889	freed_map->name = "/internal/freed_objects_map";
		890	freed_map->width = 3;
		891	freed_map->height = 3;
		892
		893	freed_map->allocate ();
		894	}
		895
		896	map = freed_map;
		897	x = 1;
		898	y = 1;
		899	}
		900
		901	// clear those pointers that likely might have circular references to us
997	owner = 0;	902	owner = 0;
		903	enemy = 0;
		904	attacked_by = 0;
		905
		906	// only relevant for players(?), but make sure of it anyways
		907	contr = 0;
998		908
999	/* Remove object from the active list */	909	/* Remove object from the active list */
1000	speed = 0;	910	speed = 0;
1001	update_ob_speed (this);	911	update_ob_speed (this);
1002		912
…		…
1007		917
1008	/*	918	/*
1009	* sub_weight() recursively (outwards) subtracts a number from the	919	* sub_weight() recursively (outwards) subtracts a number from the
1010	* weight of an object (and what is carried by it's environment(s)).	920	* weight of an object (and what is carried by it's environment(s)).
1011	*/	921	*/
1012
1013	void	922	void
1014	sub_weight (object *op, signed long weight)	923	sub_weight (object *op, signed long weight)
1015	{	924	{
1016	while (op != NULL)	925	while (op != NULL)
1017	{	926	{
1018	if (op->type == CONTAINER)	927	if (op->type == CONTAINER)
1019	{
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	928	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021	}	929
1022	op->carrying -= weight;	930	op->carrying -= weight;
1023	op = op->env;	931	op = op->env;
1024	}	932	}
1025	}	933	}
1026		934
1027	/* remove_ob(op):	935	/* op->remove ():
1028	* This function removes the object op from the linked list of objects	936	* This function removes the object op from the linked list of objects
1029	* which it is currently tied to. When this function is done, the	937	* which it is currently tied to. When this function is done, the
1030	* object will have no environment. If the object previously had an	938	* object will have no environment. If the object previously had an
1031	* environment, the x and y coordinates will be updated to	939	* environment, the x and y coordinates will be updated to
1032	* the previous environment.	940	* the previous environment.
1033	* Beware: This function is called from the editor as well!	941	* Beware: This function is called from the editor as well!
1034	*/	942	*/
1035
1036	void	943	void
1037	remove_ob (object *op)	944	object::remove ()
1038	{	945	{
		946	object *tmp, *last = 0;
1039	object *	947	object *otmp;
1040	tmp, *
1041	last = NULL;
1042	object *
1043	otmp;
1044		948
1045	tag_t
1046	tag;
1047	int
1048	check_walk_off;	949	int check_walk_off;
1049	mapstruct *
1050	m;
1051		950
1052	sint16
1053	x,
1054	y;
1055
1056	if (QUERY_FLAG (op, FLAG_REMOVED))	951	if (QUERY_FLAG (this, FLAG_REMOVED))
1057	return;	952	return;
1058		953
1059	SET_FLAG (op, FLAG_REMOVED);	954	SET_FLAG (this, FLAG_REMOVED);
1060		955
1061	if (op->more != NULL)	956	if (more)
1062	remove_ob (op->more);	957	more->remove ();
1063		958
1064	/*	959	/*
1065	* In this case, the object to be removed is in someones	960	* In this case, the object to be removed is in someones
1066	* inventory.	961	* inventory.
1067	*/	962	*/
1068	if (op->env != NULL)	963	if (env)
1069	{	964	{
1070	if (op->nrof)	965	if (nrof)
1071	sub_weight (op->env, op->weight * op->nrof);	966	sub_weight (env, weight * nrof);
1072	else	967	else
1073	sub_weight (op->env, op->weight + op->carrying);	968	sub_weight (env, weight + carrying);
1074		969
1075	/* NO_FIX_PLAYER is set when a great many changes are being	970	/* NO_FIX_PLAYER is set when a great many changes are being
1076	* made to players inventory. If set, avoiding the call	971	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	972	* to save cpu time.
1078	*/	973	*/
1079	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	974	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1080	fix_player (otmp);	975	otmp->update_stats ();
1081		976
1082	if (op->above != NULL)	977	if (above != NULL)
1083	op->above->below = op->below;	978	above->below = below;
1084	else	979	else
1085	op->env->inv = op->below;	980	env->inv = below;
1086		981
1087	if (op->below != NULL)	982	if (below != NULL)
1088	op->below->above = op->above;	983	below->above = above;
1089		984
1090	/* we set up values so that it could be inserted into	985	/* we set up values so that it could be inserted into
1091	* the map, but we don't actually do that - it is up	986	* the map, but we don't actually do that - it is up
1092	* to the caller to decide what we want to do.	987	* to the caller to decide what we want to do.
1093	*/	988	*/
1094	op->x = op->env->x, op->y = op->env->y;	989	x = env->x, y = env->y;
1095	op->map = op->env->map;	990	map = env->map;
1096	op->above = NULL, op->below = NULL;	991	above = 0, below = 0;
1097	op->env = NULL;	992	env = 0;
1098	}	993	}
1099	else if (op->map)	994	else if (map)
1100	{	995	{
1101	x = op->x;
1102	y = op->y;
1103	m = get_map_from_coord (op->map, &x, &y);
1104
1105	if (!m)
1106	{
1107	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1108	op->map->path, op->x, op->y);
1109	/* in old days, we used to set x and y to 0 and continue.
1110	* it seems if we get into this case, something is probablye
1111	* screwed up and should be fixed.
1112	*/
1113	abort ();
1114	}
1115
1116	if (op->map != m)
1117	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1118	op->map->path, m->path, op->x, op->y, x, y);
1119
1120	/* Re did the following section of code - it looks like it had	996	/* Re did the following section of code - it looks like it had
1121	* lots of logic for things we no longer care about	997	* lots of logic for things we no longer care about
1122	*/	998	*/
1123		999
1124	/* link the object above us */	1000	/* link the object above us */
1125	if (op->above)	1001	if (above)
1126	op->above->below = op->below;	1002	above->below = below;
1127	else	1003	else
1128	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1004	map->at (x, y).top = below; /* we were top, set new top */
1129		1005
1130	/* Relink the object below us, if there is one */	1006	/* Relink the object below us, if there is one */
1131	if (op->below)	1007	if (below)
1132	op->below->above = op->above;	1008	below->above = above;
1133	else	1009	else
1134	{	1010	{
1135	/* Nothing below, which means we need to relink map object for this space	1011	/* Nothing below, which means we need to relink map object for this space
1136	* use translated coordinates in case some oddness with map tiling is	1012	* use translated coordinates in case some oddness with map tiling is
1137	* evident	1013	* evident
1138	*/	1014	*/
1139	if (GET_MAP_OB (m, x, y) != op)	1015	if (GET_MAP_OB (map, x, y) != this)
1140	{	1016	{
1141	dump_object (op);	1017	char *dump = dump_object (this);
1142	LOG (llevError,	1018	LOG (llevError,
1143	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1019	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1020	free (dump);
1144	dump_object (GET_MAP_OB (m, x, y));	1021	dump = dump_object (GET_MAP_OB (map, x, y));
1145	LOG (llevError, "%s\n", errmsg);	1022	LOG (llevError, "%s\n", dump);
		1023	free (dump);
1146	}	1024	}
1147		1025
1148	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1026	map->at (x, y).bottom = above; /* goes on above it. */
1149	}	1027	}
1150		1028
1151	op->above = 0;	1029	above = 0;
1152	op->below = 0;	1030	below = 0;
1153		1031
1154	if (op->map->in_memory == MAP_SAVING)	1032	if (map->in_memory == MAP_SAVING)
1155	return;	1033	return;
1156		1034
1157	tag = op->count;
1158	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1035	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1159		1036
1160	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1037	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1161	{	1038	{
1162	/* No point updating the players look faces if he is the object	1039	/* No point updating the players look faces if he is the object
1163	* being removed.	1040	* being removed.
1164	*/	1041	*/
1165		1042
1166	if (tmp->type == PLAYER && tmp != op)	1043	if (tmp->type == PLAYER && tmp != this)
1167	{	1044	{
1168	/* If a container that the player is currently using somehow gets	1045	/* If a container that the player is currently using somehow gets
1169	* removed (most likely destroyed), update the player view	1046	* removed (most likely destroyed), update the player view
1170	* appropriately.	1047	* appropriately.
1171	*/	1048	*/
1172	if (tmp->container == op)	1049	if (tmp->container == this)
1173	{	1050	{
1174	CLEAR_FLAG (op, FLAG_APPLIED);	1051	CLEAR_FLAG (this, FLAG_APPLIED);
1175	tmp->container = NULL;	1052	tmp->container = 0;
1176	}	1053	}
1177		1054
1178	tmp->contr->socket.update_look = 1;	1055	tmp->contr->ns->floorbox_update ();
1179	}	1056	}
1180		1057
1181	/* See if player moving off should effect something */	1058	/* See if player moving off should effect something */
1182	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1059	if (check_walk_off
		1060	&& ((move_type & tmp->move_off)
		1061	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183	{	1062	{
1184	move_apply (tmp, op, NULL);	1063	move_apply (tmp, this, 0);
1185		1064
1186	if (was_destroyed (op, tag))	1065	if (destroyed ())
1187	{
1188	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1066	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1189	}
1190	}	1067	}
1191		1068
1192	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1069	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193		1070
1194	if (tmp->above == tmp)	1071	if (tmp->above == tmp)
1195	tmp->above = NULL;	1072	tmp->above = 0;
1196		1073
1197	last = tmp;	1074	last = tmp;
1198	}	1075	}
1199		1076
1200	/* last == NULL of there are no objects on this space */	1077	/* last == NULL of there are no objects on this space */
1201	if (last == NULL)	1078	if (!last)
1202	{	1079	map->at (x, y).flags_ = P_NEED_UPDATE;
1203	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1204	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1205	* those out anyways, and if there are any flags set right now, they won't
1206	* be correct anyways.
1207	*/
1208	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1209	update_position (op->map, op->x, op->y);
1210	}
1211	else	1080	else
1212	update_object (last, UP_OBJ_REMOVE);	1081	update_object (last, UP_OBJ_REMOVE);
1213		1082
1214	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1083	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1215	update_all_los (op->map, op->x, op->y);	1084	update_all_los (map, x, y);
1216	}	1085	}
1217	}	1086	}
1218		1087
1219	/*	1088	/*
1220	* merge_ob(op,top):	1089	* merge_ob(op,top):
…		…
1222	* This function goes through all objects below and including top, and	1091	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1092	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1093	* If top is NULL, it is calculated.
1225	* Returns pointer to object if it succeded in the merge, otherwise NULL	1094	* Returns pointer to object if it succeded in the merge, otherwise NULL
1226	*/	1095	*/
1227
1228	object *	1096	object *
1229	merge_ob (object *op, object *top)	1097	merge_ob (object *op, object *top)
1230	{	1098	{
1231	if (!op->nrof)	1099	if (!op->nrof)
1232	return 0;	1100	return 0;
…		…
1236		1104
1237	for (; top != NULL; top = top->below)	1105	for (; top != NULL; top = top->below)
1238	{	1106	{
1239	if (top == op)	1107	if (top == op)
1240	continue;	1108	continue;
1241	if (CAN_MERGE (op, top))	1109
		1110	if (object::can_merge (op, top))
1242	{	1111	{
1243	top->nrof += op->nrof;	1112	top->nrof += op->nrof;
1244		1113
1245	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1114	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1246	op->weight = 0; /* Don't want any adjustements now */	1115	op->weight = 0; /* Don't want any adjustements now */
1247	remove_ob (op);	1116	op->destroy ();
1248	free_object (op);
1249	return top;	1117	return top;
1250	}	1118	}
1251	}	1119	}
1252		1120
1253	return NULL;	1121	return 0;
1254	}	1122	}
1255		1123
1256	/*	1124	/*
1257	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1125	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1258	* job preparing multi-part monsters	1126	* job preparing multi-part monsters
1259	*/	1127	*/
1260	object *	1128	object *
1261	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1129	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1262	{	1130	{
1263	object *tmp;	1131	object *tmp;
1264		1132
1265	if (op->head)	1133	if (op->head)
1266	op = op->head;	1134	op = op->head;
…		…
1294	* NULL if 'op' was destroyed	1162	* NULL if 'op' was destroyed
1295	* just 'op' otherwise	1163	* just 'op' otherwise
1296	*/	1164	*/
1297		1165
1298	object *	1166	object *
1299	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1167	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1300	{	1168	{
1301	object *tmp, *top, *floor = NULL;	1169	object *tmp, *top, *floor = NULL;
1302	sint16 x, y;	1170	sint16 x, y;
1303		1171
1304	if (QUERY_FLAG (op, FLAG_FREED))	1172	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1307	return NULL;	1175	return NULL;
1308	}	1176	}
1309		1177
1310	if (m == NULL)	1178	if (m == NULL)
1311	{	1179	{
1312	dump_object (op);	1180	char *dump = dump_object (op);
1313	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1181	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1182	free (dump);
1314	return op;	1183	return op;
1315	}	1184	}
1316		1185
1317	if (out_of_map (m, op->x, op->y))	1186	if (out_of_map (m, op->x, op->y))
1318	{	1187	{
1319	dump_object (op);	1188	char *dump = dump_object (op);
1320	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1189	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1321	#ifdef MANY_CORES	1190	#ifdef MANY_CORES
1322	/* Better to catch this here, as otherwise the next use of this object	1191	/* Better to catch this here, as otherwise the next use of this object
1323	* is likely to cause a crash. Better to find out where it is getting	1192	* is likely to cause a crash. Better to find out where it is getting
1324	* improperly inserted.	1193	* improperly inserted.
1325	*/	1194	*/
1326	abort ();	1195	abort ();
1327	#endif	1196	#endif
		1197	free (dump);
1328	return op;	1198	return op;
1329	}	1199	}
1330		1200
1331	if (!QUERY_FLAG (op, FLAG_REMOVED))	1201	if (!QUERY_FLAG (op, FLAG_REMOVED))
1332	{	1202	{
1333	dump_object (op);	1203	char *dump = dump_object (op);
1334	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1204	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1205	free (dump);
1335	return op;	1206	return op;
1336	}	1207	}
1337		1208
1338	if (op->more != NULL)	1209	if (op->more != NULL)
1339	{	1210	{
…		…
1377		1248
1378	/* this has to be done after we translate the coordinates.	1249	/* this has to be done after we translate the coordinates.
1379	*/	1250	*/
1380	if (op->nrof && !(flag & INS_NO_MERGE))	1251	if (op->nrof && !(flag & INS_NO_MERGE))
1381	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1252	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1382	if (CAN_MERGE (op, tmp))	1253	if (object::can_merge (op, tmp))
1383	{	1254	{
1384	op->nrof += tmp->nrof;	1255	op->nrof += tmp->nrof;
1385	remove_ob (tmp);	1256	tmp->destroy ();
1386	free_object (tmp);
1387	}	1257	}
1388		1258
1389	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1259	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1390	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1260	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1391		1261
…		…
1404	op->below = originator->below;	1274	op->below = originator->below;
1405		1275
1406	if (op->below)	1276	if (op->below)
1407	op->below->above = op;	1277	op->below->above = op;
1408	else	1278	else
1409	SET_MAP_OB (op->map, op->x, op->y, op);	1279	op->ms ().bottom = op;
1410		1280
1411	/* since *below* originator, no need to update top */	1281	/* since *below* originator, no need to update top */
1412	originator->below = op;	1282	originator->below = op;
1413	}	1283	}
1414	else	1284	else
…		…
1460	* If INS_ON_TOP is used, don't do this processing	1330	* If INS_ON_TOP is used, don't do this processing
1461	* Need to find the object that in fact blocks view, otherwise	1331	* Need to find the object that in fact blocks view, otherwise
1462	* stacking is a bit odd.	1332	* stacking is a bit odd.
1463	*/	1333	*/
1464	if (!(flag & INS_ON_TOP) &&	1334	if (!(flag & INS_ON_TOP) &&
1465	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1335	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1466	{	1336	{
1467	for (last = top; last != floor; last = last->below)	1337	for (last = top; last != floor; last = last->below)
1468	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1338	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1469	break;	1339	break;
1470	/* Check to see if we found the object that blocks view,	1340	/* Check to see if we found the object that blocks view,
…		…
1493		1363
1494	if (op->above)	1364	if (op->above)
1495	op->above->below = op;	1365	op->above->below = op;
1496		1366
1497	op->below = NULL;	1367	op->below = NULL;
1498	SET_MAP_OB (op->map, op->x, op->y, op);	1368	op->ms ().bottom = op;
1499	}	1369	}
1500	else	1370	else
1501	{ /* get inserted into the stack above top */	1371	{ /* get inserted into the stack above top */
1502	op->above = top->above;	1372	op->above = top->above;
1503		1373
…		…
1507	op->below = top;	1377	op->below = top;
1508	top->above = op;	1378	top->above = op;
1509	}	1379	}
1510		1380
1511	if (op->above == NULL)	1381	if (op->above == NULL)
1512	SET_MAP_TOP (op->map, op->x, op->y, op);	1382	op->ms ().top = op;
1513	} /* else not INS_BELOW_ORIGINATOR */	1383	} /* else not INS_BELOW_ORIGINATOR */
1514		1384
1515	if (op->type == PLAYER)	1385	if (op->type == PLAYER)
1516	op->contr->do_los = 1;	1386	op->contr->do_los = 1;
1517		1387
1518	/* If we have a floor, we know the player, if any, will be above	1388	/* If we have a floor, we know the player, if any, will be above
1519	* it, so save a few ticks and start from there.	1389	* it, so save a few ticks and start from there.
1520	*/	1390	*/
1521	if (!(flag & INS_MAP_LOAD))	1391	if (!(flag & INS_MAP_LOAD))
1522	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1392	if (object *pl = op->ms ().player ())
1523	if (tmp->type == PLAYER)	1393	pl->contr->ns->floorbox_update ();
1524	tmp->contr->socket.update_look = 1;
1525		1394
1526	/* If this object glows, it may affect lighting conditions that are	1395	/* If this object glows, it may affect lighting conditions that are
1527	* visible to others on this map. But update_all_los is really	1396	* visible to others on this map. But update_all_los is really
1528	* an inefficient way to do this, as it means los for all players	1397	* an inefficient way to do this, as it means los for all players
1529	* on the map will get recalculated. The players could very well	1398	* on the map will get recalculated. The players could very well
…		…
1537		1406
1538	/* updates flags (blocked, alive, no magic, etc) for this map space */	1407	/* updates flags (blocked, alive, no magic, etc) for this map space */
1539	update_object (op, UP_OBJ_INSERT);	1408	update_object (op, UP_OBJ_INSERT);
1540		1409
1541	/* Don't know if moving this to the end will break anything. However,	1410	/* Don't know if moving this to the end will break anything. However,
1542	* we want to have update_look set above before calling this.	1411	* we want to have floorbox_update called before calling this.
1543	*	1412	*
1544	* check_move_on() must be after this because code called from	1413	* check_move_on() must be after this because code called from
1545	* check_move_on() depends on correct map flags (so functions like	1414	* check_move_on() depends on correct map flags (so functions like
1546	* blocked() and wall() work properly), and these flags are updated by	1415	* blocked() and wall() work properly), and these flags are updated by
1547	* update_object().	1416	* update_object().
…		…
1563		1432
1564	return op;	1433	return op;
1565	}	1434	}
1566		1435
1567	/* this function inserts an object in the map, but if it	1436	/* this function inserts an object in the map, but if it
1568	* finds an object of its own type, it'll remove that one first.	1437	* finds an object of its own type, it'll remove that one first.
1569	* op is the object to insert it under: supplies x and the map.	1438	* op is the object to insert it under: supplies x and the map.
1570	*/	1439	*/
1571	void	1440	void
1572	replace_insert_ob_in_map (const char *arch_string, object *op)	1441	replace_insert_ob_in_map (const char *arch_string, object *op)
1573	{	1442	{
1574	object *	1443	object *tmp, *tmp1;
1575	tmp;
1576	object *
1577	tmp1;
1578		1444
1579	/* first search for itself and remove any old instances */	1445	/* first search for itself and remove any old instances */
1580		1446
1581	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1447	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1582	{
1583	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1448	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1584	{	1449	tmp->destroy ();
1585	remove_ob (tmp);
1586	free_object (tmp);
1587	}
1588	}
1589		1450
1590	tmp1 = arch_to_object (find_archetype (arch_string));	1451	tmp1 = arch_to_object (archetype::find (arch_string));
1591		1452
1592	tmp1->x = op->x;	1453	tmp1->x = op->x;
1593	tmp1->y = op->y;	1454	tmp1->y = op->y;
1594	insert_ob_in_map (tmp1, op->map, op, 0);	1455	insert_ob_in_map (tmp1, op->map, op, 0);
1595	}	1456	}
…		…
1603	*/	1464	*/
1604		1465
1605	object *	1466	object *
1606	get_split_ob (object *orig_ob, uint32 nr)	1467	get_split_ob (object *orig_ob, uint32 nr)
1607	{	1468	{
1608	object *	1469	object *newob;
1609	newob;
1610	int
1611	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1470	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1612		1471
1613	if (orig_ob->nrof < nr)	1472	if (orig_ob->nrof < nr)
1614	{	1473	{
1615	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1474	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1616	return NULL;	1475	return NULL;
1617	}	1476	}
1618		1477
1619	newob = object_create_clone (orig_ob);	1478	newob = object_create_clone (orig_ob);
1620		1479
1621	if ((orig_ob->nrof -= nr) < 1)	1480	if ((orig_ob->nrof -= nr) < 1)
1622	{	1481	orig_ob->destroy (1);
1623	if (!is_removed)
1624	remove_ob (orig_ob);
1625	free_object2 (orig_ob, 1);
1626	}
1627	else if (!is_removed)	1482	else if (!is_removed)
1628	{	1483	{
1629	if (orig_ob->env != NULL)	1484	if (orig_ob->env != NULL)
1630	sub_weight (orig_ob->env, orig_ob->weight * nr);	1485	sub_weight (orig_ob->env, orig_ob->weight * nr);
1631	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1486	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1661	if (i > op->nrof)	1516	if (i > op->nrof)
1662	i = op->nrof;	1517	i = op->nrof;
1663		1518
1664	if (QUERY_FLAG (op, FLAG_REMOVED))	1519	if (QUERY_FLAG (op, FLAG_REMOVED))
1665	op->nrof -= i;	1520	op->nrof -= i;
1666	else if (op->env != NULL)	1521	else if (op->env)
1667	{	1522	{
1668	/* is this object in the players inventory, or sub container	1523	/* is this object in the players inventory, or sub container
1669	* therein?	1524	* therein?
1670	*/	1525	*/
1671	tmp = is_player_inv (op->env);	1526	tmp = op->in_player ();
1672	/* nope. Is this a container the player has opened?	1527	/* nope. Is this a container the player has opened?
1673	* If so, set tmp to that player.	1528	* If so, set tmp to that player.
1674	* IMO, searching through all the players will mostly	1529	* IMO, searching through all the players will mostly
1675	* likely be quicker than following op->env to the map,	1530	* likely be quicker than following op->env to the map,
1676	* and then searching the map for a player.	1531	* and then searching the map for a player.
1677	*/	1532	*/
1678	if (!tmp)	1533	if (!tmp)
1679	{	1534	{
1680	for (pl = first_player; pl; pl = pl->next)	1535	for (pl = first_player; pl; pl = pl->next)
1681	if (pl->ob->container == op->env)	1536	if (pl->ob->container == op->env)
		1537	{
		1538	tmp = pl->ob;
1682	break;	1539	break;
1683	if (pl)	1540	}
1684	tmp = pl->ob;
1685	else
1686	tmp = NULL;
1687	}	1541	}
1688		1542
1689	if (i < op->nrof)	1543	if (i < op->nrof)
1690	{	1544	{
1691	sub_weight (op->env, op->weight * i);	1545	sub_weight (op->env, op->weight * i);
1692	op->nrof -= i;	1546	op->nrof -= i;
1693	if (tmp)	1547	if (tmp)
1694	{
1695	esrv_send_item (tmp, op);	1548	esrv_send_item (tmp, op);
1696	}
1697	}	1549	}
1698	else	1550	else
1699	{	1551	{
1700	remove_ob (op);	1552	op->remove ();
1701	op->nrof = 0;	1553	op->nrof = 0;
1702	if (tmp)	1554	if (tmp)
1703	{
1704	esrv_del_item (tmp->contr, op->count);	1555	esrv_del_item (tmp->contr, op->count);
1705	}
1706	}	1556	}
1707	}	1557	}
1708	else	1558	else
1709	{	1559	{
1710	object *above = op->above;	1560	object *above = op->above;
1711		1561
1712	if (i < op->nrof)	1562	if (i < op->nrof)
1713	op->nrof -= i;	1563	op->nrof -= i;
1714	else	1564	else
1715	{	1565	{
1716	remove_ob (op);	1566	op->remove ();
1717	op->nrof = 0;	1567	op->nrof = 0;
1718	}	1568	}
1719		1569
1720	/* Since we just removed op, op->above is null */	1570	/* Since we just removed op, op->above is null */
1721	for (tmp = above; tmp != NULL; tmp = tmp->above)	1571	for (tmp = above; tmp; tmp = tmp->above)
1722	if (tmp->type == PLAYER)	1572	if (tmp->type == PLAYER)
1723	{	1573	{
1724	if (op->nrof)	1574	if (op->nrof)
1725	esrv_send_item (tmp, op);	1575	esrv_send_item (tmp, op);
1726	else	1576	else
…		…
1730		1580
1731	if (op->nrof)	1581	if (op->nrof)
1732	return op;	1582	return op;
1733	else	1583	else
1734	{	1584	{
1735	free_object (op);	1585	op->destroy ();
1736	return NULL;	1586	return 0;
1737	}	1587	}
1738	}	1588	}
1739		1589
1740	/*	1590	/*
1741	* add_weight(object, weight) adds the specified weight to an object,	1591	* add_weight(object, weight) adds the specified weight to an object,
…		…
1753	op->carrying += weight;	1603	op->carrying += weight;
1754	op = op->env;	1604	op = op->env;
1755	}	1605	}
1756	}	1606	}
1757		1607
		1608	object *
		1609	insert_ob_in_ob (object *op, object *where)
		1610	{
		1611	if (!where)
		1612	{
		1613	char *dump = dump_object (op);
		1614	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1615	free (dump);
		1616	return op;
		1617	}
		1618
		1619	if (where->head)
		1620	{
		1621	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1622	where = where->head;
		1623	}
		1624
		1625	return where->insert (op);
		1626	}
		1627
1758	/*	1628	/*
1759	* insert_ob_in_ob(op,environment):	1629	* env->insert (op)
1760	* This function inserts the object op in the linked list	1630	* This function inserts the object op in the linked list
1761	* inside the object environment.	1631	* inside the object environment.
1762	*	1632	*
1763	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1764	* the inventory at the last position or next to other objects of the same
1765	* type.
1766	* Frank: Now sorted by type, archetype and magic!
1767	*
1768	* The function returns now pointer to inserted item, and return value can	1633	* The function returns now pointer to inserted item, and return value can
1769	* be != op, if items are merged. -Tero	1634	* be != op, if items are merged. -Tero
1770	*/	1635	*/
1771		1636
1772	object *	1637	object *
1773	insert_ob_in_ob (object *op, object *where)	1638	object::insert (object *op)
1774	{	1639	{
1775	object *	1640	object *tmp, *otmp;
1776	tmp, *
1777	otmp;
1778		1641
1779	if (!QUERY_FLAG (op, FLAG_REMOVED))	1642	if (!QUERY_FLAG (op, FLAG_REMOVED))
1780	{	1643	op->remove ();
1781	dump_object (op);
1782	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1783	return op;
1784	}
1785
1786	if (where == NULL)
1787	{
1788	dump_object (op);
1789	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1790	return op;
1791	}
1792
1793	if (where->head)
1794	{
1795	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1796	where = where->head;
1797	}
1798		1644
1799	if (op->more)	1645	if (op->more)
1800	{	1646	{
1801	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1647	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1802	return op;	1648	return op;
…		…
1804		1650
1805	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1651	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1806	CLEAR_FLAG (op, FLAG_REMOVED);	1652	CLEAR_FLAG (op, FLAG_REMOVED);
1807	if (op->nrof)	1653	if (op->nrof)
1808	{	1654	{
1809	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1655	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1810	if (CAN_MERGE (tmp, op))	1656	if (object::can_merge (tmp, op))
1811	{	1657	{
1812	/* return the original object and remove inserted object	1658	/* return the original object and remove inserted object
1813	(client needs the original object) */	1659	(client needs the original object) */
1814	tmp->nrof += op->nrof;	1660	tmp->nrof += op->nrof;
1815	/* Weight handling gets pretty funky. Since we are adding to	1661	/* Weight handling gets pretty funky. Since we are adding to
1816	* tmp->nrof, we need to increase the weight.	1662	* tmp->nrof, we need to increase the weight.
1817	*/	1663	*/
1818	add_weight (where, op->weight * op->nrof);	1664	add_weight (this, op->weight * op->nrof);
1819	SET_FLAG (op, FLAG_REMOVED);	1665	SET_FLAG (op, FLAG_REMOVED);
1820	free_object (op); /* free the inserted object */	1666	op->destroy (); /* free the inserted object */
1821	op = tmp;	1667	op = tmp;
1822	remove_ob (op); /* and fix old object's links */	1668	op->remove (); /* and fix old object's links */
1823	CLEAR_FLAG (op, FLAG_REMOVED);	1669	CLEAR_FLAG (op, FLAG_REMOVED);
1824	break;	1670	break;
1825	}	1671	}
1826		1672
1827	/* I assume combined objects have no inventory	1673	/* I assume combined objects have no inventory
1828	* We add the weight - this object could have just been removed	1674	* We add the weight - this object could have just been removed
1829	* (if it was possible to merge). calling remove_ob will subtract	1675	* (if it was possible to merge). calling remove_ob will subtract
1830	* the weight, so we need to add it in again, since we actually do	1676	* the weight, so we need to add it in again, since we actually do
1831	* the linking below	1677	* the linking below
1832	*/	1678	*/
1833	add_weight (where, op->weight * op->nrof);	1679	add_weight (this, op->weight * op->nrof);
1834	}	1680	}
1835	else	1681	else
1836	add_weight (where, (op->weight + op->carrying));	1682	add_weight (this, (op->weight + op->carrying));
1837		1683
1838	otmp = is_player_inv (where);	1684	otmp = this->in_player ();
1839	if (otmp && otmp->contr != NULL)	1685	if (otmp && otmp->contr)
1840	{
1841	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1686	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1842	fix_player (otmp);	1687	otmp->update_stats ();
1843	}
1844		1688
1845	op->map = NULL;	1689	op->map = 0;
1846	op->env = where;	1690	op->env = this;
1847	op->above = NULL;	1691	op->above = 0;
1848	op->below = NULL;	1692	op->below = 0;
1849	op->x = 0, op->y = 0;	1693	op->x = 0, op->y = 0;
1850		1694
1851	/* reset the light list and los of the players on the map */	1695	/* reset the light list and los of the players on the map */
1852	if ((op->glow_radius != 0) && where->map)	1696	if ((op->glow_radius != 0) && map)
1853	{	1697	{
1854	#ifdef DEBUG_LIGHTS	1698	#ifdef DEBUG_LIGHTS
1855	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1699	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1856	#endif /* DEBUG_LIGHTS */	1700	#endif /* DEBUG_LIGHTS */
1857	if (MAP_DARKNESS (where->map))	1701	if (MAP_DARKNESS (map))
1858	update_all_los (where->map, where->x, where->y);	1702	update_all_los (map, x, y);
1859	}	1703	}
1860		1704
1861	/* Client has no idea of ordering so lets not bother ordering it here.	1705	/* Client has no idea of ordering so lets not bother ordering it here.
1862	* It sure simplifies this function...	1706	* It sure simplifies this function...
1863	*/	1707	*/
1864	if (where->inv == NULL)	1708	if (!inv)
1865	where->inv = op;	1709	inv = op;
1866	else	1710	else
1867	{	1711	{
1868	op->below = where->inv;	1712	op->below = inv;
1869	op->below->above = op;	1713	op->below->above = op;
1870	where->inv = op;	1714	inv = op;
1871	}	1715	}
		1716
1872	return op;	1717	return op;
1873	}	1718	}
1874		1719
1875	/*	1720	/*
1876	* Checks if any objects has a move_type that matches objects	1721	* Checks if any objects has a move_type that matches objects
…		…
1894	*/	1739	*/
1895		1740
1896	int	1741	int
1897	check_move_on (object *op, object *originator)	1742	check_move_on (object *op, object *originator)
1898	{	1743	{
1899	object *	1744	object *tmp;
1900	tmp;	1745	maptile *m = op->map;
1901	tag_t
1902	tag;
1903	mapstruct *
1904	m = op->map;
1905	int
1906	x = op->x, y = op->y;	1746	int x = op->x, y = op->y;
1907		1747
1908	MoveType	1748	MoveType move_on, move_slow, move_block;
1909	move_on,
1910	move_slow,
1911	move_block;
1912		1749
1913	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1750	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914	return 0;	1751	return 0;
1915
1916	tag = op->count;
1917		1752
1918	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1753	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1919	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1754	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1920	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1755	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1921		1756
…		…
1982	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1817	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1983	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1818	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1984	{	1819	{
1985	move_apply (tmp, op, originator);	1820	move_apply (tmp, op, originator);
1986		1821
1987	if (was_destroyed (op, tag))	1822	if (op->destroyed ())
1988	return 1;	1823	return 1;
1989		1824
1990	/* what the person/creature stepped onto has moved the object	1825	/* what the person/creature stepped onto has moved the object
1991	* someplace new. Don't process any further - if we did,	1826	* someplace new. Don't process any further - if we did,
1992	* have a feeling strange problems would result.	1827	* have a feeling strange problems would result.
…		…
2004	* a matching archetype at the given map and coordinates.	1839	* a matching archetype at the given map and coordinates.
2005	* The first matching object is returned, or NULL if none.	1840	* The first matching object is returned, or NULL if none.
2006	*/	1841	*/
2007		1842
2008	object *	1843	object *
2009	present_arch (const archetype *at, mapstruct *m, int x, int y)	1844	present_arch (const archetype *at, maptile *m, int x, int y)
2010	{	1845	{
2011	object *	1846	object *
2012	tmp;	1847	tmp;
2013		1848
2014	if (m == NULL || out_of_map (m, x, y))	1849	if (m == NULL || out_of_map (m, x, y))
…		…
2027	* a matching type variable at the given map and coordinates.	1862	* a matching type variable at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	1863	* The first matching object is returned, or NULL if none.
2029	*/	1864	*/
2030		1865
2031	object *	1866	object *
2032	present (unsigned char type, mapstruct *m, int x, int y)	1867	present (unsigned char type, maptile *m, int x, int y)
2033	{	1868	{
2034	object *	1869	object *
2035	tmp;	1870	tmp;
2036		1871
2037	if (out_of_map (m, x, y))	1872	if (out_of_map (m, x, y))
…		…
2177	* the archetype because that isn't correct if the monster has been	2012	* the archetype because that isn't correct if the monster has been
2178	* customized, changed states, etc.	2013	* customized, changed states, etc.
2179	*/	2014	*/
2180		2015
2181	int	2016	int
2182	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2017	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2183	{	2018	{
2184	int	2019	int
2185	i,	2020	i,
2186	index = 0, flag;	2021	index = 0, flag;
2187	static int	2022	static int
…		…
2199	* if the space being examined only has a wall to the north and empty	2034	* if the space being examined only has a wall to the north and empty
2200	* spaces in all the other directions, this will reduce the search space	2035	* spaces in all the other directions, this will reduce the search space
2201	* to only the spaces immediately surrounding the target area, and	2036	* to only the spaces immediately surrounding the target area, and
2202	* won't look 2 spaces south of the target space.	2037	* won't look 2 spaces south of the target space.
2203	*/	2038	*/
2204	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2039	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2205	stop = maxfree[i];	2040	stop = maxfree[i];
2206	}	2041	}
		2042
2207	if (!index)	2043	if (!index)
2208	return -1;	2044	return -1;
		2045
2209	return altern[RANDOM () % index];	2046	return altern[RANDOM () % index];
2210	}	2047	}
2211		2048
2212	/*	2049	/*
2213	* find_first_free_spot(archetype, mapstruct, x, y) works like	2050	* find_first_free_spot(archetype, maptile, x, y) works like
2214	* find_free_spot(), but it will search max number of squares.	2051	* find_free_spot(), but it will search max number of squares.
2215	* But it will return the first available spot, not a random choice.	2052	* But it will return the first available spot, not a random choice.
2216	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2053	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2217	*/	2054	*/
2218		2055
2219	int	2056	int
2220	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2057	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2221	{	2058	{
2222	int	2059	int
2223	i;	2060	i;
2224		2061
2225	for (i = 0; i < SIZEOFFREE; i++)	2062	for (i = 0; i < SIZEOFFREE; i++)
…		…
2289	* because we have to know what movement the thing looking to move	2126	* because we have to know what movement the thing looking to move
2290	* there is capable of.	2127	* there is capable of.
2291	*/	2128	*/
2292		2129
2293	int	2130	int
2294	find_dir (mapstruct *m, int x, int y, object *exclude)	2131	find_dir (maptile *m, int x, int y, object *exclude)
2295	{	2132	{
2296	int	2133	int
2297	i,	2134	i,
2298	max = SIZEOFFREE, mflags;	2135	max = SIZEOFFREE, mflags;
2299		2136
2300	sint16 nx, ny;	2137	sint16 nx, ny;
2301	object *	2138	object *
2302	tmp;	2139	tmp;
2303	mapstruct *	2140	maptile *
2304	mp;	2141	mp;
2305		2142
2306	MoveType blocked, move_type;	2143	MoveType blocked, move_type;
2307		2144
2308	if (exclude && exclude->head)	2145	if (exclude && exclude->head)
…		…
2321	mp = m;	2158	mp = m;
2322	nx = x + freearr_x[i];	2159	nx = x + freearr_x[i];
2323	ny = y + freearr_y[i];	2160	ny = y + freearr_y[i];
2324		2161
2325	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2162	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2163
2326	if (mflags & P_OUT_OF_MAP)	2164	if (mflags & P_OUT_OF_MAP)
2327	{
2328	max = maxfree[i];	2165	max = maxfree[i];
2329	}
2330	else	2166	else
2331	{	2167	{
2332	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2168	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2333		2169
2334	if ((move_type & blocked) == move_type)	2170	if ((move_type & blocked) == move_type)
2335	{
2336	max = maxfree[i];	2171	max = maxfree[i];
2337	}
2338	else if (mflags & P_IS_ALIVE)	2172	else if (mflags & P_IS_ALIVE)
2339	{	2173	{
2340	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2174	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2341	{
2342	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2175	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2343	{
2344	break;	2176	break;
2345	}	2177
2346	}
2347	if (tmp)	2178	if (tmp)
2348	{
2349	return freedir[i];	2179	return freedir[i];
2350	}
2351	}	2180	}
2352	}	2181	}
2353	}	2182	}
		2183
2354	return 0;	2184	return 0;
2355	}	2185	}
2356		2186
2357	/*	2187	/*
2358	* distance(object 1, object 2) will return the square of the	2188	* distance(object 1, object 2) will return the square of the
…		…
2360	*/	2190	*/
2361		2191
2362	int	2192	int
2363	distance (const object *ob1, const object *ob2)	2193	distance (const object *ob1, const object *ob2)
2364	{	2194	{
2365	int	2195	int i;
2366	i;
2367		2196
2368	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2197	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2369	return i;	2198	return i;
2370	}	2199	}
2371		2200
…		…
2376	*/	2205	*/
2377		2206
2378	int	2207	int
2379	find_dir_2 (int x, int y)	2208	find_dir_2 (int x, int y)
2380	{	2209	{
2381	int	2210	int q;
2382	q;
2383		2211
2384	if (y)	2212	if (y)
2385	q = x * 100 / y;	2213	q = x * 100 / y;
2386	else if (x)	2214	else if (x)
2387	q = -300 * x;	2215	q = -300 * x;
…		…
2513	* find a path to that monster that we found. If not,	2341	* find a path to that monster that we found. If not,
2514	* we don't bother going toward it. Returns 1 if we	2342	* we don't bother going toward it. Returns 1 if we
2515	* can see a direct way to get it	2343	* can see a direct way to get it
2516	* Modified to be map tile aware -.MSW	2344	* Modified to be map tile aware -.MSW
2517	*/	2345	*/
2518
2519
2520	int	2346	int
2521	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2347	can_see_monsterP (maptile *m, int x, int y, int dir)
2522	{	2348	{
2523	sint16 dx, dy;	2349	sint16 dx, dy;
2524	int
2525	mflags;	2350	int mflags;
2526		2351
2527	if (dir < 0)	2352	if (dir < 0)
2528	return 0; /* exit condition: invalid direction */	2353	return 0; /* exit condition: invalid direction */
2529		2354
2530	dx = x + freearr_x[dir];	2355	dx = x + freearr_x[dir];
…		…
2543	return 0;	2368	return 0;
2544		2369
2545	/* yes, can see. */	2370	/* yes, can see. */
2546	if (dir < 9)	2371	if (dir < 9)
2547	return 1;	2372	return 1;
		2373
2548	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2374	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2549	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2375	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2376	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2550	}	2377	}
2551
2552
2553		2378
2554	/*	2379	/*
2555	* can_pick(picker, item): finds out if an object is possible to be	2380	* can_pick(picker, item): finds out if an object is possible to be
2556	* picked up by the picker. Returnes 1 if it can be	2381	* picked up by the picker. Returnes 1 if it can be
2557	* picked up, otherwise 0.	2382	* picked up, otherwise 0.
…		…
2568	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2393	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2569	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2394	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2570	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2395	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2571	}	2396	}
2572		2397
2573
2574	/*	2398	/*
2575	* create clone from object to another	2399	* create clone from object to another
2576	*/	2400	*/
2577	object *	2401	object *
2578	object_create_clone (object *asrc)	2402	object_create_clone (object *asrc)
2579	{	2403	{
2580	object *
2581	dst = NULL, *tmp, *src, *part, *prev, *item;	2404	object *dst = 0, *tmp, *src, *part, *prev, *item;
2582		2405
2583	if (!asrc)	2406	if (!asrc)
2584	return NULL;	2407	return 0;
		2408
2585	src = asrc;	2409	src = asrc;
2586	if (src->head)	2410	if (src->head)
2587	src = src->head;	2411	src = src->head;
2588		2412
2589	prev = NULL;	2413	prev = 0;
2590	for (part = src; part; part = part->more)	2414	for (part = src; part; part = part->more)
2591	{	2415	{
2592	tmp = get_object ();	2416	tmp = part->clone ();
2593	copy_object (part, tmp);
2594	tmp->x -= src->x;	2417	tmp->x -= src->x;
2595	tmp->y -= src->y;	2418	tmp->y -= src->y;
		2419
2596	if (!part->head)	2420	if (!part->head)
2597	{	2421	{
2598	dst = tmp;	2422	dst = tmp;
2599	tmp->head = NULL;	2423	tmp->head = 0;
2600	}	2424	}
2601	else	2425	else
2602	{
2603	tmp->head = dst;	2426	tmp->head = dst;
2604	}	2427
2605	tmp->more = NULL;	2428	tmp->more = 0;
		2429
2606	if (prev)	2430	if (prev)
2607	prev->more = tmp;	2431	prev->more = tmp;
		2432
2608	prev = tmp;	2433	prev = tmp;
2609	}	2434	}
2610		2435
2611	/*** copy inventory ***/
2612	for (item = src->inv; item; item = item->below)	2436	for (item = src->inv; item; item = item->below)
2613	{
2614	(void) insert_ob_in_ob (object_create_clone (item), dst);	2437	insert_ob_in_ob (object_create_clone (item), dst);
2615	}
2616		2438
2617	return dst;	2439	return dst;
2618	}	2440	}
2619		2441
2620	/* return true if the object was destroyed, 0 otherwise */
2621	int
2622	was_destroyed (const object *op, tag_t old_tag)
2623	{
2624	/* checking for FLAG_FREED isn't necessary, but makes this function more
2625	* robust */
2626	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2627	}
2628
2629	/* GROS - Creates an object using a string representing its content. */	2442	/* GROS - Creates an object using a string representing its content. */
2630
2631	/* Basically, we save the content of the string to a temp file, then call */	2443	/* Basically, we save the content of the string to a temp file, then call */
2632
2633	/* load_object on it. I admit it is a highly inefficient way to make things, */	2444	/* load_object on it. I admit it is a highly inefficient way to make things, */
2634
2635	/* but it was simple to make and allows reusing the load_object function. */	2445	/* but it was simple to make and allows reusing the load_object function. */
2636
2637	/* Remember not to use load_object_str in a time-critical situation. */	2446	/* Remember not to use load_object_str in a time-critical situation. */
2638
2639	/* Also remember that multiparts objects are not supported for now. */	2447	/* Also remember that multiparts objects are not supported for now. */
2640		2448
2641	object *	2449	object *
2642	load_object_str (const char *obstr)	2450	load_object_str (const char *obstr)
2643	{	2451	{
2644	object *	2452	object *op;
2645	op;
2646	char
2647	filename[MAX_BUF];	2453	char filename[MAX_BUF];
2648		2454
2649	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2455	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650		2456
2651	FILE *
2652	tempfile = fopen (filename, "w");	2457	FILE *tempfile = fopen (filename, "w");
2653		2458
2654	if (tempfile == NULL)	2459	if (tempfile == NULL)
2655	{	2460	{
2656	LOG (llevError, "Error - Unable to access load object temp file\n");	2461	LOG (llevError, "Error - Unable to access load object temp file\n");
2657	return NULL;	2462	return NULL;
2658	};	2463	}
		2464
2659	fprintf (tempfile, obstr);	2465	fprintf (tempfile, obstr);
2660	fclose (tempfile);	2466	fclose (tempfile);
2661		2467
2662	op = get_object ();	2468	op = object::create ();
2663		2469
2664	object_thawer thawer (filename);	2470	object_thawer thawer (filename);
2665		2471
2666	if (thawer)	2472	if (thawer)
2667	load_object (thawer, op, 0);	2473	load_object (thawer, op, 0);
…		…
2677	* returns NULL if no match.	2483	* returns NULL if no match.
2678	*/	2484	*/
2679	object *	2485	object *
2680	find_obj_by_type_subtype (const object *who, int type, int subtype)	2486	find_obj_by_type_subtype (const object *who, int type, int subtype)
2681	{	2487	{
2682	object *	2488	object *tmp;
2683	tmp;
2684		2489
2685	for (tmp = who->inv; tmp; tmp = tmp->below)	2490	for (tmp = who->inv; tmp; tmp = tmp->below)
2686	if (tmp->type == type && tmp->subtype == subtype)	2491	if (tmp->type == type && tmp->subtype == subtype)
2687	return tmp;	2492	return tmp;
2688		2493
…		…
2696	* do the desired thing.	2501	* do the desired thing.
2697	*/	2502	*/
2698	key_value *	2503	key_value *
2699	get_ob_key_link (const object *ob, const char *key)	2504	get_ob_key_link (const object *ob, const char *key)
2700	{	2505	{
2701	key_value *	2506	key_value *link;
2702	link;
2703		2507
2704	for (link = ob->key_values; link != NULL; link = link->next)	2508	for (link = ob->key_values; link != NULL; link = link->next)
2705	{
2706	if (link->key == key)	2509	if (link->key == key)
2707	{
2708	return link;	2510	return link;
2709	}
2710	}
2711		2511
2712	return NULL;	2512	return NULL;
2713	}	2513	}
2714		2514
2715	/*	2515	/*
…		…
2720	* The returned string is shared.	2520	* The returned string is shared.
2721	*/	2521	*/
2722	const char *	2522	const char *
2723	get_ob_key_value (const object *op, const char *const key)	2523	get_ob_key_value (const object *op, const char *const key)
2724	{	2524	{
2725	key_value *	2525	key_value *link;
2726	link;	2526	shstr_cmp canonical_key (key);
2727	const char *
2728	canonical_key;
2729		2527
2730	canonical_key = shstr::find (key);
2731
2732	if (canonical_key == NULL)	2528	if (!canonical_key)
2733	{	2529	{
2734	/* 1. There being a field named key on any object	2530	/* 1. There being a field named key on any object
2735	* implies there'd be a shared string to find.	2531	* implies there'd be a shared string to find.
2736	* 2. Since there isn't, no object has this field.	2532	* 2. Since there isn't, no object has this field.
2737	* 3. Therefore, *this* object doesn't have this field.	2533	* 3. Therefore, *this* object doesn't have this field.
2738	*/	2534	*/
2739	return NULL;	2535	return 0;
2740	}	2536	}
2741		2537
2742	/* This is copied from get_ob_key_link() above -	2538	/* This is copied from get_ob_key_link() above -
2743	* only 4 lines, and saves the function call overhead.	2539	* only 4 lines, and saves the function call overhead.
2744	*/	2540	*/
2745	for (link = op->key_values; link != NULL; link = link->next)	2541	for (link = op->key_values; link; link = link->next)
2746	{
2747	if (link->key == canonical_key)	2542	if (link->key == canonical_key)
2748	{
2749	return link->value;	2543	return link->value;
2750	}	2544
2751	}
2752	return NULL;	2545	return 0;
2753	}	2546	}
2754		2547
2755		2548
2756	/*	2549	/*
2757	* Updates the canonical_key in op to value.	2550	* Updates the canonical_key in op to value.
…		…
2864	}	2657	}
2865	else	2658	else
2866	item = item->env;	2659	item = item->env;
2867	}	2660	}
2868		2661
		2662	// return a suitable string describing an objetc in enough detail to find it
		2663	const char *
		2664	object::debug_desc (char *info) const
		2665	{
		2666	char info2[256 * 3];
		2667	char *p = info;
		2668
		2669	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2670	count,
		2671	&name,
		2672	title ? " " : "",
		2673	title ? (const char *)title : "");
		2674
		2675	if (env)
		2676	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2677
		2678	if (map)
		2679	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2680
		2681	return info;
		2682	}
		2683
		2684	const char *
		2685	object::debug_desc () const
		2686	{
		2687	static char info[256 * 3];
		2688	return debug_desc (info);
		2689	}
		2690

Diff Legend

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