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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC

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

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs. Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC