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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.163 by root, Sun Jul 1 05:00:17 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
21
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <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. */
28	#include <global.h>	27	#include <global.h>
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
34	#include <loader.h>	34	#include <loader.h>
35		35
36	#include <bitset>	36	#include <bitset>
37		37
38	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
324	sum_weight (object *op)	324	sum_weight (object *op)
325	{	325	{
326	long sum;	326	long sum;
327	object *inv;	327	object *inv;
328		328
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
330	{	330	{
331	if (inv->inv)	331	if (inv->inv)
332	sum_weight (inv);	332	sum_weight (inv);
		333
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}	335	}
335		336
336	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
337	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
357	/*	358	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.	360	* Some error messages.
360	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
361	*/	362	*/
362
363	char *	363	char *
364	dump_object (object *op)	364	dump_object (object *op)
365	{	365	{
366	if (!op)	366	if (!op)
367	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
368		368
369	object_freezer freezer;	369	object_freezer freezer;
370	save_object (freezer, op, 1);	370	op->write (freezer);
371	return freezer.as_string ();	371	return freezer.as_string ();
372	}	372	}
373		373
374	/*	374	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
449	owner = owner->owner;	449	owner = owner->owner;
450		450
451	this->owner = owner;	451	this->owner = owner;
452	}	452	}
453		453
		454	int
		455	object::slottype () const
		456	{
		457	if (type == SKILL)
		458	{
		459	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		460	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		461	}
		462	else
		463	{
		464	if (slot [body_combat].info) return slot_combat;
		465	if (slot [body_range ].info) return slot_ranged;
		466	}
		467
		468	return slot_none;
		469	}
		470
		471	bool
		472	object::change_weapon (object *ob)
		473	{
		474	if (current_weapon == ob)
		475	return true;
		476
		477	if (chosen_skill)
		478	chosen_skill->flag [FLAG_APPLIED] = false;
		479
		480	current_weapon = ob;
		481	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		482
		483	if (chosen_skill)
		484	chosen_skill->flag [FLAG_APPLIED] = true;
		485
		486	update_stats ();
		487
		488	if (ob)
		489	{
		490	// now check wether any body locations became invalid, in which case
		491	// we cannot apply the weapon at the moment.
		492	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		493	if (slot[i].used < 0)
		494	{
		495	current_weapon = chosen_skill = 0;
		496	update_stats ();
		497
		498	new_draw_info_format (NDI_UNIQUE, 0, this,
		499	"You try to balance all your items at once, "
		500	"but the %s is just too much for your body. "
		501	"[You need to unapply some items first.]", &ob->name);
		502	return false;
		503	}
		504
		505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		506	}
		507	else
		508	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		509
		510	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		511	{
		512	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
		513	&name, ob->debug_desc ());
		514	return false;
		515	}
		516
		517	return true;
		518	}
		519
454	/* Zero the key_values on op, decrementing the shared-string	520	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	521	* refcounts and freeing the links.
456	*/	522	*/
457	static void	523	static void
458	free_key_values (object *op)	524	free_key_values (object *op)
459	{	525	{
460	for (key_value *i = op->key_values; i != 0;)	526	for (key_value *i = op->key_values; i; )
461	{	527	{
462	key_value *next = i->next;	528	key_value *next = i->next;
463	delete i;	529	delete i;
464		530
465	i = next;	531	i = next;
466	}	532	}
467		533
468	op->key_values = 0;	534	op->key_values = 0;
469	}	535	}
470		536
471	/*	537	object &
472	* copy_to first frees everything allocated by the dst object,	538	object::operator =(const object &src)
473	* and then copies the contents of itself into the second
474	* object, allocating what needs to be allocated. Basically, any
475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
476	* if the first object is freed, the pointers in the new object
477	* will point at garbage.
478	*/
479	void
480	object::copy_to (object *dst)
481	{	539	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	540	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	541	bool is_removed = flag [FLAG_REMOVED];
484		542
485	(object_copy )dst = *this;	543	(object_copy )this = src;
486		544
487	if (is_freed)	545	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	546	flag [FLAG_REMOVED] = is_removed;
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495		547
496	/* Copy over key_values, if any. */	548	/* Copy over key_values, if any. */
497	if (key_values)	549	if (src.key_values)
498	{	550	{
499	key_value *tail = 0;	551	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	552	key_values = 0;
503		553
504	for (i = key_values; i; i = i->next)	554	for (key_value *i = src.key_values; i; i = i->next)
505	{	555	{
506	key_value *new_link = new key_value;	556	key_value *new_link = new key_value;
507		557
508	new_link->next = 0;	558	new_link->next = 0;
509	new_link->key = i->key;	559	new_link->key = i->key;
510	new_link->value = i->value;	560	new_link->value = i->value;
511		561
512	/* Try and be clever here, too. */	562	/* Try and be clever here, too. */
513	if (!dst->key_values)	563	if (!key_values)
514	{	564	{
515	dst->key_values = new_link;	565	key_values = new_link;
516	tail = new_link;	566	tail = new_link;
517	}	567	}
518	else	568	else
519	{	569	{
520	tail->next = new_link;	570	tail->next = new_link;
521	tail = new_link;	571	tail = new_link;
522	}	572	}
523	}	573	}
524	}	574	}
		575	}
		576
		577	/*
		578	* copy_to first frees everything allocated by the dst object,
		579	* and then copies the contents of itself into the second
		580	* object, allocating what needs to be allocated. Basically, any
		581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		582	* if the first object is freed, the pointers in the new object
		583	* will point at garbage.
		584	*/
		585	void
		586	object::copy_to (object *dst)
		587	{
		588	dst = this;
		589
		590	if (speed < 0)
		591	dst->speed_left = speed_left - rndm ();
525		592
526	dst->set_speed (dst->speed);	593	dst->set_speed (dst->speed);
		594	}
		595
		596	void
		597	object::instantiate ()
		598	{
		599	if (!uuid.seq) // HACK
		600	uuid = gen_uuid ();
		601
		602	speed_left = -0.1f;
		603	/* copy the body_info to the body_used - this is only really
		604	* need for monsters, but doesn't hurt to do it for everything.
		605	* by doing so, when a monster is created, it has good starting
		606	* values for the body_used info, so when items are created
		607	* for it, they can be properly equipped.
		608	*/
		609	for (int i = NUM_BODY_LOCATIONS; i--; )
		610	slot[i].used = slot[i].info;
		611
		612	attachable::instantiate ();
527	}	613	}
528		614
529	object *	615	object *
530	object::clone ()	616	object::clone ()
531	{	617	{
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	675	* UP_OBJ_FACE: only the objects face has changed.
590	*/	676	*/
591	void	677	void
592	update_object (object *op, int action)	678	update_object (object *op, int action)
593	{	679	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	680	if (op == NULL)
597	{	681	{
598	/* this should never happen */	682	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	683	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	684	return;
…		…
670	face = blank_face;	754	face = blank_face;
671	}	755	}
672		756
673	object::~object ()	757	object::~object ()
674	{	758	{
		759	unlink ();
		760
675	free_key_values (this);	761	free_key_values (this);
676	}	762	}
677		763
678	static int object_count;	764	static int object_count;
679		765
…		…
687	objects.insert (this);	773	objects.insert (this);
688	}	774	}
689		775
690	void object::unlink ()	776	void object::unlink ()
691	{	777	{
692	assert (index);//D	778	if (!index)
		779	return;
		780
693	objects.erase (this);	781	objects.erase (this);
694	refcnt_dec ();	782	refcnt_dec ();
695	}	783	}
696		784
697	void	785	void
…		…
771	* drop on that space.	859	* drop on that space.
772	*/	860	*/
773	if (!drop_to_ground	861	if (!drop_to_ground
774	\|\| !map	862	\|\| !map
775	\|\| map->in_memory != MAP_IN_MEMORY	863	\|\| map->in_memory != MAP_IN_MEMORY
		864	\|\| map->nodrop
776	\|\| ms ().move_block == MOVE_ALL)	865	\|\| ms ().move_block == MOVE_ALL)
777	{	866	{
778	while (inv)	867	while (inv)
779	{	868	{
780	inv->destroy_inv (drop_to_ground);	869	inv->destroy_inv (drop_to_ground);
…		…
847	map = freed_map;	936	map = freed_map;
848	x = 1;	937	x = 1;
849	y = 1;	938	y = 1;
850	}	939	}
851		940
852	head = 0;
853
854	if (more)	941	if (more)
855	{	942	{
856	more->destroy ();	943	more->destroy ();
857	more = 0;	944	more = 0;
858	}	945	}
859		946
		947	head = 0;
		948
860	// clear those pointers that likely might have circular references to us	949	// clear those pointers that likely might cause circular references
861	owner = 0;	950	owner = 0;
862	enemy = 0;	951	enemy = 0;
863	attacked_by = 0;	952	attacked_by = 0;
		953	current_weapon = 0;
864	}	954	}
865		955
866	void	956	void
867	object::destroy (bool destroy_inventory)	957	object::destroy (bool destroy_inventory)
868	{	958	{
…		…
896	* This function removes the object op from the linked list of objects	986	* This function removes the object op from the linked list of objects
897	* which it is currently tied to. When this function is done, the	987	* which it is currently tied to. When this function is done, the
898	* object will have no environment. If the object previously had an	988	* object will have no environment. If the object previously had an
899	* environment, the x and y coordinates will be updated to	989	* environment, the x and y coordinates will be updated to
900	* the previous environment.	990	* the previous environment.
901	* Beware: This function is called from the editor as well!
902	*/	991	*/
903	void	992	void
904	object::remove ()	993	object::do_remove ()
905	{	994	{
906	object tmp, last = 0;	995	object tmp, last = 0;
907	object *otmp;	996	object *otmp;
908		997
909	if (QUERY_FLAG (this, FLAG_REMOVED))	998	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
952	}	1041	}
953	else if (map)	1042	else if (map)
954	{	1043	{
955	if (type == PLAYER)	1044	if (type == PLAYER)
956	{	1045	{
		1046	// leaving a spot always closes any open container on the ground
		1047	if (container && !container->env)
		1048	// this causes spurious floorbox updates, but it ensures
		1049	// that the CLOSE event is being sent.
		1050	close_container ();
		1051
957	--map->players;	1052	--map->players;
958	map->touch ();	1053	map->touch ();
959	}	1054	}
960		1055
961	map->dirty = true;	1056	map->dirty = true;
		1057	mapspace &ms = this->ms ();
962		1058
963	/* link the object above us */	1059	/* link the object above us */
964	if (above)	1060	if (above)
965	above->below = below;	1061	above->below = below;
966	else	1062	else
967	map->at (x, y).top = below; /* we were top, set new top */	1063	ms.top = below; /* we were top, set new top */
968		1064
969	/* Relink the object below us, if there is one */	1065	/* Relink the object below us, if there is one */
970	if (below)	1066	if (below)
971	below->above = above;	1067	below->above = above;
972	else	1068	else
…		…
974	/* Nothing below, which means we need to relink map object for this space	1070	/* Nothing below, which means we need to relink map object for this space
975	* use translated coordinates in case some oddness with map tiling is	1071	* use translated coordinates in case some oddness with map tiling is
976	* evident	1072	* evident
977	*/	1073	*/
978	if (GET_MAP_OB (map, x, y) != this)	1074	if (GET_MAP_OB (map, x, y) != this)
979	{
980	char *dump = dump_object (this);
981	LOG (llevError,
982	"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);	1075	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 ());
983	free (dump);
984	dump = dump_object (GET_MAP_OB (map, x, y));
985	LOG (llevError, "%s\n", dump);
986	free (dump);
987	}
988		1076
989	map->at (x, y).bot = above; /* goes on above it. */	1077	ms.bot = above; /* goes on above it. */
990	}	1078	}
991		1079
992	above = 0;	1080	above = 0;
993	below = 0;	1081	below = 0;
994		1082
995	if (map->in_memory == MAP_SAVING)	1083	if (map->in_memory == MAP_SAVING)
996	return;	1084	return;
997		1085
998	int check_walk_off = !flag [FLAG_NO_APPLY];	1086	int check_walk_off = !flag [FLAG_NO_APPLY];
999		1087
1000	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1088	for (tmp = ms.bot; tmp; tmp = tmp->above)
1001	{	1089	{
1002	/* No point updating the players look faces if he is the object	1090	/* No point updating the players look faces if he is the object
1003	* being removed.	1091	* being removed.
1004	*/	1092	*/
1005		1093
…		…
1028		1116
1029	if (destroyed ())	1117	if (destroyed ())
1030	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1118	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1031	}	1119	}
1032		1120
1033	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1034	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1035	if (tmp->above == tmp)
1036	tmp->above = 0;
1037
1038	last = tmp;	1121	last = tmp;
1039	}	1122	}
1040		1123
1041	/* last == NULL if there are no objects on this space */	1124	/* last == NULL if there are no objects on this space */
1042	//TODO: this makes little sense, why only update the topmost object?	1125	//TODO: this makes little sense, why only update the topmost object?
…		…
1085	}	1168	}
1086		1169
1087	return 0;	1170	return 0;
1088	}	1171	}
1089		1172
		1173	void
		1174	object::expand_tail ()
		1175	{
		1176	if (more)
		1177	return;
		1178
		1179	object *prev = this;
		1180
		1181	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
		1182	{
		1183	object *op = arch_to_object (at);
		1184
		1185	op->name = name;
		1186	op->name_pl = name_pl;
		1187	op->title = title;
		1188
		1189	op->head = this;
		1190	prev->more = op;
		1191
		1192	prev = op;
		1193	}
		1194	}
		1195
1090	/*	1196	/*
1091	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1197	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1092	* job preparing multi-part monsters	1198	* job preparing multi-part monsters.
1093	*/	1199	*/
1094	object *	1200	object *
1095	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1201	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1096	{	1202	{
1097	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1203	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1098	{	1204	{
1099	tmp->x = x + tmp->arch->clone.x;	1205	tmp->x = x + tmp->arch->x;
1100	tmp->y = y + tmp->arch->clone.y;	1206	tmp->y = y + tmp->arch->y;
1101	}	1207	}
1102		1208
1103	return insert_ob_in_map (op, m, originator, flag);	1209	return insert_ob_in_map (op, m, originator, flag);
1104	}	1210	}
1105		1211
…		…
1124	* just 'op' otherwise	1230	* just 'op' otherwise
1125	*/	1231	*/
1126	object *	1232	object *
1127	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1233	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1128	{	1234	{
		1235	assert (!op->flag [FLAG_FREED]);
		1236
1129	object tmp, top, *floor = NULL;	1237	object top, floor = NULL;
1130	sint16 x, y;
1131		1238
1132	if (QUERY_FLAG (op, FLAG_FREED))	1239	op->remove ();
1133	{
1134	LOG (llevError, "Trying to insert freed object!\n");
1135	return NULL;
1136	}
1137		1240
1138	if (!m)	1241	#if 0
1139	{	1242	if (!m->active != !op->active)
1140	char *dump = dump_object (op);	1243	if (m->active)
1141	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1244	op->activate_recursive ();
1142	free (dump);	1245	else
1143	return op;	1246	op->deactivate_recursive ();
1144	}	1247	#endif
1145		1248
1146	if (out_of_map (m, op->x, op->y))	1249	if (out_of_map (m, op->x, op->y))
1147	{	1250	{
1148	char *dump = dump_object (op);
1149	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1251	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1150	#ifdef MANY_CORES	1252	#ifdef MANY_CORES
1151	/* Better to catch this here, as otherwise the next use of this object	1253	/* Better to catch this here, as otherwise the next use of this object
1152	* is likely to cause a crash. Better to find out where it is getting	1254	* is likely to cause a crash. Better to find out where it is getting
1153	* improperly inserted.	1255	* improperly inserted.
1154	*/	1256	*/
1155	abort ();	1257	abort ();
1156	#endif	1258	#endif
1157	free (dump);
1158	return op;	1259	return op;
1159	}	1260	}
1160		1261
1161	if (!QUERY_FLAG (op, FLAG_REMOVED))	1262	if (object *more = op->more)
1162	{	1263	if (!insert_ob_in_map (more, m, originator, flag))
1163	char *dump = dump_object (op);
1164	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1165	free (dump);
1166	return op;	1264	return 0;
1167	}
1168
1169	if (op->more)
1170	{
1171	/* The part may be on a different map. */
1172
1173	object *more = op->more;
1174
1175	/* We really need the caller to normalise coordinates - if
1176	* we set the map, that doesn't work if the location is within
1177	* a map and this is straddling an edge. So only if coordinate
1178	* is clear wrong do we normalise it.
1179	*/
1180	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1181	more->map = get_map_from_coord (m, &more->x, &more->y);
1182	else if (!more->map)
1183	{
1184	/* For backwards compatibility - when not dealing with tiled maps,
1185	* more->map should always point to the parent.
1186	*/
1187	more->map = m;
1188	}
1189
1190	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1191	{
1192	if (!op->head)
1193	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1194
1195	return 0;
1196	}
1197	}
1198		1265
1199	CLEAR_FLAG (op, FLAG_REMOVED);	1266	CLEAR_FLAG (op, FLAG_REMOVED);
1200		1267
1201	/* Ideally, the caller figures this out. However, it complicates a lot	1268	/* Ideally, the caller figures this out. However, it complicates a lot
1202	* of areas of callers (eg, anything that uses find_free_spot would now	1269	* of areas of callers (eg, anything that uses find_free_spot would now
1203	* need extra work	1270	* need extra work
1204	*/	1271	*/
1205	op->map = get_map_from_coord (m, &op->x, &op->y);	1272	if (!xy_normalise (m, op->x, op->y))
1206	x = op->x;	1273	return 0;
1207	y = op->y;	1274
		1275	op->map = m;
		1276	mapspace &ms = op->ms ();
1208		1277
1209	/* this has to be done after we translate the coordinates.	1278	/* this has to be done after we translate the coordinates.
1210	*/	1279	*/
1211	if (op->nrof && !(flag & INS_NO_MERGE))	1280	if (op->nrof && !(flag & INS_NO_MERGE))
1212	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1281	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1213	if (object::can_merge (op, tmp))	1282	if (object::can_merge (op, tmp))
1214	{	1283	{
1215	op->nrof += tmp->nrof;	1284	op->nrof += tmp->nrof;
1216	tmp->destroy ();	1285	tmp->destroy ();
1217	}	1286	}
…		…
1234	op->below = originator->below;	1303	op->below = originator->below;
1235		1304
1236	if (op->below)	1305	if (op->below)
1237	op->below->above = op;	1306	op->below->above = op;
1238	else	1307	else
1239	op->ms ().bot = op;	1308	ms.bot = op;
1240		1309
1241	/* since below originator, no need to update top */	1310	/* since below originator, no need to update top */
1242	originator->below = op;	1311	originator->below = op;
1243	}	1312	}
1244	else	1313	else
1245	{	1314	{
		1315	top = ms.bot;
		1316
1246	/* If there are other objects, then */	1317	/* If there are other objects, then */
1247	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1318	if ((!(flag & INS_MAP_LOAD)) && top)
1248	{	1319	{
1249	object *last = 0;	1320	object *last = 0;
1250		1321
1251	/*	1322	/*
1252	* If there are multiple objects on this space, we do some trickier handling.	1323	* If there are multiple objects on this space, we do some trickier handling.
…		…
1258	* once we get to them. This reduces the need to traverse over all of	1329	* once we get to them. This reduces the need to traverse over all of
1259	* them when adding another one - this saves quite a bit of cpu time	1330	* them when adding another one - this saves quite a bit of cpu time
1260	* when lots of spells are cast in one area. Currently, it is presumed	1331	* when lots of spells are cast in one area. Currently, it is presumed
1261	* that flying non pickable objects are spell objects.	1332	* that flying non pickable objects are spell objects.
1262	*/	1333	*/
1263	while (top)	1334	for (top = ms.bot; top; top = top->above)
1264	{	1335	{
1265	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1336	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1266	floor = top;	1337	floor = top;
1267		1338
1268	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1339	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1271	top = top->below;	1342	top = top->below;
1272	break;	1343	break;
1273	}	1344	}
1274		1345
1275	last = top;	1346	last = top;
1276	top = top->above;
1277	}	1347	}
1278		1348
1279	/* Don't want top to be NULL, so set it to the last valid object */	1349	/* Don't want top to be NULL, so set it to the last valid object */
1280	top = last;	1350	top = last;
1281		1351
…		…
1283	* looks like instead of lots of conditions here.	1353	* looks like instead of lots of conditions here.
1284	* makes things faster, and effectively the same result.	1354	* makes things faster, and effectively the same result.
1285	*/	1355	*/
1286		1356
1287	/* Have object 'fall below' other objects that block view.	1357	/* Have object 'fall below' other objects that block view.
1288	* Unless those objects are exits, type 66	1358	* Unless those objects are exits.
1289	* If INS_ON_TOP is used, don't do this processing	1359	* If INS_ON_TOP is used, don't do this processing
1290	* Need to find the object that in fact blocks view, otherwise	1360	* Need to find the object that in fact blocks view, otherwise
1291	* stacking is a bit odd.	1361	* stacking is a bit odd.
1292	*/	1362	*/
1293	if (!(flag & INS_ON_TOP) &&	1363	if (!(flag & INS_ON_TOP)
1294	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1364	&& ms.flags () & P_BLOCKSVIEW
		1365	&& (op->face && !faces [op->face].visibility))
1295	{	1366	{
1296	for (last = top; last != floor; last = last->below)	1367	for (last = top; last != floor; last = last->below)
1297	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1368	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1298	break;	1369	break;
		1370
1299	/* Check to see if we found the object that blocks view,	1371	/* Check to see if we found the object that blocks view,
1300	* and make sure we have a below pointer for it so that	1372	* and make sure we have a below pointer for it so that
1301	* we can get inserted below this one, which requires we	1373	* we can get inserted below this one, which requires we
1302	* set top to the object below us.	1374	* set top to the object below us.
1303	*/	1375	*/
…		…
1305	top = last->below;	1377	top = last->below;
1306	}	1378	}
1307	} /* If objects on this space */	1379	} /* If objects on this space */
1308		1380
1309	if (flag & INS_MAP_LOAD)	1381	if (flag & INS_MAP_LOAD)
1310	top = GET_MAP_TOP (op->map, op->x, op->y);	1382	top = ms.top;
1311		1383
1312	if (flag & INS_ABOVE_FLOOR_ONLY)	1384	if (flag & INS_ABOVE_FLOOR_ONLY)
1313	top = floor;	1385	top = floor;
1314		1386
1315	/* Top is the object that our object (op) is going to get inserted above.	1387	/* Top is the object that our object (op) is going to get inserted above.
1316	*/	1388	*/
1317		1389
1318	/* First object on this space */	1390	/* First object on this space */
1319	if (!top)	1391	if (!top)
1320	{	1392	{
1321	op->above = GET_MAP_OB (op->map, op->x, op->y);	1393	op->above = ms.bot;
1322		1394
1323	if (op->above)	1395	if (op->above)
1324	op->above->below = op;	1396	op->above->below = op;
1325		1397
1326	op->below = 0;	1398	op->below = 0;
1327	op->ms ().bot = op;	1399	ms.bot = op;
1328	}	1400	}
1329	else	1401	else
1330	{ /* get inserted into the stack above top */	1402	{ /* get inserted into the stack above top */
1331	op->above = top->above;	1403	op->above = top->above;
1332		1404
…		…
1336	op->below = top;	1408	op->below = top;
1337	top->above = op;	1409	top->above = op;
1338	}	1410	}
1339		1411
1340	if (!op->above)	1412	if (!op->above)
1341	op->ms ().top = op;	1413	ms.top = op;
1342	} /* else not INS_BELOW_ORIGINATOR */	1414	} /* else not INS_BELOW_ORIGINATOR */
1343		1415
1344	if (op->type == PLAYER)	1416	if (op->type == PLAYER)
1345	{	1417	{
1346	op->contr->do_los = 1;	1418	op->contr->do_los = 1;
…		…
1352		1424
1353	/* If we have a floor, we know the player, if any, will be above	1425	/* If we have a floor, we know the player, if any, will be above
1354	* it, so save a few ticks and start from there.	1426	* it, so save a few ticks and start from there.
1355	*/	1427	*/
1356	if (!(flag & INS_MAP_LOAD))	1428	if (!(flag & INS_MAP_LOAD))
1357	if (object *pl = op->ms ().player ())	1429	if (object *pl = ms.player ())
1358	if (pl->contr->ns)	1430	if (pl->contr->ns)
1359	pl->contr->ns->floorbox_update ();	1431	pl->contr->ns->floorbox_update ();
1360		1432
1361	/* If this object glows, it may affect lighting conditions that are	1433	/* If this object glows, it may affect lighting conditions that are
1362	* visible to others on this map. But update_all_los is really	1434	* visible to others on this map. But update_all_los is really
…		…
1383	* blocked() and wall() work properly), and these flags are updated by	1455	* blocked() and wall() work properly), and these flags are updated by
1384	* update_object().	1456	* update_object().
1385	*/	1457	*/
1386		1458
1387	/* if this is not the head or flag has been passed, don't check walk on status */	1459	/* if this is not the head or flag has been passed, don't check walk on status */
1388	if (!(flag & INS_NO_WALK_ON) && !op->head)	1460	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1389	{	1461	{
1390	if (check_move_on (op, originator))	1462	if (check_move_on (op, originator))
1391	return 0;	1463	return 0;
1392		1464
1393	/* If we are a multi part object, lets work our way through the check	1465	/* If we are a multi part object, lets work our way through the check
1394	* walk on's.	1466	* walk on's.
1395	*/	1467	*/
1396	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1468	for (object *tmp = op->more; tmp; tmp = tmp->more)
1397	if (check_move_on (tmp, originator))	1469	if (check_move_on (tmp, originator))
1398	return 0;	1470	return 0;
1399	}	1471	}
1400		1472
1401	return op;	1473	return op;
…		…
1411	object tmp, tmp1;	1483	object tmp, tmp1;
1412		1484
1413	/* first search for itself and remove any old instances */	1485	/* first search for itself and remove any old instances */
1414		1486
1415	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1487	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1416	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1488	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1417	tmp->destroy ();	1489	tmp->destroy ();
1418		1490
1419	tmp1 = arch_to_object (archetype::find (arch_string));	1491	tmp1 = arch_to_object (archetype::find (arch_string));
1420		1492
1421	tmp1->x = op->x;	1493	tmp1->x = op->x;
…		…
1424	}	1496	}
1425		1497
1426	object *	1498	object *
1427	object::insert_at (object where, object originator, int flags)	1499	object::insert_at (object where, object originator, int flags)
1428	{	1500	{
1429	where->map->insert (this, where->x, where->y, originator, flags);	1501	return where->map->insert (this, where->x, where->y, originator, flags);
1430	}	1502	}
1431		1503
1432	/*	1504	/*
1433	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1505	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1434	* is returned contains nr objects, and the remaining parts contains	1506	* is returned contains nr objects, and the remaining parts contains
…		…
1474	* the amount of an object. If the amount reaches 0, the object	1546	* the amount of an object. If the amount reaches 0, the object
1475	* is subsequently removed and freed.	1547	* is subsequently removed and freed.
1476	*	1548	*
1477	* Return value: 'op' if something is left, NULL if the amount reached 0	1549	* Return value: 'op' if something is left, NULL if the amount reached 0
1478	*/	1550	*/
1479
1480	object *	1551	object *
1481	decrease_ob_nr (object *op, uint32 i)	1552	decrease_ob_nr (object *op, uint32 i)
1482	{	1553	{
1483	object *tmp;	1554	object *tmp;
1484		1555
…		…
1559		1630
1560	/*	1631	/*
1561	* add_weight(object, weight) adds the specified weight to an object,	1632	* add_weight(object, weight) adds the specified weight to an object,
1562	* and also updates how much the environment(s) is/are carrying.	1633	* and also updates how much the environment(s) is/are carrying.
1563	*/	1634	*/
1564
1565	void	1635	void
1566	add_weight (object *op, signed long weight)	1636	add_weight (object *op, signed long weight)
1567	{	1637	{
1568	while (op != NULL)	1638	while (op != NULL)
1569	{	1639	{
…		…
1584	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1654	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1585	free (dump);	1655	free (dump);
1586	return op;	1656	return op;
1587	}	1657	}
1588		1658
1589	if (where->head)	1659	if (where->head_ () != where)
1590	{	1660	{
1591	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1661	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1592	where = where->head;	1662	where = where->head;
1593	}	1663	}
1594		1664
1595	return where->insert (op);	1665	return where->insert (op);
1596	}	1666	}
…		…
1601	* inside the object environment.	1671	* inside the object environment.
1602	*	1672	*
1603	* The function returns now pointer to inserted item, and return value can	1673	* The function returns now pointer to inserted item, and return value can
1604	* be != op, if items are merged. -Tero	1674	* be != op, if items are merged. -Tero
1605	*/	1675	*/
1606
1607	object *	1676	object *
1608	object::insert (object *op)	1677	object::insert (object *op)
1609	{	1678	{
1610	object tmp, otmp;	1679	object tmp, otmp;
1611		1680
…		…
1771	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1840	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1772	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1841	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1773	{	1842	{
1774		1843
1775	float	1844	float
1776	diff = tmp->move_slow_penalty * FABS (op->speed);	1845	diff = tmp->move_slow_penalty * fabs (op->speed);
1777		1846
1778	if (op->type == PLAYER)	1847	if (op->type == PLAYER)
1779	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1848	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1780	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1849	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1781	diff /= 4.0;	1850	diff /= 4.0;
…		…
1925	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1994	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1926	{	1995	{
1927	CLEAR_FLAG (tmp, flag);	1996	CLEAR_FLAG (tmp, flag);
1928	unflag_inv (tmp, flag);	1997	unflag_inv (tmp, flag);
1929	}	1998	}
1930	}
1931
1932	/*
1933	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1934	* all it's inventory (recursively).
1935	* If checksums are used, a player will get set_cheat called for
1936	* him/her-self and all object carried by a call to this function.
1937	*/
1938	void
1939	set_cheat (object *op)
1940	{
1941	SET_FLAG (op, FLAG_WAS_WIZ);
1942	flag_inv (op, FLAG_WAS_WIZ);
1943	}	1999	}
1944		2000
1945	/*	2001	/*
1946	* find_free_spot(object, map, x, y, start, stop) will search for	2002	* find_free_spot(object, map, x, y, start, stop) will search for
1947	* a spot at the given map and coordinates which will be able to contain	2003	* a spot at the given map and coordinates which will be able to contain
…		…
1988	}	2044	}
1989		2045
1990	if (!index)	2046	if (!index)
1991	return -1;	2047	return -1;
1992		2048
1993	return altern[RANDOM () % index];	2049	return altern [rndm (index)];
1994	}	2050	}
1995		2051
1996	/*	2052	/*
1997	* find_first_free_spot(archetype, maptile, x, y) works like	2053	* find_first_free_spot(archetype, maptile, x, y) works like
1998	* find_free_spot(), but it will search max number of squares.	2054	* find_free_spot(), but it will search max number of squares.
…		…
2019	{	2075	{
2020	arr += begin;	2076	arr += begin;
2021	end -= begin;	2077	end -= begin;
2022		2078
2023	while (--end)	2079	while (--end)
2024	swap (arr [end], arr [RANDOM () % (end + 1)]);	2080	swap (arr [end], arr [rndm (end + 1)]);
2025	}	2081	}
2026		2082
2027	/* new function to make monster searching more efficient, and effective!	2083	/* new function to make monster searching more efficient, and effective!
2028	* This basically returns a randomized array (in the passed pointer) of	2084	* This basically returns a randomized array (in the passed pointer) of
2029	* the spaces to find monsters. In this way, it won't always look for	2085	* the spaces to find monsters. In this way, it won't always look for
…		…
2065	object *tmp;	2121	object *tmp;
2066	maptile *mp;	2122	maptile *mp;
2067		2123
2068	MoveType blocked, move_type;	2124	MoveType blocked, move_type;
2069		2125
2070	if (exclude && exclude->head)	2126	if (exclude && exclude->head_ () != exclude)
2071	{	2127	{
2072	exclude = exclude->head;	2128	exclude = exclude->head;
2073	move_type = exclude->move_type;	2129	move_type = exclude->move_type;
2074	}	2130	}
2075	else	2131	else
…		…
2098	max = maxfree[i];	2154	max = maxfree[i];
2099	else if (mflags & P_IS_ALIVE)	2155	else if (mflags & P_IS_ALIVE)
2100	{	2156	{
2101	for (tmp = ms.bot; tmp; tmp = tmp->above)	2157	for (tmp = ms.bot; tmp; tmp = tmp->above)
2102	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2158	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2103	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2159	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104	break;	2160	break;
2105		2161
2106	if (tmp)	2162	if (tmp)
2107	return freedir[i];	2163	return freedir[i];
2108	}	2164	}
…		…
2163		2219
2164	return 3;	2220	return 3;
2165	}	2221	}
2166		2222
2167	/*	2223	/*
2168	* absdir(int): Returns a number between 1 and 8, which represent
2169	* the "absolute" direction of a number (it actually takes care of
2170	* "overflow" in previous calculations of a direction).
2171	*/
2172
2173	int
2174	absdir (int d)
2175	{
2176	while (d < 1)
2177	d += 8;
2178
2179	while (d > 8)
2180	d -= 8;
2181
2182	return d;
2183	}
2184
2185	/*
2186	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2224	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2187	* between two directions (which are expected to be absolute (see absdir())	2225	* between two directions (which are expected to be absolute (see absdir())
2188	*/	2226	*/
2189
2190	int	2227	int
2191	dirdiff (int dir1, int dir2)	2228	dirdiff (int dir1, int dir2)
2192	{	2229	{
2193	int d;	2230	int d;
2194		2231
…		…
2322	* create clone from object to another	2359	* create clone from object to another
2323	*/	2360	*/
2324	object *	2361	object *
2325	object_create_clone (object *asrc)	2362	object_create_clone (object *asrc)
2326	{	2363	{
2327	object dst = 0, tmp, src, part, prev, item;	2364	object dst = 0, tmp, src, prev, *item;
2328		2365
2329	if (!asrc)	2366	if (!asrc)
2330	return 0;	2367	return 0;
2331		2368
2332	src = asrc;
2333	if (src->head)
2334	src = src->head;	2369	src = asrc->head_ ();
2335		2370
2336	prev = 0;	2371	prev = 0;
2337	for (part = src; part; part = part->more)	2372	for (object *part = src; part; part = part->more)
2338	{	2373	{
2339	tmp = part->clone ();	2374	tmp = part->clone ();
2340	tmp->x -= src->x;	2375	tmp->x -= src->x;
2341	tmp->y -= src->y;	2376	tmp->y -= src->y;
2342		2377
…		…
2360	insert_ob_in_ob (object_create_clone (item), dst);	2395	insert_ob_in_ob (object_create_clone (item), dst);
2361		2396
2362	return dst;	2397	return dst;
2363	}	2398	}
2364		2399
2365	/* GROS - Creates an object using a string representing its content. */
2366	/* Basically, we save the content of the string to a temp file, then call */
2367	/* load_object on it. I admit it is a highly inefficient way to make things, */
2368	/* but it was simple to make and allows reusing the load_object function. */
2369	/* Remember not to use load_object_str in a time-critical situation. */
2370	/* Also remember that multiparts objects are not supported for now. */
2371	object *
2372	load_object_str (const char *obstr)
2373	{
2374	object *op;
2375	char filename[MAX_BUF];
2376
2377	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2378
2379	FILE *tempfile = fopen (filename, "w");
2380
2381	if (tempfile == NULL)
2382	{
2383	LOG (llevError, "Error - Unable to access load object temp file\n");
2384	return NULL;
2385	}
2386
2387	fprintf (tempfile, obstr);
2388	fclose (tempfile);
2389
2390	op = object::create ();
2391
2392	object_thawer thawer (filename);
2393
2394	if (thawer)
2395	load_object (thawer, op, 0);
2396
2397	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2398	CLEAR_FLAG (op, FLAG_REMOVED);
2399
2400	return op;
2401	}
2402
2403	/* This returns the first object in who's inventory that	2400	/* This returns the first object in who's inventory that
2404	* has the same type and subtype match.	2401	* has the same type and subtype match.
2405	* returns NULL if no match.	2402	* returns NULL if no match.
2406	*/	2403	*/
2407	object *	2404	object *
…		…
2460	if (link->key == canonical_key)	2457	if (link->key == canonical_key)
2461	return link->value;	2458	return link->value;
2462		2459
2463	return 0;	2460	return 0;
2464	}	2461	}
2465
2466		2462
2467	/*	2463	/*
2468	* Updates the canonical_key in op to value.	2464	* Updates the canonical_key in op to value.
2469	*	2465	*
2470	* canonical_key is a shared string (value doesn't have to be).	2466	* canonical_key is a shared string (value doesn't have to be).
…		…
2494	/* Basically, if the archetype has this key set,	2490	/* Basically, if the archetype has this key set,
2495	* we need to store the null value so when we save	2491	* we need to store the null value so when we save
2496	* it, we save the empty value so that when we load,	2492	* it, we save the empty value so that when we load,
2497	* we get this value back again.	2493	* we get this value back again.
2498	*/	2494	*/
2499	if (get_ob_key_link (&op->arch->clone, canonical_key))	2495	if (get_ob_key_link (op->arch, canonical_key))
2500	field->value = 0;	2496	field->value = 0;
2501	else	2497	else
2502	{	2498	{
2503	if (last)	2499	if (last)
2504	last->next = field->next;	2500	last->next = field->next;
…		…
2573	}	2569	}
2574	else	2570	else
2575	item = item->env;	2571	item = item->env;
2576	}	2572	}
2577		2573
2578
2579	const char *	2574	const char *
2580	object::flag_desc (char *desc, int len) const	2575	object::flag_desc (char *desc, int len) const
2581	{	2576	{
2582	char *p = desc;	2577	char *p = desc;
2583	bool first = true;	2578	bool first = true;
…		…
2610	{	2605	{
2611	char flagdesc[512];	2606	char flagdesc[512];
2612	char info2[256 * 4];	2607	char info2[256 * 4];
2613	char *p = info;	2608	char *p = info;
2614		2609
2615	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2610	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2616	count, uuid.seq,	2611	count, uuid.seq,
2617	&name,	2612	&name,
2618	title ? "\",title:" : "",	2613	title ? "\",title:\"" : "",
2619	title ? (const char *)title : "",	2614	title ? (const char *)title : "",
2620	flag_desc (flagdesc, 512), type);	2615	flag_desc (flagdesc, 512), type);
2621		2616
2622	if (env)	2617	if (env)
2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2629	}	2624	}
2630		2625
2631	const char *	2626	const char *
2632	object::debug_desc () const	2627	object::debug_desc () const
2633	{	2628	{
2634	static char info[256 * 4];	2629	static char info[3][256 * 4];
		2630	static int info_idx;
		2631
2635	return debug_desc (info);	2632	return debug_desc (info [++info_idx % 3]);
2636	}	2633	}
2637		2634
		2635	struct region *
		2636	object::region () const
		2637	{
		2638	return map ? map->region (x, y)
		2639	: region::default_region ();
		2640	}
		2641
		2642	const materialtype_t *
		2643	object::dominant_material () const
		2644	{
		2645	if (materialtype_t *mat = name_to_material (materialname))
		2646	return mat;
		2647
		2648	// omfg this is slow, this has to be temporary :)
		2649	shstr unknown ("unknown");
		2650
		2651	return name_to_material (unknown);
		2652	}
		2653
		2654	void
		2655	object::open_container (object *new_container)
		2656	{
		2657	if (container == new_container)
		2658	return;
		2659
		2660	if (object *old_container = container)
		2661	{
		2662	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2663	return;
		2664
		2665	#if 0
		2666	// remove the "Close old_container" object.
		2667	if (object *closer = old_container->inv)
		2668	if (closer->type == CLOSE_CON)
		2669	closer->destroy ();
		2670	#endif
		2671
		2672	old_container->flag [FLAG_APPLIED] = 0;
		2673	container = 0;
		2674
		2675	esrv_update_item (UPD_FLAGS, this, old_container);
		2676	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2677	}
		2678
		2679	if (new_container)
		2680	{
		2681	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2682	return;
		2683
		2684	// TODO: this does not seem to serve any purpose anymore?
		2685	#if 0
		2686	// insert the "Close Container" object.
		2687	if (archetype *closer = new_container->other_arch)
		2688	{
		2689	object *closer = arch_to_object (new_container->other_arch);
		2690	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2691	new_container->insert (closer);
		2692	}
		2693	#endif
		2694
		2695	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2696
		2697	new_container->flag [FLAG_APPLIED] = 1;
		2698	container = new_container;
		2699
		2700	esrv_update_item (UPD_FLAGS, this, new_container);
		2701	esrv_send_inventory (this, new_container);
		2702	}
		2703	}
		2704
		2705

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs. Revision 1.163 by root, Sun Jul 1 05:00:17 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.163 by root, Sun Jul 1 05:00:17 2007 UTC