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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC vs.
Revision 1.216 by root, Tue Apr 22 23:50:23 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
…		…
140	{	136	{
141	read_uuid ();	137	read_uuid ();
142	}	138	}
143		139
144	/* 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. */
145	static int	141	static bool
146	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
147	{	143	{
148	key_value *wants_field;	144	key_value *wants_field;
149		145
150	/* 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
…		…
158	key_value *has_field;	154	key_value *has_field;
159		155
160	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
161	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
162		158
163	if (has_field == NULL)	159	if (!has_field)
164	{
165	/* No field with that name. */	160	return 0; /* No field with that name. */
166	return FALSE;
167	}
168		161
169	/* Found the matching field. */	162	/* Found the matching field. */
170	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
171	{
172	/* 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. */
173	return FALSE;
174	}
175		165
176	/* 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. */
177	}	167	}
178		168
179	/* 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. */
180	return TRUE;	170	return 1;
181	}	171	}
182		172
183	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
184	static int	174	static bool
185	compare_ob_value_lists (const object ob1, const object ob2)	175	compare_ob_value_lists (const object ob1, const object ob2)
186	{	176	{
187	/* 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,
188	* so we need to run the comparison twice. :(	178	* so we need to run the comparison twice. :(
189	*/	179	*/
…		…
210	\|\| ob1->speed != ob2->speed	200	\|\| ob1->speed != ob2->speed
211	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
212	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
213	return 0;	203	return 0;
214		204
215	//TODO: this ain't working well, use nicer and correct overflow check	205	/* Do not merge objects if nrof would overflow. First part checks
216	/* 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
217	* 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
218	* used to store nrof).	208	* nrof values.
219	*/	209	*/
220	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
221	return 0;	211	return 0;
222		212
223	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* If the objects have been identified, set the BEEN_APPLIED flag.
224	* 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
225	* 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
226	* 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
227	* flags lose any meaning.	217	* flags lose any meaning.
228	*/	218	*/
229	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
230	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
231		221
232	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
233	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
234		224
235	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
236	\|\| ob1->arch != ob2->arch
237	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
238	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
239	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
240	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
241	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
242	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
243	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
244	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
245	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
246	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
247	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
254	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
255	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
256	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
257	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
258	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
259	\|\| 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)))
260	return 0;	249	return 0;
261		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
262	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
263	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
264	*/	261	*/
265	if (ob1->inv \|\| ob2->inv)	262	if (ob1->inv \|\| ob2->inv)
266	{	263	{
267	if (!(ob1->inv && ob2->inv))	264	if (!(ob1->inv && ob2->inv))
268	return 0; /* inventories differ in length */	265	return 0; /* inventories differ in length */
269		266
270	if (ob1->inv->below \|\| ob2->inv->below)	267	if (ob1->inv->below \|\| ob2->inv->below)
271	return 0; /* more than one object in inv */	268	return 0; /* more than one object in inv */
272		269
273	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
274	return 0; /* inventory objexts differ */	271	return 0; /* inventory objects differ */
275		272
276	/* 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
277	* if it is valid.	274	* if it is valid.
278	*/	275	*/
279	}	276	}
…		…
298	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
299	return 0;	296	return 0;
300	break;	297	break;
301	}	298	}
302		299
303	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	300	if (ob1->key_values \|\| ob2->key_values)
304	{	301	{
305	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
306	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
307	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
308	return 0;	305
309	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
310	return 0;	307	return 0;
311	}	308	}
312		309
313	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
314	{	311	{
…		…
320	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
321	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
322		319
323	if (k1 != k2)	320	if (k1 != k2)
324	return 0;	321	return 0;
		322
325	else if (k1 == 0)	323	if (k1 == 0)
326	return 1;	324	return 1;
		325
327	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
328	return 0;	327	return 0;
329	}	328	}
330	}	329	}
331		330
332	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
333	return 1;	332	return 1;
334	}	333	}
335		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
336	/*	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	/*
337	* sum_weight() is a recursive function which calculates the weight	404	* this is a recursive function which calculates the weight
338	* 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
339	* containers are carrying, and sums it up.	406	* containers are carrying, and sums it up.
340	*/	407	*/
341	long	408	void
342	sum_weight (object *op)	409	object::update_weight ()
343	{	410	{
344	long sum;	411	sint32 sum = 0;
345	object *inv;
346		412
347	for (sum = 0, inv = op->inv; inv; inv = inv->below)	413	for (object *op = inv; op; op = op->below)
348	{	414	{
349	if (inv->inv)	415	if (op->inv)
350	sum_weight (inv);	416	op->update_weight ();
351		417
352	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)
353	}	424	{
354
355	if (op->type == CONTAINER && op->stats.Str)
356	sum = (sum * (100 - op->stats.Str)) / 100;
357
358	if (op->carrying != sum)
359	op->carrying = sum;	425	carrying = sum;
360		426
361	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	}
362	}	431	}
363		432
364	/**	433	/*
365	* Return the outermost environment object for a given object.	434	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
366	*/
367
368	object *
369	object_get_env_recursive (object *op)
370	{
371	while (op->env != NULL)
372	op = op->env;
373	return op;
374	}
375
376	/*
377	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
378	* Some error messages.
379	* The result of the dump is stored in the static global errmsg array.
380	*/	435	*/
381	char *	436	char *
382	dump_object (object *op)	437	dump_object (object *op)
383	{	438	{
384	if (!op)	439	if (!op)
…		…
398	get_nearest_part (object op, const object pl)	453	get_nearest_part (object op, const object pl)
399	{	454	{
400	object tmp, closest;	455	object tmp, closest;
401	int last_dist, i;	456	int last_dist, i;
402		457
403	if (op->more == NULL)	458	if (!op->more)
404	return op;	459	return op;
		460
405	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)
406	if ((i = distance (tmp, pl)) < last_dist)	464	if ((i = distance (tmp, pl)) < last_dist)
407	closest = tmp, last_dist = i;	465	closest = tmp, last_dist = i;
		466
408	return closest;	467	return closest;
409	}	468	}
410		469
411	/*	470	/*
412	* 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.
413	*/	473	*/
414	object *	474	object *
415	find_object (tag_t i)	475	find_object (tag_t i)
416	{	476	{
417	for_all_objects (op)	477	for_all_objects (op)
…		…
868	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
869	* drop on that space.	929	* drop on that space.
870	*/	930	*/
871	if (!drop_to_ground	931	if (!drop_to_ground
872	\|\| !map	932	\|\| !map
873	\|\| map->in_memory != MAP_IN_MEMORY	933	\|\| map->in_memory != MAP_ACTIVE
874	\|\| map->nodrop	934	\|\| map->nodrop
875	\|\| ms ().move_block == MOVE_ALL)	935	\|\| ms ().move_block == MOVE_ALL)
876	{	936	{
877	while (inv)	937	while (inv)
878	{	938	{
…		…
907	}	967	}
908		968
909	void	969	void
910	object::do_destroy ()	970	object::do_destroy ()
911	{	971	{
912	attachable::do_destroy ();
913
914	if (flag [FLAG_IS_LINKED])	972	if (flag [FLAG_IS_LINKED])
915	remove_button_link (this);	973	remove_button_link (this);
916		974
917	if (flag [FLAG_FRIENDLY])	975	if (flag [FLAG_FRIENDLY])
918	remove_friendly_object (this);	976	remove_friendly_object (this);
919		977
920	if (!flag [FLAG_REMOVED])
921	remove ();	978	remove ();
		979
		980	attachable::do_destroy ();
922		981
923	destroy_inv (true);	982	destroy_inv (true);
924		983
925	deactivate ();	984	deactivate ();
926	unlink ();	985	unlink ();
…		…
940	freed_map->width = 3;	999	freed_map->width = 3;
941	freed_map->height = 3;	1000	freed_map->height = 3;
942	freed_map->nodrop = 1;	1001	freed_map->nodrop = 1;
943		1002
944	freed_map->alloc ();	1003	freed_map->alloc ();
945	freed_map->in_memory = MAP_IN_MEMORY;	1004	freed_map->in_memory = MAP_ACTIVE;
946	}	1005	}
947		1006
948	map = freed_map;	1007	map = freed_map;
949	x = 1;	1008	x = 1;
950	y = 1;	1009	y = 1;
…		…
979	play_sound (sound_destroy);	1038	play_sound (sound_destroy);
980	else if (flag [FLAG_MONSTER])	1039	else if (flag [FLAG_MONSTER])
981	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1040	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
982		1041
983	attachable::destroy ();	1042	attachable::destroy ();
984	}
985
986	/*
987	* sub_weight() recursively (outwards) subtracts a number from the
988	* weight of an object (and what is carried by it's environment(s)).
989	*/
990	void
991	sub_weight (object *op, signed long weight)
992	{
993	while (op != NULL)
994	{
995	if (op->type == CONTAINER)
996	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
997
998	op->carrying -= weight;
999	op = op->env;
1000	}
1001	}	1043	}
1002		1044
1003	/* op->remove ():	1045	/* op->remove ():
1004	* This function removes the object op from the linked list of objects	1046	* This function removes the object op from the linked list of objects
1005	* which it is currently tied to. When this function is done, the	1047	* which it is currently tied to. When this function is done, the
…		…
1011	object::do_remove ()	1053	object::do_remove ()
1012	{	1054	{
1013	object tmp, last = 0;	1055	object tmp, last = 0;
1014	object *otmp;	1056	object *otmp;
1015		1057
1016	if (QUERY_FLAG (this, FLAG_REMOVED))	1058	if (flag [FLAG_REMOVED])
1017	return;	1059	return;
1018		1060
1019	SET_FLAG (this, FLAG_REMOVED);
1020	INVOKE_OBJECT (REMOVE, this);	1061	INVOKE_OBJECT (REMOVE, this);
		1062
		1063	if (object *pl = visible_to ())
		1064	esrv_del_item (pl->contr, count);
		1065
		1066	flag [FLAG_REMOVED] = true;
1021		1067
1022	if (more)	1068	if (more)
1023	more->remove ();	1069	more->remove ();
1024		1070
1025	/*	1071	/*
1026	* In this case, the object to be removed is in someones	1072	* In this case, the object to be removed is in someones
1027	* inventory.	1073	* inventory.
1028	*/	1074	*/
1029	if (env)	1075	if (env)
1030	{	1076	{
		1077	adjust_weight (env, -total_weight ());
		1078
		1079	*(above ? &above->below : &env->inv) = below;
		1080
1031	if (nrof)	1081	if (below)
1032	sub_weight (env, weight * nrof);	1082	below->above = above;
1033	else	1083
1034	sub_weight (env, weight + carrying);	1084	/* we set up values so that it could be inserted into
		1085	* the map, but we don't actually do that - it is up
		1086	* to the caller to decide what we want to do.
		1087	*/
		1088	map = env->map;
		1089	x = env->x;
		1090	y = env->y;
		1091	above = 0;
		1092	below = 0;
		1093	env = 0;
1035		1094
1036	/* NO_FIX_PLAYER is set when a great many changes are being	1095	/* NO_FIX_PLAYER is set when a great many changes are being
1037	* made to players inventory. If set, avoiding the call	1096	* made to players inventory. If set, avoiding the call
1038	* to save cpu time.	1097	* to save cpu time.
1039	*/	1098	*/
1040	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1099	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1041	otmp->update_stats ();	1100	otmp->update_stats ();
1042
1043	if (above)
1044	above->below = below;
1045	else
1046	env->inv = below;
1047
1048	if (below)
1049	below->above = above;
1050
1051	/* we set up values so that it could be inserted into
1052	* the map, but we don't actually do that - it is up
1053	* to the caller to decide what we want to do.
1054	*/
1055	x = env->x, y = env->y;
1056	map = env->map;
1057	above = 0, below = 0;
1058	env = 0;
1059	}	1101	}
1060	else if (map)	1102	else if (map)
1061	{	1103	{
1062	if (type == PLAYER)	1104	if (type == PLAYER)
1063	{	1105	{
…		…
1164	if (!top)	1206	if (!top)
1165	for (top = op; top && top->above; top = top->above)	1207	for (top = op; top && top->above; top = top->above)
1166	;	1208	;
1167		1209
1168	for (; top; top = top->below)	1210	for (; top; top = top->below)
1169	{
1170	if (top == op)
1171	continue;
1172
1173	if (object::can_merge (op, top))	1211	if (object::can_merge (op, top))
1174	{	1212	{
1175	top->nrof += op->nrof;	1213	top->nrof += op->nrof;
1176		1214
1177	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1215	if (object *pl = top->visible_to ())
1178	op->weight = 0; /* Don't want any adjustements now */	1216	esrv_update_item (UPD_NROF, pl, top);
		1217
		1218	op->weight = 0; // cancel the addition above
		1219	op->carrying = 0; // must be 0 already
		1220
1179	op->destroy ();	1221	op->destroy (1);
		1222
1180	return top;	1223	return top;
1181	}	1224	}
1182	}
1183		1225
1184	return 0;	1226	return 0;
1185	}	1227	}
1186		1228
1187	void	1229	void
…		…
1276	if (op->nrof && !(flag & INS_NO_MERGE))	1318	if (op->nrof && !(flag & INS_NO_MERGE))
1277	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1319	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1278	if (object::can_merge (op, tmp))	1320	if (object::can_merge (op, tmp))
1279	{	1321	{
1280	op->nrof += tmp->nrof;	1322	op->nrof += tmp->nrof;
1281	tmp->destroy ();	1323	tmp->destroy (1);
1282	}	1324	}
1283		1325
1284	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1326	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1285	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1327	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1286		1328
…		…
1466	* op is the object to insert it under: supplies x and the map.	1508	* op is the object to insert it under: supplies x and the map.
1467	*/	1509	*/
1468	void	1510	void
1469	replace_insert_ob_in_map (const char arch_string, object op)	1511	replace_insert_ob_in_map (const char arch_string, object op)
1470	{	1512	{
1471	object tmp, tmp1;
1472
1473	/* first search for itself and remove any old instances */	1513	/* first search for itself and remove any old instances */
1474		1514
1475	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1515	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1476	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1516	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1477	tmp->destroy ();	1517	tmp->destroy (1);
1478		1518
1479	tmp1 = arch_to_object (archetype::find (arch_string));	1519	object *tmp = arch_to_object (archetype::find (arch_string));
1480		1520
1481	tmp1->x = op->x;	1521	tmp->x = op->x;
1482	tmp1->y = op->y;	1522	tmp->y = op->y;
		1523
1483	insert_ob_in_map (tmp1, op->map, op, 0);	1524	insert_ob_in_map (tmp, op->map, op, 0);
1484	}	1525	}
1485		1526
1486	object *	1527	object *
1487	object::insert_at (object where, object originator, int flags)	1528	object::insert_at (object where, object originator, int flags)
1488	{	1529	{
		1530	if (where->env)
		1531	return where->env->insert (this);
		1532	else
1489	return where->map->insert (this, where->x, where->y, originator, flags);	1533	return where->map->insert (this, where->x, where->y, originator, flags);
1490	}	1534	}
1491		1535
1492	/*	1536	/*
1493	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1494	* is returned contains nr objects, and the remaining parts contains
1495	* the rest (or is removed and freed if that number is 0).
1496	* On failure, NULL is returned, and the reason put into the
1497	* global static errmsg array.
1498	*/
1499	object *
1500	get_split_ob (object *orig_ob, uint32 nr)
1501	{
1502	object *newob;
1503	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1504
1505	if (orig_ob->nrof < nr)
1506	{
1507	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1508	return NULL;
1509	}
1510
1511	newob = object_create_clone (orig_ob);
1512
1513	if ((orig_ob->nrof -= nr) < 1)
1514	orig_ob->destroy (1);
1515	else if (!is_removed)
1516	{
1517	if (orig_ob->env != NULL)
1518	sub_weight (orig_ob->env, orig_ob->weight * nr);
1519	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1520	{
1521	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1522	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1523	return NULL;
1524	}
1525	}
1526
1527	newob->nrof = nr;
1528
1529	return newob;
1530	}
1531
1532	/*
1533	* decrease_ob_nr(object, number) decreases a specified number from	1537	* decrease(object, number) decreases a specified number from
1534	* the amount of an object. If the amount reaches 0, the object	1538	* the amount of an object. If the amount reaches 0, the object
1535	* is subsequently removed and freed.	1539	* is subsequently removed and freed.
1536	*	1540	*
1537	* Return value: 'op' if something is left, NULL if the amount reached 0	1541	* Return value: 'op' if something is left, NULL if the amount reached 0
1538	*/	1542	*/
		1543	bool
		1544	object::decrease (sint32 nr)
		1545	{
		1546	if (!nr)
		1547	return true;
		1548
		1549	nr = min (nr, nrof);
		1550
		1551	nrof -= nr;
		1552
		1553	if (nrof)
		1554	{
		1555	adjust_weight (env, -weight * nr); // carrying == 0
		1556
		1557	if (object *pl = visible_to ())
		1558	esrv_update_item (UPD_NROF, pl, this);
		1559
		1560	return true;
		1561	}
		1562	else
		1563	{
		1564	destroy (1);
		1565	return false;
		1566	}
		1567	}
		1568
		1569	/*
		1570	* split(ob,nr) splits up ob into two parts. The part which
		1571	* is returned contains nr objects, and the remaining parts contains
		1572	* the rest (or is removed and returned if that number is 0).
		1573	* On failure, NULL is returned.
		1574	*/
1539	object *	1575	object *
1540	decrease_ob_nr (object *op, uint32 i)	1576	object::split (sint32 nr)
1541	{	1577	{
1542	object *tmp;	1578	int have = number_of ();
1543		1579
1544	if (i == 0) /* objects with op->nrof require this check */	1580	if (have < nr)
1545	return op;	1581	return 0;
1546		1582	else if (have == nr)
1547	if (i > op->nrof)
1548	i = op->nrof;
1549
1550	if (QUERY_FLAG (op, FLAG_REMOVED))
1551	op->nrof -= i;
1552	else if (op->env)
1553	{	1583	{
1554	/* is this object in the players inventory, or sub container
1555	* therein?
1556	*/
1557	tmp = op->in_player ();
1558	/* nope. Is this a container the player has opened?
1559	* If so, set tmp to that player.
1560	* IMO, searching through all the players will mostly
1561	* likely be quicker than following op->env to the map,
1562	* and then searching the map for a player.
1563	*/
1564	if (!tmp)
1565	for_all_players (pl)
1566	if (pl->ob->container == op->env)
1567	{
1568	tmp = pl->ob;
1569	break;
1570	}
1571
1572	if (i < op->nrof)
1573	{
1574	sub_weight (op->env, op->weight * i);
1575	op->nrof -= i;
1576	if (tmp)
1577	esrv_send_item (tmp, op);
1578	}
1579	else
1580	{
1581	op->remove ();	1584	remove ();
1582	op->nrof = 0;	1585	return this;
1583	if (tmp)
1584	esrv_del_item (tmp->contr, op->count);
1585	}
1586	}	1586	}
1587	else	1587	else
1588	{	1588	{
1589	object *above = op->above;	1589	decrease (nr);
1590		1590
1591	if (i < op->nrof)	1591	object *op = object_create_clone (this);
1592	op->nrof -= i;	1592	op->nrof = nr;
1593	else
1594	{
1595	op->remove ();
1596	op->nrof = 0;
1597	}
1598
1599	/* Since we just removed op, op->above is null */
1600	for (tmp = above; tmp; tmp = tmp->above)
1601	if (tmp->type == PLAYER)
1602	{
1603	if (op->nrof)
1604	esrv_send_item (tmp, op);
1605	else
1606	esrv_del_item (tmp->contr, op->count);
1607	}
1608	}
1609
1610	if (op->nrof)
1611	return op;	1593	return op;
1612	else
1613	{
1614	op->destroy ();
1615	return 0;
1616	}
1617	}
1618
1619	/*
1620	* add_weight(object, weight) adds the specified weight to an object,
1621	* and also updates how much the environment(s) is/are carrying.
1622	*/
1623	void
1624	add_weight (object *op, signed long weight)
1625	{
1626	while (op != NULL)
1627	{
1628	if (op->type == CONTAINER)
1629	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1630
1631	op->carrying += weight;
1632	op = op->env;
1633	}	1594	}
1634	}	1595	}
1635		1596
1636	object *	1597	object *
1637	insert_ob_in_ob (object op, object where)	1598	insert_ob_in_ob (object op, object where)
…		…
1662	* be != op, if items are merged. -Tero	1623	* be != op, if items are merged. -Tero
1663	*/	1624	*/
1664	object *	1625	object *
1665	object::insert (object *op)	1626	object::insert (object *op)
1666	{	1627	{
1667	if (!QUERY_FLAG (op, FLAG_REMOVED))
1668	op->remove ();
1669
1670	if (op->more)	1628	if (op->more)
1671	{	1629	{
1672	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1630	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1673	return op;	1631	return op;
1674	}	1632	}
1675		1633
1676	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1634	op->remove ();
1677	CLEAR_FLAG (op, FLAG_REMOVED);	1635
		1636	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1678		1637
1679	if (op->nrof)	1638	if (op->nrof)
1680	{
1681	for (object *tmp = inv; tmp; tmp = tmp->below)	1639	for (object *tmp = inv; tmp; tmp = tmp->below)
1682	if (object::can_merge (tmp, op))	1640	if (object::can_merge (tmp, op))
1683	{	1641	{
1684	/* return the original object and remove inserted object	1642	/* return the original object and remove inserted object
1685	(client needs the original object) */	1643	(client needs the original object) */
1686	tmp->nrof += op->nrof;	1644	tmp->nrof += op->nrof;
1687	/* Weight handling gets pretty funky. Since we are adding to	1645
1688	* tmp->nrof, we need to increase the weight.	1646	if (object *pl = tmp->visible_to ())
1689	*/	1647	esrv_update_item (UPD_NROF, pl, tmp);
		1648
1690	add_weight (this, op->weight * op->nrof);	1649	adjust_weight (this, op->total_weight ());
1691	SET_FLAG (op, FLAG_REMOVED);	1650
1692	op->destroy (); /* free the inserted object */	1651	op->destroy (1);
1693	op = tmp;	1652	op = tmp;
1694	op->remove (); /* and fix old object's links */	1653	goto inserted;
1695	CLEAR_FLAG (op, FLAG_REMOVED);
1696	break;
1697	}	1654	}
1698		1655
1699	/* I assume combined objects have no inventory
1700	* We add the weight - this object could have just been removed
1701	* (if it was possible to merge). calling remove_ob will subtract
1702	* the weight, so we need to add it in again, since we actually do
1703	* the linking below
1704	*/
1705	add_weight (this, op->weight * op->nrof);
1706	}
1707	else
1708	add_weight (this, (op->weight + op->carrying));
1709
1710	if (object *otmp = this->in_player ())
1711	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1712	otmp->update_stats ();
1713
1714	op->owner = 0; // its his/hers now. period.	1656	op->owner = 0; // it's his/hers now. period.
1715	op->map = 0;	1657	op->map = 0;
		1658	op->x = 0;
		1659	op->y = 0;
		1660
		1661	op->above = 0;
		1662	op->below = inv;
1716	op->env = this;	1663	op->env = this;
1717	op->above = 0;
1718	op->below = 0;
1719	op->x = op->y = 0;
1720		1664
		1665	if (inv)
		1666	inv->above = op;
		1667
		1668	inv = op;
		1669
		1670	op->flag [FLAG_REMOVED] = 0;
		1671
		1672	if (object *pl = op->visible_to ())
		1673	esrv_send_item (pl, op);
		1674
		1675	adjust_weight (this, op->total_weight ());
		1676
		1677	inserted:
1721	/* reset the light list and los of the players on the map */	1678	/* reset the light list and los of the players on the map */
1722	if (op->glow_radius && map)	1679	if (op->glow_radius && map && map->darkness)
1723	{
1724	#ifdef DEBUG_LIGHTS
1725	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1726	#endif /* DEBUG_LIGHTS */
1727	if (map->darkness)
1728	update_all_los (map, x, y);	1680	update_all_los (map, x, y);
1729	}
1730		1681
1731	/* Client has no idea of ordering so lets not bother ordering it here.	1682	// if this is a player's inventory, update stats
1732	* It sure simplifies this function...	1683	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1733	*/	1684	update_stats ();
1734	if (!inv)
1735	inv = op;
1736	else
1737	{
1738	op->below = inv;
1739	op->below->above = op;
1740	inv = op;
1741	}
1742		1685
1743	INVOKE_OBJECT (INSERT, this);	1686	INVOKE_OBJECT (INSERT, this);
1744		1687
1745	return op;	1688	return op;
1746	}	1689	}
…		…
2676	if (object *closer = old_container->inv)	2619	if (object *closer = old_container->inv)
2677	if (closer->type == CLOSE_CON)	2620	if (closer->type == CLOSE_CON)
2678	closer->destroy ();	2621	closer->destroy ();
2679	#endif	2622	#endif
2680		2623
2681	old_container->flag [FLAG_APPLIED] = 0;	2624	old_container->flag [FLAG_APPLIED] = false;
2682	container = 0;	2625	container = 0;
2683		2626
2684	esrv_update_item (UPD_FLAGS, this, old_container);	2627	esrv_update_item (UPD_FLAGS, this, old_container);
2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2628	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2686	play_sound (sound_find ("chest_close"));	2629	play_sound (sound_find ("chest_close"));
…		…
2702	}	2645	}
2703	#endif	2646	#endif
2704		2647
2705	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2648	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2706		2649
2707	new_container->flag [FLAG_APPLIED] = 1;	2650	new_container->flag [FLAG_APPLIED] = true;
2708	container = new_container;	2651	container = new_container;
2709		2652
2710	esrv_update_item (UPD_FLAGS, this, new_container);	2653	esrv_update_item (UPD_FLAGS, this, new_container);
2711	esrv_send_inventory (this, new_container);	2654	esrv_send_inventory (this, new_container);
2712	play_sound (sound_find ("chest_open"));	2655	play_sound (sound_find ("chest_open"));
…		…
2744		2687
2745	insert (force);	2688	insert (force);
2746	}	2689	}
2747		2690
2748	void	2691	void
2749	object::play_sound (faceidx sound) const	2692	object::play_sound (faceidx sound)
2750	{	2693	{
2751	if (!sound)	2694	if (!sound)
2752	return;	2695	return;
2753		2696
2754	if (flag [FLAG_REMOVED])	2697	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC vs. Revision 1.216 by root, Tue Apr 22 23:50:23 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC vs.
Revision 1.216 by root, Tue Apr 22 23:50:23 2008 UTC