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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC vs.
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra 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
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	UUID UUID::cur;	34	UUID UUID::cur;
		35	static uint64_t seq_next_save;
39	static const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
40		37
41	objectvec objects;	38	objectvec objects;
42	activevec actives;	39	activevec actives;
43		40
44	short freearr_x[SIZEOFFREE] = {	41	short freearr_x[SIZEOFFREE] = {
…		…
81	{	78	{
82	char filename[MAX_BUF];	79	char filename[MAX_BUF];
83		80
84	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
85		82
		83	seq_next_save = 0;
		84
86	FILE *fp;	85	FILE *fp;
87		86
88	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
89	{	88	{
90	if (errno == ENOENT)	89	if (errno == ENOENT)
91	{	90	{
92	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
93	UUID::cur.seq = 0;	92	UUID::cur.seq = 0;
94	write_uuid (UUID_SKIP, true);	93	write_uuid (UUID_GAP, true);
95	return;	94	return;
96	}	95	}
97		96
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	98	_exit (1);
…		…
109	_exit (1);	108	_exit (1);
110	}	109	}
111		110
112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113		112
114	write_uuid (UUID_SKIP, true);	113	write_uuid (UUID_GAP, true);
115	fclose (fp);	114	fclose (fp);
116	}	115	}
117		116
118	UUID	117	UUID
119	UUID::gen ()	118	UUID::gen ()
120	{	119	{
121	UUID uid;	120	UUID uid;
122		121
123	uid.seq = ++cur.seq;	122	uid.seq = ++cur.seq;
124		123
125	if (expect_false (!(cur.seq & (UUID_SKIP - 1))))	124	if (expect_false (cur.seq >= seq_next_save))
		125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
126	write_uuid (UUID_SKIP, false);	127	write_uuid (UUID_GAP, false);
		128	}
		129
127		130
128	return uid;	131	return uid;
129	}	132	}
130		133
131	void	134	void
…		…
133	{	136	{
134	read_uuid ();	137	read_uuid ();
135	}	138	}
136		139
137	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138	static int	141	static bool
139	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
140	{	143	{
141	key_value *wants_field;	144	key_value *wants_field;
142		145
143	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
151	key_value *has_field;	154	key_value *has_field;
152		155
153	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
155		158
156	if (has_field == NULL)	159	if (!has_field)
157	{
158	/* No field with that name. */	160	return 0; /* No field with that name. */
159	return FALSE;
160	}
161		161
162	/* Found the matching field. */	162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168		165
169	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
170	}	167	}
171		168
172	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
173	return TRUE;	170	return 1;
174	}	171	}
175		172
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	174	static bool
178	compare_ob_value_lists (const object ob1, const object ob2)	175	compare_ob_value_lists (const object ob1, const object ob2)
179	{	176	{
180	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
181	* so we need to run the comparison twice. :(	178	* so we need to run the comparison twice. :(
182	*/	179	*/
…		…
203	\|\| ob1->speed != ob2->speed	200	\|\| ob1->speed != ob2->speed
204	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
205	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
206	return 0;	203	return 0;
207		204
208	//TODO: this ain't working well, use nicer and correct overflow check	205	/* Do not merge objects if nrof would overflow. First part checks
209	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	206	* for unsigned overflow (2c), second part checks whether the result
210	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
211	* used to store nrof).	208	* nrof values.
212	*/	209	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	211	return 0;
215		212
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* This is to the comparison of the flags below will be OK. We	214	* This is to the comparison of the flags below will be OK. We
218	* just can't ignore the been applied or identified flags, as they	215	* just can't ignore the been applied or identified flags, as they
219	* are not equal - just if it has been identified, the been_applied	216	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	217	* flags lose any meaning.
221	*/	218	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		221
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		224
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
229	\|\| ob1->arch != ob2->arch
230	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
231	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
232	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
233	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
234	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
237	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
238	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
239	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
240	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
247	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
248	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
249	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
250	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
251	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
252	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253	return 0;	249	return 0;
254		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
255	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
257	*/	261	*/
258	if (ob1->inv \|\| ob2->inv)	262	if (ob1->inv \|\| ob2->inv)
259	{	263	{
260	if (!(ob1->inv && ob2->inv))	264	if (!(ob1->inv && ob2->inv))
261	return 0; /* inventories differ in length */	265	return 0; /* inventories differ in length */
262		266
263	if (ob1->inv->below \|\| ob2->inv->below)	267	if (ob1->inv->below \|\| ob2->inv->below)
264	return 0; /* more than one object in inv */	268	return 0; /* more than one object in inv */
265		269
266	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
267	return 0; /* inventory objexts differ */	271	return 0; /* inventory objects differ */
268		272
269	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
270	* if it is valid.	274	* if it is valid.
271	*/	275	*/
272	}	276	}
…		…
291	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
292	return 0;	296	return 0;
293	break;	297	break;
294	}	298	}
295		299
296	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	300	if (ob1->key_values \|\| ob2->key_values)
297	{	301	{
298	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
299	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
300	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
301	return 0;	305
302	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
303	return 0;	307	return 0;
304	}	308	}
305		309
306	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
307	{	311	{
…		…
313	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
314	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
315		319
316	if (k1 != k2)	320	if (k1 != k2)
317	return 0;	321	return 0;
		322
318	else if (k1 == 0)	323	if (k1 == 0)
319	return 1;	324	return 1;
		325
320	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
321	return 0;	327	return 0;
322	}	328	}
323	}	329	}
324		330
325	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
326	return 1;	332	return 1;
327	}	333	}
328		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (!flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	return pl;
		364	}
		365	}
		366
		367	return 0;
		368	}
		369
		370	// adjust weight per container type ("of holding")
		371	static sint32
		372	weight_adjust (object *op, sint32 weight)
		373	{
		374	return op->type == CONTAINER
		375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		376	: weight;
		377	}
		378
329	/*	379	/*
		380	* adjust_weight(object, weight) adds the specified weight to an object,
		381	* and also updates how much the environment(s) is/are carrying.
		382	*/
		383	static void
		384	adjust_weight (object *op, sint32 weight)
		385	{
		386	while (op)
		387	{
		388	weight = weight_adjust (op, weight);
		389
		390	if (!weight)
		391	return;
		392
		393	op->carrying += weight;
		394
		395	if (object *pl = op->visible_to ())
		396	if (pl != op) // player is handled lazily
		397	esrv_update_item (UPD_WEIGHT, pl, op);
		398
		399	op = op->env;
		400	}
		401	}
		402
		403	/*
330	* sum_weight() is a recursive function which calculates the weight	404	* this is a recursive function which calculates the weight
331	* an object is carrying. It goes through in figures out how much	405	* an object is carrying. It goes through op and figures out how much
332	* containers are carrying, and sums it up.	406	* containers are carrying, and sums it up.
333	*/	407	*/
334	long	408	void
335	sum_weight (object *op)	409	object::update_weight ()
336	{	410	{
337	long sum;	411	sint32 sum = 0;
338	object *inv;
339		412
340	for (sum = 0, inv = op->inv; inv; inv = inv->below)	413	for (object *op = inv; op; op = op->below)
341	{	414	{
342	if (inv->inv)	415	if (op->inv)
343	sum_weight (inv);	416	op->update_weight ();
344		417
345	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	418	sum += op->total_weight ();
		419	}
		420
		421	sum = weight_adjust (this, sum);
		422
		423	if (sum != carrying)
346	}	424	{
347
348	if (op->type == CONTAINER && op->stats.Str)
349	sum = (sum * (100 - op->stats.Str)) / 100;
350
351	if (op->carrying != sum)
352	op->carrying = sum;	425	carrying = sum;
353		426
354	return sum;	427	if (object *pl = visible_to ())
		428	if (pl != this) // player is handled lazily
		429	esrv_update_item (UPD_WEIGHT, pl, this);
		430	}
355	}	431	}
356		432
357	/**	433	/*
358	* Return the outermost environment object for a given object.	434	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
359	*/
360
361	object *
362	object_get_env_recursive (object *op)
363	{
364	while (op->env != NULL)
365	op = op->env;
366	return op;
367	}
368
369	/*
370	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
371	* Some error messages.
372	* The result of the dump is stored in the static global errmsg array.
373	*/	435	*/
374	char *	436	char *
375	dump_object (object *op)	437	dump_object (object *op)
376	{	438	{
377	if (!op)	439	if (!op)
…		…
391	get_nearest_part (object op, const object pl)	453	get_nearest_part (object op, const object pl)
392	{	454	{
393	object tmp, closest;	455	object tmp, closest;
394	int last_dist, i;	456	int last_dist, i;
395		457
396	if (op->more == NULL)	458	if (!op->more)
397	return op;	459	return op;
		460
398	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	461	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		462	tmp;
		463	tmp = tmp->more)
399	if ((i = distance (tmp, pl)) < last_dist)	464	if ((i = distance (tmp, pl)) < last_dist)
400	closest = tmp, last_dist = i;	465	closest = tmp, last_dist = i;
		466
401	return closest;	467	return closest;
402	}	468	}
403		469
404	/*	470	/*
405	* Returns the object which has the count-variable equal to the argument.	471	* Returns the object which has the count-variable equal to the argument.
		472	* VERRRY slow.
406	*/	473	*/
407	object *	474	object *
408	find_object (tag_t i)	475	find_object (tag_t i)
409	{	476	{
410	for_all_objects (op)	477	for_all_objects (op)
…		…
850	object::destroy_inv (bool drop_to_ground)	917	object::destroy_inv (bool drop_to_ground)
851	{	918	{
852	// need to check first, because the checks below might segfault	919	// need to check first, because the checks below might segfault
853	// as we might be on an invalid mapspace and crossfire code	920	// as we might be on an invalid mapspace and crossfire code
854	// is too buggy to ensure that the inventory is empty.	921	// is too buggy to ensure that the inventory is empty.
855	// corollary: if you create arrows etc. with stuff in tis inventory,	922	// corollary: if you create arrows etc. with stuff in its inventory,
856	// cf will crash below with off-map x and y	923	// cf will crash below with off-map x and y
857	if (!inv)	924	if (!inv)
858	return;	925	return;
859		926
860	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
861	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
862	* drop on that space.	929	* drop on that space.
863	*/	930	*/
864	if (!drop_to_ground	931	if (!drop_to_ground
865	\|\| !map	932	\|\| !map
866	\|\| map->in_memory != MAP_IN_MEMORY	933	\|\| map->in_memory != MAP_ACTIVE
867	\|\| map->nodrop	934	\|\| map->nodrop
868	\|\| ms ().move_block == MOVE_ALL)	935	\|\| ms ().move_block == MOVE_ALL)
869	{	936	{
870	while (inv)	937	while (inv)
871	{	938	{
872	inv->destroy_inv (drop_to_ground);	939	inv->destroy_inv (false);
873	inv->destroy ();	940	inv->destroy ();
874	}	941	}
875	}	942	}
876	else	943	else
877	{ /* Put objects in inventory onto this space */	944	{ /* Put objects in inventory onto this space */
…		…
883	\|\| op->flag [FLAG_NO_DROP]	950	\|\| op->flag [FLAG_NO_DROP]
884	\|\| op->type == RUNE	951	\|\| op->type == RUNE
885	\|\| op->type == TRAP	952	\|\| op->type == TRAP
886	\|\| op->flag [FLAG_IS_A_TEMPLATE]	953	\|\| op->flag [FLAG_IS_A_TEMPLATE]
887	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	954	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
888	op->destroy ();	955	op->destroy (true);
889	else	956	else
890	map->insert (op, x, y);	957	map->insert (op, x, y);
891	}	958	}
892	}	959	}
893	}	960	}
…		…
900	}	967	}
901		968
902	void	969	void
903	object::do_destroy ()	970	object::do_destroy ()
904	{	971	{
905	attachable::do_destroy ();
906
907	if (flag [FLAG_IS_LINKED])	972	if (flag [FLAG_IS_LINKED])
908	remove_button_link (this);	973	remove_button_link (this);
909		974
910	if (flag [FLAG_FRIENDLY])	975	if (flag [FLAG_FRIENDLY])
911	remove_friendly_object (this);	976	remove_friendly_object (this);
912		977
913	if (!flag [FLAG_REMOVED])
914	remove ();	978	remove ();
915		979
916	destroy_inv (true);	980	attachable::do_destroy ();
917		981
918	deactivate ();	982	deactivate ();
919	unlink ();	983	unlink ();
920		984
921	flag [FLAG_FREED] = 1;	985	flag [FLAG_FREED] = 1;
…		…
933	freed_map->width = 3;	997	freed_map->width = 3;
934	freed_map->height = 3;	998	freed_map->height = 3;
935	freed_map->nodrop = 1;	999	freed_map->nodrop = 1;
936		1000
937	freed_map->alloc ();	1001	freed_map->alloc ();
938	freed_map->in_memory = MAP_IN_MEMORY;	1002	freed_map->in_memory = MAP_ACTIVE;
939	}	1003	}
940		1004
941	map = freed_map;	1005	map = freed_map;
942	x = 1;	1006	x = 1;
943	y = 1;	1007	y = 1;
…		…
962	object::destroy (bool destroy_inventory)	1026	object::destroy (bool destroy_inventory)
963	{	1027	{
964	if (destroyed ())	1028	if (destroyed ())
965	return;	1029	return;
966		1030
967	if (destroy_inventory)	1031	destroy_inv (!destroy_inventory);
968	destroy_inv (false);
969		1032
970	if (is_head ())	1033	if (is_head ())
971	if (sound_destroy)	1034	if (sound_destroy)
972	play_sound (sound_destroy);	1035	play_sound (sound_destroy);
973	else if (flag [FLAG_MONSTER])	1036	else if (flag [FLAG_MONSTER])
974	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1037	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
975		1038
976	attachable::destroy ();	1039	attachable::destroy ();
977	}
978
979	/*
980	* sub_weight() recursively (outwards) subtracts a number from the
981	* weight of an object (and what is carried by it's environment(s)).
982	*/
983	void
984	sub_weight (object *op, signed long weight)
985	{
986	while (op != NULL)
987	{
988	if (op->type == CONTAINER)
989	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
990
991	op->carrying -= weight;
992	op = op->env;
993	}
994	}	1040	}
995		1041
996	/* op->remove ():	1042	/* op->remove ():
997	* This function removes the object op from the linked list of objects	1043	* This function removes the object op from the linked list of objects
998	* which it is currently tied to. When this function is done, the	1044	* which it is currently tied to. When this function is done, the
…		…
1004	object::do_remove ()	1050	object::do_remove ()
1005	{	1051	{
1006	object tmp, last = 0;	1052	object tmp, last = 0;
1007	object *otmp;	1053	object *otmp;
1008		1054
1009	if (QUERY_FLAG (this, FLAG_REMOVED))	1055	if (flag [FLAG_REMOVED])
1010	return;	1056	return;
1011		1057
1012	SET_FLAG (this, FLAG_REMOVED);
1013	INVOKE_OBJECT (REMOVE, this);	1058	INVOKE_OBJECT (REMOVE, this);
		1059
		1060	if (object *pl = visible_to ())
		1061	esrv_del_item (pl->contr, count);
		1062
		1063	flag [FLAG_REMOVED] = true;
1014		1064
1015	if (more)	1065	if (more)
1016	more->remove ();	1066	more->remove ();
1017		1067
1018	/*	1068	/*
1019	* In this case, the object to be removed is in someones	1069	* In this case, the object to be removed is in someones
1020	* inventory.	1070	* inventory.
1021	*/	1071	*/
1022	if (env)	1072	if (env)
1023	{	1073	{
		1074	adjust_weight (env, -total_weight ());
		1075
		1076	*(above ? &above->below : &env->inv) = below;
		1077
1024	if (nrof)	1078	if (below)
1025	sub_weight (env, weight * nrof);	1079	below->above = above;
1026	else	1080
1027	sub_weight (env, weight + carrying);	1081	/* we set up values so that it could be inserted into
		1082	* the map, but we don't actually do that - it is up
		1083	* to the caller to decide what we want to do.
		1084	*/
		1085	map = env->map;
		1086	x = env->x;
		1087	y = env->y;
		1088	above = 0;
		1089	below = 0;
		1090	env = 0;
1028		1091
1029	/* NO_FIX_PLAYER is set when a great many changes are being	1092	/* NO_FIX_PLAYER is set when a great many changes are being
1030	* made to players inventory. If set, avoiding the call	1093	* made to players inventory. If set, avoiding the call
1031	* to save cpu time.	1094	* to save cpu time.
1032	*/	1095	*/
1033	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1096	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1034	otmp->update_stats ();	1097	otmp->update_stats ();
1035
1036	if (above)
1037	above->below = below;
1038	else
1039	env->inv = below;
1040
1041	if (below)
1042	below->above = above;
1043
1044	/* we set up values so that it could be inserted into
1045	* the map, but we don't actually do that - it is up
1046	* to the caller to decide what we want to do.
1047	*/
1048	x = env->x, y = env->y;
1049	map = env->map;
1050	above = 0, below = 0;
1051	env = 0;
1052	}	1098	}
1053	else if (map)	1099	else if (map)
1054	{	1100	{
1055	if (type == PLAYER)	1101	if (type == PLAYER)
1056	{	1102	{
…		…
1103	* removed (most likely destroyed), update the player view	1149	* removed (most likely destroyed), update the player view
1104	* appropriately.	1150	* appropriately.
1105	*/	1151	*/
1106	pl->close_container ();	1152	pl->close_container ();
1107		1153
1108	pl->contr->ns->floorbox_update ();	1154	//TODO: the floorbox prev/next might need updating
		1155	esrv_del_item (pl->contr, count);
1109	}	1156	}
1110		1157
1111	for (tmp = ms.bot; tmp; tmp = tmp->above)	1158	for (tmp = ms.bot; tmp; tmp = tmp->above)
1112	{	1159	{
1113	/* No point updating the players look faces if he is the object	1160	/* No point updating the players look faces if he is the object
…		…
1157	if (!top)	1204	if (!top)
1158	for (top = op; top && top->above; top = top->above)	1205	for (top = op; top && top->above; top = top->above)
1159	;	1206	;
1160		1207
1161	for (; top; top = top->below)	1208	for (; top; top = top->below)
1162	{
1163	if (top == op)
1164	continue;
1165
1166	if (object::can_merge (op, top))	1209	if (object::can_merge (op, top))
1167	{	1210	{
1168	top->nrof += op->nrof;	1211	top->nrof += op->nrof;
1169		1212
1170	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1213	if (object *pl = top->visible_to ())
1171	op->weight = 0; /* Don't want any adjustements now */	1214	esrv_update_item (UPD_NROF, pl, top);
		1215
		1216	op->weight = 0; // cancel the addition above
		1217	op->carrying = 0; // must be 0 already
		1218
1172	op->destroy ();	1219	op->destroy (1);
		1220
1173	return top;	1221	return top;
1174	}	1222	}
1175	}
1176		1223
1177	return 0;	1224	return 0;
1178	}	1225	}
1179		1226
1180	void	1227	void
…		…
1239	object *	1286	object *
1240	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1287	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1241	{	1288	{
1242	assert (!op->flag [FLAG_FREED]);	1289	assert (!op->flag [FLAG_FREED]);
1243		1290
1244	object top, floor = NULL;
1245
1246	op->remove ();	1291	op->remove ();
1247		1292
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1293	/* Ideally, the caller figures this out. However, it complicates a lot
1249	* of areas of callers (eg, anything that uses find_free_spot would now	1294	* of areas of callers (eg, anything that uses find_free_spot would now
1250	* need extra work	1295	* need extra work
1251	*/	1296	*/
1252	if (!xy_normalise (m, op->x, op->y))	1297	if (!xy_normalise (m, op->x, op->y))
1253	{	1298	{
1254	op->destroy ();	1299	op->destroy (1);
1255	return 0;	1300	return 0;
1256	}	1301	}
1257		1302
1258	if (object *more = op->more)	1303	if (object *more = op->more)
1259	if (!insert_ob_in_map (more, m, originator, flag))	1304	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1268	*/	1313	*/
1269	if (op->nrof && !(flag & INS_NO_MERGE))	1314	if (op->nrof && !(flag & INS_NO_MERGE))
1270	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1315	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1271	if (object::can_merge (op, tmp))	1316	if (object::can_merge (op, tmp))
1272	{	1317	{
		1318	// TODO: we atcually want to update tmp, not op,
		1319	// but some caller surely breaks when we return tmp
		1320	// from here :/
1273	op->nrof += tmp->nrof;	1321	op->nrof += tmp->nrof;
1274	tmp->destroy ();	1322	tmp->destroy (1);
1275	}	1323	}
1276		1324
1277	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1325	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1278	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1326	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1279		1327
…		…
1299	/* since below originator, no need to update top */	1347	/* since below originator, no need to update top */
1300	originator->below = op;	1348	originator->below = op;
1301	}	1349	}
1302	else	1350	else
1303	{	1351	{
		1352	object top, floor = NULL;
		1353
1304	top = ms.bot;	1354	top = ms.bot;
1305		1355
1306	/* If there are other objects, then */	1356	/* If there are other objects, then */
1307	if (top)	1357	if (top)
1308	{	1358	{
…		…
1407	}	1457	}
1408		1458
1409	op->map->dirty = true;	1459	op->map->dirty = true;
1410		1460
1411	if (object *pl = ms.player ())	1461	if (object *pl = ms.player ())
1412	pl->contr->ns->floorbox_update ();	1462	//TODO: the floorbox prev/next might need updating
		1463	esrv_send_item (pl, op);
1413		1464
1414	/* If this object glows, it may affect lighting conditions that are	1465	/* If this object glows, it may affect lighting conditions that are
1415	* visible to others on this map. But update_all_los is really	1466	* visible to others on this map. But update_all_los is really
1416	* an inefficient way to do this, as it means los for all players	1467	* an inefficient way to do this, as it means los for all players
1417	* on the map will get recalculated. The players could very well	1468	* on the map will get recalculated. The players could very well
…		…
1459	* op is the object to insert it under: supplies x and the map.	1510	* op is the object to insert it under: supplies x and the map.
1460	*/	1511	*/
1461	void	1512	void
1462	replace_insert_ob_in_map (const char arch_string, object op)	1513	replace_insert_ob_in_map (const char arch_string, object op)
1463	{	1514	{
1464	object tmp, tmp1;
1465
1466	/* first search for itself and remove any old instances */	1515	/* first search for itself and remove any old instances */
1467		1516
1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1518	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1470	tmp->destroy ();	1519	tmp->destroy (1);
1471		1520
1472	tmp1 = arch_to_object (archetype::find (arch_string));	1521	object *tmp = arch_to_object (archetype::find (arch_string));
1473		1522
1474	tmp1->x = op->x;	1523	tmp->x = op->x;
1475	tmp1->y = op->y;	1524	tmp->y = op->y;
		1525
1476	insert_ob_in_map (tmp1, op->map, op, 0);	1526	insert_ob_in_map (tmp, op->map, op, 0);
1477	}	1527	}
1478		1528
1479	object *	1529	object *
1480	object::insert_at (object where, object originator, int flags)	1530	object::insert_at (object where, object originator, int flags)
1481	{	1531	{
		1532	if (where->env)
		1533	return where->env->insert (this);
		1534	else
1482	return where->map->insert (this, where->x, where->y, originator, flags);	1535	return where->map->insert (this, where->x, where->y, originator, flags);
1483	}	1536	}
1484		1537
1485	/*	1538	/*
1486	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1487	* is returned contains nr objects, and the remaining parts contains
1488	* the rest (or is removed and freed if that number is 0).
1489	* On failure, NULL is returned, and the reason put into the
1490	* global static errmsg array.
1491	*/
1492	object *
1493	get_split_ob (object *orig_ob, uint32 nr)
1494	{
1495	object *newob;
1496	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1497
1498	if (orig_ob->nrof < nr)
1499	{
1500	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1501	return NULL;
1502	}
1503
1504	newob = object_create_clone (orig_ob);
1505
1506	if ((orig_ob->nrof -= nr) < 1)
1507	orig_ob->destroy (1);
1508	else if (!is_removed)
1509	{
1510	if (orig_ob->env != NULL)
1511	sub_weight (orig_ob->env, orig_ob->weight * nr);
1512	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1513	{
1514	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1515	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1516	return NULL;
1517	}
1518	}
1519
1520	newob->nrof = nr;
1521
1522	return newob;
1523	}
1524
1525	/*
1526	* decrease_ob_nr(object, number) decreases a specified number from	1539	* decrease(object, number) decreases a specified number from
1527	* the amount of an object. If the amount reaches 0, the object	1540	* the amount of an object. If the amount reaches 0, the object
1528	* is subsequently removed and freed.	1541	* is subsequently removed and freed.
1529	*	1542	*
1530	* Return value: 'op' if something is left, NULL if the amount reached 0	1543	* Return value: 'op' if something is left, NULL if the amount reached 0
1531	*/	1544	*/
		1545	bool
		1546	object::decrease (sint32 nr)
		1547	{
		1548	if (!nr)
		1549	return true;
		1550
		1551	nr = min (nr, nrof);
		1552
		1553	nrof -= nr;
		1554
		1555	if (nrof)
		1556	{
		1557	adjust_weight (env, -weight * nr); // carrying == 0
		1558
		1559	if (object *pl = visible_to ())
		1560	esrv_update_item (UPD_NROF, pl, this);
		1561
		1562	return true;
		1563	}
		1564	else
		1565	{
		1566	destroy (1);
		1567	return false;
		1568	}
		1569	}
		1570
		1571	/*
		1572	* split(ob,nr) splits up ob into two parts. The part which
		1573	* is returned contains nr objects, and the remaining parts contains
		1574	* the rest (or is removed and returned if that number is 0).
		1575	* On failure, NULL is returned.
		1576	*/
1532	object *	1577	object *
1533	decrease_ob_nr (object *op, uint32 i)	1578	object::split (sint32 nr)
1534	{	1579	{
1535	object *tmp;	1580	int have = number_of ();
1536		1581
1537	if (i == 0) /* objects with op->nrof require this check */	1582	if (have < nr)
1538	return op;	1583	return 0;
1539		1584	else if (have == nr)
1540	if (i > op->nrof)
1541	i = op->nrof;
1542
1543	if (QUERY_FLAG (op, FLAG_REMOVED))
1544	op->nrof -= i;
1545	else if (op->env)
1546	{	1585	{
1547	/* is this object in the players inventory, or sub container
1548	* therein?
1549	*/
1550	tmp = op->in_player ();
1551	/* nope. Is this a container the player has opened?
1552	* If so, set tmp to that player.
1553	* IMO, searching through all the players will mostly
1554	* likely be quicker than following op->env to the map,
1555	* and then searching the map for a player.
1556	*/
1557	if (!tmp)
1558	for_all_players (pl)
1559	if (pl->ob->container == op->env)
1560	{
1561	tmp = pl->ob;
1562	break;
1563	}
1564
1565	if (i < op->nrof)
1566	{
1567	sub_weight (op->env, op->weight * i);
1568	op->nrof -= i;
1569	if (tmp)
1570	esrv_send_item (tmp, op);
1571	}
1572	else
1573	{
1574	op->remove ();	1586	remove ();
1575	op->nrof = 0;	1587	return this;
1576	if (tmp)
1577	esrv_del_item (tmp->contr, op->count);
1578	}
1579	}	1588	}
1580	else	1589	else
1581	{	1590	{
1582	object *above = op->above;	1591	decrease (nr);
1583		1592
1584	if (i < op->nrof)	1593	object *op = object_create_clone (this);
1585	op->nrof -= i;	1594	op->nrof = nr;
1586	else
1587	{
1588	op->remove ();
1589	op->nrof = 0;
1590	}
1591
1592	/* Since we just removed op, op->above is null */
1593	for (tmp = above; tmp; tmp = tmp->above)
1594	if (tmp->type == PLAYER)
1595	{
1596	if (op->nrof)
1597	esrv_send_item (tmp, op);
1598	else
1599	esrv_del_item (tmp->contr, op->count);
1600	}
1601	}
1602
1603	if (op->nrof)
1604	return op;	1595	return op;
1605	else
1606	{
1607	op->destroy ();
1608	return 0;
1609	}
1610	}
1611
1612	/*
1613	* add_weight(object, weight) adds the specified weight to an object,
1614	* and also updates how much the environment(s) is/are carrying.
1615	*/
1616	void
1617	add_weight (object *op, signed long weight)
1618	{
1619	while (op != NULL)
1620	{
1621	if (op->type == CONTAINER)
1622	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1623
1624	op->carrying += weight;
1625	op = op->env;
1626	}	1596	}
1627	}	1597	}
1628		1598
1629	object *	1599	object *
1630	insert_ob_in_ob (object op, object where)	1600	insert_ob_in_ob (object op, object where)
…		…
1655	* be != op, if items are merged. -Tero	1625	* be != op, if items are merged. -Tero
1656	*/	1626	*/
1657	object *	1627	object *
1658	object::insert (object *op)	1628	object::insert (object *op)
1659	{	1629	{
1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1661	op->remove ();
1662
1663	if (op->more)	1630	if (op->more)
1664	{	1631	{
1665	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1632	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1666	return op;	1633	return op;
1667	}	1634	}
1668		1635
1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1636	op->remove ();
1670	CLEAR_FLAG (op, FLAG_REMOVED);	1637
		1638	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1671		1639
1672	if (op->nrof)	1640	if (op->nrof)
1673	{
1674	for (object *tmp = inv; tmp; tmp = tmp->below)	1641	for (object *tmp = inv; tmp; tmp = tmp->below)
1675	if (object::can_merge (tmp, op))	1642	if (object::can_merge (tmp, op))
1676	{	1643	{
1677	/* return the original object and remove inserted object	1644	/* return the original object and remove inserted object
1678	(client needs the original object) */	1645	(client needs the original object) */
1679	tmp->nrof += op->nrof;	1646	tmp->nrof += op->nrof;
1680	/* Weight handling gets pretty funky. Since we are adding to	1647
1681	* tmp->nrof, we need to increase the weight.	1648	if (object *pl = tmp->visible_to ())
1682	*/	1649	esrv_update_item (UPD_NROF, pl, tmp);
		1650
1683	add_weight (this, op->weight * op->nrof);	1651	adjust_weight (this, op->total_weight ());
1684	SET_FLAG (op, FLAG_REMOVED);	1652
1685	op->destroy (); /* free the inserted object */	1653	op->destroy (1);
1686	op = tmp;	1654	op = tmp;
1687	op->remove (); /* and fix old object's links */	1655	goto inserted;
1688	CLEAR_FLAG (op, FLAG_REMOVED);
1689	break;
1690	}	1656	}
1691		1657
1692	/* I assume combined objects have no inventory
1693	* We add the weight - this object could have just been removed
1694	* (if it was possible to merge). calling remove_ob will subtract
1695	* the weight, so we need to add it in again, since we actually do
1696	* the linking below
1697	*/
1698	add_weight (this, op->weight * op->nrof);
1699	}
1700	else
1701	add_weight (this, (op->weight + op->carrying));
1702
1703	if (object *otmp = this->in_player ())
1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1705	otmp->update_stats ();
1706
1707	op->owner = 0; // its his/hers now. period.	1658	op->owner = 0; // it's his/hers now. period.
1708	op->map = 0;	1659	op->map = 0;
		1660	op->x = 0;
		1661	op->y = 0;
		1662
		1663	op->above = 0;
		1664	op->below = inv;
1709	op->env = this;	1665	op->env = this;
1710	op->above = 0;
1711	op->below = 0;
1712	op->x = op->y = 0;
1713		1666
		1667	if (inv)
		1668	inv->above = op;
		1669
		1670	inv = op;
		1671
		1672	op->flag [FLAG_REMOVED] = 0;
		1673
		1674	if (object *pl = op->visible_to ())
		1675	esrv_send_item (pl, op);
		1676
		1677	adjust_weight (this, op->total_weight ());
		1678
		1679	inserted:
1714	/* reset the light list and los of the players on the map */	1680	/* reset the light list and los of the players on the map */
1715	if (op->glow_radius && map)	1681	if (op->glow_radius && map && map->darkness)
1716	{
1717	#ifdef DEBUG_LIGHTS
1718	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1719	#endif /* DEBUG_LIGHTS */
1720	if (map->darkness)
1721	update_all_los (map, x, y);	1682	update_all_los (map, x, y);
1722	}
1723		1683
1724	/* Client has no idea of ordering so lets not bother ordering it here.	1684	// if this is a player's inventory, update stats
1725	* It sure simplifies this function...	1685	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1726	*/	1686	update_stats ();
1727	if (!inv)
1728	inv = op;
1729	else
1730	{
1731	op->below = inv;
1732	op->below->above = op;
1733	inv = op;
1734	}
1735		1687
1736	INVOKE_OBJECT (INSERT, this);	1688	INVOKE_OBJECT (INSERT, this);
1737		1689
1738	return op;	1690	return op;
1739	}	1691	}
…		…
2617	&name,	2569	&name,
2618	title ? "\",title:\"" : "",	2570	title ? "\",title:\"" : "",
2619	title ? (const char *)title : "",	2571	title ? (const char *)title : "",
2620	flag_desc (flagdesc, 512), type);	2572	flag_desc (flagdesc, 512), type);
2621		2573
2622	if (!this->flag[FLAG_REMOVED] && env)	2574	if (!flag[FLAG_REMOVED] && env)
2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2624		2576
2625	if (map)	2577	if (map)
2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2578	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2627		2579
…		…
2669	if (object *closer = old_container->inv)	2621	if (object *closer = old_container->inv)
2670	if (closer->type == CLOSE_CON)	2622	if (closer->type == CLOSE_CON)
2671	closer->destroy ();	2623	closer->destroy ();
2672	#endif	2624	#endif
2673		2625
2674	old_container->flag [FLAG_APPLIED] = 0;	2626	old_container->flag [FLAG_APPLIED] = false;
2675	container = 0;	2627	container = 0;
2676		2628
2677	esrv_update_item (UPD_FLAGS, this, old_container);	2629	esrv_update_item (UPD_FLAGS, this, old_container);
2678	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2630	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2679	play_sound (sound_find ("chest_close"));	2631	play_sound (sound_find ("chest_close"));
…		…
2695	}	2647	}
2696	#endif	2648	#endif
2697		2649
2698	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2650	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2699		2651
2700	new_container->flag [FLAG_APPLIED] = 1;	2652	new_container->flag [FLAG_APPLIED] = true;
2701	container = new_container;	2653	container = new_container;
2702		2654
2703	esrv_update_item (UPD_FLAGS, this, new_container);	2655	esrv_update_item (UPD_FLAGS, this, new_container);
2704	esrv_send_inventory (this, new_container);	2656	esrv_send_inventory (this, new_container);
2705	play_sound (sound_find ("chest_open"));	2657	play_sound (sound_find ("chest_open"));
…		…
2737		2689
2738	insert (force);	2690	insert (force);
2739	}	2691	}
2740		2692
2741	void	2693	void
2742	object::play_sound (faceidx sound) const	2694	object::play_sound (faceidx sound)
2743	{	2695	{
2744	if (!sound)	2696	if (!sound)
2745	return;	2697	return;
2746		2698
2747	if (flag [FLAG_REMOVED])	2699	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC vs. Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC vs.
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC