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.31 by root, Mon Sep 11 23:33:27 2006 UTC vs.
Revision 1.63 by root, Tue Dec 12 20:53:02 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <skills.h>
35	#include <loader.h>	33	#include <loader.h>
36		34
37	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
38		38
39	object *objects; /* Pointer to the list of used objects */
40	object *active_objects; /* List of active objects that need to be processed */	39	object *active_objects; /* List of active objects that need to be processed */
41		40
42	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44	};	43	};
…		…
50	};	49	};
51	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
52	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54	};	53	};
		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
55		131
56	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57	static int	133	static int
58	compare_ob_value_lists_one (const object *wants, const object *has)	134	compare_ob_value_lists_one (const object *wants, const object *has)
59	{	135	{
…		…
255	{	331	{
256	if (inv->inv)	332	if (inv->inv)
257	sum_weight (inv);	333	sum_weight (inv);
258	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259	}	335	}
		336
260	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
261	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
262	if (op->carrying != sum)	340	if (op->carrying != sum)
263	op->carrying = sum;	341	op->carrying = sum;
		342
264	return sum;	343	return sum;
265	}	344	}
266		345
267	/**	346	/**
268	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
295	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296	* Some error messages.	375	* Some error messages.
297	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
298	*/	377	*/
299		378
300	void	379	char *
301	dump_object2 (object *op)
302	{
303	errmsg[0] = 0;
304	return;
305	//TODO//D#d#
306	#if 0
307	char *cp;
308
309	/* object *tmp;*/
310
311	if (op->arch != NULL)
312	{
313	strcat (errmsg, "arch ");
314	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315	strcat (errmsg, "\n");
316	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317	strcat (errmsg, cp);
318	# if 0
319	/* Don't dump player diffs - they are too long, mostly meaningless, and
320	* will overflow the buffer.
321	* Changed so that we don't dump inventory either. This may
322	* also overflow the buffer.
323	*/
324	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325	strcat (errmsg, cp);
326	for (tmp = op->inv; tmp; tmp = tmp->below)
327	dump_object2 (tmp);
328	# endif
329	strcat (errmsg, "end\n");
330	}
331	else
332	{
333	strcat (errmsg, "Object ");
334	if (op->name == NULL)
335	strcat (errmsg, "(null)");
336	else
337	strcat (errmsg, op->name);
338	strcat (errmsg, "\n");
339	# if 0
340	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341	strcat (errmsg, cp);
342	for (tmp = op->inv; tmp; tmp = tmp->below)
343	dump_object2 (tmp);
344	# endif
345	strcat (errmsg, "end\n");
346	}
347	#endif
348	}
349
350	/*
351	* Dumps an object. Returns output in the static global errmsg array.
352	*/
353
354	void
355	dump_object (object *op)	380	dump_object (object *op)
356	{	381	{
357	if (op == NULL)	382	if (!op)
358	{	383	return strdup ("[NULLOBJ]");
359	strcpy (errmsg, "[NULL pointer]");
360	return;
361	}
362	errmsg[0] = '\0';
363	dump_object2 (op);
364	}
365		384
366	void	385	object_freezer freezer;
367	dump_all_objects (void)	386	save_object (freezer, op, 3);
368	{	387	return freezer.as_string ();
369	object *op;
370
371	for (op = objects; op != NULL; op = op->next)
372	{
373	dump_object (op);
374	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375	}
376	}	388	}
377		389
378	/*	390	/*
379	* get_nearest_part(multi-object, object 2) returns the part of the	391	* get_nearest_part(multi-object, object 2) returns the part of the
380	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
400	*/	412	*/
401		413
402	object *	414	object *
403	find_object (tag_t i)	415	find_object (tag_t i)
404	{	416	{
405	object *op;	417	for (object *op = object::first; op; op = op->next)
406
407	for (op = objects; op != NULL; op = op->next)
408	if (op->count == i)	418	if (op->count == i)
409	break;	419	return op;
		420
410	return op;	421	return 0;
411	}	422	}
412		423
413	/*	424	/*
414	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
415	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
417	*/	428	*/
418		429
419	object *	430	object *
420	find_object_name (const char *str)	431	find_object_name (const char *str)
421	{	432	{
422	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
423	object *op;	434	object *op;
424		435
425	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
426	if (&op->name == name)	437	if (op->name == str_)
427	break;	438	break;
428		439
429	return op;	440	return op;
430	}	441	}
431		442
432	void	443	void
433	free_all_object_data ()	444	free_all_object_data ()
434	{	445	{
435	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436	}
437
438	/*
439	* Returns the object which this object marks as being the owner.
440	* A id-scheme is used to avoid pointing to objects which have been
441	* freed and are now reused. If this is detected, the owner is
442	* set to NULL, and NULL is returned.
443	* Changed 2004-02-12 - if the player is setting at the play again
444	* prompt, he is removed, and we don't want to treat him as an owner of
445	* anything, so check removed flag. I don't expect that this should break
446	* anything - once an object is removed, it is basically dead anyways.
447	*/
448	object *
449	object::get_owner ()
450	{
451	if (!owner
452	|| QUERY_FLAG (owner, FLAG_FREED)
453	|| QUERY_FLAG (owner, FLAG_REMOVED))
454	owner = 0;
455
456	return owner;
457	}	447	}
458		448
459	/*	449	/*
460	* Sets the owner and sets the skill and exp pointers to owner's current	450	* Sets the owner and sets the skill and exp pointers to owner's current
461	* skill and experience objects.	451	* skill and experience objects.
…		…
531		521
532	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
533		523
534	expmul = 1.0;	524	expmul = 1.0;
535	face = blank_face;	525	face = blank_face;
536	attacked_by_count = -1;
537		526
538	if (settings.casting_time)	527	if (settings.casting_time)
539	casting_time = -1;	528	casting_time = -1;
540	}	529	}
541		530
…		…
564		553
565	op2->clone (op);	554	op2->clone (op);
566		555
567	if (is_freed)	556	if (is_freed)
568	SET_FLAG (op, FLAG_FREED);	557	SET_FLAG (op, FLAG_FREED);
		558
569	if (is_removed)	559	if (is_removed)
570	SET_FLAG (op, FLAG_REMOVED);	560	SET_FLAG (op, FLAG_REMOVED);
571		561
572	if (op2->speed < 0)	562	if (op2->speed < 0)
573	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	563	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
…		…
815	update_now = 1;	805	update_now = 1;
816		806
817	if ((move_slow | op->move_slow) != move_slow)	807	if ((move_slow | op->move_slow) != move_slow)
818	update_now = 1;	808	update_now = 1;
819	}	809	}
		810
820	/* if the object is being removed, we can't make intelligent	811	/* if the object is being removed, we can't make intelligent
821	* decisions, because remove_ob can't really pass the object	812	* decisions, because remove_ob can't really pass the object
822	* that is being removed.	813	* that is being removed.
823	*/	814	*/
824	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
836		827
837	if (op->more != NULL)	828	if (op->more != NULL)
838	update_object (op->more, action);	829	update_object (op->more, action);
839	}	830	}
840		831
841	static unordered_vector<object *> mortals;	832	object::vector object::mortals;
842	static std::vector<object *> freed;	833	object::vector object::objects; // not yet used
		834	object *object::first;
843		835
844	void object::free_mortals ()	836	void object::free_mortals ()
845	{	837	{
846	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
847	if ((*i)->refcnt)	839	if ((*i)->refcnt)
848	++i; // further delay freeing	840	++i; // further delay freeing
849	else	841	else
850	{	842	{
851	freed.push_back (*i);//D
852	//delete *i;	843	delete *i;
853	mortals.erase (i);	844	mortals.erase (i);
854	}	845	}
855
856	if (mortals.size())//D
857	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
858	}	846	}
859		847
860	object::object ()	848	object::object ()
861	{	849	{
862	SET_FLAG (this, FLAG_REMOVED);	850	SET_FLAG (this, FLAG_REMOVED);
863		851
864	expmul = 1.0;	852	expmul = 1.0;
865	face = blank_face;	853	face = blank_face;
866	attacked_by_count = -1;
867	}	854	}
868		855
869	object::~object ()	856	object::~object ()
870	{	857	{
871	free_key_values (this);	858	free_key_values (this);
872	}	859	}
873		860
874	void object::link ()	861	void object::link ()
875	{	862	{
876	count = ++ob_count;	863	count = ++ob_count;
		864	uuid = gen_uuid ();
877		865
878	prev = 0;	866	prev = 0;
879	next = objects;	867	next = object::first;
880		868
881	if (objects)	869	if (object::first)
882	objects->prev = this;	870	object::first->prev = this;
883		871
884	objects = this;	872	object::first = this;
885	}	873	}
886		874
887	void object::unlink ()	875	void object::unlink ()
888	{	876	{
889	count = 0;	877	if (this == object::first)
		878	object::first = next;
890		879
891	/* Remove this object from the list of used objects */	880	/* Remove this object from the list of used objects */
892	if (prev)
893	{
894	prev->next = next;	881	if (prev) prev->next = next;
		882	if (next) next->prev = prev;
		883
895	prev = 0;	884	prev = 0;
896	}
897
898	if (next)
899	{
900	next->prev = prev;
901	next = 0;	885	next = 0;
902	}
903
904	if (this == objects)
905	objects = next;
906	}	886	}
907		887
908	object *object::create ()	888	object *object::create ()
909	{	889	{
910	object *
911	op;
912
913	if (freed.empty ())
914	op = new object;	890	object *op = new object;
915	else
916	{
917	// highly annoying, but the only way to get it stable right now
918	op = freed.back ();
919	freed.pop_back ();
920	op->~object ();
921	new ((void *) op) object;
922	}
923
924	op->link ();	891	op->link ();
925	return op;	892	return op;
926	}	893	}
927		894
928	/*	895	/*
…		…
930	* it from the list of used objects, and puts it on the list of	897	* it from the list of used objects, and puts it on the list of
931	* free objects. The IS_FREED() flag is set in the object.	898	* free objects. The IS_FREED() flag is set in the object.
932	* The object must have been removed by remove_ob() first for	899	* The object must have been removed by remove_ob() first for
933	* this function to succeed.	900	* this function to succeed.
934	*	901	*
935	* If free_inventory is set, free inventory as well. Else drop items in	902	* If destroy_inventory is set, free inventory as well. Else drop items in
936	* inventory to the ground.	903	* inventory to the ground.
937	*/	904	*/
938	void object::free (bool free_inventory)	905	void object::destroy (bool destroy_inventory)
939	{	906	{
940	if (QUERY_FLAG (this, FLAG_FREED))	907	if (QUERY_FLAG (this, FLAG_FREED))
941	return;	908	return;
942		909
943	if (!QUERY_FLAG (this, FLAG_REMOVED))
944	remove_ob (this);
945
946	if (QUERY_FLAG (this, FLAG_FRIENDLY))	910	if (QUERY_FLAG (this, FLAG_FRIENDLY))
947	remove_friendly_object (this);	911	remove_friendly_object (this);
948		912
		913	if (!QUERY_FLAG (this, FLAG_REMOVED))
		914	remove ();
		915
949	SET_FLAG (this, FLAG_FREED);	916	SET_FLAG (this, FLAG_FREED);
950		917
951	if (more)	918	if (more)
952	{	919	{
953	more->free (free_inventory);	920	more->destroy (destroy_inventory);
954	more = 0;	921	more = 0;
955	}	922	}
956		923
957	if (inv)	924	if (inv)
958	{	925	{
959	/* Only if the space blocks everything do we not process -	926	/* Only if the space blocks everything do we not process -
960	* if some form of movement is allowed, let objects	927	* if some form of movement is allowed, let objects
961	* drop on that space.	928	* drop on that space.
962	*/	929	*/
963	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	930	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
964	{	931	{
965	object *op = inv;	932	object *op = inv;
966		933
967	while (op)	934	while (op)
968	{	935	{
969	object *tmp = op->below;	936	object *tmp = op->below;
970	op->free (free_inventory);	937	op->destroy (destroy_inventory);
971	op = tmp;	938	op = tmp;
972	}	939	}
973	}	940	}
974	else	941	else
975	{ /* Put objects in inventory onto this space */	942	{ /* Put objects in inventory onto this space */
…		…
977		944
978	while (op)	945	while (op)
979	{	946	{
980	object *tmp = op->below;	947	object *tmp = op->below;
981		948
982	remove_ob (op);	949	op->remove ();
983		950
984	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	951	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
985	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	952	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
986	free_object (op);	953	op->destroy (0);
987	else	954	else
988	{	955	{
989	op->x = x;	956	op->x = x;
990	op->y = y;	957	op->y = y;
991	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	958	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
994	op = tmp;	961	op = tmp;
995	}	962	}
996	}	963	}
997	}	964	}
998		965
		966	// hack to ensure that freed objects still have a valid map
		967	{
		968	static maptile *freed_map; // freed objects are moved here to avoid crashes
		969
		970	if (!freed_map)
		971	{
		972	freed_map = new maptile;
		973
		974	freed_map->name = "/internal/freed_objects_map";
		975	freed_map->width = 3;
		976	freed_map->height = 3;
		977
		978	freed_map->allocate ();
		979	}
		980
		981	map = freed_map;
		982	x = 1;
		983	y = 1;
		984	}
		985
		986	// clear those pointers that likely might have circular references to us
999	owner = 0;	987	owner = 0;
		988	enemy = 0;
		989	attacked_by = 0;
		990
		991	// only relevant for players(?), but make sure of it anyways
		992	contr = 0;
1000		993
1001	/* Remove object from the active list */	994	/* Remove object from the active list */
1002	speed = 0;	995	speed = 0;
1003	update_ob_speed (this);	996	update_ob_speed (this);
1004		997
…		…
1009		1002
1010	/*	1003	/*
1011	* sub_weight() recursively (outwards) subtracts a number from the	1004	* sub_weight() recursively (outwards) subtracts a number from the
1012	* weight of an object (and what is carried by it's environment(s)).	1005	* weight of an object (and what is carried by it's environment(s)).
1013	*/	1006	*/
1014
1015	void	1007	void
1016	sub_weight (object *op, signed long weight)	1008	sub_weight (object *op, signed long weight)
1017	{	1009	{
1018	while (op != NULL)	1010	while (op != NULL)
1019	{	1011	{
1020	if (op->type == CONTAINER)	1012	if (op->type == CONTAINER)
1021	{
1022	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1013	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1023	}	1014
1024	op->carrying -= weight;	1015	op->carrying -= weight;
1025	op = op->env;	1016	op = op->env;
1026	}	1017	}
1027	}	1018	}
1028		1019
1029	/* remove_ob(op):	1020	/* op->remove ():
1030	* This function removes the object op from the linked list of objects	1021	* This function removes the object op from the linked list of objects
1031	* which it is currently tied to. When this function is done, the	1022	* which it is currently tied to. When this function is done, the
1032	* object will have no environment. If the object previously had an	1023	* object will have no environment. If the object previously had an
1033	* environment, the x and y coordinates will be updated to	1024	* environment, the x and y coordinates will be updated to
1034	* the previous environment.	1025	* the previous environment.
1035	* Beware: This function is called from the editor as well!	1026	* Beware: This function is called from the editor as well!
1036	*/	1027	*/
1037
1038	void	1028	void
1039	remove_ob (object *op)	1029	object::remove ()
1040	{	1030	{
		1031	object *tmp, *last = 0;
1041	object *	1032	object *otmp;
1042	tmp, *
1043	last = NULL;
1044	object *
1045	otmp;
1046		1033
1047	tag_t
1048	tag;
1049	int
1050	check_walk_off;	1034	int check_walk_off;
1051	mapstruct *
1052	m;
1053		1035
1054	sint16
1055	x,
1056	y;
1057
1058	if (QUERY_FLAG (op, FLAG_REMOVED))	1036	if (QUERY_FLAG (this, FLAG_REMOVED))
1059	return;	1037	return;
1060		1038
1061	SET_FLAG (op, FLAG_REMOVED);	1039	SET_FLAG (this, FLAG_REMOVED);
1062		1040
1063	if (op->more != NULL)	1041	if (more)
1064	remove_ob (op->more);	1042	more->remove ();
1065		1043
1066	/*	1044	/*
1067	* In this case, the object to be removed is in someones	1045	* In this case, the object to be removed is in someones
1068	* inventory.	1046	* inventory.
1069	*/	1047	*/
1070	if (op->env != NULL)	1048	if (env)
1071	{	1049	{
1072	if (op->nrof)	1050	if (nrof)
1073	sub_weight (op->env, op->weight * op->nrof);	1051	sub_weight (env, weight * nrof);
1074	else	1052	else
1075	sub_weight (op->env, op->weight + op->carrying);	1053	sub_weight (env, weight + carrying);
1076		1054
1077	/* NO_FIX_PLAYER is set when a great many changes are being	1055	/* NO_FIX_PLAYER is set when a great many changes are being
1078	* made to players inventory. If set, avoiding the call	1056	* made to players inventory. If set, avoiding the call
1079	* to save cpu time.	1057	* to save cpu time.
1080	*/	1058	*/
1081	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1059	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1082	fix_player (otmp);	1060	fix_player (otmp);
1083		1061
1084	if (op->above != NULL)	1062	if (above != NULL)
1085	op->above->below = op->below;	1063	above->below = below;
1086	else	1064	else
1087	op->env->inv = op->below;	1065	env->inv = below;
1088		1066
1089	if (op->below != NULL)	1067	if (below != NULL)
1090	op->below->above = op->above;	1068	below->above = above;
1091		1069
1092	/* we set up values so that it could be inserted into	1070	/* we set up values so that it could be inserted into
1093	* the map, but we don't actually do that - it is up	1071	* the map, but we don't actually do that - it is up
1094	* to the caller to decide what we want to do.	1072	* to the caller to decide what we want to do.
1095	*/	1073	*/
1096	op->x = op->env->x, op->y = op->env->y;	1074	x = env->x, y = env->y;
1097	op->map = op->env->map;	1075	map = env->map;
1098	op->above = NULL, op->below = NULL;	1076	above = 0, below = 0;
1099	op->env = NULL;	1077	env = 0;
1100	}	1078	}
1101	else if (op->map)	1079	else if (map)
1102	{	1080	{
1103	x = op->x;
1104	y = op->y;
1105	m = get_map_from_coord (op->map, &x, &y);
1106
1107	if (!m)
1108	{
1109	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1110	op->map->path, op->x, op->y);
1111	/* in old days, we used to set x and y to 0 and continue.
1112	* it seems if we get into this case, something is probablye
1113	* screwed up and should be fixed.
1114	*/
1115	abort ();
1116	}
1117
1118	if (op->map != m)
1119	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1120	op->map->path, m->path, op->x, op->y, x, y);
1121
1122	/* Re did the following section of code - it looks like it had	1081	/* Re did the following section of code - it looks like it had
1123	* lots of logic for things we no longer care about	1082	* lots of logic for things we no longer care about
1124	*/	1083	*/
1125		1084
1126	/* link the object above us */	1085	/* link the object above us */
1127	if (op->above)	1086	if (above)
1128	op->above->below = op->below;	1087	above->below = below;
1129	else	1088	else
1130	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1089	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1131		1090
1132	/* Relink the object below us, if there is one */	1091	/* Relink the object below us, if there is one */
1133	if (op->below)	1092	if (below)
1134	op->below->above = op->above;	1093	below->above = above;
1135	else	1094	else
1136	{	1095	{
1137	/* Nothing below, which means we need to relink map object for this space	1096	/* Nothing below, which means we need to relink map object for this space
1138	* use translated coordinates in case some oddness with map tiling is	1097	* use translated coordinates in case some oddness with map tiling is
1139	* evident	1098	* evident
1140	*/	1099	*/
1141	if (GET_MAP_OB (m, x, y) != op)	1100	if (GET_MAP_OB (map, x, y) != this)
1142	{	1101	{
1143	dump_object (op);	1102	char *dump = dump_object (this);
1144	LOG (llevError,	1103	LOG (llevError,
1145	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1104	"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);
		1105	free (dump);
1146	dump_object (GET_MAP_OB (m, x, y));	1106	dump = dump_object (GET_MAP_OB (map, x, y));
1147	LOG (llevError, "%s\n", errmsg);	1107	LOG (llevError, "%s\n", dump);
		1108	free (dump);
1148	}	1109	}
1149		1110
1150	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1111	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1151	}	1112	}
1152		1113
1153	op->above = 0;	1114	above = 0;
1154	op->below = 0;	1115	below = 0;
1155		1116
1156	if (op->map->in_memory == MAP_SAVING)	1117	if (map->in_memory == MAP_SAVING)
1157	return;	1118	return;
1158		1119
1159	tag = op->count;
1160	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1120	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1161		1121
1162	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1122	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1163	{	1123	{
1164	/* No point updating the players look faces if he is the object	1124	/* No point updating the players look faces if he is the object
1165	* being removed.	1125	* being removed.
1166	*/	1126	*/
1167		1127
1168	if (tmp->type == PLAYER && tmp != op)	1128	if (tmp->type == PLAYER && tmp != this)
1169	{	1129	{
1170	/* If a container that the player is currently using somehow gets	1130	/* If a container that the player is currently using somehow gets
1171	* removed (most likely destroyed), update the player view	1131	* removed (most likely destroyed), update the player view
1172	* appropriately.	1132	* appropriately.
1173	*/	1133	*/
1174	if (tmp->container == op)	1134	if (tmp->container == this)
1175	{	1135	{
1176	CLEAR_FLAG (op, FLAG_APPLIED);	1136	CLEAR_FLAG (this, FLAG_APPLIED);
1177	tmp->container = NULL;	1137	tmp->container = 0;
1178	}	1138	}
1179		1139
1180	tmp->contr->socket.update_look = 1;	1140	tmp->contr->socket.update_look = 1;
1181	}	1141	}
1182		1142
1183	/* See if player moving off should effect something */	1143	/* See if player moving off should effect something */
1184	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1144	if (check_walk_off
		1145	&& ((move_type & tmp->move_off)
		1146	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1185	{	1147	{
1186	move_apply (tmp, op, NULL);	1148	move_apply (tmp, this, 0);
1187		1149
1188	if (was_destroyed (op, tag))	1150	if (destroyed ())
1189	{
1190	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1151	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1191	}
1192	}	1152	}
1193		1153
1194	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1154	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1195		1155
1196	if (tmp->above == tmp)	1156	if (tmp->above == tmp)
1197	tmp->above = NULL;	1157	tmp->above = 0;
1198		1158
1199	last = tmp;	1159	last = tmp;
1200	}	1160	}
1201		1161
1202	/* last == NULL of there are no objects on this space */	1162	/* last == NULL of there are no objects on this space */
1203	if (last == NULL)	1163	if (!last)
1204	{	1164	{
1205	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1165	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1206	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1166	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1207	* those out anyways, and if there are any flags set right now, they won't	1167	* those out anyways, and if there are any flags set right now, they won't
1208	* be correct anyways.	1168	* be correct anyways.
1209	*/	1169	*/
1210	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1170	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1211	update_position (op->map, op->x, op->y);	1171	update_position (map, x, y);
1212	}	1172	}
1213	else	1173	else
1214	update_object (last, UP_OBJ_REMOVE);	1174	update_object (last, UP_OBJ_REMOVE);
1215		1175
1216	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1176	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1217	update_all_los (op->map, op->x, op->y);	1177	update_all_los (map, x, y);
1218	}	1178	}
1219	}	1179	}
1220		1180
1221	/*	1181	/*
1222	* merge_ob(op,top):	1182	* merge_ob(op,top):
…		…
1224	* This function goes through all objects below and including top, and	1184	* This function goes through all objects below and including top, and
1225	* merges op to the first matching object.	1185	* merges op to the first matching object.
1226	* If top is NULL, it is calculated.	1186	* If top is NULL, it is calculated.
1227	* Returns pointer to object if it succeded in the merge, otherwise NULL	1187	* Returns pointer to object if it succeded in the merge, otherwise NULL
1228	*/	1188	*/
1229
1230	object *	1189	object *
1231	merge_ob (object *op, object *top)	1190	merge_ob (object *op, object *top)
1232	{	1191	{
1233	if (!op->nrof)	1192	if (!op->nrof)
1234	return 0;	1193	return 0;
…		…
1244	{	1203	{
1245	top->nrof += op->nrof;	1204	top->nrof += op->nrof;
1246		1205
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1206	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1207	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1208	op->remove ();
1250	free_object (op);	1209	op->destroy (0);
1251	return top;	1210	return top;
1252	}	1211	}
1253	}	1212	}
1254		1213
1255	return NULL;	1214	return 0;
1256	}	1215	}
1257		1216
1258	/*	1217	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1218	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1219	* job preparing multi-part monsters
1261	*/	1220	*/
1262	object *	1221	object *
1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1222	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264	{	1223	{
1265	object *tmp;	1224	object *tmp;
1266		1225
1267	if (op->head)	1226	if (op->head)
1268	op = op->head;	1227	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1255	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1256	* just 'op' otherwise
1298	*/	1257	*/
1299		1258
1300	object *	1259	object *
1301	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1260	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302	{	1261	{
1303	object *tmp, *top, *floor = NULL;	1262	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1263	sint16 x, y;
1305		1264
1306	if (QUERY_FLAG (op, FLAG_FREED))	1265	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1268	return NULL;
1310	}	1269	}
1311		1270
1312	if (m == NULL)	1271	if (m == NULL)
1313	{	1272	{
1314	dump_object (op);	1273	char *dump = dump_object (op);
1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1274	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1275	free (dump);
1316	return op;	1276	return op;
1317	}	1277	}
1318		1278
1319	if (out_of_map (m, op->x, op->y))	1279	if (out_of_map (m, op->x, op->y))
1320	{	1280	{
1321	dump_object (op);	1281	char *dump = dump_object (op);
1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1282	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323	#ifdef MANY_CORES	1283	#ifdef MANY_CORES
1324	/* Better to catch this here, as otherwise the next use of this object	1284	/* Better to catch this here, as otherwise the next use of this object
1325	* is likely to cause a crash. Better to find out where it is getting	1285	* is likely to cause a crash. Better to find out where it is getting
1326	* improperly inserted.	1286	* improperly inserted.
1327	*/	1287	*/
1328	abort ();	1288	abort ();
1329	#endif	1289	#endif
		1290	free (dump);
1330	return op;	1291	return op;
1331	}	1292	}
1332		1293
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1294	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1295	{
1335	dump_object (op);	1296	char *dump = dump_object (op);
1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1297	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1298	free (dump);
1337	return op;	1299	return op;
1338	}	1300	}
1339		1301
1340	if (op->more != NULL)	1302	if (op->more != NULL)
1341	{	1303	{
…		…
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1344	if (op->nrof && !(flag & INS_NO_MERGE))
1383	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1345	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1384	if (CAN_MERGE (op, tmp))	1346	if (CAN_MERGE (op, tmp))
1385	{	1347	{
1386	op->nrof += tmp->nrof;	1348	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1349	tmp->remove ();
1388	free_object (tmp);	1350	tmp->destroy (0);
1389	}	1351	}
1390		1352
1391	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1355
…		…
1582		1544
1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1584	{	1546	{
1585	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1548	{
1587	remove_ob (tmp);	1549	tmp->remove ();
1588	free_object (tmp);	1550	tmp->destroy (0);
1589	}	1551	}
1590	}	1552	}
1591		1553
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1554	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1555
1594	tmp1->x = op->x;	1556	tmp1->x = op->x;
1595	tmp1->y = op->y;	1557	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1558	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1559	}
…		…
1619	}	1581	}
1620		1582
1621	newob = object_create_clone (orig_ob);	1583	newob = object_create_clone (orig_ob);
1622		1584
1623	if ((orig_ob->nrof -= nr) < 1)	1585	if ((orig_ob->nrof -= nr) < 1)
1624	{	1586	orig_ob->destroy (1);
1625	if (!is_removed)
1626	remove_ob (orig_ob);
1627	free_object2 (orig_ob, 1);
1628	}
1629	else if (!is_removed)	1587	else if (!is_removed)
1630	{	1588	{
1631	if (orig_ob->env != NULL)	1589	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1590	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1591	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1697	esrv_send_item (tmp, op);	1655	esrv_send_item (tmp, op);
1698	}	1656	}
1699	}	1657	}
1700	else	1658	else
1701	{	1659	{
1702	remove_ob (op);	1660	op->remove ();
1703	op->nrof = 0;	1661	op->nrof = 0;
1704	if (tmp)	1662	if (tmp)
1705	{	1663	{
1706	esrv_del_item (tmp->contr, op->count);	1664	esrv_del_item (tmp->contr, op->count);
1707	}	1665	}
…		…
1713		1671
1714	if (i < op->nrof)	1672	if (i < op->nrof)
1715	op->nrof -= i;	1673	op->nrof -= i;
1716	else	1674	else
1717	{	1675	{
1718	remove_ob (op);	1676	op->remove ();
1719	op->nrof = 0;	1677	op->nrof = 0;
1720	}	1678	}
1721		1679
1722	/* Since we just removed op, op->above is null */	1680	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1681	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1732		1690
1733	if (op->nrof)	1691	if (op->nrof)
1734	return op;	1692	return op;
1735	else	1693	else
1736	{	1694	{
1737	free_object (op);	1695	op->destroy (0);
1738	return NULL;	1696	return NULL;
1739	}	1697	}
1740	}	1698	}
1741		1699
1742	/*	1700	/*
…		…
1755	op->carrying += weight;	1713	op->carrying += weight;
1756	op = op->env;	1714	op = op->env;
1757	}	1715	}
1758	}	1716	}
1759		1717
		1718	object *
		1719	insert_ob_in_ob (object *op, object *where)
		1720	{
		1721	if (!where)
		1722	{
		1723	char *dump = dump_object (op);
		1724	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1725	free (dump);
		1726	return op;
		1727	}
		1728
		1729	if (where->head)
		1730	{
		1731	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1732	where = where->head;
		1733	}
		1734
		1735	return where->insert (op);
		1736	}
		1737
1760	/*	1738	/*
1761	* insert_ob_in_ob(op,environment):	1739	* env->insert (op)
1762	* This function inserts the object op in the linked list	1740	* This function inserts the object op in the linked list
1763	* inside the object environment.	1741	* inside the object environment.
1764	*	1742	*
1765	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1766	* the inventory at the last position or next to other objects of the same
1767	* type.
1768	* Frank: Now sorted by type, archetype and magic!
1769	*
1770	* The function returns now pointer to inserted item, and return value can	1743	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1744	* be != op, if items are merged. -Tero
1772	*/	1745	*/
1773		1746
1774	object *	1747	object *
1775	insert_ob_in_ob (object *op, object *where)	1748	object::insert (object *op)
1776	{	1749	{
1777	object *	1750	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1751
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1752	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1753	op->remove ();
1783	dump_object (op);
1784	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1785	return op;
1786	}
1787
1788	if (where == NULL)
1789	{
1790	dump_object (op);
1791	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1792	return op;
1793	}
1794
1795	if (where->head)
1796	{
1797	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1798	where = where->head;
1799	}
1800		1754
1801	if (op->more)	1755	if (op->more)
1802	{	1756	{
1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1757	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804	return op;	1758	return op;
…		…
1806		1760
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1761	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1762	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1763	if (op->nrof)
1810	{	1764	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1765	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1766	if (CAN_MERGE (tmp, op))
1813	{	1767	{
1814	/* return the original object and remove inserted object	1768	/* return the original object and remove inserted object
1815	(client needs the original object) */	1769	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1770	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1771	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1772	* tmp->nrof, we need to increase the weight.
1819	*/	1773	*/
1820	add_weight (where, op->weight * op->nrof);	1774	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1775	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1776	op->destroy (); /* free the inserted object */
1823	op = tmp;	1777	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1778	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1779	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1780	break;
1827	}	1781	}
1828		1782
1829	/* I assume combined objects have no inventory	1783	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1784	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1785	* (if it was possible to merge). calling remove_ob will subtract
1832	* the weight, so we need to add it in again, since we actually do	1786	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1787	* the linking below
1834	*/	1788	*/
1835	add_weight (where, op->weight * op->nrof);	1789	add_weight (this, op->weight * op->nrof);
1836	}	1790	}
1837	else	1791	else
1838	add_weight (where, (op->weight + op->carrying));	1792	add_weight (this, (op->weight + op->carrying));
1839		1793
1840	otmp = is_player_inv (where);	1794	otmp = is_player_inv (this);
1841	if (otmp && otmp->contr != NULL)	1795	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1796	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1797	fix_player (otmp);
1845	}
1846		1798
1847	op->map = NULL;	1799	op->map = NULL;
1848	op->env = where;	1800	op->env = this;
1849	op->above = NULL;	1801	op->above = NULL;
1850	op->below = NULL;	1802	op->below = NULL;
1851	op->x = 0, op->y = 0;	1803	op->x = 0, op->y = 0;
1852		1804
1853	/* reset the light list and los of the players on the map */	1805	/* reset the light list and los of the players on the map */
1854	if ((op->glow_radius != 0) && where->map)	1806	if ((op->glow_radius != 0) && map)
1855	{	1807	{
1856	#ifdef DEBUG_LIGHTS	1808	#ifdef DEBUG_LIGHTS
1857	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1809	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858	#endif /* DEBUG_LIGHTS */	1810	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1811	if (MAP_DARKNESS (map))
1860	update_all_los (where->map, where->x, where->y);	1812	update_all_los (map, x, y);
1861	}	1813	}
1862		1814
1863	/* Client has no idea of ordering so lets not bother ordering it here.	1815	/* Client has no idea of ordering so lets not bother ordering it here.
1864	* It sure simplifies this function...	1816	* It sure simplifies this function...
1865	*/	1817	*/
1866	if (where->inv == NULL)	1818	if (!inv)
1867	where->inv = op;	1819	inv = op;
1868	else	1820	else
1869	{	1821	{
1870	op->below = where->inv;	1822	op->below = inv;
1871	op->below->above = op;	1823	op->below->above = op;
1872	where->inv = op;	1824	inv = op;
1873	}	1825	}
		1826
1874	return op;	1827	return op;
1875	}	1828	}
1876		1829
1877	/*	1830	/*
1878	* Checks if any objects has a move_type that matches objects	1831	* Checks if any objects has a move_type that matches objects
…		…
1896	*/	1849	*/
1897		1850
1898	int	1851	int
1899	check_move_on (object *op, object *originator)	1852	check_move_on (object *op, object *originator)
1900	{	1853	{
1901	object *	1854	object *tmp;
1902	tmp;	1855	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1856	int x = op->x, y = op->y;
1909		1857
1910	MoveType	1858	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1859
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1860	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1861	return 0;
1917
1918	tag = op->count;
1919		1862
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1863	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1921	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1864	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1922	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1865	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1866
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1927	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1985	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1928	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1929	{
1987	move_apply (tmp, op, originator);	1930	move_apply (tmp, op, originator);
1988		1931
1989	if (was_destroyed (op, tag))	1932	if (op->destroyed ())
1990	return 1;	1933	return 1;
1991		1934
1992	/* what the person/creature stepped onto has moved the object	1935	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1936	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1937	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1949	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1950	* The first matching object is returned, or NULL if none.
2008	*/	1951	*/
2009		1952
2010	object *	1953	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1954	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1955	{
2013	object *	1956	object *
2014	tmp;	1957	tmp;
2015		1958
2016	if (m == NULL || out_of_map (m, x, y))	1959	if (m == NULL || out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	1972	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1973	* The first matching object is returned, or NULL if none.
2031	*/	1974	*/
2032		1975
2033	object *	1976	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1977	present (unsigned char type, maptile *m, int x, int y)
2035	{	1978	{
2036	object *	1979	object *
2037	tmp;	1980	tmp;
2038		1981
2039	if (out_of_map (m, x, y))	1982	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2122	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2123	* customized, changed states, etc.
2181	*/	2124	*/
2182		2125
2183	int	2126	int
2184	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2127	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185	{	2128	{
2186	int	2129	int
2187	i,	2130	i,
2188	index = 0, flag;	2131	index = 0, flag;
2189	static int	2132	static int
…		…
2210	return -1;	2153	return -1;
2211	return altern[RANDOM () % index];	2154	return altern[RANDOM () % index];
2212	}	2155	}
2213		2156
2214	/*	2157	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2158	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2159	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2160	* But it will return the first available spot, not a random choice.
2218	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2161	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2162	*/
2220		2163
2221	int	2164	int
2222	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2165	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223	{	2166	{
2224	int	2167	int
2225	i;	2168	i;
2226		2169
2227	for (i = 0; i < SIZEOFFREE; i++)	2170	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2234	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2235	* there is capable of.
2293	*/	2236	*/
2294		2237
2295	int	2238	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2239	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2240	{
2298	int	2241	int
2299	i,	2242	i,
2300	max = SIZEOFFREE, mflags;	2243	max = SIZEOFFREE, mflags;
2301		2244
2302	sint16 nx, ny;	2245	sint16 nx, ny;
2303	object *	2246	object *
2304	tmp;	2247	tmp;
2305	mapstruct *	2248	maptile *
2306	mp;	2249	mp;
2307		2250
2308	MoveType blocked, move_type;	2251	MoveType blocked, move_type;
2309		2252
2310	if (exclude && exclude->head)	2253	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2461	* Modified to be map tile aware -.MSW
2519	*/	2462	*/
2520		2463
2521		2464
2522	int	2465	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2466	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2467	{
2525	sint16 dx, dy;	2468	sint16 dx, dy;
2526	int	2469	int
2527	mflags;	2470	mflags;
2528		2471
…		…
2577	* create clone from object to another	2520	* create clone from object to another
2578	*/	2521	*/
2579	object *	2522	object *
2580	object_create_clone (object *asrc)	2523	object_create_clone (object *asrc)
2581	{	2524	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2525	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2526
2585	if (!asrc)	2527	if (!asrc)
2586	return NULL;	2528	return 0;
		2529
2587	src = asrc;	2530	src = asrc;
2588	if (src->head)	2531	if (src->head)
2589	src = src->head;	2532	src = src->head;
2590		2533
2591	prev = NULL;	2534	prev = 0;
2592	for (part = src; part; part = part->more)	2535	for (part = src; part; part = part->more)
2593	{	2536	{
2594	tmp = get_object ();	2537	tmp = get_object ();
2595	copy_object (part, tmp);	2538	copy_object (part, tmp);
2596	tmp->x -= src->x;	2539	tmp->x -= src->x;
2597	tmp->y -= src->y;	2540	tmp->y -= src->y;
		2541
2598	if (!part->head)	2542	if (!part->head)
2599	{	2543	{
2600	dst = tmp;	2544	dst = tmp;
2601	tmp->head = NULL;	2545	tmp->head = 0;
2602	}	2546	}
2603	else	2547	else
2604	{	2548	{
2605	tmp->head = dst;	2549	tmp->head = dst;
2606	}	2550	}
		2551
2607	tmp->more = NULL;	2552	tmp->more = 0;
		2553
2608	if (prev)	2554	if (prev)
2609	prev->more = tmp;	2555	prev->more = tmp;
		2556
2610	prev = tmp;	2557	prev = tmp;
2611	}	2558	}
2612		2559
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2560	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2561	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2562
2619	return dst;	2563	return dst;
2620	}	2564	}
2621		2565
2622	/* return true if the object was destroyed, 0 otherwise */
2623	int
2624	was_destroyed (const object *op, tag_t old_tag)
2625	{
2626	/* checking for FLAG_FREED isn't necessary, but makes this function more
2627	* robust */
2628	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2629	}
2630
2631	/* GROS - Creates an object using a string representing its content. */	2566	/* GROS - Creates an object using a string representing its content. */
2632
2633	/* Basically, we save the content of the string to a temp file, then call */	2567	/* Basically, we save the content of the string to a temp file, then call */
2634
2635	/* load_object on it. I admit it is a highly inefficient way to make things, */	2568	/* load_object on it. I admit it is a highly inefficient way to make things, */
2636
2637	/* but it was simple to make and allows reusing the load_object function. */	2569	/* but it was simple to make and allows reusing the load_object function. */
2638
2639	/* Remember not to use load_object_str in a time-critical situation. */	2570	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2571	/* Also remember that multiparts objects are not supported for now. */
2642		2572
2643	object *	2573	object *
2644	load_object_str (const char *obstr)	2574	load_object_str (const char *obstr)
2645	{	2575	{
2646	object *	2576	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2577	char filename[MAX_BUF];
2650		2578
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2579	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2580
2653	FILE *
2654	tempfile = fopen (filename, "w");	2581	FILE *tempfile = fopen (filename, "w");
2655		2582
2656	if (tempfile == NULL)	2583	if (tempfile == NULL)
2657	{	2584	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2585	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2586	return NULL;
2660	};	2587	}
		2588
2661	fprintf (tempfile, obstr);	2589	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2590	fclose (tempfile);
2663		2591
2664	op = get_object ();	2592	op = get_object ();
2665		2593
…		…
2679	* returns NULL if no match.	2607	* returns NULL if no match.
2680	*/	2608	*/
2681	object *	2609	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2610	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2611	{
2684	object *	2612	object *tmp;
2685	tmp;
2686		2613
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2614	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2615	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2616	return tmp;
2690		2617
…		…
2698	* do the desired thing.	2625	* do the desired thing.
2699	*/	2626	*/
2700	key_value *	2627	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2628	get_ob_key_link (const object *ob, const char *key)
2702	{	2629	{
2703	key_value *	2630	key_value *link;
2704	link;
2705		2631
2706	for (link = ob->key_values; link != NULL; link = link->next)	2632	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2633	if (link->key == key)
2709	{
2710	return link;	2634	return link;
2711	}
2712	}
2713		2635
2714	return NULL;	2636	return NULL;
2715	}	2637	}
2716		2638
2717	/*	2639	/*
…		…
2722	* The returned string is shared.	2644	* The returned string is shared.
2723	*/	2645	*/
2724	const char *	2646	const char *
2725	get_ob_key_value (const object *op, const char *const key)	2647	get_ob_key_value (const object *op, const char *const key)
2726	{	2648	{
2727	key_value *	2649	key_value *link;
2728	link;	2650	shstr_cmp canonical_key (key);
2729	const char *
2730	canonical_key;
2731		2651
2732	canonical_key = shstr::find (key);
2733
2734	if (canonical_key == NULL)	2652	if (!canonical_key)
2735	{	2653	{
2736	/* 1. There being a field named key on any object	2654	/* 1. There being a field named key on any object
2737	* implies there'd be a shared string to find.	2655	* implies there'd be a shared string to find.
2738	* 2. Since there isn't, no object has this field.	2656	* 2. Since there isn't, no object has this field.
2739	* 3. Therefore, *this* object doesn't have this field.	2657	* 3. Therefore, *this* object doesn't have this field.
2740	*/	2658	*/
2741	return NULL;	2659	return 0;
2742	}	2660	}
2743		2661
2744	/* This is copied from get_ob_key_link() above -	2662	/* This is copied from get_ob_key_link() above -
2745	* only 4 lines, and saves the function call overhead.	2663	* only 4 lines, and saves the function call overhead.
2746	*/	2664	*/
2747	for (link = op->key_values; link != NULL; link = link->next)	2665	for (link = op->key_values; link; link = link->next)
2748	{
2749	if (link->key == canonical_key)	2666	if (link->key == canonical_key)
2750	{
2751	return link->value;	2667	return link->value;
2752	}	2668
2753	}
2754	return NULL;	2669	return 0;
2755	}	2670	}
2756		2671
2757		2672
2758	/*	2673	/*
2759	* Updates the canonical_key in op to value.	2674	* Updates the canonical_key in op to value.
…		…
2845	shstr key_ (key);	2760	shstr key_ (key);
2846		2761
2847	return set_ob_key_value_s (op, key_, value, add_key);	2762	return set_ob_key_value_s (op, key_, value, add_key);
2848	}	2763	}
2849		2764
		2765	object::depth_iterator::depth_iterator (object *container)
		2766	: iterator_base (container)
		2767	{
		2768	while (item->inv)
		2769	item = item->inv;
		2770	}
		2771
2850	void	2772	void
2851	object::deep_iterator::next ()	2773	object::depth_iterator::next ()
2852	{	2774	{
2853	if (item->inv)
2854	item = item->inv;
2855	else if (item->below)	2775	if (item->below)
		2776	{
2856	item = item->below;	2777	item = item->below;
		2778
		2779	while (item->inv)
		2780	item = item->inv;
		2781	}
2857	else	2782	else
2858	item = item->env->below;	2783	item = item->env;
2859	}	2784	}
		2785
		2786	// return a suitable string describing an objetc in enough detail to find it
		2787	const char *
		2788	object::debug_desc (char *info) const
		2789	{
		2790	char info2[256 * 3];
		2791	char *p = info;
		2792
		2793	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2794	count,
		2795	&name,
		2796	title ? " " : "",
		2797	title ? (const char *)title : "");
		2798
		2799	if (env)
		2800	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2801
		2802	if (map)
		2803	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2804
		2805	return info;
		2806	}
		2807
		2808	const char *
		2809	object::debug_desc () const
		2810	{
		2811	static char info[256 * 3];
		2812	return debug_desc (info);
		2813	}
		2814

Diff Legend

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