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.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.81 by root, Sat Dec 23 13:56:25 2006 UTC

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

Diff Legend

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