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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra 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.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
		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	UUID UUID::cur;
39	static UUID uuid;	39	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	40	static const uint64 UUID_GAP = 1<<19;
41		41
42	objectvec objects;	42	objectvec objects;
43	activevec actives;	43	activevec actives;
44		44
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = {
		46	0,
		47	0, 1, 1, 1, 0, -1, -1, -1,
		48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	50	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	51	short freearr_y[SIZEOFFREE] = {
		52	0,
		53	-1, -1, 0, 1, 1, 1, 0, -1,
		54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	56	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	57	int maxfree[SIZEOFFREE] = {
		58	0,
		59	9, 10, 13, 14, 17, 18, 21, 22,
		60	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	61	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	62	};
54	int freedir[SIZEOFFREE] = {	63	int freedir[SIZEOFFREE] = {
55	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,	64	0,
		65	1, 2, 3, 4, 5, 6, 7, 8,
		66	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	67	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	68	};
58		69
59	static void	70	static void
60	write_uuid (void)	71	write_uuid (uval64 skip, bool sync)
61	{	72	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	73	CALL_BEGIN (2);
63		74	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	75	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		77	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	78	}
79		79
80	static void	80	static void
81	read_uuid (void)	81	read_uuid (void)
82	{	82	{
83	char filename[MAX_BUF];	83	char filename[MAX_BUF];
84		84
85	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
86		86
		87	seq_next_save = 0;
		88
87	FILE *fp;	89	FILE *fp;
88		90
89	if (!(fp = fopen (filename, "r")))	91	if (!(fp = fopen (filename, "r")))
90	{	92	{
91	if (errno == ENOENT)	93	if (errno == ENOENT)
92	{	94	{
93	LOG (llevInfo, "RESET uid to 1\n");	95	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	96	UUID::cur.seq = 0;
95	write_uuid ();	97	write_uuid (UUID_GAP, true);
96	return;	98	return;
97	}	99	}
98		100
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	102	_exit (1);
101	}	103	}
102		104
103	int version;	105	UUID::BUF buf;
104	unsigned long long uid;	106	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	107	fgets (buf, sizeof (buf), fp);
		108
		109	if (!UUID::cur.parse (buf))
106	{	110	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	111	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	112	_exit (1);
109	}	113	}
110		114
111	uuid.seq = uid;	115	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	116
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	117	write_uuid (UUID_GAP, true);
114	fclose (fp);	118	fclose (fp);
115	}	119	}
116		120
117	UUID	121	UUID
118	gen_uuid ()	122	UUID::gen ()
119	{	123	{
120	UUID uid;	124	UUID uid;
121		125
122	uid.seq = ++uuid.seq;	126	uid.seq = ++cur.seq;
123		127
124	if (!(uuid.seq & (UUID_SKIP - 1)))	128	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	129	{
		130	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		131	write_uuid (UUID_GAP, false);
		132	}
		133
126		134
127	return uid;	135	return uid;
128	}	136	}
129		137
130	void	138	void
131	init_uuid ()	139	UUID::init ()
132	{	140	{
133	read_uuid ();	141	read_uuid ();
134	}	142	}
135		143
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
…		…
254	/* This is really a spellbook check - really, we should	262	/* This is really a spellbook check - really, we should
255	* check all objects in the inventory.	263	* check all objects in the inventory.
256	*/	264	*/
257	if (ob1->inv \|\| ob2->inv)	265	if (ob1->inv \|\| ob2->inv)
258	{	266	{
259	/* if one object has inventory but the other doesn't, not equiv */	267	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	268	return 0; /* inventories differ in length */
261	return 0;
262		269
263	/* Now check to see if the two inventory objects could merge */	270	if (ob1->inv->below \|\| ob2->inv->below)
		271	return 0; /* more than one object in inv */
		272
264	if (!object::can_merge (ob1->inv, ob2->inv))	273	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	274	return 0; /* inventory objexts differ */
266		275
267	/* inventory ok - still need to check rest of this object to see	276	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	277	* if it is valid.
269	*/	278	*/
270	}	279	}
…		…
299	return 0;	308	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))	309	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	310	return 0;
302	}	311	}
303		312
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self \|\| ob2->self)	313	if (ob1->self \|\| ob2->self)
306	{	314	{
307	ob1->optimise ();	315	ob1->optimise ();
308	ob2->optimise ();	316	ob2->optimise ();
309		317
310	if (ob1->self \|\| ob2->self)	318	if (ob1->self \|\| ob2->self)
		319	{
		320	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		321	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		322
		323	if (k1 != k2)
311	return 0;	324	return 0;
		325	else if (k1 == 0)
		326	return 1;
		327	else if (!cfperl_can_merge (ob1, ob2))
		328	return 0;
		329	}
312	}	330	}
313		331
314	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
315	return 1;	333	return 1;
316	}	334	}
…		…
324	sum_weight (object *op)	342	sum_weight (object *op)
325	{	343	{
326	long sum;	344	long sum;
327	object *inv;	345	object *inv;
328		346
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	347	for (sum = 0, inv = op->inv; inv; inv = inv->below)
330	{	348	{
331	if (inv->inv)	349	if (inv->inv)
332	sum_weight (inv);	350	sum_weight (inv);
		351
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	352	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}	353	}
335		354
336	if (op->type == CONTAINER && op->stats.Str)	355	if (op->type == CONTAINER && op->stats.Str)
337	sum = (sum * (100 - op->stats.Str)) / 100;	356	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
373	/*	392	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	393	* get_nearest_part(multi-object, object 2) returns the part of the
375	* multi-object 1 which is closest to the second object.	394	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	395	* If it's not a multi-object, it is returned.
377	*/	396	*/
378
379	object *	397	object *
380	get_nearest_part (object op, const object pl)	398	get_nearest_part (object op, const object pl)
381	{	399	{
382	object tmp, closest;	400	object tmp, closest;
383	int last_dist, i;	401	int last_dist, i;
…		…
419	break;	437	break;
420		438
421	return op;	439	return op;
422	}	440	}
423		441
424	void
425	free_all_object_data ()
426	{
427	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428	}
429
430	/*	442	/*
431	* Sets the owner and sets the skill and exp pointers to owner's current	443	* Sets the owner and sets the skill and exp pointers to owner's current
432	* skill and experience objects.	444	* skill and experience objects.
		445	* ACTUALLY NO! investigate! TODO
433	*/	446	*/
434	void	447	void
435	object::set_owner (object *owner)	448	object::set_owner (object *owner)
436	{	449	{
		450	// allow objects which own objects
437	if (!owner)	451	if (owner)
438	return;
439
440	/* next line added to allow objects which own objects */
441	/* Add a check for ownercounts in here, as I got into an endless loop
442	* with the fireball owning a poison cloud which then owned the
443	* fireball. I believe that was caused by one of the objects getting
444	* freed and then another object replacing it. Since the ownercounts
445	* didn't match, this check is valid and I believe that cause is valid.
446	*/
447	while (owner->owner)	452	while (owner->owner)
448	owner = owner->owner;	453	owner = owner->owner;
		454
		455	if (flag [FLAG_FREED])
		456	{
		457	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		458	return;
		459	}
449		460
450	this->owner = owner;	461	this->owner = owner;
		462	}
		463
		464	int
		465	object::slottype () const
		466	{
		467	if (type == SKILL)
		468	{
		469	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		470	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		471	}
		472	else
		473	{
		474	if (slot [body_combat].info) return slot_combat;
		475	if (slot [body_range ].info) return slot_ranged;
		476	}
		477
		478	return slot_none;
		479	}
		480
		481	bool
		482	object::change_weapon (object *ob)
		483	{
		484	if (current_weapon == ob)
		485	return true;
		486
		487	if (chosen_skill)
		488	chosen_skill->flag [FLAG_APPLIED] = false;
		489
		490	current_weapon = ob;
		491	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		492
		493	if (chosen_skill)
		494	chosen_skill->flag [FLAG_APPLIED] = true;
		495
		496	update_stats ();
		497
		498	if (ob)
		499	{
		500	// now check wether any body locations became invalid, in which case
		501	// we cannot apply the weapon at the moment.
		502	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		503	if (slot[i].used < 0)
		504	{
		505	current_weapon = chosen_skill = 0;
		506	update_stats ();
		507
		508	new_draw_info_format (NDI_UNIQUE, 0, this,
		509	"You try to balance all your items at once, "
		510	"but the %s is just too much for your body. "
		511	"[You need to unapply some items first.]", &ob->name);
		512	return false;
		513	}
		514
		515	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		516	}
		517	else
		518	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		519
		520	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		521	{
		522	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
		523	&name, ob->debug_desc ());
		524	return false;
		525	}
		526
		527	return true;
451	}	528	}
452		529
453	/* Zero the key_values on op, decrementing the shared-string	530	/* Zero the key_values on op, decrementing the shared-string
454	* refcounts and freeing the links.	531	* refcounts and freeing the links.
455	*/	532	*/
…		…
519	object::copy_to (object *dst)	596	object::copy_to (object *dst)
520	{	597	{
521	dst = this;	598	dst = this;
522		599
523	if (speed < 0)	600	if (speed < 0)
524	dst->speed_left = speed_left - rndm ();	601	dst->speed_left -= rndm ();
525		602
526	dst->set_speed (dst->speed);	603	dst->set_speed (dst->speed);
527	}	604	}
528		605
529	void	606	void
530	object::instantiate ()	607	object::instantiate ()
531	{	608	{
532	if (!uuid.seq) // HACK	609	if (!uuid.seq) // HACK
533	uuid = gen_uuid ();	610	uuid = UUID::gen ();
534		611
535	speed_left = -0.1f;	612	speed_left = -0.1f;
536	/* copy the body_info to the body_used - this is only really	613	/* copy the body_info to the body_used - this is only really
537	* need for monsters, but doesn't hurt to do it for everything.	614	* need for monsters, but doesn't hurt to do it for everything.
538	* by doing so, when a monster is created, it has good starting	615	* by doing so, when a monster is created, it has good starting
539	* values for the body_used info, so when items are created	616	* values for the body_used info, so when items are created
540	* for it, they can be properly equipped.	617	* for it, they can be properly equipped.
541	*/	618	*/
542	memcpy (body_used, body_info, sizeof (body_used));	619	for (int i = NUM_BODY_LOCATIONS; i--; )
		620	slot[i].used = slot[i].info;
543		621
544	attachable::instantiate ();	622	attachable::instantiate ();
545	}	623	}
546		624
547	object *	625	object *
…		…
696	static int object_count;	774	static int object_count;
697		775
698	void object::link ()	776	void object::link ()
699	{	777	{
700	assert (!index);//D	778	assert (!index);//D
701	uuid = gen_uuid ();	779	uuid = UUID::gen ();
702	count = ++object_count;	780	count = ++object_count;
703		781
704	refcnt_inc ();	782	refcnt_inc ();
705	objects.insert (this);	783	objects.insert (this);
706	}	784	}
…		…
855		933
856	if (!freed_map)	934	if (!freed_map)
857	{	935	{
858	freed_map = new maptile;	936	freed_map = new maptile;
859		937
		938	freed_map->path = "<freed objects map>";
860	freed_map->name = "/internal/freed_objects_map";	939	freed_map->name = "/internal/freed_objects_map";
861	freed_map->width = 3;	940	freed_map->width = 3;
862	freed_map->height = 3;	941	freed_map->height = 3;
		942	freed_map->nodrop = 1;
863		943
864	freed_map->alloc ();	944	freed_map->alloc ();
865	freed_map->in_memory = MAP_IN_MEMORY;	945	freed_map->in_memory = MAP_IN_MEMORY;
866	}	946	}
867		947
868	map = freed_map;	948	map = freed_map;
869	x = 1;	949	x = 1;
870	y = 1;	950	y = 1;
871	}	951	}
872		952
873	head = 0;
874
875	if (more)	953	if (more)
876	{	954	{
877	more->destroy ();	955	more->destroy ();
878	more = 0;	956	more = 0;
879	}	957	}
880		958
		959	head = 0;
		960
881	// clear those pointers that likely might have circular references to us	961	// clear those pointers that likely might cause circular references
882	owner = 0;	962	owner = 0;
883	enemy = 0;	963	enemy = 0;
884	attacked_by = 0;	964	attacked_by = 0;
		965	current_weapon = 0;
885	}	966	}
886		967
887	void	968	void
888	object::destroy (bool destroy_inventory)	969	object::destroy (bool destroy_inventory)
889	{	970	{
890	if (destroyed ())	971	if (destroyed ())
891	return;	972	return;
892		973
893	if (destroy_inventory)	974	if (destroy_inventory)
894	destroy_inv (false);	975	destroy_inv (false);
		976
		977	if (is_head ())
		978	if (sound_destroy)
		979	play_sound (sound_destroy);
		980	else if (flag [FLAG_MONSTER])
		981	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
895		982
896	attachable::destroy ();	983	attachable::destroy ();
897	}	984	}
898		985
899	/*	986	/*
…		…
1014	if (map->in_memory == MAP_SAVING)	1101	if (map->in_memory == MAP_SAVING)
1015	return;	1102	return;
1016		1103
1017	int check_walk_off = !flag [FLAG_NO_APPLY];	1104	int check_walk_off = !flag [FLAG_NO_APPLY];
1018		1105
		1106	if (object *pl = ms.player ())
		1107	{
		1108	if (pl->container == this)
		1109	/* If a container that the player is currently using somehow gets
		1110	* removed (most likely destroyed), update the player view
		1111	* appropriately.
		1112	*/
		1113	pl->close_container ();
		1114
		1115	pl->contr->ns->floorbox_update ();
		1116	}
		1117
1019	for (tmp = ms.bot; tmp; tmp = tmp->above)	1118	for (tmp = ms.bot; tmp; tmp = tmp->above)
1020	{	1119	{
1021	/* No point updating the players look faces if he is the object	1120	/* No point updating the players look faces if he is the object
1022	* being removed.	1121	* being removed.
1023	*/	1122	*/
1024
1025	if (tmp->type == PLAYER && tmp != this)
1026	{
1027	/* If a container that the player is currently using somehow gets
1028	* removed (most likely destroyed), update the player view
1029	* appropriately.
1030	*/
1031	if (tmp->container == this)
1032	{
1033	flag [FLAG_APPLIED] = 0;
1034	tmp->container = 0;
1035	}
1036
1037	if (tmp->contr->ns)
1038	tmp->contr->ns->floorbox_update ();
1039	}
1040		1123
1041	/* See if object moving off should effect something */	1124	/* See if object moving off should effect something */
1042	if (check_walk_off	1125	if (check_walk_off
1043	&& ((move_type & tmp->move_off)	1126	&& ((move_type & tmp->move_off)
1044	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1127	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1047		1130
1048	if (destroyed ())	1131	if (destroyed ())
1049	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1132	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1050	}	1133	}
1051		1134
1052	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1053	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1054	if (tmp->above == tmp)
1055	tmp->above = 0;
1056
1057	last = tmp;	1135	last = tmp;
1058	}	1136	}
1059		1137
1060	/* last == NULL if there are no objects on this space */	1138	/* last == NULL if there are no objects on this space */
1061	//TODO: this makes little sense, why only update the topmost object?	1139	//TODO: this makes little sense, why only update the topmost object?
…		…
1081	merge_ob (object op, object top)	1159	merge_ob (object op, object top)
1082	{	1160	{
1083	if (!op->nrof)	1161	if (!op->nrof)
1084	return 0;	1162	return 0;
1085		1163
1086	if (top)	1164	if (!top)
1087	for (top = op; top && top->above; top = top->above)	1165	for (top = op; top && top->above; top = top->above)
1088	;	1166	;
1089		1167
1090	for (; top; top = top->below)	1168	for (; top; top = top->below)
1091	{	1169	{
…		…
1112	if (more)	1190	if (more)
1113	return;	1191	return;
1114		1192
1115	object *prev = this;	1193	object *prev = this;
1116		1194
1117	for (archetype *at = arch->more; at; at = at->more)	1195	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1118	{	1196	{
1119	object *op = arch_to_object (at);	1197	object *op = arch_to_object (at);
1120		1198
1121	op->name = name;	1199	op->name = name;
1122	op->name_pl = name_pl;	1200	op->name_pl = name_pl;
…		…
1136	object *	1214	object *
1137	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1215	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1138	{	1216	{
1139	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1217	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140	{	1218	{
1141	tmp->x = x + tmp->arch->clone.x;	1219	tmp->x = x + tmp->arch->x;
1142	tmp->y = y + tmp->arch->clone.y;	1220	tmp->y = y + tmp->arch->y;
1143	}	1221	}
1144		1222
1145	return insert_ob_in_map (op, m, originator, flag);	1223	return insert_ob_in_map (op, m, originator, flag);
1146	}	1224	}
1147		1225
…		…
1168	object *	1246	object *
1169	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1247	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1170	{	1248	{
1171	assert (!op->flag [FLAG_FREED]);	1249	assert (!op->flag [FLAG_FREED]);
1172		1250
1173	object tmp, top, *floor = NULL;	1251	object top, floor = NULL;
1174		1252
1175	op->remove ();	1253	op->remove ();
1176
1177	#if 0
1178	if (!m->active != !op->active)
1179	if (m->active)
1180	op->activate_recursive ();
1181	else
1182	op->deactivate_recursive ();
1183	#endif
1184
1185	if (out_of_map (m, op->x, op->y))
1186	{
1187	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1188	#ifdef MANY_CORES
1189	/* Better to catch this here, as otherwise the next use of this object
1190	* is likely to cause a crash. Better to find out where it is getting
1191	* improperly inserted.
1192	*/
1193	abort ();
1194	#endif
1195	return op;
1196	}
1197
1198	if (object *more = op->more)
1199	{
1200	if (!insert_ob_in_map (more, m, originator, flag))
1201	{
1202	if (!op->head)
1203	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1204
1205	return 0;
1206	}
1207	}
1208
1209	CLEAR_FLAG (op, FLAG_REMOVED);
1210		1254
1211	/* Ideally, the caller figures this out. However, it complicates a lot	1255	/* Ideally, the caller figures this out. However, it complicates a lot
1212	* of areas of callers (eg, anything that uses find_free_spot would now	1256	* of areas of callers (eg, anything that uses find_free_spot would now
1213	* need extra work	1257	* need extra work
1214	*/	1258	*/
1215	if (!xy_normalise (m, op->x, op->y))	1259	if (!xy_normalise (m, op->x, op->y))
		1260	{
		1261	op->destroy ();
1216	return 0;	1262	return 0;
		1263	}
		1264
		1265	if (object *more = op->more)
		1266	if (!insert_ob_in_map (more, m, originator, flag))
		1267	return 0;
		1268
		1269	CLEAR_FLAG (op, FLAG_REMOVED);
1217		1270
1218	op->map = m;	1271	op->map = m;
1219	mapspace &ms = op->ms ();	1272	mapspace &ms = op->ms ();
1220		1273
1221	/* this has to be done after we translate the coordinates.	1274	/* this has to be done after we translate the coordinates.
1222	*/	1275	*/
1223	if (op->nrof && !(flag & INS_NO_MERGE))	1276	if (op->nrof && !(flag & INS_NO_MERGE))
1224	for (tmp = ms.bot; tmp; tmp = tmp->above)	1277	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1225	if (object::can_merge (op, tmp))	1278	if (object::can_merge (op, tmp))
1226	{	1279	{
1227	op->nrof += tmp->nrof;	1280	op->nrof += tmp->nrof;
1228	tmp->destroy ();	1281	tmp->destroy ();
1229	}	1282	}
…		…
1256	else	1309	else
1257	{	1310	{
1258	top = ms.bot;	1311	top = ms.bot;
1259		1312
1260	/* If there are other objects, then */	1313	/* If there are other objects, then */
1261	if ((!(flag & INS_MAP_LOAD)) && top)	1314	if (top)
1262	{	1315	{
1263	object *last = 0;	1316	object *last = 0;
1264		1317
1265	/*	1318	/*
1266	* If there are multiple objects on this space, we do some trickier handling.	1319	* If there are multiple objects on this space, we do some trickier handling.
…		…
1319	if (last && last->below && last != floor)	1372	if (last && last->below && last != floor)
1320	top = last->below;	1373	top = last->below;
1321	}	1374	}
1322	} /* If objects on this space */	1375	} /* If objects on this space */
1323		1376
1324	if (flag & INS_MAP_LOAD)
1325	top = ms.top;
1326
1327	if (flag & INS_ABOVE_FLOOR_ONLY)	1377	if (flag & INS_ABOVE_FLOOR_ONLY)
1328	top = floor;	1378	top = floor;
1329		1379
1330	/* Top is the object that our object (op) is going to get inserted above.	1380	/* Top is the object that our object (op) is going to get inserted above.
1331	*/	1381	*/
…		…
1363	op->map->touch ();	1413	op->map->touch ();
1364	}	1414	}
1365		1415
1366	op->map->dirty = true;	1416	op->map->dirty = true;
1367		1417
1368	/* If we have a floor, we know the player, if any, will be above
1369	* it, so save a few ticks and start from there.
1370	*/
1371	if (!(flag & INS_MAP_LOAD))
1372	if (object *pl = ms.player ())	1418	if (object *pl = ms.player ())
1373	if (pl->contr->ns)
1374	pl->contr->ns->floorbox_update ();	1419	pl->contr->ns->floorbox_update ();
1375		1420
1376	/* If this object glows, it may affect lighting conditions that are	1421	/* If this object glows, it may affect lighting conditions that are
1377	* visible to others on this map. But update_all_los is really	1422	* visible to others on this map. But update_all_los is really
1378	* an inefficient way to do this, as it means los for all players	1423	* an inefficient way to do this, as it means los for all players
1379	* on the map will get recalculated. The players could very well	1424	* on the map will get recalculated. The players could very well
…		…
1398	* blocked() and wall() work properly), and these flags are updated by	1443	* blocked() and wall() work properly), and these flags are updated by
1399	* update_object().	1444	* update_object().
1400	*/	1445	*/
1401		1446
1402	/* if this is not the head or flag has been passed, don't check walk on status */	1447	/* if this is not the head or flag has been passed, don't check walk on status */
1403	if (!(flag & INS_NO_WALK_ON) && !op->head)	1448	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404	{	1449	{
1405	if (check_move_on (op, originator))	1450	if (check_move_on (op, originator))
1406	return 0;	1451	return 0;
1407		1452
1408	/* If we are a multi part object, lets work our way through the check	1453	/* If we are a multi part object, lets work our way through the check
1409	* walk on's.	1454	* walk on's.
1410	*/	1455	*/
1411	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1456	for (object *tmp = op->more; tmp; tmp = tmp->more)
1412	if (check_move_on (tmp, originator))	1457	if (check_move_on (tmp, originator))
1413	return 0;	1458	return 0;
1414	}	1459	}
1415		1460
1416	return op;	1461	return op;
…		…
1426	object tmp, tmp1;	1471	object tmp, tmp1;
1427		1472
1428	/* first search for itself and remove any old instances */	1473	/* first search for itself and remove any old instances */
1429		1474
1430	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1475	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1476	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432	tmp->destroy ();	1477	tmp->destroy ();
1433		1478
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1479	tmp1 = arch_to_object (archetype::find (arch_string));
1435		1480
1436	tmp1->x = op->x;	1481	tmp1->x = op->x;
…		…
1597	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1642	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1598	free (dump);	1643	free (dump);
1599	return op;	1644	return op;
1600	}	1645	}
1601		1646
1602	if (where->head)	1647	if (where->head_ () != where)
1603	{	1648	{
1604	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1649	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1605	where = where->head;	1650	where = where->head;
1606	}	1651	}
1607		1652
1608	return where->insert (op);	1653	return where->insert (op);
1609	}	1654	}
…		…
1617	* be != op, if items are merged. -Tero	1662	* be != op, if items are merged. -Tero
1618	*/	1663	*/
1619	object *	1664	object *
1620	object::insert (object *op)	1665	object::insert (object *op)
1621	{	1666	{
1622	object tmp, otmp;
1623
1624	if (!QUERY_FLAG (op, FLAG_REMOVED))	1667	if (!QUERY_FLAG (op, FLAG_REMOVED))
1625	op->remove ();	1668	op->remove ();
1626		1669
1627	if (op->more)	1670	if (op->more)
1628	{	1671	{
…		…
1630	return op;	1673	return op;
1631	}	1674	}
1632		1675
1633	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1676	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1634	CLEAR_FLAG (op, FLAG_REMOVED);	1677	CLEAR_FLAG (op, FLAG_REMOVED);
		1678
1635	if (op->nrof)	1679	if (op->nrof)
1636	{	1680	{
1637	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1681	for (object *tmp = inv; tmp; tmp = tmp->below)
1638	if (object::can_merge (tmp, op))	1682	if (object::can_merge (tmp, op))
1639	{	1683	{
1640	/* return the original object and remove inserted object	1684	/* return the original object and remove inserted object
1641	(client needs the original object) */	1685	(client needs the original object) */
1642	tmp->nrof += op->nrof;	1686	tmp->nrof += op->nrof;
…		…
1661	add_weight (this, op->weight * op->nrof);	1705	add_weight (this, op->weight * op->nrof);
1662	}	1706	}
1663	else	1707	else
1664	add_weight (this, (op->weight + op->carrying));	1708	add_weight (this, (op->weight + op->carrying));
1665		1709
1666	otmp = this->in_player ();	1710	if (object *otmp = this->in_player ())
1667	if (otmp && otmp->contr)
1668	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1711	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1669	otmp->update_stats ();	1712	otmp->update_stats ();
1670		1713
		1714	op->owner = 0; // its his/hers now. period.
1671	op->map = 0;	1715	op->map = 0;
1672	op->env = this;	1716	op->env = this;
1673	op->above = 0;	1717	op->above = 0;
1674	op->below = 0;	1718	op->below = 0;
1675	op->x = 0, op->y = 0;	1719	op->x = op->y = 0;
1676		1720
1677	/* reset the light list and los of the players on the map */	1721	/* reset the light list and los of the players on the map */
1678	if ((op->glow_radius != 0) && map)	1722	if (op->glow_radius && map)
1679	{	1723	{
1680	#ifdef DEBUG_LIGHTS	1724	#ifdef DEBUG_LIGHTS
1681	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1725	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1682	#endif /* DEBUG_LIGHTS */	1726	#endif /* DEBUG_LIGHTS */
1683	if (map->darkness)	1727	if (map->darkness)
…		…
1917	* activate recursively a flag on an object inventory	1961	* activate recursively a flag on an object inventory
1918	*/	1962	*/
1919	void	1963	void
1920	flag_inv (object *op, int flag)	1964	flag_inv (object *op, int flag)
1921	{	1965	{
1922	if (op->inv)
1923	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1966	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1924	{	1967	{
1925	SET_FLAG (tmp, flag);	1968	SET_FLAG (tmp, flag);
1926	flag_inv (tmp, flag);	1969	flag_inv (tmp, flag);
1927	}	1970	}
1928	}	1971	}
1929		1972
1930	/*	1973	/*
1931	* deactivate recursively a flag on an object inventory	1974	* deactivate recursively a flag on an object inventory
1932	*/	1975	*/
1933	void	1976	void
1934	unflag_inv (object *op, int flag)	1977	unflag_inv (object *op, int flag)
1935	{	1978	{
1936	if (op->inv)
1937	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1979	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1938	{	1980	{
1939	CLEAR_FLAG (tmp, flag);	1981	CLEAR_FLAG (tmp, flag);
1940	unflag_inv (tmp, flag);	1982	unflag_inv (tmp, flag);
1941	}	1983	}
1942	}
1943
1944	/*
1945	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1946	* all it's inventory (recursively).
1947	* If checksums are used, a player will get set_cheat called for
1948	* him/her-self and all object carried by a call to this function.
1949	*/
1950	void
1951	set_cheat (object *op)
1952	{
1953	SET_FLAG (op, FLAG_WAS_WIZ);
1954	flag_inv (op, FLAG_WAS_WIZ);
1955	}	1984	}
1956		1985
1957	/*	1986	/*
1958	* find_free_spot(object, map, x, y, start, stop) will search for	1987	* find_free_spot(object, map, x, y, start, stop) will search for
1959	* a spot at the given map and coordinates which will be able to contain	1988	* a spot at the given map and coordinates which will be able to contain
…		…
1961	* to search (see the freearr_x/y[] definition).	1990	* to search (see the freearr_x/y[] definition).
1962	* It returns a random choice among the alternatives found.	1991	* It returns a random choice among the alternatives found.
1963	* start and stop are where to start relative to the free_arr array (1,9	1992	* start and stop are where to start relative to the free_arr array (1,9
1964	* does all 4 immediate directions). This returns the index into the	1993	* does all 4 immediate directions). This returns the index into the
1965	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1994	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1966	* Note - this only checks to see if there is space for the head of the
1967	* object - if it is a multispace object, this should be called for all
1968	* pieces.
1969	* Note2: This function does correctly handle tiled maps, but does not	1995	* Note: This function does correctly handle tiled maps, but does not
1970	* inform the caller. However, insert_ob_in_map will update as	1996	* inform the caller. However, insert_ob_in_map will update as
1971	* necessary, so the caller shouldn't need to do any special work.	1997	* necessary, so the caller shouldn't need to do any special work.
1972	* Note - updated to take an object instead of archetype - this is necessary	1998	* Note - updated to take an object instead of archetype - this is necessary
1973	* because arch_blocked (now ob_blocked) needs to know the movement type	1999	* because arch_blocked (now ob_blocked) needs to know the movement type
1974	* to know if the space in question will block the object. We can't use	2000	* to know if the space in question will block the object. We can't use
…		…
1976	* customized, changed states, etc.	2002	* customized, changed states, etc.
1977	*/	2003	*/
1978	int	2004	int
1979	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2005	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
1980	{	2006	{
		2007	int altern[SIZEOFFREE];
1981	int index = 0, flag;	2008	int index = 0, flag;
1982	int altern[SIZEOFFREE];
1983		2009
1984	for (int i = start; i < stop; i++)	2010	for (int i = start; i < stop; i++)
1985	{	2011	{
1986	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2012	mapxy pos (m, x, y); pos.move (i);
1987	if (!flag)	2013
		2014	if (!pos.normalise ())
		2015	continue;
		2016
		2017	mapspace &ms = *pos;
		2018
		2019	if (ms.flags () & P_IS_ALIVE)
		2020	continue;
		2021
		2022	/* However, often
		2023	* ob doesn't have any move type (when used to place exits)
		2024	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2025	*/
		2026	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2027	{
1988	altern [index++] = i;	2028	altern [index++] = i;
		2029	continue;
		2030	}
1989		2031
1990	/* Basically, if we find a wall on a space, we cut down the search size.	2032	/* Basically, if we find a wall on a space, we cut down the search size.
1991	* In this way, we won't return spaces that are on another side of a wall.	2033	* In this way, we won't return spaces that are on another side of a wall.
1992	* This mostly work, but it cuts down the search size in all directions -	2034	* This mostly work, but it cuts down the search size in all directions -
1993	* if the space being examined only has a wall to the north and empty	2035	* if the space being examined only has a wall to the north and empty
1994	* spaces in all the other directions, this will reduce the search space	2036	* spaces in all the other directions, this will reduce the search space
1995	* to only the spaces immediately surrounding the target area, and	2037	* to only the spaces immediately surrounding the target area, and
1996	* won't look 2 spaces south of the target space.	2038	* won't look 2 spaces south of the target space.
1997	*/	2039	*/
1998	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2040	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2041	{
1999	stop = maxfree[i];	2042	stop = maxfree[i];
		2043	continue;
		2044	}
		2045
		2046	/* Note it is intentional that we check ob - the movement type of the
		2047	* head of the object should correspond for the entire object.
		2048	*/
		2049	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2050	continue;
		2051
		2052	if (ob->blocked (m, pos.x, pos.y))
		2053	continue;
		2054
		2055	altern [index++] = i;
2000	}	2056	}
2001		2057
2002	if (!index)	2058	if (!index)
2003	return -1;	2059	return -1;
2004		2060
…		…
2013	*/	2069	*/
2014	int	2070	int
2015	find_first_free_spot (const object ob, maptile m, int x, int y)	2071	find_first_free_spot (const object ob, maptile m, int x, int y)
2016	{	2072	{
2017	for (int i = 0; i < SIZEOFFREE; i++)	2073	for (int i = 0; i < SIZEOFFREE; i++)
2018	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2074	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2019	return i;	2075	return i;
2020		2076
2021	return -1;	2077	return -1;
2022	}	2078	}
2023		2079
…		…
2077	object *tmp;	2133	object *tmp;
2078	maptile *mp;	2134	maptile *mp;
2079		2135
2080	MoveType blocked, move_type;	2136	MoveType blocked, move_type;
2081		2137
2082	if (exclude && exclude->head)	2138	if (exclude && exclude->head_ () != exclude)
2083	{	2139	{
2084	exclude = exclude->head;	2140	exclude = exclude->head;
2085	move_type = exclude->move_type;	2141	move_type = exclude->move_type;
2086	}	2142	}
2087	else	2143	else
…		…
2110	max = maxfree[i];	2166	max = maxfree[i];
2111	else if (mflags & P_IS_ALIVE)	2167	else if (mflags & P_IS_ALIVE)
2112	{	2168	{
2113	for (tmp = ms.bot; tmp; tmp = tmp->above)	2169	for (tmp = ms.bot; tmp; tmp = tmp->above)
2114	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2170	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2115	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2171	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2116	break;	2172	break;
2117		2173
2118	if (tmp)	2174	if (tmp)
2119	return freedir[i];	2175	return freedir[i];
2120	}	2176	}
…		…
2300	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2356	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2301	* core dumps if they do.	2357	* core dumps if they do.
2302	*	2358	*
2303	* Add a check so we can't pick up invisible objects (0.93.8)	2359	* Add a check so we can't pick up invisible objects (0.93.8)
2304	*/	2360	*/
2305
2306	int	2361	int
2307	can_pick (const object who, const object item)	2362	can_pick (const object who, const object item)
2308	{	2363	{
2309	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2364	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2310	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2365	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2315	* create clone from object to another	2370	* create clone from object to another
2316	*/	2371	*/
2317	object *	2372	object *
2318	object_create_clone (object *asrc)	2373	object_create_clone (object *asrc)
2319	{	2374	{
2320	object dst = 0, tmp, src, part, prev, item;	2375	object dst = 0, tmp, src, prev, *item;
2321		2376
2322	if (!asrc)	2377	if (!asrc)
2323	return 0;	2378	return 0;
2324		2379
2325	src = asrc;
2326	if (src->head)
2327	src = src->head;	2380	src = asrc->head_ ();
2328		2381
2329	prev = 0;	2382	prev = 0;
2330	for (part = src; part; part = part->more)	2383	for (object *part = src; part; part = part->more)
2331	{	2384	{
2332	tmp = part->clone ();	2385	tmp = part->clone ();
2333	tmp->x -= src->x;	2386	tmp->x -= src->x;
2334	tmp->y -= src->y;	2387	tmp->y -= src->y;
2335		2388
…		…
2448	/* Basically, if the archetype has this key set,	2501	/* Basically, if the archetype has this key set,
2449	* we need to store the null value so when we save	2502	* we need to store the null value so when we save
2450	* it, we save the empty value so that when we load,	2503	* it, we save the empty value so that when we load,
2451	* we get this value back again.	2504	* we get this value back again.
2452	*/	2505	*/
2453	if (get_ob_key_link (&op->arch->clone, canonical_key))	2506	if (get_ob_key_link (op->arch, canonical_key))
2454	field->value = 0;	2507	field->value = 0;
2455	else	2508	else
2456	{	2509	{
2457	if (last)	2510	if (last)
2458	last->next = field->next;	2511	last->next = field->next;
…		…
2527	}	2580	}
2528	else	2581	else
2529	item = item->env;	2582	item = item->env;
2530	}	2583	}
2531		2584
2532
2533	const char *	2585	const char *
2534	object::flag_desc (char *desc, int len) const	2586	object::flag_desc (char *desc, int len) const
2535	{	2587	{
2536	char *p = desc;	2588	char *p = desc;
2537	bool first = true;	2589	bool first = true;
…		…
2564	{	2616	{
2565	char flagdesc[512];	2617	char flagdesc[512];
2566	char info2[256 * 4];	2618	char info2[256 * 4];
2567	char *p = info;	2619	char *p = info;
2568		2620
2569	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2621	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2570	count, uuid.seq,	2622	count,
		2623	uuid.c_str (),
2571	&name,	2624	&name,
2572	title ? "\",title:\"" : "",	2625	title ? "\",title:\"" : "",
2573	title ? (const char *)title : "",	2626	title ? (const char *)title : "",
2574	flag_desc (flagdesc, 512), type);	2627	flag_desc (flagdesc, 512), type);
2575		2628
2576	if (env)	2629	if (!this->flag[FLAG_REMOVED] && env)
2577	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2630	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2578		2631
2579	if (map)	2632	if (map)
2580	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2633	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2581		2634
…		…
2583	}	2636	}
2584		2637
2585	const char *	2638	const char *
2586	object::debug_desc () const	2639	object::debug_desc () const
2587	{	2640	{
2588	static char info[256 * 4];	2641	static char info[3][256 * 4];
		2642	static int info_idx;
		2643
2589	return debug_desc (info);	2644	return debug_desc (info [++info_idx % 3]);
2590	}
2591
2592	const char *
2593	object::debug_desc2 () const
2594	{
2595	static char info[256 * 4];
2596	return debug_desc (info);
2597	}	2645	}
2598		2646
2599	struct region *	2647	struct region *
2600	object::region () const	2648	object::region () const
2601	{	2649	{
…		…
2604	}	2652	}
2605		2653
2606	const materialtype_t *	2654	const materialtype_t *
2607	object::dominant_material () const	2655	object::dominant_material () const
2608	{	2656	{
2609	if (materialtype_t *mat = name_to_material (materialname))	2657	if (materialtype_t *mt = name_to_material (materialname))
2610	return mat;	2658	return mt;
2611		2659
2612	// omfg this is slow, this has to be temporary :)
2613	shstr unknown ("unknown");
2614
2615	return name_to_material (unknown);	2660	return name_to_material (shstr_unknown);
2616	}	2661	}
2617		2662
2618	void	2663	void
2619	object::open_container (object *new_container)	2664	object::open_container (object *new_container)
2620	{	2665	{
…		…
2636	old_container->flag [FLAG_APPLIED] = 0;	2681	old_container->flag [FLAG_APPLIED] = 0;
2637	container = 0;	2682	container = 0;
2638		2683
2639	esrv_update_item (UPD_FLAGS, this, old_container);	2684	esrv_update_item (UPD_FLAGS, this, old_container);
2640	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2686	play_sound (sound_find ("chest_close"));
2641	}	2687	}
2642		2688
2643	if (new_container)	2689	if (new_container)
2644	{	2690	{
2645	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2691	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2661	new_container->flag [FLAG_APPLIED] = 1;	2707	new_container->flag [FLAG_APPLIED] = 1;
2662	container = new_container;	2708	container = new_container;
2663		2709
2664	esrv_update_item (UPD_FLAGS, this, new_container);	2710	esrv_update_item (UPD_FLAGS, this, new_container);
2665	esrv_send_inventory (this, new_container);	2711	esrv_send_inventory (this, new_container);
		2712	play_sound (sound_find ("chest_open"));
		2713	}
		2714	}
		2715
		2716	object *
		2717	object::force_find (const shstr name)
		2718	{
		2719	/* cycle through his inventory to look for the MARK we want to
		2720	* place
		2721	*/
		2722	for (object *tmp = inv; tmp; tmp = tmp->below)
		2723	if (tmp->type == FORCE && tmp->slaying == name)
		2724	return splay (tmp);
		2725
		2726	return 0;
		2727	}
		2728
		2729	void
		2730	object::force_add (const shstr name, int duration)
		2731	{
		2732	if (object *force = force_find (name))
		2733	force->destroy ();
		2734
		2735	object *force = get_archetype (FORCE_NAME);
		2736
		2737	force->slaying = name;
		2738	force->stats.food = 1;
		2739	force->speed_left = -1.f;
		2740
		2741	force->set_speed (duration ? 1.f / duration : 0.f);
		2742	force->flag [FLAG_IS_USED_UP] = true;
		2743	force->flag [FLAG_APPLIED] = true;
		2744
		2745	insert (force);
		2746	}
		2747
		2748	void
		2749	object::play_sound (faceidx sound) const
		2750	{
		2751	if (!sound)
		2752	return;
		2753
		2754	if (flag [FLAG_REMOVED])
		2755	return;
		2756
		2757	if (env)
2666	}	2758	{
		2759	if (object *pl = in_player ())
		2760	pl->contr->play_sound (sound);
		2761	}
		2762	else
		2763	map->play_sound (sound, x, y);
2667	}	2764	}
2668		2765
2669

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs. Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC