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.38 by root, Wed Sep 13 01:09:24 2006 UTC vs.
Revision 1.96 by root, Sat Dec 30 10:16:10 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;
…		…
62	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
63	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
64	*/	143	*/
65		144
66	/* For each field in wants, */	145	/* For each field in wants, */
67	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
68	{	147	{
69	key_value *has_field;	148	key_value *has_field;
70		149
71	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
72	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
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
117	bool object::can_merge (object *ob1, object *ob2)	195	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	196	{
119	/* A couple quicksanity checks */	197	/* A couple quicksanity checks */
120	if ((ob1 == ob2) || (ob1->type != ob2->type))	198	if (ob1 == ob2
		199	|| ob1->type != ob2->type
		200	|| ob1->speed != ob2->speed
		201	|| ob1->value != ob2->value
		202	|| ob1->name != ob2->name)
121	return 0;	203	return 0;
122		204
123	if (ob1->speed != ob2->speed)	205	//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	206	/* 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	207	* value could not be stored in a sint32 (which unfortunately sometimes is
128	* used to store nrof).	208	* used to store nrof).
129	*/	209	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
140	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141		221
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		224
145		225	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
146	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	226	|| 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) ||	227	|| ob1->name != ob2->name
156	(ob1->title != ob2->title) ||	228	|| ob1->title != ob2->title
157	(ob1->msg != ob2->msg) ||	229	|| ob1->msg != ob2->msg
158	(ob1->weight != ob2->weight) ||	230	|| ob1->weight != ob2->weight
159	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
160	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
161	(ob1->attacktype != ob2->attacktype) ||	233	|| ob1->attacktype != ob2->attacktype
162	(ob1->magic != ob2->magic) ||	234	|| ob1->magic != ob2->magic
163	(ob1->slaying != ob2->slaying) ||	235	|| ob1->slaying != ob2->slaying
164	(ob1->skill != ob2->skill) ||	236	|| ob1->skill != ob2->skill
165	(ob1->value != ob2->value) ||	237	|| ob1->value != ob2->value
166	(ob1->animation_id != ob2->animation_id) ||	238	|| ob1->animation_id != ob2->animation_id
167	(ob1->client_type != ob2->client_type) ||	239	|| ob1->client_type != ob2->client_type
168	(ob1->materialname != ob2->materialname) ||	240	|| ob1->materialname != ob2->materialname
169	(ob1->lore != ob2->lore) ||	241	|| ob1->lore != ob2->lore
170	(ob1->subtype != ob2->subtype) ||	242	|| ob1->subtype != ob2->subtype
171	(ob1->move_type != ob2->move_type) ||	243	|| ob1->move_type != ob2->move_type
172	(ob1->move_block != ob2->move_block) ||	244	|| ob1->move_block != ob2->move_block
173	(ob1->move_allow != ob2->move_allow) ||	245	|| ob1->move_allow != ob2->move_allow
174	(ob1->move_on != ob2->move_on) ||	246	|| 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))	247	|| ob1->move_off != ob2->move_off
		248	|| ob1->move_slow != ob2->move_slow
		249	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
176	return 0;	250	return 0;
177		251
178	/* This is really a spellbook check - really, we should	252	/* This is really a spellbook check - really, we should
179	* check all objects in the inventory.	253	* check all objects in the inventory.
180	*/	254	*/
…		…
183	/* if one object has inventory but the other doesn't, not equiv */	257	/* if one object has inventory but the other doesn't, not equiv */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	258	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	259	return 0;
186		260
187	/* Now check to see if the two inventory objects could merge */	261	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	262	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	263	return 0;
190		264
191	/* inventory ok - still need to check rest of this object to see	265	/* inventory ok - still need to check rest of this object to see
192	* if it is valid.	266	* if it is valid.
193	*/	267	*/
…		…
277	op = op->env;	351	op = op->env;
278	return op;	352	return op;
279	}	353	}
280		354
281	/*	355	/*
282	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
283	* a better check. We basically keeping traversing up until we can't
284	* or find a player.
285	*/
286
287	object *
288	is_player_inv (object *op)
289	{
290	for (; op != NULL && op->type != PLAYER; op = op->env)
291	if (op->env == op)
292	op->env = NULL;
293	return op;
294	}
295
296	/*
297	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
298	* Some error messages.	357	* Some error messages.
299	* The result of the dump is stored in the static global errmsg array.	358	* The result of the dump is stored in the static global errmsg array.
300	*/	359	*/
301		360
302	void	361	char *
303	dump_object2 (object *op)
304	{
305	errmsg[0] = 0;
306	return;
307	//TODO//D#d#
308	#if 0
309	char *cp;
310
311	/* object *tmp;*/
312
313	if (op->arch != NULL)
314	{
315	strcat (errmsg, "arch ");
316	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
317	strcat (errmsg, "\n");
318	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
319	strcat (errmsg, cp);
320	# if 0
321	/* Don't dump player diffs - they are too long, mostly meaningless, and
322	* will overflow the buffer.
323	* Changed so that we don't dump inventory either. This may
324	* also overflow the buffer.
325	*/
326	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
327	strcat (errmsg, cp);
328	for (tmp = op->inv; tmp; tmp = tmp->below)
329	dump_object2 (tmp);
330	# endif
331	strcat (errmsg, "end\n");
332	}
333	else
334	{
335	strcat (errmsg, "Object ");
336	if (op->name == NULL)
337	strcat (errmsg, "(null)");
338	else
339	strcat (errmsg, op->name);
340	strcat (errmsg, "\n");
341	# if 0
342	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
343	strcat (errmsg, cp);
344	for (tmp = op->inv; tmp; tmp = tmp->below)
345	dump_object2 (tmp);
346	# endif
347	strcat (errmsg, "end\n");
348	}
349	#endif
350	}
351
352	/*
353	* Dumps an object. Returns output in the static global errmsg array.
354	*/
355
356	void
357	dump_object (object *op)	362	dump_object (object *op)
358	{	363	{
359	if (op == NULL)	364	if (!op)
360	{	365	return strdup ("[NULLOBJ]");
361	strcpy (errmsg, "[NULL pointer]");
362	return;
363	}
364	errmsg[0] = '\0';
365	dump_object2 (op);
366	}
367		366
368	void	367	object_freezer freezer;
369	dump_all_objects (void)	368	save_object (freezer, op, 1);
370	{	369	return freezer.as_string ();
371	object *op;
372
373	for (op = objects; op != NULL; op = op->next)
374	{
375	dump_object (op);
376	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
377	}
378	}	370	}
379		371
380	/*	372	/*
381	* get_nearest_part(multi-object, object 2) returns the part of the	373	* get_nearest_part(multi-object, object 2) returns the part of the
382	* multi-object 1 which is closest to the second object.	374	* multi-object 1 which is closest to the second object.
…		…
402	*/	394	*/
403		395
404	object *	396	object *
405	find_object (tag_t i)	397	find_object (tag_t i)
406	{	398	{
407	object *op;	399	for (object *op = object::first; op; op = op->next)
408
409	for (op = objects; op != NULL; op = op->next)
410	if (op->count == i)	400	if (op->count == i)
411	break;	401	return op;
		402
412	return op;	403	return 0;
413	}	404	}
414		405
415	/*	406	/*
416	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
417	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
…		…
422	find_object_name (const char *str)	413	find_object_name (const char *str)
423	{	414	{
424	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
425	object *op;	416	object *op;
426		417
427	for (op = objects; op != NULL; op = op->next)	418	for (op = object::first; op != NULL; op = op->next)
428	if (op->name == str_)	419	if (op->name == str_)
429	break;	420	break;
430		421
431	return op;	422	return op;
432	}	423	}
433		424
434	void	425	void
435	free_all_object_data ()	426	free_all_object_data ()
436	{	427	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}
439
440	/*
441	* Returns the object which this object marks as being the owner.
442	* A id-scheme is used to avoid pointing to objects which have been
443	* freed and are now reused. If this is detected, the owner is
444	* set to NULL, and NULL is returned.
445	* Changed 2004-02-12 - if the player is setting at the play again
446	* prompt, he is removed, and we don't want to treat him as an owner of
447	* anything, so check removed flag. I don't expect that this should break
448	* anything - once an object is removed, it is basically dead anyways.
449	*/
450	object *
451	object::get_owner ()
452	{
453	if (!owner
454	|| QUERY_FLAG (owner, FLAG_FREED)
455	|| QUERY_FLAG (owner, FLAG_REMOVED))
456	owner = 0;
457
458	return owner;
459	}	429	}
460		430
461	/*	431	/*
462	* Sets the owner and sets the skill and exp pointers to owner's current	432	* Sets the owner and sets the skill and exp pointers to owner's current
463	* skill and experience objects.	433	* skill and experience objects.
…		…
496	}	466	}
497		467
498	op->key_values = 0;	468	op->key_values = 0;
499	}	469	}
500		470
501	void object::clear ()
502	{
503	attachable_base::clear ();
504
505	free_key_values (this);
506
507	owner = 0;
508	name = 0;
509	name_pl = 0;
510	title = 0;
511	race = 0;
512	slaying = 0;
513	skill = 0;
514	msg = 0;
515	lore = 0;
516	custom_name = 0;
517	materialname = 0;
518	contr = 0;
519	below = 0;
520	above = 0;
521	inv = 0;
522	container = 0;
523	env = 0;
524	more = 0;
525	head = 0;
526	map = 0;
527	active_next = 0;
528	active_prev = 0;
529
530	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
531
532	SET_FLAG (this, FLAG_REMOVED);
533
534	/* What is not cleared is next, prev, and count */
535
536	expmul = 1.0;
537	face = blank_face;
538	attacked_by_count = -1;
539
540	if (settings.casting_time)
541	casting_time = -1;
542	}
543
544	void object::clone (object *destination)
545	{
546	*(object_copy *)destination = *this;
547	*(object_pod *)destination = *this;
548
549	if (self || cb)
550	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
551	}
552
553	/*	471	/*
554	* copy object first frees everything allocated by the second object,	472	* copy_to first frees everything allocated by the dst object,
555	* and then copies the contends of the first object into the second	473	* and then copies the contents of itself into the second
556	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
557	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
558	* if the first object is freed, the pointers in the new object	476	* if the first object is freed, the pointers in the new object
559	* will point at garbage.	477	* will point at garbage.
560	*/	478	*/
561	void	479	void
562	copy_object (object *op2, object *op)	480	object::copy_to (object *dst)
563	{	481	{
564	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
565	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
566		484
567	op2->clone (op);	485	*(object_copy *)dst = *this;
568		486
569	if (is_freed)	487	if (is_freed)
570	SET_FLAG (op, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
		489
571	if (is_removed)	490	if (is_removed)
572	SET_FLAG (op, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
573		492
574	if (op2->speed < 0)	493	if (speed < 0)
575	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
576		495
577	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
578	if (op2->key_values)	497	if (key_values)
579	{	498	{
580	key_value *tail = 0;	499	key_value *tail = 0;
581	key_value *i;	500	key_value *i;
582		501
583	op->key_values = 0;	502	dst->key_values = 0;
584		503
585	for (i = op2->key_values; i; i = i->next)	504	for (i = key_values; i; i = i->next)
586	{	505	{
587	key_value *new_link = new key_value;	506	key_value *new_link = new key_value;
588		507
589	new_link->next = 0;	508	new_link->next = 0;
590	new_link->key = i->key;	509	new_link->key = i->key;
591	new_link->value = i->value;	510	new_link->value = i->value;
592		511
593	/* Try and be clever here, too. */	512	/* Try and be clever here, too. */
594	if (!op->key_values)	513	if (!dst->key_values)
595	{	514	{
596	op->key_values = new_link;	515	dst->key_values = new_link;
597	tail = new_link;	516	tail = new_link;
598	}	517	}
599	else	518	else
600	{	519	{
601	tail->next = new_link;	520	tail->next = new_link;
602	tail = new_link;	521	tail = new_link;
603	}	522	}
604	}	523	}
605	}	524	}
606		525
607	update_ob_speed (op);	526	dst->set_speed (dst->speed);
		527	}
		528
		529	object *
		530	object::clone ()
		531	{
		532	object *neu = create ();
		533	copy_to (neu);
		534	return neu;
608	}	535	}
609		536
610	/*	537	/*
611	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* If an object with the IS_TURNABLE() flag needs to be turned due
612	* to the closest player being on the other side, this function can	539	* to the closest player being on the other side, this function can
613	* be called to update the face variable, _and_ how it looks on the map.	540	* be called to update the face variable, _and_ how it looks on the map.
614	*/	541	*/
615
616	void	542	void
617	update_turn_face (object *op)	543	update_turn_face (object *op)
618	{	544	{
619	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
620	return;	546	return;
		547
621	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
622	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
623	}	550	}
624		551
625	/*	552	/*
626	* Updates the speed of an object. If the speed changes from 0 to another	553	* Updates the speed of an object. If the speed changes from 0 to another
627	* value, or vice versa, then add/remove the object from the active list.	554	* value, or vice versa, then add/remove the object from the active list.
628	* This function needs to be called whenever the speed of an object changes.	555	* This function needs to be called whenever the speed of an object changes.
629	*/	556	*/
630	void	557	void
631	update_ob_speed (object *op)	558	object::set_speed (float speed)
632	{	559	{
633	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
634
635	/* No reason putting the archetypes objects on the speed list,
636	* since they never really need to be updated.
637	*/
638
639	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
640	{	561	{
641	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
642	#ifdef MANY_CORES
643	abort ();
644	#else
645	op->speed = 0;	563	speed = 0;
646	#endif
647	}	564	}
648		565
649	if (arch_init)	566	this->speed = speed;
650	return;
651		567
652	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	568	if (FABS (speed) > MIN_ACTIVE_SPEED)
653	{	569	{
654	/* If already on active list, don't do anything */	570	/* If already on active list, don't do anything */
655	if (op->active_next || op->active_prev || op == active_objects)	571	if (active_next || active_prev || this == active_objects)
656	return;	572	return;
657		573
658	/* process_events() expects us to insert the object at the beginning	574	/* process_events() expects us to insert the object at the beginning
659	* of the list. */	575	* of the list. */
660	op->active_next = active_objects;	576	active_next = active_objects;
661		577
662	if (op->active_next != NULL)	578	if (active_next)
663	op->active_next->active_prev = op;	579	active_next->active_prev = this;
664		580
665	active_objects = op;	581	active_objects = this;
666	}	582	}
667	else	583	else
668	{	584	{
669	/* If not on the active list, nothing needs to be done */	585	/* If not on the active list, nothing needs to be done */
670	if (!op->active_next && !op->active_prev && op != active_objects)	586	if (!active_next && !active_prev && this != active_objects)
671	return;	587	return;
672		588
673	if (op->active_prev == NULL)	589	if (!active_prev)
674	{	590	{
675	active_objects = op->active_next;	591	active_objects = active_next;
676		592
677	if (op->active_next != NULL)	593	if (active_next)
678	op->active_next->active_prev = NULL;	594	active_next->active_prev = 0;
679	}	595	}
680	else	596	else
681	{	597	{
682	op->active_prev->active_next = op->active_next;	598	active_prev->active_next = active_next;
683		599
684	if (op->active_next)	600	if (active_next)
685	op->active_next->active_prev = op->active_prev;	601	active_next->active_prev = active_prev;
686	}	602	}
687		603
688	op->active_next = NULL;	604	active_next = 0;
689	op->active_prev = NULL;	605	active_prev = 0;
690	}
691	}
692
693	/* This function removes object 'op' from the list of active
694	* objects.
695	* This should only be used for style maps or other such
696	* reference maps where you don't want an object that isn't
697	* in play chewing up cpu time getting processed.
698	* The reverse of this is to call update_ob_speed, which
699	* will do the right thing based on the speed of the object.
700	*/
701	void
702	remove_from_active_list (object *op)
703	{
704	/* If not on the active list, nothing needs to be done */
705	if (!op->active_next && !op->active_prev && op != active_objects)
706	return;
707
708	if (op->active_prev == NULL)
709	{	606	}
710	active_objects = op->active_next;
711	if (op->active_next != NULL)
712	op->active_next->active_prev = NULL;
713	}
714	else
715	{
716	op->active_prev->active_next = op->active_next;
717	if (op->active_next)
718	op->active_next->active_prev = op->active_prev;
719	}
720	op->active_next = NULL;
721	op->active_prev = NULL;
722	}	607	}
723		608
724	/*	609	/*
725	* update_object() updates the array which represents the map.	610	* update_object() updates the the map.
726	* It takes into account invisible objects (and represent squares covered	611	* It takes into account invisible objects (and represent squares covered
727	* by invisible objects by whatever is below them (unless it's another	612	* by invisible objects by whatever is below them (unless it's another
728	* invisible object, etc...)	613	* invisible object, etc...)
729	* If the object being updated is beneath a player, the look-window	614	* If the object being updated is beneath a player, the look-window
730	* of that player is updated (this might be a suboptimal way of	615	* of that player is updated (this might be a suboptimal way of
731	* updating that window, though, since update_object() is called _often_)	616	* updating that window, though, since update_object() is called _often_)
732	*	617	*
733	* action is a hint of what the caller believes need to be done.	618	* action is a hint of what the caller believes need to be done.
734	* For example, if the only thing that has changed is the face (due to
735	* an animation), we don't need to call update_position until that actually
736	* comes into view of a player. OTOH, many other things, like addition/removal
737	* of walls or living creatures may need us to update the flags now.
738	* current action are:	619	* current action are:
739	* UP_OBJ_INSERT: op was inserted	620	* UP_OBJ_INSERT: op was inserted
740	* UP_OBJ_REMOVE: op was removed	621	* UP_OBJ_REMOVE: op was removed
741	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	622	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
742	* as that is easier than trying to look at what may have changed.	623	* as that is easier than trying to look at what may have changed.
743	* UP_OBJ_FACE: only the objects face has changed.	624	* UP_OBJ_FACE: only the objects face has changed.
744	*/	625	*/
745
746	void	626	void
747	update_object (object *op, int action)	627	update_object (object *op, int action)
748	{	628	{
749	int update_now = 0, flags;
750	MoveType move_on, move_off, move_block, move_slow;	629	MoveType move_on, move_off, move_block, move_slow;
751		630
752	if (op == NULL)	631	if (op == NULL)
753	{	632	{
754	/* this should never happen */	633	/* this should never happen */
755	LOG (llevDebug, "update_object() called for NULL object.\n");	634	LOG (llevDebug, "update_object() called for NULL object.\n");
756	return;	635	return;
757	}	636	}
758		637
759	if (op->env != NULL)	638	if (op->env)
760	{	639	{
761	/* Animation is currently handled by client, so nothing	640	/* Animation is currently handled by client, so nothing
762	* to do in this case.	641	* to do in this case.
763	*/	642	*/
764	return;	643	return;
…		…
769	*/	648	*/
770	if (!op->map || op->map->in_memory == MAP_SAVING)	649	if (!op->map || op->map->in_memory == MAP_SAVING)
771	return;	650	return;
772		651
773	/* make sure the object is within map boundaries */	652	/* make sure the object is within map boundaries */
774	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	653	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
775	{	654	{
776	LOG (llevError, "update_object() called for object out of map!\n");	655	LOG (llevError, "update_object() called for object out of map!\n");
777	#ifdef MANY_CORES	656	#ifdef MANY_CORES
778	abort ();	657	abort ();
779	#endif	658	#endif
780	return;	659	return;
781	}	660	}
782		661
783	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	662	mapspace &m = op->ms ();
784	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
785	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
786	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
787	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
788	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
789		663
		664	if (m.flags_ & P_NEED_UPDATE)
		665	/* nop */;
790	if (action == UP_OBJ_INSERT)	666	else if (action == UP_OBJ_INSERT)
791	{	667	{
		668	// this is likely overkill, TODO: revisit (schmorp)
792	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	669	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
793	update_now = 1;
794
795	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	670	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
796	update_now = 1;	671	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
797		672	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		673	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
798	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	674	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
799	update_now = 1;
800
801	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
802	update_now = 1;
803
804	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
805	update_now = 1;
806
807	if ((move_on | op->move_on) != move_on)	675	|| (m.move_on | op->move_on ) != m.move_on
808	update_now = 1;
809
810	if ((move_off | op->move_off) != move_off)	676	|| (m.move_off | op->move_off ) != m.move_off
811	update_now = 1;	677	|| (m.move_slow | op->move_slow) != m.move_slow
812
813	/* This isn't perfect, but I don't expect a lot of objects to	678	/* This isn't perfect, but I don't expect a lot of objects to
814	* to have move_allow right now.	679	* to have move_allow right now.
815	*/	680	*/
816	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	681	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
817	update_now = 1;	682	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
818		683	m.flags_ = P_NEED_UPDATE;
819	if ((move_slow | op->move_slow) != move_slow)
820	update_now = 1;
821	}	684	}
822	/* if the object is being removed, we can't make intelligent	685	/* if the object is being removed, we can't make intelligent
823	* decisions, because remove_ob can't really pass the object	686	* decisions, because remove_ob can't really pass the object
824	* that is being removed.	687	* that is being removed.
825	*/	688	*/
826	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	689	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
827	update_now = 1;	690	m.flags_ = P_NEED_UPDATE;
828	else if (action == UP_OBJ_FACE)	691	else if (action == UP_OBJ_FACE)
829	/* Nothing to do for that case */ ;	692	/* Nothing to do for that case */ ;
830	else	693	else
831	LOG (llevError, "update_object called with invalid action: %d\n", action);	694	LOG (llevError, "update_object called with invalid action: %d\n", action);
832		695
833	if (update_now)
834	{
835	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
836	update_position (op->map, op->x, op->y);
837	}
838
839	if (op->more != NULL)	696	if (op->more)
840	update_object (op->more, action);	697	update_object (op->more, action);
841	}	698	}
842		699
843	static unordered_vector<object *> mortals;	700	object::vector object::objects; // not yet used
844	static std::vector<object *, slice_allocator <object *> > freed;	701	object *object::first;
845
846	void object::free_mortals ()
847	{
848	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
849	if ((*i)->refcnt)
850	++i; // further delay freeing
851	else
852	{
853	freed.push_back (*i);//D
854	//delete *i;
855	mortals.erase (i);
856	}
857
858	if (mortals.size() && 0)//D
859	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
860	}
861		702
862	object::object ()	703	object::object ()
863	{	704	{
864	SET_FLAG (this, FLAG_REMOVED);	705	SET_FLAG (this, FLAG_REMOVED);
865		706
866	expmul = 1.0;	707	expmul = 1.0;
867	face = blank_face;	708	face = blank_face;
868	attacked_by_count = -1;
869	}	709	}
870		710
871	object::~object ()	711	object::~object ()
872	{	712	{
873	free_key_values (this);	713	free_key_values (this);
874	}	714	}
875		715
876	void object::link ()	716	void object::link ()
877	{	717	{
878	count = ++ob_count;	718	count = ++ob_count;
		719	uuid = gen_uuid ();
879		720
880	prev = 0;	721	prev = 0;
881	next = objects;	722	next = object::first;
882		723
883	if (objects)	724	if (object::first)
884	objects->prev = this;	725	object::first->prev = this;
885		726
886	objects = this;	727	object::first = this;
887	}	728	}
888		729
889	void object::unlink ()	730	void object::unlink ()
890	{	731	{
891	count = 0;
892
893	if (this == objects)	732	if (this == object::first)
894	objects = next;	733	object::first = next;
895		734
896	/* Remove this object from the list of used objects */	735	/* Remove this object from the list of used objects */
897	if (prev)
898	{
899	prev->next = next;	736	if (prev) prev->next = next;
		737	if (next) next->prev = prev;
		738
900	prev = 0;	739	prev = 0;
901	}
902
903	if (next)
904	{
905	next->prev = prev;
906	next = 0;	740	next = 0;
		741	}
		742
		743	void
		744	object::activate (bool recursive)
		745	{
		746	// uh, hack
		747	set_speed (speed);
		748
		749	if (recursive)
		750	for (object *op = inv; op; op = op->above)
		751	op->activate (1);
		752	}
		753
		754	/* This function removes object 'op' from the list of active
		755	* objects.
		756	* This should only be used for style maps or other such
		757	* reference maps where you don't want an object that isn't
		758	* in play chewing up cpu time getting processed.
		759	* The reverse of this is to call update_ob_speed, which
		760	* will do the right thing based on the speed of the object.
		761	*/
		762	void
		763	object::deactivate (bool recursive)
		764	{
		765	/* If not on the active list, nothing needs to be done */
		766	if (!active_next && !active_prev && this != active_objects)
		767	return;
		768
		769	if (active_prev == 0)
		770	{
		771	active_objects = active_next;
		772	if (active_next)
		773	active_next->active_prev = 0;
		774	}
		775	else
		776	{
		777	active_prev->active_next = active_next;
		778	if (active_next)
		779	active_next->active_prev = active_prev;
		780	}
		781
		782	active_next = 0;
		783	active_prev = 0;
		784
		785	if (recursive)
		786	for (object *op = inv; op; op = op->above)
		787	op->deactivate (1);
		788	}
		789
		790	/*
		791	* Remove and free all objects in the inventory of the given object.
		792	* object.c ?
		793	*/
		794	void
		795	object::destroy_inv (bool drop_to_ground)
		796	{
		797	// need to check first, because the checks below might segfault
		798	// as we might be on an invalid mapspace and crossfire code
		799	// is too buggy to ensure that the inventory is empty.
		800	// corollary: if you create arrows etc. with stuff in tis inventory,
		801	// cf will crash below with off-map x and y
		802	if (!inv)
		803	return;
		804
		805	/* Only if the space blocks everything do we not process -
		806	* if some form of movement is allowed, let objects
		807	* drop on that space.
		808	*/
		809	if (!drop_to_ground
		810	|| !map
		811	|| map->in_memory != MAP_IN_MEMORY
		812	|| ms ().move_block == MOVE_ALL)
		813	{
		814	while (inv)
		815	{
		816	inv->destroy_inv (drop_to_ground);
		817	inv->destroy ();
		818	}
		819	}
		820	else
		821	{ /* Put objects in inventory onto this space */
		822	while (inv)
		823	{
		824	object *op = inv;
		825
		826	if (op->flag [FLAG_STARTEQUIP]
		827	|| op->flag [FLAG_NO_DROP]
		828	|| op->type == RUNE
		829	|| op->type == TRAP
		830	|| op->flag [FLAG_IS_A_TEMPLATE])
		831	op->destroy ();
		832	else
		833	map->insert (op, x, y);
		834	}
907	}	835	}
908	}	836	}
909		837
910	object *object::create ()	838	object *object::create ()
911	{	839	{
912	object *op;
913
914	if (freed.empty ())
915	op = new object;	840	object *op = new object;
916	else
917	{
918	// highly annoying, but the only way to get it stable right now
919	op = freed.back ();
920	freed.pop_back ();
921	op->~object ();
922	new ((void *) op) object;
923	}
924
925	op->link ();	841	op->link ();
926	return op;	842	return op;
927	}	843	}
928		844
929	/*	845	void
930	* free_object() frees everything allocated by an object, removes	846	object::do_destroy ()
931	* it from the list of used objects, and puts it on the list of
932	* free objects. The IS_FREED() flag is set in the object.
933	* The object must have been removed by remove_ob() first for
934	* this function to succeed.
935	*
936	* If free_inventory is set, free inventory as well. Else drop items in
937	* inventory to the ground.
938	*/
939	void object::free (bool free_inventory)
940	{	847	{
941	if (QUERY_FLAG (this, FLAG_FREED))	848	if (flag [FLAG_IS_LINKED])
		849	remove_button_link (this);
		850
		851	if (flag [FLAG_FRIENDLY])
		852	remove_friendly_object (this);
		853
		854	if (!flag [FLAG_REMOVED])
		855	remove ();
		856
		857	if (flag [FLAG_FREED])
942	return;	858	return;
943		859
944	if (QUERY_FLAG (this, FLAG_FRIENDLY))	860	set_speed (0);
945	remove_friendly_object (this);
946		861
947	if (!QUERY_FLAG (this, FLAG_REMOVED))	862	flag [FLAG_FREED] = 1;
948	remove_ob (this);
949		863
950	SET_FLAG (this, FLAG_FREED);	864	attachable::do_destroy ();
		865
		866	destroy_inv (true);
		867	unlink ();
		868
		869	// hack to ensure that freed objects still have a valid map
		870	{
		871	static maptile *freed_map; // freed objects are moved here to avoid crashes
		872
		873	if (!freed_map)
		874	{
		875	freed_map = new maptile;
		876
		877	freed_map->name = "/internal/freed_objects_map";
		878	freed_map->width = 3;
		879	freed_map->height = 3;
		880
		881	freed_map->alloc ();
		882	}
		883
		884	map = freed_map;
		885	x = 1;
		886	y = 1;
		887	}
		888
		889	head = 0;
951		890
952	if (more)	891	if (more)
953	{	892	{
954	more->free (free_inventory);	893	more->destroy ();
955	more = 0;	894	more = 0;
956	}	895	}
957		896
958	if (inv)	897	// clear those pointers that likely might have circular references to us
959	{
960	/* Only if the space blocks everything do we not process -
961	* if some form of movement is allowed, let objects
962	* drop on that space.
963	*/
964	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
965	{
966	object *op = inv;
967
968	while (op)
969	{
970	object *tmp = op->below;
971	op->free (free_inventory);
972	op = tmp;
973	}
974	}
975	else
976	{ /* Put objects in inventory onto this space */
977	object *op = inv;
978
979	while (op)
980	{
981	object *tmp = op->below;
982
983	remove_ob (op);
984
985	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
986	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
987	free_object (op);
988	else
989	{
990	op->x = x;
991	op->y = y;
992	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
993	}
994
995	op = tmp;
996	}
997	}
998	}
999
1000	owner = 0;	898	owner = 0;
		899	enemy = 0;
		900	attacked_by = 0;
1001		901
1002	/* Remove object from the active list */	902	// only relevant for players(?), but make sure of it anyways
1003	speed = 0;	903	contr = 0;
1004	update_ob_speed (this);	904	}
1005		905
1006	unlink ();	906	void
		907	object::destroy (bool destroy_inventory)
		908	{
		909	if (destroyed ())
		910	return;
1007		911
1008	mortals.push_back (this);	912	if (destroy_inventory)
		913	destroy_inv (false);
		914
		915	attachable::destroy ();
1009	}	916	}
1010		917
1011	/*	918	/*
1012	* sub_weight() recursively (outwards) subtracts a number from the	919	* sub_weight() recursively (outwards) subtracts a number from the
1013	* 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)).
1014	*/	921	*/
1015
1016	void	922	void
1017	sub_weight (object *op, signed long weight)	923	sub_weight (object *op, signed long weight)
1018	{	924	{
1019	while (op != NULL)	925	while (op != NULL)
1020	{	926	{
1021	if (op->type == CONTAINER)	927	if (op->type == CONTAINER)
1022	{
1023	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	928	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024	}	929
1025	op->carrying -= weight;	930	op->carrying -= weight;
1026	op = op->env;	931	op = op->env;
1027	}	932	}
1028	}	933	}
1029		934
1030	/* remove_ob(op):	935	/* op->remove ():
1031	* 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
1032	* 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
1033	* object will have no environment. If the object previously had an	938	* object will have no environment. If the object previously had an
1034	* environment, the x and y coordinates will be updated to	939	* environment, the x and y coordinates will be updated to
1035	* the previous environment.	940	* the previous environment.
1036	* Beware: This function is called from the editor as well!	941	* Beware: This function is called from the editor as well!
1037	*/	942	*/
1038
1039	void	943	void
1040	remove_ob (object *op)	944	object::remove ()
1041	{	945	{
		946	object *tmp, *last = 0;
1042	object *	947	object *otmp;
1043	tmp, *
1044	last = NULL;
1045	object *
1046	otmp;
1047		948
1048	tag_t
1049	tag;
1050	int
1051	check_walk_off;
1052	mapstruct *
1053	m;
1054
1055	sint16
1056	x,
1057	y;
1058
1059	if (QUERY_FLAG (op, FLAG_REMOVED))	949	if (QUERY_FLAG (this, FLAG_REMOVED))
1060	return;	950	return;
1061		951
1062	SET_FLAG (op, FLAG_REMOVED);	952	SET_FLAG (this, FLAG_REMOVED);
		953	INVOKE_OBJECT (REMOVE, this);
1063		954
1064	if (op->more != NULL)	955	if (more)
1065	remove_ob (op->more);	956	more->remove ();
1066		957
1067	/*	958	/*
1068	* In this case, the object to be removed is in someones	959	* In this case, the object to be removed is in someones
1069	* inventory.	960	* inventory.
1070	*/	961	*/
1071	if (op->env != NULL)	962	if (env)
1072	{	963	{
1073	if (op->nrof)	964	if (nrof)
1074	sub_weight (op->env, op->weight * op->nrof);	965	sub_weight (env, weight * nrof);
1075	else	966	else
1076	sub_weight (op->env, op->weight + op->carrying);	967	sub_weight (env, weight + carrying);
1077		968
1078	/* 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
1079	* made to players inventory. If set, avoiding the call	970	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	971	* to save cpu time.
1081	*/	972	*/
1082	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))
1083	fix_player (otmp);	974	otmp->update_stats ();
1084		975
1085	if (op->above != NULL)	976	if (above)
1086	op->above->below = op->below;	977	above->below = below;
1087	else	978	else
1088	op->env->inv = op->below;	979	env->inv = below;
1089		980
1090	if (op->below != NULL)	981	if (below)
1091	op->below->above = op->above;	982	below->above = above;
1092		983
1093	/* we set up values so that it could be inserted into	984	/* we set up values so that it could be inserted into
1094	* 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
1095	* to the caller to decide what we want to do.	986	* to the caller to decide what we want to do.
1096	*/	987	*/
1097	op->x = op->env->x, op->y = op->env->y;	988	x = env->x, y = env->y;
1098	op->map = op->env->map;	989	map = env->map;
1099	op->above = NULL, op->below = NULL;	990	above = 0, below = 0;
1100	op->env = NULL;	991	env = 0;
1101	}	992	}
1102	else if (op->map)	993	else if (map)
1103	{	994	{
1104	x = op->x;	995	if (type == PLAYER)
1105	y = op->y;
1106	m = get_map_from_coord (op->map, &x, &y);
1107
1108	if (!m)
1109	{
1110	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1111	op->map->path, op->x, op->y);
1112	/* in old days, we used to set x and y to 0 and continue.
1113	* it seems if we get into this case, something is probablye
1114	* screwed up and should be fixed.
1115	*/
1116	abort ();
1117	}	996	{
1118		997	--map->players;
1119	if (op->map != m)	998	map->last_access = runtime;
1120	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1121	op->map->path, m->path, op->x, op->y, x, y);
1122
1123	/* Re did the following section of code - it looks like it had
1124	* lots of logic for things we no longer care about
1125	*/	999	}
		1000
1126		1001
1127	/* link the object above us */	1002	/* link the object above us */
1128	if (op->above)	1003	if (above)
1129	op->above->below = op->below;	1004	above->below = below;
1130	else	1005	else
1131	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1006	map->at (x, y).top = below; /* we were top, set new top */
1132		1007
1133	/* Relink the object below us, if there is one */	1008	/* Relink the object below us, if there is one */
1134	if (op->below)	1009	if (below)
1135	op->below->above = op->above;	1010	below->above = above;
1136	else	1011	else
1137	{	1012	{
1138	/* Nothing below, which means we need to relink map object for this space	1013	/* Nothing below, which means we need to relink map object for this space
1139	* use translated coordinates in case some oddness with map tiling is	1014	* use translated coordinates in case some oddness with map tiling is
1140	* evident	1015	* evident
1141	*/	1016	*/
1142	if (GET_MAP_OB (m, x, y) != op)	1017	if (GET_MAP_OB (map, x, y) != this)
1143	{	1018	{
1144	dump_object (op);	1019	char *dump = dump_object (this);
1145	LOG (llevError,	1020	LOG (llevError,
1146	"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);	1021	"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);
		1022	free (dump);
1147	dump_object (GET_MAP_OB (m, x, y));	1023	dump = dump_object (GET_MAP_OB (map, x, y));
1148	LOG (llevError, "%s\n", errmsg);	1024	LOG (llevError, "%s\n", dump);
		1025	free (dump);
1149	}	1026	}
1150		1027
1151	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1028	map->at (x, y).bot = above; /* goes on above it. */
1152	}	1029	}
1153		1030
1154	op->above = 0;	1031	above = 0;
1155	op->below = 0;	1032	below = 0;
1156		1033
1157	if (op->map->in_memory == MAP_SAVING)	1034	if (map->in_memory == MAP_SAVING)
1158	return;	1035	return;
1159		1036
1160	tag = op->count;	1037	int check_walk_off = !flag [FLAG_NO_APPLY];
1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1162		1038
1163	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1039	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1164	{	1040	{
1165	/* No point updating the players look faces if he is the object	1041	/* No point updating the players look faces if he is the object
1166	* being removed.	1042	* being removed.
1167	*/	1043	*/
1168		1044
1169	if (tmp->type == PLAYER && tmp != op)	1045	if (tmp->type == PLAYER && tmp != this)
1170	{	1046	{
1171	/* If a container that the player is currently using somehow gets	1047	/* If a container that the player is currently using somehow gets
1172	* removed (most likely destroyed), update the player view	1048	* removed (most likely destroyed), update the player view
1173	* appropriately.	1049	* appropriately.
1174	*/	1050	*/
1175	if (tmp->container == op)	1051	if (tmp->container == this)
1176	{	1052	{
1177	CLEAR_FLAG (op, FLAG_APPLIED);	1053	flag [FLAG_APPLIED] = 0;
1178	tmp->container = NULL;	1054	tmp->container = 0;
1179	}	1055	}
1180		1056
1181	tmp->contr->socket.update_look = 1;	1057	if (tmp->contr->ns)
		1058	tmp->contr->ns->floorbox_update ();
1182	}	1059	}
1183		1060
1184	/* See if player moving off should effect something */	1061	/* See if object moving off should effect something */
1185	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1062	if (check_walk_off
		1063	&& ((move_type & tmp->move_off)
		1064	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186	{	1065	{
1187	move_apply (tmp, op, NULL);	1066	move_apply (tmp, this, 0);
1188		1067
1189	if (was_destroyed (op, tag))	1068	if (destroyed ())
1190	{
1191	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1069	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192	}
1193	}	1070	}
1194		1071
1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1072	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196		1073	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1197	if (tmp->above == tmp)	1074	if (tmp->above == tmp)
1198	tmp->above = NULL;	1075	tmp->above = 0;
1199		1076
1200	last = tmp;	1077	last = tmp;
1201	}	1078	}
1202		1079
1203	/* last == NULL of there are no objects on this space */	1080	/* last == NULL if there are no objects on this space */
		1081	//TODO: this makes little sense, why only update the topmost object?
1204	if (last == NULL)	1082	if (!last)
1205	{	1083	map->at (x, y).flags_ = P_NEED_UPDATE;
1206	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1207	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1208	* those out anyways, and if there are any flags set right now, they won't
1209	* be correct anyways.
1210	*/
1211	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1212	update_position (op->map, op->x, op->y);
1213	}
1214	else	1084	else
1215	update_object (last, UP_OBJ_REMOVE);	1085	update_object (last, UP_OBJ_REMOVE);
1216		1086
1217	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1087	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1218	update_all_los (op->map, op->x, op->y);	1088	update_all_los (map, x, y);
1219	}	1089	}
1220	}	1090	}
1221		1091
1222	/*	1092	/*
1223	* merge_ob(op,top):	1093	* merge_ob(op,top):
…		…
1231	merge_ob (object *op, object *top)	1101	merge_ob (object *op, object *top)
1232	{	1102	{
1233	if (!op->nrof)	1103	if (!op->nrof)
1234	return 0;	1104	return 0;
1235		1105
1236	if (top == NULL)	1106	if (top)
1237	for (top = op; top != NULL && top->above != NULL; top = top->above);	1107	for (top = op; top && top->above; top = top->above)
		1108	;
1238		1109
1239	for (; top != NULL; top = top->below)	1110	for (; top; top = top->below)
1240	{	1111	{
1241	if (top == op)	1112	if (top == op)
1242	continue;	1113	continue;
1243	if (CAN_MERGE (op, top))	1114
		1115	if (object::can_merge (op, top))
1244	{	1116	{
1245	top->nrof += op->nrof;	1117	top->nrof += op->nrof;
1246		1118
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1119	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1120	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1121	op->destroy ();
1250	free_object (op);
1251	return top;	1122	return top;
1252	}	1123	}
1253	}	1124	}
1254		1125
1255	return NULL;	1126	return 0;
1256	}	1127	}
1257		1128
1258	/*	1129	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1130	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1131	* job preparing multi-part monsters
1261	*/	1132	*/
1262	object *	1133	object *
1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1134	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264	{	1135	{
1265	object *tmp;
1266
1267	if (op->head)
1268	op = op->head;
1269
1270	for (tmp = op; tmp; tmp = tmp->more)	1136	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1271	{	1137	{
1272	tmp->x = x + tmp->arch->clone.x;	1138	tmp->x = x + tmp->arch->clone.x;
1273	tmp->y = y + tmp->arch->clone.y;	1139	tmp->y = y + tmp->arch->clone.y;
1274	}	1140	}
1275		1141
…		…
1294	* Return value:	1160	* Return value:
1295	* new object if 'op' was merged with other object	1161	* new object if 'op' was merged with other object
1296	* NULL if 'op' was destroyed	1162	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1163	* just 'op' otherwise
1298	*/	1164	*/
1299
1300	object *	1165	object *
1301	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)
1302	{	1167	{
1303	object *tmp, *top, *floor = NULL;	1168	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1169	sint16 x, y;
1305		1170
1306	if (QUERY_FLAG (op, FLAG_FREED))	1171	if (QUERY_FLAG (op, FLAG_FREED))
1307	{	1172	{
1308	LOG (llevError, "Trying to insert freed object!\n");	1173	LOG (llevError, "Trying to insert freed object!\n");
1309	return NULL;	1174	return NULL;
1310	}	1175	}
1311		1176
1312	if (m == NULL)	1177	if (!m)
1313	{	1178	{
1314	dump_object (op);	1179	char *dump = dump_object (op);
1315	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);
1316	return op;	1182	return op;
1317	}	1183	}
1318		1184
1319	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1320	{	1186	{
1321	dump_object (op);	1187	char *dump = dump_object (op);
1322	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);
1323	#ifdef MANY_CORES	1189	#ifdef MANY_CORES
1324	/* 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
1325	* 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
1326	* improperly inserted.	1192	* improperly inserted.
1327	*/	1193	*/
1328	abort ();	1194	abort ();
1329	#endif	1195	#endif
		1196	free (dump);
1330	return op;	1197	return op;
1331	}	1198	}
1332		1199
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1201	{
1335	dump_object (op);	1202	char *dump = dump_object (op);
1336	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);
1337	return op;	1205	return op;
1338	}	1206	}
1339		1207
1340	if (op->more != NULL)	1208	if (op->more)
1341	{	1209	{
1342	/* The part may be on a different map. */	1210	/* The part may be on a different map. */
1343		1211
1344	object *more = op->more;	1212	object *more = op->more;
1345		1213
…		…
1361	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1362	{	1230	{
1363	if (!op->head)	1231	if (!op->head)
1364	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1365		1233
1366	return NULL;	1234	return 0;
1367	}	1235	}
1368	}	1236	}
1369		1237
1370	CLEAR_FLAG (op, FLAG_REMOVED);	1238	CLEAR_FLAG (op, FLAG_REMOVED);
1371		1239
…		…
1378	y = op->y;	1246	y = op->y;
1379		1247
1380	/* this has to be done after we translate the coordinates.	1248	/* this has to be done after we translate the coordinates.
1381	*/	1249	*/
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1250	if (op->nrof && !(flag & INS_NO_MERGE))
1383	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; tmp = tmp->above)
1384	if (CAN_MERGE (op, tmp))	1252	if (object::can_merge (op, tmp))
1385	{	1253	{
1386	op->nrof += tmp->nrof;	1254	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1255	tmp->destroy ();
1388	free_object (tmp);
1389	}	1256	}
1390		1257
1391	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 */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1259	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1260
…		…
1406	op->below = originator->below;	1273	op->below = originator->below;
1407		1274
1408	if (op->below)	1275	if (op->below)
1409	op->below->above = op;	1276	op->below->above = op;
1410	else	1277	else
1411	SET_MAP_OB (op->map, op->x, op->y, op);	1278	op->ms ().bot = op;
1412		1279
1413	/* since *below* originator, no need to update top */	1280	/* since *below* originator, no need to update top */
1414	originator->below = op;	1281	originator->below = op;
1415	}	1282	}
1416	else	1283	else
1417	{	1284	{
1418	/* If there are other objects, then */	1285	/* If there are other objects, then */
1419	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1420	{	1287	{
1421	object *last = NULL;	1288	object *last = 0;
1422		1289
1423	/*	1290	/*
1424	* If there are multiple objects on this space, we do some trickier handling.	1291	* If there are multiple objects on this space, we do some trickier handling.
1425	* We've already dealt with merging if appropriate.	1292	* We've already dealt with merging if appropriate.
1426	* Generally, we want to put the new object on top. But if	1293	* Generally, we want to put the new object on top. But if
…		…
1430	* once we get to them. This reduces the need to traverse over all of	1297	* once we get to them. This reduces the need to traverse over all of
1431	* them when adding another one - this saves quite a bit of cpu time	1298	* them when adding another one - this saves quite a bit of cpu time
1432	* when lots of spells are cast in one area. Currently, it is presumed	1299	* when lots of spells are cast in one area. Currently, it is presumed
1433	* that flying non pickable objects are spell objects.	1300	* that flying non pickable objects are spell objects.
1434	*/	1301	*/
1435
1436	while (top != NULL)	1302	while (top)
1437	{	1303	{
1438	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1304	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1439	floor = top;	1305	floor = top;
1440		1306
1441	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1307	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1462	* If INS_ON_TOP is used, don't do this processing	1328	* If INS_ON_TOP is used, don't do this processing
1463	* Need to find the object that in fact blocks view, otherwise	1329	* Need to find the object that in fact blocks view, otherwise
1464	* stacking is a bit odd.	1330	* stacking is a bit odd.
1465	*/	1331	*/
1466	if (!(flag & INS_ON_TOP) &&	1332	if (!(flag & INS_ON_TOP) &&
1467	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1333	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1468	{	1334	{
1469	for (last = top; last != floor; last = last->below)	1335	for (last = top; last != floor; last = last->below)
1470	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1336	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1471	break;	1337	break;
1472	/* Check to see if we found the object that blocks view,	1338	/* Check to see if we found the object that blocks view,
…		…
1494	op->above = GET_MAP_OB (op->map, op->x, op->y);	1360	op->above = GET_MAP_OB (op->map, op->x, op->y);
1495		1361
1496	if (op->above)	1362	if (op->above)
1497	op->above->below = op;	1363	op->above->below = op;
1498		1364
1499	op->below = NULL;	1365	op->below = 0;
1500	SET_MAP_OB (op->map, op->x, op->y, op);	1366	op->ms ().bot = op;
1501	}	1367	}
1502	else	1368	else
1503	{ /* get inserted into the stack above top */	1369	{ /* get inserted into the stack above top */
1504	op->above = top->above;	1370	op->above = top->above;
1505		1371
…		…
1508		1374
1509	op->below = top;	1375	op->below = top;
1510	top->above = op;	1376	top->above = op;
1511	}	1377	}
1512		1378
1513	if (op->above == NULL)	1379	if (!op->above)
1514	SET_MAP_TOP (op->map, op->x, op->y, op);	1380	op->ms ().top = op;
1515	} /* else not INS_BELOW_ORIGINATOR */	1381	} /* else not INS_BELOW_ORIGINATOR */
1516		1382
1517	if (op->type == PLAYER)	1383	if (op->type == PLAYER)
		1384	{
1518	op->contr->do_los = 1;	1385	op->contr->do_los = 1;
		1386	++op->map->players;
		1387	op->map->last_access = runtime;
		1388	}
1519		1389
1520	/* If we have a floor, we know the player, if any, will be above	1390	/* If we have a floor, we know the player, if any, will be above
1521	* it, so save a few ticks and start from there.	1391	* it, so save a few ticks and start from there.
1522	*/	1392	*/
1523	if (!(flag & INS_MAP_LOAD))	1393	if (!(flag & INS_MAP_LOAD))
1524	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1394	if (object *pl = op->ms ().player ())
1525	if (tmp->type == PLAYER)	1395	if (pl->contr->ns)
1526	tmp->contr->socket.update_look = 1;	1396	pl->contr->ns->floorbox_update ();
1527		1397
1528	/* If this object glows, it may affect lighting conditions that are	1398	/* If this object glows, it may affect lighting conditions that are
1529	* visible to others on this map. But update_all_los is really	1399	* visible to others on this map. But update_all_los is really
1530	* an inefficient way to do this, as it means los for all players	1400	* an inefficient way to do this, as it means los for all players
1531	* on the map will get recalculated. The players could very well	1401	* on the map will get recalculated. The players could very well
1532	* be far away from this change and not affected in any way -	1402	* be far away from this change and not affected in any way -
1533	* this should get redone to only look for players within range,	1403	* this should get redone to only look for players within range,
1534	* or just updating the P_NEED_UPDATE for spaces within this area	1404	* or just updating the P_NEED_UPDATE for spaces within this area
1535	* of effect may be sufficient.	1405	* of effect may be sufficient.
1536	*/	1406	*/
1537	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1407	if (op->map->darkness && (op->glow_radius != 0))
1538	update_all_los (op->map, op->x, op->y);	1408	update_all_los (op->map, op->x, op->y);
1539		1409
1540	/* updates flags (blocked, alive, no magic, etc) for this map space */	1410	/* updates flags (blocked, alive, no magic, etc) for this map space */
1541	update_object (op, UP_OBJ_INSERT);	1411	update_object (op, UP_OBJ_INSERT);
1542		1412
		1413	INVOKE_OBJECT (INSERT, op);
		1414
1543	/* Don't know if moving this to the end will break anything. However,	1415	/* Don't know if moving this to the end will break anything. However,
1544	* we want to have update_look set above before calling this.	1416	* we want to have floorbox_update called before calling this.
1545	*	1417	*
1546	* check_move_on() must be after this because code called from	1418	* check_move_on() must be after this because code called from
1547	* check_move_on() depends on correct map flags (so functions like	1419	* check_move_on() depends on correct map flags (so functions like
1548	* blocked() and wall() work properly), and these flags are updated by	1420	* blocked() and wall() work properly), and these flags are updated by
1549	* update_object().	1421	* update_object().
…		…
1551		1423
1552	/* if this is not the head or flag has been passed, don't check walk on status */	1424	/* if this is not the head or flag has been passed, don't check walk on status */
1553	if (!(flag & INS_NO_WALK_ON) && !op->head)	1425	if (!(flag & INS_NO_WALK_ON) && !op->head)
1554	{	1426	{
1555	if (check_move_on (op, originator))	1427	if (check_move_on (op, originator))
1556	return NULL;	1428	return 0;
1557		1429
1558	/* If we are a multi part object, lets work our way through the check	1430	/* If we are a multi part object, lets work our way through the check
1559	* walk on's.	1431	* walk on's.
1560	*/	1432	*/
1561	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1433	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1562	if (check_move_on (tmp, originator))	1434	if (check_move_on (tmp, originator))
1563	return NULL;	1435	return 0;
1564	}	1436	}
1565		1437
1566	return op;	1438	return op;
1567	}	1439	}
1568		1440
1569	/* this function inserts an object in the map, but if it	1441	/* this function inserts an object in the map, but if it
1570	* finds an object of its own type, it'll remove that one first.	1442	* finds an object of its own type, it'll remove that one first.
1571	* op is the object to insert it under: supplies x and the map.	1443	* op is the object to insert it under: supplies x and the map.
1572	*/	1444	*/
1573	void	1445	void
1574	replace_insert_ob_in_map (const char *arch_string, object *op)	1446	replace_insert_ob_in_map (const char *arch_string, object *op)
1575	{	1447	{
1576	object *	1448	object *tmp, *tmp1;
1577	tmp;
1578	object *
1579	tmp1;
1580		1449
1581	/* first search for itself and remove any old instances */	1450	/* first search for itself and remove any old instances */
1582		1451
1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1452	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1584	{
1585	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1453	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1454	tmp->destroy ();
1587	remove_ob (tmp);
1588	free_object (tmp);
1589	}
1590	}
1591		1455
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1456	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1457
1594	tmp1->x = op->x;	1458	tmp1->x = op->x;
1595	tmp1->y = op->y;	1459	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1460	insert_ob_in_map (tmp1, op->map, op, 0);
		1461	}
		1462
		1463	object *
		1464	object::insert_at (object *where, object *originator, int flags)
		1465	{
		1466	where->map->insert (this, where->x, where->y, originator, flags);
1597	}	1467	}
1598		1468
1599	/*	1469	/*
1600	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1470	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1601	* is returned contains nr objects, and the remaining parts contains	1471	* is returned contains nr objects, and the remaining parts contains
1602	* the rest (or is removed and freed if that number is 0).	1472	* the rest (or is removed and freed if that number is 0).
1603	* On failure, NULL is returned, and the reason put into the	1473	* On failure, NULL is returned, and the reason put into the
1604	* global static errmsg array.	1474	* global static errmsg array.
1605	*/	1475	*/
1606
1607	object *	1476	object *
1608	get_split_ob (object *orig_ob, uint32 nr)	1477	get_split_ob (object *orig_ob, uint32 nr)
1609	{	1478	{
1610	object *	1479	object *newob;
1611	newob;
1612	int
1613	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614		1481
1615	if (orig_ob->nrof < nr)	1482	if (orig_ob->nrof < nr)
1616	{	1483	{
1617	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1484	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1618	return NULL;	1485	return NULL;
1619	}	1486	}
1620		1487
1621	newob = object_create_clone (orig_ob);	1488	newob = object_create_clone (orig_ob);
1622		1489
1623	if ((orig_ob->nrof -= nr) < 1)	1490	if ((orig_ob->nrof -= nr) < 1)
1624	{	1491	orig_ob->destroy (1);
1625	if (!is_removed)
1626	remove_ob (orig_ob);
1627	free_object2 (orig_ob, 1);
1628	}
1629	else if (!is_removed)	1492	else if (!is_removed)
1630	{	1493	{
1631	if (orig_ob->env != NULL)	1494	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1495	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1496	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1653		1516
1654	object *	1517	object *
1655	decrease_ob_nr (object *op, uint32 i)	1518	decrease_ob_nr (object *op, uint32 i)
1656	{	1519	{
1657	object *tmp;	1520	object *tmp;
1658	player *pl;
1659		1521
1660	if (i == 0) /* objects with op->nrof require this check */	1522	if (i == 0) /* objects with op->nrof require this check */
1661	return op;	1523	return op;
1662		1524
1663	if (i > op->nrof)	1525	if (i > op->nrof)
1664	i = op->nrof;	1526	i = op->nrof;
1665		1527
1666	if (QUERY_FLAG (op, FLAG_REMOVED))	1528	if (QUERY_FLAG (op, FLAG_REMOVED))
1667	op->nrof -= i;	1529	op->nrof -= i;
1668	else if (op->env != NULL)	1530	else if (op->env)
1669	{	1531	{
1670	/* is this object in the players inventory, or sub container	1532	/* is this object in the players inventory, or sub container
1671	* therein?	1533	* therein?
1672	*/	1534	*/
1673	tmp = is_player_inv (op->env);	1535	tmp = op->in_player ();
1674	/* nope. Is this a container the player has opened?	1536	/* nope. Is this a container the player has opened?
1675	* If so, set tmp to that player.	1537	* If so, set tmp to that player.
1676	* IMO, searching through all the players will mostly	1538	* IMO, searching through all the players will mostly
1677	* likely be quicker than following op->env to the map,	1539	* likely be quicker than following op->env to the map,
1678	* and then searching the map for a player.	1540	* and then searching the map for a player.
1679	*/	1541	*/
1680	if (!tmp)	1542	if (!tmp)
1681	{	1543	for_all_players (pl)
1682	for (pl = first_player; pl; pl = pl->next)
1683	if (pl->ob->container == op->env)	1544	if (pl->ob->container == op->env)
		1545	{
		1546	tmp = pl->ob;
1684	break;	1547	break;
1685	if (pl)
1686	tmp = pl->ob;
1687	else
1688	tmp = NULL;
1689	}	1548	}
1690		1549
1691	if (i < op->nrof)	1550	if (i < op->nrof)
1692	{	1551	{
1693	sub_weight (op->env, op->weight * i);	1552	sub_weight (op->env, op->weight * i);
1694	op->nrof -= i;	1553	op->nrof -= i;
1695	if (tmp)	1554	if (tmp)
1696	{
1697	esrv_send_item (tmp, op);	1555	esrv_send_item (tmp, op);
1698	}
1699	}	1556	}
1700	else	1557	else
1701	{	1558	{
1702	remove_ob (op);	1559	op->remove ();
1703	op->nrof = 0;	1560	op->nrof = 0;
1704	if (tmp)	1561	if (tmp)
1705	{
1706	esrv_del_item (tmp->contr, op->count);	1562	esrv_del_item (tmp->contr, op->count);
1707	}
1708	}	1563	}
1709	}	1564	}
1710	else	1565	else
1711	{	1566	{
1712	object *above = op->above;	1567	object *above = op->above;
1713		1568
1714	if (i < op->nrof)	1569	if (i < op->nrof)
1715	op->nrof -= i;	1570	op->nrof -= i;
1716	else	1571	else
1717	{	1572	{
1718	remove_ob (op);	1573	op->remove ();
1719	op->nrof = 0;	1574	op->nrof = 0;
1720	}	1575	}
1721		1576
1722	/* Since we just removed op, op->above is null */	1577	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1578	for (tmp = above; tmp; tmp = tmp->above)
1724	if (tmp->type == PLAYER)	1579	if (tmp->type == PLAYER)
1725	{	1580	{
1726	if (op->nrof)	1581	if (op->nrof)
1727	esrv_send_item (tmp, op);	1582	esrv_send_item (tmp, op);
1728	else	1583	else
…		…
1732		1587
1733	if (op->nrof)	1588	if (op->nrof)
1734	return op;	1589	return op;
1735	else	1590	else
1736	{	1591	{
1737	free_object (op);	1592	op->destroy ();
1738	return NULL;	1593	return 0;
1739	}	1594	}
1740	}	1595	}
1741		1596
1742	/*	1597	/*
1743	* add_weight(object, weight) adds the specified weight to an object,	1598	* add_weight(object, weight) adds the specified weight to an object,
…		…
1755	op->carrying += weight;	1610	op->carrying += weight;
1756	op = op->env;	1611	op = op->env;
1757	}	1612	}
1758	}	1613	}
1759		1614
		1615	object *
		1616	insert_ob_in_ob (object *op, object *where)
		1617	{
		1618	if (!where)
		1619	{
		1620	char *dump = dump_object (op);
		1621	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1622	free (dump);
		1623	return op;
		1624	}
		1625
		1626	if (where->head)
		1627	{
		1628	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1629	where = where->head;
		1630	}
		1631
		1632	return where->insert (op);
		1633	}
		1634
1760	/*	1635	/*
1761	* insert_ob_in_ob(op,environment):	1636	* env->insert (op)
1762	* This function inserts the object op in the linked list	1637	* This function inserts the object op in the linked list
1763	* inside the object environment.	1638	* inside the object environment.
1764	*	1639	*
1765	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1766	* the inventory at the last position or next to other objects of the same
1767	* type.
1768	* Frank: Now sorted by type, archetype and magic!
1769	*
1770	* The function returns now pointer to inserted item, and return value can	1640	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1641	* be != op, if items are merged. -Tero
1772	*/	1642	*/
1773		1643
1774	object *	1644	object *
1775	insert_ob_in_ob (object *op, object *where)	1645	object::insert (object *op)
1776	{	1646	{
1777	object *	1647	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1648
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1649	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1650	op->remove ();
1783	dump_object (op);
1784	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1785	return op;
1786	}
1787
1788	if (where == NULL)
1789	{
1790	dump_object (op);
1791	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1792	return op;
1793	}
1794
1795	if (where->head)
1796	{
1797	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1798	where = where->head;
1799	}
1800		1651
1801	if (op->more)	1652	if (op->more)
1802	{	1653	{
1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1654	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804	return op;	1655	return op;
…		…
1806		1657
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1658	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1659	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1660	if (op->nrof)
1810	{	1661	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1662	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1663	if (object::can_merge (tmp, op))
1813	{	1664	{
1814	/* return the original object and remove inserted object	1665	/* return the original object and remove inserted object
1815	(client needs the original object) */	1666	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1667	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1668	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1669	* tmp->nrof, we need to increase the weight.
1819	*/	1670	*/
1820	add_weight (where, op->weight * op->nrof);	1671	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1672	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1673	op->destroy (); /* free the inserted object */
1823	op = tmp;	1674	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1675	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1676	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1677	break;
1827	}	1678	}
1828		1679
1829	/* I assume combined objects have no inventory	1680	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1681	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1682	* (if it was possible to merge). calling remove_ob will subtract
1832	* the weight, so we need to add it in again, since we actually do	1683	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1684	* the linking below
1834	*/	1685	*/
1835	add_weight (where, op->weight * op->nrof);	1686	add_weight (this, op->weight * op->nrof);
1836	}	1687	}
1837	else	1688	else
1838	add_weight (where, (op->weight + op->carrying));	1689	add_weight (this, (op->weight + op->carrying));
1839		1690
1840	otmp = is_player_inv (where);	1691	otmp = this->in_player ();
1841	if (otmp && otmp->contr != NULL)	1692	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1693	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1694	otmp->update_stats ();
1845	}
1846		1695
1847	op->map = NULL;	1696	op->map = 0;
1848	op->env = where;	1697	op->env = this;
1849	op->above = NULL;	1698	op->above = 0;
1850	op->below = NULL;	1699	op->below = 0;
1851	op->x = 0, op->y = 0;	1700	op->x = 0, op->y = 0;
1852		1701
1853	/* reset the light list and los of the players on the map */	1702	/* reset the light list and los of the players on the map */
1854	if ((op->glow_radius != 0) && where->map)	1703	if ((op->glow_radius != 0) && map)
1855	{	1704	{
1856	#ifdef DEBUG_LIGHTS	1705	#ifdef DEBUG_LIGHTS
1857	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858	#endif /* DEBUG_LIGHTS */	1707	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1708	if (map->darkness)
1860	update_all_los (where->map, where->x, where->y);	1709	update_all_los (map, x, y);
1861	}	1710	}
1862		1711
1863	/* Client has no idea of ordering so lets not bother ordering it here.	1712	/* Client has no idea of ordering so lets not bother ordering it here.
1864	* It sure simplifies this function...	1713	* It sure simplifies this function...
1865	*/	1714	*/
1866	if (where->inv == NULL)	1715	if (!inv)
1867	where->inv = op;	1716	inv = op;
1868	else	1717	else
1869	{	1718	{
1870	op->below = where->inv;	1719	op->below = inv;
1871	op->below->above = op;	1720	op->below->above = op;
1872	where->inv = op;	1721	inv = op;
1873	}	1722	}
		1723
		1724	INVOKE_OBJECT (INSERT, this);
		1725
1874	return op;	1726	return op;
1875	}	1727	}
1876		1728
1877	/*	1729	/*
1878	* Checks if any objects has a move_type that matches objects	1730	* Checks if any objects has a move_type that matches objects
…		…
1892	*	1744	*
1893	* MSW 2001-07-08: Check all objects on space, not just those below	1745	* MSW 2001-07-08: Check all objects on space, not just those below
1894	* object being inserted. insert_ob_in_map may not put new objects	1746	* object being inserted. insert_ob_in_map may not put new objects
1895	* on top.	1747	* on top.
1896	*/	1748	*/
1897
1898	int	1749	int
1899	check_move_on (object *op, object *originator)	1750	check_move_on (object *op, object *originator)
1900	{	1751	{
1901	object *	1752	object *tmp;
1902	tmp;	1753	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1754	int x = op->x, y = op->y;
1909		1755
1910	MoveType	1756	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1757
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1758	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1759	return 0;
1917
1918	tag = op->count;
1919		1760
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1761	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1921	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1762	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1922	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1763	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1764
…		…
1939		1780
1940	/* The objects have to be checked from top to bottom.	1781	/* The objects have to be checked from top to bottom.
1941	* Hence, we first go to the top:	1782	* Hence, we first go to the top:
1942	*/	1783	*/
1943		1784
1944	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1785	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1945	{	1786	{
1946	/* Trim the search when we find the first other spell effect	1787	/* Trim the search when we find the first other spell effect
1947	* this helps performance so that if a space has 50 spell objects,	1788	* this helps performance so that if a space has 50 spell objects,
1948	* we don't need to check all of them.	1789	* we don't need to check all of them.
1949	*/	1790	*/
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1825	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1985	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1826	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1827	{
1987	move_apply (tmp, op, originator);	1828	move_apply (tmp, op, originator);
1988		1829
1989	if (was_destroyed (op, tag))	1830	if (op->destroyed ())
1990	return 1;	1831	return 1;
1991		1832
1992	/* what the person/creature stepped onto has moved the object	1833	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1834	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1835	* have a feeling strange problems would result.
…		…
2004	/*	1845	/*
2005	* present_arch(arch, map, x, y) searches for any objects with	1846	* present_arch(arch, map, x, y) searches for any objects with
2006	* a matching archetype at the given map and coordinates.	1847	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1848	* The first matching object is returned, or NULL if none.
2008	*/	1849	*/
2009
2010	object *	1850	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1851	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1852	{
2013	object *
2014	tmp;
2015
2016	if (m == NULL || out_of_map (m, x, y))	1853	if (m == NULL || out_of_map (m, x, y))
2017	{	1854	{
2018	LOG (llevError, "Present_arch called outside map.\n");	1855	LOG (llevError, "Present_arch called outside map.\n");
2019	return NULL;	1856	return NULL;
2020	}	1857	}
		1858
2021	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1859	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2022	if (tmp->arch == at)	1860	if (tmp->arch == at)
2023	return tmp;	1861	return tmp;
		1862
2024	return NULL;	1863	return NULL;
2025	}	1864	}
2026		1865
2027	/*	1866	/*
2028	* present(type, map, x, y) searches for any objects with	1867	* present(type, map, x, y) searches for any objects with
2029	* a matching type variable at the given map and coordinates.	1868	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1869	* The first matching object is returned, or NULL if none.
2031	*/	1870	*/
2032
2033	object *	1871	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1872	present (unsigned char type, maptile *m, int x, int y)
2035	{	1873	{
2036	object *
2037	tmp;
2038
2039	if (out_of_map (m, x, y))	1874	if (out_of_map (m, x, y))
2040	{	1875	{
2041	LOG (llevError, "Present called outside map.\n");	1876	LOG (llevError, "Present called outside map.\n");
2042	return NULL;	1877	return NULL;
2043	}	1878	}
		1879
2044	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1880	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2045	if (tmp->type == type)	1881	if (tmp->type == type)
2046	return tmp;	1882	return tmp;
		1883
2047	return NULL;	1884	return NULL;
2048	}	1885	}
2049		1886
2050	/*	1887	/*
2051	* present_in_ob(type, object) searches for any objects with	1888	* present_in_ob(type, object) searches for any objects with
2052	* a matching type variable in the inventory of the given object.	1889	* a matching type variable in the inventory of the given object.
2053	* The first matching object is returned, or NULL if none.	1890	* The first matching object is returned, or NULL if none.
2054	*/	1891	*/
2055
2056	object *	1892	object *
2057	present_in_ob (unsigned char type, const object *op)	1893	present_in_ob (unsigned char type, const object *op)
2058	{	1894	{
2059	object *
2060	tmp;
2061
2062	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1895	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2063	if (tmp->type == type)	1896	if (tmp->type == type)
2064	return tmp;	1897	return tmp;
		1898
2065	return NULL;	1899	return NULL;
2066	}	1900	}
2067		1901
2068	/*	1902	/*
2069	* present_in_ob (type, str, object) searches for any objects with	1903	* present_in_ob (type, str, object) searches for any objects with
…		…
2077	* str is the string to match against. Note that we match against	1911	* str is the string to match against. Note that we match against
2078	* the object name, not the archetype name. this is so that the	1912	* the object name, not the archetype name. this is so that the
2079	* spell code can use one object type (force), but change it's name	1913	* spell code can use one object type (force), but change it's name
2080	* to be unique.	1914	* to be unique.
2081	*/	1915	*/
2082
2083	object *	1916	object *
2084	present_in_ob_by_name (int type, const char *str, const object *op)	1917	present_in_ob_by_name (int type, const char *str, const object *op)
2085	{	1918	{
2086	object *
2087	tmp;
2088
2089	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1919	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2090	{
2091	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1920	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2092	return tmp;	1921	return tmp;
2093	}	1922
2094	return NULL;	1923	return 0;
2095	}	1924	}
2096		1925
2097	/*	1926	/*
2098	* present_arch_in_ob(archetype, object) searches for any objects with	1927	* present_arch_in_ob(archetype, object) searches for any objects with
2099	* a matching archetype in the inventory of the given object.	1928	* a matching archetype in the inventory of the given object.
2100	* The first matching object is returned, or NULL if none.	1929	* The first matching object is returned, or NULL if none.
2101	*/	1930	*/
2102
2103	object *	1931	object *
2104	present_arch_in_ob (const archetype *at, const object *op)	1932	present_arch_in_ob (const archetype *at, const object *op)
2105	{	1933	{
2106	object *
2107	tmp;
2108
2109	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1934	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2110	if (tmp->arch == at)	1935	if (tmp->arch == at)
2111	return tmp;	1936	return tmp;
		1937
2112	return NULL;	1938	return NULL;
2113	}	1939	}
2114		1940
2115	/*	1941	/*
2116	* activate recursively a flag on an object inventory	1942	* activate recursively a flag on an object inventory
2117	*/	1943	*/
2118	void	1944	void
2119	flag_inv (object *op, int flag)	1945	flag_inv (object *op, int flag)
2120	{	1946	{
2121	object *
2122	tmp;
2123
2124	if (op->inv)	1947	if (op->inv)
2125	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1948	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2126	{	1949	{
2127	SET_FLAG (tmp, flag);	1950	SET_FLAG (tmp, flag);
2128	flag_inv (tmp, flag);	1951	flag_inv (tmp, flag);
2129	}	1952	}
2130	} /*	1953	}
		1954
		1955	/*
2131	* desactivate recursively a flag on an object inventory	1956	* deactivate recursively a flag on an object inventory
2132	*/	1957	*/
2133	void	1958	void
2134	unflag_inv (object *op, int flag)	1959	unflag_inv (object *op, int flag)
2135	{	1960	{
2136	object *
2137	tmp;
2138
2139	if (op->inv)	1961	if (op->inv)
2140	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1962	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2141	{	1963	{
2142	CLEAR_FLAG (tmp, flag);	1964	CLEAR_FLAG (tmp, flag);
2143	unflag_inv (tmp, flag);	1965	unflag_inv (tmp, flag);
2144	}	1966	}
2145	}	1967	}
…		…
2148	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1970	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2149	* all it's inventory (recursively).	1971	* all it's inventory (recursively).
2150	* If checksums are used, a player will get set_cheat called for	1972	* If checksums are used, a player will get set_cheat called for
2151	* him/her-self and all object carried by a call to this function.	1973	* him/her-self and all object carried by a call to this function.
2152	*/	1974	*/
2153
2154	void	1975	void
2155	set_cheat (object *op)	1976	set_cheat (object *op)
2156	{	1977	{
2157	SET_FLAG (op, FLAG_WAS_WIZ);	1978	SET_FLAG (op, FLAG_WAS_WIZ);
2158	flag_inv (op, FLAG_WAS_WIZ);	1979	flag_inv (op, FLAG_WAS_WIZ);
…		…
2177	* because arch_blocked (now ob_blocked) needs to know the movement type	1998	* because arch_blocked (now ob_blocked) needs to know the movement type
2178	* to know if the space in question will block the object. We can't use	1999	* to know if the space in question will block the object. We can't use
2179	* the archetype because that isn't correct if the monster has been	2000	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2001	* customized, changed states, etc.
2181	*/	2002	*/
2182
2183	int	2003	int
2184	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2004	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185	{	2005	{
2186	int
2187	i,
2188	index = 0, flag;	2006	int index = 0, flag;
2189	static int
2190	altern[SIZEOFFREE];	2007	int altern[SIZEOFFREE];
2191		2008
2192	for (i = start; i < stop; i++)	2009	for (int i = start; i < stop; i++)
2193	{	2010	{
2194	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2011	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2195	if (!flag)	2012	if (!flag)
2196	altern[index++] = i;	2013	altern [index++] = i;
2197		2014
2198	/* Basically, if we find a wall on a space, we cut down the search size.	2015	/* Basically, if we find a wall on a space, we cut down the search size.
2199	* In this way, we won't return spaces that are on another side of a wall.	2016	* In this way, we won't return spaces that are on another side of a wall.
2200	* This mostly work, but it cuts down the search size in all directions -	2017	* This mostly work, but it cuts down the search size in all directions -
2201	* if the space being examined only has a wall to the north and empty	2018	* if the space being examined only has a wall to the north and empty
2202	* spaces in all the other directions, this will reduce the search space	2019	* spaces in all the other directions, this will reduce the search space
2203	* to only the spaces immediately surrounding the target area, and	2020	* to only the spaces immediately surrounding the target area, and
2204	* won't look 2 spaces south of the target space.	2021	* won't look 2 spaces south of the target space.
2205	*/	2022	*/
2206	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2023	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2207	stop = maxfree[i];	2024	stop = maxfree[i];
2208	}	2025	}
		2026
2209	if (!index)	2027	if (!index)
2210	return -1;	2028	return -1;
		2029
2211	return altern[RANDOM () % index];	2030	return altern[RANDOM () % index];
2212	}	2031	}
2213		2032
2214	/*	2033	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2034	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2035	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2036	* But it will return the first available spot, not a random choice.
2218	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2037	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2038	*/
2220
2221	int	2039	int
2222	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2040	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223	{	2041	{
2224	int
2225	i;
2226
2227	for (i = 0; i < SIZEOFFREE; i++)	2042	for (int i = 0; i < SIZEOFFREE; i++)
2228	{
2229	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2043	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2230	return i;	2044	return i;
2231	}	2045
2232	return -1;	2046	return -1;
2233	}	2047	}
2234		2048
2235	/*	2049	/*
2236	* The function permute(arr, begin, end) randomly reorders the array	2050	* The function permute(arr, begin, end) randomly reorders the array
2237	* arr[begin..end-1].	2051	* arr[begin..end-1].
		2052	* now uses a fisher-yates shuffle, old permute was broken
2238	*/	2053	*/
2239	static void	2054	static void
2240	permute (int *arr, int begin, int end)	2055	permute (int *arr, int begin, int end)
2241	{	2056	{
2242	int	2057	arr += begin;
2243	i,
2244	j,
2245	tmp,
2246	len;
2247
2248	len = end - begin;	2058	end -= begin;
2249	for (i = begin; i < end; i++)
2250	{
2251	j = begin + RANDOM () % len;
2252		2059
2253	tmp = arr[i];	2060	while (--end)
2254	arr[i] = arr[j];	2061	swap (arr [end], arr [RANDOM () % (end + 1)]);
2255	arr[j] = tmp;
2256	}
2257	}	2062	}
2258		2063
2259	/* new function to make monster searching more efficient, and effective!	2064	/* new function to make monster searching more efficient, and effective!
2260	* This basically returns a randomized array (in the passed pointer) of	2065	* This basically returns a randomized array (in the passed pointer) of
2261	* the spaces to find monsters. In this way, it won't always look for	2066	* the spaces to find monsters. In this way, it won't always look for
…		…
2264	* the 3x3 area will be searched, just not in a predictable order.	2069	* the 3x3 area will be searched, just not in a predictable order.
2265	*/	2070	*/
2266	void	2071	void
2267	get_search_arr (int *search_arr)	2072	get_search_arr (int *search_arr)
2268	{	2073	{
2269	int	2074	int i;
2270	i;
2271		2075
2272	for (i = 0; i < SIZEOFFREE; i++)	2076	for (i = 0; i < SIZEOFFREE; i++)
2273	{
2274	search_arr[i] = i;	2077	search_arr[i] = i;
2275	}
2276		2078
2277	permute (search_arr, 1, SIZEOFFREE1 + 1);	2079	permute (search_arr, 1, SIZEOFFREE1 + 1);
2278	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2080	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2279	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2081	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2280	}	2082	}
…		…
2289	* Perhaps incorrectly, but I'm making the assumption that exclude	2091	* Perhaps incorrectly, but I'm making the assumption that exclude
2290	* is actually want is going to try and move there. We need this info	2092	* is actually want is going to try and move there. We need this info
2291	* because we have to know what movement the thing looking to move	2093	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2094	* there is capable of.
2293	*/	2095	*/
2294
2295	int	2096	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2097	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2098	{
2298	int
2299	i,
2300	max = SIZEOFFREE, mflags;	2099	int i, max = SIZEOFFREE, mflags;
2301		2100
2302	sint16 nx, ny;	2101	sint16 nx, ny;
2303	object *	2102	object *tmp;
2304	tmp;	2103	maptile *mp;
2305	mapstruct *
2306	mp;
2307		2104
2308	MoveType blocked, move_type;	2105	MoveType blocked, move_type;
2309		2106
2310	if (exclude && exclude->head)	2107	if (exclude && exclude->head)
2311	{	2108	{
…		…
2323	mp = m;	2120	mp = m;
2324	nx = x + freearr_x[i];	2121	nx = x + freearr_x[i];
2325	ny = y + freearr_y[i];	2122	ny = y + freearr_y[i];
2326		2123
2327	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2124	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2125
2328	if (mflags & P_OUT_OF_MAP)	2126	if (mflags & P_OUT_OF_MAP)
2329	{
2330	max = maxfree[i];	2127	max = maxfree[i];
2331	}
2332	else	2128	else
2333	{	2129	{
2334	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2130	mapspace &ms = mp->at (nx, ny);
		2131
		2132	blocked = ms.move_block;
2335		2133
2336	if ((move_type & blocked) == move_type)	2134	if ((move_type & blocked) == move_type)
2337	{
2338	max = maxfree[i];	2135	max = maxfree[i];
2339	}
2340	else if (mflags & P_IS_ALIVE)	2136	else if (mflags & P_IS_ALIVE)
2341	{	2137	{
2342	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2138	for (tmp = ms.bot; tmp; tmp = tmp->above)
2343	{	2139	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2344	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2140	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2345	{
2346	break;	2141	break;
2347	}	2142
2348	}
2349	if (tmp)	2143	if (tmp)
2350	{
2351	return freedir[i];	2144	return freedir[i];
2352	}
2353	}	2145	}
2354	}	2146	}
2355	}	2147	}
		2148
2356	return 0;	2149	return 0;
2357	}	2150	}
2358		2151
2359	/*	2152	/*
2360	* distance(object 1, object 2) will return the square of the	2153	* distance(object 1, object 2) will return the square of the
2361	* distance between the two given objects.	2154	* distance between the two given objects.
2362	*/	2155	*/
2363
2364	int	2156	int
2365	distance (const object *ob1, const object *ob2)	2157	distance (const object *ob1, const object *ob2)
2366	{	2158	{
2367	int
2368	i;
2369
2370	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2159	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2371	return i;
2372	}	2160	}
2373		2161
2374	/*	2162	/*
2375	* find_dir_2(delta-x,delta-y) will return a direction in which	2163	* find_dir_2(delta-x,delta-y) will return a direction in which
2376	* an object which has subtracted the x and y coordinates of another	2164	* an object which has subtracted the x and y coordinates of another
2377	* object, needs to travel toward it.	2165	* object, needs to travel toward it.
2378	*/	2166	*/
2379
2380	int	2167	int
2381	find_dir_2 (int x, int y)	2168	find_dir_2 (int x, int y)
2382	{	2169	{
2383	int	2170	int q;
2384	q;
2385		2171
2386	if (y)	2172	if (y)
2387	q = x * 100 / y;	2173	q = x * 100 / y;
2388	else if (x)	2174	else if (x)
2389	q = -300 * x;	2175	q = -300 * x;
…		…
2424	int	2210	int
2425	absdir (int d)	2211	absdir (int d)
2426	{	2212	{
2427	while (d < 1)	2213	while (d < 1)
2428	d += 8;	2214	d += 8;
		2215
2429	while (d > 8)	2216	while (d > 8)
2430	d -= 8;	2217	d -= 8;
		2218
2431	return d;	2219	return d;
2432	}	2220	}
2433		2221
2434	/*	2222	/*
2435	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2223	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2437	*/	2225	*/
2438		2226
2439	int	2227	int
2440	dirdiff (int dir1, int dir2)	2228	dirdiff (int dir1, int dir2)
2441	{	2229	{
2442	int	2230	int d;
2443	d;
2444		2231
2445	d = abs (dir1 - dir2);	2232	d = abs (dir1 - dir2);
2446	if (d > 4)	2233	if (d > 4)
2447	d = 8 - d;	2234	d = 8 - d;
		2235
2448	return d;	2236	return d;
2449	}	2237	}
2450		2238
2451	/* peterm:	2239	/* peterm:
2452	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2240	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2455	* This basically means that if direction is 15, then it could either go	2243	* This basically means that if direction is 15, then it could either go
2456	* direction 4, 14, or 16 to get back to where we are.	2244	* direction 4, 14, or 16 to get back to where we are.
2457	* Moved from spell_util.c to object.c with the other related direction	2245	* Moved from spell_util.c to object.c with the other related direction
2458	* functions.	2246	* functions.
2459	*/	2247	*/
2460
2461	int
2462	reduction_dir[SIZEOFFREE][3] = {	2248	int reduction_dir[SIZEOFFREE][3] = {
2463	{0, 0, 0}, /* 0 */	2249	{0, 0, 0}, /* 0 */
2464	{0, 0, 0}, /* 1 */	2250	{0, 0, 0}, /* 1 */
2465	{0, 0, 0}, /* 2 */	2251	{0, 0, 0}, /* 2 */
2466	{0, 0, 0}, /* 3 */	2252	{0, 0, 0}, /* 3 */
2467	{0, 0, 0}, /* 4 */	2253	{0, 0, 0}, /* 4 */
…		…
2515	* find a path to that monster that we found. If not,	2301	* find a path to that monster that we found. If not,
2516	* we don't bother going toward it. Returns 1 if we	2302	* we don't bother going toward it. Returns 1 if we
2517	* can see a direct way to get it	2303	* can see a direct way to get it
2518	* Modified to be map tile aware -.MSW	2304	* Modified to be map tile aware -.MSW
2519	*/	2305	*/
2520
2521
2522	int	2306	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2307	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2308	{
2525	sint16 dx, dy;	2309	sint16 dx, dy;
2526	int
2527	mflags;	2310	int mflags;
2528		2311
2529	if (dir < 0)	2312	if (dir < 0)
2530	return 0; /* exit condition: invalid direction */	2313	return 0; /* exit condition: invalid direction */
2531		2314
2532	dx = x + freearr_x[dir];	2315	dx = x + freearr_x[dir];
…		…
2545	return 0;	2328	return 0;
2546		2329
2547	/* yes, can see. */	2330	/* yes, can see. */
2548	if (dir < 9)	2331	if (dir < 9)
2549	return 1;	2332	return 1;
		2333
2550	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2334	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2551	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2335	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2336	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2552	}	2337	}
2553
2554
2555		2338
2556	/*	2339	/*
2557	* can_pick(picker, item): finds out if an object is possible to be	2340	* can_pick(picker, item): finds out if an object is possible to be
2558	* picked up by the picker. Returnes 1 if it can be	2341	* picked up by the picker. Returnes 1 if it can be
2559	* picked up, otherwise 0.	2342	* picked up, otherwise 0.
…		…
2570	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2353	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2571	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2354	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2572	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2355	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2573	}	2356	}
2574		2357
2575
2576	/*	2358	/*
2577	* create clone from object to another	2359	* create clone from object to another
2578	*/	2360	*/
2579	object *	2361	object *
2580	object_create_clone (object *asrc)	2362	object_create_clone (object *asrc)
2581	{	2363	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2364	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2365
2585	if (!asrc)	2366	if (!asrc)
2586	return NULL;	2367	return 0;
		2368
2587	src = asrc;	2369	src = asrc;
2588	if (src->head)	2370	if (src->head)
2589	src = src->head;	2371	src = src->head;
2590		2372
2591	prev = NULL;	2373	prev = 0;
2592	for (part = src; part; part = part->more)	2374	for (part = src; part; part = part->more)
2593	{	2375	{
2594	tmp = get_object ();	2376	tmp = part->clone ();
2595	copy_object (part, tmp);
2596	tmp->x -= src->x;	2377	tmp->x -= src->x;
2597	tmp->y -= src->y;	2378	tmp->y -= src->y;
		2379
2598	if (!part->head)	2380	if (!part->head)
2599	{	2381	{
2600	dst = tmp;	2382	dst = tmp;
2601	tmp->head = NULL;	2383	tmp->head = 0;
2602	}	2384	}
2603	else	2385	else
2604	{
2605	tmp->head = dst;	2386	tmp->head = dst;
2606	}	2387
2607	tmp->more = NULL;	2388	tmp->more = 0;
		2389
2608	if (prev)	2390	if (prev)
2609	prev->more = tmp;	2391	prev->more = tmp;
		2392
2610	prev = tmp;	2393	prev = tmp;
2611	}	2394	}
2612		2395
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2396	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2397	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2398
2619	return dst;	2399	return dst;
2620	}	2400	}
2621		2401
2622	/* return true if the object was destroyed, 0 otherwise */
2623	int
2624	was_destroyed (const object *op, tag_t old_tag)
2625	{
2626	/* checking for FLAG_FREED isn't necessary, but makes this function more
2627	* robust */
2628	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2629	}
2630
2631	/* GROS - Creates an object using a string representing its content. */	2402	/* GROS - Creates an object using a string representing its content. */
2632
2633	/* Basically, we save the content of the string to a temp file, then call */	2403	/* Basically, we save the content of the string to a temp file, then call */
2634
2635	/* load_object on it. I admit it is a highly inefficient way to make things, */	2404	/* load_object on it. I admit it is a highly inefficient way to make things, */
2636
2637	/* but it was simple to make and allows reusing the load_object function. */	2405	/* but it was simple to make and allows reusing the load_object function. */
2638
2639	/* Remember not to use load_object_str in a time-critical situation. */	2406	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2407	/* Also remember that multiparts objects are not supported for now. */
2642
2643	object *	2408	object *
2644	load_object_str (const char *obstr)	2409	load_object_str (const char *obstr)
2645	{	2410	{
2646	object *	2411	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2412	char filename[MAX_BUF];
2650		2413
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2414	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2415
2653	FILE *
2654	tempfile = fopen (filename, "w");	2416	FILE *tempfile = fopen (filename, "w");
2655		2417
2656	if (tempfile == NULL)	2418	if (tempfile == NULL)
2657	{	2419	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2420	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2421	return NULL;
2660	};	2422	}
		2423
2661	fprintf (tempfile, obstr);	2424	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2425	fclose (tempfile);
2663		2426
2664	op = get_object ();	2427	op = object::create ();
2665		2428
2666	object_thawer thawer (filename);	2429	object_thawer thawer (filename);
2667		2430
2668	if (thawer)	2431	if (thawer)
2669	load_object (thawer, op, 0);	2432	load_object (thawer, op, 0);
…		…
2679	* returns NULL if no match.	2442	* returns NULL if no match.
2680	*/	2443	*/
2681	object *	2444	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2445	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2446	{
2684	object *
2685	tmp;
2686
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2447	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2448	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2449	return tmp;
2690		2450
2691	return NULL;	2451	return 0;
2692	}	2452	}
2693		2453
2694	/* If ob has a field named key, return the link from the list,	2454	/* If ob has a field named key, return the link from the list,
2695	* otherwise return NULL.	2455	* otherwise return NULL.
2696	*	2456	*
…		…
2698	* do the desired thing.	2458	* do the desired thing.
2699	*/	2459	*/
2700	key_value *	2460	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2461	get_ob_key_link (const object *ob, const char *key)
2702	{	2462	{
2703	key_value *
2704	link;
2705
2706	for (link = ob->key_values; link != NULL; link = link->next)	2463	for (key_value *link = ob->key_values; link; link = link->next)
2707	{
2708	if (link->key == key)	2464	if (link->key == key)
2709	{
2710	return link;	2465	return link;
2711	}
2712	}
2713		2466
2714	return NULL;	2467	return 0;
2715	}	2468	}
2716		2469
2717	/*	2470	/*
2718	* Returns the value of op has an extra_field for key, or NULL.	2471	* Returns the value of op has an extra_field for key, or NULL.
2719	*	2472	*
…		…
2759	* Returns TRUE on success.	2512	* Returns TRUE on success.
2760	*/	2513	*/
2761	int	2514	int
2762	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2515	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2763	{	2516	{
2764	key_value *
2765	field = NULL, *last = NULL;	2517	key_value *field = NULL, *last = NULL;
2766		2518
2767	for (field = op->key_values; field != NULL; field = field->next)	2519	for (field = op->key_values; field != NULL; field = field->next)
2768	{	2520	{
2769	if (field->key != canonical_key)	2521	if (field->key != canonical_key)
2770	{	2522	{
…		…
2798	/* IF we get here, key doesn't exist */	2550	/* IF we get here, key doesn't exist */
2799		2551
2800	/* No field, we'll have to add it. */	2552	/* No field, we'll have to add it. */
2801		2553
2802	if (!add_key)	2554	if (!add_key)
2803	{
2804	return FALSE;	2555	return FALSE;
2805	}	2556
2806	/* There isn't any good reason to store a null	2557	/* There isn't any good reason to store a null
2807	* value in the key/value list. If the archetype has	2558	* value in the key/value list. If the archetype has
2808	* this key, then we should also have it, so shouldn't	2559	* this key, then we should also have it, so shouldn't
2809	* be here. If user wants to store empty strings,	2560	* be here. If user wants to store empty strings,
2810	* should pass in ""	2561	* should pass in ""
…		…
2876		2627
2877	if (env)	2628	if (env)
2878	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2629	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2879		2630
2880	if (map)	2631	if (map)
2881	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2632	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2882		2633
2883	return info;	2634	return info;
2884	}	2635	}
2885		2636
2886	const char *	2637	const char *

Diff Legend

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