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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.197 by root, Wed Oct 17 22:04:31 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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	* Crossfire TRT 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 <crossfire@schmorp.de>
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	}
…		…
374	/*	384	/*
375	* 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
376	* multi-object 1 which is closest to the second object.	386	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	387	* If it's not a multi-object, it is returned.
378	*/	388	*/
379
380	object *	389	object *
381	get_nearest_part (object op, const object pl)	390	get_nearest_part (object op, const object pl)
382	{	391	{
383	object tmp, closest;	392	object tmp, closest;
384	int last_dist, i;	393	int last_dist, i;
…		…
429	}	438	}
430		439
431	/*	440	/*
432	* 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
433	* skill and experience objects.	442	* skill and experience objects.
		443	* ACTUALLY NO! investigate! TODO
434	*/	444	*/
435	void	445	void
436	object::set_owner (object *owner)	446	object::set_owner (object *owner)
437	{	447	{
		448	// allow objects which own objects
438	if (!owner)	449	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	450	while (owner->owner)
449	owner = owner->owner;	451	owner = owner->owner;
450		452
451	this->owner = owner;	453	this->owner = owner;
452	}	454	}
453		455
454	void	456	int
		457	object::slottype () const
		458	{
		459	if (type == SKILL)
		460	{
		461	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		462	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		463	}
		464	else
		465	{
		466	if (slot [body_combat].info) return slot_combat;
		467	if (slot [body_range ].info) return slot_ranged;
		468	}
		469
		470	return slot_none;
		471	}
		472
		473	bool
455	object::set_weapon (object *ob)	474	object::change_weapon (object *ob)
456	{	475	{
457	if (current_weapon == ob)	476	if (current_weapon == ob)
458	return;	477	return true;
		478
		479	if (chosen_skill)
		480	chosen_skill->flag [FLAG_APPLIED] = false;
459		481
460	current_weapon = ob;	482	current_weapon = ob;
461	new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	483	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		484
		485	if (chosen_skill)
		486	chosen_skill->flag [FLAG_APPLIED] = true;
		487
462	update_stats ();	488	update_stats ();
		489
		490	if (ob)
		491	{
		492	// now check wether any body locations became invalid, in which case
		493	// we cannot apply the weapon at the moment.
		494	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		495	if (slot[i].used < 0)
		496	{
		497	current_weapon = chosen_skill = 0;
		498	update_stats ();
		499
		500	new_draw_info_format (NDI_UNIQUE, 0, this,
		501	"You try to balance all your items at once, "
		502	"but the %s is just too much for your body. "
		503	"[You need to unapply some items first.]", &ob->name);
		504	return false;
		505	}
		506
		507	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		508	}
		509	else
		510	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		511
		512	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		513	{
		514	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
		515	&name, ob->debug_desc ());
		516	return false;
		517	}
		518
		519	return true;
463	}	520	}
464		521
465	/* Zero the key_values on op, decrementing the shared-string	522	/* Zero the key_values on op, decrementing the shared-string
466	* refcounts and freeing the links.	523	* refcounts and freeing the links.
467	*/	524	*/
…		…
531	object::copy_to (object *dst)	588	object::copy_to (object *dst)
532	{	589	{
533	dst = this;	590	dst = this;
534		591
535	if (speed < 0)	592	if (speed < 0)
536	dst->speed_left = speed_left - rndm ();	593	dst->speed_left -= rndm ();
537		594
538	dst->set_speed (dst->speed);	595	dst->set_speed (dst->speed);
539	}	596	}
540		597
541	void	598	void
…		…
549	* need for monsters, but doesn't hurt to do it for everything.	606	* need for monsters, but doesn't hurt to do it for everything.
550	* by doing so, when a monster is created, it has good starting	607	* by doing so, when a monster is created, it has good starting
551	* values for the body_used info, so when items are created	608	* values for the body_used info, so when items are created
552	* for it, they can be properly equipped.	609	* for it, they can be properly equipped.
553	*/	610	*/
554	memcpy (body_used, body_info, sizeof (body_used));	611	for (int i = NUM_BODY_LOCATIONS; i--; )
		612	slot[i].used = slot[i].info;
555		613
556	attachable::instantiate ();	614	attachable::instantiate ();
557	}	615	}
558		616
559	object *	617	object *
…		…
867		925
868	if (!freed_map)	926	if (!freed_map)
869	{	927	{
870	freed_map = new maptile;	928	freed_map = new maptile;
871		929
		930	freed_map->path = "<freed objects map>";
872	freed_map->name = "/internal/freed_objects_map";	931	freed_map->name = "/internal/freed_objects_map";
873	freed_map->width = 3;	932	freed_map->width = 3;
874	freed_map->height = 3;	933	freed_map->height = 3;
875		934
876	freed_map->alloc ();	935	freed_map->alloc ();
…		…
880	map = freed_map;	939	map = freed_map;
881	x = 1;	940	x = 1;
882	y = 1;	941	y = 1;
883	}	942	}
884		943
885	head = 0;
886
887	if (more)	944	if (more)
888	{	945	{
889	more->destroy ();	946	more->destroy ();
890	more = 0;	947	more = 0;
891	}	948	}
892		949
		950	head = 0;
		951
893	// clear those pointers that likely might have circular references to us	952	// clear those pointers that likely might cause circular references
894	owner = 0;	953	owner = 0;
895	enemy = 0;	954	enemy = 0;
896	attacked_by = 0;	955	attacked_by = 0;
		956	current_weapon = 0;
897	}	957	}
898		958
899	void	959	void
900	object::destroy (bool destroy_inventory)	960	object::destroy (bool destroy_inventory)
901	{	961	{
902	if (destroyed ())	962	if (destroyed ())
903	return;	963	return;
904		964
905	if (destroy_inventory)	965	if (destroy_inventory)
906	destroy_inv (false);	966	destroy_inv (false);
		967
		968	if (is_head ())
		969	if (sound_destroy)
		970	play_sound (sound_destroy);
		971	else if (flag [FLAG_MONSTER])
		972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
907		973
908	attachable::destroy ();	974	attachable::destroy ();
909	}	975	}
910		976
911	/*	977	/*
…		…
1026	if (map->in_memory == MAP_SAVING)	1092	if (map->in_memory == MAP_SAVING)
1027	return;	1093	return;
1028		1094
1029	int check_walk_off = !flag [FLAG_NO_APPLY];	1095	int check_walk_off = !flag [FLAG_NO_APPLY];
1030		1096
		1097	if (object *pl = ms.player ())
		1098	{
		1099	if (pl->container == this)
		1100	/* If a container that the player is currently using somehow gets
		1101	* removed (most likely destroyed), update the player view
		1102	* appropriately.
		1103	*/
		1104	pl->close_container ();
		1105
		1106	pl->contr->ns->floorbox_update ();
		1107	}
		1108
1031	for (tmp = ms.bot; tmp; tmp = tmp->above)	1109	for (tmp = ms.bot; tmp; tmp = tmp->above)
1032	{	1110	{
1033	/* No point updating the players look faces if he is the object	1111	/* No point updating the players look faces if he is the object
1034	* being removed.	1112	* being removed.
1035	*/	1113	*/
1036
1037	if (tmp->type == PLAYER && tmp != this)
1038	{
1039	/* If a container that the player is currently using somehow gets
1040	* removed (most likely destroyed), update the player view
1041	* appropriately.
1042	*/
1043	if (tmp->container == this)
1044	{
1045	flag [FLAG_APPLIED] = 0;
1046	tmp->container = 0;
1047	}
1048
1049	if (tmp->contr->ns)
1050	tmp->contr->ns->floorbox_update ();
1051	}
1052		1114
1053	/* See if object moving off should effect something */	1115	/* See if object moving off should effect something */
1054	if (check_walk_off	1116	if (check_walk_off
1055	&& ((move_type & tmp->move_off)	1117	&& ((move_type & tmp->move_off)
1056	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1118	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1059		1121
1060	if (destroyed ())	1122	if (destroyed ())
1061	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1123	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1062	}	1124	}
1063		1125
1064	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1065	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1066	if (tmp->above == tmp)
1067	tmp->above = 0;
1068
1069	last = tmp;	1126	last = tmp;
1070	}	1127	}
1071		1128
1072	/* last == NULL if there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
1073	//TODO: this makes little sense, why only update the topmost object?	1130	//TODO: this makes little sense, why only update the topmost object?
…		…
1093	merge_ob (object op, object top)	1150	merge_ob (object op, object top)
1094	{	1151	{
1095	if (!op->nrof)	1152	if (!op->nrof)
1096	return 0;	1153	return 0;
1097		1154
1098	if (top)	1155	if (!top)
1099	for (top = op; top && top->above; top = top->above)	1156	for (top = op; top && top->above; top = top->above)
1100	;	1157	;
1101		1158
1102	for (; top; top = top->below)	1159	for (; top; top = top->below)
1103	{	1160	{
…		…
1124	if (more)	1181	if (more)
1125	return;	1182	return;
1126		1183
1127	object *prev = this;	1184	object *prev = this;
1128		1185
1129	for (archetype *at = arch->more; at; at = at->more)	1186	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1130	{	1187	{
1131	object *op = arch_to_object (at);	1188	object *op = arch_to_object (at);
1132		1189
1133	op->name = name;	1190	op->name = name;
1134	op->name_pl = name_pl;	1191	op->name_pl = name_pl;
…		…
1148	object *	1205	object *
1149	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1206	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1150	{	1207	{
1151	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1152	{	1209	{
1153	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->x;
1154	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->y;
1155	}	1212	}
1156		1213
1157	return insert_ob_in_map (op, m, originator, flag);	1214	return insert_ob_in_map (op, m, originator, flag);
1158	}	1215	}
1159		1216
…		…
1180	object *	1237	object *
1181	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1238	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1182	{	1239	{
1183	assert (!op->flag [FLAG_FREED]);	1240	assert (!op->flag [FLAG_FREED]);
1184		1241
1185	object tmp, top, *floor = NULL;	1242	object top, floor = NULL;
1186		1243
1187	op->remove ();	1244	op->remove ();
1188
1189	#if 0
1190	if (!m->active != !op->active)
1191	if (m->active)
1192	op->activate_recursive ();
1193	else
1194	op->deactivate_recursive ();
1195	#endif
1196
1197	if (out_of_map (m, op->x, op->y))
1198	{
1199	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1200	#ifdef MANY_CORES
1201	/* Better to catch this here, as otherwise the next use of this object
1202	* is likely to cause a crash. Better to find out where it is getting
1203	* improperly inserted.
1204	*/
1205	abort ();
1206	#endif
1207	return op;
1208	}
1209
1210	if (object *more = op->more)
1211	{
1212	if (!insert_ob_in_map (more, m, originator, flag))
1213	{
1214	if (!op->head)
1215	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1216
1217	return 0;
1218	}
1219	}
1220
1221	CLEAR_FLAG (op, FLAG_REMOVED);
1222		1245
1223	/* Ideally, the caller figures this out. However, it complicates a lot	1246	/* Ideally, the caller figures this out. However, it complicates a lot
1224	* of areas of callers (eg, anything that uses find_free_spot would now	1247	* of areas of callers (eg, anything that uses find_free_spot would now
1225	* need extra work	1248	* need extra work
1226	*/	1249	*/
1227	if (!xy_normalise (m, op->x, op->y))	1250	if (!xy_normalise (m, op->x, op->y))
		1251	{
		1252	op->destroy ();
1228	return 0;	1253	return 0;
		1254	}
		1255
		1256	if (object *more = op->more)
		1257	if (!insert_ob_in_map (more, m, originator, flag))
		1258	return 0;
		1259
		1260	CLEAR_FLAG (op, FLAG_REMOVED);
1229		1261
1230	op->map = m;	1262	op->map = m;
1231	mapspace &ms = op->ms ();	1263	mapspace &ms = op->ms ();
1232		1264
1233	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1234	*/	1266	*/
1235	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1236	for (tmp = ms.bot; tmp; tmp = tmp->above)	1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1237	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1238	{	1270	{
1239	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1240	tmp->destroy ();	1272	tmp->destroy ();
1241	}	1273	}
…		…
1268	else	1300	else
1269	{	1301	{
1270	top = ms.bot;	1302	top = ms.bot;
1271		1303
1272	/* If there are other objects, then */	1304	/* If there are other objects, then */
1273	if ((!(flag & INS_MAP_LOAD)) && top)	1305	if (top)
1274	{	1306	{
1275	object *last = 0;	1307	object *last = 0;
1276		1308
1277	/*	1309	/*
1278	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
…		…
1331	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1332	top = last->below;	1364	top = last->below;
1333	}	1365	}
1334	} /* If objects on this space */	1366	} /* If objects on this space */
1335		1367
1336	if (flag & INS_MAP_LOAD)
1337	top = ms.top;
1338
1339	if (flag & INS_ABOVE_FLOOR_ONLY)	1368	if (flag & INS_ABOVE_FLOOR_ONLY)
1340	top = floor;	1369	top = floor;
1341		1370
1342	/* Top is the object that our object (op) is going to get inserted above.	1371	/* Top is the object that our object (op) is going to get inserted above.
1343	*/	1372	*/
…		…
1375	op->map->touch ();	1404	op->map->touch ();
1376	}	1405	}
1377		1406
1378	op->map->dirty = true;	1407	op->map->dirty = true;
1379		1408
1380	/* If we have a floor, we know the player, if any, will be above
1381	* it, so save a few ticks and start from there.
1382	*/
1383	if (!(flag & INS_MAP_LOAD))
1384	if (object *pl = ms.player ())	1409	if (object *pl = ms.player ())
1385	if (pl->contr->ns)
1386	pl->contr->ns->floorbox_update ();	1410	pl->contr->ns->floorbox_update ();
1387		1411
1388	/* If this object glows, it may affect lighting conditions that are	1412	/* If this object glows, it may affect lighting conditions that are
1389	* visible to others on this map. But update_all_los is really	1413	* visible to others on this map. But update_all_los is really
1390	* an inefficient way to do this, as it means los for all players	1414	* an inefficient way to do this, as it means los for all players
1391	* on the map will get recalculated. The players could very well	1415	* on the map will get recalculated. The players could very well
…		…
1410	* blocked() and wall() work properly), and these flags are updated by	1434	* blocked() and wall() work properly), and these flags are updated by
1411	* update_object().	1435	* update_object().
1412	*/	1436	*/
1413		1437
1414	/* if this is not the head or flag has been passed, don't check walk on status */	1438	/* if this is not the head or flag has been passed, don't check walk on status */
1415	if (!(flag & INS_NO_WALK_ON) && !op->head)	1439	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1416	{	1440	{
1417	if (check_move_on (op, originator))	1441	if (check_move_on (op, originator))
1418	return 0;	1442	return 0;
1419		1443
1420	/* If we are a multi part object, lets work our way through the check	1444	/* If we are a multi part object, lets work our way through the check
1421	* walk on's.	1445	* walk on's.
1422	*/	1446	*/
1423	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1447	for (object *tmp = op->more; tmp; tmp = tmp->more)
1424	if (check_move_on (tmp, originator))	1448	if (check_move_on (tmp, originator))
1425	return 0;	1449	return 0;
1426	}	1450	}
1427		1451
1428	return op;	1452	return op;
…		…
1438	object tmp, tmp1;	1462	object tmp, tmp1;
1439		1463
1440	/* first search for itself and remove any old instances */	1464	/* first search for itself and remove any old instances */
1441		1465
1442	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1443	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1444	tmp->destroy ();	1468	tmp->destroy ();
1445		1469
1446	tmp1 = arch_to_object (archetype::find (arch_string));	1470	tmp1 = arch_to_object (archetype::find (arch_string));
1447		1471
1448	tmp1->x = op->x;	1472	tmp1->x = op->x;
…		…
1609	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1633	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1610	free (dump);	1634	free (dump);
1611	return op;	1635	return op;
1612	}	1636	}
1613		1637
1614	if (where->head)	1638	if (where->head_ () != where)
1615	{	1639	{
1616	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1640	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1617	where = where->head;	1641	where = where->head;
1618	}	1642	}
1619		1643
1620	return where->insert (op);	1644	return where->insert (op);
1621	}	1645	}
…		…
1629	* be != op, if items are merged. -Tero	1653	* be != op, if items are merged. -Tero
1630	*/	1654	*/
1631	object *	1655	object *
1632	object::insert (object *op)	1656	object::insert (object *op)
1633	{	1657	{
1634	object tmp, otmp;
1635
1636	if (!QUERY_FLAG (op, FLAG_REMOVED))	1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1637	op->remove ();	1659	op->remove ();
1638		1660
1639	if (op->more)	1661	if (op->more)
1640	{	1662	{
…		…
1642	return op;	1664	return op;
1643	}	1665	}
1644		1666
1645	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1646	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
		1669
1647	if (op->nrof)	1670	if (op->nrof)
1648	{	1671	{
1649	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1672	for (object *tmp = inv; tmp; tmp = tmp->below)
1650	if (object::can_merge (tmp, op))	1673	if (object::can_merge (tmp, op))
1651	{	1674	{
1652	/* return the original object and remove inserted object	1675	/* return the original object and remove inserted object
1653	(client needs the original object) */	1676	(client needs the original object) */
1654	tmp->nrof += op->nrof;	1677	tmp->nrof += op->nrof;
…		…
1673	add_weight (this, op->weight * op->nrof);	1696	add_weight (this, op->weight * op->nrof);
1674	}	1697	}
1675	else	1698	else
1676	add_weight (this, (op->weight + op->carrying));	1699	add_weight (this, (op->weight + op->carrying));
1677		1700
1678	otmp = this->in_player ();	1701	if (object *otmp = this->in_player ())
1679	if (otmp && otmp->contr)
1680	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1681	otmp->update_stats ();	1703	otmp->update_stats ();
1682		1704
		1705	op->owner = 0; // its his/hers now. period.
1683	op->map = 0;	1706	op->map = 0;
1684	op->env = this;	1707	op->env = this;
1685	op->above = 0;	1708	op->above = 0;
1686	op->below = 0;	1709	op->below = 0;
1687	op->x = 0, op->y = 0;	1710	op->x = op->y = 0;
1688		1711
1689	/* reset the light list and los of the players on the map */	1712	/* reset the light list and los of the players on the map */
1690	if ((op->glow_radius != 0) && map)	1713	if (op->glow_radius && map)
1691	{	1714	{
1692	#ifdef DEBUG_LIGHTS	1715	#ifdef DEBUG_LIGHTS
1693	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1716	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1694	#endif /* DEBUG_LIGHTS */	1717	#endif /* DEBUG_LIGHTS */
1695	if (map->darkness)	1718	if (map->darkness)
…		…
1929	* activate recursively a flag on an object inventory	1952	* activate recursively a flag on an object inventory
1930	*/	1953	*/
1931	void	1954	void
1932	flag_inv (object *op, int flag)	1955	flag_inv (object *op, int flag)
1933	{	1956	{
1934	if (op->inv)
1935	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1957	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1936	{	1958	{
1937	SET_FLAG (tmp, flag);	1959	SET_FLAG (tmp, flag);
1938	flag_inv (tmp, flag);	1960	flag_inv (tmp, flag);
1939	}	1961	}
1940	}	1962	}
1941		1963
1942	/*	1964	/*
1943	* deactivate recursively a flag on an object inventory	1965	* deactivate recursively a flag on an object inventory
1944	*/	1966	*/
1945	void	1967	void
1946	unflag_inv (object *op, int flag)	1968	unflag_inv (object *op, int flag)
1947	{	1969	{
1948	if (op->inv)
1949	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1970	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1950	{	1971	{
1951	CLEAR_FLAG (tmp, flag);	1972	CLEAR_FLAG (tmp, flag);
1952	unflag_inv (tmp, flag);	1973	unflag_inv (tmp, flag);
1953	}	1974	}
1954	}
1955
1956	/*
1957	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1958	* all it's inventory (recursively).
1959	* If checksums are used, a player will get set_cheat called for
1960	* him/her-self and all object carried by a call to this function.
1961	*/
1962	void
1963	set_cheat (object *op)
1964	{
1965	SET_FLAG (op, FLAG_WAS_WIZ);
1966	flag_inv (op, FLAG_WAS_WIZ);
1967	}	1975	}
1968		1976
1969	/*	1977	/*
1970	* find_free_spot(object, map, x, y, start, stop) will search for	1978	* find_free_spot(object, map, x, y, start, stop) will search for
1971	* a spot at the given map and coordinates which will be able to contain	1979	* a spot at the given map and coordinates which will be able to contain
…		…
1973	* to search (see the freearr_x/y[] definition).	1981	* to search (see the freearr_x/y[] definition).
1974	* It returns a random choice among the alternatives found.	1982	* It returns a random choice among the alternatives found.
1975	* start and stop are where to start relative to the free_arr array (1,9	1983	* start and stop are where to start relative to the free_arr array (1,9
1976	* does all 4 immediate directions). This returns the index into the	1984	* does all 4 immediate directions). This returns the index into the
1977	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1985	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1978	* Note - this only checks to see if there is space for the head of the
1979	* object - if it is a multispace object, this should be called for all
1980	* pieces.
1981	* Note2: This function does correctly handle tiled maps, but does not	1986	* Note: This function does correctly handle tiled maps, but does not
1982	* inform the caller. However, insert_ob_in_map will update as	1987	* inform the caller. However, insert_ob_in_map will update as
1983	* necessary, so the caller shouldn't need to do any special work.	1988	* necessary, so the caller shouldn't need to do any special work.
1984	* Note - updated to take an object instead of archetype - this is necessary	1989	* Note - updated to take an object instead of archetype - this is necessary
1985	* because arch_blocked (now ob_blocked) needs to know the movement type	1990	* because arch_blocked (now ob_blocked) needs to know the movement type
1986	* to know if the space in question will block the object. We can't use	1991	* to know if the space in question will block the object. We can't use
…		…
1988	* customized, changed states, etc.	1993	* customized, changed states, etc.
1989	*/	1994	*/
1990	int	1995	int
1991	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	1996	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
1992	{	1997	{
		1998	int altern[SIZEOFFREE];
1993	int index = 0, flag;	1999	int index = 0, flag;
1994	int altern[SIZEOFFREE];
1995		2000
1996	for (int i = start; i < stop; i++)	2001	for (int i = start; i < stop; i++)
1997	{	2002	{
1998	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2003	mapxy pos (m, x, y); pos.move (i);
1999	if (!flag)	2004
		2005	if (!pos.normalise ())
		2006	continue;
		2007
		2008	mapspace &ms = *pos;
		2009
		2010	if (ms.flags () & P_IS_ALIVE)
		2011	continue;
		2012
		2013	/* However, often
		2014	* ob doesn't have any move type (when used to place exits)
		2015	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2016	*/
		2017	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2018	{
2000	altern [index++] = i;	2019	altern [index++] = i;
		2020	continue;
		2021	}
2001		2022
2002	/* Basically, if we find a wall on a space, we cut down the search size.	2023	/* Basically, if we find a wall on a space, we cut down the search size.
2003	* In this way, we won't return spaces that are on another side of a wall.	2024	* In this way, we won't return spaces that are on another side of a wall.
2004	* This mostly work, but it cuts down the search size in all directions -	2025	* This mostly work, but it cuts down the search size in all directions -
2005	* if the space being examined only has a wall to the north and empty	2026	* if the space being examined only has a wall to the north and empty
2006	* spaces in all the other directions, this will reduce the search space	2027	* spaces in all the other directions, this will reduce the search space
2007	* to only the spaces immediately surrounding the target area, and	2028	* to only the spaces immediately surrounding the target area, and
2008	* won't look 2 spaces south of the target space.	2029	* won't look 2 spaces south of the target space.
2009	*/	2030	*/
2010	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2031	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2032	{
2011	stop = maxfree[i];	2033	stop = maxfree[i];
		2034	continue;
		2035	}
		2036
		2037	/* Note it is intentional that we check ob - the movement type of the
		2038	* head of the object should correspond for the entire object.
		2039	*/
		2040	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2041	continue;
		2042
		2043	if (ob->blocked (m, pos.x, pos.y))
		2044	continue;
		2045
		2046	altern [index++] = i;
2012	}	2047	}
2013		2048
2014	if (!index)	2049	if (!index)
2015	return -1;	2050	return -1;
2016		2051
…		…
2025	*/	2060	*/
2026	int	2061	int
2027	find_first_free_spot (const object ob, maptile m, int x, int y)	2062	find_first_free_spot (const object ob, maptile m, int x, int y)
2028	{	2063	{
2029	for (int i = 0; i < SIZEOFFREE; i++)	2064	for (int i = 0; i < SIZEOFFREE; i++)
2030	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2065	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2031	return i;	2066	return i;
2032		2067
2033	return -1;	2068	return -1;
2034	}	2069	}
2035		2070
…		…
2089	object *tmp;	2124	object *tmp;
2090	maptile *mp;	2125	maptile *mp;
2091		2126
2092	MoveType blocked, move_type;	2127	MoveType blocked, move_type;
2093		2128
2094	if (exclude && exclude->head)	2129	if (exclude && exclude->head_ () != exclude)
2095	{	2130	{
2096	exclude = exclude->head;	2131	exclude = exclude->head;
2097	move_type = exclude->move_type;	2132	move_type = exclude->move_type;
2098	}	2133	}
2099	else	2134	else
…		…
2122	max = maxfree[i];	2157	max = maxfree[i];
2123	else if (mflags & P_IS_ALIVE)	2158	else if (mflags & P_IS_ALIVE)
2124	{	2159	{
2125	for (tmp = ms.bot; tmp; tmp = tmp->above)	2160	for (tmp = ms.bot; tmp; tmp = tmp->above)
2126	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2161	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2127	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2162	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2128	break;	2163	break;
2129		2164
2130	if (tmp)	2165	if (tmp)
2131	return freedir[i];	2166	return freedir[i];
2132	}	2167	}
…		…
2312	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2347	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2313	* core dumps if they do.	2348	* core dumps if they do.
2314	*	2349	*
2315	* Add a check so we can't pick up invisible objects (0.93.8)	2350	* Add a check so we can't pick up invisible objects (0.93.8)
2316	*/	2351	*/
2317
2318	int	2352	int
2319	can_pick (const object who, const object item)	2353	can_pick (const object who, const object item)
2320	{	2354	{
2321	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2355	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2322	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2356	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2327	* create clone from object to another	2361	* create clone from object to another
2328	*/	2362	*/
2329	object *	2363	object *
2330	object_create_clone (object *asrc)	2364	object_create_clone (object *asrc)
2331	{	2365	{
2332	object dst = 0, tmp, src, part, prev, item;	2366	object dst = 0, tmp, src, prev, *item;
2333		2367
2334	if (!asrc)	2368	if (!asrc)
2335	return 0;	2369	return 0;
2336		2370
2337	src = asrc;
2338	if (src->head)
2339	src = src->head;	2371	src = asrc->head_ ();
2340		2372
2341	prev = 0;	2373	prev = 0;
2342	for (part = src; part; part = part->more)	2374	for (object *part = src; part; part = part->more)
2343	{	2375	{
2344	tmp = part->clone ();	2376	tmp = part->clone ();
2345	tmp->x -= src->x;	2377	tmp->x -= src->x;
2346	tmp->y -= src->y;	2378	tmp->y -= src->y;
2347		2379
…		…
2460	/* Basically, if the archetype has this key set,	2492	/* Basically, if the archetype has this key set,
2461	* we need to store the null value so when we save	2493	* we need to store the null value so when we save
2462	* it, we save the empty value so that when we load,	2494	* it, we save the empty value so that when we load,
2463	* we get this value back again.	2495	* we get this value back again.
2464	*/	2496	*/
2465	if (get_ob_key_link (&op->arch->clone, canonical_key))	2497	if (get_ob_key_link (op->arch, canonical_key))
2466	field->value = 0;	2498	field->value = 0;
2467	else	2499	else
2468	{	2500	{
2469	if (last)	2501	if (last)
2470	last->next = field->next;	2502	last->next = field->next;
…		…
2539	}	2571	}
2540	else	2572	else
2541	item = item->env;	2573	item = item->env;
2542	}	2574	}
2543		2575
2544
2545	const char *	2576	const char *
2546	object::flag_desc (char *desc, int len) const	2577	object::flag_desc (char *desc, int len) const
2547	{	2578	{
2548	char *p = desc;	2579	char *p = desc;
2549	bool first = true;	2580	bool first = true;
…		…
2583	&name,	2614	&name,
2584	title ? "\",title:\"" : "",	2615	title ? "\",title:\"" : "",
2585	title ? (const char *)title : "",	2616	title ? (const char *)title : "",
2586	flag_desc (flagdesc, 512), type);	2617	flag_desc (flagdesc, 512), type);
2587		2618
2588	if (env)	2619	if (!this->flag[FLAG_REMOVED] && env)
2589	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2590		2621
2591	if (map)	2622	if (map)
2592	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2593		2624
…		…
2611	}	2642	}
2612		2643
2613	const materialtype_t *	2644	const materialtype_t *
2614	object::dominant_material () const	2645	object::dominant_material () const
2615	{	2646	{
2616	if (materialtype_t *mat = name_to_material (materialname))	2647	if (materialtype_t *mt = name_to_material (materialname))
2617	return mat;	2648	return mt;
2618		2649
2619	// omfg this is slow, this has to be temporary :)
2620	shstr unknown ("unknown");
2621
2622	return name_to_material (unknown);	2650	return name_to_material (shstr_unknown);
2623	}	2651	}
2624		2652
2625	void	2653	void
2626	object::open_container (object *new_container)	2654	object::open_container (object *new_container)
2627	{	2655	{
…		…
2643	old_container->flag [FLAG_APPLIED] = 0;	2671	old_container->flag [FLAG_APPLIED] = 0;
2644	container = 0;	2672	container = 0;
2645		2673
2646	esrv_update_item (UPD_FLAGS, this, old_container);	2674	esrv_update_item (UPD_FLAGS, this, old_container);
2647	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2675	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2676	play_sound (sound_find ("chest_close"));
2648	}	2677	}
2649		2678
2650	if (new_container)	2679	if (new_container)
2651	{	2680	{
2652	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2681	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2668	new_container->flag [FLAG_APPLIED] = 1;	2697	new_container->flag [FLAG_APPLIED] = 1;
2669	container = new_container;	2698	container = new_container;
2670		2699
2671	esrv_update_item (UPD_FLAGS, this, new_container);	2700	esrv_update_item (UPD_FLAGS, this, new_container);
2672	esrv_send_inventory (this, new_container);	2701	esrv_send_inventory (this, new_container);
		2702	play_sound (sound_find ("chest_open"));
		2703	}
		2704	}
		2705
		2706	object *
		2707	object::force_find (const shstr name)
		2708	{
		2709	/* cycle through his inventory to look for the MARK we want to
		2710	* place
		2711	*/
		2712	for (object *tmp = inv; tmp; tmp = tmp->below)
		2713	if (tmp->type == FORCE && tmp->slaying == name)
		2714	return splay (tmp);
		2715
		2716	return 0;
		2717	}
		2718
		2719	void
		2720	object::force_add (const shstr name, int duration)
		2721	{
		2722	if (object *force = force_find (name))
		2723	force->destroy ();
		2724
		2725	object *force = get_archetype (FORCE_NAME);
		2726
		2727	force->slaying = name;
		2728	force->stats.food = 1;
		2729	force->speed_left = -1.f;
		2730
		2731	force->set_speed (duration ? 1.f / duration : 0.f);
		2732	force->flag [FLAG_IS_USED_UP] = true;
		2733	force->flag [FLAG_APPLIED] = true;
		2734
		2735	insert (force);
		2736	}
		2737
		2738	void
		2739	object::play_sound (faceidx sound) const
		2740	{
		2741	if (!sound)
		2742	return;
		2743
		2744	if (flag [FLAG_REMOVED])
		2745	return;
		2746
		2747	if (env)
2673	}	2748	{
		2749	if (object *pl = in_player ())
		2750	pl->contr->play_sound (sound);
		2751	}
		2752	else
		2753	map->play_sound (sound, x, y);
2674	}	2754	}
2675		2755
2676

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC vs. Revision 1.197 by root, Wed Oct 17 22:04:31 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.197 by root, Wed Oct 17 22:04:31 2007 UTC