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.60 by pippijn, Mon Dec 11 21:06:58 2006 UTC vs.
Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
3		3
		4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	Copyright (C) 1992 Frank Tore Johansen
6		7
7	This program is free software; you can redistribute it and/or modify	8	This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by
…		…
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
		36	#include <bitset>
		37
35	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
36	static UUID uuid;	39	static UUID uuid;
37	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
38		41
39	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
40		44
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,	45	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	46	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	};	47	};
44	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
104	_exit (1);	108	_exit (1);
105	}	109	}
106		110
107	uuid.seq = uid;	111	uuid.seq = uid;
108	write_uuid ();	112	write_uuid ();
109	LOG (llevDebug, "read UID: %" I64_PFd "\n", uid);	113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110	fclose (fp);	114	fclose (fp);
111	}	115	}
112		116
113	UUID	117	UUID
114	gen_uuid ()	118	gen_uuid ()
…		…
139	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
141	*/	145	*/
142		146
143	/* For each field in wants, */	147	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	149	{
146	key_value *has_field;	150	key_value *has_field;
147		151
148	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
183	*	187	*
184	* Note that this function appears a lot longer than the macro it	188	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	189	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	190	* reduce this to the same efficiency.
187	*	191	*
188	* Check nrof variable *before* calling CAN_MERGE()	192	* Check nrof variable *before* calling can_merge()
189	*	193	*
190	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
191	* check weight	195	* check weight
192	*/	196	*/
193
194	bool object::can_merge (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	198	{
196	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	200	if (ob1 == ob2
		201	|| ob1->type != ob2->type
		202	|| ob1->speed != ob2->speed
		203	|| ob1->value != ob2->value
		204	|| ob1->name != ob2->name)
198	return 0;	205	return 0;
199		206
200	if (ob1->speed != ob2->speed)	207	//TODO: this ain't working well, use nicer and correct overflow check
201	return 0;
202
203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204	* value could not be stored in a sint32 (which unfortunately sometimes is	209	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).	210	* used to store nrof).
206	*/	211	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	212	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		223
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		226
222		227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	228	|| ob1->arch != ob2->arch
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	249	|| ob1->move_off != ob2->move_off
		250	|| ob1->move_slow != ob2->move_slow
		251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	252	return 0;
254		253
255	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	255	* check all objects in the inventory.
257	*/	256	*/
…		…
260	/* if one object has inventory but the other doesn't, not equiv */	259	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	261	return 0;
263		262
264	/* Now check to see if the two inventory objects could merge */	263	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	264	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	265	return 0;
267		266
268	/* inventory ok - still need to check rest of this object to see	267	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	268	* if it is valid.
270	*/	269	*/
…		…
279		278
280	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
281	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
282	* check?	281	* check?
283	*/	282	*/
284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
285	return 0;	284	return 0;
286		285
287	switch (ob1->type)	286	switch (ob1->type)
288	{	287	{
289	case SCROLL:	288	case SCROLL:
…		…
354	op = op->env;	353	op = op->env;
355	return op;	354	return op;
356	}	355	}
357		356
358	/*	357	/*
359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;
371	}
372
373	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	359	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
377	*/	361	*/
378		362
…		…
381	{	365	{
382	if (!op)	366	if (!op)
383	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
384		368
385	object_freezer freezer;	369	object_freezer freezer;
386	save_object (freezer, op, 3);	370	save_object (freezer, op, 1);
387	return freezer.as_string ();	371	return freezer.as_string ();
388	}	372	}
389		373
390	/*	374	/*
391	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
408	}	392	}
409		393
410	/*	394	/*
411	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
412	*/	396	*/
413
414	object *	397	object *
415	find_object (tag_t i)	398	find_object (tag_t i)
416	{	399	{
417	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
418	if (op->count == i)	401	if (op->count == i)
419	return op;	402	return op;
420		403
421	return 0;	404	return 0;
422	}	405	}
423		406
424	/*	407	/*
425	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
426	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
427	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
428	*/	411	*/
429
430	object *	412	object *
431	find_object_name (const char *str)	413	find_object_name (const char *str)
432	{	414	{
433	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
434	object *op;	416	object *op;
435		417
436	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
437	if (op->name == str_)	419	if (op->name == str_)
438	break;	420	break;
439		421
440	return op;	422	return op;
441	}	423	}
…		…
484	}	466	}
485		467
486	op->key_values = 0;	468	op->key_values = 0;
487	}	469	}
488		470
489	void object::clear ()
490	{
491	attachable_base::clear ();
492
493	free_key_values (this);
494
495	owner = 0;
496	name = 0;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	void object::clone (object *destination)
532	{
533	*(object_copy *)destination = *this;
534	*(object_pod *)destination = *this;
535
536	if (self || cb)
537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538	}
539
540	/*	471	/*
541	* copy object first frees everything allocated by the second object,	472	* copy_to first frees everything allocated by the dst object,
542	* and then copies the contends of the first object into the second	473	* and then copies the contents of itself into the second
543	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
544	* 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,
545	* 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
546	* will point at garbage.	477	* will point at garbage.
547	*/	478	*/
548	void	479	void
549	copy_object (object *op2, object *op)	480	object::copy_to (object *dst)
550	{	481	{
551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553		484
554	op2->clone (op);	485	*(object_copy *)dst = *this;
555		486
556	if (is_freed)	487	if (is_freed)
557	SET_FLAG (op, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
558		489
559	if (is_removed)	490	if (is_removed)
560	SET_FLAG (op, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
561		492
562	if (op2->speed < 0)	493	if (speed < 0)
563	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
564		495
565	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
566	if (op2->key_values)	497	if (key_values)
567	{	498	{
568	key_value *tail = 0;	499	key_value *tail = 0;
569	key_value *i;	500	key_value *i;
570		501
571	op->key_values = 0;	502	dst->key_values = 0;
572		503
573	for (i = op2->key_values; i; i = i->next)	504	for (i = key_values; i; i = i->next)
574	{	505	{
575	key_value *new_link = new key_value;	506	key_value *new_link = new key_value;
576		507
577	new_link->next = 0;	508	new_link->next = 0;
578	new_link->key = i->key;	509	new_link->key = i->key;
579	new_link->value = i->value;	510	new_link->value = i->value;
580		511
581	/* Try and be clever here, too. */	512	/* Try and be clever here, too. */
582	if (!op->key_values)	513	if (!dst->key_values)
583	{	514	{
584	op->key_values = new_link;	515	dst->key_values = new_link;
585	tail = new_link;	516	tail = new_link;
586	}	517	}
587	else	518	else
588	{	519	{
589	tail->next = new_link;	520	tail->next = new_link;
590	tail = new_link;	521	tail = new_link;
591	}	522	}
592	}	523	}
593	}	524	}
594		525
595	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;
596	}	535	}
597		536
598	/*	537	/*
599	* 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
600	* 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
601	* 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.
602	*/	541	*/
603
604	void	542	void
605	update_turn_face (object *op)	543	update_turn_face (object *op)
606	{	544	{
607	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
608	return;	546	return;
		547
609	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
610	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
611	}	550	}
612		551
613	/*	552	/*
614	* 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
615	* 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.
616	* 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.
617	*/	556	*/
618	void	557	void
619	update_ob_speed (object *op)	558	object::set_speed (float speed)
620	{	559	{
621	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
622
623	/* No reason putting the archetypes objects on the speed list,
624	* since they never really need to be updated.
625	*/
626
627	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
628	{	561	{
629	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
630	#ifdef MANY_CORES
631	abort ();
632	#else
633	op->speed = 0;	563	speed = 0;
634	#endif
635	}
636
637	if (arch_init)
638	return;
639
640	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
641	{	564	}
642	/* If already on active list, don't do anything */
643	if (op->active_next || op->active_prev || op == active_objects)
644	return;
645		565
646	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
647	* of the list. */
648	op->active_next = active_objects;
649		567
650	if (op->active_next != NULL)	568	if (has_active_speed ())
651	op->active_next->active_prev = op;	569	activate ();
652
653	active_objects = op;
654	}
655	else	570	else
656	{	571	deactivate ();
657	/* If not on the active list, nothing needs to be done */
658	if (!op->active_next && !op->active_prev && op != active_objects)
659	return;
660
661	if (op->active_prev == NULL)
662	{
663	active_objects = op->active_next;
664
665	if (op->active_next != NULL)
666	op->active_next->active_prev = NULL;
667	}
668	else
669	{
670	op->active_prev->active_next = op->active_next;
671
672	if (op->active_next)
673	op->active_next->active_prev = op->active_prev;
674	}
675
676	op->active_next = NULL;
677	op->active_prev = NULL;
678	}
679	}	572	}
680		573
681	/* This function removes object 'op' from the list of active
682	* objects.
683	* This should only be used for style maps or other such
684	* reference maps where you don't want an object that isn't
685	* in play chewing up cpu time getting processed.
686	* The reverse of this is to call update_ob_speed, which
687	* will do the right thing based on the speed of the object.
688	*/
689	void
690	remove_from_active_list (object *op)
691	{
692	/* If not on the active list, nothing needs to be done */
693	if (!op->active_next && !op->active_prev && op != active_objects)
694	return;
695
696	if (op->active_prev == NULL)
697	{
698	active_objects = op->active_next;
699	if (op->active_next != NULL)
700	op->active_next->active_prev = NULL;
701	}
702	else
703	{
704	op->active_prev->active_next = op->active_next;
705	if (op->active_next)
706	op->active_next->active_prev = op->active_prev;
707	}
708	op->active_next = NULL;
709	op->active_prev = NULL;
710	}
711
712	/*	574	/*
713	* update_object() updates the array which represents the map.	575	* update_object() updates the the map.
714	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
715	* by invisible objects by whatever is below them (unless it's another	577	* by invisible objects by whatever is below them (unless it's another
716	* invisible object, etc...)	578	* invisible object, etc...)
717	* If the object being updated is beneath a player, the look-window	579	* If the object being updated is beneath a player, the look-window
718	* of that player is updated (this might be a suboptimal way of	580	* of that player is updated (this might be a suboptimal way of
719	* updating that window, though, since update_object() is called _often_)	581	* updating that window, though, since update_object() is called _often_)
720	*	582	*
721	* action is a hint of what the caller believes need to be done.	583	* action is a hint of what the caller believes need to be done.
722	* For example, if the only thing that has changed is the face (due to
723	* an animation), we don't need to call update_position until that actually
724	* comes into view of a player. OTOH, many other things, like addition/removal
725	* of walls or living creatures may need us to update the flags now.
726	* current action are:	584	* current action are:
727	* UP_OBJ_INSERT: op was inserted	585	* UP_OBJ_INSERT: op was inserted
728	* UP_OBJ_REMOVE: op was removed	586	* UP_OBJ_REMOVE: op was removed
729	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	587	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
730	* as that is easier than trying to look at what may have changed.	588	* as that is easier than trying to look at what may have changed.
731	* UP_OBJ_FACE: only the objects face has changed.	589	* UP_OBJ_FACE: only the objects face has changed.
732	*/	590	*/
733
734	void	591	void
735	update_object (object *op, int action)	592	update_object (object *op, int action)
736	{	593	{
737	int update_now = 0, flags;
738	MoveType move_on, move_off, move_block, move_slow;	594	MoveType move_on, move_off, move_block, move_slow;
739		595
740	if (op == NULL)	596	if (op == NULL)
741	{	597	{
742	/* this should never happen */	598	/* this should never happen */
743	LOG (llevDebug, "update_object() called for NULL object.\n");	599	LOG (llevDebug, "update_object() called for NULL object.\n");
744	return;	600	return;
745	}	601	}
746		602
747	if (op->env != NULL)	603	if (op->env)
748	{	604	{
749	/* Animation is currently handled by client, so nothing	605	/* Animation is currently handled by client, so nothing
750	* to do in this case.	606	* to do in this case.
751	*/	607	*/
752	return;	608	return;
…		…
757	*/	613	*/
758	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
759	return;	615	return;
760		616
761	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
762	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
763	{	619	{
764	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
765	#ifdef MANY_CORES	621	#ifdef MANY_CORES
766	abort ();	622	abort ();
767	#endif	623	#endif
768	return;	624	return;
769	}	625	}
770		626
771	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	627	mapspace &m = op->ms ();
772	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
773	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
774	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
775	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
776	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
777		628
		629	if (!(m.flags_ & P_UPTODATE))
		630	/* nop */;
778	if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
779	{	632	{
		633	// this is likely overkill, TODO: revisit (schmorp)
780	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
781	update_now = 1;
782
783	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	635	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
784	update_now = 1;	636	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
785		637	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		638	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
786	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
787	update_now = 1;
788
789	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
790	update_now = 1;
791
792	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
793	update_now = 1;
794
795	if ((move_on | op->move_on) != move_on)	640	|| (m.move_on | op->move_on ) != m.move_on
796	update_now = 1;
797
798	if ((move_off | op->move_off) != move_off)	641	|| (m.move_off | op->move_off ) != m.move_off
799	update_now = 1;	642	|| (m.move_slow | op->move_slow) != m.move_slow
800
801	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
802	* to have move_allow right now.	644	* to have move_allow right now.
803	*/	645	*/
804	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
805	update_now = 1;	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
806		648	m.flags_ = 0;
807	if ((move_slow | op->move_slow) != move_slow)
808	update_now = 1;
809	}	649	}
810
811	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
812	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
813	* that is being removed.	652	* that is being removed.
814	*/	653	*/
815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
816	update_now = 1;	655	m.flags_ = 0;
817	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
818	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
819	else	658	else
820	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
821		660
822	if (update_now)
823	{
824	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
825	update_position (op->map, op->x, op->y);
826	}
827
828	if (op->more != NULL)	661	if (op->more)
829	update_object (op->more, action);	662	update_object (op->more, action);
830	}
831
832	object::vector object::mortals;
833	object::vector object::objects; // not yet used
834	object *object::first;
835
836	void object::free_mortals ()
837	{
838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
839	if ((*i)->refcnt)
840	++i; // further delay freeing
841	else
842	{
843	delete *i;
844	mortals.erase (i);
845	}
846	}	663	}
847		664
848	object::object ()	665	object::object ()
849	{	666	{
850	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
…		…
856	object::~object ()	673	object::~object ()
857	{	674	{
858	free_key_values (this);	675	free_key_values (this);
859	}	676	}
860		677
		678	static int object_count;
		679
861	void object::link ()	680	void object::link ()
862	{	681	{
863	count = ++ob_count;	682	assert (!index);//D
864	uuid = gen_uuid ();	683	uuid = gen_uuid ();
		684	count = ++object_count;
865		685
866	prev = 0;	686	refcnt_inc ();
867	next = object::first;	687	objects.insert (this);
868
869	if (object::first)
870	object::first->prev = this;
871
872	object::first = this;
873	}	688	}
874		689
875	void object::unlink ()	690	void object::unlink ()
876	{	691	{
877	if (this == object::first)	692	assert (index);//D
878	object::first = next;	693	objects.erase (this);
		694	refcnt_dec ();
		695	}
879		696
880	/* Remove this object from the list of used objects */	697	void
881	if (prev) prev->next = next;	698	object::activate ()
882	if (next) next->prev = prev;	699	{
		700	/* If already on active list, don't do anything */
		701	if (active)
		702	return;
883		703
884	prev = 0;	704	if (has_active_speed ())
885	next = 0;	705	actives.insert (this);
		706	}
		707
		708	void
		709	object::activate_recursive ()
		710	{
		711	activate ();
		712
		713	for (object *op = inv; op; op = op->below)
		714	op->activate_recursive ();
		715	}
		716
		717	/* This function removes object 'op' from the list of active
		718	* objects.
		719	* This should only be used for style maps or other such
		720	* reference maps where you don't want an object that isn't
		721	* in play chewing up cpu time getting processed.
		722	* The reverse of this is to call update_ob_speed, which
		723	* will do the right thing based on the speed of the object.
		724	*/
		725	void
		726	object::deactivate ()
		727	{
		728	/* If not on the active list, nothing needs to be done */
		729	if (!active)
		730	return;
		731
		732	actives.erase (this);
		733	}
		734
		735	void
		736	object::deactivate_recursive ()
		737	{
		738	for (object *op = inv; op; op = op->below)
		739	op->deactivate_recursive ();
		740
		741	deactivate ();
		742	}
		743
		744	void
		745	object::set_flag_inv (int flag, int value)
		746	{
		747	for (object *op = inv; op; op = op->below)
		748	{
		749	op->flag [flag] = value;
		750	op->set_flag_inv (flag, value);
		751	}
		752	}
		753
		754	/*
		755	* Remove and free all objects in the inventory of the given object.
		756	* object.c ?
		757	*/
		758	void
		759	object::destroy_inv (bool drop_to_ground)
		760	{
		761	// need to check first, because the checks below might segfault
		762	// as we might be on an invalid mapspace and crossfire code
		763	// is too buggy to ensure that the inventory is empty.
		764	// corollary: if you create arrows etc. with stuff in tis inventory,
		765	// cf will crash below with off-map x and y
		766	if (!inv)
		767	return;
		768
		769	/* Only if the space blocks everything do we not process -
		770	* if some form of movement is allowed, let objects
		771	* drop on that space.
		772	*/
		773	if (!drop_to_ground
		774	|| !map
		775	|| map->in_memory != MAP_IN_MEMORY
		776	|| ms ().move_block == MOVE_ALL)
		777	{
		778	while (inv)
		779	{
		780	inv->destroy_inv (drop_to_ground);
		781	inv->destroy ();
		782	}
		783	}
		784	else
		785	{ /* Put objects in inventory onto this space */
		786	while (inv)
		787	{
		788	object *op = inv;
		789
		790	if (op->flag [FLAG_STARTEQUIP]
		791	|| op->flag [FLAG_NO_DROP]
		792	|| op->type == RUNE
		793	|| op->type == TRAP
		794	|| op->flag [FLAG_IS_A_TEMPLATE]
		795	|| op->flag [FLAG_DESTROY_ON_DEATH])
		796	op->destroy ();
		797	else
		798	map->insert (op, x, y);
		799	}
		800	}
886	}	801	}
887		802
888	object *object::create ()	803	object *object::create ()
889	{	804	{
890	object *op = new object;	805	object *op = new object;
891	op->link ();	806	op->link ();
892	return op;	807	return op;
893	}	808	}
894		809
895	/*	810	void
896	* free_object() frees everything allocated by an object, removes	811	object::do_destroy ()
897	* it from the list of used objects, and puts it on the list of
898	* free objects. The IS_FREED() flag is set in the object.
899	* The object must have been removed by remove_ob() first for
900	* this function to succeed.
901	*
902	* If destroy_inventory is set, free inventory as well. Else drop items in
903	* inventory to the ground.
904	*/
905	void object::destroy (bool destroy_inventory)
906	{	812	{
907	if (QUERY_FLAG (this, FLAG_FREED))	813	attachable::do_destroy ();
908	return;
909		814
910	if (QUERY_FLAG (this, FLAG_FRIENDLY))	815	if (flag [FLAG_IS_LINKED])
		816	remove_button_link (this);
		817
		818	if (flag [FLAG_FRIENDLY])
911	remove_friendly_object (this);	819	remove_friendly_object (this);
912		820
913	if (!QUERY_FLAG (this, FLAG_REMOVED))	821	if (!flag [FLAG_REMOVED])
914	remove_ob (this);	822	remove ();
915		823
916	SET_FLAG (this, FLAG_FREED);	824	destroy_inv (true);
917		825
918	if (more)	826	deactivate ();
919	{	827	unlink ();
920	more->destroy (destroy_inventory);
921	more = 0;
922	}
923		828
924	if (inv)	829	flag [FLAG_FREED] = 1;
925	{
926	/* Only if the space blocks everything do we not process -
927	* if some form of movement is allowed, let objects
928	* drop on that space.
929	*/
930	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
931	{
932	object *op = inv;
933
934	while (op)
935	{
936	object *tmp = op->below;
937	op->destroy (destroy_inventory);
938	op = tmp;
939	}
940	}
941	else
942	{ /* Put objects in inventory onto this space */
943	object *op = inv;
944
945	while (op)
946	{
947	object *tmp = op->below;
948
949	remove_ob (op);
950
951	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
952	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
953	free_object (op);
954	else
955	{
956	op->x = x;
957	op->y = y;
958	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
959	}
960
961	op = tmp;
962	}
963	}
964	}
965		830
966	// hack to ensure that freed objects still have a valid map	831	// hack to ensure that freed objects still have a valid map
967	{	832	{
968	static maptile *freed_map; // freed objects are moved here to avoid crashes	833	static maptile *freed_map; // freed objects are moved here to avoid crashes
969		834
…		…
973		838
974	freed_map->name = "/internal/freed_objects_map";	839	freed_map->name = "/internal/freed_objects_map";
975	freed_map->width = 3;	840	freed_map->width = 3;
976	freed_map->height = 3;	841	freed_map->height = 3;
977		842
978	freed_map->allocate ();	843	freed_map->alloc ();
		844	freed_map->in_memory = MAP_IN_MEMORY;
979	}	845	}
980		846
981	map = freed_map;	847	map = freed_map;
982	x = 1;	848	x = 1;
983	y = 1;	849	y = 1;
984	}	850	}
985		851
		852	head = 0;
		853
		854	if (more)
		855	{
		856	more->destroy ();
		857	more = 0;
		858	}
		859
986	// clear those pointers that likely might have circular references to us	860	// clear those pointers that likely might have circular references to us
987	owner = 0;	861	owner = 0;
988	enemy = 0;	862	enemy = 0;
989	attacked_by = 0;	863	attacked_by = 0;
		864	}
990		865
991	// only relevant for players(?), but make sure of it anyways	866	void
992	contr = 0;	867	object::destroy (bool destroy_inventory)
		868	{
		869	if (destroyed ())
		870	return;
993		871
994	/* Remove object from the active list */	872	if (destroy_inventory)
995	speed = 0;	873	destroy_inv (false);
996	update_ob_speed (this);
997		874
998	unlink ();	875	attachable::destroy ();
999
1000	mortals.push_back (this);
1001	}	876	}
1002		877
1003	/*	878	/*
1004	* sub_weight() recursively (outwards) subtracts a number from the	879	* sub_weight() recursively (outwards) subtracts a number from the
1005	* weight of an object (and what is carried by it's environment(s)).	880	* weight of an object (and what is carried by it's environment(s)).
…		…
1015	op->carrying -= weight;	890	op->carrying -= weight;
1016	op = op->env;	891	op = op->env;
1017	}	892	}
1018	}	893	}
1019		894
1020	/* remove_ob(op):	895	/* op->remove ():
1021	* This function removes the object op from the linked list of objects	896	* This function removes the object op from the linked list of objects
1022	* which it is currently tied to. When this function is done, the	897	* which it is currently tied to. When this function is done, the
1023	* object will have no environment. If the object previously had an	898	* object will have no environment. If the object previously had an
1024	* environment, the x and y coordinates will be updated to	899	* environment, the x and y coordinates will be updated to
1025	* the previous environment.	900	* the previous environment.
…		…
1029	object::remove ()	904	object::remove ()
1030	{	905	{
1031	object *tmp, *last = 0;	906	object *tmp, *last = 0;
1032	object *otmp;	907	object *otmp;
1033		908
1034	int check_walk_off;
1035
1036	if (QUERY_FLAG (this, FLAG_REMOVED))	909	if (QUERY_FLAG (this, FLAG_REMOVED))
1037	return;	910	return;
1038		911
1039	SET_FLAG (this, FLAG_REMOVED);	912	SET_FLAG (this, FLAG_REMOVED);
		913	INVOKE_OBJECT (REMOVE, this);
1040		914
1041	if (more)	915	if (more)
1042	more->remove ();	916	more->remove ();
1043		917
1044	/*	918	/*
…		…
1054		928
1055	/* NO_FIX_PLAYER is set when a great many changes are being	929	/* NO_FIX_PLAYER is set when a great many changes are being
1056	* made to players inventory. If set, avoiding the call	930	* made to players inventory. If set, avoiding the call
1057	* to save cpu time.	931	* to save cpu time.
1058	*/	932	*/
1059	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	933	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1060	fix_player (otmp);	934	otmp->update_stats ();
1061		935
1062	if (above != NULL)	936	if (above)
1063	above->below = below;	937	above->below = below;
1064	else	938	else
1065	env->inv = below;	939	env->inv = below;
1066		940
1067	if (below != NULL)	941	if (below)
1068	below->above = above;	942	below->above = above;
1069		943
1070	/* we set up values so that it could be inserted into	944	/* we set up values so that it could be inserted into
1071	* the map, but we don't actually do that - it is up	945	* the map, but we don't actually do that - it is up
1072	* to the caller to decide what we want to do.	946	* to the caller to decide what we want to do.
…		…
1076	above = 0, below = 0;	950	above = 0, below = 0;
1077	env = 0;	951	env = 0;
1078	}	952	}
1079	else if (map)	953	else if (map)
1080	{	954	{
1081	/* Re did the following section of code - it looks like it had	955	if (type == PLAYER)
1082	* lots of logic for things we no longer care about
1083	*/	956	{
		957	--map->players;
		958	map->touch ();
		959	}
		960
		961	map->dirty = true;
1084		962
1085	/* link the object above us */	963	/* link the object above us */
1086	if (above)	964	if (above)
1087	above->below = below;	965	above->below = below;
1088	else	966	else
1089	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	967	map->at (x, y).top = below; /* we were top, set new top */
1090		968
1091	/* Relink the object below us, if there is one */	969	/* Relink the object below us, if there is one */
1092	if (below)	970	if (below)
1093	below->above = above;	971	below->above = above;
1094	else	972	else
…		…
1106	dump = dump_object (GET_MAP_OB (map, x, y));	984	dump = dump_object (GET_MAP_OB (map, x, y));
1107	LOG (llevError, "%s\n", dump);	985	LOG (llevError, "%s\n", dump);
1108	free (dump);	986	free (dump);
1109	}	987	}
1110		988
1111	SET_MAP_OB (map, x, y, above); /* goes on above it. */	989	map->at (x, y).bot = above; /* goes on above it. */
1112	}	990	}
1113		991
1114	above = 0;	992	above = 0;
1115	below = 0;	993	below = 0;
1116		994
1117	if (map->in_memory == MAP_SAVING)	995	if (map->in_memory == MAP_SAVING)
1118	return;	996	return;
1119		997
1120	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	998	int check_walk_off = !flag [FLAG_NO_APPLY];
1121		999
1122	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1000	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1123	{	1001	{
1124	/* No point updating the players look faces if he is the object	1002	/* No point updating the players look faces if he is the object
1125	* being removed.	1003	* being removed.
1126	*/	1004	*/
1127		1005
…		…
1131	* removed (most likely destroyed), update the player view	1009	* removed (most likely destroyed), update the player view
1132	* appropriately.	1010	* appropriately.
1133	*/	1011	*/
1134	if (tmp->container == this)	1012	if (tmp->container == this)
1135	{	1013	{
1136	CLEAR_FLAG (this, FLAG_APPLIED);	1014	flag [FLAG_APPLIED] = 0;
1137	tmp->container = 0;	1015	tmp->container = 0;
1138	}	1016	}
1139		1017
1140	tmp->contr->socket.update_look = 1;	1018	if (tmp->contr->ns)
		1019	tmp->contr->ns->floorbox_update ();
1141	}	1020	}
1142		1021
1143	/* See if player moving off should effect something */	1022	/* See if object moving off should effect something */
1144	if (check_walk_off	1023	if (check_walk_off
1145	&& ((move_type & tmp->move_off)	1024	&& ((move_type & tmp->move_off)
1146	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1025	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1147	{	1026	{
1148	move_apply (tmp, this, 0);	1027	move_apply (tmp, this, 0);
…		…
1150	if (destroyed ())	1029	if (destroyed ())
1151	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1030	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1152	}	1031	}
1153		1032
1154	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1033	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1155		1034	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1156	if (tmp->above == tmp)	1035	if (tmp->above == tmp)
1157	tmp->above = 0;	1036	tmp->above = 0;
1158		1037
1159	last = tmp;	1038	last = tmp;
1160	}	1039	}
1161		1040
1162	/* last == NULL of there are no objects on this space */	1041	/* last == NULL if there are no objects on this space */
		1042	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)	1043	if (!last)
1164	{	1044	map->at (x, y).flags_ = 0;
1165	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1166	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1167	* those out anyways, and if there are any flags set right now, they won't
1168	* be correct anyways.
1169	*/
1170	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1171	update_position (map, x, y);
1172	}
1173	else	1045	else
1174	update_object (last, UP_OBJ_REMOVE);	1046	update_object (last, UP_OBJ_REMOVE);
1175		1047
1176	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1048	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1177	update_all_los (map, x, y);	1049	update_all_los (map, x, y);
1178	}	1050	}
1179	}	1051	}
1180		1052
1181	/*	1053	/*
…		…
1190	merge_ob (object *op, object *top)	1062	merge_ob (object *op, object *top)
1191	{	1063	{
1192	if (!op->nrof)	1064	if (!op->nrof)
1193	return 0;	1065	return 0;
1194		1066
1195	if (top == NULL)	1067	if (top)
1196	for (top = op; top != NULL && top->above != NULL; top = top->above);	1068	for (top = op; top && top->above; top = top->above)
		1069	;
1197		1070
1198	for (; top != NULL; top = top->below)	1071	for (; top; top = top->below)
1199	{	1072	{
1200	if (top == op)	1073	if (top == op)
1201	continue;	1074	continue;
1202	if (CAN_MERGE (op, top))	1075
		1076	if (object::can_merge (op, top))
1203	{	1077	{
1204	top->nrof += op->nrof;	1078	top->nrof += op->nrof;
1205		1079
1206	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1080	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1207	op->weight = 0; /* Don't want any adjustements now */	1081	op->weight = 0; /* Don't want any adjustements now */
1208	remove_ob (op);	1082	op->destroy ();
1209	free_object (op);
1210	return top;	1083	return top;
1211	}	1084	}
1212	}	1085	}
1213		1086
1214	return 0;	1087	return 0;
…		…
1219	* job preparing multi-part monsters	1092	* job preparing multi-part monsters
1220	*/	1093	*/
1221	object *	1094	object *
1222	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1095	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1223	{	1096	{
1224	object *tmp;
1225
1226	if (op->head)
1227	op = op->head;
1228
1229	for (tmp = op; tmp; tmp = tmp->more)	1097	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1230	{	1098	{
1231	tmp->x = x + tmp->arch->clone.x;	1099	tmp->x = x + tmp->arch->clone.x;
1232	tmp->y = y + tmp->arch->clone.y;	1100	tmp->y = y + tmp->arch->clone.y;
1233	}	1101	}
1234		1102
…		…
1253	* Return value:	1121	* Return value:
1254	* new object if 'op' was merged with other object	1122	* new object if 'op' was merged with other object
1255	* NULL if 'op' was destroyed	1123	* NULL if 'op' was destroyed
1256	* just 'op' otherwise	1124	* just 'op' otherwise
1257	*/	1125	*/
1258
1259	object *	1126	object *
1260	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1127	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1261	{	1128	{
1262	object *tmp, *top, *floor = NULL;	1129	object *tmp, *top, *floor = NULL;
1263	sint16 x, y;	1130	sint16 x, y;
…		…
1266	{	1133	{
1267	LOG (llevError, "Trying to insert freed object!\n");	1134	LOG (llevError, "Trying to insert freed object!\n");
1268	return NULL;	1135	return NULL;
1269	}	1136	}
1270		1137
1271	if (m == NULL)	1138	if (!m)
1272	{	1139	{
1273	char *dump = dump_object (op);	1140	char *dump = dump_object (op);
1274	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1141	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1275	free (dump);	1142	free (dump);
1276	return op;	1143	return op;
…		…
1297	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1164	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1298	free (dump);	1165	free (dump);
1299	return op;	1166	return op;
1300	}	1167	}
1301		1168
1302	if (op->more != NULL)	1169	if (op->more)
1303	{	1170	{
1304	/* The part may be on a different map. */	1171	/* The part may be on a different map. */
1305		1172
1306	object *more = op->more;	1173	object *more = op->more;
1307		1174
1308	/* We really need the caller to normalize coordinates - if	1175	/* We really need the caller to normalise coordinates - if
1309	* we set the map, that doesn't work if the location is within	1176	* we set the map, that doesn't work if the location is within
1310	* a map and this is straddling an edge. So only if coordinate	1177	* a map and this is straddling an edge. So only if coordinate
1311	* is clear wrong do we normalize it.	1178	* is clear wrong do we normalise it.
1312	*/	1179	*/
1313	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1180	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1314	more->map = get_map_from_coord (m, &more->x, &more->y);	1181	more->map = get_map_from_coord (m, &more->x, &more->y);
1315	else if (!more->map)	1182	else if (!more->map)
1316	{	1183	{
…		…
1323	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1190	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1324	{	1191	{
1325	if (!op->head)	1192	if (!op->head)
1326	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1193	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1327		1194
1328	return NULL;	1195	return 0;
1329	}	1196	}
1330	}	1197	}
1331		1198
1332	CLEAR_FLAG (op, FLAG_REMOVED);	1199	CLEAR_FLAG (op, FLAG_REMOVED);
1333		1200
…		…
1340	y = op->y;	1207	y = op->y;
1341		1208
1342	/* this has to be done after we translate the coordinates.	1209	/* this has to be done after we translate the coordinates.
1343	*/	1210	*/
1344	if (op->nrof && !(flag & INS_NO_MERGE))	1211	if (op->nrof && !(flag & INS_NO_MERGE))
1345	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1212	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1346	if (CAN_MERGE (op, tmp))	1213	if (object::can_merge (op, tmp))
1347	{	1214	{
1348	op->nrof += tmp->nrof;	1215	op->nrof += tmp->nrof;
1349	remove_ob (tmp);	1216	tmp->destroy ();
1350	free_object (tmp);
1351	}	1217	}
1352		1218
1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1219	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1220	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1355		1221
…		…
1368	op->below = originator->below;	1234	op->below = originator->below;
1369		1235
1370	if (op->below)	1236	if (op->below)
1371	op->below->above = op;	1237	op->below->above = op;
1372	else	1238	else
1373	SET_MAP_OB (op->map, op->x, op->y, op);	1239	op->ms ().bot = op;
1374		1240
1375	/* since *below* originator, no need to update top */	1241	/* since *below* originator, no need to update top */
1376	originator->below = op;	1242	originator->below = op;
1377	}	1243	}
1378	else	1244	else
1379	{	1245	{
1380	/* If there are other objects, then */	1246	/* If there are other objects, then */
1381	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1247	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1382	{	1248	{
1383	object *last = NULL;	1249	object *last = 0;
1384		1250
1385	/*	1251	/*
1386	* If there are multiple objects on this space, we do some trickier handling.	1252	* If there are multiple objects on this space, we do some trickier handling.
1387	* We've already dealt with merging if appropriate.	1253	* We've already dealt with merging if appropriate.
1388	* Generally, we want to put the new object on top. But if	1254	* Generally, we want to put the new object on top. But if
…		…
1392	* once we get to them. This reduces the need to traverse over all of	1258	* once we get to them. This reduces the need to traverse over all of
1393	* them when adding another one - this saves quite a bit of cpu time	1259	* them when adding another one - this saves quite a bit of cpu time
1394	* when lots of spells are cast in one area. Currently, it is presumed	1260	* when lots of spells are cast in one area. Currently, it is presumed
1395	* that flying non pickable objects are spell objects.	1261	* that flying non pickable objects are spell objects.
1396	*/	1262	*/
1397
1398	while (top != NULL)	1263	while (top)
1399	{	1264	{
1400	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1265	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1401	floor = top;	1266	floor = top;
1402		1267
1403	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1268	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1424	* If INS_ON_TOP is used, don't do this processing	1289	* If INS_ON_TOP is used, don't do this processing
1425	* Need to find the object that in fact blocks view, otherwise	1290	* Need to find the object that in fact blocks view, otherwise
1426	* stacking is a bit odd.	1291	* stacking is a bit odd.
1427	*/	1292	*/
1428	if (!(flag & INS_ON_TOP) &&	1293	if (!(flag & INS_ON_TOP) &&
1429	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1294	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1430	{	1295	{
1431	for (last = top; last != floor; last = last->below)	1296	for (last = top; last != floor; last = last->below)
1432	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1297	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1433	break;	1298	break;
1434	/* Check to see if we found the object that blocks view,	1299	/* Check to see if we found the object that blocks view,
…		…
1456	op->above = GET_MAP_OB (op->map, op->x, op->y);	1321	op->above = GET_MAP_OB (op->map, op->x, op->y);
1457		1322
1458	if (op->above)	1323	if (op->above)
1459	op->above->below = op;	1324	op->above->below = op;
1460		1325
1461	op->below = NULL;	1326	op->below = 0;
1462	SET_MAP_OB (op->map, op->x, op->y, op);	1327	op->ms ().bot = op;
1463	}	1328	}
1464	else	1329	else
1465	{ /* get inserted into the stack above top */	1330	{ /* get inserted into the stack above top */
1466	op->above = top->above;	1331	op->above = top->above;
1467		1332
…		…
1470		1335
1471	op->below = top;	1336	op->below = top;
1472	top->above = op;	1337	top->above = op;
1473	}	1338	}
1474		1339
1475	if (op->above == NULL)	1340	if (!op->above)
1476	SET_MAP_TOP (op->map, op->x, op->y, op);	1341	op->ms ().top = op;
1477	} /* else not INS_BELOW_ORIGINATOR */	1342	} /* else not INS_BELOW_ORIGINATOR */
1478		1343
1479	if (op->type == PLAYER)	1344	if (op->type == PLAYER)
		1345	{
1480	op->contr->do_los = 1;	1346	op->contr->do_los = 1;
		1347	++op->map->players;
		1348	op->map->touch ();
		1349	}
		1350
		1351	op->map->dirty = true;
1481		1352
1482	/* If we have a floor, we know the player, if any, will be above	1353	/* If we have a floor, we know the player, if any, will be above
1483	* it, so save a few ticks and start from there.	1354	* it, so save a few ticks and start from there.
1484	*/	1355	*/
1485	if (!(flag & INS_MAP_LOAD))	1356	if (!(flag & INS_MAP_LOAD))
1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1357	if (object *pl = op->ms ().player ())
1487	if (tmp->type == PLAYER)	1358	if (pl->contr->ns)
1488	tmp->contr->socket.update_look = 1;	1359	pl->contr->ns->floorbox_update ();
1489		1360
1490	/* If this object glows, it may affect lighting conditions that are	1361	/* If this object glows, it may affect lighting conditions that are
1491	* visible to others on this map. But update_all_los is really	1362	* visible to others on this map. But update_all_los is really
1492	* an inefficient way to do this, as it means los for all players	1363	* an inefficient way to do this, as it means los for all players
1493	* on the map will get recalculated. The players could very well	1364	* on the map will get recalculated. The players could very well
1494	* be far away from this change and not affected in any way -	1365	* be far away from this change and not affected in any way -
1495	* this should get redone to only look for players within range,	1366	* this should get redone to only look for players within range,
1496	* or just updating the P_NEED_UPDATE for spaces within this area	1367	* or just updating the P_UPTODATE for spaces within this area
1497	* of effect may be sufficient.	1368	* of effect may be sufficient.
1498	*/	1369	*/
1499	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1370	if (op->map->darkness && (op->glow_radius != 0))
1500	update_all_los (op->map, op->x, op->y);	1371	update_all_los (op->map, op->x, op->y);
1501		1372
1502	/* updates flags (blocked, alive, no magic, etc) for this map space */	1373	/* updates flags (blocked, alive, no magic, etc) for this map space */
1503	update_object (op, UP_OBJ_INSERT);	1374	update_object (op, UP_OBJ_INSERT);
1504		1375
		1376	INVOKE_OBJECT (INSERT, op);
		1377
1505	/* Don't know if moving this to the end will break anything. However,	1378	/* Don't know if moving this to the end will break anything. However,
1506	* we want to have update_look set above before calling this.	1379	* we want to have floorbox_update called before calling this.
1507	*	1380	*
1508	* check_move_on() must be after this because code called from	1381	* check_move_on() must be after this because code called from
1509	* check_move_on() depends on correct map flags (so functions like	1382	* check_move_on() depends on correct map flags (so functions like
1510	* blocked() and wall() work properly), and these flags are updated by	1383	* blocked() and wall() work properly), and these flags are updated by
1511	* update_object().	1384	* update_object().
…		…
1513		1386
1514	/* if this is not the head or flag has been passed, don't check walk on status */	1387	/* if this is not the head or flag has been passed, don't check walk on status */
1515	if (!(flag & INS_NO_WALK_ON) && !op->head)	1388	if (!(flag & INS_NO_WALK_ON) && !op->head)
1516	{	1389	{
1517	if (check_move_on (op, originator))	1390	if (check_move_on (op, originator))
1518	return NULL;	1391	return 0;
1519		1392
1520	/* If we are a multi part object, lets work our way through the check	1393	/* If we are a multi part object, lets work our way through the check
1521	* walk on's.	1394	* walk on's.
1522	*/	1395	*/
1523	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1396	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1524	if (check_move_on (tmp, originator))	1397	if (check_move_on (tmp, originator))
1525	return NULL;	1398	return 0;
1526	}	1399	}
1527		1400
1528	return op;	1401	return op;
1529	}	1402	}
1530		1403
1531	/* this function inserts an object in the map, but if it	1404	/* this function inserts an object in the map, but if it
1532	* finds an object of its own type, it'll remove that one first.	1405	* finds an object of its own type, it'll remove that one first.
1533	* op is the object to insert it under: supplies x and the map.	1406	* op is the object to insert it under: supplies x and the map.
1534	*/	1407	*/
1535	void	1408	void
1536	replace_insert_ob_in_map (const char *arch_string, object *op)	1409	replace_insert_ob_in_map (const char *arch_string, object *op)
1537	{	1410	{
1538	object *	1411	object *tmp, *tmp1;
1539	tmp;
1540	object *
1541	tmp1;
1542		1412
1543	/* first search for itself and remove any old instances */	1413	/* first search for itself and remove any old instances */
1544		1414
1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1415	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1546	{
1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1416	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1548	{	1417	tmp->destroy ();
1549	remove_ob (tmp);
1550	free_object (tmp);
1551	}
1552	}
1553		1418
1554	tmp1 = arch_to_object (archetype::find (arch_string));	1419	tmp1 = arch_to_object (archetype::find (arch_string));
1555		1420
1556	tmp1->x = op->x;	1421	tmp1->x = op->x;
1557	tmp1->y = op->y;	1422	tmp1->y = op->y;
1558	insert_ob_in_map (tmp1, op->map, op, 0);	1423	insert_ob_in_map (tmp1, op->map, op, 0);
		1424	}
		1425
		1426	object *
		1427	object::insert_at (object *where, object *originator, int flags)
		1428	{
		1429	where->map->insert (this, where->x, where->y, originator, flags);
1559	}	1430	}
1560		1431
1561	/*	1432	/*
1562	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1433	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1563	* is returned contains nr objects, and the remaining parts contains	1434	* is returned contains nr objects, and the remaining parts contains
1564	* the rest (or is removed and freed if that number is 0).	1435	* the rest (or is removed and freed if that number is 0).
1565	* On failure, NULL is returned, and the reason put into the	1436	* On failure, NULL is returned, and the reason put into the
1566	* global static errmsg array.	1437	* global static errmsg array.
1567	*/	1438	*/
1568
1569	object *	1439	object *
1570	get_split_ob (object *orig_ob, uint32 nr)	1440	get_split_ob (object *orig_ob, uint32 nr)
1571	{	1441	{
1572	object *	1442	object *newob;
1573	newob;
1574	int
1575	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1443	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1576		1444
1577	if (orig_ob->nrof < nr)	1445	if (orig_ob->nrof < nr)
1578	{	1446	{
1579	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1447	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1580	return NULL;	1448	return NULL;
1581	}	1449	}
1582		1450
1583	newob = object_create_clone (orig_ob);	1451	newob = object_create_clone (orig_ob);
1584		1452
1585	if ((orig_ob->nrof -= nr) < 1)	1453	if ((orig_ob->nrof -= nr) < 1)
1586	{	1454	orig_ob->destroy (1);
1587	if (!is_removed)
1588	remove_ob (orig_ob);
1589	free_object2 (orig_ob, 1);
1590	}
1591	else if (!is_removed)	1455	else if (!is_removed)
1592	{	1456	{
1593	if (orig_ob->env != NULL)	1457	if (orig_ob->env != NULL)
1594	sub_weight (orig_ob->env, orig_ob->weight * nr);	1458	sub_weight (orig_ob->env, orig_ob->weight * nr);
1595	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1459	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1615		1479
1616	object *	1480	object *
1617	decrease_ob_nr (object *op, uint32 i)	1481	decrease_ob_nr (object *op, uint32 i)
1618	{	1482	{
1619	object *tmp;	1483	object *tmp;
1620	player *pl;
1621		1484
1622	if (i == 0) /* objects with op->nrof require this check */	1485	if (i == 0) /* objects with op->nrof require this check */
1623	return op;	1486	return op;
1624		1487
1625	if (i > op->nrof)	1488	if (i > op->nrof)
1626	i = op->nrof;	1489	i = op->nrof;
1627		1490
1628	if (QUERY_FLAG (op, FLAG_REMOVED))	1491	if (QUERY_FLAG (op, FLAG_REMOVED))
1629	op->nrof -= i;	1492	op->nrof -= i;
1630	else if (op->env != NULL)	1493	else if (op->env)
1631	{	1494	{
1632	/* is this object in the players inventory, or sub container	1495	/* is this object in the players inventory, or sub container
1633	* therein?	1496	* therein?
1634	*/	1497	*/
1635	tmp = is_player_inv (op->env);	1498	tmp = op->in_player ();
1636	/* nope. Is this a container the player has opened?	1499	/* nope. Is this a container the player has opened?
1637	* If so, set tmp to that player.	1500	* If so, set tmp to that player.
1638	* IMO, searching through all the players will mostly	1501	* IMO, searching through all the players will mostly
1639	* likely be quicker than following op->env to the map,	1502	* likely be quicker than following op->env to the map,
1640	* and then searching the map for a player.	1503	* and then searching the map for a player.
1641	*/	1504	*/
1642	if (!tmp)	1505	if (!tmp)
1643	{	1506	for_all_players (pl)
1644	for (pl = first_player; pl; pl = pl->next)
1645	if (pl->ob->container == op->env)	1507	if (pl->ob->container == op->env)
		1508	{
		1509	tmp = pl->ob;
1646	break;	1510	break;
1647	if (pl)
1648	tmp = pl->ob;
1649	else
1650	tmp = NULL;
1651	}	1511	}
1652		1512
1653	if (i < op->nrof)	1513	if (i < op->nrof)
1654	{	1514	{
1655	sub_weight (op->env, op->weight * i);	1515	sub_weight (op->env, op->weight * i);
1656	op->nrof -= i;	1516	op->nrof -= i;
1657	if (tmp)	1517	if (tmp)
1658	{
1659	esrv_send_item (tmp, op);	1518	esrv_send_item (tmp, op);
1660	}
1661	}	1519	}
1662	else	1520	else
1663	{	1521	{
1664	remove_ob (op);	1522	op->remove ();
1665	op->nrof = 0;	1523	op->nrof = 0;
1666	if (tmp)	1524	if (tmp)
1667	{
1668	esrv_del_item (tmp->contr, op->count);	1525	esrv_del_item (tmp->contr, op->count);
1669	}
1670	}	1526	}
1671	}	1527	}
1672	else	1528	else
1673	{	1529	{
1674	object *above = op->above;	1530	object *above = op->above;
1675		1531
1676	if (i < op->nrof)	1532	if (i < op->nrof)
1677	op->nrof -= i;	1533	op->nrof -= i;
1678	else	1534	else
1679	{	1535	{
1680	remove_ob (op);	1536	op->remove ();
1681	op->nrof = 0;	1537	op->nrof = 0;
1682	}	1538	}
1683		1539
1684	/* Since we just removed op, op->above is null */	1540	/* Since we just removed op, op->above is null */
1685	for (tmp = above; tmp != NULL; tmp = tmp->above)	1541	for (tmp = above; tmp; tmp = tmp->above)
1686	if (tmp->type == PLAYER)	1542	if (tmp->type == PLAYER)
1687	{	1543	{
1688	if (op->nrof)	1544	if (op->nrof)
1689	esrv_send_item (tmp, op);	1545	esrv_send_item (tmp, op);
1690	else	1546	else
…		…
1694		1550
1695	if (op->nrof)	1551	if (op->nrof)
1696	return op;	1552	return op;
1697	else	1553	else
1698	{	1554	{
1699	free_object (op);	1555	op->destroy ();
1700	return NULL;	1556	return 0;
1701	}	1557	}
1702	}	1558	}
1703		1559
1704	/*	1560	/*
1705	* add_weight(object, weight) adds the specified weight to an object,	1561	* add_weight(object, weight) adds the specified weight to an object,
…		…
1765	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1621	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1766	CLEAR_FLAG (op, FLAG_REMOVED);	1622	CLEAR_FLAG (op, FLAG_REMOVED);
1767	if (op->nrof)	1623	if (op->nrof)
1768	{	1624	{
1769	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1625	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1770	if (CAN_MERGE (tmp, op))	1626	if (object::can_merge (tmp, op))
1771	{	1627	{
1772	/* return the original object and remove inserted object	1628	/* return the original object and remove inserted object
1773	(client needs the original object) */	1629	(client needs the original object) */
1774	tmp->nrof += op->nrof;	1630	tmp->nrof += op->nrof;
1775	/* Weight handling gets pretty funky. Since we are adding to	1631	/* Weight handling gets pretty funky. Since we are adding to
…		…
1793	add_weight (this, op->weight * op->nrof);	1649	add_weight (this, op->weight * op->nrof);
1794	}	1650	}
1795	else	1651	else
1796	add_weight (this, (op->weight + op->carrying));	1652	add_weight (this, (op->weight + op->carrying));
1797		1653
1798	otmp = is_player_inv (this);	1654	otmp = this->in_player ();
1799	if (otmp && otmp->contr)	1655	if (otmp && otmp->contr)
1800	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1656	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1801	fix_player (otmp);	1657	otmp->update_stats ();
1802		1658
1803	op->map = NULL;	1659	op->map = 0;
1804	op->env = this;	1660	op->env = this;
1805	op->above = NULL;	1661	op->above = 0;
1806	op->below = NULL;	1662	op->below = 0;
1807	op->x = 0, op->y = 0;	1663	op->x = 0, op->y = 0;
1808		1664
1809	/* reset the light list and los of the players on the map */	1665	/* reset the light list and los of the players on the map */
1810	if ((op->glow_radius != 0) && map)	1666	if ((op->glow_radius != 0) && map)
1811	{	1667	{
1812	#ifdef DEBUG_LIGHTS	1668	#ifdef DEBUG_LIGHTS
1813	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1669	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1814	#endif /* DEBUG_LIGHTS */	1670	#endif /* DEBUG_LIGHTS */
1815	if (MAP_DARKNESS (map))	1671	if (map->darkness)
1816	update_all_los (map, x, y);	1672	update_all_los (map, x, y);
1817	}	1673	}
1818		1674
1819	/* Client has no idea of ordering so lets not bother ordering it here.	1675	/* Client has no idea of ordering so lets not bother ordering it here.
1820	* It sure simplifies this function...	1676	* It sure simplifies this function...
…		…
1825	{	1681	{
1826	op->below = inv;	1682	op->below = inv;
1827	op->below->above = op;	1683	op->below->above = op;
1828	inv = op;	1684	inv = op;
1829	}	1685	}
		1686
		1687	INVOKE_OBJECT (INSERT, this);
1830		1688
1831	return op;	1689	return op;
1832	}	1690	}
1833		1691
1834	/*	1692	/*
…		…
1849	*	1707	*
1850	* MSW 2001-07-08: Check all objects on space, not just those below	1708	* MSW 2001-07-08: Check all objects on space, not just those below
1851	* object being inserted. insert_ob_in_map may not put new objects	1709	* object being inserted. insert_ob_in_map may not put new objects
1852	* on top.	1710	* on top.
1853	*/	1711	*/
1854
1855	int	1712	int
1856	check_move_on (object *op, object *originator)	1713	check_move_on (object *op, object *originator)
1857	{	1714	{
1858	object *tmp;	1715	object *tmp;
1859	maptile *m = op->map;	1716	maptile *m = op->map;
…		…
1886		1743
1887	/* The objects have to be checked from top to bottom.	1744	/* The objects have to be checked from top to bottom.
1888	* Hence, we first go to the top:	1745	* Hence, we first go to the top:
1889	*/	1746	*/
1890		1747
1891	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1748	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1892	{	1749	{
1893	/* Trim the search when we find the first other spell effect	1750	/* Trim the search when we find the first other spell effect
1894	* this helps performance so that if a space has 50 spell objects,	1751	* this helps performance so that if a space has 50 spell objects,
1895	* we don't need to check all of them.	1752	* we don't need to check all of them.
1896	*/	1753	*/
…		…
1951	/*	1808	/*
1952	* present_arch(arch, map, x, y) searches for any objects with	1809	* present_arch(arch, map, x, y) searches for any objects with
1953	* a matching archetype at the given map and coordinates.	1810	* a matching archetype at the given map and coordinates.
1954	* The first matching object is returned, or NULL if none.	1811	* The first matching object is returned, or NULL if none.
1955	*/	1812	*/
1956
1957	object *	1813	object *
1958	present_arch (const archetype *at, maptile *m, int x, int y)	1814	present_arch (const archetype *at, maptile *m, int x, int y)
1959	{	1815	{
1960	object *
1961	tmp;
1962
1963	if (m == NULL || out_of_map (m, x, y))	1816	if (!m || out_of_map (m, x, y))
1964	{	1817	{
1965	LOG (llevError, "Present_arch called outside map.\n");	1818	LOG (llevError, "Present_arch called outside map.\n");
1966	return NULL;	1819	return NULL;
1967	}	1820	}
1968	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1821
		1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1969	if (tmp->arch == at)	1823	if (tmp->arch == at)
1970	return tmp;	1824	return tmp;
		1825
1971	return NULL;	1826	return NULL;
1972	}	1827	}
1973		1828
1974	/*	1829	/*
1975	* present(type, map, x, y) searches for any objects with	1830	* present(type, map, x, y) searches for any objects with
1976	* a matching type variable at the given map and coordinates.	1831	* a matching type variable at the given map and coordinates.
1977	* The first matching object is returned, or NULL if none.	1832	* The first matching object is returned, or NULL if none.
1978	*/	1833	*/
1979
1980	object *	1834	object *
1981	present (unsigned char type, maptile *m, int x, int y)	1835	present (unsigned char type, maptile *m, int x, int y)
1982	{	1836	{
1983	object *
1984	tmp;
1985
1986	if (out_of_map (m, x, y))	1837	if (out_of_map (m, x, y))
1987	{	1838	{
1988	LOG (llevError, "Present called outside map.\n");	1839	LOG (llevError, "Present called outside map.\n");
1989	return NULL;	1840	return NULL;
1990	}	1841	}
1991	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1842
		1843	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1992	if (tmp->type == type)	1844	if (tmp->type == type)
1993	return tmp;	1845	return tmp;
		1846
1994	return NULL;	1847	return NULL;
1995	}	1848	}
1996		1849
1997	/*	1850	/*
1998	* present_in_ob(type, object) searches for any objects with	1851	* present_in_ob(type, object) searches for any objects with
1999	* a matching type variable in the inventory of the given object.	1852	* a matching type variable in the inventory of the given object.
2000	* The first matching object is returned, or NULL if none.	1853	* The first matching object is returned, or NULL if none.
2001	*/	1854	*/
2002
2003	object *	1855	object *
2004	present_in_ob (unsigned char type, const object *op)	1856	present_in_ob (unsigned char type, const object *op)
2005	{	1857	{
2006	object *
2007	tmp;
2008
2009	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1858	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2010	if (tmp->type == type)	1859	if (tmp->type == type)
2011	return tmp;	1860	return tmp;
		1861
2012	return NULL;	1862	return NULL;
2013	}	1863	}
2014		1864
2015	/*	1865	/*
2016	* present_in_ob (type, str, object) searches for any objects with	1866	* present_in_ob (type, str, object) searches for any objects with
…		…
2024	* str is the string to match against. Note that we match against	1874	* str is the string to match against. Note that we match against
2025	* the object name, not the archetype name. this is so that the	1875	* the object name, not the archetype name. this is so that the
2026	* spell code can use one object type (force), but change it's name	1876	* spell code can use one object type (force), but change it's name
2027	* to be unique.	1877	* to be unique.
2028	*/	1878	*/
2029
2030	object *	1879	object *
2031	present_in_ob_by_name (int type, const char *str, const object *op)	1880	present_in_ob_by_name (int type, const char *str, const object *op)
2032	{	1881	{
2033	object *
2034	tmp;
2035
2036	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1882	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2037	{
2038	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1883	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2039	return tmp;	1884	return tmp;
2040	}	1885
2041	return NULL;	1886	return 0;
2042	}	1887	}
2043		1888
2044	/*	1889	/*
2045	* present_arch_in_ob(archetype, object) searches for any objects with	1890	* present_arch_in_ob(archetype, object) searches for any objects with
2046	* a matching archetype in the inventory of the given object.	1891	* a matching archetype in the inventory of the given object.
2047	* The first matching object is returned, or NULL if none.	1892	* The first matching object is returned, or NULL if none.
2048	*/	1893	*/
2049
2050	object *	1894	object *
2051	present_arch_in_ob (const archetype *at, const object *op)	1895	present_arch_in_ob (const archetype *at, const object *op)
2052	{	1896	{
2053	object *
2054	tmp;
2055
2056	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1897	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2057	if (tmp->arch == at)	1898	if (tmp->arch == at)
2058	return tmp;	1899	return tmp;
		1900
2059	return NULL;	1901	return NULL;
2060	}	1902	}
2061		1903
2062	/*	1904	/*
2063	* activate recursively a flag on an object inventory	1905	* activate recursively a flag on an object inventory
2064	*/	1906	*/
2065	void	1907	void
2066	flag_inv (object *op, int flag)	1908	flag_inv (object *op, int flag)
2067	{	1909	{
2068	object *
2069	tmp;
2070
2071	if (op->inv)	1910	if (op->inv)
2072	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2073	{	1912	{
2074	SET_FLAG (tmp, flag);	1913	SET_FLAG (tmp, flag);
2075	flag_inv (tmp, flag);	1914	flag_inv (tmp, flag);
2076	}	1915	}
2077	} /*	1916	}
		1917
		1918	/*
2078	* desactivate recursively a flag on an object inventory	1919	* deactivate recursively a flag on an object inventory
2079	*/	1920	*/
2080	void	1921	void
2081	unflag_inv (object *op, int flag)	1922	unflag_inv (object *op, int flag)
2082	{	1923	{
2083	object *
2084	tmp;
2085
2086	if (op->inv)	1924	if (op->inv)
2087	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1925	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2088	{	1926	{
2089	CLEAR_FLAG (tmp, flag);	1927	CLEAR_FLAG (tmp, flag);
2090	unflag_inv (tmp, flag);	1928	unflag_inv (tmp, flag);
2091	}	1929	}
2092	}	1930	}
…		…
2095	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1933	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2096	* all it's inventory (recursively).	1934	* all it's inventory (recursively).
2097	* If checksums are used, a player will get set_cheat called for	1935	* If checksums are used, a player will get set_cheat called for
2098	* him/her-self and all object carried by a call to this function.	1936	* him/her-self and all object carried by a call to this function.
2099	*/	1937	*/
2100
2101	void	1938	void
2102	set_cheat (object *op)	1939	set_cheat (object *op)
2103	{	1940	{
2104	SET_FLAG (op, FLAG_WAS_WIZ);	1941	SET_FLAG (op, FLAG_WAS_WIZ);
2105	flag_inv (op, FLAG_WAS_WIZ);	1942	flag_inv (op, FLAG_WAS_WIZ);
…		…
2124	* because arch_blocked (now ob_blocked) needs to know the movement type	1961	* because arch_blocked (now ob_blocked) needs to know the movement type
2125	* to know if the space in question will block the object. We can't use	1962	* to know if the space in question will block the object. We can't use
2126	* the archetype because that isn't correct if the monster has been	1963	* the archetype because that isn't correct if the monster has been
2127	* customized, changed states, etc.	1964	* customized, changed states, etc.
2128	*/	1965	*/
2129
2130	int	1966	int
2131	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1967	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2132	{	1968	{
2133	int
2134	i,
2135	index = 0, flag;	1969	int index = 0, flag;
2136	static int
2137	altern[SIZEOFFREE];	1970	int altern[SIZEOFFREE];
2138		1971
2139	for (i = start; i < stop; i++)	1972	for (int i = start; i < stop; i++)
2140	{	1973	{
2141	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1974	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2142	if (!flag)	1975	if (!flag)
2143	altern[index++] = i;	1976	altern [index++] = i;
2144		1977
2145	/* Basically, if we find a wall on a space, we cut down the search size.	1978	/* Basically, if we find a wall on a space, we cut down the search size.
2146	* In this way, we won't return spaces that are on another side of a wall.	1979	* In this way, we won't return spaces that are on another side of a wall.
2147	* This mostly work, but it cuts down the search size in all directions -	1980	* This mostly work, but it cuts down the search size in all directions -
2148	* if the space being examined only has a wall to the north and empty	1981	* if the space being examined only has a wall to the north and empty
2149	* spaces in all the other directions, this will reduce the search space	1982	* spaces in all the other directions, this will reduce the search space
2150	* to only the spaces immediately surrounding the target area, and	1983	* to only the spaces immediately surrounding the target area, and
2151	* won't look 2 spaces south of the target space.	1984	* won't look 2 spaces south of the target space.
2152	*/	1985	*/
2153	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1986	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2154	stop = maxfree[i];	1987	stop = maxfree[i];
2155	}	1988	}
		1989
2156	if (!index)	1990	if (!index)
2157	return -1;	1991	return -1;
		1992
2158	return altern[RANDOM () % index];	1993	return altern[RANDOM () % index];
2159	}	1994	}
2160		1995
2161	/*	1996	/*
2162	* find_first_free_spot(archetype, maptile, x, y) works like	1997	* find_first_free_spot(archetype, maptile, x, y) works like
2163	* find_free_spot(), but it will search max number of squares.	1998	* find_free_spot(), but it will search max number of squares.
2164	* But it will return the first available spot, not a random choice.	1999	* But it will return the first available spot, not a random choice.
2165	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2000	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2166	*/	2001	*/
2167
2168	int	2002	int
2169	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2003	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2170	{	2004	{
2171	int
2172	i;
2173
2174	for (i = 0; i < SIZEOFFREE; i++)	2005	for (int i = 0; i < SIZEOFFREE; i++)
2175	{
2176	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2006	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2177	return i;	2007	return i;
2178	}	2008
2179	return -1;	2009	return -1;
2180	}	2010	}
2181		2011
2182	/*	2012	/*
2183	* The function permute(arr, begin, end) randomly reorders the array	2013	* The function permute(arr, begin, end) randomly reorders the array
2184	* arr[begin..end-1].	2014	* arr[begin..end-1].
		2015	* now uses a fisher-yates shuffle, old permute was broken
2185	*/	2016	*/
2186	static void	2017	static void
2187	permute (int *arr, int begin, int end)	2018	permute (int *arr, int begin, int end)
2188	{	2019	{
2189	int	2020	arr += begin;
2190	i,
2191	j,
2192	tmp,
2193	len;
2194
2195	len = end - begin;	2021	end -= begin;
2196	for (i = begin; i < end; i++)
2197	{
2198	j = begin + RANDOM () % len;
2199		2022
2200	tmp = arr[i];	2023	while (--end)
2201	arr[i] = arr[j];	2024	swap (arr [end], arr [RANDOM () % (end + 1)]);
2202	arr[j] = tmp;
2203	}
2204	}	2025	}
2205		2026
2206	/* new function to make monster searching more efficient, and effective!	2027	/* new function to make monster searching more efficient, and effective!
2207	* This basically returns a randomized array (in the passed pointer) of	2028	* This basically returns a randomized array (in the passed pointer) of
2208	* the spaces to find monsters. In this way, it won't always look for	2029	* the spaces to find monsters. In this way, it won't always look for
…		…
2211	* the 3x3 area will be searched, just not in a predictable order.	2032	* the 3x3 area will be searched, just not in a predictable order.
2212	*/	2033	*/
2213	void	2034	void
2214	get_search_arr (int *search_arr)	2035	get_search_arr (int *search_arr)
2215	{	2036	{
2216	int	2037	int i;
2217	i;
2218		2038
2219	for (i = 0; i < SIZEOFFREE; i++)	2039	for (i = 0; i < SIZEOFFREE; i++)
2220	{
2221	search_arr[i] = i;	2040	search_arr[i] = i;
2222	}
2223		2041
2224	permute (search_arr, 1, SIZEOFFREE1 + 1);	2042	permute (search_arr, 1, SIZEOFFREE1 + 1);
2225	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2043	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2226	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2044	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2227	}	2045	}
…		…
2236	* Perhaps incorrectly, but I'm making the assumption that exclude	2054	* Perhaps incorrectly, but I'm making the assumption that exclude
2237	* is actually want is going to try and move there. We need this info	2055	* is actually want is going to try and move there. We need this info
2238	* because we have to know what movement the thing looking to move	2056	* because we have to know what movement the thing looking to move
2239	* there is capable of.	2057	* there is capable of.
2240	*/	2058	*/
2241
2242	int	2059	int
2243	find_dir (maptile *m, int x, int y, object *exclude)	2060	find_dir (maptile *m, int x, int y, object *exclude)
2244	{	2061	{
2245	int
2246	i,
2247	max = SIZEOFFREE, mflags;	2062	int i, max = SIZEOFFREE, mflags;
2248		2063
2249	sint16 nx, ny;	2064	sint16 nx, ny;
2250	object *	2065	object *tmp;
2251	tmp;
2252	maptile *	2066	maptile *mp;
2253	mp;
2254		2067
2255	MoveType blocked, move_type;	2068	MoveType blocked, move_type;
2256		2069
2257	if (exclude && exclude->head)	2070	if (exclude && exclude->head)
2258	{	2071	{
…		…
2270	mp = m;	2083	mp = m;
2271	nx = x + freearr_x[i];	2084	nx = x + freearr_x[i];
2272	ny = y + freearr_y[i];	2085	ny = y + freearr_y[i];
2273		2086
2274	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2088
2275	if (mflags & P_OUT_OF_MAP)	2089	if (mflags & P_OUT_OF_MAP)
2276	{
2277	max = maxfree[i];	2090	max = maxfree[i];
2278	}
2279	else	2091	else
2280	{	2092	{
2281	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2093	mapspace &ms = mp->at (nx, ny);
		2094
		2095	blocked = ms.move_block;
2282		2096
2283	if ((move_type & blocked) == move_type)	2097	if ((move_type & blocked) == move_type)
2284	{
2285	max = maxfree[i];	2098	max = maxfree[i];
2286	}
2287	else if (mflags & P_IS_ALIVE)	2099	else if (mflags & P_IS_ALIVE)
2288	{	2100	{
2289	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2101	for (tmp = ms.bot; tmp; tmp = tmp->above)
2290	{	2102	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2291	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2103	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2292	{
2293	break;	2104	break;
2294	}	2105
2295	}
2296	if (tmp)	2106	if (tmp)
2297	{
2298	return freedir[i];	2107	return freedir[i];
2299	}
2300	}	2108	}
2301	}	2109	}
2302	}	2110	}
		2111
2303	return 0;	2112	return 0;
2304	}	2113	}
2305		2114
2306	/*	2115	/*
2307	* distance(object 1, object 2) will return the square of the	2116	* distance(object 1, object 2) will return the square of the
2308	* distance between the two given objects.	2117	* distance between the two given objects.
2309	*/	2118	*/
2310
2311	int	2119	int
2312	distance (const object *ob1, const object *ob2)	2120	distance (const object *ob1, const object *ob2)
2313	{	2121	{
2314	int
2315	i;
2316
2317	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2122	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2318	return i;
2319	}	2123	}
2320		2124
2321	/*	2125	/*
2322	* find_dir_2(delta-x,delta-y) will return a direction in which	2126	* find_dir_2(delta-x,delta-y) will return a direction in which
2323	* an object which has subtracted the x and y coordinates of another	2127	* an object which has subtracted the x and y coordinates of another
2324	* object, needs to travel toward it.	2128	* object, needs to travel toward it.
2325	*/	2129	*/
2326
2327	int	2130	int
2328	find_dir_2 (int x, int y)	2131	find_dir_2 (int x, int y)
2329	{	2132	{
2330	int	2133	int q;
2331	q;
2332		2134
2333	if (y)	2135	if (y)
2334	q = x * 100 / y;	2136	q = x * 100 / y;
2335	else if (x)	2137	else if (x)
2336	q = -300 * x;	2138	q = -300 * x;
…		…
2371	int	2173	int
2372	absdir (int d)	2174	absdir (int d)
2373	{	2175	{
2374	while (d < 1)	2176	while (d < 1)
2375	d += 8;	2177	d += 8;
		2178
2376	while (d > 8)	2179	while (d > 8)
2377	d -= 8;	2180	d -= 8;
		2181
2378	return d;	2182	return d;
2379	}	2183	}
2380		2184
2381	/*	2185	/*
2382	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2186	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2384	*/	2188	*/
2385		2189
2386	int	2190	int
2387	dirdiff (int dir1, int dir2)	2191	dirdiff (int dir1, int dir2)
2388	{	2192	{
2389	int	2193	int d;
2390	d;
2391		2194
2392	d = abs (dir1 - dir2);	2195	d = abs (dir1 - dir2);
2393	if (d > 4)	2196	if (d > 4)
2394	d = 8 - d;	2197	d = 8 - d;
		2198
2395	return d;	2199	return d;
2396	}	2200	}
2397		2201
2398	/* peterm:	2202	/* peterm:
2399	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2203	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2402	* This basically means that if direction is 15, then it could either go	2206	* This basically means that if direction is 15, then it could either go
2403	* direction 4, 14, or 16 to get back to where we are.	2207	* direction 4, 14, or 16 to get back to where we are.
2404	* Moved from spell_util.c to object.c with the other related direction	2208	* Moved from spell_util.c to object.c with the other related direction
2405	* functions.	2209	* functions.
2406	*/	2210	*/
2407
2408	int
2409	reduction_dir[SIZEOFFREE][3] = {	2211	int reduction_dir[SIZEOFFREE][3] = {
2410	{0, 0, 0}, /* 0 */	2212	{0, 0, 0}, /* 0 */
2411	{0, 0, 0}, /* 1 */	2213	{0, 0, 0}, /* 1 */
2412	{0, 0, 0}, /* 2 */	2214	{0, 0, 0}, /* 2 */
2413	{0, 0, 0}, /* 3 */	2215	{0, 0, 0}, /* 3 */
2414	{0, 0, 0}, /* 4 */	2216	{0, 0, 0}, /* 4 */
…		…
2462	* find a path to that monster that we found. If not,	2264	* find a path to that monster that we found. If not,
2463	* we don't bother going toward it. Returns 1 if we	2265	* we don't bother going toward it. Returns 1 if we
2464	* can see a direct way to get it	2266	* can see a direct way to get it
2465	* Modified to be map tile aware -.MSW	2267	* Modified to be map tile aware -.MSW
2466	*/	2268	*/
2467
2468
2469	int	2269	int
2470	can_see_monsterP (maptile *m, int x, int y, int dir)	2270	can_see_monsterP (maptile *m, int x, int y, int dir)
2471	{	2271	{
2472	sint16 dx, dy;	2272	sint16 dx, dy;
2473	int
2474	mflags;	2273	int mflags;
2475		2274
2476	if (dir < 0)	2275	if (dir < 0)
2477	return 0; /* exit condition: invalid direction */	2276	return 0; /* exit condition: invalid direction */
2478		2277
2479	dx = x + freearr_x[dir];	2278	dx = x + freearr_x[dir];
…		…
2492	return 0;	2291	return 0;
2493		2292
2494	/* yes, can see. */	2293	/* yes, can see. */
2495	if (dir < 9)	2294	if (dir < 9)
2496	return 1;	2295	return 1;
		2296
2497	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2297	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2498	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2298	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2299	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2499	}	2300	}
2500
2501
2502		2301
2503	/*	2302	/*
2504	* can_pick(picker, item): finds out if an object is possible to be	2303	* can_pick(picker, item): finds out if an object is possible to be
2505	* picked up by the picker. Returnes 1 if it can be	2304	* picked up by the picker. Returnes 1 if it can be
2506	* picked up, otherwise 0.	2305	* picked up, otherwise 0.
…		…
2517	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2316	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2518	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2317	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2519	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2318	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2520	}	2319	}
2521		2320
2522
2523	/*	2321	/*
2524	* create clone from object to another	2322	* create clone from object to another
2525	*/	2323	*/
2526	object *	2324	object *
2527	object_create_clone (object *asrc)	2325	object_create_clone (object *asrc)
2528	{	2326	{
2529	object *
2530	dst = NULL, *tmp, *src, *part, *prev, *item;	2327	object *dst = 0, *tmp, *src, *part, *prev, *item;
2531		2328
2532	if (!asrc)	2329	if (!asrc)
2533	return NULL;	2330	return 0;
		2331
2534	src = asrc;	2332	src = asrc;
2535	if (src->head)	2333	if (src->head)
2536	src = src->head;	2334	src = src->head;
2537		2335
2538	prev = NULL;	2336	prev = 0;
2539	for (part = src; part; part = part->more)	2337	for (part = src; part; part = part->more)
2540	{	2338	{
2541	tmp = get_object ();	2339	tmp = part->clone ();
2542	copy_object (part, tmp);
2543	tmp->x -= src->x;	2340	tmp->x -= src->x;
2544	tmp->y -= src->y;	2341	tmp->y -= src->y;
		2342
2545	if (!part->head)	2343	if (!part->head)
2546	{	2344	{
2547	dst = tmp;	2345	dst = tmp;
2548	tmp->head = NULL;	2346	tmp->head = 0;
2549	}	2347	}
2550	else	2348	else
2551	{
2552	tmp->head = dst;	2349	tmp->head = dst;
2553	}	2350
2554	tmp->more = NULL;	2351	tmp->more = 0;
		2352
2555	if (prev)	2353	if (prev)
2556	prev->more = tmp;	2354	prev->more = tmp;
		2355
2557	prev = tmp;	2356	prev = tmp;
2558	}	2357	}
2559		2358
2560	for (item = src->inv; item; item = item->below)	2359	for (item = src->inv; item; item = item->below)
2561	insert_ob_in_ob (object_create_clone (item), dst);	2360	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2567	/* Basically, we save the content of the string to a temp file, then call */	2366	/* Basically, we save the content of the string to a temp file, then call */
2568	/* load_object on it. I admit it is a highly inefficient way to make things, */	2367	/* load_object on it. I admit it is a highly inefficient way to make things, */
2569	/* but it was simple to make and allows reusing the load_object function. */	2368	/* but it was simple to make and allows reusing the load_object function. */
2570	/* Remember not to use load_object_str in a time-critical situation. */	2369	/* Remember not to use load_object_str in a time-critical situation. */
2571	/* Also remember that multiparts objects are not supported for now. */	2370	/* Also remember that multiparts objects are not supported for now. */
2572
2573	object *	2371	object *
2574	load_object_str (const char *obstr)	2372	load_object_str (const char *obstr)
2575	{	2373	{
2576	object *op;	2374	object *op;
2577	char filename[MAX_BUF];	2375	char filename[MAX_BUF];
…		…
2587	}	2385	}
2588		2386
2589	fprintf (tempfile, obstr);	2387	fprintf (tempfile, obstr);
2590	fclose (tempfile);	2388	fclose (tempfile);
2591		2389
2592	op = get_object ();	2390	op = object::create ();
2593		2391
2594	object_thawer thawer (filename);	2392	object_thawer thawer (filename);
2595		2393
2596	if (thawer)	2394	if (thawer)
2597	load_object (thawer, op, 0);	2395	load_object (thawer, op, 0);
…		…
2607	* returns NULL if no match.	2405	* returns NULL if no match.
2608	*/	2406	*/
2609	object *	2407	object *
2610	find_obj_by_type_subtype (const object *who, int type, int subtype)	2408	find_obj_by_type_subtype (const object *who, int type, int subtype)
2611	{	2409	{
2612	object *tmp;
2613
2614	for (tmp = who->inv; tmp; tmp = tmp->below)	2410	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2615	if (tmp->type == type && tmp->subtype == subtype)	2411	if (tmp->type == type && tmp->subtype == subtype)
2616	return tmp;	2412	return tmp;
2617		2413
2618	return NULL;	2414	return 0;
2619	}	2415	}
2620		2416
2621	/* If ob has a field named key, return the link from the list,	2417	/* If ob has a field named key, return the link from the list,
2622	* otherwise return NULL.	2418	* otherwise return NULL.
2623	*	2419	*
…		…
2625	* do the desired thing.	2421	* do the desired thing.
2626	*/	2422	*/
2627	key_value *	2423	key_value *
2628	get_ob_key_link (const object *ob, const char *key)	2424	get_ob_key_link (const object *ob, const char *key)
2629	{	2425	{
2630	key_value *link;
2631
2632	for (link = ob->key_values; link != NULL; link = link->next)	2426	for (key_value *link = ob->key_values; link; link = link->next)
2633	if (link->key == key)	2427	if (link->key == key)
2634	return link;	2428	return link;
2635		2429
2636	return NULL;	2430	return 0;
2637	}	2431	}
2638		2432
2639	/*	2433	/*
2640	* Returns the value of op has an extra_field for key, or NULL.	2434	* Returns the value of op has an extra_field for key, or NULL.
2641	*	2435	*
…		…
2681	* Returns TRUE on success.	2475	* Returns TRUE on success.
2682	*/	2476	*/
2683	int	2477	int
2684	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2478	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2685	{	2479	{
2686	key_value *
2687	field = NULL, *last = NULL;	2480	key_value *field = NULL, *last = NULL;
2688		2481
2689	for (field = op->key_values; field != NULL; field = field->next)	2482	for (field = op->key_values; field != NULL; field = field->next)
2690	{	2483	{
2691	if (field->key != canonical_key)	2484	if (field->key != canonical_key)
2692	{	2485	{
…		…
2720	/* IF we get here, key doesn't exist */	2513	/* IF we get here, key doesn't exist */
2721		2514
2722	/* No field, we'll have to add it. */	2515	/* No field, we'll have to add it. */
2723		2516
2724	if (!add_key)	2517	if (!add_key)
2725	{
2726	return FALSE;	2518	return FALSE;
2727	}	2519
2728	/* There isn't any good reason to store a null	2520	/* There isn't any good reason to store a null
2729	* value in the key/value list. If the archetype has	2521	* value in the key/value list. If the archetype has
2730	* this key, then we should also have it, so shouldn't	2522	* this key, then we should also have it, so shouldn't
2731	* be here. If user wants to store empty strings,	2523	* be here. If user wants to store empty strings,
2732	* should pass in ""	2524	* should pass in ""
…		…
2781	}	2573	}
2782	else	2574	else
2783	item = item->env;	2575	item = item->env;
2784	}	2576	}
2785		2577
		2578
		2579	const char *
		2580	object::flag_desc (char *desc, int len) const
		2581	{
		2582	char *p = desc;
		2583	bool first = true;
		2584
		2585	*p = 0;
		2586
		2587	for (int i = 0; i < NUM_FLAGS; i++)
		2588	{
		2589	if (len <= 10) // magic constant!
		2590	{
		2591	snprintf (p, len, ",...");
		2592	break;
		2593	}
		2594
		2595	if (flag [i])
		2596	{
		2597	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2598	len -= cnt;
		2599	p += cnt;
		2600	first = false;
		2601	}
		2602	}
		2603
		2604	return desc;
		2605	}
		2606
2786	// return a suitable string describing an objetc in enough detail to find it	2607	// return a suitable string describing an object in enough detail to find it
2787	const char *	2608	const char *
2788	object::debug_desc (char *info) const	2609	object::debug_desc (char *info) const
2789	{	2610	{
		2611	char flagdesc[512];
2790	char info2[256 * 3];	2612	char info2[256 * 4];
2791	char *p = info;	2613	char *p = info;
2792		2614
2793	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2615	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2794	count,	2616	count, uuid.seq,
2795	&name,	2617	&name,
2796	title ? " " : "",	2618	title ? "\",title:" : "",
2797	title ? (const char *)title : "");	2619	title ? (const char *)title : "",
		2620	flag_desc (flagdesc, 512), type);
2798		2621
2799	if (env)	2622	if (env)
2800	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2801		2624
2802	if (map)	2625	if (map)
2803	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2804		2627
2805	return info;	2628	return info;
2806	}	2629	}
2807		2630
2808	const char *	2631	const char *
2809	object::debug_desc () const	2632	object::debug_desc () const
2810	{	2633	{
2811	static char info[256 * 3];	2634	static char info[256 * 4];
2812	return debug_desc (info);	2635	return debug_desc (info);
2813	}	2636	}
2814		2637

Diff Legend

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