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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.205 by root, Sun Apr 13 01:34:08 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
…		…
205	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
206	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
207	return 0;	203	return 0;
208		204
209	/* Do not merge objects if nrof would overflow. First part checks	205	/* Do not merge objects if nrof would overflow. First part checks
210	* for unsigned overflow (2c), second part checks wether the result	206	* for unsigned overflow (2c), second part checks whether the result
211	* would fit into a 32 bit signed int, which is often used to hold	207	* would fit into a 32 bit signed int, which is often used to hold
212	* nrof values.	208	* nrof values.
213	*/	209	*/
214	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
215	return 0;	211	return 0;
…		…
224	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
225		221
226	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
227	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
228		224
229	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
230	\|\| ob1->arch != ob2->arch
231	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
232	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
233	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
234	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
235	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
236	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
237	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
238	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
239	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
240	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
241	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
248	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
249	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
250	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
251	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
252	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
253	\|\| 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)))
		249	return 0;
		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
254	return 0;	256	return 0;
255		257
256	/* This is really a spellbook check - we should in general	258	/* This is really a spellbook check - we should in general
257	* not merge objects with real inventories, as splitting them	259	* not merge objects with real inventories, as splitting them
258	* is hard.	260	* is hard.
…		…
297		299
298	if (ob1->key_values \|\| ob2->key_values)	300	if (ob1->key_values \|\| ob2->key_values)
299	{	301	{
300	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
301	if ((!ob1->key_values) != (!ob2->key_values))	303	if ((!ob1->key_values) != (!ob2->key_values))
302	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
303	return 0;	305
304	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
305	return 0;	307	return 0;
306	}	308	}
307		309
308	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
309	{	311	{
…		…
315	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
316	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
317		319
318	if (k1 != k2)	320	if (k1 != k2)
319	return 0;	321	return 0;
		322
320	else if (k1 == 0)	323	if (k1 == 0)
321	return 1;	324	return 1;
		325
322	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
323	return 0;	327	return 0;
324	}	328	}
325	}	329	}
326		330
327	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
328	return 1;	332	return 1;
329	}	333	}
330		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
331	/*	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	/*
332	* sum_weight() is a recursive function which calculates the weight	404	* this is a recursive function which calculates the weight
333	* 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
334	* containers are carrying, and sums it up.	406	* containers are carrying, and sums it up.
335	*/	407	*/
336	long	408	void
337	sum_weight (object *op)	409	object::update_weight ()
338	{	410	{
339	long sum;	411	sint32 sum = 0;
340	object *inv;
341		412
342	for (sum = 0, inv = op->inv; inv; inv = inv->below)	413	for (object *op = inv; op; op = op->below)
343	{	414	{
344	if (inv->inv)	415	if (op->inv)
345	sum_weight (inv);	416	op->update_weight ();
346		417
347	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)
348	}	424	{
349
350	if (op->type == CONTAINER && op->stats.Str)
351	sum = (sum * (100 - op->stats.Str)) / 100;
352
353	if (op->carrying != sum)
354	op->carrying = sum;	425	carrying = sum;
355		426
356	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	}
357	}	431	}
358		432
359	/**	433	/*
360	* Return the outermost environment object for a given object.	434	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
361	*/
362
363	object *
364	object_get_env_recursive (object *op)
365	{
366	while (op->env != NULL)
367	op = op->env;
368	return op;
369	}
370
371	/*
372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
373	* Some error messages.
374	* The result of the dump is stored in the static global errmsg array.
375	*/	435	*/
376	char *	436	char *
377	dump_object (object *op)	437	dump_object (object *op)
378	{	438	{
379	if (!op)	439	if (!op)
…		…
393	get_nearest_part (object op, const object pl)	453	get_nearest_part (object op, const object pl)
394	{	454	{
395	object tmp, closest;	455	object tmp, closest;
396	int last_dist, i;	456	int last_dist, i;
397		457
398	if (op->more == NULL)	458	if (!op->more)
399	return op;	459	return op;
		460
400	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)
401	if ((i = distance (tmp, pl)) < last_dist)	464	if ((i = distance (tmp, pl)) < last_dist)
402	closest = tmp, last_dist = i;	465	closest = tmp, last_dist = i;
		466
403	return closest;	467	return closest;
404	}	468	}
405		469
406	/*	470	/*
407	* 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.
408	*/	473	*/
409	object *	474	object *
410	find_object (tag_t i)	475	find_object (tag_t i)
411	{	476	{
412	for_all_objects (op)	477	for_all_objects (op)
…		…
852	object::destroy_inv (bool drop_to_ground)	917	object::destroy_inv (bool drop_to_ground)
853	{	918	{
854	// need to check first, because the checks below might segfault	919	// need to check first, because the checks below might segfault
855	// as we might be on an invalid mapspace and crossfire code	920	// as we might be on an invalid mapspace and crossfire code
856	// is too buggy to ensure that the inventory is empty.	921	// is too buggy to ensure that the inventory is empty.
857	// corollary: if you create arrows etc. with stuff in tis inventory,	922	// corollary: if you create arrows etc. with stuff in its inventory,
858	// cf will crash below with off-map x and y	923	// cf will crash below with off-map x and y
859	if (!inv)	924	if (!inv)
860	return;	925	return;
861		926
862	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
863	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
864	* drop on that space.	929	* drop on that space.
865	*/	930	*/
866	if (!drop_to_ground	931	if (!drop_to_ground
867	\|\| !map	932	\|\| !map
868	\|\| map->in_memory != MAP_IN_MEMORY	933	\|\| map->in_memory != MAP_ACTIVE
869	\|\| map->nodrop	934	\|\| map->nodrop
870	\|\| ms ().move_block == MOVE_ALL)	935	\|\| ms ().move_block == MOVE_ALL)
871	{	936	{
872	while (inv)	937	while (inv)
873	{	938	{
874	inv->destroy_inv (drop_to_ground);	939	inv->destroy_inv (false);
875	inv->destroy ();	940	inv->destroy ();
876	}	941	}
877	}	942	}
878	else	943	else
879	{ /* Put objects in inventory onto this space */	944	{ /* Put objects in inventory onto this space */
…		…
885	\|\| op->flag [FLAG_NO_DROP]	950	\|\| op->flag [FLAG_NO_DROP]
886	\|\| op->type == RUNE	951	\|\| op->type == RUNE
887	\|\| op->type == TRAP	952	\|\| op->type == TRAP
888	\|\| op->flag [FLAG_IS_A_TEMPLATE]	953	\|\| op->flag [FLAG_IS_A_TEMPLATE]
889	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	954	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
890	op->destroy ();	955	op->destroy (true);
891	else	956	else
892	map->insert (op, x, y);	957	map->insert (op, x, y);
893	}	958	}
894	}	959	}
895	}	960	}
…		…
902	}	967	}
903		968
904	void	969	void
905	object::do_destroy ()	970	object::do_destroy ()
906	{	971	{
907	attachable::do_destroy ();
908
909	if (flag [FLAG_IS_LINKED])	972	if (flag [FLAG_IS_LINKED])
910	remove_button_link (this);	973	remove_button_link (this);
911		974
912	if (flag [FLAG_FRIENDLY])	975	if (flag [FLAG_FRIENDLY])
913	remove_friendly_object (this);	976	remove_friendly_object (this);
914		977
915	if (!flag [FLAG_REMOVED])
916	remove ();	978	remove ();
917		979
918	destroy_inv (true);	980	attachable::do_destroy ();
919		981
920	deactivate ();	982	deactivate ();
921	unlink ();	983	unlink ();
922		984
923	flag [FLAG_FREED] = 1;	985	flag [FLAG_FREED] = 1;
…		…
935	freed_map->width = 3;	997	freed_map->width = 3;
936	freed_map->height = 3;	998	freed_map->height = 3;
937	freed_map->nodrop = 1;	999	freed_map->nodrop = 1;
938		1000
939	freed_map->alloc ();	1001	freed_map->alloc ();
940	freed_map->in_memory = MAP_IN_MEMORY;	1002	freed_map->in_memory = MAP_ACTIVE;
941	}	1003	}
942		1004
943	map = freed_map;	1005	map = freed_map;
944	x = 1;	1006	x = 1;
945	y = 1;	1007	y = 1;
…		…
964	object::destroy (bool destroy_inventory)	1026	object::destroy (bool destroy_inventory)
965	{	1027	{
966	if (destroyed ())	1028	if (destroyed ())
967	return;	1029	return;
968		1030
969	if (destroy_inventory)	1031	destroy_inv (!destroy_inventory);
970	destroy_inv (false);
971		1032
972	if (is_head ())	1033	if (is_head ())
973	if (sound_destroy)	1034	if (sound_destroy)
974	play_sound (sound_destroy);	1035	play_sound (sound_destroy);
975	else if (flag [FLAG_MONSTER])	1036	else if (flag [FLAG_MONSTER])
976	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
977		1038
978	attachable::destroy ();	1039	attachable::destroy ();
979	}
980
981	/*
982	* sub_weight() recursively (outwards) subtracts a number from the
983	* weight of an object (and what is carried by it's environment(s)).
984	*/
985	void
986	sub_weight (object *op, signed long weight)
987	{
988	while (op != NULL)
989	{
990	if (op->type == CONTAINER)
991	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
992
993	op->carrying -= weight;
994	op = op->env;
995	}
996	}	1040	}
997		1041
998	/* op->remove ():	1042	/* op->remove ():
999	* 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
1000	* 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
…		…
1006	object::do_remove ()	1050	object::do_remove ()
1007	{	1051	{
1008	object tmp, last = 0;	1052	object tmp, last = 0;
1009	object *otmp;	1053	object *otmp;
1010		1054
1011	if (QUERY_FLAG (this, FLAG_REMOVED))	1055	if (flag [FLAG_REMOVED])
1012	return;	1056	return;
1013		1057
1014	SET_FLAG (this, FLAG_REMOVED);
1015	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;
1016		1064
1017	if (more)	1065	if (more)
1018	more->remove ();	1066	more->remove ();
1019		1067
1020	/*	1068	/*
1021	* In this case, the object to be removed is in someones	1069	* In this case, the object to be removed is in someones
1022	* inventory.	1070	* inventory.
1023	*/	1071	*/
1024	if (env)	1072	if (env)
1025	{	1073	{
		1074	adjust_weight (env, -total_weight ());
		1075
		1076	*(above ? &above->below : &env->inv) = below;
		1077
1026	if (nrof)	1078	if (below)
1027	sub_weight (env, weight * nrof);	1079	below->above = above;
1028	else	1080
1029	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;
1030		1091
1031	/* 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
1032	* made to players inventory. If set, avoiding the call	1093	* made to players inventory. If set, avoiding the call
1033	* to save cpu time.	1094	* to save cpu time.
1034	*/	1095	*/
1035	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))
1036	otmp->update_stats ();	1097	otmp->update_stats ();
1037
1038	if (above)
1039	above->below = below;
1040	else
1041	env->inv = below;
1042
1043	if (below)
1044	below->above = above;
1045
1046	/* we set up values so that it could be inserted into
1047	* the map, but we don't actually do that - it is up
1048	* to the caller to decide what we want to do.
1049	*/
1050	x = env->x, y = env->y;
1051	map = env->map;
1052	above = 0, below = 0;
1053	env = 0;
1054	}	1098	}
1055	else if (map)	1099	else if (map)
1056	{	1100	{
1057	if (type == PLAYER)	1101	if (type == PLAYER)
1058	{	1102	{
…		…
1105	* removed (most likely destroyed), update the player view	1149	* removed (most likely destroyed), update the player view
1106	* appropriately.	1150	* appropriately.
1107	*/	1151	*/
1108	pl->close_container ();	1152	pl->close_container ();
1109		1153
1110	pl->contr->ns->floorbox_update ();	1154	//TODO: the floorbox prev/next might need updating
		1155	esrv_del_item (pl->contr, count);
1111	}	1156	}
1112		1157
1113	for (tmp = ms.bot; tmp; tmp = tmp->above)	1158	for (tmp = ms.bot; tmp; tmp = tmp->above)
1114	{	1159	{
1115	/* 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
…		…
1159	if (!top)	1204	if (!top)
1160	for (top = op; top && top->above; top = top->above)	1205	for (top = op; top && top->above; top = top->above)
1161	;	1206	;
1162		1207
1163	for (; top; top = top->below)	1208	for (; top; top = top->below)
1164	{
1165	if (top == op)
1166	continue;
1167
1168	if (object::can_merge (op, top))	1209	if (object::can_merge (op, top))
1169	{	1210	{
1170	top->nrof += op->nrof;	1211	top->nrof += op->nrof;
1171		1212
1172	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1213	if (object *pl = top->visible_to ())
1173	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
1174	op->destroy ();	1219	op->destroy (1);
		1220
1175	return top;	1221	return top;
1176	}	1222	}
1177	}
1178		1223
1179	return 0;	1224	return 0;
1180	}	1225	}
1181		1226
1182	void	1227	void
…		…
1241	object *	1286	object *
1242	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)
1243	{	1288	{
1244	assert (!op->flag [FLAG_FREED]);	1289	assert (!op->flag [FLAG_FREED]);
1245		1290
1246	object top, floor = NULL;
1247
1248	op->remove ();	1291	op->remove ();
1249		1292
1250	/* Ideally, the caller figures this out. However, it complicates a lot	1293	/* Ideally, the caller figures this out. However, it complicates a lot
1251	* 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
1252	* need extra work	1295	* need extra work
1253	*/	1296	*/
1254	if (!xy_normalise (m, op->x, op->y))	1297	if (!xy_normalise (m, op->x, op->y))
1255	{	1298	{
1256	op->destroy ();	1299	op->destroy (1);
1257	return 0;	1300	return 0;
1258	}	1301	}
1259		1302
1260	if (object *more = op->more)	1303	if (object *more = op->more)
1261	if (!insert_ob_in_map (more, m, originator, flag))	1304	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1270	*/	1313	*/
1271	if (op->nrof && !(flag & INS_NO_MERGE))	1314	if (op->nrof && !(flag & INS_NO_MERGE))
1272	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1315	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1273	if (object::can_merge (op, tmp))	1316	if (object::can_merge (op, tmp))
1274	{	1317	{
		1318	// TODO: we atcually want to update tmp, not op,
		1319	// but some caller surely breaks when we return tmp
		1320	// from here :/
1275	op->nrof += tmp->nrof;	1321	op->nrof += tmp->nrof;
1276	tmp->destroy ();	1322	tmp->destroy (1);
1277	}	1323	}
1278		1324
1279	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 */
1280	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1326	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1281		1327
…		…
1301	/* since below originator, no need to update top */	1347	/* since below originator, no need to update top */
1302	originator->below = op;	1348	originator->below = op;
1303	}	1349	}
1304	else	1350	else
1305	{	1351	{
		1352	object top, floor = NULL;
		1353
1306	top = ms.bot;	1354	top = ms.bot;
1307		1355
1308	/* If there are other objects, then */	1356	/* If there are other objects, then */
1309	if (top)	1357	if (top)
1310	{	1358	{
…		…
1409	}	1457	}
1410		1458
1411	op->map->dirty = true;	1459	op->map->dirty = true;
1412		1460
1413	if (object *pl = ms.player ())	1461	if (object *pl = ms.player ())
1414	pl->contr->ns->floorbox_update ();	1462	//TODO: the floorbox prev/next might need updating
		1463	esrv_send_item (pl, op);
1415		1464
1416	/* If this object glows, it may affect lighting conditions that are	1465	/* If this object glows, it may affect lighting conditions that are
1417	* 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
1418	* 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
1419	* on the map will get recalculated. The players could very well	1468	* on the map will get recalculated. The players could very well
…		…
1461	* 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.
1462	*/	1511	*/
1463	void	1512	void
1464	replace_insert_ob_in_map (const char arch_string, object op)	1513	replace_insert_ob_in_map (const char arch_string, object op)
1465	{	1514	{
1466	object tmp, tmp1;
1467
1468	/* first search for itself and remove any old instances */	1515	/* first search for itself and remove any old instances */
1469		1516
1470	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1471	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1518	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1472	tmp->destroy ();	1519	tmp->destroy (1);
1473		1520
1474	tmp1 = arch_to_object (archetype::find (arch_string));	1521	object *tmp = arch_to_object (archetype::find (arch_string));
1475		1522
1476	tmp1->x = op->x;	1523	tmp->x = op->x;
1477	tmp1->y = op->y;	1524	tmp->y = op->y;
		1525
1478	insert_ob_in_map (tmp1, op->map, op, 0);	1526	insert_ob_in_map (tmp, op->map, op, 0);
1479	}	1527	}
1480		1528
1481	object *	1529	object *
1482	object::insert_at (object where, object originator, int flags)	1530	object::insert_at (object where, object originator, int flags)
1483	{	1531	{
…		…
1486	else	1534	else
1487	return where->map->insert (this, where->x, where->y, originator, flags);	1535	return where->map->insert (this, where->x, where->y, originator, flags);
1488	}	1536	}
1489		1537
1490	/*	1538	/*
1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1492	* is returned contains nr objects, and the remaining parts contains
1493	* the rest (or is removed and freed if that number is 0).
1494	* On failure, NULL is returned, and the reason put into the
1495	* global static errmsg array.
1496	*/
1497	object *
1498	get_split_ob (object *orig_ob, uint32 nr)
1499	{
1500	object *newob;
1501	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1502
1503	if (orig_ob->nrof < nr)
1504	{
1505	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1506	return NULL;
1507	}
1508
1509	newob = object_create_clone (orig_ob);
1510
1511	if ((orig_ob->nrof -= nr) < 1)
1512	orig_ob->destroy (1);
1513	else if (!is_removed)
1514	{
1515	if (orig_ob->env != NULL)
1516	sub_weight (orig_ob->env, orig_ob->weight * nr);
1517	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1518	{
1519	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1520	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1521	return NULL;
1522	}
1523	}
1524
1525	newob->nrof = nr;
1526
1527	return newob;
1528	}
1529
1530	/*
1531	* decrease_ob_nr(object, number) decreases a specified number from	1539	* decrease(object, number) decreases a specified number from
1532	* 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
1533	* is subsequently removed and freed.	1541	* is subsequently removed and freed.
1534	*	1542	*
1535	* 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
1536	*/	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	*/
1537	object *	1577	object *
1538	decrease_ob_nr (object *op, uint32 i)	1578	object::split (sint32 nr)
1539	{	1579	{
1540	object *tmp;	1580	int have = number_of ();
1541		1581
1542	if (i == 0) /* objects with op->nrof require this check */	1582	if (have < nr)
1543	return op;	1583	return 0;
1544		1584	else if (have == nr)
1545	if (i > op->nrof)
1546	i = op->nrof;
1547
1548	if (QUERY_FLAG (op, FLAG_REMOVED))
1549	op->nrof -= i;
1550	else if (op->env)
1551	{	1585	{
1552	/* is this object in the players inventory, or sub container
1553	* therein?
1554	*/
1555	tmp = op->in_player ();
1556	/* nope. Is this a container the player has opened?
1557	* If so, set tmp to that player.
1558	* IMO, searching through all the players will mostly
1559	* likely be quicker than following op->env to the map,
1560	* and then searching the map for a player.
1561	*/
1562	if (!tmp)
1563	for_all_players (pl)
1564	if (pl->ob->container == op->env)
1565	{
1566	tmp = pl->ob;
1567	break;
1568	}
1569
1570	if (i < op->nrof)
1571	{
1572	sub_weight (op->env, op->weight * i);
1573	op->nrof -= i;
1574	if (tmp)
1575	esrv_send_item (tmp, op);
1576	}
1577	else
1578	{
1579	op->remove ();	1586	remove ();
1580	op->nrof = 0;	1587	return this;
1581	if (tmp)
1582	esrv_del_item (tmp->contr, op->count);
1583	}
1584	}	1588	}
1585	else	1589	else
1586	{	1590	{
1587	object *above = op->above;	1591	decrease (nr);
1588		1592
1589	if (i < op->nrof)	1593	object *op = object_create_clone (this);
1590	op->nrof -= i;	1594	op->nrof = nr;
1591	else
1592	{
1593	op->remove ();
1594	op->nrof = 0;
1595	}
1596
1597	/* Since we just removed op, op->above is null */
1598	for (tmp = above; tmp; tmp = tmp->above)
1599	if (tmp->type == PLAYER)
1600	{
1601	if (op->nrof)
1602	esrv_send_item (tmp, op);
1603	else
1604	esrv_del_item (tmp->contr, op->count);
1605	}
1606	}
1607
1608	if (op->nrof)
1609	return op;	1595	return op;
1610	else
1611	{
1612	op->destroy ();
1613	return 0;
1614	}
1615	}
1616
1617	/*
1618	* add_weight(object, weight) adds the specified weight to an object,
1619	* and also updates how much the environment(s) is/are carrying.
1620	*/
1621	void
1622	add_weight (object *op, signed long weight)
1623	{
1624	while (op != NULL)
1625	{
1626	if (op->type == CONTAINER)
1627	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1628
1629	op->carrying += weight;
1630	op = op->env;
1631	}	1596	}
1632	}	1597	}
1633		1598
1634	object *	1599	object *
1635	insert_ob_in_ob (object op, object where)	1600	insert_ob_in_ob (object op, object where)
…		…
1660	* be != op, if items are merged. -Tero	1625	* be != op, if items are merged. -Tero
1661	*/	1626	*/
1662	object *	1627	object *
1663	object::insert (object *op)	1628	object::insert (object *op)
1664	{	1629	{
1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1666	op->remove ();
1667
1668	if (op->more)	1630	if (op->more)
1669	{	1631	{
1670	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);
1671	return op;	1633	return op;
1672	}	1634	}
1673		1635
1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1636	op->remove ();
1675	CLEAR_FLAG (op, FLAG_REMOVED);	1637
		1638	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1676		1639
1677	if (op->nrof)	1640	if (op->nrof)
1678	{
1679	for (object *tmp = inv; tmp; tmp = tmp->below)	1641	for (object *tmp = inv; tmp; tmp = tmp->below)
1680	if (object::can_merge (tmp, op))	1642	if (object::can_merge (tmp, op))
1681	{	1643	{
1682	/* return the original object and remove inserted object	1644	/* return the original object and remove inserted object
1683	(client needs the original object) */	1645	(client needs the original object) */
1684	tmp->nrof += op->nrof;	1646	tmp->nrof += op->nrof;
1685	/* Weight handling gets pretty funky. Since we are adding to	1647
1686	* tmp->nrof, we need to increase the weight.	1648	if (object *pl = tmp->visible_to ())
1687	*/	1649	esrv_update_item (UPD_NROF, pl, tmp);
		1650
1688	add_weight (this, op->weight * op->nrof);	1651	adjust_weight (this, op->total_weight ());
1689	SET_FLAG (op, FLAG_REMOVED);	1652
1690	op->destroy (); /* free the inserted object */	1653	op->destroy (1);
1691	op = tmp;	1654	op = tmp;
1692	op->remove (); /* and fix old object's links */	1655	goto inserted;
1693	CLEAR_FLAG (op, FLAG_REMOVED);
1694	break;
1695	}	1656	}
1696		1657
1697	/* I assume combined objects have no inventory
1698	* We add the weight - this object could have just been removed
1699	* (if it was possible to merge). calling remove_ob will subtract
1700	* the weight, so we need to add it in again, since we actually do
1701	* the linking below
1702	*/
1703	add_weight (this, op->weight * op->nrof);
1704	}
1705	else
1706	add_weight (this, (op->weight + op->carrying));
1707
1708	if (object *otmp = this->in_player ())
1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1710	otmp->update_stats ();
1711
1712	op->owner = 0; // its his/hers now. period.	1658	op->owner = 0; // it's his/hers now. period.
1713	op->map = 0;	1659	op->map = 0;
		1660	op->x = 0;
		1661	op->y = 0;
		1662
		1663	op->above = 0;
		1664	op->below = inv;
1714	op->env = this;	1665	op->env = this;
1715	op->above = 0;
1716	op->below = 0;
1717	op->x = op->y = 0;
1718		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:
1719	/* 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 */
1720	if (op->glow_radius && map)	1681	if (op->glow_radius && map && map->darkness)
1721	{
1722	#ifdef DEBUG_LIGHTS
1723	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1724	#endif /* DEBUG_LIGHTS */
1725	if (map->darkness)
1726	update_all_los (map, x, y);	1682	update_all_los (map, x, y);
1727	}
1728		1683
1729	/* Client has no idea of ordering so lets not bother ordering it here.	1684	// if this is a player's inventory, update stats
1730	* It sure simplifies this function...	1685	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1731	*/	1686	update_stats ();
1732	if (!inv)
1733	inv = op;
1734	else
1735	{
1736	op->below = inv;
1737	op->below->above = op;
1738	inv = op;
1739	}
1740		1687
1741	INVOKE_OBJECT (INSERT, this);	1688	INVOKE_OBJECT (INSERT, this);
1742		1689
1743	return op;	1690	return op;
1744	}	1691	}
…		…
2622	&name,	2569	&name,
2623	title ? "\",title:\"" : "",	2570	title ? "\",title:\"" : "",
2624	title ? (const char *)title : "",	2571	title ? (const char *)title : "",
2625	flag_desc (flagdesc, 512), type);	2572	flag_desc (flagdesc, 512), type);
2626		2573
2627	if (!this->flag[FLAG_REMOVED] && env)	2574	if (!flag[FLAG_REMOVED] && env)
2628	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2629		2576
2630	if (map)	2577	if (map)
2631	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);
2632		2579
…		…
2674	if (object *closer = old_container->inv)	2621	if (object *closer = old_container->inv)
2675	if (closer->type == CLOSE_CON)	2622	if (closer->type == CLOSE_CON)
2676	closer->destroy ();	2623	closer->destroy ();
2677	#endif	2624	#endif
2678		2625
2679	old_container->flag [FLAG_APPLIED] = 0;	2626	old_container->flag [FLAG_APPLIED] = false;
2680	container = 0;	2627	container = 0;
2681		2628
2682	esrv_update_item (UPD_FLAGS, this, old_container);	2629	esrv_update_item (UPD_FLAGS, this, old_container);
2683	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));
2684	play_sound (sound_find ("chest_close"));	2631	play_sound (sound_find ("chest_close"));
…		…
2700	}	2647	}
2701	#endif	2648	#endif
2702		2649
2703	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));
2704		2651
2705	new_container->flag [FLAG_APPLIED] = 1;	2652	new_container->flag [FLAG_APPLIED] = true;
2706	container = new_container;	2653	container = new_container;
2707		2654
2708	esrv_update_item (UPD_FLAGS, this, new_container);	2655	esrv_update_item (UPD_FLAGS, this, new_container);
2709	esrv_send_inventory (this, new_container);	2656	esrv_send_inventory (this, new_container);
2710	play_sound (sound_find ("chest_open"));	2657	play_sound (sound_find ("chest_open"));
…		…
2742		2689
2743	insert (force);	2690	insert (force);
2744	}	2691	}
2745		2692
2746	void	2693	void
2747	object::play_sound (faceidx sound) const	2694	object::play_sound (faceidx sound)
2748	{	2695	{
2749	if (!sound)	2696	if (!sound)
2750	return;	2697	return;
2751		2698
2752	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.205 by root, Sun Apr 13 01:34:08 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.205 by root, Sun Apr 13 01:34:08 2008 UTC vs.
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC