[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.141 by root, Sun Apr 29 21:44:34 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	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
9	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
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		21	*
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
27	variable. */	27	variable. */
28	#include <global.h>	28	#include <global.h>
37		37
38	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
39	static UUID uuid;	39	static UUID uuid;
40	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
41		41
42	object active_objects; / List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
43		44
44	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,
45	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
46	};	47	};
47	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,
…		…
312		313
313	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
314	return 1;	315	return 1;
315	}	316	}
316		317
		318	void
		319	player::set_range (rangetype r)
		320	{
		321	shoottype = r;
		322	}
		323
317	/*	324	/*
318	* sum_weight() is a recursive function which calculates the weight	325	* sum_weight() is a recursive function which calculates the weight
319	* an object is carrying. It goes through in figures out how much	326	* an object is carrying. It goes through in figures out how much
320	* containers are carrying, and sums it up.	327	* containers are carrying, and sums it up.
321	*/	328	*/
…		…
356	/*	363	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	364	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	365	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	366	* The result of the dump is stored in the static global errmsg array.
360	*/	367	*/
361
362	char *	368	char *
363	dump_object (object *op)	369	dump_object (object *op)
364	{	370	{
365	if (!op)	371	if (!op)
366	return strdup ("[NULLOBJ]");	372	return strdup ("[NULLOBJ]");
367		373
368	object_freezer freezer;	374	object_freezer freezer;
369	save_object (freezer, op, 1);	375	op->write (freezer);
370	return freezer.as_string ();	376	return freezer.as_string ();
371	}	377	}
372		378
373	/*	379	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	380	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	397	}
392		398
393	/*	399	/*
394	* Returns the object which has the count-variable equal to the argument.	400	* Returns the object which has the count-variable equal to the argument.
395	*/	401	*/
396
397	object *	402	object *
398	find_object (tag_t i)	403	find_object (tag_t i)
399	{	404	{
400	for (object *op = object::first; op; op = op->next)	405	for_all_objects (op)
401	if (op->count == i)	406	if (op->count == i)
402	return op;	407	return op;
403		408
404	return 0;	409	return 0;
405	}	410	}
406		411
407	/*	412	/*
408	* Returns the first object which has a name equal to the argument.	413	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	414	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	415	* Enables features like "patch <name-of-other-player> food 999"
411	*/	416	*/
412
413	object *	417	object *
414	find_object_name (const char *str)	418	find_object_name (const char *str)
415	{	419	{
416	shstr_cmp str_ (str);	420	shstr_cmp str_ (str);
417	object *op;	421	object *op;
418		422
419	for (op = object::first; op != NULL; op = op->next)	423	for_all_objects (op)
420	if (op->name == str_)	424	if (op->name == str_)
421	break;	425	break;
422		426
423	return op;	427	return op;
424	}	428	}
…		…
456	* refcounts and freeing the links.	460	* refcounts and freeing the links.
457	*/	461	*/
458	static void	462	static void
459	free_key_values (object *op)	463	free_key_values (object *op)
460	{	464	{
461	for (key_value *i = op->key_values; i != 0;)	465	for (key_value *i = op->key_values; i; )
462	{	466	{
463	key_value *next = i->next;	467	key_value *next = i->next;
464	delete i;	468	delete i;
465		469
466	i = next;	470	i = next;
467	}	471	}
468		472
469	op->key_values = 0;	473	op->key_values = 0;
470	}	474	}
471		475
472	/*	476	object &
473	* copy_to first frees everything allocated by the dst object,	477	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	478	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	479	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	480	bool is_removed = flag [FLAG_REMOVED];
485		481
486	(object_copy )dst = *this;	482	(object_copy )this = src;
487		483
488	if (is_freed)	484	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	485	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		486
497	/* Copy over key_values, if any. */	487	/* Copy over key_values, if any. */
498	if (key_values)	488	if (src.key_values)
499	{	489	{
500	key_value *tail = 0;	490	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	491	key_values = 0;
504		492
505	for (i = key_values; i; i = i->next)	493	for (key_value *i = src.key_values; i; i = i->next)
506	{	494	{
507	key_value *new_link = new key_value;	495	key_value *new_link = new key_value;
508		496
509	new_link->next = 0;	497	new_link->next = 0;
510	new_link->key = i->key;	498	new_link->key = i->key;
511	new_link->value = i->value;	499	new_link->value = i->value;
512		500
513	/* Try and be clever here, too. */	501	/* Try and be clever here, too. */
514	if (!dst->key_values)	502	if (!key_values)
515	{	503	{
516	dst->key_values = new_link;	504	key_values = new_link;
517	tail = new_link;	505	tail = new_link;
518	}	506	}
519	else	507	else
520	{	508	{
521	tail->next = new_link;	509	tail->next = new_link;
522	tail = new_link;	510	tail = new_link;
523	}	511	}
524	}	512	}
525	}	513	}
		514	}
		515
		516	/*
		517	* copy_to first frees everything allocated by the dst object,
		518	* and then copies the contents of itself into the second
		519	* object, allocating what needs to be allocated. Basically, any
		520	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		521	* if the first object is freed, the pointers in the new object
		522	* will point at garbage.
		523	*/
		524	void
		525	object::copy_to (object *dst)
		526	{
		527	dst = this;
		528
		529	if (speed < 0)
		530	dst->speed_left = speed_left - rndm ();
526		531
527	dst->set_speed (dst->speed);	532	dst->set_speed (dst->speed);
		533	}
		534
		535	void
		536	object::instantiate ()
		537	{
		538	if (!uuid.seq) // HACK
		539	uuid = gen_uuid ();
		540
		541	speed_left = -0.1f;
		542	/* copy the body_info to the body_used - this is only really
		543	* need for monsters, but doesn't hurt to do it for everything.
		544	* by doing so, when a monster is created, it has good starting
		545	* values for the body_used info, so when items are created
		546	* for it, they can be properly equipped.
		547	*/
		548	memcpy (body_used, body_info, sizeof (body_used));
		549
		550	attachable::instantiate ();
528	}	551	}
529		552
530	object *	553	object *
531	object::clone ()	554	object::clone ()
532	{	555	{
…		…
590	* UP_OBJ_FACE: only the objects face has changed.	613	* UP_OBJ_FACE: only the objects face has changed.
591	*/	614	*/
592	void	615	void
593	update_object (object *op, int action)	616	update_object (object *op, int action)
594	{	617	{
595	MoveType move_on, move_off, move_block, move_slow;
596
597	if (op == NULL)	618	if (op == NULL)
598	{	619	{
599	/* this should never happen */	620	/* this should never happen */
600	LOG (llevDebug, "update_object() called for NULL object.\n");	621	LOG (llevDebug, "update_object() called for NULL object.\n");
601	return;	622	return;
…		…
661		682
662	if (op->more)	683	if (op->more)
663	update_object (op->more, action);	684	update_object (op->more, action);
664	}	685	}
665		686
666	object *object::first;
667
668	object::object ()	687	object::object ()
669	{	688	{
670	SET_FLAG (this, FLAG_REMOVED);	689	SET_FLAG (this, FLAG_REMOVED);
671		690
672	expmul = 1.0;	691	expmul = 1.0;
673	face = blank_face;	692	face = blank_face;
674	}	693	}
675		694
676	object::~object ()	695	object::~object ()
677	{	696	{
		697	unlink ();
		698
678	free_key_values (this);	699	free_key_values (this);
679	}	700	}
680		701
		702	static int object_count;
		703
681	void object::link ()	704	void object::link ()
682	{	705	{
683	count = ++ob_count;	706	assert (!index);//D
684	uuid = gen_uuid ();	707	uuid = gen_uuid ();
		708	count = ++object_count;
685		709
686	prev = 0;	710	refcnt_inc ();
687	next = object::first;	711	objects.insert (this);
688
689	if (object::first)
690	object::first->prev = this;
691
692	object::first = this;
693	}	712	}
694		713
695	void object::unlink ()	714	void object::unlink ()
696	{	715	{
697	if (this == object::first)	716	if (!index)
698	object::first = next;	717	return;
699		718
700	/* Remove this object from the list of used objects */	719	objects.erase (this);
701	if (prev) prev->next = next;	720	refcnt_dec ();
702	if (next) next->prev = prev;
703
704	prev = 0;
705	next = 0;
706	}
707
708	bool
709	object::active () const
710	{
711	return active_next \|\| active_prev \|\| this == active_objects;
712	}	721	}
713		722
714	void	723	void
715	object::activate ()	724	object::activate ()
716	{	725	{
717	/* If already on active list, don't do anything */	726	/* If already on active list, don't do anything */
718	if (active ())	727	if (active)
719	return;	728	return;
720		729
721	if (has_active_speed ())	730	if (has_active_speed ())
722	{	731	actives.insert (this);
723	/* process_events() expects us to insert the object at the beginning
724	* of the list. */
725	active_next = active_objects;
726
727	if (active_next)
728	active_next->active_prev = this;
729
730	active_objects = this;
731	}
732	}	732	}
733		733
734	void	734	void
735	object::activate_recursive ()	735	object::activate_recursive ()
736	{	736	{
…		…
750	*/	750	*/
751	void	751	void
752	object::deactivate ()	752	object::deactivate ()
753	{	753	{
754	/* If not on the active list, nothing needs to be done */	754	/* If not on the active list, nothing needs to be done */
755	if (!active ())	755	if (!active)
756	return;	756	return;
757		757
758	if (active_prev == 0)	758	actives.erase (this);
759	{
760	active_objects = active_next;
761	if (active_next)
762	active_next->active_prev = 0;
763	}
764	else
765	{
766	active_prev->active_next = active_next;
767	if (active_next)
768	active_next->active_prev = active_prev;
769	}
770
771	active_next = 0;
772	active_prev = 0;
773	}	759	}
774		760
775	void	761	void
776	object::deactivate_recursive ()	762	object::deactivate_recursive ()
777	{	763	{
…		…
811	* drop on that space.	797	* drop on that space.
812	*/	798	*/
813	if (!drop_to_ground	799	if (!drop_to_ground
814	\|\| !map	800	\|\| !map
815	\|\| map->in_memory != MAP_IN_MEMORY	801	\|\| map->in_memory != MAP_IN_MEMORY
		802	\|\| map->nodrop
816	\|\| ms ().move_block == MOVE_ALL)	803	\|\| ms ().move_block == MOVE_ALL)
817	{	804	{
818	while (inv)	805	while (inv)
819	{	806	{
820	inv->destroy_inv (drop_to_ground);	807	inv->destroy_inv (drop_to_ground);
…		…
829		816
830	if (op->flag [FLAG_STARTEQUIP]	817	if (op->flag [FLAG_STARTEQUIP]
831	\|\| op->flag [FLAG_NO_DROP]	818	\|\| op->flag [FLAG_NO_DROP]
832	\|\| op->type == RUNE	819	\|\| op->type == RUNE
833	\|\| op->type == TRAP	820	\|\| op->type == TRAP
834	\|\| op->flag [FLAG_IS_A_TEMPLATE])	821	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		822	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
835	op->destroy ();	823	op->destroy ();
836	else	824	else
837	map->insert (op, x, y);	825	map->insert (op, x, y);
838	}	826	}
839	}	827	}
…		…
847	}	835	}
848		836
849	void	837	void
850	object::do_destroy ()	838	object::do_destroy ()
851	{	839	{
		840	attachable::do_destroy ();
		841
852	if (flag [FLAG_IS_LINKED])	842	if (flag [FLAG_IS_LINKED])
853	remove_button_link (this);	843	remove_button_link (this);
854		844
855	if (flag [FLAG_FRIENDLY])	845	if (flag [FLAG_FRIENDLY])
856	remove_friendly_object (this);	846	remove_friendly_object (this);
857		847
858	if (!flag [FLAG_REMOVED])	848	if (!flag [FLAG_REMOVED])
859	remove ();	849	remove ();
860		850
861	if (flag [FLAG_FREED])	851	destroy_inv (true);
862	return;
863		852
864	set_speed (0);	853	deactivate ();
		854	unlink ();
865		855
866	flag [FLAG_FREED] = 1;	856	flag [FLAG_FREED] = 1;
867
868	attachable::do_destroy ();
869
870	destroy_inv (true);
871	unlink ();
872		857
873	// hack to ensure that freed objects still have a valid map	858	// hack to ensure that freed objects still have a valid map
874	{	859	{
875	static maptile *freed_map; // freed objects are moved here to avoid crashes	860	static maptile *freed_map; // freed objects are moved here to avoid crashes
876		861
…		…
901		886
902	// clear those pointers that likely might have circular references to us	887	// clear those pointers that likely might have circular references to us
903	owner = 0;	888	owner = 0;
904	enemy = 0;	889	enemy = 0;
905	attacked_by = 0;	890	attacked_by = 0;
906
907	// only relevant for players(?), but make sure of it anyways
908	contr = 0;
909	}	891	}
910		892
911	void	893	void
912	object::destroy (bool destroy_inventory)	894	object::destroy (bool destroy_inventory)
913	{	895	{
…		…
941	* This function removes the object op from the linked list of objects	923	* This function removes the object op from the linked list of objects
942	* which it is currently tied to. When this function is done, the	924	* which it is currently tied to. When this function is done, the
943	* object will have no environment. If the object previously had an	925	* object will have no environment. If the object previously had an
944	* environment, the x and y coordinates will be updated to	926	* environment, the x and y coordinates will be updated to
945	* the previous environment.	927	* the previous environment.
946	* Beware: This function is called from the editor as well!
947	*/	928	*/
948	void	929	void
949	object::remove ()	930	object::do_remove ()
950	{	931	{
951	object tmp, last = 0;	932	object tmp, last = 0;
952	object *otmp;	933	object *otmp;
953		934
954	if (QUERY_FLAG (this, FLAG_REMOVED))	935	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
997	}	978	}
998	else if (map)	979	else if (map)
999	{	980	{
1000	if (type == PLAYER)	981	if (type == PLAYER)
1001	{	982	{
		983	// leaving a spot always closes any open container on the ground
		984	if (container && !container->env)
		985	// this causes spurious floorbox updates, but it ensures
		986	// that the CLOSE event is being sent.
		987	close_container ();
		988
1002	--map->players;	989	--map->players;
1003	map->touch ();	990	map->touch ();
1004	}	991	}
1005		992
1006	map->dirty = true;	993	map->dirty = true;
		994	mapspace &ms = this->ms ();
1007		995
1008	/* link the object above us */	996	/* link the object above us */
1009	if (above)	997	if (above)
1010	above->below = below;	998	above->below = below;
1011	else	999	else
1012	map->at (x, y).top = below; /* we were top, set new top */	1000	ms.top = below; /* we were top, set new top */
1013		1001
1014	/* Relink the object below us, if there is one */	1002	/* Relink the object below us, if there is one */
1015	if (below)	1003	if (below)
1016	below->above = above;	1004	below->above = above;
1017	else	1005	else
…		…
1019	/* Nothing below, which means we need to relink map object for this space	1007	/* Nothing below, which means we need to relink map object for this space
1020	* use translated coordinates in case some oddness with map tiling is	1008	* use translated coordinates in case some oddness with map tiling is
1021	* evident	1009	* evident
1022	*/	1010	*/
1023	if (GET_MAP_OB (map, x, y) != this)	1011	if (GET_MAP_OB (map, x, y) != this)
1024	{
1025	char *dump = dump_object (this);
1026	LOG (llevError,
1027	"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);	1012	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1028	free (dump);
1029	dump = dump_object (GET_MAP_OB (map, x, y));
1030	LOG (llevError, "%s\n", dump);
1031	free (dump);
1032	}
1033		1013
1034	map->at (x, y).bot = above; /* goes on above it. */	1014	ms.bot = above; /* goes on above it. */
1035	}	1015	}
1036		1016
1037	above = 0;	1017	above = 0;
1038	below = 0;	1018	below = 0;
1039		1019
1040	if (map->in_memory == MAP_SAVING)	1020	if (map->in_memory == MAP_SAVING)
1041	return;	1021	return;
1042		1022
1043	int check_walk_off = !flag [FLAG_NO_APPLY];	1023	int check_walk_off = !flag [FLAG_NO_APPLY];
1044		1024
1045	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1025	for (tmp = ms.bot; tmp; tmp = tmp->above)
1046	{	1026	{
1047	/* No point updating the players look faces if he is the object	1027	/* No point updating the players look faces if he is the object
1048	* being removed.	1028	* being removed.
1049	*/	1029	*/
1050		1030
…		…
1130	}	1110	}
1131		1111
1132	return 0;	1112	return 0;
1133	}	1113	}
1134		1114
		1115	void
		1116	object::expand_tail ()
		1117	{
		1118	if (more)
		1119	return;
		1120
		1121	object *prev = this;
		1122
		1123	for (archetype *at = arch->more; at; at = at->more)
		1124	{
		1125	object *op = arch_to_object (at);
		1126
		1127	op->name = name;
		1128	op->name_pl = name_pl;
		1129	op->title = title;
		1130
		1131	op->head = this;
		1132	prev->more = op;
		1133
		1134	prev = op;
		1135	}
		1136	}
		1137
1135	/*	1138	/*
1136	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1139	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1137	* job preparing multi-part monsters	1140	* job preparing multi-part monsters.
1138	*/	1141	*/
1139	object *	1142	object *
1140	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1143	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1141	{	1144	{
1142	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1145	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1169	* just 'op' otherwise	1172	* just 'op' otherwise
1170	*/	1173	*/
1171	object *	1174	object *
1172	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1175	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1173	{	1176	{
		1177	assert (!op->flag [FLAG_FREED]);
		1178
1174	object tmp, top, *floor = NULL;	1179	object tmp, top, *floor = NULL;
1175	sint16 x, y;
1176		1180
1177	if (QUERY_FLAG (op, FLAG_FREED))	1181	op->remove ();
1178	{
1179	LOG (llevError, "Trying to insert freed object!\n");
1180	return NULL;
1181	}
1182		1182
1183	if (!m)	1183	#if 0
1184	{	1184	if (!m->active != !op->active)
1185	char *dump = dump_object (op);	1185	if (m->active)
1186	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1186	op->activate_recursive ();
1187	free (dump);	1187	else
1188	return op;	1188	op->deactivate_recursive ();
1189	}	1189	#endif
1190		1190
1191	if (out_of_map (m, op->x, op->y))	1191	if (out_of_map (m, op->x, op->y))
1192	{	1192	{
1193	char *dump = dump_object (op);
1194	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1193	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1195	#ifdef MANY_CORES	1194	#ifdef MANY_CORES
1196	/* Better to catch this here, as otherwise the next use of this object	1195	/* Better to catch this here, as otherwise the next use of this object
1197	* is likely to cause a crash. Better to find out where it is getting	1196	* is likely to cause a crash. Better to find out where it is getting
1198	* improperly inserted.	1197	* improperly inserted.
1199	*/	1198	*/
1200	abort ();	1199	abort ();
1201	#endif	1200	#endif
1202	free (dump);
1203	return op;	1201	return op;
1204	}	1202	}
1205		1203
1206	if (!QUERY_FLAG (op, FLAG_REMOVED))
1207	{
1208	char *dump = dump_object (op);
1209	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1210	free (dump);
1211	return op;
1212	}
1213
1214	if (op->more)
1215	{
1216	/* The part may be on a different map. */
1217
1218	object *more = op->more;	1204	if (object *more = op->more)
1219		1205	{
1220	/* We really need the caller to normalise coordinates - if
1221	* we set the map, that doesn't work if the location is within
1222	* a map and this is straddling an edge. So only if coordinate
1223	* is clear wrong do we normalise it.
1224	*/
1225	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1226	more->map = get_map_from_coord (m, &more->x, &more->y);
1227	else if (!more->map)
1228	{
1229	/* For backwards compatibility - when not dealing with tiled maps,
1230	* more->map should always point to the parent.
1231	*/
1232	more->map = m;
1233	}
1234
1235	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1206	if (!insert_ob_in_map (more, m, originator, flag))
1236	{	1207	{
1237	if (!op->head)	1208	if (!op->head)
1238	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1209	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1239		1210
1240	return 0;	1211	return 0;
…		…
1245		1216
1246	/* Ideally, the caller figures this out. However, it complicates a lot	1217	/* Ideally, the caller figures this out. However, it complicates a lot
1247	* of areas of callers (eg, anything that uses find_free_spot would now	1218	* of areas of callers (eg, anything that uses find_free_spot would now
1248	* need extra work	1219	* need extra work
1249	*/	1220	*/
1250	op->map = get_map_from_coord (m, &op->x, &op->y);	1221	if (!xy_normalise (m, op->x, op->y))
1251	x = op->x;	1222	return 0;
1252	y = op->y;	1223
		1224	op->map = m;
		1225	mapspace &ms = op->ms ();
1253		1226
1254	/* this has to be done after we translate the coordinates.	1227	/* this has to be done after we translate the coordinates.
1255	*/	1228	*/
1256	if (op->nrof && !(flag & INS_NO_MERGE))	1229	if (op->nrof && !(flag & INS_NO_MERGE))
1257	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1230	for (tmp = ms.bot; tmp; tmp = tmp->above)
1258	if (object::can_merge (op, tmp))	1231	if (object::can_merge (op, tmp))
1259	{	1232	{
1260	op->nrof += tmp->nrof;	1233	op->nrof += tmp->nrof;
1261	tmp->destroy ();	1234	tmp->destroy ();
1262	}	1235	}
…		…
1279	op->below = originator->below;	1252	op->below = originator->below;
1280		1253
1281	if (op->below)	1254	if (op->below)
1282	op->below->above = op;	1255	op->below->above = op;
1283	else	1256	else
1284	op->ms ().bot = op;	1257	ms.bot = op;
1285		1258
1286	/* since below originator, no need to update top */	1259	/* since below originator, no need to update top */
1287	originator->below = op;	1260	originator->below = op;
1288	}	1261	}
1289	else	1262	else
1290	{	1263	{
		1264	top = ms.bot;
		1265
1291	/* If there are other objects, then */	1266	/* If there are other objects, then */
1292	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1267	if ((!(flag & INS_MAP_LOAD)) && top)
1293	{	1268	{
1294	object *last = 0;	1269	object *last = 0;
1295		1270
1296	/*	1271	/*
1297	* If there are multiple objects on this space, we do some trickier handling.	1272	* If there are multiple objects on this space, we do some trickier handling.
…		…
1303	* once we get to them. This reduces the need to traverse over all of	1278	* once we get to them. This reduces the need to traverse over all of
1304	* them when adding another one - this saves quite a bit of cpu time	1279	* them when adding another one - this saves quite a bit of cpu time
1305	* when lots of spells are cast in one area. Currently, it is presumed	1280	* when lots of spells are cast in one area. Currently, it is presumed
1306	* that flying non pickable objects are spell objects.	1281	* that flying non pickable objects are spell objects.
1307	*/	1282	*/
1308	while (top)	1283	for (top = ms.bot; top; top = top->above)
1309	{	1284	{
1310	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1285	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1311	floor = top;	1286	floor = top;
1312		1287
1313	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1288	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1316	top = top->below;	1291	top = top->below;
1317	break;	1292	break;
1318	}	1293	}
1319		1294
1320	last = top;	1295	last = top;
1321	top = top->above;
1322	}	1296	}
1323		1297
1324	/* Don't want top to be NULL, so set it to the last valid object */	1298	/* Don't want top to be NULL, so set it to the last valid object */
1325	top = last;	1299	top = last;
1326		1300
…		…
1328	* looks like instead of lots of conditions here.	1302	* looks like instead of lots of conditions here.
1329	* makes things faster, and effectively the same result.	1303	* makes things faster, and effectively the same result.
1330	*/	1304	*/
1331		1305
1332	/* Have object 'fall below' other objects that block view.	1306	/* Have object 'fall below' other objects that block view.
1333	* Unless those objects are exits, type 66	1307	* Unless those objects are exits.
1334	* If INS_ON_TOP is used, don't do this processing	1308	* If INS_ON_TOP is used, don't do this processing
1335	* Need to find the object that in fact blocks view, otherwise	1309	* Need to find the object that in fact blocks view, otherwise
1336	* stacking is a bit odd.	1310	* stacking is a bit odd.
1337	*/	1311	*/
1338	if (!(flag & INS_ON_TOP) &&	1312	if (!(flag & INS_ON_TOP)
1339	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1313	&& ms.flags () & P_BLOCKSVIEW
		1314	&& (op->face && !faces [op->face].visibility))
1340	{	1315	{
1341	for (last = top; last != floor; last = last->below)	1316	for (last = top; last != floor; last = last->below)
1342	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1317	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1343	break;	1318	break;
		1319
1344	/* Check to see if we found the object that blocks view,	1320	/* Check to see if we found the object that blocks view,
1345	* and make sure we have a below pointer for it so that	1321	* and make sure we have a below pointer for it so that
1346	* we can get inserted below this one, which requires we	1322	* we can get inserted below this one, which requires we
1347	* set top to the object below us.	1323	* set top to the object below us.
1348	*/	1324	*/
…		…
1350	top = last->below;	1326	top = last->below;
1351	}	1327	}
1352	} /* If objects on this space */	1328	} /* If objects on this space */
1353		1329
1354	if (flag & INS_MAP_LOAD)	1330	if (flag & INS_MAP_LOAD)
1355	top = GET_MAP_TOP (op->map, op->x, op->y);	1331	top = ms.top;
1356		1332
1357	if (flag & INS_ABOVE_FLOOR_ONLY)	1333	if (flag & INS_ABOVE_FLOOR_ONLY)
1358	top = floor;	1334	top = floor;
1359		1335
1360	/* Top is the object that our object (op) is going to get inserted above.	1336	/* Top is the object that our object (op) is going to get inserted above.
1361	*/	1337	*/
1362		1338
1363	/* First object on this space */	1339	/* First object on this space */
1364	if (!top)	1340	if (!top)
1365	{	1341	{
1366	op->above = GET_MAP_OB (op->map, op->x, op->y);	1342	op->above = ms.bot;
1367		1343
1368	if (op->above)	1344	if (op->above)
1369	op->above->below = op;	1345	op->above->below = op;
1370		1346
1371	op->below = 0;	1347	op->below = 0;
1372	op->ms ().bot = op;	1348	ms.bot = op;
1373	}	1349	}
1374	else	1350	else
1375	{ /* get inserted into the stack above top */	1351	{ /* get inserted into the stack above top */
1376	op->above = top->above;	1352	op->above = top->above;
1377		1353
…		…
1381	op->below = top;	1357	op->below = top;
1382	top->above = op;	1358	top->above = op;
1383	}	1359	}
1384		1360
1385	if (!op->above)	1361	if (!op->above)
1386	op->ms ().top = op;	1362	ms.top = op;
1387	} /* else not INS_BELOW_ORIGINATOR */	1363	} /* else not INS_BELOW_ORIGINATOR */
1388		1364
1389	if (op->type == PLAYER)	1365	if (op->type == PLAYER)
1390	{	1366	{
1391	op->contr->do_los = 1;	1367	op->contr->do_los = 1;
…		…
1397		1373
1398	/* If we have a floor, we know the player, if any, will be above	1374	/* If we have a floor, we know the player, if any, will be above
1399	* it, so save a few ticks and start from there.	1375	* it, so save a few ticks and start from there.
1400	*/	1376	*/
1401	if (!(flag & INS_MAP_LOAD))	1377	if (!(flag & INS_MAP_LOAD))
1402	if (object *pl = op->ms ().player ())	1378	if (object *pl = ms.player ())
1403	if (pl->contr->ns)	1379	if (pl->contr->ns)
1404	pl->contr->ns->floorbox_update ();	1380	pl->contr->ns->floorbox_update ();
1405		1381
1406	/* If this object glows, it may affect lighting conditions that are	1382	/* If this object glows, it may affect lighting conditions that are
1407	* visible to others on this map. But update_all_los is really	1383	* visible to others on this map. But update_all_los is really
…		…
1469	}	1445	}
1470		1446
1471	object *	1447	object *
1472	object::insert_at (object where, object originator, int flags)	1448	object::insert_at (object where, object originator, int flags)
1473	{	1449	{
1474	where->map->insert (this, where->x, where->y, originator, flags);	1450	return where->map->insert (this, where->x, where->y, originator, flags);
1475	}	1451	}
1476		1452
1477	/*	1453	/*
1478	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1454	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1479	* is returned contains nr objects, and the remaining parts contains	1455	* is returned contains nr objects, and the remaining parts contains
…		…
1519	* the amount of an object. If the amount reaches 0, the object	1495	* the amount of an object. If the amount reaches 0, the object
1520	* is subsequently removed and freed.	1496	* is subsequently removed and freed.
1521	*	1497	*
1522	* Return value: 'op' if something is left, NULL if the amount reached 0	1498	* Return value: 'op' if something is left, NULL if the amount reached 0
1523	*/	1499	*/
1524
1525	object *	1500	object *
1526	decrease_ob_nr (object *op, uint32 i)	1501	decrease_ob_nr (object *op, uint32 i)
1527	{	1502	{
1528	object *tmp;	1503	object *tmp;
1529		1504
…		…
1604		1579
1605	/*	1580	/*
1606	* add_weight(object, weight) adds the specified weight to an object,	1581	* add_weight(object, weight) adds the specified weight to an object,
1607	* and also updates how much the environment(s) is/are carrying.	1582	* and also updates how much the environment(s) is/are carrying.
1608	*/	1583	*/
1609
1610	void	1584	void
1611	add_weight (object *op, signed long weight)	1585	add_weight (object *op, signed long weight)
1612	{	1586	{
1613	while (op != NULL)	1587	while (op != NULL)
1614	{	1588	{
…		…
1646	* inside the object environment.	1620	* inside the object environment.
1647	*	1621	*
1648	* The function returns now pointer to inserted item, and return value can	1622	* The function returns now pointer to inserted item, and return value can
1649	* be != op, if items are merged. -Tero	1623	* be != op, if items are merged. -Tero
1650	*/	1624	*/
1651
1652	object *	1625	object *
1653	object::insert (object *op)	1626	object::insert (object *op)
1654	{	1627	{
1655	object tmp, otmp;	1628	object tmp, otmp;
1656		1629
…		…
1816	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1789	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1817	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1790	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1818	{	1791	{
1819		1792
1820	float	1793	float
1821	diff = tmp->move_slow_penalty * FABS (op->speed);	1794	diff = tmp->move_slow_penalty * fabs (op->speed);
1822		1795
1823	if (op->type == PLAYER)	1796	if (op->type == PLAYER)
1824	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1797	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1825	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1798	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1826	diff /= 4.0;	1799	diff /= 4.0;
…		…
2033	}	2006	}
2034		2007
2035	if (!index)	2008	if (!index)
2036	return -1;	2009	return -1;
2037		2010
2038	return altern[RANDOM () % index];	2011	return altern [rndm (index)];
2039	}	2012	}
2040		2013
2041	/*	2014	/*
2042	* find_first_free_spot(archetype, maptile, x, y) works like	2015	* find_first_free_spot(archetype, maptile, x, y) works like
2043	* find_free_spot(), but it will search max number of squares.	2016	* find_free_spot(), but it will search max number of squares.
…		…
2064	{	2037	{
2065	arr += begin;	2038	arr += begin;
2066	end -= begin;	2039	end -= begin;
2067		2040
2068	while (--end)	2041	while (--end)
2069	swap (arr [end], arr [RANDOM () % (end + 1)]);	2042	swap (arr [end], arr [rndm (end + 1)]);
2070	}	2043	}
2071		2044
2072	/* new function to make monster searching more efficient, and effective!	2045	/* new function to make monster searching more efficient, and effective!
2073	* This basically returns a randomized array (in the passed pointer) of	2046	* This basically returns a randomized array (in the passed pointer) of
2074	* the spaces to find monsters. In this way, it won't always look for	2047	* the spaces to find monsters. In this way, it won't always look for
…		…
2208		2181
2209	return 3;	2182	return 3;
2210	}	2183	}
2211		2184
2212	/*	2185	/*
2213	* absdir(int): Returns a number between 1 and 8, which represent
2214	* the "absolute" direction of a number (it actually takes care of
2215	* "overflow" in previous calculations of a direction).
2216	*/
2217
2218	int
2219	absdir (int d)
2220	{
2221	while (d < 1)
2222	d += 8;
2223
2224	while (d > 8)
2225	d -= 8;
2226
2227	return d;
2228	}
2229
2230	/*
2231	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2186	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2232	* between two directions (which are expected to be absolute (see absdir())	2187	* between two directions (which are expected to be absolute (see absdir())
2233	*/	2188	*/
2234
2235	int	2189	int
2236	dirdiff (int dir1, int dir2)	2190	dirdiff (int dir1, int dir2)
2237	{	2191	{
2238	int d;	2192	int d;
2239		2193
…		…
2405	insert_ob_in_ob (object_create_clone (item), dst);	2359	insert_ob_in_ob (object_create_clone (item), dst);
2406		2360
2407	return dst;	2361	return dst;
2408	}	2362	}
2409		2363
2410	/* GROS - Creates an object using a string representing its content. */
2411	/* Basically, we save the content of the string to a temp file, then call */
2412	/* load_object on it. I admit it is a highly inefficient way to make things, */
2413	/* but it was simple to make and allows reusing the load_object function. */
2414	/* Remember not to use load_object_str in a time-critical situation. */
2415	/* Also remember that multiparts objects are not supported for now. */
2416	object *
2417	load_object_str (const char *obstr)
2418	{
2419	object *op;
2420	char filename[MAX_BUF];
2421
2422	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2423
2424	FILE *tempfile = fopen (filename, "w");
2425
2426	if (tempfile == NULL)
2427	{
2428	LOG (llevError, "Error - Unable to access load object temp file\n");
2429	return NULL;
2430	}
2431
2432	fprintf (tempfile, obstr);
2433	fclose (tempfile);
2434
2435	op = object::create ();
2436
2437	object_thawer thawer (filename);
2438
2439	if (thawer)
2440	load_object (thawer, op, 0);
2441
2442	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2443	CLEAR_FLAG (op, FLAG_REMOVED);
2444
2445	return op;
2446	}
2447
2448	/* This returns the first object in who's inventory that	2364	/* This returns the first object in who's inventory that
2449	* has the same type and subtype match.	2365	* has the same type and subtype match.
2450	* returns NULL if no match.	2366	* returns NULL if no match.
2451	*/	2367	*/
2452	object *	2368	object *
…		…
2505	if (link->key == canonical_key)	2421	if (link->key == canonical_key)
2506	return link->value;	2422	return link->value;
2507		2423
2508	return 0;	2424	return 0;
2509	}	2425	}
2510
2511		2426
2512	/*	2427	/*
2513	* Updates the canonical_key in op to value.	2428	* Updates the canonical_key in op to value.
2514	*	2429	*
2515	* canonical_key is a shared string (value doesn't have to be).	2430	* canonical_key is a shared string (value doesn't have to be).
…		…
2655	{	2570	{
2656	char flagdesc[512];	2571	char flagdesc[512];
2657	char info2[256 * 4];	2572	char info2[256 * 4];
2658	char *p = info;	2573	char *p = info;
2659		2574
2660	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2575	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2661	count, uuid.seq,	2576	count, uuid.seq,
2662	&name,	2577	&name,
2663	title ? "\",title:" : "",	2578	title ? "\",title:\"" : "",
2664	title ? (const char *)title : "",	2579	title ? (const char *)title : "",
2665	flag_desc (flagdesc, 512), type);	2580	flag_desc (flagdesc, 512), type);
2666		2581
2667	if (env)	2582	if (env)
2668	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2583	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2678	{	2593	{
2679	static char info[256 * 4];	2594	static char info[256 * 4];
2680	return debug_desc (info);	2595	return debug_desc (info);
2681	}	2596	}
2682		2597
		2598	const char *
		2599	object::debug_desc2 () const
		2600	{
		2601	static char info[256 * 4];
		2602	return debug_desc (info);
		2603	}
		2604
		2605	struct region *
		2606	object::region () const
		2607	{
		2608	return map ? map->region (x, y)
		2609	: region::default_region ();
		2610	}
		2611
		2612	const materialtype_t *
		2613	object::dominant_material () const
		2614	{
		2615	if (materialtype_t *mat = name_to_material (materialname))
		2616	return mat;
		2617
		2618	// omfg this is slow, this has to be temporary :)
		2619	shstr unknown ("unknown");
		2620
		2621	return name_to_material (unknown);
		2622	}
		2623
		2624	void
		2625	object::open_container (object *new_container)
		2626	{
		2627	if (container == new_container)
		2628	return;
		2629
		2630	if (object *old_container = container)
		2631	{
		2632	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2633	return;
		2634
		2635	#if 0
		2636	// remove the "Close old_container" object.
		2637	if (object *closer = old_container->inv)
		2638	if (closer->type == CLOSE_CON)
		2639	closer->destroy ();
		2640	#endif
		2641
		2642	old_container->flag [FLAG_APPLIED] = 0;
		2643	container = 0;
		2644
		2645	esrv_update_item (UPD_FLAGS, this, old_container);
		2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2647	}
		2648
		2649	if (new_container)
		2650	{
		2651	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2652	return;
		2653
		2654	// TODO: this does not seem to serve any purpose anymore?
		2655	#if 0
		2656	// insert the "Close Container" object.
		2657	if (archetype *closer = new_container->other_arch)
		2658	{
		2659	object *closer = arch_to_object (new_container->other_arch);
		2660	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2661	new_container->insert (closer);
		2662	}
		2663	#endif
		2664
		2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2666
		2667	new_container->flag [FLAG_APPLIED] = 1;
		2668	container = new_container;
		2669
		2670	esrv_update_item (UPD_FLAGS, this, new_container);
		2671	esrv_send_inventory (this, new_container);
		2672	}
		2673	}
		2674
		2675

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs. Revision 1.141 by root, Sun Apr 29 21:44:34 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.141 by root, Sun Apr 29 21:44:34 2007 UTC