[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.211 by root, Mon Apr 21 21:32:32 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>
…		…
34	#include <loader.h>	31	#include <loader.h>
35		32
36	#include <bitset>	33	#include <bitset>
37		34
38	UUID UUID::cur;	35	UUID UUID::cur;
		36	static uint64_t seq_next_save;
39	static const uint64 UUID_SKIP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
40		38
41	objectvec objects;	39	objectvec objects;
42	activevec actives;	40	activevec actives;
43		41
44	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
81	{	79	{
82	char filename[MAX_BUF];	80	char filename[MAX_BUF];
83		81
84	sprintf (filename, "%s/uuid", settings.localdir);	82	sprintf (filename, "%s/uuid", settings.localdir);
85		83
		84	seq_next_save = 0;
		85
86	FILE *fp;	86	FILE *fp;
87		87
88	if (!(fp = fopen (filename, "r")))	88	if (!(fp = fopen (filename, "r")))
89	{	89	{
90	if (errno == ENOENT)	90	if (errno == ENOENT)
91	{	91	{
92	LOG (llevInfo, "RESET uid to 1\n");	92	LOG (llevInfo, "RESET uid to 1\n");
93	UUID::cur.seq = 0;	93	UUID::cur.seq = 0;
94	write_uuid (UUID_SKIP, true);	94	write_uuid (UUID_GAP, true);
95	return;	95	return;
96	}	96	}
97		97
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	99	_exit (1);
…		…
109	_exit (1);	109	_exit (1);
110	}	110	}
111		111
112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());	112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113		113
114	write_uuid (UUID_SKIP, true);	114	write_uuid (UUID_GAP, true);
115	fclose (fp);	115	fclose (fp);
116	}	116	}
117		117
118	UUID	118	UUID
119	UUID::gen ()	119	UUID::gen ()
120	{	120	{
121	UUID uid;	121	UUID uid;
122		122
123	uid.seq = ++cur.seq;	123	uid.seq = ++cur.seq;
124		124
125	if (expect_false (!(cur.seq & (UUID_SKIP - 1))))	125	if (expect_false (cur.seq >= seq_next_save))
		126	{
		127	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
126	write_uuid (UUID_SKIP, false);	128	write_uuid (UUID_GAP, false);
		129	}
		130
127		131
128	return uid;	132	return uid;
129	}	133	}
130		134
131	void	135	void
…		…
133	{	137	{
134	read_uuid ();	138	read_uuid ();
135	}	139	}
136		140
137	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138	static int	142	static bool
139	compare_ob_value_lists_one (const object wants, const object has)	143	compare_ob_value_lists_one (const object wants, const object has)
140	{	144	{
141	key_value *wants_field;	145	key_value *wants_field;
142		146
143	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	147	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
151	key_value *has_field;	155	key_value *has_field;
152		156
153	/* Look for a field in has with the same key. */	157	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);	158	has_field = get_ob_key_link (has, wants_field->key);
155		159
156	if (has_field == NULL)	160	if (!has_field)
157	{
158	/* No field with that name. */	161	return 0; /* No field with that name. */
159	return FALSE;
160	}
161		162
162	/* Found the matching field. */	163	/* Found the matching field. */
163	if (has_field->value != wants_field->value)	164	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */	165	return 0; /* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168		166
169	/* If we get here, we found a match. Now for the next field in wants. */	167	/* If we get here, we found a match. Now for the next field in wants. */
170	}	168	}
171		169
172	/* If we get here, every field in wants has a matching field in has. */	170	/* If we get here, every field in wants has a matching field in has. */
173	return TRUE;	171	return 1;
174	}	172	}
175		173
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	174	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	175	static bool
178	compare_ob_value_lists (const object ob1, const object ob2)	176	compare_ob_value_lists (const object ob1, const object ob2)
179	{	177	{
180	/* However, there may be fields in has which aren't partnered in wants,	178	/* However, there may be fields in has which aren't partnered in wants,
181	* so we need to run the comparison twice. :(	179	* so we need to run the comparison twice. :(
182	*/	180	*/
…		…
203	\|\| ob1->speed != ob2->speed	201	\|\| ob1->speed != ob2->speed
204	\|\| ob1->value != ob2->value	202	\|\| ob1->value != ob2->value
205	\|\| ob1->name != ob2->name)	203	\|\| ob1->name != ob2->name)
206	return 0;	204	return 0;
207		205
208	//TODO: this ain't working well, use nicer and correct overflow check	206	/* 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	207	* for unsigned overflow (2c), second part checks whether the result
210	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* would fit into a 32 bit signed int, which is often used to hold
211	* used to store nrof).	209	* nrof values.
212	*/	210	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	212	return 0;
215		213
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	214	/* 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	215	* 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	216	* 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	217	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	218	* flags lose any meaning.
221	*/	219	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		222
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		225
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	226	if (ob1->arch->name != ob2->arch->name
229	\|\| ob1->arch != ob2->arch
230	\|\| ob1->name != ob2->name	227	\|\| ob1->name != ob2->name
231	\|\| ob1->title != ob2->title	228	\|\| ob1->title != ob2->title
232	\|\| ob1->msg != ob2->msg	229	\|\| ob1->msg != ob2->msg
233	\|\| ob1->weight != ob2->weight	230	\|\| 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	231	\|\| ob1->attacktype != ob2->attacktype
237	\|\| ob1->magic != ob2->magic	232	\|\| ob1->magic != ob2->magic
238	\|\| ob1->slaying != ob2->slaying	233	\|\| ob1->slaying != ob2->slaying
239	\|\| ob1->skill != ob2->skill	234	\|\| ob1->skill != ob2->skill
240	\|\| ob1->value != ob2->value	235	\|\| ob1->value != ob2->value
…		…
247	\|\| ob1->move_block != ob2->move_block	242	\|\| ob1->move_block != ob2->move_block
248	\|\| ob1->move_allow != ob2->move_allow	243	\|\| ob1->move_allow != ob2->move_allow
249	\|\| ob1->move_on != ob2->move_on	244	\|\| ob1->move_on != ob2->move_on
250	\|\| ob1->move_off != ob2->move_off	245	\|\| ob1->move_off != ob2->move_off
251	\|\| ob1->move_slow != ob2->move_slow	246	\|\| ob1->move_slow != ob2->move_slow
252	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	247	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		248	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		249	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253	return 0;	250	return 0;
254		251
		252	if ((ob1->flag ^ ob2->flag)
		253	.reset (FLAG_INV_LOCKED)
		254	.reset (FLAG_CLIENT_SENT)
		255	.reset (FLAG_REMOVED)
		256	.any ())
		257	return 0;
		258
255	/* This is really a spellbook check - really, we should	259	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	260	* not merge objects with real inventories, as splitting them
		261	* is hard.
257	*/	262	*/
258	if (ob1->inv \|\| ob2->inv)	263	if (ob1->inv \|\| ob2->inv)
259	{	264	{
260	if (!(ob1->inv && ob2->inv))	265	if (!(ob1->inv && ob2->inv))
261	return 0; /* inventories differ in length */	266	return 0; /* inventories differ in length */
262		267
263	if (ob1->inv->below \|\| ob2->inv->below)	268	if (ob1->inv->below \|\| ob2->inv->below)
264	return 0; /* more than one object in inv */	269	return 0; /* more than one object in inv */
265		270
266	if (!object::can_merge (ob1->inv, ob2->inv))	271	if (!object::can_merge (ob1->inv, ob2->inv))
267	return 0; /* inventory objexts differ */	272	return 0; /* inventory objects differ */
268		273
269	/* inventory ok - still need to check rest of this object to see	274	/* inventory ok - still need to check rest of this object to see
270	* if it is valid.	275	* if it is valid.
271	*/	276	*/
272	}	277	}
…		…
291	if (ob1->level != ob2->level)	296	if (ob1->level != ob2->level)
292	return 0;	297	return 0;
293	break;	298	break;
294	}	299	}
295		300
296	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	301	if (ob1->key_values \|\| ob2->key_values)
297	{	302	{
298	/* At least one of these has key_values. */	303	/* At least one of these has key_values. */
299	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	304	if ((!ob1->key_values) != (!ob2->key_values))
300	/* One has fields, but the other one doesn't. */	305	return 0; /* One has fields, but the other one doesn't. */
301	return 0;	306
302	else if (!compare_ob_value_lists (ob1, ob2))	307	if (!compare_ob_value_lists (ob1, ob2))
303	return 0;	308	return 0;
304	}	309	}
305		310
306	if (ob1->self \|\| ob2->self)	311	if (ob1->self \|\| ob2->self)
307	{	312	{
…		…
313	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	318	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
314	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	319	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
315		320
316	if (k1 != k2)	321	if (k1 != k2)
317	return 0;	322	return 0;
		323
318	else if (k1 == 0)	324	if (k1 == 0)
319	return 1;	325	return 1;
		326
320	else if (!cfperl_can_merge (ob1, ob2))	327	if (!cfperl_can_merge (ob1, ob2))
321	return 0;	328	return 0;
322	}	329	}
323	}	330	}
324		331
325	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
326	return 1;	333	return 1;
327	}	334	}
328		335
		336	// adjust weight per container type ("of holding")
		337	static sint32
		338	weight_adjust (object *op, sint32 weight)
		339	{
		340	return op->type == CONTAINER
		341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		342	: weight;
		343	}
		344
329	/*	345	/*
		346	* adjust_weight(object, weight) adds the specified weight to an object,
		347	* and also updates how much the environment(s) is/are carrying.
		348	*/
		349	static void
		350	adjust_weight (object *op, sint32 weight)
		351	{
		352	while (op)
		353	{
		354	weight = weight_adjust (op, weight);
		355
		356	op->carrying += weight;
		357	op = op->env;
		358	}
		359	}
		360
		361	/*
330	* sum_weight() is a recursive function which calculates the weight	362	* this is a recursive function which calculates the weight
331	* an object is carrying. It goes through in figures out how much	363	* an object is carrying. It goes through op and figures out how much
332	* containers are carrying, and sums it up.	364	* containers are carrying, and sums it up.
333	*/	365	*/
334	long	366	void
335	sum_weight (object *op)	367	object::update_weight ()
336	{	368	{
337	long sum;	369	sint32 sum = 0;
338	object *inv;
339		370
340	for (sum = 0, inv = op->inv; inv; inv = inv->below)	371	for (object *op = inv; op; op = op->below)
341	{	372	{
342	if (inv->inv)	373	if (op->inv)
343	sum_weight (inv);	374	op->update_weight ();
344		375
345	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	376	sum += op->total_weight ();
346	}	377	}
347		378
348	if (op->type == CONTAINER && op->stats.Str)	379	carrying = weight_adjust (this, sum);
349	sum = (sum * (100 - op->stats.Str)) / 100;
350
351	if (op->carrying != sum)
352	op->carrying = sum;
353
354	return sum;
355	}	380	}
356		381
357	/**	382	/*
358	* Return the outermost environment object for a given object.	383	* 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	*/	384	*/
374	char *	385	char *
375	dump_object (object *op)	386	dump_object (object *op)
376	{	387	{
377	if (!op)	388	if (!op)
…		…
391	get_nearest_part (object op, const object pl)	402	get_nearest_part (object op, const object pl)
392	{	403	{
393	object tmp, closest;	404	object tmp, closest;
394	int last_dist, i;	405	int last_dist, i;
395		406
396	if (op->more == NULL)	407	if (!op->more)
397	return op;	408	return op;
		409
398	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	410	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		411	tmp;
		412	tmp = tmp->more)
399	if ((i = distance (tmp, pl)) < last_dist)	413	if ((i = distance (tmp, pl)) < last_dist)
400	closest = tmp, last_dist = i;	414	closest = tmp, last_dist = i;
		415
401	return closest;	416	return closest;
402	}	417	}
403		418
404	/*	419	/*
405	* Returns the object which has the count-variable equal to the argument.	420	* Returns the object which has the count-variable equal to the argument.
		421	* VERRRY slow.
406	*/	422	*/
407	object *	423	object *
408	find_object (tag_t i)	424	find_object (tag_t i)
409	{	425	{
410	for_all_objects (op)	426	for_all_objects (op)
…		…
861	* if some form of movement is allowed, let objects	877	* if some form of movement is allowed, let objects
862	* drop on that space.	878	* drop on that space.
863	*/	879	*/
864	if (!drop_to_ground	880	if (!drop_to_ground
865	\|\| !map	881	\|\| !map
866	\|\| map->in_memory != MAP_IN_MEMORY	882	\|\| map->in_memory != MAP_ACTIVE
867	\|\| map->nodrop	883	\|\| map->nodrop
868	\|\| ms ().move_block == MOVE_ALL)	884	\|\| ms ().move_block == MOVE_ALL)
869	{	885	{
870	while (inv)	886	while (inv)
871	{	887	{
…		…
933	freed_map->width = 3;	949	freed_map->width = 3;
934	freed_map->height = 3;	950	freed_map->height = 3;
935	freed_map->nodrop = 1;	951	freed_map->nodrop = 1;
936		952
937	freed_map->alloc ();	953	freed_map->alloc ();
938	freed_map->in_memory = MAP_IN_MEMORY;	954	freed_map->in_memory = MAP_ACTIVE;
939	}	955	}
940		956
941	map = freed_map;	957	map = freed_map;
942	x = 1;	958	x = 1;
943	y = 1;	959	y = 1;
…		…
972	play_sound (sound_destroy);	988	play_sound (sound_destroy);
973	else if (flag [FLAG_MONSTER])	989	else if (flag [FLAG_MONSTER])
974	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	990	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
975		991
976	attachable::destroy ();	992	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	}	993	}
995		994
996	/* op->remove ():	995	/* op->remove ():
997	* This function removes the object op from the linked list of objects	996	* 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	997	* which it is currently tied to. When this function is done, the
…		…
1019	* In this case, the object to be removed is in someones	1018	* In this case, the object to be removed is in someones
1020	* inventory.	1019	* inventory.
1021	*/	1020	*/
1022	if (env)	1021	if (env)
1023	{	1022	{
		1023	adjust_weight (env, -total_weight ());
		1024
		1025	*(above ? &above->below : &env->inv) = below;
		1026
1024	if (nrof)	1027	if (below)
1025	sub_weight (env, weight * nrof);	1028	below->above = above;
1026	else	1029
1027	sub_weight (env, weight + carrying);	1030	/* we set up values so that it could be inserted into
		1031	* the map, but we don't actually do that - it is up
		1032	* to the caller to decide what we want to do.
		1033	*/
		1034	map = env->map;
		1035	x = env->x;
		1036	y = env->y;
		1037	above = 0;
		1038	below = 0;
		1039	env = 0;
1028		1040
1029	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1030	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1031	* to save cpu time.	1043	* to save cpu time.
1032	*/	1044	*/
1033	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1034	otmp->update_stats ();	1046	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	}	1047	}
1053	else if (map)	1048	else if (map)
1054	{	1049	{
1055	if (type == PLAYER)	1050	if (type == PLAYER)
1056	{	1051	{
…		…
1269	if (op->nrof && !(flag & INS_NO_MERGE))	1264	if (op->nrof && !(flag & INS_NO_MERGE))
1270	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1271	if (object::can_merge (op, tmp))	1266	if (object::can_merge (op, tmp))
1272	{	1267	{
1273	op->nrof += tmp->nrof;	1268	op->nrof += tmp->nrof;
1274	tmp->destroy ();	1269	tmp->destroy (1);
1275	}	1270	}
1276		1271
1277	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1278	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1279		1274
…		…
1459	* op is the object to insert it under: supplies x and the map.	1454	* op is the object to insert it under: supplies x and the map.
1460	*/	1455	*/
1461	void	1456	void
1462	replace_insert_ob_in_map (const char arch_string, object op)	1457	replace_insert_ob_in_map (const char arch_string, object op)
1463	{	1458	{
1464	object tmp, tmp1;
1465
1466	/* first search for itself and remove any old instances */	1459	/* first search for itself and remove any old instances */
1467		1460
1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1470	tmp->destroy ();	1463	tmp->destroy (1);
1471		1464
1472	tmp1 = arch_to_object (archetype::find (arch_string));	1465	object *tmp = arch_to_object (archetype::find (arch_string));
1473		1466
1474	tmp1->x = op->x;	1467	tmp->x = op->x;
1475	tmp1->y = op->y;	1468	tmp->y = op->y;
		1469
1476	insert_ob_in_map (tmp1, op->map, op, 0);	1470	insert_ob_in_map (tmp, op->map, op, 0);
1477	}	1471	}
1478		1472
1479	object *	1473	object *
1480	object::insert_at (object where, object originator, int flags)	1474	object::insert_at (object where, object originator, int flags)
1481	{	1475	{
		1476	if (where->env)
		1477	return where->env->insert (this);
		1478	else
1482	return where->map->insert (this, where->x, where->y, originator, flags);	1479	return where->map->insert (this, where->x, where->y, originator, flags);
1483	}	1480	}
1484		1481
1485	/*	1482	// find player who can see this object
1486	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1483	static object *
1487	* is returned contains nr objects, and the remaining parts contains	1484	visible_to (object *op)
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	{	1485	{
1495	object *newob;	1486	if (!op->flag [FLAG_REMOVED])
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	}	1487	{
1503		1488	// see if we are in a container of sorts
1504	newob = object_create_clone (orig_ob);	1489	if (object *env = op->env)
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	}	1490	{
1518	}	1491	// the player inventory itself is always visible
		1492	if (env->type == PLAYER)
		1493	return env;
1519		1494
1520	newob->nrof = nr;	1495	// else a player could have our env open
		1496	env = env->outer_env ();
1521		1497
		1498	// the player itself is always on a map, so we will find him here
		1499	// even if our inv is in a player.
		1500	if (env->is_on_map ())
		1501	if (object *pl = env->ms ().player ())
		1502	if (pl->container == op->env)
		1503	return pl;
		1504	}
		1505	else
		1506	{
		1507	// maybe there is a player standing on the same mapspace
		1508	if (object *pl = op->ms ().player ())
		1509	return pl;
		1510	}
		1511	}
		1512
1522	return newob;	1513	return 0;
1523	}	1514	}
1524		1515
1525	/*	1516	/*
1526	* decrease_ob_nr(object, number) decreases a specified number from	1517	* decrease(object, number) decreases a specified number from
1527	* the amount of an object. If the amount reaches 0, the object	1518	* the amount of an object. If the amount reaches 0, the object
1528	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1529	*	1520	*
1530	* Return value: 'op' if something is left, NULL if the amount reached 0	1521	* Return value: 'op' if something is left, NULL if the amount reached 0
1531	*/	1522	*/
		1523	bool
		1524	object::decrease (sint32 nr)
		1525	{
		1526	nr = min (nr, nrof);
		1527
		1528	if (!nr)
		1529	return 1;
		1530
		1531	nrof -= nr;
		1532
		1533	object *visible = visible_to (this);
		1534
		1535	if (nrof)
		1536	{
		1537	adjust_weight (env, -weight * nr); // carrying == 0
		1538
		1539	if (visible)
		1540	esrv_send_item (visible, this);
		1541
		1542	return 1;
		1543	}
		1544	else
		1545	{
		1546	if (visible)
		1547	esrv_del_item (visible->contr, count);
		1548
		1549	this->destroy (1);
		1550	return 0;
		1551	}
		1552	}
		1553
		1554	/*
		1555	* split(ob,nr) splits up ob into two parts. The part which
		1556	* is returned contains nr objects, and the remaining parts contains
		1557	* the rest (or is removed and returned if that number is 0).
		1558	* On failure, NULL is returned.
		1559	*/
1532	object *	1560	object *
1533	decrease_ob_nr (object *op, uint32 i)	1561	object::split (sint32 nr)
1534	{	1562	{
1535	object *tmp;	1563	if (nrof < nr)
1536
1537	if (i == 0) /* objects with op->nrof require this check */
1538	return op;	1564	return 0;
1539		1565	else if (nrof == 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	{	1566	{
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 ();	1567	remove ();
1575	op->nrof = 0;	1568	return this;
1576	if (tmp)
1577	esrv_del_item (tmp->contr, op->count);
1578	}
1579	}	1569	}
1580	else	1570	else
1581	{	1571	{
1582	object *above = op->above;	1572	decrease (nr);
1583		1573
1584	if (i < op->nrof)	1574	object *op = object_create_clone (this);
1585	op->nrof -= i;	1575	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;	1576	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	}	1577	}
1627	}	1578	}
1628		1579
1629	object *	1580	object *
1630	insert_ob_in_ob (object op, object where)	1581	insert_ob_in_ob (object op, object where)
…		…
1655	* be != op, if items are merged. -Tero	1606	* be != op, if items are merged. -Tero
1656	*/	1607	*/
1657	object *	1608	object *
1658	object::insert (object *op)	1609	object::insert (object *op)
1659	{	1610	{
1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1661	op->remove ();
1662
1663	if (op->more)	1611	if (op->more)
1664	{	1612	{
1665	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1613	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1666	return op;	1614	return op;
1667	}	1615	}
1668		1616
1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1617	op->remove ();
1670	CLEAR_FLAG (op, FLAG_REMOVED);	1618
		1619	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1671		1620
1672	if (op->nrof)	1621	if (op->nrof)
1673	{
1674	for (object *tmp = inv; tmp; tmp = tmp->below)	1622	for (object *tmp = inv; tmp; tmp = tmp->below)
1675	if (object::can_merge (tmp, op))	1623	if (object::can_merge (tmp, op))
1676	{	1624	{
1677	/* return the original object and remove inserted object	1625	/* return the original object and remove inserted object
1678	(client needs the original object) */	1626	(client needs the original object) */
1679	tmp->nrof += op->nrof;	1627	tmp->nrof += op->nrof;
1680	/* Weight handling gets pretty funky. Since we are adding to
1681	* tmp->nrof, we need to increase the weight.
1682	*/
1683	add_weight (this, op->weight * op->nrof);	1628	adjust_weight (this, op->total_weight ());
1684	SET_FLAG (op, FLAG_REMOVED);	1629
1685	op->destroy (); /* free the inserted object */	1630	op->destroy (1);
1686	op = tmp;	1631	op = tmp;
1687	op->remove (); /* and fix old object's links */	1632	goto inserted;
1688	CLEAR_FLAG (op, FLAG_REMOVED);
1689	break;
1690	}	1633	}
1691		1634
1692	/* I assume combined objects have no inventory	1635	op->owner = 0; // it's his/hers now. period.
1693	* We add the weight - this object could have just been removed	1636	op->map = 0;
1694	* (if it was possible to merge). calling remove_ob will subtract	1637	op->x = 0;
1695	* the weight, so we need to add it in again, since we actually do	1638	op->y = 0;
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		1639
		1640	op->above = 0;
		1641	op->below = inv;
		1642	op->env = this;
		1643
		1644	if (inv)
		1645	inv->above = op;
		1646
		1647	inv = op;
		1648
		1649	op->flag [FLAG_REMOVED] = 0;
		1650
		1651	adjust_weight (this, op->total_weight ());
		1652
		1653	inserted:
		1654	/* reset the light list and los of the players on the map */
		1655	if (op->glow_radius && map && map->darkness)
		1656	update_all_los (map, x, y);
		1657
1703	if (object *otmp = this->in_player ())	1658	if (object *otmp = in_player ())
1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1659	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1705	otmp->update_stats ();	1660	otmp->update_stats ();
1706
1707	op->owner = 0; // its his/hers now. period.
1708	op->map = 0;
1709	op->env = this;
1710	op->above = 0;
1711	op->below = 0;
1712	op->x = op->y = 0;
1713
1714	/* reset the light list and los of the players on the map */
1715	if (op->glow_radius && map)
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);
1722	}
1723
1724	/* Client has no idea of ordering so lets not bother ordering it here.
1725	* It sure simplifies this function...
1726	*/
1727	if (!inv)
1728	inv = op;
1729	else
1730	{
1731	op->below = inv;
1732	op->below->above = op;
1733	inv = op;
1734	}
1735		1661
1736	INVOKE_OBJECT (INSERT, this);	1662	INVOKE_OBJECT (INSERT, this);
1737		1663
1738	return op;	1664	return op;
1739	}	1665	}
…		…
2737		2663
2738	insert (force);	2664	insert (force);
2739	}	2665	}
2740		2666
2741	void	2667	void
2742	object::play_sound (faceidx sound) const	2668	object::play_sound (faceidx sound)
2743	{	2669	{
2744	if (!sound)	2670	if (!sound)
2745	return;	2671	return;
2746		2672
2747	if (flag [FLAG_REMOVED])	2673	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.211 by root, Mon Apr 21 21:32:32 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.211 by root, Mon Apr 21 21:32:32 2008 UTC