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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.37 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 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. */
…		…
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
36	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
37		38
38	object objects; / Pointer to the list of used objects */
39	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 */
40		40
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,	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,
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	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
43	};	43	};
…		…
49	};	49	};
50	int freedir[SIZEOFFREE] = {	50	int freedir[SIZEOFFREE] = {
51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	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,
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	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
53	};	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: %lld\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	}
54		131
55	/* 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. */
56	static int	133	static int
57	compare_ob_value_lists_one (const object wants, const object has)	134	compare_ob_value_lists_one (const object wants, const object has)
58	{	135	{
…		…
297	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
298	* Some error messages.	375	* Some error messages.
299	* 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.
300	*/	377	*/
301		378
302	void	379	char *
303	dump_object2 (object *op)
304	{
305	errmsg[0] = 0;
306	return;
307	//TODO//D#d#
308	#if 0
309	char *cp;
310
311	/* object tmp;/
312
313	if (op->arch != NULL)
314	{
315	strcat (errmsg, "arch ");
316	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
317	strcat (errmsg, "\n");
318	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
319	strcat (errmsg, cp);
320	# if 0
321	/* Don't dump player diffs - they are too long, mostly meaningless, and
322	* will overflow the buffer.
323	* Changed so that we don't dump inventory either. This may
324	* also overflow the buffer.
325	*/
326	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
327	strcat (errmsg, cp);
328	for (tmp = op->inv; tmp; tmp = tmp->below)
329	dump_object2 (tmp);
330	# endif
331	strcat (errmsg, "end\n");
332	}
333	else
334	{
335	strcat (errmsg, "Object ");
336	if (op->name == NULL)
337	strcat (errmsg, "(null)");
338	else
339	strcat (errmsg, op->name);
340	strcat (errmsg, "\n");
341	# if 0
342	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
343	strcat (errmsg, cp);
344	for (tmp = op->inv; tmp; tmp = tmp->below)
345	dump_object2 (tmp);
346	# endif
347	strcat (errmsg, "end\n");
348	}
349	#endif
350	}
351
352	/*
353	* Dumps an object. Returns output in the static global errmsg array.
354	*/
355
356	void
357	dump_object (object *op)	380	dump_object (object *op)
358	{	381	{
359	if (op == NULL)	382	if (!op)
360	{	383	return strdup ("[NULLOBJ]");
361	strcpy (errmsg, "[NULL pointer]");
362	return;
363	}
364	errmsg[0] = '\0';
365	dump_object2 (op);
366	}
367		384
368	void	385	object_freezer freezer;
369	dump_all_objects (void)	386	save_object (freezer, op, 3);
370	{	387	return freezer.as_string ();
371	object *op;
372
373	for (op = objects; op != NULL; op = op->next)
374	{
375	dump_object (op);
376	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
377	}
378	}	388	}
379		389
380	/*	390	/*
381	* 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
382	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
402	*/	412	*/
403		413
404	object *	414	object *
405	find_object (tag_t i)	415	find_object (tag_t i)
406	{	416	{
407	object *op;	417	for (object *op = object::first; op; op = op->next)
408
409	for (op = objects; op != NULL; op = op->next)
410	if (op->count == i)	418	if (op->count == i)
411	break;	419	return op;
		420
412	return op;	421	return 0;
413	}	422	}
414		423
415	/*	424	/*
416	* 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.
417	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
422	find_object_name (const char *str)	431	find_object_name (const char *str)
423	{	432	{
424	shstr_cmp str_ (str);	433	shstr_cmp str_ (str);
425	object *op;	434	object *op;
426		435
427	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
428	if (op->name == str_)	437	if (op->name == str_)
429	break;	438	break;
430		439
431	return op;	440	return op;
432	}	441	}
433		442
434	void	443	void
435	free_all_object_data ()	444	free_all_object_data ()
436	{	445	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}
439
440	/*
441	* Returns the object which this object marks as being the owner.
442	* A id-scheme is used to avoid pointing to objects which have been
443	* freed and are now reused. If this is detected, the owner is
444	* set to NULL, and NULL is returned.
445	* Changed 2004-02-12 - if the player is setting at the play again
446	* prompt, he is removed, and we don't want to treat him as an owner of
447	* anything, so check removed flag. I don't expect that this should break
448	* anything - once an object is removed, it is basically dead anyways.
449	*/
450	object *
451	object::get_owner ()
452	{
453	if (!owner
454	\|\| QUERY_FLAG (owner, FLAG_FREED)
455	\|\| QUERY_FLAG (owner, FLAG_REMOVED))
456	owner = 0;
457
458	return owner;
459	}	447	}
460		448
461	/*	449	/*
462	* 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
463	* skill and experience objects.	451	* skill and experience objects.
…		…
533		521
534	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
535		523
536	expmul = 1.0;	524	expmul = 1.0;
537	face = blank_face;	525	face = blank_face;
538	attacked_by_count = -1;
539		526
540	if (settings.casting_time)	527	if (settings.casting_time)
541	casting_time = -1;	528	casting_time = -1;
542	}	529	}
543		530
…		…
838		825
839	if (op->more != NULL)	826	if (op->more != NULL)
840	update_object (op->more, action);	827	update_object (op->more, action);
841	}	828	}
842		829
843	static unordered_vector<object *> mortals;	830	object::vector object::mortals;
844	static std::vector<object , slice_allocator <object > > freed;	831	object::vector object::objects; // not yet used
		832	object *object::first;
845		833
846	void object::free_mortals ()	834	void object::free_mortals ()
847	{	835	{
848	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849	if ((*i)->refcnt)	837	if ((*i)->refcnt)
850	++i; // further delay freeing	838	++i; // further delay freeing
851	else	839	else
852	{	840	{
853	freed.push_back (*i);//D
854	//delete *i;	841	delete *i;
855	mortals.erase (i);	842	mortals.erase (i);
856	}	843	}
857
858	if (mortals.size() && 0)//D
859	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
860	}	844	}
861		845
862	object::object ()	846	object::object ()
863	{	847	{
864	SET_FLAG (this, FLAG_REMOVED);	848	SET_FLAG (this, FLAG_REMOVED);
865		849
866	expmul = 1.0;	850	expmul = 1.0;
867	face = blank_face;	851	face = blank_face;
868	attacked_by_count = -1;
869	}	852	}
870		853
871	object::~object ()	854	object::~object ()
872	{	855	{
873	free_key_values (this);	856	free_key_values (this);
874	}	857	}
875		858
876	void object::link ()	859	void object::link ()
877	{	860	{
878	count = ++ob_count;	861	count = ++ob_count;
		862	uuid = gen_uuid ();
879		863
880	prev = 0;	864	prev = 0;
881	next = objects;	865	next = object::first;
882		866
883	if (objects)	867	if (object::first)
884	objects->prev = this;	868	object::first->prev = this;
885		869
886	objects = this;	870	object::first = this;
887	}	871	}
888		872
889	void object::unlink ()	873	void object::unlink ()
890	{	874	{
891	count = 0;	875	if (this == object::first)
		876	object::first = next;
892		877
893	/* Remove this object from the list of used objects */	878	/* Remove this object from the list of used objects */
894	if (prev)
895	{
896	prev->next = next;	879	if (prev) prev->next = next;
		880	if (next) next->prev = prev;
		881
897	prev = 0;	882	prev = 0;
898	}
899
900	if (next)
901	{
902	next->prev = prev;
903	next = 0;	883	next = 0;
904	}
905
906	if (this == objects)
907	objects = next;
908	}	884	}
909		885
910	object *object::create ()	886	object *object::create ()
911	{	887	{
912	object *op;
913
914	if (freed.empty ())
915	op = new object;	888	object *op = new object;
916	else
917	{
918	// highly annoying, but the only way to get it stable right now
919	op = freed.back ();
920	freed.pop_back ();
921	op->~object ();
922	new ((void *) op) object;
923	}
924
925	op->link ();	889	op->link ();
926	return op;	890	return op;
927	}	891	}
928		892
929	/*	893	/*
…		…
931	* it from the list of used objects, and puts it on the list of	895	* it from the list of used objects, and puts it on the list of
932	* free objects. The IS_FREED() flag is set in the object.	896	* free objects. The IS_FREED() flag is set in the object.
933	* The object must have been removed by remove_ob() first for	897	* The object must have been removed by remove_ob() first for
934	* this function to succeed.	898	* this function to succeed.
935	*	899	*
936	* If free_inventory is set, free inventory as well. Else drop items in	900	* If destroy_inventory is set, free inventory as well. Else drop items in
937	* inventory to the ground.	901	* inventory to the ground.
938	*/	902	*/
939	void object::free (bool free_inventory)	903	void object::destroy (bool destroy_inventory)
940	{	904	{
941	if (QUERY_FLAG (this, FLAG_FREED))	905	if (QUERY_FLAG (this, FLAG_FREED))
942	return;	906	return;
943		907
944	if (QUERY_FLAG (this, FLAG_FRIENDLY))	908	if (QUERY_FLAG (this, FLAG_FRIENDLY))
…		…
949		913
950	SET_FLAG (this, FLAG_FREED);	914	SET_FLAG (this, FLAG_FREED);
951		915
952	if (more)	916	if (more)
953	{	917	{
954	more->free (free_inventory);	918	more->destroy (destroy_inventory);
955	more = 0;	919	more = 0;
956	}	920	}
957		921
958	if (inv)	922	if (inv)
959	{	923	{
960	/* Only if the space blocks everything do we not process -	924	/* Only if the space blocks everything do we not process -
961	* if some form of movement is allowed, let objects	925	* if some form of movement is allowed, let objects
962	* drop on that space.	926	* drop on that space.
963	*/	927	*/
964	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	928	if (destroy_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
965	{	929	{
966	object *op = inv;	930	object *op = inv;
967		931
968	while (op)	932	while (op)
969	{	933	{
970	object *tmp = op->below;	934	object *tmp = op->below;
971	op->free (free_inventory);	935	op->destroy (destroy_inventory);
972	op = tmp;	936	op = tmp;
973	}	937	}
974	}	938	}
975	else	939	else
976	{ /* Put objects in inventory onto this space */	940	{ /* Put objects in inventory onto this space */
…		…
995	op = tmp;	959	op = tmp;
996	}	960	}
997	}	961	}
998	}	962	}
999		963
		964	// hack to ensure that freed objects still have a valid map
		965	{
		966	static maptile *freed_map; // freed objects are moved here to avoid crashes
		967
		968	if (!freed_map)
		969	{
		970	freed_map = new maptile;
		971
		972	freed_map->name = "/internal/freed_objects_map";
		973	freed_map->width = 3;
		974	freed_map->height = 3;
		975
		976	freed_map->allocate ();
		977	}
		978
		979	map = freed_map;
		980	x = 1;
		981	y = 1;
		982	}
		983
		984	// clear those pointers that likely might have circular references to us
1000	owner = 0;	985	owner = 0;
		986	enemy = 0;
		987	attacked_by = 0;
		988
		989	// only relevant for players(?), but make sure of it anyways
		990	contr = 0;
1001		991
1002	/* Remove object from the active list */	992	/* Remove object from the active list */
1003	speed = 0;	993	speed = 0;
1004	update_ob_speed (this);	994	update_ob_speed (this);
1005		995
…		…
1017	sub_weight (object *op, signed long weight)	1007	sub_weight (object *op, signed long weight)
1018	{	1008	{
1019	while (op != NULL)	1009	while (op != NULL)
1020	{	1010	{
1021	if (op->type == CONTAINER)	1011	if (op->type == CONTAINER)
1022	{
1023	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1012	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024	}	1013
1025	op->carrying -= weight;	1014	op->carrying -= weight;
1026	op = op->env;	1015	op = op->env;
1027	}	1016	}
1028	}	1017	}
1029		1018
…		…
1037	*/	1026	*/
1038		1027
1039	void	1028	void
1040	remove_ob (object *op)	1029	remove_ob (object *op)
1041	{	1030	{
		1031	object tmp, last = 0;
1042	object *	1032	object *otmp;
1043	tmp, *
1044	last = NULL;
1045	object *
1046	otmp;
1047		1033
1048	tag_t
1049	tag;
1050	int
1051	check_walk_off;	1034	int check_walk_off;
1052	mapstruct *	1035	maptile *m;
1053	m;
1054		1036
1055	sint16	1037	sint16 x, y;
1056	x,
1057	y;
1058		1038
1059	if (QUERY_FLAG (op, FLAG_REMOVED))	1039	if (QUERY_FLAG (op, FLAG_REMOVED))
1060	return;	1040	return;
1061		1041
1062	SET_FLAG (op, FLAG_REMOVED);	1042	SET_FLAG (op, FLAG_REMOVED);
…		…
1139	* use translated coordinates in case some oddness with map tiling is	1119	* use translated coordinates in case some oddness with map tiling is
1140	* evident	1120	* evident
1141	*/	1121	*/
1142	if (GET_MAP_OB (m, x, y) != op)	1122	if (GET_MAP_OB (m, x, y) != op)
1143	{	1123	{
1144	dump_object (op);	1124	char *dump = dump_object (op);
1145	LOG (llevError,	1125	LOG (llevError,
1146	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1126	"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);
		1127	free (dump);
1147	dump_object (GET_MAP_OB (m, x, y));	1128	dump = dump_object (GET_MAP_OB (m, x, y));
1148	LOG (llevError, "%s\n", errmsg);	1129	LOG (llevError, "%s\n", dump);
		1130	free (dump);
1149	}	1131	}
1150		1132
1151	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1133	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1152	}	1134	}
1153		1135
…		…
1155	op->below = 0;	1137	op->below = 0;
1156		1138
1157	if (op->map->in_memory == MAP_SAVING)	1139	if (op->map->in_memory == MAP_SAVING)
1158	return;	1140	return;
1159		1141
1160	tag = op->count;
1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1142	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1162		1143
1163	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1144	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1164	{	1145	{
1165	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
…		…
1180		1161
1181	tmp->contr->socket.update_look = 1;	1162	tmp->contr->socket.update_look = 1;
1182	}	1163	}
1183		1164
1184	/* See if player moving off should effect something */	1165	/* See if player moving off should effect something */
1185	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1166	if (check_walk_off
		1167	&& ((op->move_type & tmp->move_off)
		1168	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186	{	1169	{
1187	move_apply (tmp, op, NULL);	1170	move_apply (tmp, op, NULL);
1188		1171
1189	if (was_destroyed (op, tag))	1172	if (op->destroyed ())
1190	{
1191	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1173	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192	}
1193	}	1174	}
1194		1175
1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1176	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196		1177
1197	if (tmp->above == tmp)	1178	if (tmp->above == tmp)
…		…
1250	free_object (op);	1231	free_object (op);
1251	return top;	1232	return top;
1252	}	1233	}
1253	}	1234	}
1254		1235
1255	return NULL;	1236	return 0;
1256	}	1237	}
1257		1238
1258	/*	1239	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1240	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1241	* job preparing multi-part monsters
1261	*/	1242	*/
1262	object *	1243	object *
1263	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1244	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1264	{	1245	{
1265	object *tmp;	1246	object *tmp;
1266		1247
1267	if (op->head)	1248	if (op->head)
1268	op = op->head;	1249	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1277	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1278	* just 'op' otherwise
1298	*/	1279	*/
1299		1280
1300	object *	1281	object *
1301	insert_ob_in_map (object op, mapstruct m, object *originator, int flag)	1282	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1302	{	1283	{
1303	object tmp, top, *floor = NULL;	1284	object tmp, top, *floor = NULL;
1304	sint16 x, y;	1285	sint16 x, y;
1305		1286
1306	if (QUERY_FLAG (op, FLAG_FREED))	1287	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1290	return NULL;
1310	}	1291	}
1311		1292
1312	if (m == NULL)	1293	if (m == NULL)
1313	{	1294	{
1314	dump_object (op);	1295	char *dump = dump_object (op);
1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1296	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1297	free (dump);
1316	return op;	1298	return op;
1317	}	1299	}
1318		1300
1319	if (out_of_map (m, op->x, op->y))	1301	if (out_of_map (m, op->x, op->y))
1320	{	1302	{
1321	dump_object (op);	1303	char *dump = dump_object (op);
1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1304	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323	#ifdef MANY_CORES	1305	#ifdef MANY_CORES
1324	/* Better to catch this here, as otherwise the next use of this object	1306	/* 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	1307	* is likely to cause a crash. Better to find out where it is getting
1326	* improperly inserted.	1308	* improperly inserted.
1327	*/	1309	*/
1328	abort ();	1310	abort ();
1329	#endif	1311	#endif
		1312	free (dump);
1330	return op;	1313	return op;
1331	}	1314	}
1332		1315
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1316	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1317	{
1335	dump_object (op);	1318	char *dump = dump_object (op);
1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1319	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1320	free (dump);
1337	return op;	1321	return op;
1338	}	1322	}
1339		1323
1340	if (op->more != NULL)	1324	if (op->more != NULL)
1341	{	1325	{
…		…
1587	remove_ob (tmp);	1571	remove_ob (tmp);
1588	free_object (tmp);	1572	free_object (tmp);
1589	}	1573	}
1590	}	1574	}
1591		1575
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1576	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1577
1594	tmp1->x = op->x;	1578	tmp1->x = op->x;
1595	tmp1->y = op->y;	1579	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1580	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1581	}
…		…
1778	tmp, *	1762	tmp, *
1779	otmp;	1763	otmp;
1780		1764
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1765	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1766	{
1783	dump_object (op);	1767	char *dump = dump_object (op);
1784	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1768	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
		1769	free (dump);
1785	return op;	1770	return op;
1786	}	1771	}
1787		1772
1788	if (where == NULL)	1773	if (where == NULL)
1789	{	1774	{
1790	dump_object (op);	1775	char *dump = dump_object (op);
1791	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1776	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1777	free (dump);
1792	return op;	1778	return op;
1793	}	1779	}
1794		1780
1795	if (where->head)	1781	if (where->head)
1796	{	1782	{
…		…
1896	*/	1882	*/
1897		1883
1898	int	1884	int
1899	check_move_on (object op, object originator)	1885	check_move_on (object op, object originator)
1900	{	1886	{
1901	object *	1887	object *tmp;
1902	tmp;	1888	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1889	int x = op->x, y = op->y;
1909		1890
1910	MoveType	1891	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1892
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1893	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1894	return 0;
1917
1918	tag = op->count;
1919		1895
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1896	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);	1897	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);	1898	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1899
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1960	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))	1961	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1962	{
1987	move_apply (tmp, op, originator);	1963	move_apply (tmp, op, originator);
1988		1964
1989	if (was_destroyed (op, tag))	1965	if (op->destroyed ())
1990	return 1;	1966	return 1;
1991		1967
1992	/* what the person/creature stepped onto has moved the object	1968	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1969	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1970	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1982	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1983	* The first matching object is returned, or NULL if none.
2008	*/	1984	*/
2009		1985
2010	object *	1986	object *
2011	present_arch (const archetype at, mapstruct m, int x, int y)	1987	present_arch (const archetype at, maptile m, int x, int y)
2012	{	1988	{
2013	object *	1989	object *
2014	tmp;	1990	tmp;
2015		1991
2016	if (m == NULL \|\| out_of_map (m, x, y))	1992	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	2005	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	2006	* The first matching object is returned, or NULL if none.
2031	*/	2007	*/
2032		2008
2033	object *	2009	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	2010	present (unsigned char type, maptile *m, int x, int y)
2035	{	2011	{
2036	object *	2012	object *
2037	tmp;	2013	tmp;
2038		2014
2039	if (out_of_map (m, x, y))	2015	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2155	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2156	* customized, changed states, etc.
2181	*/	2157	*/
2182		2158
2183	int	2159	int
2184	find_free_spot (const object ob, mapstruct m, int x, int y, int start, int stop)	2160	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2185	{	2161	{
2186	int	2162	int
2187	i,	2163	i,
2188	index = 0, flag;	2164	index = 0, flag;
2189	static int	2165	static int
…		…
2210	return -1;	2186	return -1;
2211	return altern[RANDOM () % index];	2187	return altern[RANDOM () % index];
2212	}	2188	}
2213		2189
2214	/*	2190	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2191	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2192	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2193	* 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.	2194	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2195	*/
2220		2196
2221	int	2197	int
2222	find_first_free_spot (const object ob, mapstruct m, int x, int y)	2198	find_first_free_spot (const object ob, maptile m, int x, int y)
2223	{	2199	{
2224	int	2200	int
2225	i;	2201	i;
2226		2202
2227	for (i = 0; i < SIZEOFFREE; i++)	2203	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2267	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2268	* there is capable of.
2293	*/	2269	*/
2294		2270
2295	int	2271	int
2296	find_dir (mapstruct m, int x, int y, object exclude)	2272	find_dir (maptile m, int x, int y, object exclude)
2297	{	2273	{
2298	int	2274	int
2299	i,	2275	i,
2300	max = SIZEOFFREE, mflags;	2276	max = SIZEOFFREE, mflags;
2301		2277
2302	sint16 nx, ny;	2278	sint16 nx, ny;
2303	object *	2279	object *
2304	tmp;	2280	tmp;
2305	mapstruct *	2281	maptile *
2306	mp;	2282	mp;
2307		2283
2308	MoveType blocked, move_type;	2284	MoveType blocked, move_type;
2309		2285
2310	if (exclude && exclude->head)	2286	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2494	* Modified to be map tile aware -.MSW
2519	*/	2495	*/
2520		2496
2521		2497
2522	int	2498	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2499	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2500	{
2525	sint16 dx, dy;	2501	sint16 dx, dy;
2526	int	2502	int
2527	mflags;	2503	mflags;
2528		2504
…		…
2608	if (prev)	2584	if (prev)
2609	prev->more = tmp;	2585	prev->more = tmp;
2610	prev = tmp;	2586	prev = tmp;
2611	}	2587	}
2612		2588
2613	/* copy inventory */
2614	for (item = src->inv; item; item = item->below)	2589	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2590	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2591
2619	return dst;	2592	return dst;
2620	}	2593	}
2621		2594
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. */	2595	/* 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 */	2596	/* 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, */	2597	/* 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. */	2598	/* 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. */	2599	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2600	/* Also remember that multiparts objects are not supported for now. */
2642		2601
2643	object *	2602	object *
2644	load_object_str (const char *obstr)	2603	load_object_str (const char *obstr)
2645	{	2604	{
2646	object *	2605	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2606	char filename[MAX_BUF];
2650		2607
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2608	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2609
2653	FILE *
2654	tempfile = fopen (filename, "w");	2610	FILE *tempfile = fopen (filename, "w");
2655		2611
2656	if (tempfile == NULL)	2612	if (tempfile == NULL)
2657	{	2613	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2614	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2615	return NULL;
2660	};	2616	}
		2617
2661	fprintf (tempfile, obstr);	2618	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2619	fclose (tempfile);
2663		2620
2664	op = get_object ();	2621	op = get_object ();
2665		2622
…		…
2679	* returns NULL if no match.	2636	* returns NULL if no match.
2680	*/	2637	*/
2681	object *	2638	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2639	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2640	{
2684	object *	2641	object *tmp;
2685	tmp;
2686		2642
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2643	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2644	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2645	return tmp;
2690		2646
…		…
2698	* do the desired thing.	2654	* do the desired thing.
2699	*/	2655	*/
2700	key_value *	2656	key_value *
2701	get_ob_key_link (const object ob, const char key)	2657	get_ob_key_link (const object ob, const char key)
2702	{	2658	{
2703	key_value *	2659	key_value *link;
2704	link;
2705		2660
2706	for (link = ob->key_values; link != NULL; link = link->next)	2661	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2662	if (link->key == key)
2709	{
2710	return link;	2663	return link;
2711	}
2712	}
2713		2664
2714	return NULL;	2665	return NULL;
2715	}	2666	}
2716		2667
2717	/*	2668	/*

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.37 by root, Tue Sep 12 20:55:40 2006 UTC vs. Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.37 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC