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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.34 by root, Tue Sep 12 01:09:53 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	{
…		…
254	{	331	{
255	if (inv->inv)	332	if (inv->inv)
256	sum_weight (inv);	333	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	335	}
		336
259	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
261	if (op->carrying != sum)	340	if (op->carrying != sum)
262	op->carrying = sum;	341	op->carrying = sum;
		342
263	return sum;	343	return sum;
264	}	344	}
265		345
266	/**	346	/**
267	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
…		…
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	375	* Some error messages.
296	* 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.
297	*/	377	*/
298		378
299	void	379	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object tmp;/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	380	dump_object (object *op)
355	{	381	{
356	if (op == NULL)	382	if (!op)
357	{	383	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		384
365	void	385	object_freezer freezer;
366	dump_all_objects (void)	386	save_object (freezer, op, 3);
367	{	387	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	388	}
376		389
377	/*	390	/*
378	* 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
379	* multi-object 1 which is closest to the second object.	392	* multi-object 1 which is closest to the second object.
…		…
399	*/	412	*/
400		413
401	object *	414	object *
402	find_object (tag_t i)	415	find_object (tag_t i)
403	{	416	{
404	object *op;	417	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	418	if (op->count == i)
408	break;	419	return op;
		420
409	return op;	421	return 0;
410	}	422	}
411		423
412	/*	424	/*
413	* 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.
414	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
416	*/	428	*/
417		429
418	object *	430	object *
419	find_object_name (const char *str)	431	find_object_name (const char *str)
420	{	432	{
421	const char *name = shstr::find (str);	433	shstr_cmp str_ (str);
422	object *op;	434	object *op;
423		435
424	for (op = objects; op != NULL; op = op->next)	436	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	437	if (op->name == str_)
426	break;	438	break;
427		439
428	return op;	440	return op;
429	}	441	}
430		442
431	void	443	void
432	free_all_object_data ()	444	free_all_object_data ()
433	{	445	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}
436
437	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447	object *
448	object::get_owner ()
449	{
450	if (!owner
451	\|\| QUERY_FLAG (owner, FLAG_FREED)
452	\|\| QUERY_FLAG (owner, FLAG_REMOVED))
453	owner = 0;
454
455	return owner;
456	}	447	}
457		448
458	/*	449	/*
459	* 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
460	* skill and experience objects.	451	* skill and experience objects.
…		…
530		521
531	/* What is not cleared is next, prev, and count */	522	/* What is not cleared is next, prev, and count */
532		523
533	expmul = 1.0;	524	expmul = 1.0;
534	face = blank_face;	525	face = blank_face;
535	attacked_by_count = -1;
536		526
537	if (settings.casting_time)	527	if (settings.casting_time)
538	casting_time = -1;	528	casting_time = -1;
539	}	529	}
540		530
…		…
835		825
836	if (op->more != NULL)	826	if (op->more != NULL)
837	update_object (op->more, action);	827	update_object (op->more, action);
838	}	828	}
839		829
840	static unordered_vector<object *> mortals;	830	object::vector object::mortals;
841	static std::vector<object *> freed;	831	object::vector object::objects; // not yet used
		832	object *object::first;
842		833
843	void object::free_mortals ()	834	void object::free_mortals ()
844	{	835	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
846	if ((*i)->refcnt)	837	if ((*i)->refcnt)
847	++i; // further delay freeing	838	++i; // further delay freeing
848	else	839	else
849	{	840	{
850	freed.push_back (*i);//D
851	//delete *i;	841	delete *i;
852	mortals.erase (i);	842	mortals.erase (i);
853	}	843	}
854
855	if (mortals.size())//D
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857	}	844	}
858		845
859	object::object ()	846	object::object ()
860	{	847	{
861	SET_FLAG (this, FLAG_REMOVED);	848	SET_FLAG (this, FLAG_REMOVED);
862		849
863	expmul = 1.0;	850	expmul = 1.0;
864	face = blank_face;	851	face = blank_face;
865	attacked_by_count = -1;
866	}	852	}
867		853
868	object::~object ()	854	object::~object ()
869	{	855	{
870	free_key_values (this);	856	free_key_values (this);
871	}	857	}
872		858
873	void object::link ()	859	void object::link ()
874	{	860	{
875	count = ++ob_count;	861	count = ++ob_count;
		862	uuid = gen_uuid ();
876		863
877	prev = 0;	864	prev = 0;
878	next = objects;	865	next = object::first;
879		866
880	if (objects)	867	if (object::first)
881	objects->prev = this;	868	object::first->prev = this;
882		869
883	objects = this;	870	object::first = this;
884	}	871	}
885		872
886	void object::unlink ()	873	void object::unlink ()
887	{	874	{
888	count = 0;	875	if (this == object::first)
		876	object::first = next;
889		877
890	/* Remove this object from the list of used objects */	878	/* Remove this object from the list of used objects */
891	if (prev)
892	{
893	prev->next = next;	879	if (prev) prev->next = next;
		880	if (next) next->prev = prev;
		881
894	prev = 0;	882	prev = 0;
895	}
896
897	if (next)
898	{
899	next->prev = prev;
900	next = 0;	883	next = 0;
901	}
902
903	if (this == objects)
904	objects = next;
905	}	884	}
906		885
907	object *object::create ()	886	object *object::create ()
908	{	887	{
909	object *op;
910
911	if (freed.empty ())
912	op = new object;	888	object *op = new object;
913	else
914	{
915	// highly annoying, but the only way to get it stable right now
916	op = freed.back ();
917	freed.pop_back ();
918	op->~object ();
919	new ((void *) op) object;
920	}
921
922	op->link ();	889	op->link ();
923	return op;	890	return op;
924	}	891	}
925		892
926	/*	893	/*
…		…
928	* 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
929	* free objects. The IS_FREED() flag is set in the object.	896	* free objects. The IS_FREED() flag is set in the object.
930	* The object must have been removed by remove_ob() first for	897	* The object must have been removed by remove_ob() first for
931	* this function to succeed.	898	* this function to succeed.
932	*	899	*
933	* 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
934	* inventory to the ground.	901	* inventory to the ground.
935	*/	902	*/
936	void object::free (bool free_inventory)	903	void object::destroy (bool destroy_inventory)
937	{	904	{
938	if (QUERY_FLAG (this, FLAG_FREED))	905	if (QUERY_FLAG (this, FLAG_FREED))
939	return;	906	return;
940		907
941	if (QUERY_FLAG (this, FLAG_FRIENDLY))	908	if (QUERY_FLAG (this, FLAG_FRIENDLY))
…		…
946		913
947	SET_FLAG (this, FLAG_FREED);	914	SET_FLAG (this, FLAG_FREED);
948		915
949	if (more)	916	if (more)
950	{	917	{
951	more->free (free_inventory);	918	more->destroy (destroy_inventory);
952	more = 0;	919	more = 0;
953	}	920	}
954		921
955	if (inv)	922	if (inv)
956	{	923	{
957	/* Only if the space blocks everything do we not process -	924	/* Only if the space blocks everything do we not process -
958	* if some form of movement is allowed, let objects	925	* if some form of movement is allowed, let objects
959	* drop on that space.	926	* drop on that space.
960	*/	927	*/
961	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)
962	{	929	{
963	object *op = inv;	930	object *op = inv;
964		931
965	while (op)	932	while (op)
966	{	933	{
967	object *tmp = op->below;	934	object *tmp = op->below;
968	op->free (free_inventory);	935	op->destroy (destroy_inventory);
969	op = tmp;	936	op = tmp;
970	}	937	}
971	}	938	}
972	else	939	else
973	{ /* Put objects in inventory onto this space */	940	{ /* Put objects in inventory onto this space */
…		…
992	op = tmp;	959	op = tmp;
993	}	960	}
994	}	961	}
995	}	962	}
996		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
997	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;
998		991
999	/* Remove object from the active list */	992	/* Remove object from the active list */
1000	speed = 0;	993	speed = 0;
1001	update_ob_speed (this);	994	update_ob_speed (this);
1002		995
…		…
1014	sub_weight (object *op, signed long weight)	1007	sub_weight (object *op, signed long weight)
1015	{	1008	{
1016	while (op != NULL)	1009	while (op != NULL)
1017	{	1010	{
1018	if (op->type == CONTAINER)	1011	if (op->type == CONTAINER)
1019	{
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1012	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021	}	1013
1022	op->carrying -= weight;	1014	op->carrying -= weight;
1023	op = op->env;	1015	op = op->env;
1024	}	1016	}
1025	}	1017	}
1026		1018
…		…
1034	*/	1026	*/
1035		1027
1036	void	1028	void
1037	remove_ob (object *op)	1029	remove_ob (object *op)
1038	{	1030	{
		1031	object tmp, last = 0;
1039	object *	1032	object *otmp;
1040	tmp, *
1041	last = NULL;
1042	object *
1043	otmp;
1044		1033
1045	tag_t
1046	tag;
1047	int
1048	check_walk_off;	1034	int check_walk_off;
1049	mapstruct *	1035	maptile *m;
1050	m;
1051		1036
1052	sint16	1037	sint16 x, y;
1053	x,
1054	y;
1055		1038
1056	if (QUERY_FLAG (op, FLAG_REMOVED))	1039	if (QUERY_FLAG (op, FLAG_REMOVED))
1057	return;	1040	return;
1058		1041
1059	SET_FLAG (op, FLAG_REMOVED);	1042	SET_FLAG (op, FLAG_REMOVED);
…		…
1136	* use translated coordinates in case some oddness with map tiling is	1119	* use translated coordinates in case some oddness with map tiling is
1137	* evident	1120	* evident
1138	*/	1121	*/
1139	if (GET_MAP_OB (m, x, y) != op)	1122	if (GET_MAP_OB (m, x, y) != op)
1140	{	1123	{
1141	dump_object (op);	1124	char *dump = dump_object (op);
1142	LOG (llevError,	1125	LOG (llevError,
1143	"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);
1144	dump_object (GET_MAP_OB (m, x, y));	1128	dump = dump_object (GET_MAP_OB (m, x, y));
1145	LOG (llevError, "%s\n", errmsg);	1129	LOG (llevError, "%s\n", dump);
		1130	free (dump);
1146	}	1131	}
1147		1132
1148	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. */
1149	}	1134	}
1150		1135
…		…
1152	op->below = 0;	1137	op->below = 0;
1153		1138
1154	if (op->map->in_memory == MAP_SAVING)	1139	if (op->map->in_memory == MAP_SAVING)
1155	return;	1140	return;
1156		1141
1157	tag = op->count;
1158	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1142	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1159		1143
1160	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)
1161	{	1145	{
1162	/* 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
…		…
1177		1161
1178	tmp->contr->socket.update_look = 1;	1162	tmp->contr->socket.update_look = 1;
1179	}	1163	}
1180		1164
1181	/* See if player moving off should effect something */	1165	/* See if player moving off should effect something */
1182	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))
1183	{	1169	{
1184	move_apply (tmp, op, NULL);	1170	move_apply (tmp, op, NULL);
1185		1171
1186	if (was_destroyed (op, tag))	1172	if (op->destroyed ())
1187	{
1188	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 ());
1189	}
1190	}	1174	}
1191		1175
1192	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1176	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193		1177
1194	if (tmp->above == tmp)	1178	if (tmp->above == tmp)
…		…
1222	* This function goes through all objects below and including top, and	1206	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1207	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1208	* If top is NULL, it is calculated.
1225	* Returns pointer to object if it succeded in the merge, otherwise NULL	1209	* Returns pointer to object if it succeded in the merge, otherwise NULL
1226	*/	1210	*/
1227
1228	object *	1211	object *
1229	merge_ob (object op, object top)	1212	merge_ob (object op, object top)
1230	{	1213	{
1231	if (!op->nrof)	1214	if (!op->nrof)
1232	return 0;	1215	return 0;
…		…
1248	free_object (op);	1231	free_object (op);
1249	return top;	1232	return top;
1250	}	1233	}
1251	}	1234	}
1252		1235
1253	return NULL;	1236	return 0;
1254	}	1237	}
1255		1238
1256	/*	1239	/*
1257	* 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
1258	* job preparing multi-part monsters	1241	* job preparing multi-part monsters
1259	*/	1242	*/
1260	object *	1243	object *
1261	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)
1262	{	1245	{
1263	object *tmp;	1246	object *tmp;
1264		1247
1265	if (op->head)	1248	if (op->head)
1266	op = op->head;	1249	op = op->head;
…		…
1294	* NULL if 'op' was destroyed	1277	* NULL if 'op' was destroyed
1295	* just 'op' otherwise	1278	* just 'op' otherwise
1296	*/	1279	*/
1297		1280
1298	object *	1281	object *
1299	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)
1300	{	1283	{
1301	object tmp, top, *floor = NULL;	1284	object tmp, top, *floor = NULL;
1302	sint16 x, y;	1285	sint16 x, y;
1303		1286
1304	if (QUERY_FLAG (op, FLAG_FREED))	1287	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1307	return NULL;	1290	return NULL;
1308	}	1291	}
1309		1292
1310	if (m == NULL)	1293	if (m == NULL)
1311	{	1294	{
1312	dump_object (op);	1295	char *dump = dump_object (op);
1313	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);
1314	return op;	1298	return op;
1315	}	1299	}
1316		1300
1317	if (out_of_map (m, op->x, op->y))	1301	if (out_of_map (m, op->x, op->y))
1318	{	1302	{
1319	dump_object (op);	1303	char *dump = dump_object (op);
1320	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);
1321	#ifdef MANY_CORES	1305	#ifdef MANY_CORES
1322	/* 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
1323	* 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
1324	* improperly inserted.	1308	* improperly inserted.
1325	*/	1309	*/
1326	abort ();	1310	abort ();
1327	#endif	1311	#endif
		1312	free (dump);
1328	return op;	1313	return op;
1329	}	1314	}
1330		1315
1331	if (!QUERY_FLAG (op, FLAG_REMOVED))	1316	if (!QUERY_FLAG (op, FLAG_REMOVED))
1332	{	1317	{
1333	dump_object (op);	1318	char *dump = dump_object (op);
1334	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);
1335	return op;	1321	return op;
1336	}	1322	}
1337		1323
1338	if (op->more != NULL)	1324	if (op->more != NULL)
1339	{	1325	{
…		…
1585	remove_ob (tmp);	1571	remove_ob (tmp);
1586	free_object (tmp);	1572	free_object (tmp);
1587	}	1573	}
1588	}	1574	}
1589		1575
1590	tmp1 = arch_to_object (find_archetype (arch_string));	1576	tmp1 = arch_to_object (archetype::find (arch_string));
1591		1577
1592	tmp1->x = op->x;	1578	tmp1->x = op->x;
1593	tmp1->y = op->y;	1579	tmp1->y = op->y;
1594	insert_ob_in_map (tmp1, op->map, op, 0);	1580	insert_ob_in_map (tmp1, op->map, op, 0);
1595	}	1581	}
…		…
1776	tmp, *	1762	tmp, *
1777	otmp;	1763	otmp;
1778		1764
1779	if (!QUERY_FLAG (op, FLAG_REMOVED))	1765	if (!QUERY_FLAG (op, FLAG_REMOVED))
1780	{	1766	{
1781	dump_object (op);	1767	char *dump = dump_object (op);
1782	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);
1783	return op;	1770	return op;
1784	}	1771	}
1785		1772
1786	if (where == NULL)	1773	if (where == NULL)
1787	{	1774	{
1788	dump_object (op);	1775	char *dump = dump_object (op);
1789	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);
1790	return op;	1778	return op;
1791	}	1779	}
1792		1780
1793	if (where->head)	1781	if (where->head)
1794	{	1782	{
…		…
1894	*/	1882	*/
1895		1883
1896	int	1884	int
1897	check_move_on (object op, object originator)	1885	check_move_on (object op, object originator)
1898	{	1886	{
1899	object *	1887	object *tmp;
1900	tmp;	1888	maptile *m = op->map;
1901	tag_t
1902	tag;
1903	mapstruct *
1904	m = op->map;
1905	int
1906	x = op->x, y = op->y;	1889	int x = op->x, y = op->y;
1907		1890
1908	MoveType	1891	MoveType move_on, move_slow, move_block;
1909	move_on,
1910	move_slow,
1911	move_block;
1912		1892
1913	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1893	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914	return 0;	1894	return 0;
1915
1916	tag = op->count;
1917		1895
1918	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);
1919	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);
1920	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);
1921		1899
…		…
1982	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1960	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1983	((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))
1984	{	1962	{
1985	move_apply (tmp, op, originator);	1963	move_apply (tmp, op, originator);
1986		1964
1987	if (was_destroyed (op, tag))	1965	if (op->destroyed ())
1988	return 1;	1966	return 1;
1989		1967
1990	/* what the person/creature stepped onto has moved the object	1968	/* what the person/creature stepped onto has moved the object
1991	* someplace new. Don't process any further - if we did,	1969	* someplace new. Don't process any further - if we did,
1992	* have a feeling strange problems would result.	1970	* have a feeling strange problems would result.
…		…
2004	* a matching archetype at the given map and coordinates.	1982	* a matching archetype at the given map and coordinates.
2005	* The first matching object is returned, or NULL if none.	1983	* The first matching object is returned, or NULL if none.
2006	*/	1984	*/
2007		1985
2008	object *	1986	object *
2009	present_arch (const archetype at, mapstruct m, int x, int y)	1987	present_arch (const archetype at, maptile m, int x, int y)
2010	{	1988	{
2011	object *	1989	object *
2012	tmp;	1990	tmp;
2013		1991
2014	if (m == NULL \|\| out_of_map (m, x, y))	1992	if (m == NULL \|\| out_of_map (m, x, y))
…		…
2027	* a matching type variable at the given map and coordinates.	2005	* a matching type variable at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	2006	* The first matching object is returned, or NULL if none.
2029	*/	2007	*/
2030		2008
2031	object *	2009	object *
2032	present (unsigned char type, mapstruct *m, int x, int y)	2010	present (unsigned char type, maptile *m, int x, int y)
2033	{	2011	{
2034	object *	2012	object *
2035	tmp;	2013	tmp;
2036		2014
2037	if (out_of_map (m, x, y))	2015	if (out_of_map (m, x, y))
…		…
2177	* 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
2178	* customized, changed states, etc.	2156	* customized, changed states, etc.
2179	*/	2157	*/
2180		2158
2181	int	2159	int
2182	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)
2183	{	2161	{
2184	int	2162	int
2185	i,	2163	i,
2186	index = 0, flag;	2164	index = 0, flag;
2187	static int	2165	static int
…		…
2208	return -1;	2186	return -1;
2209	return altern[RANDOM () % index];	2187	return altern[RANDOM () % index];
2210	}	2188	}
2211		2189
2212	/*	2190	/*
2213	* find_first_free_spot(archetype, mapstruct, x, y) works like	2191	* find_first_free_spot(archetype, maptile, x, y) works like
2214	* find_free_spot(), but it will search max number of squares.	2192	* find_free_spot(), but it will search max number of squares.
2215	* 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.
2216	* 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.
2217	*/	2195	*/
2218		2196
2219	int	2197	int
2220	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)
2221	{	2199	{
2222	int	2200	int
2223	i;	2201	i;
2224		2202
2225	for (i = 0; i < SIZEOFFREE; i++)	2203	for (i = 0; i < SIZEOFFREE; i++)
…		…
2289	* 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
2290	* there is capable of.	2268	* there is capable of.
2291	*/	2269	*/
2292		2270
2293	int	2271	int
2294	find_dir (mapstruct m, int x, int y, object exclude)	2272	find_dir (maptile m, int x, int y, object exclude)
2295	{	2273	{
2296	int	2274	int
2297	i,	2275	i,
2298	max = SIZEOFFREE, mflags;	2276	max = SIZEOFFREE, mflags;
2299		2277
2300	sint16 nx, ny;	2278	sint16 nx, ny;
2301	object *	2279	object *
2302	tmp;	2280	tmp;
2303	mapstruct *	2281	maptile *
2304	mp;	2282	mp;
2305		2283
2306	MoveType blocked, move_type;	2284	MoveType blocked, move_type;
2307		2285
2308	if (exclude && exclude->head)	2286	if (exclude && exclude->head)
…		…
2516	* Modified to be map tile aware -.MSW	2494	* Modified to be map tile aware -.MSW
2517	*/	2495	*/
2518		2496
2519		2497
2520	int	2498	int
2521	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2499	can_see_monsterP (maptile *m, int x, int y, int dir)
2522	{	2500	{
2523	sint16 dx, dy;	2501	sint16 dx, dy;
2524	int	2502	int
2525	mflags;	2503	mflags;
2526		2504
…		…
2606	if (prev)	2584	if (prev)
2607	prev->more = tmp;	2585	prev->more = tmp;
2608	prev = tmp;	2586	prev = tmp;
2609	}	2587	}
2610		2588
2611	/* copy inventory */
2612	for (item = src->inv; item; item = item->below)	2589	for (item = src->inv; item; item = item->below)
2613	{
2614	(void) insert_ob_in_ob (object_create_clone (item), dst);	2590	insert_ob_in_ob (object_create_clone (item), dst);
2615	}
2616		2591
2617	return dst;	2592	return dst;
2618	}	2593	}
2619		2594
2620	/* return true if the object was destroyed, 0 otherwise */
2621	int
2622	was_destroyed (const object *op, tag_t old_tag)
2623	{
2624	/* checking for FLAG_FREED isn't necessary, but makes this function more
2625	* robust */
2626	return op->count != old_tag \|\| QUERY_FLAG (op, FLAG_FREED);
2627	}
2628
2629	/* GROS - Creates an object using a string representing its content. */	2595	/* GROS - Creates an object using a string representing its content. */
2630
2631	/* 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 */
2632
2633	/* 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, */
2634
2635	/* 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. */
2636
2637	/* 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. */
2638
2639	/* Also remember that multiparts objects are not supported for now. */	2600	/* Also remember that multiparts objects are not supported for now. */
2640		2601
2641	object *	2602	object *
2642	load_object_str (const char *obstr)	2603	load_object_str (const char *obstr)
2643	{	2604	{
2644	object *	2605	object *op;
2645	op;
2646	char
2647	filename[MAX_BUF];	2606	char filename[MAX_BUF];
2648		2607
2649	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2608	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650		2609
2651	FILE *
2652	tempfile = fopen (filename, "w");	2610	FILE *tempfile = fopen (filename, "w");
2653		2611
2654	if (tempfile == NULL)	2612	if (tempfile == NULL)
2655	{	2613	{
2656	LOG (llevError, "Error - Unable to access load object temp file\n");	2614	LOG (llevError, "Error - Unable to access load object temp file\n");
2657	return NULL;	2615	return NULL;
2658	};	2616	}
		2617
2659	fprintf (tempfile, obstr);	2618	fprintf (tempfile, obstr);
2660	fclose (tempfile);	2619	fclose (tempfile);
2661		2620
2662	op = get_object ();	2621	op = get_object ();
2663		2622
…		…
2677	* returns NULL if no match.	2636	* returns NULL if no match.
2678	*/	2637	*/
2679	object *	2638	object *
2680	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)
2681	{	2640	{
2682	object *	2641	object *tmp;
2683	tmp;
2684		2642
2685	for (tmp = who->inv; tmp; tmp = tmp->below)	2643	for (tmp = who->inv; tmp; tmp = tmp->below)
2686	if (tmp->type == type && tmp->subtype == subtype)	2644	if (tmp->type == type && tmp->subtype == subtype)
2687	return tmp;	2645	return tmp;
2688		2646
…		…
2696	* do the desired thing.	2654	* do the desired thing.
2697	*/	2655	*/
2698	key_value *	2656	key_value *
2699	get_ob_key_link (const object ob, const char key)	2657	get_ob_key_link (const object ob, const char key)
2700	{	2658	{
2701	key_value *	2659	key_value *link;
2702	link;
2703		2660
2704	for (link = ob->key_values; link != NULL; link = link->next)	2661	for (link = ob->key_values; link != NULL; link = link->next)
2705	{
2706	if (link->key == key)	2662	if (link->key == key)
2707	{
2708	return link;	2663	return link;
2709	}
2710	}
2711		2664
2712	return NULL;	2665	return NULL;
2713	}	2666	}
2714		2667
2715	/*	2668	/*
…		…
2720	* The returned string is shared.	2673	* The returned string is shared.
2721	*/	2674	*/
2722	const char *	2675	const char *
2723	get_ob_key_value (const object op, const char const key)	2676	get_ob_key_value (const object op, const char const key)
2724	{	2677	{
2725	key_value *	2678	key_value *link;
2726	link;	2679	shstr_cmp canonical_key (key);
2727	const char *
2728	canonical_key;
2729		2680
2730	canonical_key = shstr::find (key);
2731
2732	if (canonical_key == NULL)	2681	if (!canonical_key)
2733	{	2682	{
2734	/* 1. There being a field named key on any object	2683	/* 1. There being a field named key on any object
2735	* implies there'd be a shared string to find.	2684	* implies there'd be a shared string to find.
2736	* 2. Since there isn't, no object has this field.	2685	* 2. Since there isn't, no object has this field.
2737	* 3. Therefore, this object doesn't have this field.	2686	* 3. Therefore, this object doesn't have this field.
2738	*/	2687	*/
2739	return NULL;	2688	return 0;
2740	}	2689	}
2741		2690
2742	/* This is copied from get_ob_key_link() above -	2691	/* This is copied from get_ob_key_link() above -
2743	* only 4 lines, and saves the function call overhead.	2692	* only 4 lines, and saves the function call overhead.
2744	*/	2693	*/
2745	for (link = op->key_values; link != NULL; link = link->next)	2694	for (link = op->key_values; link; link = link->next)
2746	{
2747	if (link->key == canonical_key)	2695	if (link->key == canonical_key)
2748	{
2749	return link->value;	2696	return link->value;
2750	}	2697
2751	}
2752	return NULL;	2698	return 0;
2753	}	2699	}
2754		2700
2755		2701
2756	/*	2702	/*
2757	* Updates the canonical_key in op to value.	2703	* Updates the canonical_key in op to value.
…		…
2864	}	2810	}
2865	else	2811	else
2866	item = item->env;	2812	item = item->env;
2867	}	2813	}
2868		2814
		2815	// return a suitable string describing an objetc in enough detail to find it
		2816	const char *
		2817	object::debug_desc (char *info) const
		2818	{
		2819	char info2[256 * 3];
		2820	char *p = info;
		2821
		2822	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2823	count,
		2824	&name,
		2825	title ? " " : "",
		2826	title ? (const char *)title : "");
		2827
		2828	if (env)
		2829	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2830
		2831	if (map)
		2832	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2833
		2834	return info;
		2835	}
		2836
		2837	const char *
		2838	object::debug_desc () const
		2839	{
		2840	static char info[256 * 3];
		2841	return debug_desc (info);
		2842	}
		2843

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.34 by root, Tue Sep 12 01:09:53 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.34 by root, Tue Sep 12 01:09:53 2006 UTC vs.
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 2006 UTC