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.53 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 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: %lld\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	object *op;	400	return ((unsigned int)i) < objects.size ()
418		401	? objects [i]
419	for (op = object::first; op != NULL; op = op->next)	402	: 0;
420	if (op->count == i)
421	break;
422
423	return op;
424	}	403	}
425		404
426	/*	405	/*
427	* Returns the first object which has a name equal to the argument.	406	* Returns the first object which has a name equal to the argument.
428	* Used only by the patch command, but not all that useful.	407	* Used only by the patch command, but not all that useful.
429	* Enables features like "patch <name-of-other-player> food 999"	408	* Enables features like "patch <name-of-other-player> food 999"
430	*/	409	*/
431
432	object *	410	object *
433	find_object_name (const char *str)	411	find_object_name (const char *str)
434	{	412	{
435	shstr_cmp str_ (str);	413	shstr_cmp str_ (str);
436	object *op;	414	object *op;
437		415
438	for (op = object::first; op != NULL; op = op->next)	416	for_all_objects (op)
439	if (op->name == str_)	417	if (op->name == str_)
440	break;	418	break;
441		419
442	return op;	420	return op;
443	}	421	}
…		…
486	}	464	}
487		465
488	op->key_values = 0;	466	op->key_values = 0;
489	}	467	}
490		468
491	void object::clear ()
492	{
493	attachable_base::clear ();
494
495	free_key_values (this);
496
497	owner = 0;
498	name = 0;
499	name_pl = 0;
500	title = 0;
501	race = 0;
502	slaying = 0;
503	skill = 0;
504	msg = 0;
505	lore = 0;
506	custom_name = 0;
507	materialname = 0;
508	contr = 0;
509	below = 0;
510	above = 0;
511	inv = 0;
512	container = 0;
513	env = 0;
514	more = 0;
515	head = 0;
516	map = 0;
517	active_next = 0;
518	active_prev = 0;
519
520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
521
522	SET_FLAG (this, FLAG_REMOVED);
523
524	/* What is not cleared is next, prev, and count */
525
526	expmul = 1.0;
527	face = blank_face;
528
529	if (settings.casting_time)
530	casting_time = -1;
531	}
532
533	void object::clone (object *destination)
534	{
535	*(object_copy *)destination = *this;
536	*(object_pod *)destination = *this;
537
538	if (self || cb)
539	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
540	}
541
542	/*	469	/*
543	* copy object first frees everything allocated by the second object,	470	* copy_to first frees everything allocated by the dst object,
544	* and then copies the contends of the first object into the second	471	* and then copies the contents of itself into the second
545	* object, allocating what needs to be allocated. Basically, any	472	* object, allocating what needs to be allocated. Basically, any
546	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	473	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
547	* if the first object is freed, the pointers in the new object	474	* if the first object is freed, the pointers in the new object
548	* will point at garbage.	475	* will point at garbage.
549	*/	476	*/
550	void	477	void
551	copy_object (object *op2, object *op)	478	object::copy_to (object *dst)
552	{	479	{
553	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	480	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
554	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	481	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
555		482
556	op2->clone (op);	483	*(object_copy *)dst = *this;
557		484
558	if (is_freed)	485	if (is_freed)
559	SET_FLAG (op, FLAG_FREED);	486	SET_FLAG (dst, FLAG_FREED);
		487
560	if (is_removed)	488	if (is_removed)
561	SET_FLAG (op, FLAG_REMOVED);	489	SET_FLAG (dst, FLAG_REMOVED);
562		490
563	if (op2->speed < 0)	491	if (speed < 0)
564	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	492	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
565		493
566	/* Copy over key_values, if any. */	494	/* Copy over key_values, if any. */
567	if (op2->key_values)	495	if (key_values)
568	{	496	{
569	key_value *tail = 0;	497	key_value *tail = 0;
570	key_value *i;	498	key_value *i;
571		499
572	op->key_values = 0;	500	dst->key_values = 0;
573		501
574	for (i = op2->key_values; i; i = i->next)	502	for (i = key_values; i; i = i->next)
575	{	503	{
576	key_value *new_link = new key_value;	504	key_value *new_link = new key_value;
577		505
578	new_link->next = 0;	506	new_link->next = 0;
579	new_link->key = i->key;	507	new_link->key = i->key;
580	new_link->value = i->value;	508	new_link->value = i->value;
581		509
582	/* Try and be clever here, too. */	510	/* Try and be clever here, too. */
583	if (!op->key_values)	511	if (!dst->key_values)
584	{	512	{
585	op->key_values = new_link;	513	dst->key_values = new_link;
586	tail = new_link;	514	tail = new_link;
587	}	515	}
588	else	516	else
589	{	517	{
590	tail->next = new_link;	518	tail->next = new_link;
591	tail = new_link;	519	tail = new_link;
592	}	520	}
593	}	521	}
594	}	522	}
595		523
596	update_ob_speed (op);	524	dst->set_speed (dst->speed);
		525	}
		526
		527	object *
		528	object::clone ()
		529	{
		530	object *neu = create ();
		531	copy_to (neu);
		532	return neu;
597	}	533	}
598		534
599	/*	535	/*
600	* If an object with the IS_TURNABLE() flag needs to be turned due	536	* If an object with the IS_TURNABLE() flag needs to be turned due
601	* to the closest player being on the other side, this function can	537	* to the closest player being on the other side, this function can
602	* be called to update the face variable, _and_ how it looks on the map.	538	* be called to update the face variable, _and_ how it looks on the map.
603	*/	539	*/
604
605	void	540	void
606	update_turn_face (object *op)	541	update_turn_face (object *op)
607	{	542	{
608	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	543	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
609	return;	544	return;
		545
610	SET_ANIMATION (op, op->direction);	546	SET_ANIMATION (op, op->direction);
611	update_object (op, UP_OBJ_FACE);	547	update_object (op, UP_OBJ_FACE);
612	}	548	}
613		549
614	/*	550	/*
615	* Updates the speed of an object. If the speed changes from 0 to another	551	* Updates the speed of an object. If the speed changes from 0 to another
616	* value, or vice versa, then add/remove the object from the active list.	552	* value, or vice versa, then add/remove the object from the active list.
617	* This function needs to be called whenever the speed of an object changes.	553	* This function needs to be called whenever the speed of an object changes.
618	*/	554	*/
619	void	555	void
620	update_ob_speed (object *op)	556	object::set_speed (float speed)
621	{	557	{
622	extern int arch_init;	558	if (flag [FLAG_FREED] && speed)
623
624	/* No reason putting the archetypes objects on the speed list,
625	* since they never really need to be updated.
626	*/
627
628	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
629	{	559	{
630	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	560	LOG (llevError, "Object %s is freed but has speed.\n", &name);
631	#ifdef MANY_CORES
632	abort ();
633	#else
634	op->speed = 0;	561	speed = 0;
635	#endif
636	}
637
638	if (arch_init)
639	return;
640
641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
642	{	562	}
643	/* If already on active list, don't do anything */
644	if (op->active_next || op->active_prev || op == active_objects)
645	return;
646		563
647	/* process_events() expects us to insert the object at the beginning	564	this->speed = speed;
648	* of the list. */
649	op->active_next = active_objects;
650		565
651	if (op->active_next != NULL)	566	if (has_active_speed ())
652	op->active_next->active_prev = op;	567	activate ();
653
654	active_objects = op;
655	}
656	else	568	else
657	{	569	deactivate ();
658	/* If not on the active list, nothing needs to be done */
659	if (!op->active_next && !op->active_prev && op != active_objects)
660	return;
661
662	if (op->active_prev == NULL)
663	{
664	active_objects = op->active_next;
665
666	if (op->active_next != NULL)
667	op->active_next->active_prev = NULL;
668	}
669	else
670	{
671	op->active_prev->active_next = op->active_next;
672
673	if (op->active_next)
674	op->active_next->active_prev = op->active_prev;
675	}
676
677	op->active_next = NULL;
678	op->active_prev = NULL;
679	}
680	}	570	}
681		571
682	/* This function removes object 'op' from the list of active
683	* objects.
684	* This should only be used for style maps or other such
685	* reference maps where you don't want an object that isn't
686	* in play chewing up cpu time getting processed.
687	* The reverse of this is to call update_ob_speed, which
688	* will do the right thing based on the speed of the object.
689	*/
690	void
691	remove_from_active_list (object *op)
692	{
693	/* If not on the active list, nothing needs to be done */
694	if (!op->active_next && !op->active_prev && op != active_objects)
695	return;
696
697	if (op->active_prev == NULL)
698	{
699	active_objects = op->active_next;
700	if (op->active_next != NULL)
701	op->active_next->active_prev = NULL;
702	}
703	else
704	{
705	op->active_prev->active_next = op->active_next;
706	if (op->active_next)
707	op->active_next->active_prev = op->active_prev;
708	}
709	op->active_next = NULL;
710	op->active_prev = NULL;
711	}
712
713	/*	572	/*
714	* update_object() updates the array which represents the map.	573	* update_object() updates the the map.
715	* It takes into account invisible objects (and represent squares covered	574	* It takes into account invisible objects (and represent squares covered
716	* by invisible objects by whatever is below them (unless it's another	575	* by invisible objects by whatever is below them (unless it's another
717	* invisible object, etc...)	576	* invisible object, etc...)
718	* If the object being updated is beneath a player, the look-window	577	* If the object being updated is beneath a player, the look-window
719	* of that player is updated (this might be a suboptimal way of	578	* of that player is updated (this might be a suboptimal way of
720	* updating that window, though, since update_object() is called _often_)	579	* updating that window, though, since update_object() is called _often_)
721	*	580	*
722	* action is a hint of what the caller believes need to be done.	581	* action is a hint of what the caller believes need to be done.
723	* For example, if the only thing that has changed is the face (due to
724	* an animation), we don't need to call update_position until that actually
725	* comes into view of a player. OTOH, many other things, like addition/removal
726	* of walls or living creatures may need us to update the flags now.
727	* current action are:	582	* current action are:
728	* UP_OBJ_INSERT: op was inserted	583	* UP_OBJ_INSERT: op was inserted
729	* UP_OBJ_REMOVE: op was removed	584	* UP_OBJ_REMOVE: op was removed
730	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	585	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
731	* as that is easier than trying to look at what may have changed.	586	* as that is easier than trying to look at what may have changed.
732	* UP_OBJ_FACE: only the objects face has changed.	587	* UP_OBJ_FACE: only the objects face has changed.
733	*/	588	*/
734
735	void	589	void
736	update_object (object *op, int action)	590	update_object (object *op, int action)
737	{	591	{
738	int update_now = 0, flags;
739	MoveType move_on, move_off, move_block, move_slow;	592	MoveType move_on, move_off, move_block, move_slow;
740		593
741	if (op == NULL)	594	if (op == NULL)
742	{	595	{
743	/* this should never happen */	596	/* this should never happen */
744	LOG (llevDebug, "update_object() called for NULL object.\n");	597	LOG (llevDebug, "update_object() called for NULL object.\n");
745	return;	598	return;
746	}	599	}
747		600
748	if (op->env != NULL)	601	if (op->env)
749	{	602	{
750	/* Animation is currently handled by client, so nothing	603	/* Animation is currently handled by client, so nothing
751	* to do in this case.	604	* to do in this case.
752	*/	605	*/
753	return;	606	return;
…		…
758	*/	611	*/
759	if (!op->map || op->map->in_memory == MAP_SAVING)	612	if (!op->map || op->map->in_memory == MAP_SAVING)
760	return;	613	return;
761		614
762	/* make sure the object is within map boundaries */	615	/* make sure the object is within map boundaries */
763	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	616	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
764	{	617	{
765	LOG (llevError, "update_object() called for object out of map!\n");	618	LOG (llevError, "update_object() called for object out of map!\n");
766	#ifdef MANY_CORES	619	#ifdef MANY_CORES
767	abort ();	620	abort ();
768	#endif	621	#endif
769	return;	622	return;
770	}	623	}
771		624
772	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	625	mapspace &m = op->ms ();
773	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778		626
		627	if (!(m.flags_ & P_UPTODATE))
		628	/* nop */;
779	if (action == UP_OBJ_INSERT)	629	else if (action == UP_OBJ_INSERT)
780	{	630	{
		631	// this is likely overkill, TODO: revisit (schmorp)
781	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	632	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782	update_now = 1;
783
784	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	633	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	update_now = 1;	634	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786		635	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		636	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	637	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788	update_now = 1;
789
790	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791	update_now = 1;
792
793	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794	update_now = 1;
795
796	if ((move_on | op->move_on) != move_on)	638	|| (m.move_on | op->move_on ) != m.move_on
797	update_now = 1;
798
799	if ((move_off | op->move_off) != move_off)	639	|| (m.move_off | op->move_off ) != m.move_off
800	update_now = 1;	640	|| (m.move_slow | op->move_slow) != m.move_slow
801
802	/* This isn't perfect, but I don't expect a lot of objects to	641	/* This isn't perfect, but I don't expect a lot of objects to
803	* to have move_allow right now.	642	* to have move_allow right now.
804	*/	643	*/
805	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	644	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806	update_now = 1;	645	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807		646	m.flags_ = 0;
808	if ((move_slow | op->move_slow) != move_slow)
809	update_now = 1;
810	}	647	}
811	/* if the object is being removed, we can't make intelligent	648	/* if the object is being removed, we can't make intelligent
812	* decisions, because remove_ob can't really pass the object	649	* decisions, because remove_ob can't really pass the object
813	* that is being removed.	650	* that is being removed.
814	*/	651	*/
815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	652	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
816	update_now = 1;	653	m.flags_ = 0;
817	else if (action == UP_OBJ_FACE)	654	else if (action == UP_OBJ_FACE)
818	/* Nothing to do for that case */ ;	655	/* Nothing to do for that case */ ;
819	else	656	else
820	LOG (llevError, "update_object called with invalid action: %d\n", action);	657	LOG (llevError, "update_object called with invalid action: %d\n", action);
821		658
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)	659	if (op->more)
829	update_object (op->more, action);	660	update_object (op->more, action);
830	}	661	}
831		662
832	object::vector object::mortals;
833	object::vector object::objects; // not yet used
834	object *object::first;	663	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
847	static int lastmortals = 0;//D
848
849	if (mortals.size() != lastmortals && lastmortals > 100)//D
850	{
851	lastmortals = mortals.size ();//D
852	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
853	}
854	}
855		664
856	object::object ()	665	object::object ()
857	{	666	{
858	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
859		668
…		…
866	free_key_values (this);	675	free_key_values (this);
867	}	676	}
868		677
869	void object::link ()	678	void object::link ()
870	{	679	{
871	count = ++ob_count;
872	uuid = gen_uuid ();	680	uuid = gen_uuid ();
873		681
874	prev = 0;	682	refcnt_inc ();
875	next = object::first;	683	objects.insert (this);
876
877	if (object::first)
878	object::first->prev = this;
879
880	object::first = this;
881	}	684	}
882		685
883	void object::unlink ()	686	void object::unlink ()
884	{	687	{
885	if (this == object::first)	688	objects.erase (this);
886	object::first = next;	689	refcnt_dec ();
		690	}
887		691
888	/* Remove this object from the list of used objects */	692	void
889	if (prev) prev->next = next;	693	object::activate ()
890	if (next) next->prev = prev;	694	{
		695	/* If already on active list, don't do anything */
		696	if (active)
		697	return;
891		698
892	prev = 0;	699	if (has_active_speed ())
893	next = 0;	700	actives.insert (this);
		701	}
		702
		703	void
		704	object::activate_recursive ()
		705	{
		706	activate ();
		707
		708	for (object *op = inv; op; op = op->below)
		709	op->activate_recursive ();
		710	}
		711
		712	/* This function removes object 'op' from the list of active
		713	* objects.
		714	* This should only be used for style maps or other such
		715	* reference maps where you don't want an object that isn't
		716	* in play chewing up cpu time getting processed.
		717	* The reverse of this is to call update_ob_speed, which
		718	* will do the right thing based on the speed of the object.
		719	*/
		720	void
		721	object::deactivate ()
		722	{
		723	/* If not on the active list, nothing needs to be done */
		724	if (!active)
		725	return;
		726
		727	actives.erase (this);
		728	}
		729
		730	void
		731	object::deactivate_recursive ()
		732	{
		733	for (object *op = inv; op; op = op->below)
		734	op->deactivate_recursive ();
		735
		736	deactivate ();
		737	}
		738
		739	void
		740	object::set_flag_inv (int flag, int value)
		741	{
		742	for (object *op = inv; op; op = op->below)
		743	{
		744	op->flag [flag] = value;
		745	op->set_flag_inv (flag, value);
		746	}
		747	}
		748
		749	/*
		750	* Remove and free all objects in the inventory of the given object.
		751	* object.c ?
		752	*/
		753	void
		754	object::destroy_inv (bool drop_to_ground)
		755	{
		756	// need to check first, because the checks below might segfault
		757	// as we might be on an invalid mapspace and crossfire code
		758	// is too buggy to ensure that the inventory is empty.
		759	// corollary: if you create arrows etc. with stuff in tis inventory,
		760	// cf will crash below with off-map x and y
		761	if (!inv)
		762	return;
		763
		764	/* Only if the space blocks everything do we not process -
		765	* if some form of movement is allowed, let objects
		766	* drop on that space.
		767	*/
		768	if (!drop_to_ground
		769	|| !map
		770	|| map->in_memory != MAP_IN_MEMORY
		771	|| ms ().move_block == MOVE_ALL)
		772	{
		773	while (inv)
		774	{
		775	inv->destroy_inv (drop_to_ground);
		776	inv->destroy ();
		777	}
		778	}
		779	else
		780	{ /* Put objects in inventory onto this space */
		781	while (inv)
		782	{
		783	object *op = inv;
		784
		785	if (op->flag [FLAG_STARTEQUIP]
		786	|| op->flag [FLAG_NO_DROP]
		787	|| op->type == RUNE
		788	|| op->type == TRAP
		789	|| op->flag [FLAG_IS_A_TEMPLATE]
		790	|| op->flag [FLAG_DESTROY_ON_DEATH])
		791	op->destroy ();
		792	else
		793	map->insert (op, x, y);
		794	}
		795	}
894	}	796	}
895		797
896	object *object::create ()	798	object *object::create ()
897	{	799	{
898	object *op = new object;	800	object *op = new object;
899	op->link ();	801	op->link ();
900	return op;	802	return op;
901	}	803	}
902		804
903	/*	805	void
904	* free_object() frees everything allocated by an object, removes	806	object::do_destroy ()
905	* it from the list of used objects, and puts it on the list of
906	* free objects. The IS_FREED() flag is set in the object.
907	* The object must have been removed by remove_ob() first for
908	* this function to succeed.
909	*
910	* If destroy_inventory is set, free inventory as well. Else drop items in
911	* inventory to the ground.
912	*/
913	void object::destroy (bool destroy_inventory)
914	{	807	{
915	if (QUERY_FLAG (this, FLAG_FREED))	808	if (flag [FLAG_IS_LINKED])
		809	remove_button_link (this);
		810
		811	if (flag [FLAG_FRIENDLY])
		812	remove_friendly_object (this);
		813
		814	if (!flag [FLAG_REMOVED])
		815	remove ();
		816
		817	if (flag [FLAG_FREED])
916	return;	818	return;
917		819
918	if (QUERY_FLAG (this, FLAG_FRIENDLY))	820	set_speed (0);
919	remove_friendly_object (this);
920		821
921	if (!QUERY_FLAG (this, FLAG_REMOVED))	822	flag [FLAG_FREED] = 1;
922	remove_ob (this);
923		823
924	SET_FLAG (this, FLAG_FREED);	824	attachable::do_destroy ();
		825
		826	destroy_inv (true);
		827	unlink ();
		828
		829	// hack to ensure that freed objects still have a valid map
		830	{
		831	static maptile *freed_map; // freed objects are moved here to avoid crashes
		832
		833	if (!freed_map)
		834	{
		835	freed_map = new maptile;
		836
		837	freed_map->name = "/internal/freed_objects_map";
		838	freed_map->width = 3;
		839	freed_map->height = 3;
		840
		841	freed_map->alloc ();
		842	freed_map->in_memory = MAP_IN_MEMORY;
		843	}
		844
		845	map = freed_map;
		846	x = 1;
		847	y = 1;
		848	}
		849
		850	head = 0;
925		851
926	if (more)	852	if (more)
927	{	853	{
928	more->destroy (destroy_inventory);	854	more->destroy ();
929	more = 0;	855	more = 0;
930	}
931
932	if (inv)
933	{
934	/* Only if the space blocks everything do we not process -
935	* if some form of movement is allowed, let objects
936	* drop on that space.
937	*/
938	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
939	{
940	object *op = inv;
941
942	while (op)
943	{
944	object *tmp = op->below;
945	op->destroy (destroy_inventory);
946	op = tmp;
947	}
948	}
949	else
950	{ /* Put objects in inventory onto this space */
951	object *op = inv;
952
953	while (op)
954	{
955	object *tmp = op->below;
956
957	remove_ob (op);
958
959	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
960	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
961	free_object (op);
962	else
963	{
964	op->x = x;
965	op->y = y;
966	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
967	}
968
969	op = tmp;
970	}
971	}
972	}	856	}
973		857
974	// clear those pointers that likely might have circular references to us	858	// clear those pointers that likely might have circular references to us
975	owner = 0;	859	owner = 0;
976	enemy = 0;	860	enemy = 0;
977	attacked_by = 0;	861	attacked_by = 0;
		862	}
978		863
979	// only relevant for players(?), but make sure of it anyways	864	void
980	contr = 0;	865	object::destroy (bool destroy_inventory)
		866	{
		867	if (destroyed ())
		868	return;
981		869
982	/* Remove object from the active list */	870	if (destroy_inventory)
983	speed = 0;	871	destroy_inv (false);
984	update_ob_speed (this);
985		872
986	unlink ();	873	attachable::destroy ();
987
988	mortals.push_back (this);
989	}	874	}
990		875
991	/*	876	/*
992	* sub_weight() recursively (outwards) subtracts a number from the	877	* sub_weight() recursively (outwards) subtracts a number from the
993	* weight of an object (and what is carried by it's environment(s)).	878	* weight of an object (and what is carried by it's environment(s)).
994	*/	879	*/
995
996	void	880	void
997	sub_weight (object *op, signed long weight)	881	sub_weight (object *op, signed long weight)
998	{	882	{
999	while (op != NULL)	883	while (op != NULL)
1000	{	884	{
…		…
1004	op->carrying -= weight;	888	op->carrying -= weight;
1005	op = op->env;	889	op = op->env;
1006	}	890	}
1007	}	891	}
1008		892
1009	/* remove_ob(op):	893	/* op->remove ():
1010	* This function removes the object op from the linked list of objects	894	* This function removes the object op from the linked list of objects
1011	* which it is currently tied to. When this function is done, the	895	* which it is currently tied to. When this function is done, the
1012	* object will have no environment. If the object previously had an	896	* object will have no environment. If the object previously had an
1013	* environment, the x and y coordinates will be updated to	897	* environment, the x and y coordinates will be updated to
1014	* the previous environment.	898	* the previous environment.
1015	* Beware: This function is called from the editor as well!	899	* Beware: This function is called from the editor as well!
1016	*/	900	*/
1017
1018	void	901	void
1019	remove_ob (object *op)	902	object::remove ()
1020	{	903	{
1021	object *tmp, *last = 0;	904	object *tmp, *last = 0;
1022	object *otmp;	905	object *otmp;
1023		906
1024	int check_walk_off;
1025	maptile *m;
1026
1027	sint16 x, y;
1028
1029	if (QUERY_FLAG (op, FLAG_REMOVED))	907	if (QUERY_FLAG (this, FLAG_REMOVED))
1030	return;	908	return;
1031		909
1032	SET_FLAG (op, FLAG_REMOVED);	910	SET_FLAG (this, FLAG_REMOVED);
		911	INVOKE_OBJECT (REMOVE, this);
1033		912
1034	if (op->more != NULL)	913	if (more)
1035	remove_ob (op->more);	914	more->remove ();
1036		915
1037	/*	916	/*
1038	* In this case, the object to be removed is in someones	917	* In this case, the object to be removed is in someones
1039	* inventory.	918	* inventory.
1040	*/	919	*/
1041	if (op->env != NULL)	920	if (env)
1042	{	921	{
1043	if (op->nrof)	922	if (nrof)
1044	sub_weight (op->env, op->weight * op->nrof);	923	sub_weight (env, weight * nrof);
1045	else	924	else
1046	sub_weight (op->env, op->weight + op->carrying);	925	sub_weight (env, weight + carrying);
1047		926
1048	/* NO_FIX_PLAYER is set when a great many changes are being	927	/* NO_FIX_PLAYER is set when a great many changes are being
1049	* made to players inventory. If set, avoiding the call	928	* made to players inventory. If set, avoiding the call
1050	* to save cpu time.	929	* to save cpu time.
1051	*/	930	*/
1052	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	931	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1053	fix_player (otmp);	932	otmp->update_stats ();
1054		933
1055	if (op->above != NULL)	934	if (above)
1056	op->above->below = op->below;	935	above->below = below;
1057	else	936	else
1058	op->env->inv = op->below;	937	env->inv = below;
1059		938
1060	if (op->below != NULL)	939	if (below)
1061	op->below->above = op->above;	940	below->above = above;
1062		941
1063	/* we set up values so that it could be inserted into	942	/* we set up values so that it could be inserted into
1064	* the map, but we don't actually do that - it is up	943	* the map, but we don't actually do that - it is up
1065	* to the caller to decide what we want to do.	944	* to the caller to decide what we want to do.
1066	*/	945	*/
1067	op->x = op->env->x, op->y = op->env->y;	946	x = env->x, y = env->y;
1068	op->map = op->env->map;	947	map = env->map;
1069	op->above = NULL, op->below = NULL;	948	above = 0, below = 0;
1070	op->env = NULL;	949	env = 0;
1071	}	950	}
1072	else if (op->map)	951	else if (map)
1073	{	952	{
1074	x = op->x;	953	if (type == PLAYER)
1075	y = op->y;
1076	m = get_map_from_coord (op->map, &x, &y);
1077
1078	if (!m)
1079	{
1080	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1081	op->map->path, op->x, op->y);
1082	/* in old days, we used to set x and y to 0 and continue.
1083	* it seems if we get into this case, something is probablye
1084	* screwed up and should be fixed.
1085	*/
1086	abort ();
1087	}	954	{
1088		955	--map->players;
1089	if (op->map != m)	956	map->touch ();
1090	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1091	op->map->path, m->path, op->x, op->y, x, y);
1092
1093	/* Re did the following section of code - it looks like it had
1094	* lots of logic for things we no longer care about
1095	*/	957	}
		958
		959	map->dirty = true;
1096		960
1097	/* link the object above us */	961	/* link the object above us */
1098	if (op->above)	962	if (above)
1099	op->above->below = op->below;	963	above->below = below;
1100	else	964	else
1101	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	965	map->at (x, y).top = below; /* we were top, set new top */
1102		966
1103	/* Relink the object below us, if there is one */	967	/* Relink the object below us, if there is one */
1104	if (op->below)	968	if (below)
1105	op->below->above = op->above;	969	below->above = above;
1106	else	970	else
1107	{	971	{
1108	/* Nothing below, which means we need to relink map object for this space	972	/* Nothing below, which means we need to relink map object for this space
1109	* use translated coordinates in case some oddness with map tiling is	973	* use translated coordinates in case some oddness with map tiling is
1110	* evident	974	* evident
1111	*/	975	*/
1112	if (GET_MAP_OB (m, x, y) != op)	976	if (GET_MAP_OB (map, x, y) != this)
1113	{	977	{
1114	char *dump = dump_object (op);	978	char *dump = dump_object (this);
1115	LOG (llevError,	979	LOG (llevError,
1116	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	980	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1117	free (dump);	981	free (dump);
1118	dump = dump_object (GET_MAP_OB (m, x, y));	982	dump = dump_object (GET_MAP_OB (map, x, y));
1119	LOG (llevError, "%s\n", dump);	983	LOG (llevError, "%s\n", dump);
1120	free (dump);	984	free (dump);
1121	}	985	}
1122		986
1123	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	987	map->at (x, y).bot = above; /* goes on above it. */
1124	}	988	}
1125		989
1126	op->above = 0;	990	above = 0;
1127	op->below = 0;	991	below = 0;
1128		992
1129	if (op->map->in_memory == MAP_SAVING)	993	if (map->in_memory == MAP_SAVING)
1130	return;	994	return;
1131		995
1132	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	996	int check_walk_off = !flag [FLAG_NO_APPLY];
1133		997
1134	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	998	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1135	{	999	{
1136	/* No point updating the players look faces if he is the object	1000	/* No point updating the players look faces if he is the object
1137	* being removed.	1001	* being removed.
1138	*/	1002	*/
1139		1003
1140	if (tmp->type == PLAYER && tmp != op)	1004	if (tmp->type == PLAYER && tmp != this)
1141	{	1005	{
1142	/* If a container that the player is currently using somehow gets	1006	/* If a container that the player is currently using somehow gets
1143	* removed (most likely destroyed), update the player view	1007	* removed (most likely destroyed), update the player view
1144	* appropriately.	1008	* appropriately.
1145	*/	1009	*/
1146	if (tmp->container == op)	1010	if (tmp->container == this)
1147	{	1011	{
1148	CLEAR_FLAG (op, FLAG_APPLIED);	1012	flag [FLAG_APPLIED] = 0;
1149	tmp->container = NULL;	1013	tmp->container = 0;
1150	}	1014	}
1151		1015
1152	tmp->contr->socket.update_look = 1;	1016	if (tmp->contr->ns)
		1017	tmp->contr->ns->floorbox_update ();
1153	}	1018	}
1154		1019
1155	/* See if player moving off should effect something */	1020	/* See if object moving off should effect something */
1156	if (check_walk_off	1021	if (check_walk_off
1157	&& ((op->move_type & tmp->move_off)	1022	&& ((move_type & tmp->move_off)
1158	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1023	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1159	{	1024	{
1160	move_apply (tmp, op, NULL);	1025	move_apply (tmp, this, 0);
1161		1026
1162	if (op->destroyed ())	1027	if (destroyed ())
1163	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1028	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1164	}	1029	}
1165		1030
1166	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1031	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1167		1032	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1168	if (tmp->above == tmp)	1033	if (tmp->above == tmp)
1169	tmp->above = NULL;	1034	tmp->above = 0;
1170		1035
1171	last = tmp;	1036	last = tmp;
1172	}	1037	}
1173		1038
1174	/* last == NULL of there are no objects on this space */	1039	/* last == NULL if there are no objects on this space */
		1040	//TODO: this makes little sense, why only update the topmost object?
1175	if (last == NULL)	1041	if (!last)
1176	{	1042	map->at (x, y).flags_ = 0;
1177	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1178	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1179	* those out anyways, and if there are any flags set right now, they won't
1180	* be correct anyways.
1181	*/
1182	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1183	update_position (op->map, op->x, op->y);
1184	}
1185	else	1043	else
1186	update_object (last, UP_OBJ_REMOVE);	1044	update_object (last, UP_OBJ_REMOVE);
1187		1045
1188	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1046	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1189	update_all_los (op->map, op->x, op->y);	1047	update_all_los (map, x, y);
1190	}	1048	}
1191	}	1049	}
1192		1050
1193	/*	1051	/*
1194	* merge_ob(op,top):	1052	* merge_ob(op,top):
…		…
1202	merge_ob (object *op, object *top)	1060	merge_ob (object *op, object *top)
1203	{	1061	{
1204	if (!op->nrof)	1062	if (!op->nrof)
1205	return 0;	1063	return 0;
1206		1064
1207	if (top == NULL)	1065	if (top)
1208	for (top = op; top != NULL && top->above != NULL; top = top->above);	1066	for (top = op; top && top->above; top = top->above)
		1067	;
1209		1068
1210	for (; top != NULL; top = top->below)	1069	for (; top; top = top->below)
1211	{	1070	{
1212	if (top == op)	1071	if (top == op)
1213	continue;	1072	continue;
1214	if (CAN_MERGE (op, top))	1073
		1074	if (object::can_merge (op, top))
1215	{	1075	{
1216	top->nrof += op->nrof;	1076	top->nrof += op->nrof;
1217		1077
1218	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1078	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1219	op->weight = 0; /* Don't want any adjustements now */	1079	op->weight = 0; /* Don't want any adjustements now */
1220	remove_ob (op);	1080	op->destroy ();
1221	free_object (op);
1222	return top;	1081	return top;
1223	}	1082	}
1224	}	1083	}
1225		1084
1226	return 0;	1085	return 0;
…		…
1231	* job preparing multi-part monsters	1090	* job preparing multi-part monsters
1232	*/	1091	*/
1233	object *	1092	object *
1234	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1093	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1235	{	1094	{
1236	object *tmp;
1237
1238	if (op->head)
1239	op = op->head;
1240
1241	for (tmp = op; tmp; tmp = tmp->more)	1095	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1242	{	1096	{
1243	tmp->x = x + tmp->arch->clone.x;	1097	tmp->x = x + tmp->arch->clone.x;
1244	tmp->y = y + tmp->arch->clone.y;	1098	tmp->y = y + tmp->arch->clone.y;
1245	}	1099	}
1246		1100
…		…
1265	* Return value:	1119	* Return value:
1266	* new object if 'op' was merged with other object	1120	* new object if 'op' was merged with other object
1267	* NULL if 'op' was destroyed	1121	* NULL if 'op' was destroyed
1268	* just 'op' otherwise	1122	* just 'op' otherwise
1269	*/	1123	*/
1270
1271	object *	1124	object *
1272	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1125	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1273	{	1126	{
1274	object *tmp, *top, *floor = NULL;	1127	object *tmp, *top, *floor = NULL;
1275	sint16 x, y;	1128	sint16 x, y;
…		…
1278	{	1131	{
1279	LOG (llevError, "Trying to insert freed object!\n");	1132	LOG (llevError, "Trying to insert freed object!\n");
1280	return NULL;	1133	return NULL;
1281	}	1134	}
1282		1135
1283	if (m == NULL)	1136	if (!m)
1284	{	1137	{
1285	char *dump = dump_object (op);	1138	char *dump = dump_object (op);
1286	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1139	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1287	free (dump);	1140	free (dump);
1288	return op;	1141	return op;
…		…
1309	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1162	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1310	free (dump);	1163	free (dump);
1311	return op;	1164	return op;
1312	}	1165	}
1313		1166
1314	if (op->more != NULL)	1167	if (op->more)
1315	{	1168	{
1316	/* The part may be on a different map. */	1169	/* The part may be on a different map. */
1317		1170
1318	object *more = op->more;	1171	object *more = op->more;
1319		1172
1320	/* We really need the caller to normalize coordinates - if	1173	/* We really need the caller to normalise coordinates - if
1321	* we set the map, that doesn't work if the location is within	1174	* we set the map, that doesn't work if the location is within
1322	* a map and this is straddling an edge. So only if coordinate	1175	* a map and this is straddling an edge. So only if coordinate
1323	* is clear wrong do we normalize it.	1176	* is clear wrong do we normalise it.
1324	*/	1177	*/
1325	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1178	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1326	more->map = get_map_from_coord (m, &more->x, &more->y);	1179	more->map = get_map_from_coord (m, &more->x, &more->y);
1327	else if (!more->map)	1180	else if (!more->map)
1328	{	1181	{
…		…
1335	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1188	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1336	{	1189	{
1337	if (!op->head)	1190	if (!op->head)
1338	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1191	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1339		1192
1340	return NULL;	1193	return 0;
1341	}	1194	}
1342	}	1195	}
1343		1196
1344	CLEAR_FLAG (op, FLAG_REMOVED);	1197	CLEAR_FLAG (op, FLAG_REMOVED);
1345		1198
…		…
1352	y = op->y;	1205	y = op->y;
1353		1206
1354	/* this has to be done after we translate the coordinates.	1207	/* this has to be done after we translate the coordinates.
1355	*/	1208	*/
1356	if (op->nrof && !(flag & INS_NO_MERGE))	1209	if (op->nrof && !(flag & INS_NO_MERGE))
1357	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1210	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1358	if (CAN_MERGE (op, tmp))	1211	if (object::can_merge (op, tmp))
1359	{	1212	{
1360	op->nrof += tmp->nrof;	1213	op->nrof += tmp->nrof;
1361	remove_ob (tmp);	1214	tmp->destroy ();
1362	free_object (tmp);
1363	}	1215	}
1364		1216
1365	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1217	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1366	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1218	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1367		1219
…		…
1380	op->below = originator->below;	1232	op->below = originator->below;
1381		1233
1382	if (op->below)	1234	if (op->below)
1383	op->below->above = op;	1235	op->below->above = op;
1384	else	1236	else
1385	SET_MAP_OB (op->map, op->x, op->y, op);	1237	op->ms ().bot = op;
1386		1238
1387	/* since *below* originator, no need to update top */	1239	/* since *below* originator, no need to update top */
1388	originator->below = op;	1240	originator->below = op;
1389	}	1241	}
1390	else	1242	else
1391	{	1243	{
1392	/* If there are other objects, then */	1244	/* If there are other objects, then */
1393	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1245	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1394	{	1246	{
1395	object *last = NULL;	1247	object *last = 0;
1396		1248
1397	/*	1249	/*
1398	* If there are multiple objects on this space, we do some trickier handling.	1250	* If there are multiple objects on this space, we do some trickier handling.
1399	* We've already dealt with merging if appropriate.	1251	* We've already dealt with merging if appropriate.
1400	* Generally, we want to put the new object on top. But if	1252	* Generally, we want to put the new object on top. But if
…		…
1404	* once we get to them. This reduces the need to traverse over all of	1256	* once we get to them. This reduces the need to traverse over all of
1405	* them when adding another one - this saves quite a bit of cpu time	1257	* them when adding another one - this saves quite a bit of cpu time
1406	* when lots of spells are cast in one area. Currently, it is presumed	1258	* when lots of spells are cast in one area. Currently, it is presumed
1407	* that flying non pickable objects are spell objects.	1259	* that flying non pickable objects are spell objects.
1408	*/	1260	*/
1409
1410	while (top != NULL)	1261	while (top)
1411	{	1262	{
1412	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1263	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1413	floor = top;	1264	floor = top;
1414		1265
1415	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1266	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1436	* If INS_ON_TOP is used, don't do this processing	1287	* If INS_ON_TOP is used, don't do this processing
1437	* Need to find the object that in fact blocks view, otherwise	1288	* Need to find the object that in fact blocks view, otherwise
1438	* stacking is a bit odd.	1289	* stacking is a bit odd.
1439	*/	1290	*/
1440	if (!(flag & INS_ON_TOP) &&	1291	if (!(flag & INS_ON_TOP) &&
1441	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1292	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1442	{	1293	{
1443	for (last = top; last != floor; last = last->below)	1294	for (last = top; last != floor; last = last->below)
1444	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1295	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1445	break;	1296	break;
1446	/* Check to see if we found the object that blocks view,	1297	/* Check to see if we found the object that blocks view,
…		…
1468	op->above = GET_MAP_OB (op->map, op->x, op->y);	1319	op->above = GET_MAP_OB (op->map, op->x, op->y);
1469		1320
1470	if (op->above)	1321	if (op->above)
1471	op->above->below = op;	1322	op->above->below = op;
1472		1323
1473	op->below = NULL;	1324	op->below = 0;
1474	SET_MAP_OB (op->map, op->x, op->y, op);	1325	op->ms ().bot = op;
1475	}	1326	}
1476	else	1327	else
1477	{ /* get inserted into the stack above top */	1328	{ /* get inserted into the stack above top */
1478	op->above = top->above;	1329	op->above = top->above;
1479		1330
…		…
1482		1333
1483	op->below = top;	1334	op->below = top;
1484	top->above = op;	1335	top->above = op;
1485	}	1336	}
1486		1337
1487	if (op->above == NULL)	1338	if (!op->above)
1488	SET_MAP_TOP (op->map, op->x, op->y, op);	1339	op->ms ().top = op;
1489	} /* else not INS_BELOW_ORIGINATOR */	1340	} /* else not INS_BELOW_ORIGINATOR */
1490		1341
1491	if (op->type == PLAYER)	1342	if (op->type == PLAYER)
		1343	{
1492	op->contr->do_los = 1;	1344	op->contr->do_los = 1;
		1345	++op->map->players;
		1346	op->map->touch ();
		1347	}
		1348
		1349	op->map->dirty = true;
1493		1350
1494	/* If we have a floor, we know the player, if any, will be above	1351	/* If we have a floor, we know the player, if any, will be above
1495	* it, so save a few ticks and start from there.	1352	* it, so save a few ticks and start from there.
1496	*/	1353	*/
1497	if (!(flag & INS_MAP_LOAD))	1354	if (!(flag & INS_MAP_LOAD))
1498	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1355	if (object *pl = op->ms ().player ())
1499	if (tmp->type == PLAYER)	1356	if (pl->contr->ns)
1500	tmp->contr->socket.update_look = 1;	1357	pl->contr->ns->floorbox_update ();
1501		1358
1502	/* If this object glows, it may affect lighting conditions that are	1359	/* If this object glows, it may affect lighting conditions that are
1503	* visible to others on this map. But update_all_los is really	1360	* visible to others on this map. But update_all_los is really
1504	* an inefficient way to do this, as it means los for all players	1361	* an inefficient way to do this, as it means los for all players
1505	* on the map will get recalculated. The players could very well	1362	* on the map will get recalculated. The players could very well
1506	* be far away from this change and not affected in any way -	1363	* be far away from this change and not affected in any way -
1507	* this should get redone to only look for players within range,	1364	* this should get redone to only look for players within range,
1508	* or just updating the P_NEED_UPDATE for spaces within this area	1365	* or just updating the P_UPTODATE for spaces within this area
1509	* of effect may be sufficient.	1366	* of effect may be sufficient.
1510	*/	1367	*/
1511	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1368	if (op->map->darkness && (op->glow_radius != 0))
1512	update_all_los (op->map, op->x, op->y);	1369	update_all_los (op->map, op->x, op->y);
1513		1370
1514	/* updates flags (blocked, alive, no magic, etc) for this map space */	1371	/* updates flags (blocked, alive, no magic, etc) for this map space */
1515	update_object (op, UP_OBJ_INSERT);	1372	update_object (op, UP_OBJ_INSERT);
1516		1373
		1374	INVOKE_OBJECT (INSERT, op);
		1375
1517	/* Don't know if moving this to the end will break anything. However,	1376	/* Don't know if moving this to the end will break anything. However,
1518	* we want to have update_look set above before calling this.	1377	* we want to have floorbox_update called before calling this.
1519	*	1378	*
1520	* check_move_on() must be after this because code called from	1379	* check_move_on() must be after this because code called from
1521	* check_move_on() depends on correct map flags (so functions like	1380	* check_move_on() depends on correct map flags (so functions like
1522	* blocked() and wall() work properly), and these flags are updated by	1381	* blocked() and wall() work properly), and these flags are updated by
1523	* update_object().	1382	* update_object().
…		…
1525		1384
1526	/* if this is not the head or flag has been passed, don't check walk on status */	1385	/* if this is not the head or flag has been passed, don't check walk on status */
1527	if (!(flag & INS_NO_WALK_ON) && !op->head)	1386	if (!(flag & INS_NO_WALK_ON) && !op->head)
1528	{	1387	{
1529	if (check_move_on (op, originator))	1388	if (check_move_on (op, originator))
1530	return NULL;	1389	return 0;
1531		1390
1532	/* If we are a multi part object, lets work our way through the check	1391	/* If we are a multi part object, lets work our way through the check
1533	* walk on's.	1392	* walk on's.
1534	*/	1393	*/
1535	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1394	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1536	if (check_move_on (tmp, originator))	1395	if (check_move_on (tmp, originator))
1537	return NULL;	1396	return 0;
1538	}	1397	}
1539		1398
1540	return op;	1399	return op;
1541	}	1400	}
1542		1401
1543	/* this function inserts an object in the map, but if it	1402	/* this function inserts an object in the map, but if it
1544	* finds an object of its own type, it'll remove that one first.	1403	* finds an object of its own type, it'll remove that one first.
1545	* op is the object to insert it under: supplies x and the map.	1404	* op is the object to insert it under: supplies x and the map.
1546	*/	1405	*/
1547	void	1406	void
1548	replace_insert_ob_in_map (const char *arch_string, object *op)	1407	replace_insert_ob_in_map (const char *arch_string, object *op)
1549	{	1408	{
1550	object *	1409	object *tmp, *tmp1;
1551	tmp;
1552	object *
1553	tmp1;
1554		1410
1555	/* first search for itself and remove any old instances */	1411	/* first search for itself and remove any old instances */
1556		1412
1557	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1413	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1558	{
1559	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1414	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1560	{	1415	tmp->destroy ();
1561	remove_ob (tmp);
1562	free_object (tmp);
1563	}
1564	}
1565		1416
1566	tmp1 = arch_to_object (archetype::find (arch_string));	1417	tmp1 = arch_to_object (archetype::find (arch_string));
1567		1418
1568	tmp1->x = op->x;	1419	tmp1->x = op->x;
1569	tmp1->y = op->y;	1420	tmp1->y = op->y;
1570	insert_ob_in_map (tmp1, op->map, op, 0);	1421	insert_ob_in_map (tmp1, op->map, op, 0);
		1422	}
		1423
		1424	object *
		1425	object::insert_at (object *where, object *originator, int flags)
		1426	{
		1427	where->map->insert (this, where->x, where->y, originator, flags);
1571	}	1428	}
1572		1429
1573	/*	1430	/*
1574	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1431	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1575	* is returned contains nr objects, and the remaining parts contains	1432	* is returned contains nr objects, and the remaining parts contains
1576	* the rest (or is removed and freed if that number is 0).	1433	* the rest (or is removed and freed if that number is 0).
1577	* On failure, NULL is returned, and the reason put into the	1434	* On failure, NULL is returned, and the reason put into the
1578	* global static errmsg array.	1435	* global static errmsg array.
1579	*/	1436	*/
1580
1581	object *	1437	object *
1582	get_split_ob (object *orig_ob, uint32 nr)	1438	get_split_ob (object *orig_ob, uint32 nr)
1583	{	1439	{
1584	object *	1440	object *newob;
1585	newob;
1586	int
1587	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1441	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1588		1442
1589	if (orig_ob->nrof < nr)	1443	if (orig_ob->nrof < nr)
1590	{	1444	{
1591	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1445	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1592	return NULL;	1446	return NULL;
1593	}	1447	}
1594		1448
1595	newob = object_create_clone (orig_ob);	1449	newob = object_create_clone (orig_ob);
1596		1450
1597	if ((orig_ob->nrof -= nr) < 1)	1451	if ((orig_ob->nrof -= nr) < 1)
1598	{	1452	orig_ob->destroy (1);
1599	if (!is_removed)
1600	remove_ob (orig_ob);
1601	free_object2 (orig_ob, 1);
1602	}
1603	else if (!is_removed)	1453	else if (!is_removed)
1604	{	1454	{
1605	if (orig_ob->env != NULL)	1455	if (orig_ob->env != NULL)
1606	sub_weight (orig_ob->env, orig_ob->weight * nr);	1456	sub_weight (orig_ob->env, orig_ob->weight * nr);
1607	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1457	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1627		1477
1628	object *	1478	object *
1629	decrease_ob_nr (object *op, uint32 i)	1479	decrease_ob_nr (object *op, uint32 i)
1630	{	1480	{
1631	object *tmp;	1481	object *tmp;
1632	player *pl;
1633		1482
1634	if (i == 0) /* objects with op->nrof require this check */	1483	if (i == 0) /* objects with op->nrof require this check */
1635	return op;	1484	return op;
1636		1485
1637	if (i > op->nrof)	1486	if (i > op->nrof)
1638	i = op->nrof;	1487	i = op->nrof;
1639		1488
1640	if (QUERY_FLAG (op, FLAG_REMOVED))	1489	if (QUERY_FLAG (op, FLAG_REMOVED))
1641	op->nrof -= i;	1490	op->nrof -= i;
1642	else if (op->env != NULL)	1491	else if (op->env)
1643	{	1492	{
1644	/* is this object in the players inventory, or sub container	1493	/* is this object in the players inventory, or sub container
1645	* therein?	1494	* therein?
1646	*/	1495	*/
1647	tmp = is_player_inv (op->env);	1496	tmp = op->in_player ();
1648	/* nope. Is this a container the player has opened?	1497	/* nope. Is this a container the player has opened?
1649	* If so, set tmp to that player.	1498	* If so, set tmp to that player.
1650	* IMO, searching through all the players will mostly	1499	* IMO, searching through all the players will mostly
1651	* likely be quicker than following op->env to the map,	1500	* likely be quicker than following op->env to the map,
1652	* and then searching the map for a player.	1501	* and then searching the map for a player.
1653	*/	1502	*/
1654	if (!tmp)	1503	if (!tmp)
1655	{	1504	for_all_players (pl)
1656	for (pl = first_player; pl; pl = pl->next)
1657	if (pl->ob->container == op->env)	1505	if (pl->ob->container == op->env)
		1506	{
		1507	tmp = pl->ob;
1658	break;	1508	break;
1659	if (pl)
1660	tmp = pl->ob;
1661	else
1662	tmp = NULL;
1663	}	1509	}
1664		1510
1665	if (i < op->nrof)	1511	if (i < op->nrof)
1666	{	1512	{
1667	sub_weight (op->env, op->weight * i);	1513	sub_weight (op->env, op->weight * i);
1668	op->nrof -= i;	1514	op->nrof -= i;
1669	if (tmp)	1515	if (tmp)
1670	{
1671	esrv_send_item (tmp, op);	1516	esrv_send_item (tmp, op);
1672	}
1673	}	1517	}
1674	else	1518	else
1675	{	1519	{
1676	remove_ob (op);	1520	op->remove ();
1677	op->nrof = 0;	1521	op->nrof = 0;
1678	if (tmp)	1522	if (tmp)
1679	{
1680	esrv_del_item (tmp->contr, op->count);	1523	esrv_del_item (tmp->contr, op->count);
1681	}
1682	}	1524	}
1683	}	1525	}
1684	else	1526	else
1685	{	1527	{
1686	object *above = op->above;	1528	object *above = op->above;
1687		1529
1688	if (i < op->nrof)	1530	if (i < op->nrof)
1689	op->nrof -= i;	1531	op->nrof -= i;
1690	else	1532	else
1691	{	1533	{
1692	remove_ob (op);	1534	op->remove ();
1693	op->nrof = 0;	1535	op->nrof = 0;
1694	}	1536	}
1695		1537
1696	/* Since we just removed op, op->above is null */	1538	/* Since we just removed op, op->above is null */
1697	for (tmp = above; tmp != NULL; tmp = tmp->above)	1539	for (tmp = above; tmp; tmp = tmp->above)
1698	if (tmp->type == PLAYER)	1540	if (tmp->type == PLAYER)
1699	{	1541	{
1700	if (op->nrof)	1542	if (op->nrof)
1701	esrv_send_item (tmp, op);	1543	esrv_send_item (tmp, op);
1702	else	1544	else
…		…
1706		1548
1707	if (op->nrof)	1549	if (op->nrof)
1708	return op;	1550	return op;
1709	else	1551	else
1710	{	1552	{
1711	free_object (op);	1553	op->destroy ();
1712	return NULL;	1554	return 0;
1713	}	1555	}
1714	}	1556	}
1715		1557
1716	/*	1558	/*
1717	* add_weight(object, weight) adds the specified weight to an object,	1559	* add_weight(object, weight) adds the specified weight to an object,
…		…
1729	op->carrying += weight;	1571	op->carrying += weight;
1730	op = op->env;	1572	op = op->env;
1731	}	1573	}
1732	}	1574	}
1733		1575
1734	/*
1735	* insert_ob_in_ob(op,environment):
1736	* This function inserts the object op in the linked list
1737	* inside the object environment.
1738	*
1739	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1740	* the inventory at the last position or next to other objects of the same
1741	* type.
1742	* Frank: Now sorted by type, archetype and magic!
1743	*
1744	* The function returns now pointer to inserted item, and return value can
1745	* be != op, if items are merged. -Tero
1746	*/
1747
1748	object *	1576	object *
1749	insert_ob_in_ob (object *op, object *where)	1577	insert_ob_in_ob (object *op, object *where)
1750	{	1578	{
1751	object *	1579	if (!where)
1752	tmp, *
1753	otmp;
1754
1755	if (!QUERY_FLAG (op, FLAG_REMOVED))
1756	{
1757	char *dump = dump_object (op);
1758	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1759	free (dump);
1760	return op;
1761	}
1762
1763	if (where == NULL)
1764	{	1580	{
1765	char *dump = dump_object (op);	1581	char *dump = dump_object (op);
1766	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1582	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1767	free (dump);	1583	free (dump);
1768	return op;	1584	return op;
1769	}	1585	}
1770		1586
1771	if (where->head)	1587	if (where->head)
1772	{	1588	{
1773	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1589	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1774	where = where->head;	1590	where = where->head;
1775	}	1591	}
		1592
		1593	return where->insert (op);
		1594	}
		1595
		1596	/*
		1597	* env->insert (op)
		1598	* This function inserts the object op in the linked list
		1599	* inside the object environment.
		1600	*
		1601	* The function returns now pointer to inserted item, and return value can
		1602	* be != op, if items are merged. -Tero
		1603	*/
		1604
		1605	object *
		1606	object::insert (object *op)
		1607	{
		1608	object *tmp, *otmp;
		1609
		1610	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1611	op->remove ();
1776		1612
1777	if (op->more)	1613	if (op->more)
1778	{	1614	{
1779	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1615	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1780	return op;	1616	return op;
…		…
1782		1618
1783	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1619	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1784	CLEAR_FLAG (op, FLAG_REMOVED);	1620	CLEAR_FLAG (op, FLAG_REMOVED);
1785	if (op->nrof)	1621	if (op->nrof)
1786	{	1622	{
1787	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1623	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1788	if (CAN_MERGE (tmp, op))	1624	if (object::can_merge (tmp, op))
1789	{	1625	{
1790	/* return the original object and remove inserted object	1626	/* return the original object and remove inserted object
1791	(client needs the original object) */	1627	(client needs the original object) */
1792	tmp->nrof += op->nrof;	1628	tmp->nrof += op->nrof;
1793	/* Weight handling gets pretty funky. Since we are adding to	1629	/* Weight handling gets pretty funky. Since we are adding to
1794	* tmp->nrof, we need to increase the weight.	1630	* tmp->nrof, we need to increase the weight.
1795	*/	1631	*/
1796	add_weight (where, op->weight * op->nrof);	1632	add_weight (this, op->weight * op->nrof);
1797	SET_FLAG (op, FLAG_REMOVED);	1633	SET_FLAG (op, FLAG_REMOVED);
1798	free_object (op); /* free the inserted object */	1634	op->destroy (); /* free the inserted object */
1799	op = tmp;	1635	op = tmp;
1800	remove_ob (op); /* and fix old object's links */	1636	op->remove (); /* and fix old object's links */
1801	CLEAR_FLAG (op, FLAG_REMOVED);	1637	CLEAR_FLAG (op, FLAG_REMOVED);
1802	break;	1638	break;
1803	}	1639	}
1804		1640
1805	/* I assume combined objects have no inventory	1641	/* I assume combined objects have no inventory
1806	* We add the weight - this object could have just been removed	1642	* We add the weight - this object could have just been removed
1807	* (if it was possible to merge). calling remove_ob will subtract	1643	* (if it was possible to merge). calling remove_ob will subtract
1808	* the weight, so we need to add it in again, since we actually do	1644	* the weight, so we need to add it in again, since we actually do
1809	* the linking below	1645	* the linking below
1810	*/	1646	*/
1811	add_weight (where, op->weight * op->nrof);	1647	add_weight (this, op->weight * op->nrof);
1812	}	1648	}
1813	else	1649	else
1814	add_weight (where, (op->weight + op->carrying));	1650	add_weight (this, (op->weight + op->carrying));
1815		1651
1816	otmp = is_player_inv (where);	1652	otmp = this->in_player ();
1817	if (otmp && otmp->contr != NULL)	1653	if (otmp && otmp->contr)
1818	{
1819	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1654	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1820	fix_player (otmp);	1655	otmp->update_stats ();
1821	}
1822		1656
1823	op->map = NULL;	1657	op->map = 0;
1824	op->env = where;	1658	op->env = this;
1825	op->above = NULL;	1659	op->above = 0;
1826	op->below = NULL;	1660	op->below = 0;
1827	op->x = 0, op->y = 0;	1661	op->x = 0, op->y = 0;
1828		1662
1829	/* reset the light list and los of the players on the map */	1663	/* reset the light list and los of the players on the map */
1830	if ((op->glow_radius != 0) && where->map)	1664	if ((op->glow_radius != 0) && map)
1831	{	1665	{
1832	#ifdef DEBUG_LIGHTS	1666	#ifdef DEBUG_LIGHTS
1833	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1667	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1834	#endif /* DEBUG_LIGHTS */	1668	#endif /* DEBUG_LIGHTS */
1835	if (MAP_DARKNESS (where->map))	1669	if (map->darkness)
1836	update_all_los (where->map, where->x, where->y);	1670	update_all_los (map, x, y);
1837	}	1671	}
1838		1672
1839	/* Client has no idea of ordering so lets not bother ordering it here.	1673	/* Client has no idea of ordering so lets not bother ordering it here.
1840	* It sure simplifies this function...	1674	* It sure simplifies this function...
1841	*/	1675	*/
1842	if (where->inv == NULL)	1676	if (!inv)
1843	where->inv = op;	1677	inv = op;
1844	else	1678	else
1845	{	1679	{
1846	op->below = where->inv;	1680	op->below = inv;
1847	op->below->above = op;	1681	op->below->above = op;
1848	where->inv = op;	1682	inv = op;
1849	}	1683	}
		1684
		1685	INVOKE_OBJECT (INSERT, this);
		1686
1850	return op;	1687	return op;
1851	}	1688	}
1852		1689
1853	/*	1690	/*
1854	* Checks if any objects has a move_type that matches objects	1691	* Checks if any objects has a move_type that matches objects
…		…
1868	*	1705	*
1869	* MSW 2001-07-08: Check all objects on space, not just those below	1706	* MSW 2001-07-08: Check all objects on space, not just those below
1870	* object being inserted. insert_ob_in_map may not put new objects	1707	* object being inserted. insert_ob_in_map may not put new objects
1871	* on top.	1708	* on top.
1872	*/	1709	*/
1873
1874	int	1710	int
1875	check_move_on (object *op, object *originator)	1711	check_move_on (object *op, object *originator)
1876	{	1712	{
1877	object *tmp;	1713	object *tmp;
1878	maptile *m = op->map;	1714	maptile *m = op->map;
…		…
1905		1741
1906	/* The objects have to be checked from top to bottom.	1742	/* The objects have to be checked from top to bottom.
1907	* Hence, we first go to the top:	1743	* Hence, we first go to the top:
1908	*/	1744	*/
1909		1745
1910	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1746	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1911	{	1747	{
1912	/* Trim the search when we find the first other spell effect	1748	/* Trim the search when we find the first other spell effect
1913	* this helps performance so that if a space has 50 spell objects,	1749	* this helps performance so that if a space has 50 spell objects,
1914	* we don't need to check all of them.	1750	* we don't need to check all of them.
1915	*/	1751	*/
…		…
1970	/*	1806	/*
1971	* present_arch(arch, map, x, y) searches for any objects with	1807	* present_arch(arch, map, x, y) searches for any objects with
1972	* a matching archetype at the given map and coordinates.	1808	* a matching archetype at the given map and coordinates.
1973	* The first matching object is returned, or NULL if none.	1809	* The first matching object is returned, or NULL if none.
1974	*/	1810	*/
1975
1976	object *	1811	object *
1977	present_arch (const archetype *at, maptile *m, int x, int y)	1812	present_arch (const archetype *at, maptile *m, int x, int y)
1978	{	1813	{
1979	object *
1980	tmp;
1981
1982	if (m == NULL || out_of_map (m, x, y))	1814	if (!m || out_of_map (m, x, y))
1983	{	1815	{
1984	LOG (llevError, "Present_arch called outside map.\n");	1816	LOG (llevError, "Present_arch called outside map.\n");
1985	return NULL;	1817	return NULL;
1986	}	1818	}
1987	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1819
		1820	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1988	if (tmp->arch == at)	1821	if (tmp->arch == at)
1989	return tmp;	1822	return tmp;
		1823
1990	return NULL;	1824	return NULL;
1991	}	1825	}
1992		1826
1993	/*	1827	/*
1994	* present(type, map, x, y) searches for any objects with	1828	* present(type, map, x, y) searches for any objects with
1995	* a matching type variable at the given map and coordinates.	1829	* a matching type variable at the given map and coordinates.
1996	* The first matching object is returned, or NULL if none.	1830	* The first matching object is returned, or NULL if none.
1997	*/	1831	*/
1998
1999	object *	1832	object *
2000	present (unsigned char type, maptile *m, int x, int y)	1833	present (unsigned char type, maptile *m, int x, int y)
2001	{	1834	{
2002	object *
2003	tmp;
2004
2005	if (out_of_map (m, x, y))	1835	if (out_of_map (m, x, y))
2006	{	1836	{
2007	LOG (llevError, "Present called outside map.\n");	1837	LOG (llevError, "Present called outside map.\n");
2008	return NULL;	1838	return NULL;
2009	}	1839	}
2010	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1840
		1841	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2011	if (tmp->type == type)	1842	if (tmp->type == type)
2012	return tmp;	1843	return tmp;
		1844
2013	return NULL;	1845	return NULL;
2014	}	1846	}
2015		1847
2016	/*	1848	/*
2017	* present_in_ob(type, object) searches for any objects with	1849	* present_in_ob(type, object) searches for any objects with
2018	* a matching type variable in the inventory of the given object.	1850	* a matching type variable in the inventory of the given object.
2019	* The first matching object is returned, or NULL if none.	1851	* The first matching object is returned, or NULL if none.
2020	*/	1852	*/
2021
2022	object *	1853	object *
2023	present_in_ob (unsigned char type, const object *op)	1854	present_in_ob (unsigned char type, const object *op)
2024	{	1855	{
2025	object *
2026	tmp;
2027
2028	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1856	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2029	if (tmp->type == type)	1857	if (tmp->type == type)
2030	return tmp;	1858	return tmp;
		1859
2031	return NULL;	1860	return NULL;
2032	}	1861	}
2033		1862
2034	/*	1863	/*
2035	* present_in_ob (type, str, object) searches for any objects with	1864	* present_in_ob (type, str, object) searches for any objects with
…		…
2043	* str is the string to match against. Note that we match against	1872	* str is the string to match against. Note that we match against
2044	* the object name, not the archetype name. this is so that the	1873	* the object name, not the archetype name. this is so that the
2045	* spell code can use one object type (force), but change it's name	1874	* spell code can use one object type (force), but change it's name
2046	* to be unique.	1875	* to be unique.
2047	*/	1876	*/
2048
2049	object *	1877	object *
2050	present_in_ob_by_name (int type, const char *str, const object *op)	1878	present_in_ob_by_name (int type, const char *str, const object *op)
2051	{	1879	{
2052	object *
2053	tmp;
2054
2055	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1880	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2056	{
2057	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1881	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2058	return tmp;	1882	return tmp;
2059	}	1883
2060	return NULL;	1884	return 0;
2061	}	1885	}
2062		1886
2063	/*	1887	/*
2064	* present_arch_in_ob(archetype, object) searches for any objects with	1888	* present_arch_in_ob(archetype, object) searches for any objects with
2065	* a matching archetype in the inventory of the given object.	1889	* a matching archetype in the inventory of the given object.
2066	* The first matching object is returned, or NULL if none.	1890	* The first matching object is returned, or NULL if none.
2067	*/	1891	*/
2068
2069	object *	1892	object *
2070	present_arch_in_ob (const archetype *at, const object *op)	1893	present_arch_in_ob (const archetype *at, const object *op)
2071	{	1894	{
2072	object *
2073	tmp;
2074
2075	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1895	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2076	if (tmp->arch == at)	1896	if (tmp->arch == at)
2077	return tmp;	1897	return tmp;
		1898
2078	return NULL;	1899	return NULL;
2079	}	1900	}
2080		1901
2081	/*	1902	/*
2082	* activate recursively a flag on an object inventory	1903	* activate recursively a flag on an object inventory
2083	*/	1904	*/
2084	void	1905	void
2085	flag_inv (object *op, int flag)	1906	flag_inv (object *op, int flag)
2086	{	1907	{
2087	object *
2088	tmp;
2089
2090	if (op->inv)	1908	if (op->inv)
2091	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1909	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2092	{	1910	{
2093	SET_FLAG (tmp, flag);	1911	SET_FLAG (tmp, flag);
2094	flag_inv (tmp, flag);	1912	flag_inv (tmp, flag);
2095	}	1913	}
2096	} /*	1914	}
		1915
		1916	/*
2097	* desactivate recursively a flag on an object inventory	1917	* deactivate recursively a flag on an object inventory
2098	*/	1918	*/
2099	void	1919	void
2100	unflag_inv (object *op, int flag)	1920	unflag_inv (object *op, int flag)
2101	{	1921	{
2102	object *
2103	tmp;
2104
2105	if (op->inv)	1922	if (op->inv)
2106	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1923	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2107	{	1924	{
2108	CLEAR_FLAG (tmp, flag);	1925	CLEAR_FLAG (tmp, flag);
2109	unflag_inv (tmp, flag);	1926	unflag_inv (tmp, flag);
2110	}	1927	}
2111	}	1928	}
…		…
2114	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1931	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2115	* all it's inventory (recursively).	1932	* all it's inventory (recursively).
2116	* If checksums are used, a player will get set_cheat called for	1933	* If checksums are used, a player will get set_cheat called for
2117	* him/her-self and all object carried by a call to this function.	1934	* him/her-self and all object carried by a call to this function.
2118	*/	1935	*/
2119
2120	void	1936	void
2121	set_cheat (object *op)	1937	set_cheat (object *op)
2122	{	1938	{
2123	SET_FLAG (op, FLAG_WAS_WIZ);	1939	SET_FLAG (op, FLAG_WAS_WIZ);
2124	flag_inv (op, FLAG_WAS_WIZ);	1940	flag_inv (op, FLAG_WAS_WIZ);
…		…
2143	* because arch_blocked (now ob_blocked) needs to know the movement type	1959	* because arch_blocked (now ob_blocked) needs to know the movement type
2144	* to know if the space in question will block the object. We can't use	1960	* to know if the space in question will block the object. We can't use
2145	* the archetype because that isn't correct if the monster has been	1961	* the archetype because that isn't correct if the monster has been
2146	* customized, changed states, etc.	1962	* customized, changed states, etc.
2147	*/	1963	*/
2148
2149	int	1964	int
2150	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1965	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2151	{	1966	{
2152	int
2153	i,
2154	index = 0, flag;	1967	int index = 0, flag;
2155	static int
2156	altern[SIZEOFFREE];	1968	int altern[SIZEOFFREE];
2157		1969
2158	for (i = start; i < stop; i++)	1970	for (int i = start; i < stop; i++)
2159	{	1971	{
2160	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1972	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2161	if (!flag)	1973	if (!flag)
2162	altern[index++] = i;	1974	altern [index++] = i;
2163		1975
2164	/* Basically, if we find a wall on a space, we cut down the search size.	1976	/* Basically, if we find a wall on a space, we cut down the search size.
2165	* In this way, we won't return spaces that are on another side of a wall.	1977	* In this way, we won't return spaces that are on another side of a wall.
2166	* This mostly work, but it cuts down the search size in all directions -	1978	* This mostly work, but it cuts down the search size in all directions -
2167	* if the space being examined only has a wall to the north and empty	1979	* if the space being examined only has a wall to the north and empty
2168	* spaces in all the other directions, this will reduce the search space	1980	* spaces in all the other directions, this will reduce the search space
2169	* to only the spaces immediately surrounding the target area, and	1981	* to only the spaces immediately surrounding the target area, and
2170	* won't look 2 spaces south of the target space.	1982	* won't look 2 spaces south of the target space.
2171	*/	1983	*/
2172	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1984	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2173	stop = maxfree[i];	1985	stop = maxfree[i];
2174	}	1986	}
		1987
2175	if (!index)	1988	if (!index)
2176	return -1;	1989	return -1;
		1990
2177	return altern[RANDOM () % index];	1991	return altern[RANDOM () % index];
2178	}	1992	}
2179		1993
2180	/*	1994	/*
2181	* find_first_free_spot(archetype, maptile, x, y) works like	1995	* find_first_free_spot(archetype, maptile, x, y) works like
2182	* find_free_spot(), but it will search max number of squares.	1996	* find_free_spot(), but it will search max number of squares.
2183	* But it will return the first available spot, not a random choice.	1997	* But it will return the first available spot, not a random choice.
2184	* Changed 0.93.2: Have it return -1 if there is no free spot available.	1998	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2185	*/	1999	*/
2186
2187	int	2000	int
2188	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2001	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2189	{	2002	{
2190	int
2191	i;
2192
2193	for (i = 0; i < SIZEOFFREE; i++)	2003	for (int i = 0; i < SIZEOFFREE; i++)
2194	{
2195	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2004	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2196	return i;	2005	return i;
2197	}	2006
2198	return -1;	2007	return -1;
2199	}	2008	}
2200		2009
2201	/*	2010	/*
2202	* The function permute(arr, begin, end) randomly reorders the array	2011	* The function permute(arr, begin, end) randomly reorders the array
2203	* arr[begin..end-1].	2012	* arr[begin..end-1].
		2013	* now uses a fisher-yates shuffle, old permute was broken
2204	*/	2014	*/
2205	static void	2015	static void
2206	permute (int *arr, int begin, int end)	2016	permute (int *arr, int begin, int end)
2207	{	2017	{
2208	int	2018	arr += begin;
2209	i,
2210	j,
2211	tmp,
2212	len;
2213
2214	len = end - begin;	2019	end -= begin;
2215	for (i = begin; i < end; i++)
2216	{
2217	j = begin + RANDOM () % len;
2218		2020
2219	tmp = arr[i];	2021	while (--end)
2220	arr[i] = arr[j];	2022	swap (arr [end], arr [RANDOM () % (end + 1)]);
2221	arr[j] = tmp;
2222	}
2223	}	2023	}
2224		2024
2225	/* new function to make monster searching more efficient, and effective!	2025	/* new function to make monster searching more efficient, and effective!
2226	* This basically returns a randomized array (in the passed pointer) of	2026	* This basically returns a randomized array (in the passed pointer) of
2227	* the spaces to find monsters. In this way, it won't always look for	2027	* the spaces to find monsters. In this way, it won't always look for
…		…
2230	* the 3x3 area will be searched, just not in a predictable order.	2030	* the 3x3 area will be searched, just not in a predictable order.
2231	*/	2031	*/
2232	void	2032	void
2233	get_search_arr (int *search_arr)	2033	get_search_arr (int *search_arr)
2234	{	2034	{
2235	int	2035	int i;
2236	i;
2237		2036
2238	for (i = 0; i < SIZEOFFREE; i++)	2037	for (i = 0; i < SIZEOFFREE; i++)
2239	{
2240	search_arr[i] = i;	2038	search_arr[i] = i;
2241	}
2242		2039
2243	permute (search_arr, 1, SIZEOFFREE1 + 1);	2040	permute (search_arr, 1, SIZEOFFREE1 + 1);
2244	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2041	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2245	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2042	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2246	}	2043	}
…		…
2255	* Perhaps incorrectly, but I'm making the assumption that exclude	2052	* Perhaps incorrectly, but I'm making the assumption that exclude
2256	* is actually want is going to try and move there. We need this info	2053	* is actually want is going to try and move there. We need this info
2257	* because we have to know what movement the thing looking to move	2054	* because we have to know what movement the thing looking to move
2258	* there is capable of.	2055	* there is capable of.
2259	*/	2056	*/
2260
2261	int	2057	int
2262	find_dir (maptile *m, int x, int y, object *exclude)	2058	find_dir (maptile *m, int x, int y, object *exclude)
2263	{	2059	{
2264	int
2265	i,
2266	max = SIZEOFFREE, mflags;	2060	int i, max = SIZEOFFREE, mflags;
2267		2061
2268	sint16 nx, ny;	2062	sint16 nx, ny;
2269	object *	2063	object *tmp;
2270	tmp;
2271	maptile *	2064	maptile *mp;
2272	mp;
2273		2065
2274	MoveType blocked, move_type;	2066	MoveType blocked, move_type;
2275		2067
2276	if (exclude && exclude->head)	2068	if (exclude && exclude->head)
2277	{	2069	{
…		…
2289	mp = m;	2081	mp = m;
2290	nx = x + freearr_x[i];	2082	nx = x + freearr_x[i];
2291	ny = y + freearr_y[i];	2083	ny = y + freearr_y[i];
2292		2084
2293	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2085	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2086
2294	if (mflags & P_OUT_OF_MAP)	2087	if (mflags & P_OUT_OF_MAP)
2295	{
2296	max = maxfree[i];	2088	max = maxfree[i];
2297	}
2298	else	2089	else
2299	{	2090	{
2300	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2091	mapspace &ms = mp->at (nx, ny);
		2092
		2093	blocked = ms.move_block;
2301		2094
2302	if ((move_type & blocked) == move_type)	2095	if ((move_type & blocked) == move_type)
2303	{
2304	max = maxfree[i];	2096	max = maxfree[i];
2305	}
2306	else if (mflags & P_IS_ALIVE)	2097	else if (mflags & P_IS_ALIVE)
2307	{	2098	{
2308	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2099	for (tmp = ms.bot; tmp; tmp = tmp->above)
2309	{	2100	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2310	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2101	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2311	{
2312	break;	2102	break;
2313	}	2103
2314	}
2315	if (tmp)	2104	if (tmp)
2316	{
2317	return freedir[i];	2105	return freedir[i];
2318	}
2319	}	2106	}
2320	}	2107	}
2321	}	2108	}
		2109
2322	return 0;	2110	return 0;
2323	}	2111	}
2324		2112
2325	/*	2113	/*
2326	* distance(object 1, object 2) will return the square of the	2114	* distance(object 1, object 2) will return the square of the
2327	* distance between the two given objects.	2115	* distance between the two given objects.
2328	*/	2116	*/
2329
2330	int	2117	int
2331	distance (const object *ob1, const object *ob2)	2118	distance (const object *ob1, const object *ob2)
2332	{	2119	{
2333	int
2334	i;
2335
2336	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2120	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2337	return i;
2338	}	2121	}
2339		2122
2340	/*	2123	/*
2341	* find_dir_2(delta-x,delta-y) will return a direction in which	2124	* find_dir_2(delta-x,delta-y) will return a direction in which
2342	* an object which has subtracted the x and y coordinates of another	2125	* an object which has subtracted the x and y coordinates of another
2343	* object, needs to travel toward it.	2126	* object, needs to travel toward it.
2344	*/	2127	*/
2345
2346	int	2128	int
2347	find_dir_2 (int x, int y)	2129	find_dir_2 (int x, int y)
2348	{	2130	{
2349	int	2131	int q;
2350	q;
2351		2132
2352	if (y)	2133	if (y)
2353	q = x * 100 / y;	2134	q = x * 100 / y;
2354	else if (x)	2135	else if (x)
2355	q = -300 * x;	2136	q = -300 * x;
…		…
2390	int	2171	int
2391	absdir (int d)	2172	absdir (int d)
2392	{	2173	{
2393	while (d < 1)	2174	while (d < 1)
2394	d += 8;	2175	d += 8;
		2176
2395	while (d > 8)	2177	while (d > 8)
2396	d -= 8;	2178	d -= 8;
		2179
2397	return d;	2180	return d;
2398	}	2181	}
2399		2182
2400	/*	2183	/*
2401	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2184	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2403	*/	2186	*/
2404		2187
2405	int	2188	int
2406	dirdiff (int dir1, int dir2)	2189	dirdiff (int dir1, int dir2)
2407	{	2190	{
2408	int	2191	int d;
2409	d;
2410		2192
2411	d = abs (dir1 - dir2);	2193	d = abs (dir1 - dir2);
2412	if (d > 4)	2194	if (d > 4)
2413	d = 8 - d;	2195	d = 8 - d;
		2196
2414	return d;	2197	return d;
2415	}	2198	}
2416		2199
2417	/* peterm:	2200	/* peterm:
2418	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2201	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2421	* This basically means that if direction is 15, then it could either go	2204	* This basically means that if direction is 15, then it could either go
2422	* direction 4, 14, or 16 to get back to where we are.	2205	* direction 4, 14, or 16 to get back to where we are.
2423	* Moved from spell_util.c to object.c with the other related direction	2206	* Moved from spell_util.c to object.c with the other related direction
2424	* functions.	2207	* functions.
2425	*/	2208	*/
2426
2427	int
2428	reduction_dir[SIZEOFFREE][3] = {	2209	int reduction_dir[SIZEOFFREE][3] = {
2429	{0, 0, 0}, /* 0 */	2210	{0, 0, 0}, /* 0 */
2430	{0, 0, 0}, /* 1 */	2211	{0, 0, 0}, /* 1 */
2431	{0, 0, 0}, /* 2 */	2212	{0, 0, 0}, /* 2 */
2432	{0, 0, 0}, /* 3 */	2213	{0, 0, 0}, /* 3 */
2433	{0, 0, 0}, /* 4 */	2214	{0, 0, 0}, /* 4 */
…		…
2481	* find a path to that monster that we found. If not,	2262	* find a path to that monster that we found. If not,
2482	* we don't bother going toward it. Returns 1 if we	2263	* we don't bother going toward it. Returns 1 if we
2483	* can see a direct way to get it	2264	* can see a direct way to get it
2484	* Modified to be map tile aware -.MSW	2265	* Modified to be map tile aware -.MSW
2485	*/	2266	*/
2486
2487
2488	int	2267	int
2489	can_see_monsterP (maptile *m, int x, int y, int dir)	2268	can_see_monsterP (maptile *m, int x, int y, int dir)
2490	{	2269	{
2491	sint16 dx, dy;	2270	sint16 dx, dy;
2492	int
2493	mflags;	2271	int mflags;
2494		2272
2495	if (dir < 0)	2273	if (dir < 0)
2496	return 0; /* exit condition: invalid direction */	2274	return 0; /* exit condition: invalid direction */
2497		2275
2498	dx = x + freearr_x[dir];	2276	dx = x + freearr_x[dir];
…		…
2511	return 0;	2289	return 0;
2512		2290
2513	/* yes, can see. */	2291	/* yes, can see. */
2514	if (dir < 9)	2292	if (dir < 9)
2515	return 1;	2293	return 1;
		2294
2516	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2295	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2517	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2296	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2297	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2518	}	2298	}
2519
2520
2521		2299
2522	/*	2300	/*
2523	* can_pick(picker, item): finds out if an object is possible to be	2301	* can_pick(picker, item): finds out if an object is possible to be
2524	* picked up by the picker. Returnes 1 if it can be	2302	* picked up by the picker. Returnes 1 if it can be
2525	* picked up, otherwise 0.	2303	* picked up, otherwise 0.
…		…
2536	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2314	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2537	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2315	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2538	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2316	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2539	}	2317	}
2540		2318
2541
2542	/*	2319	/*
2543	* create clone from object to another	2320	* create clone from object to another
2544	*/	2321	*/
2545	object *	2322	object *
2546	object_create_clone (object *asrc)	2323	object_create_clone (object *asrc)
2547	{	2324	{
2548	object *
2549	dst = NULL, *tmp, *src, *part, *prev, *item;	2325	object *dst = 0, *tmp, *src, *part, *prev, *item;
2550		2326
2551	if (!asrc)	2327	if (!asrc)
2552	return NULL;	2328	return 0;
		2329
2553	src = asrc;	2330	src = asrc;
2554	if (src->head)	2331	if (src->head)
2555	src = src->head;	2332	src = src->head;
2556		2333
2557	prev = NULL;	2334	prev = 0;
2558	for (part = src; part; part = part->more)	2335	for (part = src; part; part = part->more)
2559	{	2336	{
2560	tmp = get_object ();	2337	tmp = part->clone ();
2561	copy_object (part, tmp);
2562	tmp->x -= src->x;	2338	tmp->x -= src->x;
2563	tmp->y -= src->y;	2339	tmp->y -= src->y;
		2340
2564	if (!part->head)	2341	if (!part->head)
2565	{	2342	{
2566	dst = tmp;	2343	dst = tmp;
2567	tmp->head = NULL;	2344	tmp->head = 0;
2568	}	2345	}
2569	else	2346	else
2570	{
2571	tmp->head = dst;	2347	tmp->head = dst;
2572	}	2348
2573	tmp->more = NULL;	2349	tmp->more = 0;
		2350
2574	if (prev)	2351	if (prev)
2575	prev->more = tmp;	2352	prev->more = tmp;
		2353
2576	prev = tmp;	2354	prev = tmp;
2577	}	2355	}
2578		2356
2579	for (item = src->inv; item; item = item->below)	2357	for (item = src->inv; item; item = item->below)
2580	insert_ob_in_ob (object_create_clone (item), dst);	2358	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2586	/* Basically, we save the content of the string to a temp file, then call */	2364	/* Basically, we save the content of the string to a temp file, then call */
2587	/* load_object on it. I admit it is a highly inefficient way to make things, */	2365	/* load_object on it. I admit it is a highly inefficient way to make things, */
2588	/* but it was simple to make and allows reusing the load_object function. */	2366	/* but it was simple to make and allows reusing the load_object function. */
2589	/* Remember not to use load_object_str in a time-critical situation. */	2367	/* Remember not to use load_object_str in a time-critical situation. */
2590	/* Also remember that multiparts objects are not supported for now. */	2368	/* Also remember that multiparts objects are not supported for now. */
2591
2592	object *	2369	object *
2593	load_object_str (const char *obstr)	2370	load_object_str (const char *obstr)
2594	{	2371	{
2595	object *op;	2372	object *op;
2596	char filename[MAX_BUF];	2373	char filename[MAX_BUF];
…		…
2606	}	2383	}
2607		2384
2608	fprintf (tempfile, obstr);	2385	fprintf (tempfile, obstr);
2609	fclose (tempfile);	2386	fclose (tempfile);
2610		2387
2611	op = get_object ();	2388	op = object::create ();
2612		2389
2613	object_thawer thawer (filename);	2390	object_thawer thawer (filename);
2614		2391
2615	if (thawer)	2392	if (thawer)
2616	load_object (thawer, op, 0);	2393	load_object (thawer, op, 0);
…		…
2626	* returns NULL if no match.	2403	* returns NULL if no match.
2627	*/	2404	*/
2628	object *	2405	object *
2629	find_obj_by_type_subtype (const object *who, int type, int subtype)	2406	find_obj_by_type_subtype (const object *who, int type, int subtype)
2630	{	2407	{
2631	object *tmp;
2632
2633	for (tmp = who->inv; tmp; tmp = tmp->below)	2408	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2634	if (tmp->type == type && tmp->subtype == subtype)	2409	if (tmp->type == type && tmp->subtype == subtype)
2635	return tmp;	2410	return tmp;
2636		2411
2637	return NULL;	2412	return 0;
2638	}	2413	}
2639		2414
2640	/* If ob has a field named key, return the link from the list,	2415	/* If ob has a field named key, return the link from the list,
2641	* otherwise return NULL.	2416	* otherwise return NULL.
2642	*	2417	*
…		…
2644	* do the desired thing.	2419	* do the desired thing.
2645	*/	2420	*/
2646	key_value *	2421	key_value *
2647	get_ob_key_link (const object *ob, const char *key)	2422	get_ob_key_link (const object *ob, const char *key)
2648	{	2423	{
2649	key_value *link;
2650
2651	for (link = ob->key_values; link != NULL; link = link->next)	2424	for (key_value *link = ob->key_values; link; link = link->next)
2652	if (link->key == key)	2425	if (link->key == key)
2653	return link;	2426	return link;
2654		2427
2655	return NULL;	2428	return 0;
2656	}	2429	}
2657		2430
2658	/*	2431	/*
2659	* Returns the value of op has an extra_field for key, or NULL.	2432	* Returns the value of op has an extra_field for key, or NULL.
2660	*	2433	*
…		…
2700	* Returns TRUE on success.	2473	* Returns TRUE on success.
2701	*/	2474	*/
2702	int	2475	int
2703	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2476	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2704	{	2477	{
2705	key_value *
2706	field = NULL, *last = NULL;	2478	key_value *field = NULL, *last = NULL;
2707		2479
2708	for (field = op->key_values; field != NULL; field = field->next)	2480	for (field = op->key_values; field != NULL; field = field->next)
2709	{	2481	{
2710	if (field->key != canonical_key)	2482	if (field->key != canonical_key)
2711	{	2483	{
…		…
2739	/* IF we get here, key doesn't exist */	2511	/* IF we get here, key doesn't exist */
2740		2512
2741	/* No field, we'll have to add it. */	2513	/* No field, we'll have to add it. */
2742		2514
2743	if (!add_key)	2515	if (!add_key)
2744	{
2745	return FALSE;	2516	return FALSE;
2746	}	2517
2747	/* There isn't any good reason to store a null	2518	/* There isn't any good reason to store a null
2748	* value in the key/value list. If the archetype has	2519	* value in the key/value list. If the archetype has
2749	* this key, then we should also have it, so shouldn't	2520	* this key, then we should also have it, so shouldn't
2750	* be here. If user wants to store empty strings,	2521	* be here. If user wants to store empty strings,
2751	* should pass in ""	2522	* should pass in ""
…		…
2800	}	2571	}
2801	else	2572	else
2802	item = item->env;	2573	item = item->env;
2803	}	2574	}
2804		2575
		2576
		2577	const char *
		2578	object::flag_desc (char *desc, int len) const
		2579	{
		2580	char *p = desc;
		2581	bool first = true;
		2582
		2583	*p = 0;
		2584
		2585	for (int i = 0; i < NUM_FLAGS; i++)
		2586	{
		2587	if (len <= 10) // magic constant!
		2588	{
		2589	snprintf (p, len, ",...");
		2590	break;
		2591	}
		2592
		2593	if (flag [i])
		2594	{
		2595	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2596	len -= cnt;
		2597	p += cnt;
		2598	first = false;
		2599	}
		2600	}
		2601
		2602	return desc;
		2603	}
		2604
2805	// return a suitable string describing an objetc in enough detail to find it	2605	// return a suitable string describing an object in enough detail to find it
2806	const char *	2606	const char *
2807	object::debug_desc (char *info) const	2607	object::debug_desc (char *info) const
2808	{	2608	{
		2609	char flagdesc[512];
2809	char info2[256 * 3];	2610	char info2[256 * 4];
2810	char *p = info;	2611	char *p = info;
2811		2612
2812	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2613	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2813	count,	2614	count, uuid.seq,
2814	&name,	2615	&name,
2815	title ? " " : "",	2616	title ? "\",title:" : "",
2816	title ? (const char *)title : "");	2617	title ? (const char *)title : "",
		2618	flag_desc (flagdesc, 512), type);
2817		2619
2818	if (env)	2620	if (env)
2819	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2621	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2820		2622
2821	if (map)	2623	if (map)
2822	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2624	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2823		2625
2824	return info;	2626	return info;
2825	}	2627	}
2826		2628
2827	const char *	2629	const char *
2828	object::debug_desc () const	2630	object::debug_desc () const
2829	{	2631	{
2830	static char info[256 * 3];	2632	static char info[256 * 4];
2831	return debug_desc (info);	2633	return debug_desc (info);
2832	}	2634	}
2833		2635

Diff Legend

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