ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.45 by root, Thu Sep 14 18:13:01 2006 UTC vs.
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
4		3	*
		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.	20	*
21		21	* The authors can be reached via e-mail to <support@deliantra.net>
22	The authors can be reached via e-mail at crossfire-devel@real-time.com
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. */
28	#include <global.h>	27	#include <global.h>
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
		36	#include <bitset>
35		37
36	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
37	static UUID uuid;	39	static UUID uuid;
38	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
39		41
40	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
41		44
42	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44	};	47	};
45	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
105	_exit (1);	108	_exit (1);
106	}	109	}
107		110
108	uuid.seq = uid;	111	uuid.seq = uid;
109	write_uuid ();	112	write_uuid ();
110	LOG (llevDebug, "read UID: %lld\n", uid);	113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
111	fclose (fp);	114	fclose (fp);
112	}	115	}
113		116
114	UUID	117	UUID
115	gen_uuid ()	118	gen_uuid ()
…		…
140	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
141	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
142	*/	145	*/
143		146
144	/* For each field in wants, */	147	/* For each field in wants, */
145	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
146	{	149	{
147	key_value *has_field;	150	key_value *has_field;
148		151
149	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
150	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
184	*	187	*
185	* Note that this function appears a lot longer than the macro it	188	* Note that this function appears a lot longer than the macro it
186	* replaces - this is mostly for clarity - a decent compiler should hopefully	189	* replaces - this is mostly for clarity - a decent compiler should hopefully
187	* reduce this to the same efficiency.	190	* reduce this to the same efficiency.
188	*	191	*
189	* Check nrof variable *before* calling CAN_MERGE()	192	* Check nrof variable *before* calling can_merge()
190	*	193	*
191	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
192	* check weight	195	* check weight
193	*/	196	*/
194
195	bool object::can_merge (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
196	{	198	{
197	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
198	if ((ob1 == ob2) || (ob1->type != ob2->type))	200	if (ob1 == ob2
		201	|| ob1->type != ob2->type
		202	|| ob1->speed != ob2->speed
		203	|| ob1->value != ob2->value
		204	|| ob1->name != ob2->name)
199	return 0;	205	return 0;
200		206
201	if (ob1->speed != ob2->speed)	207	//TODO: this ain't working well, use nicer and correct overflow check
202	return 0;
203
204	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
205	* value could not be stored in a sint32 (which unfortunately sometimes is	209	* value could not be stored in a sint32 (which unfortunately sometimes is
206	* used to store nrof).	210	* used to store nrof).
207	*/	211	*/
208	if (ob1->nrof + ob2->nrof >= 1UL << 31)	212	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
218	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
219		223
220	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
221	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
222		226
223		227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
224	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	228	|| ob1->arch != ob2->arch
225	* being locked in inventory should prevent merging.
226	* 0x4 in flags3 is CLIENT_SENT
227	*/
228	if ((ob1->arch != ob2->arch) ||
229	(ob1->flags[0] != ob2->flags[0]) ||
230	(ob1->flags[1] != ob2->flags[1]) ||
231	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
232	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
233	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
234	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
235	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
236	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
237	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
238	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
239	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
240	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
241	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
242	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
243	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
244	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
245	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
246	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
247	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
248	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
249	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
250	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
251	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
252	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
253	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	249	|| ob1->move_off != ob2->move_off
		250	|| ob1->move_slow != ob2->move_slow
		251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
254	return 0;	252	return 0;
255		253
256	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
257	* check all objects in the inventory.	255	* check all objects in the inventory.
258	*/	256	*/
259	if (ob1->inv || ob2->inv)	257	if (ob1->inv || ob2->inv)
260	{	258	{
261	/* if one object has inventory but the other doesn't, not equiv */
262	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
263	return 0;
264
265	/* Now check to see if the two inventory objects could merge */
266	if (!CAN_MERGE (ob1->inv, ob2->inv))	259	if (!(ob1->inv && ob2->inv))
267	return 0;	260	return 0; /* inventories differ in length */
		261
		262	if (ob1->inv->below || ob2->inv->below)
		263	return 0; /* more than one object in inv */
		264
		265	if (!object::can_merge (ob1->inv, ob2->inv))
		266	return 0; /* inventory objexts differ */
268		267
269	/* 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
270	* if it is valid.	269	* if it is valid.
271	*/	270	*/
272	}	271	}
…		…
280		279
281	/* Note sure why the following is the case - either the object has to	280	/* Note sure why the following is the case - either the object has to
282	* be animated or have a very low speed. Is this an attempted monster	281	* be animated or have a very low speed. Is this an attempted monster
283	* check?	282	* check?
284	*/	283	*/
285	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
286	return 0;	285	return 0;
287		286
288	switch (ob1->type)	287	switch (ob1->type)
289	{	288	{
290	case SCROLL:	289	case SCROLL:
…		…
301	return 0;	300	return 0;
302	else if (!compare_ob_value_lists (ob1, ob2))	301	else if (!compare_ob_value_lists (ob1, ob2))
303	return 0;	302	return 0;
304	}	303	}
305		304
306	//TODO: generate an event or call into perl for additional checks
307	if (ob1->self || ob2->self)	305	if (ob1->self || ob2->self)
308	{	306	{
309	ob1->optimise ();	307	ob1->optimise ();
310	ob2->optimise ();	308	ob2->optimise ();
311		309
312	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)
313	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	}
314	}	322	}
315		323
316	/* Everything passes, must be OK. */	324	/* Everything passes, must be OK. */
317	return 1;	325	return 1;
318	}	326	}
…		…
326	sum_weight (object *op)	334	sum_weight (object *op)
327	{	335	{
328	long sum;	336	long sum;
329	object *inv;	337	object *inv;
330		338
331	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	339	for (sum = 0, inv = op->inv; inv; inv = inv->below)
332	{	340	{
333	if (inv->inv)	341	if (inv->inv)
334	sum_weight (inv);	342	sum_weight (inv);
		343
335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
336	}	345	}
337		346
338	if (op->type == CONTAINER && op->stats.Str)	347	if (op->type == CONTAINER && op->stats.Str)
339	sum = (sum * (100 - op->stats.Str)) / 100;	348	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
355	op = op->env;	364	op = op->env;
356	return op;	365	return op;
357	}	366	}
358		367
359	/*	368	/*
360	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
361	* a better check. We basically keeping traversing up until we can't
362	* or find a player.
363	*/
364
365	object *
366	is_player_inv (object *op)
367	{
368	for (; op != NULL && op->type != PLAYER; op = op->env)
369	if (op->env == op)
370	op->env = NULL;
371	return op;
372	}
373
374	/*
375	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	369	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
376	* Some error messages.	370	* Some error messages.
377	* The result of the dump is stored in the static global errmsg array.	371	* The result of the dump is stored in the static global errmsg array.
378	*/	372	*/
379		373	char *
380	void
381	dump_object2 (object *op)
382	{
383	errmsg[0] = 0;
384	return;
385	//TODO//D#d#
386	#if 0
387	char *cp;
388
389	/* object *tmp;*/
390
391	if (op->arch != NULL)
392	{
393	strcat (errmsg, "arch ");
394	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
395	strcat (errmsg, "\n");
396	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
397	strcat (errmsg, cp);
398	# if 0
399	/* Don't dump player diffs - they are too long, mostly meaningless, and
400	* will overflow the buffer.
401	* Changed so that we don't dump inventory either. This may
402	* also overflow the buffer.
403	*/
404	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
405	strcat (errmsg, cp);
406	for (tmp = op->inv; tmp; tmp = tmp->below)
407	dump_object2 (tmp);
408	# endif
409	strcat (errmsg, "end\n");
410	}
411	else
412	{
413	strcat (errmsg, "Object ");
414	if (op->name == NULL)
415	strcat (errmsg, "(null)");
416	else
417	strcat (errmsg, op->name);
418	strcat (errmsg, "\n");
419	# if 0
420	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
421	strcat (errmsg, cp);
422	for (tmp = op->inv; tmp; tmp = tmp->below)
423	dump_object2 (tmp);
424	# endif
425	strcat (errmsg, "end\n");
426	}
427	#endif
428	}
429
430	/*
431	* Dumps an object. Returns output in the static global errmsg array.
432	*/
433
434	void
435	dump_object (object *op)	374	dump_object (object *op)
436	{	375	{
437	if (op == NULL)	376	if (!op)
438	{	377	return strdup ("[NULLOBJ]");
439	strcpy (errmsg, "[NULL pointer]");
440	return;
441	}
442	errmsg[0] = '\0';
443	dump_object2 (op);
444	}
445		378
446	void	379	object_freezer freezer;
447	dump_all_objects (void)	380	op->write (freezer);
448	{	381	return freezer.as_string ();
449	object *op;
450
451	for (op = object::first; op != NULL; op = op->next)
452	{
453	dump_object (op);
454	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
455	}
456	}	382	}
457		383
458	/*	384	/*
459	* 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
460	* multi-object 1 which is closest to the second object.	386	* multi-object 1 which is closest to the second object.
461	* If it's not a multi-object, it is returned.	387	* If it's not a multi-object, it is returned.
462	*/	388	*/
463
464	object *	389	object *
465	get_nearest_part (object *op, const object *pl)	390	get_nearest_part (object *op, const object *pl)
466	{	391	{
467	object *tmp, *closest;	392	object *tmp, *closest;
468	int last_dist, i;	393	int last_dist, i;
…		…
476	}	401	}
477		402
478	/*	403	/*
479	* Returns the object which has the count-variable equal to the argument.	404	* Returns the object which has the count-variable equal to the argument.
480	*/	405	*/
481
482	object *	406	object *
483	find_object (tag_t i)	407	find_object (tag_t i)
484	{	408	{
485	object *op;	409	for_all_objects (op)
486
487	for (op = object::first; op != NULL; op = op->next)
488	if (op->count == i)	410	if (op->count == i)
489	break;
490	return op;	411	return op;
		412
		413	return 0;
491	}	414	}
492		415
493	/*	416	/*
494	* Returns the first object which has a name equal to the argument.	417	* Returns the first object which has a name equal to the argument.
495	* Used only by the patch command, but not all that useful.	418	* Used only by the patch command, but not all that useful.
496	* Enables features like "patch <name-of-other-player> food 999"	419	* Enables features like "patch <name-of-other-player> food 999"
497	*/	420	*/
498
499	object *	421	object *
500	find_object_name (const char *str)	422	find_object_name (const char *str)
501	{	423	{
502	shstr_cmp str_ (str);	424	shstr_cmp str_ (str);
503	object *op;	425	object *op;
504		426
505	for (op = object::first; op != NULL; op = op->next)	427	for_all_objects (op)
506	if (op->name == str_)	428	if (op->name == str_)
507	break;	429	break;
508		430
509	return op;	431	return op;
510	}	432	}
…		…
516	}	438	}
517		439
518	/*	440	/*
519	* 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
520	* skill and experience objects.	442	* skill and experience objects.
		443	* ACTUALLY NO! investigate! TODO
521	*/	444	*/
522	void	445	void
523	object::set_owner (object *owner)	446	object::set_owner (object *owner)
524	{	447	{
		448	// allow objects which own objects
525	if (!owner)	449	if (owner)
526	return;
527
528	/* next line added to allow objects which own objects */
529	/* Add a check for ownercounts in here, as I got into an endless loop
530	* with the fireball owning a poison cloud which then owned the
531	* fireball. I believe that was caused by one of the objects getting
532	* freed and then another object replacing it. Since the ownercounts
533	* didn't match, this check is valid and I believe that cause is valid.
534	*/
535	while (owner->owner)	450	while (owner->owner)
536	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	}
537		458
538	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;
539	}	526	}
540		527
541	/* Zero the key_values on op, decrementing the shared-string	528	/* Zero the key_values on op, decrementing the shared-string
542	* refcounts and freeing the links.	529	* refcounts and freeing the links.
543	*/	530	*/
544	static void	531	static void
545	free_key_values (object *op)	532	free_key_values (object *op)
546	{	533	{
547	for (key_value *i = op->key_values; i != 0;)	534	for (key_value *i = op->key_values; i; )
548	{	535	{
549	key_value *next = i->next;	536	key_value *next = i->next;
550	delete i;	537	delete i;
551		538
552	i = next;	539	i = next;
553	}	540	}
554		541
555	op->key_values = 0;	542	op->key_values = 0;
556	}	543	}
557		544
558	void object::clear ()	545	object &
		546	object::operator =(const object &src)
559	{	547	{
560	attachable_base::clear ();	548	bool is_freed = flag [FLAG_FREED];
		549	bool is_removed = flag [FLAG_REMOVED];
561		550
562	free_key_values (this);	551	*(object_copy *)this = src;
563		552
564	owner = 0;	553	flag [FLAG_FREED] = is_freed;
565	name = 0;	554	flag [FLAG_REMOVED] = is_removed;
566	name_pl = 0;
567	title = 0;
568	race = 0;
569	slaying = 0;
570	skill = 0;
571	msg = 0;
572	lore = 0;
573	custom_name = 0;
574	materialname = 0;
575	contr = 0;
576	below = 0;
577	above = 0;
578	inv = 0;
579	container = 0;
580	env = 0;
581	more = 0;
582	head = 0;
583	map = 0;
584	active_next = 0;
585	active_prev = 0;
586
587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
588
589	SET_FLAG (this, FLAG_REMOVED);
590
591	/* What is not cleared is next, prev, and count */
592
593	expmul = 1.0;
594	face = blank_face;
595
596	if (settings.casting_time)
597	casting_time = -1;
598	}
599
600	void object::clone (object *destination)
601	{
602	*(object_copy *)destination = *this;
603	*(object_pod *)destination = *this;
604
605	if (self || cb)
606	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
607	}
608
609	/*
610	* copy object first frees everything allocated by the second object,
611	* and then copies the contends of the first object into the second
612	* object, allocating what needs to be allocated. Basically, any
613	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
614	* if the first object is freed, the pointers in the new object
615	* will point at garbage.
616	*/
617	void
618	copy_object (object *op2, object *op)
619	{
620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
622
623	op2->clone (op);
624
625	if (is_freed)
626	SET_FLAG (op, FLAG_FREED);
627	if (is_removed)
628	SET_FLAG (op, FLAG_REMOVED);
629
630	if (op2->speed < 0)
631	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
632		555
633	/* Copy over key_values, if any. */	556	/* Copy over key_values, if any. */
634	if (op2->key_values)	557	if (src.key_values)
635	{	558	{
636	key_value *tail = 0;	559	key_value *tail = 0;
637	key_value *i;
638
639	op->key_values = 0;	560	key_values = 0;
640		561
641	for (i = op2->key_values; i; i = i->next)	562	for (key_value *i = src.key_values; i; i = i->next)
642	{	563	{
643	key_value *new_link = new key_value;	564	key_value *new_link = new key_value;
644		565
645	new_link->next = 0;	566	new_link->next = 0;
646	new_link->key = i->key;	567	new_link->key = i->key;
647	new_link->value = i->value;	568	new_link->value = i->value;
648		569
649	/* Try and be clever here, too. */	570	/* Try and be clever here, too. */
650	if (!op->key_values)	571	if (!key_values)
651	{	572	{
652	op->key_values = new_link;	573	key_values = new_link;
653	tail = new_link;	574	tail = new_link;
654	}	575	}
655	else	576	else
656	{	577	{
657	tail->next = new_link;	578	tail->next = new_link;
658	tail = new_link;	579	tail = new_link;
659	}	580	}
660	}	581	}
661	}	582	}
		583	}
662		584
663	update_ob_speed (op);	585	/*
		586	* copy_to first frees everything allocated by the dst object,
		587	* and then copies the contents of itself into the second
		588	* object, allocating what needs to be allocated. Basically, any
		589	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		590	* if the first object is freed, the pointers in the new object
		591	* will point at garbage.
		592	*/
		593	void
		594	object::copy_to (object *dst)
		595	{
		596	*dst = *this;
		597
		598	if (speed < 0)
		599	dst->speed_left -= rndm ();
		600
		601	dst->set_speed (dst->speed);
		602	}
		603
		604	void
		605	object::instantiate ()
		606	{
		607	if (!uuid.seq) // HACK
		608	uuid = gen_uuid ();
		609
		610	speed_left = -0.1f;
		611	/* copy the body_info to the body_used - this is only really
		612	* need for monsters, but doesn't hurt to do it for everything.
		613	* by doing so, when a monster is created, it has good starting
		614	* values for the body_used info, so when items are created
		615	* for it, they can be properly equipped.
		616	*/
		617	for (int i = NUM_BODY_LOCATIONS; i--; )
		618	slot[i].used = slot[i].info;
		619
		620	attachable::instantiate ();
		621	}
		622
		623	object *
		624	object::clone ()
		625	{
		626	object *neu = create ();
		627	copy_to (neu);
		628	return neu;
664	}	629	}
665		630
666	/*	631	/*
667	* If an object with the IS_TURNABLE() flag needs to be turned due	632	* If an object with the IS_TURNABLE() flag needs to be turned due
668	* to the closest player being on the other side, this function can	633	* to the closest player being on the other side, this function can
669	* be called to update the face variable, _and_ how it looks on the map.	634	* be called to update the face variable, _and_ how it looks on the map.
670	*/	635	*/
671
672	void	636	void
673	update_turn_face (object *op)	637	update_turn_face (object *op)
674	{	638	{
675	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	639	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
676	return;	640	return;
		641
677	SET_ANIMATION (op, op->direction);	642	SET_ANIMATION (op, op->direction);
678	update_object (op, UP_OBJ_FACE);	643	update_object (op, UP_OBJ_FACE);
679	}	644	}
680		645
681	/*	646	/*
682	* Updates the speed of an object. If the speed changes from 0 to another	647	* Updates the speed of an object. If the speed changes from 0 to another
683	* value, or vice versa, then add/remove the object from the active list.	648	* value, or vice versa, then add/remove the object from the active list.
684	* This function needs to be called whenever the speed of an object changes.	649	* This function needs to be called whenever the speed of an object changes.
685	*/	650	*/
686	void	651	void
687	update_ob_speed (object *op)	652	object::set_speed (float speed)
688	{	653	{
689	extern int arch_init;	654	if (flag [FLAG_FREED] && speed)
690
691	/* No reason putting the archetypes objects on the speed list,
692	* since they never really need to be updated.
693	*/
694
695	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
696	{	655	{
697	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	656	LOG (llevError, "Object %s is freed but has speed.\n", &name);
698	#ifdef MANY_CORES
699	abort ();
700	#else
701	op->speed = 0;	657	speed = 0;
702	#endif
703	}
704
705	if (arch_init)
706	return;
707
708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
709	{	658	}
710	/* If already on active list, don't do anything */
711	if (op->active_next || op->active_prev || op == active_objects)
712	return;
713		659
714	/* process_events() expects us to insert the object at the beginning	660	this->speed = speed;
715	* of the list. */
716	op->active_next = active_objects;
717		661
718	if (op->active_next != NULL)	662	if (has_active_speed ())
719	op->active_next->active_prev = op;	663	activate ();
720
721	active_objects = op;
722	}
723	else	664	else
724	{	665	deactivate ();
725	/* If not on the active list, nothing needs to be done */
726	if (!op->active_next && !op->active_prev && op != active_objects)
727	return;
728
729	if (op->active_prev == NULL)
730	{
731	active_objects = op->active_next;
732
733	if (op->active_next != NULL)
734	op->active_next->active_prev = NULL;
735	}
736	else
737	{
738	op->active_prev->active_next = op->active_next;
739
740	if (op->active_next)
741	op->active_next->active_prev = op->active_prev;
742	}
743
744	op->active_next = NULL;
745	op->active_prev = NULL;
746	}
747	}	666	}
748		667
749	/* This function removes object 'op' from the list of active
750	* objects.
751	* This should only be used for style maps or other such
752	* reference maps where you don't want an object that isn't
753	* in play chewing up cpu time getting processed.
754	* The reverse of this is to call update_ob_speed, which
755	* will do the right thing based on the speed of the object.
756	*/
757	void
758	remove_from_active_list (object *op)
759	{
760	/* If not on the active list, nothing needs to be done */
761	if (!op->active_next && !op->active_prev && op != active_objects)
762	return;
763
764	if (op->active_prev == NULL)
765	{
766	active_objects = op->active_next;
767	if (op->active_next != NULL)
768	op->active_next->active_prev = NULL;
769	}
770	else
771	{
772	op->active_prev->active_next = op->active_next;
773	if (op->active_next)
774	op->active_next->active_prev = op->active_prev;
775	}
776	op->active_next = NULL;
777	op->active_prev = NULL;
778	}
779
780	/*	668	/*
781	* update_object() updates the array which represents the map.	669	* update_object() updates the the map.
782	* It takes into account invisible objects (and represent squares covered	670	* It takes into account invisible objects (and represent squares covered
783	* by invisible objects by whatever is below them (unless it's another	671	* by invisible objects by whatever is below them (unless it's another
784	* invisible object, etc...)	672	* invisible object, etc...)
785	* If the object being updated is beneath a player, the look-window	673	* If the object being updated is beneath a player, the look-window
786	* of that player is updated (this might be a suboptimal way of	674	* of that player is updated (this might be a suboptimal way of
787	* updating that window, though, since update_object() is called _often_)	675	* updating that window, though, since update_object() is called _often_)
788	*	676	*
789	* action is a hint of what the caller believes need to be done.	677	* action is a hint of what the caller believes need to be done.
790	* For example, if the only thing that has changed is the face (due to
791	* an animation), we don't need to call update_position until that actually
792	* comes into view of a player. OTOH, many other things, like addition/removal
793	* of walls or living creatures may need us to update the flags now.
794	* current action are:	678	* current action are:
795	* UP_OBJ_INSERT: op was inserted	679	* UP_OBJ_INSERT: op was inserted
796	* UP_OBJ_REMOVE: op was removed	680	* UP_OBJ_REMOVE: op was removed
797	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	681	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
798	* as that is easier than trying to look at what may have changed.	682	* as that is easier than trying to look at what may have changed.
799	* UP_OBJ_FACE: only the objects face has changed.	683	* UP_OBJ_FACE: only the objects face has changed.
800	*/	684	*/
801
802	void	685	void
803	update_object (object *op, int action)	686	update_object (object *op, int action)
804	{	687	{
805	int update_now = 0, flags;
806	MoveType move_on, move_off, move_block, move_slow;
807
808	if (op == NULL)	688	if (op == NULL)
809	{	689	{
810	/* this should never happen */	690	/* this should never happen */
811	LOG (llevDebug, "update_object() called for NULL object.\n");	691	LOG (llevDebug, "update_object() called for NULL object.\n");
812	return;	692	return;
813	}	693	}
814		694
815	if (op->env != NULL)	695	if (op->env)
816	{	696	{
817	/* Animation is currently handled by client, so nothing	697	/* Animation is currently handled by client, so nothing
818	* to do in this case.	698	* to do in this case.
819	*/	699	*/
820	return;	700	return;
…		…
825	*/	705	*/
826	if (!op->map || op->map->in_memory == MAP_SAVING)	706	if (!op->map || op->map->in_memory == MAP_SAVING)
827	return;	707	return;
828		708
829	/* make sure the object is within map boundaries */	709	/* make sure the object is within map boundaries */
830	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	710	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
831	{	711	{
832	LOG (llevError, "update_object() called for object out of map!\n");	712	LOG (llevError, "update_object() called for object out of map!\n");
833	#ifdef MANY_CORES	713	#ifdef MANY_CORES
834	abort ();	714	abort ();
835	#endif	715	#endif
836	return;	716	return;
837	}	717	}
838		718
839	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	719	mapspace &m = op->ms ();
840	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
841	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
842	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
843	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
844	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
845		720
		721	if (!(m.flags_ & P_UPTODATE))
		722	/* nop */;
846	if (action == UP_OBJ_INSERT)	723	else if (action == UP_OBJ_INSERT)
847	{	724	{
		725	// this is likely overkill, TODO: revisit (schmorp)
848	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	726	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
849	update_now = 1;
850
851	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	727	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
852	update_now = 1;	728	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
853		729	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		730	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
854	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	731	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
855	update_now = 1;
856
857	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
858	update_now = 1;
859
860	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
861	update_now = 1;
862
863	if ((move_on | op->move_on) != move_on)	732	|| (m.move_on | op->move_on ) != m.move_on
864	update_now = 1;
865
866	if ((move_off | op->move_off) != move_off)	733	|| (m.move_off | op->move_off ) != m.move_off
867	update_now = 1;	734	|| (m.move_slow | op->move_slow) != m.move_slow
868
869	/* This isn't perfect, but I don't expect a lot of objects to	735	/* This isn't perfect, but I don't expect a lot of objects to
870	* to have move_allow right now.	736	* to have move_allow right now.
871	*/	737	*/
872	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	738	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
873	update_now = 1;	739	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
874		740	m.flags_ = 0;
875	if ((move_slow | op->move_slow) != move_slow)
876	update_now = 1;
877	}	741	}
878	/* if the object is being removed, we can't make intelligent	742	/* if the object is being removed, we can't make intelligent
879	* decisions, because remove_ob can't really pass the object	743	* decisions, because remove_ob can't really pass the object
880	* that is being removed.	744	* that is being removed.
881	*/	745	*/
882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	746	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
883	update_now = 1;	747	m.flags_ = 0;
884	else if (action == UP_OBJ_FACE)	748	else if (action == UP_OBJ_FACE)
885	/* Nothing to do for that case */ ;	749	/* Nothing to do for that case */ ;
886	else	750	else
887	LOG (llevError, "update_object called with invalid action: %d\n", action);	751	LOG (llevError, "update_object called with invalid action: %d\n", action);
888		752
889	if (update_now)
890	{
891	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
892	update_position (op->map, op->x, op->y);
893	}
894
895	if (op->more != NULL)	753	if (op->more)
896	update_object (op->more, action);	754	update_object (op->more, action);
897	}
898
899	object::vector object::mortals;
900	object::vector object::objects; // not yet used
901	object *object::first;
902
903	void object::free_mortals ()
904	{
905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
906	if ((*i)->refcnt)
907	++i; // further delay freeing
908	else
909	{
910	delete *i;
911	mortals.erase (i);
912	}
913
914	static int lastmortals = 0;//D
915
916	if (mortals.size() != lastmortals)//D
917	{
918	lastmortals = mortals.size ();//D
919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920	}
921	}	755	}
922		756
923	object::object ()	757	object::object ()
924	{	758	{
925	SET_FLAG (this, FLAG_REMOVED);	759	SET_FLAG (this, FLAG_REMOVED);
…		…
928	face = blank_face;	762	face = blank_face;
929	}	763	}
930		764
931	object::~object ()	765	object::~object ()
932	{	766	{
		767	unlink ();
		768
933	free_key_values (this);	769	free_key_values (this);
934	}	770	}
935		771
		772	static int object_count;
		773
936	void object::link ()	774	void object::link ()
937	{	775	{
938	count = ++ob_count;	776	assert (!index);//D
939	uuid = gen_uuid ();	777	uuid = gen_uuid ();
		778	count = ++object_count;
940		779
941	prev = 0;	780	refcnt_inc ();
942	next = object::first;	781	objects.insert (this);
943
944	if (object::first)
945	object::first->prev = this;
946
947	object::first = this;
948	}	782	}
949		783
950	void object::unlink ()	784	void object::unlink ()
951	{	785	{
952	//count = 0;//D	786	if (!index)
953	if (!prev && !next) return;//D	787	return;
954		788
955	if (this == object::first)	789	objects.erase (this);
956	object::first = next;	790	refcnt_dec ();
		791	}
957		792
958	/* Remove this object from the list of used objects */	793	void
959	if (prev) prev->next = next;	794	object::activate ()
960	if (next) next->prev = prev;	795	{
		796	/* If already on active list, don't do anything */
		797	if (active)
		798	return;
961		799
962	prev = 0;	800	if (has_active_speed ())
963	next = 0;	801	actives.insert (this);
		802	}
		803
		804	void
		805	object::activate_recursive ()
		806	{
		807	activate ();
		808
		809	for (object *op = inv; op; op = op->below)
		810	op->activate_recursive ();
		811	}
		812
		813	/* This function removes object 'op' from the list of active
		814	* objects.
		815	* This should only be used for style maps or other such
		816	* reference maps where you don't want an object that isn't
		817	* in play chewing up cpu time getting processed.
		818	* The reverse of this is to call update_ob_speed, which
		819	* will do the right thing based on the speed of the object.
		820	*/
		821	void
		822	object::deactivate ()
		823	{
		824	/* If not on the active list, nothing needs to be done */
		825	if (!active)
		826	return;
		827
		828	actives.erase (this);
		829	}
		830
		831	void
		832	object::deactivate_recursive ()
		833	{
		834	for (object *op = inv; op; op = op->below)
		835	op->deactivate_recursive ();
		836
		837	deactivate ();
		838	}
		839
		840	void
		841	object::set_flag_inv (int flag, int value)
		842	{
		843	for (object *op = inv; op; op = op->below)
		844	{
		845	op->flag [flag] = value;
		846	op->set_flag_inv (flag, value);
		847	}
		848	}
		849
		850	/*
		851	* Remove and free all objects in the inventory of the given object.
		852	* object.c ?
		853	*/
		854	void
		855	object::destroy_inv (bool drop_to_ground)
		856	{
		857	// need to check first, because the checks below might segfault
		858	// as we might be on an invalid mapspace and crossfire code
		859	// is too buggy to ensure that the inventory is empty.
		860	// corollary: if you create arrows etc. with stuff in tis inventory,
		861	// cf will crash below with off-map x and y
		862	if (!inv)
		863	return;
		864
		865	/* Only if the space blocks everything do we not process -
		866	* if some form of movement is allowed, let objects
		867	* drop on that space.
		868	*/
		869	if (!drop_to_ground
		870	|| !map
		871	|| map->in_memory != MAP_IN_MEMORY
		872	|| map->nodrop
		873	|| ms ().move_block == MOVE_ALL)
		874	{
		875	while (inv)
		876	{
		877	inv->destroy_inv (drop_to_ground);
		878	inv->destroy ();
		879	}
		880	}
		881	else
		882	{ /* Put objects in inventory onto this space */
		883	while (inv)
		884	{
		885	object *op = inv;
		886
		887	if (op->flag [FLAG_STARTEQUIP]
		888	|| op->flag [FLAG_NO_DROP]
		889	|| op->type == RUNE
		890	|| op->type == TRAP
		891	|| op->flag [FLAG_IS_A_TEMPLATE]
		892	|| op->flag [FLAG_DESTROY_ON_DEATH])
		893	op->destroy ();
		894	else
		895	map->insert (op, x, y);
		896	}
		897	}
964	}	898	}
965		899
966	object *object::create ()	900	object *object::create ()
967	{	901	{
968	object *op = new object;	902	object *op = new object;
969	op->link ();	903	op->link ();
970	return op;	904	return op;
971	}	905	}
972		906
973	/*	907	void
974	* free_object() frees everything allocated by an object, removes	908	object::do_destroy ()
975	* it from the list of used objects, and puts it on the list of
976	* free objects. The IS_FREED() flag is set in the object.
977	* The object must have been removed by remove_ob() first for
978	* this function to succeed.
979	*
980	* If free_inventory is set, free inventory as well. Else drop items in
981	* inventory to the ground.
982	*/
983	void object::free (bool free_inventory)
984	{	909	{
985	if (QUERY_FLAG (this, FLAG_FREED))	910	attachable::do_destroy ();
		911
		912	if (flag [FLAG_IS_LINKED])
		913	remove_button_link (this);
		914
		915	if (flag [FLAG_FRIENDLY])
		916	remove_friendly_object (this);
		917
		918	if (!flag [FLAG_REMOVED])
		919	remove ();
		920
		921	destroy_inv (true);
		922
		923	deactivate ();
		924	unlink ();
		925
		926	flag [FLAG_FREED] = 1;
		927
		928	// hack to ensure that freed objects still have a valid map
		929	{
		930	static maptile *freed_map; // freed objects are moved here to avoid crashes
		931
		932	if (!freed_map)
		933	{
		934	freed_map = new maptile;
		935
		936	freed_map->path = "<freed objects map>";
		937	freed_map->name = "/internal/freed_objects_map";
		938	freed_map->width = 3;
		939	freed_map->height = 3;
		940	freed_map->nodrop = 1;
		941
		942	freed_map->alloc ();
		943	freed_map->in_memory = MAP_IN_MEMORY;
		944	}
		945
		946	map = freed_map;
		947	x = 1;
		948	y = 1;
		949	}
		950
		951	if (more)
		952	{
		953	more->destroy ();
		954	more = 0;
		955	}
		956
		957	head = 0;
		958
		959	// clear those pointers that likely might cause circular references
		960	owner = 0;
		961	enemy = 0;
		962	attacked_by = 0;
		963	current_weapon = 0;
		964	}
		965
		966	void
		967	object::destroy (bool destroy_inventory)
		968	{
		969	if (destroyed ())
986	return;	970	return;
987		971
988	if (QUERY_FLAG (this, FLAG_FRIENDLY))	972	if (destroy_inventory)
989	remove_friendly_object (this);	973	destroy_inv (false);
990		974
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	975	if (is_head ())
992	remove_ob (this);	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
993		980
994	SET_FLAG (this, FLAG_FREED);	981	attachable::destroy ();
995
996	if (more)
997	{
998	more->free (free_inventory);
999	more = 0;
1000	}
1001
1002	if (inv)
1003	{
1004	/* Only if the space blocks everything do we not process -
1005	* if some form of movement is allowed, let objects
1006	* drop on that space.
1007	*/
1008	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1009	{
1010	object *op = inv;
1011
1012	while (op)
1013	{
1014	object *tmp = op->below;
1015	op->free (free_inventory);
1016	op = tmp;
1017	}
1018	}
1019	else
1020	{ /* Put objects in inventory onto this space */
1021	object *op = inv;
1022
1023	while (op)
1024	{
1025	object *tmp = op->below;
1026
1027	remove_ob (op);
1028
1029	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1030	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1031	free_object (op);
1032	else
1033	{
1034	op->x = x;
1035	op->y = y;
1036	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1037	}
1038
1039	op = tmp;
1040	}
1041	}
1042	}
1043
1044	// clear those pointers that likely might have circular references to us
1045	owner = 0;
1046	enemy = 0;
1047	attacked_by = 0;
1048
1049	/* Remove object from the active list */
1050	speed = 0;
1051	update_ob_speed (this);
1052
1053	unlink ();
1054
1055	mortals.push_back (this);
1056	}	982	}
1057		983
1058	/*	984	/*
1059	* sub_weight() recursively (outwards) subtracts a number from the	985	* sub_weight() recursively (outwards) subtracts a number from the
1060	* weight of an object (and what is carried by it's environment(s)).	986	* weight of an object (and what is carried by it's environment(s)).
1061	*/	987	*/
1062
1063	void	988	void
1064	sub_weight (object *op, signed long weight)	989	sub_weight (object *op, signed long weight)
1065	{	990	{
1066	while (op != NULL)	991	while (op != NULL)
1067	{	992	{
…		…
1071	op->carrying -= weight;	996	op->carrying -= weight;
1072	op = op->env;	997	op = op->env;
1073	}	998	}
1074	}	999	}
1075		1000
1076	/* remove_ob(op):	1001	/* op->remove ():
1077	* This function removes the object op from the linked list of objects	1002	* This function removes the object op from the linked list of objects
1078	* which it is currently tied to. When this function is done, the	1003	* which it is currently tied to. When this function is done, the
1079	* object will have no environment. If the object previously had an	1004	* object will have no environment. If the object previously had an
1080	* environment, the x and y coordinates will be updated to	1005	* environment, the x and y coordinates will be updated to
1081	* the previous environment.	1006	* the previous environment.
1082	* Beware: This function is called from the editor as well!
1083	*/	1007	*/
1084
1085	void	1008	void
1086	remove_ob (object *op)	1009	object::do_remove ()
1087	{	1010	{
1088	object *tmp, *last = 0;	1011	object *tmp, *last = 0;
1089	object *otmp;	1012	object *otmp;
1090		1013
1091	tag_t tag;
1092	int check_walk_off;
1093	mapstruct *m;
1094
1095	sint16 x, y;
1096
1097	if (QUERY_FLAG (op, FLAG_REMOVED))	1014	if (QUERY_FLAG (this, FLAG_REMOVED))
1098	return;	1015	return;
1099		1016
1100	SET_FLAG (op, FLAG_REMOVED);	1017	SET_FLAG (this, FLAG_REMOVED);
		1018	INVOKE_OBJECT (REMOVE, this);
1101		1019
1102	if (op->more != NULL)	1020	if (more)
1103	remove_ob (op->more);	1021	more->remove ();
1104		1022
1105	/*	1023	/*
1106	* In this case, the object to be removed is in someones	1024	* In this case, the object to be removed is in someones
1107	* inventory.	1025	* inventory.
1108	*/	1026	*/
1109	if (op->env != NULL)	1027	if (env)
1110	{	1028	{
1111	if (op->nrof)	1029	if (nrof)
1112	sub_weight (op->env, op->weight * op->nrof);	1030	sub_weight (env, weight * nrof);
1113	else	1031	else
1114	sub_weight (op->env, op->weight + op->carrying);	1032	sub_weight (env, weight + carrying);
1115		1033
1116	/* NO_FIX_PLAYER is set when a great many changes are being	1034	/* NO_FIX_PLAYER is set when a great many changes are being
1117	* made to players inventory. If set, avoiding the call	1035	* made to players inventory. If set, avoiding the call
1118	* to save cpu time.	1036	* to save cpu time.
1119	*/	1037	*/
1120	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1038	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1121	fix_player (otmp);	1039	otmp->update_stats ();
1122		1040
1123	if (op->above != NULL)	1041	if (above)
1124	op->above->below = op->below;	1042	above->below = below;
1125	else	1043	else
1126	op->env->inv = op->below;	1044	env->inv = below;
1127		1045
1128	if (op->below != NULL)	1046	if (below)
1129	op->below->above = op->above;	1047	below->above = above;
1130		1048
1131	/* we set up values so that it could be inserted into	1049	/* we set up values so that it could be inserted into
1132	* the map, but we don't actually do that - it is up	1050	* the map, but we don't actually do that - it is up
1133	* to the caller to decide what we want to do.	1051	* to the caller to decide what we want to do.
1134	*/	1052	*/
1135	op->x = op->env->x, op->y = op->env->y;	1053	x = env->x, y = env->y;
1136	op->map = op->env->map;	1054	map = env->map;
1137	op->above = NULL, op->below = NULL;	1055	above = 0, below = 0;
1138	op->env = NULL;	1056	env = 0;
1139	}	1057	}
1140	else if (op->map)	1058	else if (map)
1141	{	1059	{
1142	x = op->x;	1060	if (type == PLAYER)
1143	y = op->y;
1144	m = get_map_from_coord (op->map, &x, &y);
1145
1146	if (!m)
1147	{
1148	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1149	op->map->path, op->x, op->y);
1150	/* in old days, we used to set x and y to 0 and continue.
1151	* it seems if we get into this case, something is probablye
1152	* screwed up and should be fixed.
1153	*/
1154	abort ();
1155	}	1061	{
		1062	// leaving a spot always closes any open container on the ground
		1063	if (container && !container->env)
		1064	// this causes spurious floorbox updates, but it ensures
		1065	// that the CLOSE event is being sent.
		1066	close_container ();
1156		1067
1157	if (op->map != m)	1068	--map->players;
1158	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	1069	map->touch ();
1159	op->map->path, m->path, op->x, op->y, x, y);
1160
1161	/* Re did the following section of code - it looks like it had
1162	* lots of logic for things we no longer care about
1163	*/	1070	}
		1071
		1072	map->dirty = true;
		1073	mapspace &ms = this->ms ();
1164		1074
1165	/* link the object above us */	1075	/* link the object above us */
1166	if (op->above)	1076	if (above)
1167	op->above->below = op->below;	1077	above->below = below;
1168	else	1078	else
1169	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1079	ms.top = below; /* we were top, set new top */
1170		1080
1171	/* Relink the object below us, if there is one */	1081	/* Relink the object below us, if there is one */
1172	if (op->below)	1082	if (below)
1173	op->below->above = op->above;	1083	below->above = above;
1174	else	1084	else
1175	{	1085	{
1176	/* Nothing below, which means we need to relink map object for this space	1086	/* Nothing below, which means we need to relink map object for this space
1177	* use translated coordinates in case some oddness with map tiling is	1087	* use translated coordinates in case some oddness with map tiling is
1178	* evident	1088	* evident
1179	*/	1089	*/
1180	if (GET_MAP_OB (m, x, y) != op)	1090	if (GET_MAP_OB (map, x, y) != this)
1181	{
1182	dump_object (op);
1183	LOG (llevError,
1184	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1091	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1185	dump_object (GET_MAP_OB (m, x, y));	1092
1186	LOG (llevError, "%s\n", errmsg);	1093	ms.bot = above; /* goes on above it. */
1187	}	1094	}
1188		1095
1189	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1190	}
1191
1192	op->above = 0;	1096	above = 0;
1193	op->below = 0;	1097	below = 0;
1194		1098
1195	if (op->map->in_memory == MAP_SAVING)	1099	if (map->in_memory == MAP_SAVING)
1196	return;	1100	return;
1197		1101
1198	tag = op->count;	1102	int check_walk_off = !flag [FLAG_NO_APPLY];
1199	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1200		1103
1201	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	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
		1116	for (tmp = ms.bot; tmp; tmp = tmp->above)
1202	{	1117	{
1203	/* 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
1204	* being removed.	1119	* being removed.
1205	*/	1120	*/
1206		1121
1207	if (tmp->type == PLAYER && tmp != op)	1122	/* See if object moving off should effect something */
		1123	if (check_walk_off
		1124	&& ((move_type & tmp->move_off)
		1125	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1208	{	1126	{
1209	/* If a container that the player is currently using somehow gets	1127	move_apply (tmp, this, 0);
1210	* removed (most likely destroyed), update the player view
1211	* appropriately.
1212	*/
1213	if (tmp->container == op)
1214	{
1215	CLEAR_FLAG (op, FLAG_APPLIED);
1216	tmp->container = NULL;
1217	}
1218		1128
1219	tmp->contr->socket.update_look = 1;	1129	if (destroyed ())
		1130	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1220	}	1131	}
1221		1132
1222	/* See if player moving off should effect something */
1223	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224	{
1225	move_apply (tmp, op, NULL);
1226
1227	if (was_destroyed (op, tag))
1228	{
1229	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1230	}
1231	}
1232
1233	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1234
1235	if (tmp->above == tmp)
1236	tmp->above = NULL;
1237
1238	last = tmp;	1133	last = tmp;
1239	}	1134	}
1240		1135
1241	/* last == NULL of there are no objects on this space */	1136	/* last == NULL if there are no objects on this space */
		1137	//TODO: this makes little sense, why only update the topmost object?
1242	if (last == NULL)	1138	if (!last)
1243	{	1139	map->at (x, y).flags_ = 0;
1244	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1245	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1246	* those out anyways, and if there are any flags set right now, they won't
1247	* be correct anyways.
1248	*/
1249	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1250	update_position (op->map, op->x, op->y);
1251	}
1252	else	1140	else
1253	update_object (last, UP_OBJ_REMOVE);	1141	update_object (last, UP_OBJ_REMOVE);
1254		1142
1255	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1143	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1256	update_all_los (op->map, op->x, op->y);	1144	update_all_los (map, x, y);
1257	}	1145	}
1258	}	1146	}
1259		1147
1260	/*	1148	/*
1261	* merge_ob(op,top):	1149	* merge_ob(op,top):
…		…
1269	merge_ob (object *op, object *top)	1157	merge_ob (object *op, object *top)
1270	{	1158	{
1271	if (!op->nrof)	1159	if (!op->nrof)
1272	return 0;	1160	return 0;
1273		1161
1274	if (top == NULL)	1162	if (!top)
1275	for (top = op; top != NULL && top->above != NULL; top = top->above);	1163	for (top = op; top && top->above; top = top->above)
		1164	;
1276		1165
1277	for (; top != NULL; top = top->below)	1166	for (; top; top = top->below)
1278	{	1167	{
1279	if (top == op)	1168	if (top == op)
1280	continue;	1169	continue;
1281	if (CAN_MERGE (op, top))	1170
		1171	if (object::can_merge (op, top))
1282	{	1172	{
1283	top->nrof += op->nrof;	1173	top->nrof += op->nrof;
1284		1174
1285	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1175	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1286	op->weight = 0; /* Don't want any adjustements now */	1176	op->weight = 0; /* Don't want any adjustements now */
1287	remove_ob (op);	1177	op->destroy ();
1288	free_object (op);
1289	return top;	1178	return top;
1290	}	1179	}
1291	}	1180	}
1292		1181
1293	return 0;	1182	return 0;
1294	}	1183	}
1295		1184
		1185	void
		1186	object::expand_tail ()
		1187	{
		1188	if (more)
		1189	return;
		1190
		1191	object *prev = this;
		1192
		1193	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1194	{
		1195	object *op = arch_to_object (at);
		1196
		1197	op->name = name;
		1198	op->name_pl = name_pl;
		1199	op->title = title;
		1200
		1201	op->head = this;
		1202	prev->more = op;
		1203
		1204	prev = op;
		1205	}
		1206	}
		1207
1296	/*	1208	/*
1297	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1209	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1298	* job preparing multi-part monsters	1210	* job preparing multi-part monsters.
1299	*/	1211	*/
1300	object *	1212	object *
1301	insert_ob_in_map_at (object *op, mapstruct *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)
1302	{	1214	{
1303	object *tmp;
1304
1305	if (op->head)
1306	op = op->head;
1307
1308	for (tmp = op; tmp; tmp = tmp->more)	1215	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1309	{	1216	{
1310	tmp->x = x + tmp->arch->clone.x;	1217	tmp->x = x + tmp->arch->x;
1311	tmp->y = y + tmp->arch->clone.y;	1218	tmp->y = y + tmp->arch->y;
1312	}	1219	}
1313		1220
1314	return insert_ob_in_map (op, m, originator, flag);	1221	return insert_ob_in_map (op, m, originator, flag);
1315	}	1222	}
1316		1223
…		…
1332	* Return value:	1239	* Return value:
1333	* new object if 'op' was merged with other object	1240	* new object if 'op' was merged with other object
1334	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1335	* just 'op' otherwise	1242	* just 'op' otherwise
1336	*/	1243	*/
1337
1338	object *	1244	object *
1339	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1245	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1340	{	1246	{
		1247	assert (!op->flag [FLAG_FREED]);
		1248
1341	object *tmp, *top, *floor = NULL;	1249	object *top, *floor = NULL;
1342	sint16 x, y;
1343		1250
1344	if (QUERY_FLAG (op, FLAG_FREED))	1251	op->remove ();
1345	{
1346	LOG (llevError, "Trying to insert freed object!\n");
1347	return NULL;
1348	}
1349
1350	if (m == NULL)
1351	{
1352	dump_object (op);
1353	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1354	return op;
1355	}
1356
1357	if (out_of_map (m, op->x, op->y))
1358	{
1359	dump_object (op);
1360	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1361	#ifdef MANY_CORES
1362	/* Better to catch this here, as otherwise the next use of this object
1363	* is likely to cause a crash. Better to find out where it is getting
1364	* improperly inserted.
1365	*/
1366	abort ();
1367	#endif
1368	return op;
1369	}
1370
1371	if (!QUERY_FLAG (op, FLAG_REMOVED))
1372	{
1373	dump_object (op);
1374	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1375	return op;
1376	}
1377
1378	if (op->more != NULL)
1379	{
1380	/* The part may be on a different map. */
1381
1382	object *more = op->more;
1383
1384	/* We really need the caller to normalize coordinates - if
1385	* we set the map, that doesn't work if the location is within
1386	* a map and this is straddling an edge. So only if coordinate
1387	* is clear wrong do we normalize it.
1388	*/
1389	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1390	more->map = get_map_from_coord (m, &more->x, &more->y);
1391	else if (!more->map)
1392	{
1393	/* For backwards compatibility - when not dealing with tiled maps,
1394	* more->map should always point to the parent.
1395	*/
1396	more->map = m;
1397	}
1398
1399	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1400	{
1401	if (!op->head)
1402	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1403
1404	return NULL;
1405	}
1406	}
1407
1408	CLEAR_FLAG (op, FLAG_REMOVED);
1409		1252
1410	/* Ideally, the caller figures this out. However, it complicates a lot	1253	/* Ideally, the caller figures this out. However, it complicates a lot
1411	* 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
1412	* need extra work	1255	* need extra work
1413	*/	1256	*/
1414	op->map = get_map_from_coord (m, &op->x, &op->y);	1257	if (!xy_normalise (m, op->x, op->y))
1415	x = op->x;	1258	{
1416	y = op->y;	1259	op->destroy ();
		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);
		1268
		1269	op->map = m;
		1270	mapspace &ms = op->ms ();
1417		1271
1418	/* this has to be done after we translate the coordinates.	1272	/* this has to be done after we translate the coordinates.
1419	*/	1273	*/
1420	if (op->nrof && !(flag & INS_NO_MERGE))	1274	if (op->nrof && !(flag & INS_NO_MERGE))
1421	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1275	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1422	if (CAN_MERGE (op, tmp))	1276	if (object::can_merge (op, tmp))
1423	{	1277	{
1424	op->nrof += tmp->nrof;	1278	op->nrof += tmp->nrof;
1425	remove_ob (tmp);	1279	tmp->destroy ();
1426	free_object (tmp);
1427	}	1280	}
1428		1281
1429	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1282	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1430	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1283	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1431		1284
…		…
1444	op->below = originator->below;	1297	op->below = originator->below;
1445		1298
1446	if (op->below)	1299	if (op->below)
1447	op->below->above = op;	1300	op->below->above = op;
1448	else	1301	else
1449	SET_MAP_OB (op->map, op->x, op->y, op);	1302	ms.bot = op;
1450		1303
1451	/* since *below* originator, no need to update top */	1304	/* since *below* originator, no need to update top */
1452	originator->below = op;	1305	originator->below = op;
1453	}	1306	}
1454	else	1307	else
1455	{	1308	{
		1309	top = ms.bot;
		1310
1456	/* If there are other objects, then */	1311	/* If there are other objects, then */
1457	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1312	if (top)
1458	{	1313	{
1459	object *last = NULL;	1314	object *last = 0;
1460		1315
1461	/*	1316	/*
1462	* 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.
1463	* We've already dealt with merging if appropriate.	1318	* We've already dealt with merging if appropriate.
1464	* Generally, we want to put the new object on top. But if	1319	* Generally, we want to put the new object on top. But if
…		…
1468	* once we get to them. This reduces the need to traverse over all of	1323	* once we get to them. This reduces the need to traverse over all of
1469	* them when adding another one - this saves quite a bit of cpu time	1324	* them when adding another one - this saves quite a bit of cpu time
1470	* when lots of spells are cast in one area. Currently, it is presumed	1325	* when lots of spells are cast in one area. Currently, it is presumed
1471	* that flying non pickable objects are spell objects.	1326	* that flying non pickable objects are spell objects.
1472	*/	1327	*/
1473		1328	for (top = ms.bot; top; top = top->above)
1474	while (top != NULL)
1475	{	1329	{
1476	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1330	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1477	floor = top;	1331	floor = top;
1478		1332
1479	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1333	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1482	top = top->below;	1336	top = top->below;
1483	break;	1337	break;
1484	}	1338	}
1485		1339
1486	last = top;	1340	last = top;
1487	top = top->above;
1488	}	1341	}
1489		1342
1490	/* Don't want top to be NULL, so set it to the last valid object */	1343	/* Don't want top to be NULL, so set it to the last valid object */
1491	top = last;	1344	top = last;
1492		1345
…		…
1494	* looks like instead of lots of conditions here.	1347	* looks like instead of lots of conditions here.
1495	* makes things faster, and effectively the same result.	1348	* makes things faster, and effectively the same result.
1496	*/	1349	*/
1497		1350
1498	/* Have object 'fall below' other objects that block view.	1351	/* Have object 'fall below' other objects that block view.
1499	* Unless those objects are exits, type 66	1352	* Unless those objects are exits.
1500	* If INS_ON_TOP is used, don't do this processing	1353	* If INS_ON_TOP is used, don't do this processing
1501	* Need to find the object that in fact blocks view, otherwise	1354	* Need to find the object that in fact blocks view, otherwise
1502	* stacking is a bit odd.	1355	* stacking is a bit odd.
1503	*/	1356	*/
1504	if (!(flag & INS_ON_TOP) &&	1357	if (!(flag & INS_ON_TOP)
1505	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1358	&& ms.flags () & P_BLOCKSVIEW
		1359	&& (op->face && !faces [op->face].visibility))
1506	{	1360	{
1507	for (last = top; last != floor; last = last->below)	1361	for (last = top; last != floor; last = last->below)
1508	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1362	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1509	break;	1363	break;
		1364
1510	/* Check to see if we found the object that blocks view,	1365	/* Check to see if we found the object that blocks view,
1511	* and make sure we have a below pointer for it so that	1366	* and make sure we have a below pointer for it so that
1512	* we can get inserted below this one, which requires we	1367	* we can get inserted below this one, which requires we
1513	* set top to the object below us.	1368	* set top to the object below us.
1514	*/	1369	*/
1515	if (last && last->below && last != floor)	1370	if (last && last->below && last != floor)
1516	top = last->below;	1371	top = last->below;
1517	}	1372	}
1518	} /* If objects on this space */	1373	} /* If objects on this space */
1519		1374
1520	if (flag & INS_MAP_LOAD)
1521	top = GET_MAP_TOP (op->map, op->x, op->y);
1522
1523	if (flag & INS_ABOVE_FLOOR_ONLY)	1375	if (flag & INS_ABOVE_FLOOR_ONLY)
1524	top = floor;	1376	top = floor;
1525		1377
1526	/* 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.
1527	*/	1379	*/
1528		1380
1529	/* First object on this space */	1381	/* First object on this space */
1530	if (!top)	1382	if (!top)
1531	{	1383	{
1532	op->above = GET_MAP_OB (op->map, op->x, op->y);	1384	op->above = ms.bot;
1533		1385
1534	if (op->above)	1386	if (op->above)
1535	op->above->below = op;	1387	op->above->below = op;
1536		1388
1537	op->below = NULL;	1389	op->below = 0;
1538	SET_MAP_OB (op->map, op->x, op->y, op);	1390	ms.bot = op;
1539	}	1391	}
1540	else	1392	else
1541	{ /* get inserted into the stack above top */	1393	{ /* get inserted into the stack above top */
1542	op->above = top->above;	1394	op->above = top->above;
1543		1395
…		…
1546		1398
1547	op->below = top;	1399	op->below = top;
1548	top->above = op;	1400	top->above = op;
1549	}	1401	}
1550		1402
1551	if (op->above == NULL)	1403	if (!op->above)
1552	SET_MAP_TOP (op->map, op->x, op->y, op);	1404	ms.top = op;
1553	} /* else not INS_BELOW_ORIGINATOR */	1405	} /* else not INS_BELOW_ORIGINATOR */
1554		1406
1555	if (op->type == PLAYER)	1407	if (op->type == PLAYER)
		1408	{
1556	op->contr->do_los = 1;	1409	op->contr->do_los = 1;
		1410	++op->map->players;
		1411	op->map->touch ();
		1412	}
1557		1413
1558	/* If we have a floor, we know the player, if any, will be above	1414	op->map->dirty = true;
1559	* it, so save a few ticks and start from there.	1415
1560	*/	1416	if (object *pl = ms.player ())
1561	if (!(flag & INS_MAP_LOAD))	1417	pl->contr->ns->floorbox_update ();
1562	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1563	if (tmp->type == PLAYER)
1564	tmp->contr->socket.update_look = 1;
1565		1418
1566	/* If this object glows, it may affect lighting conditions that are	1419	/* If this object glows, it may affect lighting conditions that are
1567	* 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
1568	* 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
1569	* on the map will get recalculated. The players could very well	1422	* on the map will get recalculated. The players could very well
1570	* be far away from this change and not affected in any way -	1423	* be far away from this change and not affected in any way -
1571	* this should get redone to only look for players within range,	1424	* this should get redone to only look for players within range,
1572	* or just updating the P_NEED_UPDATE for spaces within this area	1425	* or just updating the P_UPTODATE for spaces within this area
1573	* of effect may be sufficient.	1426	* of effect may be sufficient.
1574	*/	1427	*/
1575	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1428	if (op->map->darkness && (op->glow_radius != 0))
1576	update_all_los (op->map, op->x, op->y);	1429	update_all_los (op->map, op->x, op->y);
1577		1430
1578	/* updates flags (blocked, alive, no magic, etc) for this map space */	1431	/* updates flags (blocked, alive, no magic, etc) for this map space */
1579	update_object (op, UP_OBJ_INSERT);	1432	update_object (op, UP_OBJ_INSERT);
1580		1433
		1434	INVOKE_OBJECT (INSERT, op);
		1435
1581	/* Don't know if moving this to the end will break anything. However,	1436	/* Don't know if moving this to the end will break anything. However,
1582	* we want to have update_look set above before calling this.	1437	* we want to have floorbox_update called before calling this.
1583	*	1438	*
1584	* check_move_on() must be after this because code called from	1439	* check_move_on() must be after this because code called from
1585	* check_move_on() depends on correct map flags (so functions like	1440	* check_move_on() depends on correct map flags (so functions like
1586	* blocked() and wall() work properly), and these flags are updated by	1441	* blocked() and wall() work properly), and these flags are updated by
1587	* update_object().	1442	* update_object().
1588	*/	1443	*/
1589		1444
1590	/* 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 */
1591	if (!(flag & INS_NO_WALK_ON) && !op->head)	1446	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1592	{	1447	{
1593	if (check_move_on (op, originator))	1448	if (check_move_on (op, originator))
1594	return NULL;	1449	return 0;
1595		1450
1596	/* 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
1597	* walk on's.	1452	* walk on's.
1598	*/	1453	*/
1599	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1454	for (object *tmp = op->more; tmp; tmp = tmp->more)
1600	if (check_move_on (tmp, originator))	1455	if (check_move_on (tmp, originator))
1601	return NULL;	1456	return 0;
1602	}	1457	}
1603		1458
1604	return op;	1459	return op;
1605	}	1460	}
1606		1461
1607	/* this function inserts an object in the map, but if it	1462	/* this function inserts an object in the map, but if it
1608	* finds an object of its own type, it'll remove that one first.	1463	* finds an object of its own type, it'll remove that one first.
1609	* op is the object to insert it under: supplies x and the map.	1464	* op is the object to insert it under: supplies x and the map.
1610	*/	1465	*/
1611	void	1466	void
1612	replace_insert_ob_in_map (const char *arch_string, object *op)	1467	replace_insert_ob_in_map (const char *arch_string, object *op)
1613	{	1468	{
1614	object *	1469	object *tmp, *tmp1;
1615	tmp;
1616	object *
1617	tmp1;
1618		1470
1619	/* first search for itself and remove any old instances */	1471	/* first search for itself and remove any old instances */
1620		1472
1621	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1473	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1622	{
1623	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1474	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1624	{	1475	tmp->destroy ();
1625	remove_ob (tmp);
1626	free_object (tmp);
1627	}
1628	}
1629		1476
1630	tmp1 = arch_to_object (find_archetype (arch_string));	1477	tmp1 = arch_to_object (archetype::find (arch_string));
1631		1478
1632	tmp1->x = op->x;	1479	tmp1->x = op->x;
1633	tmp1->y = op->y;	1480	tmp1->y = op->y;
1634	insert_ob_in_map (tmp1, op->map, op, 0);	1481	insert_ob_in_map (tmp1, op->map, op, 0);
		1482	}
		1483
		1484	object *
		1485	object::insert_at (object *where, object *originator, int flags)
		1486	{
		1487	return where->map->insert (this, where->x, where->y, originator, flags);
1635	}	1488	}
1636		1489
1637	/*	1490	/*
1638	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1639	* is returned contains nr objects, and the remaining parts contains	1492	* is returned contains nr objects, and the remaining parts contains
1640	* the rest (or is removed and freed if that number is 0).	1493	* the rest (or is removed and freed if that number is 0).
1641	* On failure, NULL is returned, and the reason put into the	1494	* On failure, NULL is returned, and the reason put into the
1642	* global static errmsg array.	1495	* global static errmsg array.
1643	*/	1496	*/
1644
1645	object *	1497	object *
1646	get_split_ob (object *orig_ob, uint32 nr)	1498	get_split_ob (object *orig_ob, uint32 nr)
1647	{	1499	{
1648	object *	1500	object *newob;
1649	newob;
1650	int
1651	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1501	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1652		1502
1653	if (orig_ob->nrof < nr)	1503	if (orig_ob->nrof < nr)
1654	{	1504	{
1655	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1505	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1656	return NULL;	1506	return NULL;
1657	}	1507	}
1658		1508
1659	newob = object_create_clone (orig_ob);	1509	newob = object_create_clone (orig_ob);
1660		1510
1661	if ((orig_ob->nrof -= nr) < 1)	1511	if ((orig_ob->nrof -= nr) < 1)
1662	{	1512	orig_ob->destroy (1);
1663	if (!is_removed)
1664	remove_ob (orig_ob);
1665	free_object2 (orig_ob, 1);
1666	}
1667	else if (!is_removed)	1513	else if (!is_removed)
1668	{	1514	{
1669	if (orig_ob->env != NULL)	1515	if (orig_ob->env != NULL)
1670	sub_weight (orig_ob->env, orig_ob->weight * nr);	1516	sub_weight (orig_ob->env, orig_ob->weight * nr);
1671	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1517	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1686	* the amount of an object. If the amount reaches 0, the object	1532	* the amount of an object. If the amount reaches 0, the object
1687	* is subsequently removed and freed.	1533	* is subsequently removed and freed.
1688	*	1534	*
1689	* Return value: 'op' if something is left, NULL if the amount reached 0	1535	* Return value: 'op' if something is left, NULL if the amount reached 0
1690	*/	1536	*/
1691
1692	object *	1537	object *
1693	decrease_ob_nr (object *op, uint32 i)	1538	decrease_ob_nr (object *op, uint32 i)
1694	{	1539	{
1695	object *tmp;	1540	object *tmp;
1696	player *pl;
1697		1541
1698	if (i == 0) /* objects with op->nrof require this check */	1542	if (i == 0) /* objects with op->nrof require this check */
1699	return op;	1543	return op;
1700		1544
1701	if (i > op->nrof)	1545	if (i > op->nrof)
1702	i = op->nrof;	1546	i = op->nrof;
1703		1547
1704	if (QUERY_FLAG (op, FLAG_REMOVED))	1548	if (QUERY_FLAG (op, FLAG_REMOVED))
1705	op->nrof -= i;	1549	op->nrof -= i;
1706	else if (op->env != NULL)	1550	else if (op->env)
1707	{	1551	{
1708	/* is this object in the players inventory, or sub container	1552	/* is this object in the players inventory, or sub container
1709	* therein?	1553	* therein?
1710	*/	1554	*/
1711	tmp = is_player_inv (op->env);	1555	tmp = op->in_player ();
1712	/* nope. Is this a container the player has opened?	1556	/* nope. Is this a container the player has opened?
1713	* If so, set tmp to that player.	1557	* If so, set tmp to that player.
1714	* IMO, searching through all the players will mostly	1558	* IMO, searching through all the players will mostly
1715	* likely be quicker than following op->env to the map,	1559	* likely be quicker than following op->env to the map,
1716	* and then searching the map for a player.	1560	* and then searching the map for a player.
1717	*/	1561	*/
1718	if (!tmp)	1562	if (!tmp)
1719	{	1563	for_all_players (pl)
1720	for (pl = first_player; pl; pl = pl->next)
1721	if (pl->ob->container == op->env)	1564	if (pl->ob->container == op->env)
		1565	{
		1566	tmp = pl->ob;
1722	break;	1567	break;
1723	if (pl)
1724	tmp = pl->ob;
1725	else
1726	tmp = NULL;
1727	}	1568	}
1728		1569
1729	if (i < op->nrof)	1570	if (i < op->nrof)
1730	{	1571	{
1731	sub_weight (op->env, op->weight * i);	1572	sub_weight (op->env, op->weight * i);
1732	op->nrof -= i;	1573	op->nrof -= i;
1733	if (tmp)	1574	if (tmp)
1734	{
1735	esrv_send_item (tmp, op);	1575	esrv_send_item (tmp, op);
1736	}
1737	}	1576	}
1738	else	1577	else
1739	{	1578	{
1740	remove_ob (op);	1579	op->remove ();
1741	op->nrof = 0;	1580	op->nrof = 0;
1742	if (tmp)	1581	if (tmp)
1743	{
1744	esrv_del_item (tmp->contr, op->count);	1582	esrv_del_item (tmp->contr, op->count);
1745	}
1746	}	1583	}
1747	}	1584	}
1748	else	1585	else
1749	{	1586	{
1750	object *above = op->above;	1587	object *above = op->above;
1751		1588
1752	if (i < op->nrof)	1589	if (i < op->nrof)
1753	op->nrof -= i;	1590	op->nrof -= i;
1754	else	1591	else
1755	{	1592	{
1756	remove_ob (op);	1593	op->remove ();
1757	op->nrof = 0;	1594	op->nrof = 0;
1758	}	1595	}
1759		1596
1760	/* Since we just removed op, op->above is null */	1597	/* Since we just removed op, op->above is null */
1761	for (tmp = above; tmp != NULL; tmp = tmp->above)	1598	for (tmp = above; tmp; tmp = tmp->above)
1762	if (tmp->type == PLAYER)	1599	if (tmp->type == PLAYER)
1763	{	1600	{
1764	if (op->nrof)	1601	if (op->nrof)
1765	esrv_send_item (tmp, op);	1602	esrv_send_item (tmp, op);
1766	else	1603	else
…		…
1770		1607
1771	if (op->nrof)	1608	if (op->nrof)
1772	return op;	1609	return op;
1773	else	1610	else
1774	{	1611	{
1775	free_object (op);	1612	op->destroy ();
1776	return NULL;	1613	return 0;
1777	}	1614	}
1778	}	1615	}
1779		1616
1780	/*	1617	/*
1781	* add_weight(object, weight) adds the specified weight to an object,	1618	* add_weight(object, weight) adds the specified weight to an object,
1782	* and also updates how much the environment(s) is/are carrying.	1619	* and also updates how much the environment(s) is/are carrying.
1783	*/	1620	*/
1784
1785	void	1621	void
1786	add_weight (object *op, signed long weight)	1622	add_weight (object *op, signed long weight)
1787	{	1623	{
1788	while (op != NULL)	1624	while (op != NULL)
1789	{	1625	{
…		…
1793	op->carrying += weight;	1629	op->carrying += weight;
1794	op = op->env;	1630	op = op->env;
1795	}	1631	}
1796	}	1632	}
1797		1633
		1634	object *
		1635	insert_ob_in_ob (object *op, object *where)
		1636	{
		1637	if (!where)
		1638	{
		1639	char *dump = dump_object (op);
		1640	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1641	free (dump);
		1642	return op;
		1643	}
		1644
		1645	if (where->head_ () != where)
		1646	{
		1647	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1648	where = where->head;
		1649	}
		1650
		1651	return where->insert (op);
		1652	}
		1653
1798	/*	1654	/*
1799	* insert_ob_in_ob(op,environment):	1655	* env->insert (op)
1800	* This function inserts the object op in the linked list	1656	* This function inserts the object op in the linked list
1801	* inside the object environment.	1657	* inside the object environment.
1802	*	1658	*
1803	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1804	* the inventory at the last position or next to other objects of the same
1805	* type.
1806	* Frank: Now sorted by type, archetype and magic!
1807	*
1808	* The function returns now pointer to inserted item, and return value can	1659	* The function returns now pointer to inserted item, and return value can
1809	* be != op, if items are merged. -Tero	1660	* be != op, if items are merged. -Tero
1810	*/	1661	*/
1811
1812	object *	1662	object *
1813	insert_ob_in_ob (object *op, object *where)	1663	object::insert (object *op)
1814	{	1664	{
1815	object *
1816	tmp, *
1817	otmp;
1818
1819	if (!QUERY_FLAG (op, FLAG_REMOVED))	1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1820	{	1666	op->remove ();
1821	dump_object (op);
1822	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1823	return op;
1824	}
1825
1826	if (where == NULL)
1827	{
1828	dump_object (op);
1829	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1830	return op;
1831	}
1832
1833	if (where->head)
1834	{
1835	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1836	where = where->head;
1837	}
1838		1667
1839	if (op->more)	1668	if (op->more)
1840	{	1669	{
1841	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1670	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1842	return op;	1671	return op;
1843	}	1672	}
1844		1673
1845	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1846	CLEAR_FLAG (op, FLAG_REMOVED);	1675	CLEAR_FLAG (op, FLAG_REMOVED);
		1676
1847	if (op->nrof)	1677	if (op->nrof)
1848	{	1678	{
1849	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1679	for (object *tmp = inv; tmp; tmp = tmp->below)
1850	if (CAN_MERGE (tmp, op))	1680	if (object::can_merge (tmp, op))
1851	{	1681	{
1852	/* return the original object and remove inserted object	1682	/* return the original object and remove inserted object
1853	(client needs the original object) */	1683	(client needs the original object) */
1854	tmp->nrof += op->nrof;	1684	tmp->nrof += op->nrof;
1855	/* Weight handling gets pretty funky. Since we are adding to	1685	/* Weight handling gets pretty funky. Since we are adding to
1856	* tmp->nrof, we need to increase the weight.	1686	* tmp->nrof, we need to increase the weight.
1857	*/	1687	*/
1858	add_weight (where, op->weight * op->nrof);	1688	add_weight (this, op->weight * op->nrof);
1859	SET_FLAG (op, FLAG_REMOVED);	1689	SET_FLAG (op, FLAG_REMOVED);
1860	free_object (op); /* free the inserted object */	1690	op->destroy (); /* free the inserted object */
1861	op = tmp;	1691	op = tmp;
1862	remove_ob (op); /* and fix old object's links */	1692	op->remove (); /* and fix old object's links */
1863	CLEAR_FLAG (op, FLAG_REMOVED);	1693	CLEAR_FLAG (op, FLAG_REMOVED);
1864	break;	1694	break;
1865	}	1695	}
1866		1696
1867	/* I assume combined objects have no inventory	1697	/* I assume combined objects have no inventory
1868	* We add the weight - this object could have just been removed	1698	* We add the weight - this object could have just been removed
1869	* (if it was possible to merge). calling remove_ob will subtract	1699	* (if it was possible to merge). calling remove_ob will subtract
1870	* the weight, so we need to add it in again, since we actually do	1700	* the weight, so we need to add it in again, since we actually do
1871	* the linking below	1701	* the linking below
1872	*/	1702	*/
1873	add_weight (where, op->weight * op->nrof);	1703	add_weight (this, op->weight * op->nrof);
1874	}	1704	}
1875	else	1705	else
1876	add_weight (where, (op->weight + op->carrying));	1706	add_weight (this, (op->weight + op->carrying));
1877		1707
1878	otmp = is_player_inv (where);	1708	if (object *otmp = this->in_player ())
1879	if (otmp && otmp->contr != NULL)
1880	{
1881	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1882	fix_player (otmp);	1710	otmp->update_stats ();
1883	}
1884		1711
		1712	op->owner = 0; // its his/hers now. period.
1885	op->map = NULL;	1713	op->map = 0;
1886	op->env = where;	1714	op->env = this;
1887	op->above = NULL;	1715	op->above = 0;
1888	op->below = NULL;	1716	op->below = 0;
1889	op->x = 0, op->y = 0;	1717	op->x = op->y = 0;
1890		1718
1891	/* 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 */
1892	if ((op->glow_radius != 0) && where->map)	1720	if (op->glow_radius && map)
1893	{	1721	{
1894	#ifdef DEBUG_LIGHTS	1722	#ifdef DEBUG_LIGHTS
1895	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);
1896	#endif /* DEBUG_LIGHTS */	1724	#endif /* DEBUG_LIGHTS */
1897	if (MAP_DARKNESS (where->map))	1725	if (map->darkness)
1898	update_all_los (where->map, where->x, where->y);	1726	update_all_los (map, x, y);
1899	}	1727	}
1900		1728
1901	/* Client has no idea of ordering so lets not bother ordering it here.	1729	/* Client has no idea of ordering so lets not bother ordering it here.
1902	* It sure simplifies this function...	1730	* It sure simplifies this function...
1903	*/	1731	*/
1904	if (where->inv == NULL)	1732	if (!inv)
1905	where->inv = op;	1733	inv = op;
1906	else	1734	else
1907	{	1735	{
1908	op->below = where->inv;	1736	op->below = inv;
1909	op->below->above = op;	1737	op->below->above = op;
1910	where->inv = op;	1738	inv = op;
1911	}	1739	}
		1740
		1741	INVOKE_OBJECT (INSERT, this);
		1742
1912	return op;	1743	return op;
1913	}	1744	}
1914		1745
1915	/*	1746	/*
1916	* Checks if any objects has a move_type that matches objects	1747	* Checks if any objects has a move_type that matches objects
…		…
1930	*	1761	*
1931	* MSW 2001-07-08: Check all objects on space, not just those below	1762	* MSW 2001-07-08: Check all objects on space, not just those below
1932	* object being inserted. insert_ob_in_map may not put new objects	1763	* object being inserted. insert_ob_in_map may not put new objects
1933	* on top.	1764	* on top.
1934	*/	1765	*/
1935
1936	int	1766	int
1937	check_move_on (object *op, object *originator)	1767	check_move_on (object *op, object *originator)
1938	{	1768	{
1939	object *	1769	object *tmp;
1940	tmp;	1770	maptile *m = op->map;
1941	tag_t
1942	tag;
1943	mapstruct *
1944	m = op->map;
1945	int
1946	x = op->x, y = op->y;	1771	int x = op->x, y = op->y;
1947		1772
1948	MoveType	1773	MoveType move_on, move_slow, move_block;
1949	move_on,
1950	move_slow,
1951	move_block;
1952		1774
1953	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1775	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1954	return 0;	1776	return 0;
1955
1956	tag = op->count;
1957		1777
1958	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1778	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1959	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1779	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1960	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1780	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1961		1781
…		…
1977		1797
1978	/* The objects have to be checked from top to bottom.	1798	/* The objects have to be checked from top to bottom.
1979	* Hence, we first go to the top:	1799	* Hence, we first go to the top:
1980	*/	1800	*/
1981		1801
1982	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1802	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1983	{	1803	{
1984	/* Trim the search when we find the first other spell effect	1804	/* Trim the search when we find the first other spell effect
1985	* this helps performance so that if a space has 50 spell objects,	1805	* this helps performance so that if a space has 50 spell objects,
1986	* we don't need to check all of them.	1806	* we don't need to check all of them.
1987	*/	1807	*/
…		…
2005	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1825	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2006	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1826	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2007	{	1827	{
2008		1828
2009	float	1829	float
2010	diff = tmp->move_slow_penalty * FABS (op->speed);	1830	diff = tmp->move_slow_penalty * fabs (op->speed);
2011		1831
2012	if (op->type == PLAYER)	1832	if (op->type == PLAYER)
2013	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1833	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2014	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1834	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2015	diff /= 4.0;	1835	diff /= 4.0;
…		…
2022	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1842	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2023	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1843	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2024	{	1844	{
2025	move_apply (tmp, op, originator);	1845	move_apply (tmp, op, originator);
2026		1846
2027	if (was_destroyed (op, tag))	1847	if (op->destroyed ())
2028	return 1;	1848	return 1;
2029		1849
2030	/* what the person/creature stepped onto has moved the object	1850	/* what the person/creature stepped onto has moved the object
2031	* someplace new. Don't process any further - if we did,	1851	* someplace new. Don't process any further - if we did,
2032	* have a feeling strange problems would result.	1852	* have a feeling strange problems would result.
…		…
2042	/*	1862	/*
2043	* present_arch(arch, map, x, y) searches for any objects with	1863	* present_arch(arch, map, x, y) searches for any objects with
2044	* a matching archetype at the given map and coordinates.	1864	* a matching archetype at the given map and coordinates.
2045	* The first matching object is returned, or NULL if none.	1865	* The first matching object is returned, or NULL if none.
2046	*/	1866	*/
2047
2048	object *	1867	object *
2049	present_arch (const archetype *at, mapstruct *m, int x, int y)	1868	present_arch (const archetype *at, maptile *m, int x, int y)
2050	{	1869	{
2051	object *
2052	tmp;
2053
2054	if (m == NULL || out_of_map (m, x, y))	1870	if (!m || out_of_map (m, x, y))
2055	{	1871	{
2056	LOG (llevError, "Present_arch called outside map.\n");	1872	LOG (llevError, "Present_arch called outside map.\n");
2057	return NULL;	1873	return NULL;
2058	}	1874	}
2059	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1875
		1876	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2060	if (tmp->arch == at)	1877	if (tmp->arch == at)
2061	return tmp;	1878	return tmp;
		1879
2062	return NULL;	1880	return NULL;
2063	}	1881	}
2064		1882
2065	/*	1883	/*
2066	* present(type, map, x, y) searches for any objects with	1884	* present(type, map, x, y) searches for any objects with
2067	* a matching type variable at the given map and coordinates.	1885	* a matching type variable at the given map and coordinates.
2068	* The first matching object is returned, or NULL if none.	1886	* The first matching object is returned, or NULL if none.
2069	*/	1887	*/
2070
2071	object *	1888	object *
2072	present (unsigned char type, mapstruct *m, int x, int y)	1889	present (unsigned char type, maptile *m, int x, int y)
2073	{	1890	{
2074	object *
2075	tmp;
2076
2077	if (out_of_map (m, x, y))	1891	if (out_of_map (m, x, y))
2078	{	1892	{
2079	LOG (llevError, "Present called outside map.\n");	1893	LOG (llevError, "Present called outside map.\n");
2080	return NULL;	1894	return NULL;
2081	}	1895	}
2082	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1896
		1897	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2083	if (tmp->type == type)	1898	if (tmp->type == type)
2084	return tmp;	1899	return tmp;
		1900
2085	return NULL;	1901	return NULL;
2086	}	1902	}
2087		1903
2088	/*	1904	/*
2089	* present_in_ob(type, object) searches for any objects with	1905	* present_in_ob(type, object) searches for any objects with
2090	* a matching type variable in the inventory of the given object.	1906	* a matching type variable in the inventory of the given object.
2091	* The first matching object is returned, or NULL if none.	1907	* The first matching object is returned, or NULL if none.
2092	*/	1908	*/
2093
2094	object *	1909	object *
2095	present_in_ob (unsigned char type, const object *op)	1910	present_in_ob (unsigned char type, const object *op)
2096	{	1911	{
2097	object *
2098	tmp;
2099
2100	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1912	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2101	if (tmp->type == type)	1913	if (tmp->type == type)
2102	return tmp;	1914	return tmp;
		1915
2103	return NULL;	1916	return NULL;
2104	}	1917	}
2105		1918
2106	/*	1919	/*
2107	* present_in_ob (type, str, object) searches for any objects with	1920	* present_in_ob (type, str, object) searches for any objects with
…		…
2115	* str is the string to match against. Note that we match against	1928	* str is the string to match against. Note that we match against
2116	* the object name, not the archetype name. this is so that the	1929	* the object name, not the archetype name. this is so that the
2117	* spell code can use one object type (force), but change it's name	1930	* spell code can use one object type (force), but change it's name
2118	* to be unique.	1931	* to be unique.
2119	*/	1932	*/
2120
2121	object *	1933	object *
2122	present_in_ob_by_name (int type, const char *str, const object *op)	1934	present_in_ob_by_name (int type, const char *str, const object *op)
2123	{	1935	{
2124	object *
2125	tmp;
2126
2127	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1936	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2128	{
2129	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1937	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2130	return tmp;	1938	return tmp;
2131	}	1939
2132	return NULL;	1940	return 0;
2133	}	1941	}
2134		1942
2135	/*	1943	/*
2136	* present_arch_in_ob(archetype, object) searches for any objects with	1944	* present_arch_in_ob(archetype, object) searches for any objects with
2137	* a matching archetype in the inventory of the given object.	1945	* a matching archetype in the inventory of the given object.
2138	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2139	*/	1947	*/
2140
2141	object *	1948	object *
2142	present_arch_in_ob (const archetype *at, const object *op)	1949	present_arch_in_ob (const archetype *at, const object *op)
2143	{	1950	{
2144	object *
2145	tmp;
2146
2147	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2148	if (tmp->arch == at)	1952	if (tmp->arch == at)
2149	return tmp;	1953	return tmp;
		1954
2150	return NULL;	1955	return NULL;
2151	}	1956	}
2152		1957
2153	/*	1958	/*
2154	* activate recursively a flag on an object inventory	1959	* activate recursively a flag on an object inventory
2155	*/	1960	*/
2156	void	1961	void
2157	flag_inv (object *op, int flag)	1962	flag_inv (object *op, int flag)
2158	{	1963	{
2159	object *
2160	tmp;
2161
2162	if (op->inv)
2163	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1964	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2164	{	1965	{
2165	SET_FLAG (tmp, flag);	1966	SET_FLAG (tmp, flag);
2166	flag_inv (tmp, flag);	1967	flag_inv (tmp, flag);
2167	}	1968	}
2168	} /*	1969	}
		1970
		1971	/*
2169	* desactivate recursively a flag on an object inventory	1972	* deactivate recursively a flag on an object inventory
2170	*/	1973	*/
2171	void	1974	void
2172	unflag_inv (object *op, int flag)	1975	unflag_inv (object *op, int flag)
2173	{	1976	{
2174	object *
2175	tmp;
2176
2177	if (op->inv)
2178	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1977	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2179	{	1978	{
2180	CLEAR_FLAG (tmp, flag);	1979	CLEAR_FLAG (tmp, flag);
2181	unflag_inv (tmp, flag);	1980	unflag_inv (tmp, flag);
2182	}	1981	}
2183	}
2184
2185	/*
2186	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2187	* all it's inventory (recursively).
2188	* If checksums are used, a player will get set_cheat called for
2189	* him/her-self and all object carried by a call to this function.
2190	*/
2191
2192	void
2193	set_cheat (object *op)
2194	{
2195	SET_FLAG (op, FLAG_WAS_WIZ);
2196	flag_inv (op, FLAG_WAS_WIZ);
2197	}	1982	}
2198		1983
2199	/*	1984	/*
2200	* 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
2201	* 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
…		…
2203	* to search (see the freearr_x/y[] definition).	1988	* to search (see the freearr_x/y[] definition).
2204	* It returns a random choice among the alternatives found.	1989	* It returns a random choice among the alternatives found.
2205	* 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
2206	* does all 4 immediate directions). This returns the index into the	1991	* does all 4 immediate directions). This returns the index into the
2207	* 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)
2208	* Note - this only checks to see if there is space for the head of the
2209	* object - if it is a multispace object, this should be called for all
2210	* pieces.
2211	* Note2: This function does correctly handle tiled maps, but does not	1993	* Note: This function does correctly handle tiled maps, but does not
2212	* inform the caller. However, insert_ob_in_map will update as	1994	* inform the caller. However, insert_ob_in_map will update as
2213	* 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.
2214	* 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
2215	* 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
2216	* 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
2217	* the archetype because that isn't correct if the monster has been	1999	* the archetype because that isn't correct if the monster has been
2218	* customized, changed states, etc.	2000	* customized, changed states, etc.
2219	*/	2001	*/
2220
2221	int	2002	int
2222	find_free_spot (const object *ob, mapstruct *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)
2223	{	2004	{
2224	int
2225	i,
2226	index = 0, flag;
2227	static int
2228	altern[SIZEOFFREE];	2005	int altern[SIZEOFFREE];
		2006	int index = 0, flag;
2229		2007
2230	for (i = start; i < stop; i++)	2008	for (int i = start; i < stop; i++)
2231	{	2009	{
2232	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2010	mapxy pos (m, x, y); pos.move (i);
2233	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	{
2234	altern[index++] = i;	2026	altern [index++] = i;
		2027	continue;
		2028	}
2235		2029
2236	/* 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.
2237	* 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.
2238	* 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 -
2239	* 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
2240	* 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
2241	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
2242	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
2243	*/	2037	*/
2244	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2038	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2039	{
2245	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;
2246	}	2054	}
		2055
2247	if (!index)	2056	if (!index)
2248	return -1;	2057	return -1;
		2058
2249	return altern[RANDOM () % index];	2059	return altern [rndm (index)];
2250	}	2060	}
2251		2061
2252	/*	2062	/*
2253	* find_first_free_spot(archetype, mapstruct, x, y) works like	2063	* find_first_free_spot(archetype, maptile, x, y) works like
2254	* find_free_spot(), but it will search max number of squares.	2064	* find_free_spot(), but it will search max number of squares.
2255	* But it will return the first available spot, not a random choice.	2065	* But it will return the first available spot, not a random choice.
2256	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2066	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2257	*/	2067	*/
2258
2259	int	2068	int
2260	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2069	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2261	{	2070	{
2262	int
2263	i;
2264
2265	for (i = 0; i < SIZEOFFREE; i++)	2071	for (int i = 0; i < SIZEOFFREE; i++)
2266	{
2267	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]))
2268	return i;	2073	return i;
2269	}	2074
2270	return -1;	2075	return -1;
2271	}	2076	}
2272		2077
2273	/*	2078	/*
2274	* The function permute(arr, begin, end) randomly reorders the array	2079	* The function permute(arr, begin, end) randomly reorders the array
2275	* arr[begin..end-1].	2080	* arr[begin..end-1].
		2081	* now uses a fisher-yates shuffle, old permute was broken
2276	*/	2082	*/
2277	static void	2083	static void
2278	permute (int *arr, int begin, int end)	2084	permute (int *arr, int begin, int end)
2279	{	2085	{
2280	int	2086	arr += begin;
2281	i,
2282	j,
2283	tmp,
2284	len;
2285
2286	len = end - begin;	2087	end -= begin;
2287	for (i = begin; i < end; i++)
2288	{
2289	j = begin + RANDOM () % len;
2290		2088
2291	tmp = arr[i];	2089	while (--end)
2292	arr[i] = arr[j];	2090	swap (arr [end], arr [rndm (end + 1)]);
2293	arr[j] = tmp;
2294	}
2295	}	2091	}
2296		2092
2297	/* new function to make monster searching more efficient, and effective!	2093	/* new function to make monster searching more efficient, and effective!
2298	* This basically returns a randomized array (in the passed pointer) of	2094	* This basically returns a randomized array (in the passed pointer) of
2299	* the spaces to find monsters. In this way, it won't always look for	2095	* the spaces to find monsters. In this way, it won't always look for
…		…
2302	* the 3x3 area will be searched, just not in a predictable order.	2098	* the 3x3 area will be searched, just not in a predictable order.
2303	*/	2099	*/
2304	void	2100	void
2305	get_search_arr (int *search_arr)	2101	get_search_arr (int *search_arr)
2306	{	2102	{
2307	int	2103	int i;
2308	i;
2309		2104
2310	for (i = 0; i < SIZEOFFREE; i++)	2105	for (i = 0; i < SIZEOFFREE; i++)
2311	{
2312	search_arr[i] = i;	2106	search_arr[i] = i;
2313	}
2314		2107
2315	permute (search_arr, 1, SIZEOFFREE1 + 1);	2108	permute (search_arr, 1, SIZEOFFREE1 + 1);
2316	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2109	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2317	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2110	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2318	}	2111	}
…		…
2327	* Perhaps incorrectly, but I'm making the assumption that exclude	2120	* Perhaps incorrectly, but I'm making the assumption that exclude
2328	* is actually want is going to try and move there. We need this info	2121	* is actually want is going to try and move there. We need this info
2329	* because we have to know what movement the thing looking to move	2122	* because we have to know what movement the thing looking to move
2330	* there is capable of.	2123	* there is capable of.
2331	*/	2124	*/
2332
2333	int	2125	int
2334	find_dir (mapstruct *m, int x, int y, object *exclude)	2126	find_dir (maptile *m, int x, int y, object *exclude)
2335	{	2127	{
2336	int
2337	i,
2338	max = SIZEOFFREE, mflags;	2128	int i, max = SIZEOFFREE, mflags;
2339		2129
2340	sint16 nx, ny;	2130	sint16 nx, ny;
2341	object *	2131	object *tmp;
2342	tmp;	2132	maptile *mp;
2343	mapstruct *
2344	mp;
2345		2133
2346	MoveType blocked, move_type;	2134	MoveType blocked, move_type;
2347		2135
2348	if (exclude && exclude->head)	2136	if (exclude && exclude->head_ () != exclude)
2349	{	2137	{
2350	exclude = exclude->head;	2138	exclude = exclude->head;
2351	move_type = exclude->move_type;	2139	move_type = exclude->move_type;
2352	}	2140	}
2353	else	2141	else
…		…
2361	mp = m;	2149	mp = m;
2362	nx = x + freearr_x[i];	2150	nx = x + freearr_x[i];
2363	ny = y + freearr_y[i];	2151	ny = y + freearr_y[i];
2364		2152
2365	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2153	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2154
2366	if (mflags & P_OUT_OF_MAP)	2155	if (mflags & P_OUT_OF_MAP)
2367	{
2368	max = maxfree[i];	2156	max = maxfree[i];
2369	}
2370	else	2157	else
2371	{	2158	{
2372	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2159	mapspace &ms = mp->at (nx, ny);
		2160
		2161	blocked = ms.move_block;
2373		2162
2374	if ((move_type & blocked) == move_type)	2163	if ((move_type & blocked) == move_type)
2375	{
2376	max = maxfree[i];	2164	max = maxfree[i];
2377	}
2378	else if (mflags & P_IS_ALIVE)	2165	else if (mflags & P_IS_ALIVE)
2379	{	2166	{
2380	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2167	for (tmp = ms.bot; tmp; tmp = tmp->above)
2381	{	2168	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2382	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2169	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2383	{
2384	break;	2170	break;
2385	}	2171
2386	}
2387	if (tmp)	2172	if (tmp)
2388	{
2389	return freedir[i];	2173	return freedir[i];
2390	}
2391	}	2174	}
2392	}	2175	}
2393	}	2176	}
		2177
2394	return 0;	2178	return 0;
2395	}	2179	}
2396		2180
2397	/*	2181	/*
2398	* distance(object 1, object 2) will return the square of the	2182	* distance(object 1, object 2) will return the square of the
2399	* distance between the two given objects.	2183	* distance between the two given objects.
2400	*/	2184	*/
2401
2402	int	2185	int
2403	distance (const object *ob1, const object *ob2)	2186	distance (const object *ob1, const object *ob2)
2404	{	2187	{
2405	int
2406	i;
2407
2408	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2188	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2409	return i;
2410	}	2189	}
2411		2190
2412	/*	2191	/*
2413	* find_dir_2(delta-x,delta-y) will return a direction in which	2192	* find_dir_2(delta-x,delta-y) will return a direction in which
2414	* an object which has subtracted the x and y coordinates of another	2193	* an object which has subtracted the x and y coordinates of another
2415	* object, needs to travel toward it.	2194	* object, needs to travel toward it.
2416	*/	2195	*/
2417
2418	int	2196	int
2419	find_dir_2 (int x, int y)	2197	find_dir_2 (int x, int y)
2420	{	2198	{
2421	int	2199	int q;
2422	q;
2423		2200
2424	if (y)	2201	if (y)
2425	q = x * 100 / y;	2202	q = x * 100 / y;
2426	else if (x)	2203	else if (x)
2427	q = -300 * x;	2204	q = -300 * x;
…		…
2452		2229
2453	return 3;	2230	return 3;
2454	}	2231	}
2455		2232
2456	/*	2233	/*
2457	* absdir(int): Returns a number between 1 and 8, which represent
2458	* the "absolute" direction of a number (it actually takes care of
2459	* "overflow" in previous calculations of a direction).
2460	*/
2461
2462	int
2463	absdir (int d)
2464	{
2465	while (d < 1)
2466	d += 8;
2467	while (d > 8)
2468	d -= 8;
2469	return d;
2470	}
2471
2472	/*
2473	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2234	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2474	* between two directions (which are expected to be absolute (see absdir())	2235	* between two directions (which are expected to be absolute (see absdir())
2475	*/	2236	*/
2476
2477	int	2237	int
2478	dirdiff (int dir1, int dir2)	2238	dirdiff (int dir1, int dir2)
2479	{	2239	{
2480	int	2240	int d;
2481	d;
2482		2241
2483	d = abs (dir1 - dir2);	2242	d = abs (dir1 - dir2);
2484	if (d > 4)	2243	if (d > 4)
2485	d = 8 - d;	2244	d = 8 - d;
		2245
2486	return d;	2246	return d;
2487	}	2247	}
2488		2248
2489	/* peterm:	2249	/* peterm:
2490	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2250	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2493	* This basically means that if direction is 15, then it could either go	2253	* This basically means that if direction is 15, then it could either go
2494	* direction 4, 14, or 16 to get back to where we are.	2254	* direction 4, 14, or 16 to get back to where we are.
2495	* Moved from spell_util.c to object.c with the other related direction	2255	* Moved from spell_util.c to object.c with the other related direction
2496	* functions.	2256	* functions.
2497	*/	2257	*/
2498
2499	int
2500	reduction_dir[SIZEOFFREE][3] = {	2258	int reduction_dir[SIZEOFFREE][3] = {
2501	{0, 0, 0}, /* 0 */	2259	{0, 0, 0}, /* 0 */
2502	{0, 0, 0}, /* 1 */	2260	{0, 0, 0}, /* 1 */
2503	{0, 0, 0}, /* 2 */	2261	{0, 0, 0}, /* 2 */
2504	{0, 0, 0}, /* 3 */	2262	{0, 0, 0}, /* 3 */
2505	{0, 0, 0}, /* 4 */	2263	{0, 0, 0}, /* 4 */
…		…
2553	* find a path to that monster that we found. If not,	2311	* find a path to that monster that we found. If not,
2554	* we don't bother going toward it. Returns 1 if we	2312	* we don't bother going toward it. Returns 1 if we
2555	* can see a direct way to get it	2313	* can see a direct way to get it
2556	* Modified to be map tile aware -.MSW	2314	* Modified to be map tile aware -.MSW
2557	*/	2315	*/
2558
2559
2560	int	2316	int
2561	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2317	can_see_monsterP (maptile *m, int x, int y, int dir)
2562	{	2318	{
2563	sint16 dx, dy;	2319	sint16 dx, dy;
2564	int
2565	mflags;	2320	int mflags;
2566		2321
2567	if (dir < 0)	2322	if (dir < 0)
2568	return 0; /* exit condition: invalid direction */	2323	return 0; /* exit condition: invalid direction */
2569		2324
2570	dx = x + freearr_x[dir];	2325	dx = x + freearr_x[dir];
…		…
2583	return 0;	2338	return 0;
2584		2339
2585	/* yes, can see. */	2340	/* yes, can see. */
2586	if (dir < 9)	2341	if (dir < 9)
2587	return 1;	2342	return 1;
		2343
2588	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2344	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2589	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2345	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2346	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2590	}	2347	}
2591
2592
2593		2348
2594	/*	2349	/*
2595	* can_pick(picker, item): finds out if an object is possible to be	2350	* can_pick(picker, item): finds out if an object is possible to be
2596	* picked up by the picker. Returnes 1 if it can be	2351	* picked up by the picker. Returnes 1 if it can be
2597	* picked up, otherwise 0.	2352	* picked up, otherwise 0.
…		…
2599	* 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
2600	* core dumps if they do.	2355	* core dumps if they do.
2601	*	2356	*
2602	* 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)
2603	*/	2358	*/
2604
2605	int	2359	int
2606	can_pick (const object *who, const object *item)	2360	can_pick (const object *who, const object *item)
2607	{	2361	{
2608	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2362	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2609	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2363	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2610	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2364	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2611	}	2365	}
2612		2366
2613
2614	/*	2367	/*
2615	* create clone from object to another	2368	* create clone from object to another
2616	*/	2369	*/
2617	object *	2370	object *
2618	object_create_clone (object *asrc)	2371	object_create_clone (object *asrc)
2619	{	2372	{
2620	object *
2621	dst = NULL, *tmp, *src, *part, *prev, *item;	2373	object *dst = 0, *tmp, *src, *prev, *item;
2622		2374
2623	if (!asrc)	2375	if (!asrc)
2624	return NULL;	2376	return 0;
2625	src = asrc;	2377
2626	if (src->head)
2627	src = src->head;	2378	src = asrc->head_ ();
2628		2379
2629	prev = NULL;	2380	prev = 0;
2630	for (part = src; part; part = part->more)	2381	for (object *part = src; part; part = part->more)
2631	{	2382	{
2632	tmp = get_object ();	2383	tmp = part->clone ();
2633	copy_object (part, tmp);
2634	tmp->x -= src->x;	2384	tmp->x -= src->x;
2635	tmp->y -= src->y;	2385	tmp->y -= src->y;
		2386
2636	if (!part->head)	2387	if (!part->head)
2637	{	2388	{
2638	dst = tmp;	2389	dst = tmp;
2639	tmp->head = NULL;	2390	tmp->head = 0;
2640	}	2391	}
2641	else	2392	else
2642	{
2643	tmp->head = dst;	2393	tmp->head = dst;
2644	}	2394
2645	tmp->more = NULL;	2395	tmp->more = 0;
		2396
2646	if (prev)	2397	if (prev)
2647	prev->more = tmp;	2398	prev->more = tmp;
		2399
2648	prev = tmp;	2400	prev = tmp;
2649	}	2401	}
2650		2402
2651	/*** copy inventory ***/
2652	for (item = src->inv; item; item = item->below)	2403	for (item = src->inv; item; item = item->below)
2653	{
2654	(void) insert_ob_in_ob (object_create_clone (item), dst);	2404	insert_ob_in_ob (object_create_clone (item), dst);
2655	}
2656		2405
2657	return dst;	2406	return dst;
2658	}
2659
2660	/* return true if the object was destroyed, 0 otherwise */
2661	int
2662	was_destroyed (const object *op, tag_t old_tag)
2663	{
2664	/* checking for FLAG_FREED isn't necessary, but makes this function more
2665	* robust */
2666	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2667	}
2668
2669	/* GROS - Creates an object using a string representing its content. */
2670
2671	/* Basically, we save the content of the string to a temp file, then call */
2672
2673	/* load_object on it. I admit it is a highly inefficient way to make things, */
2674
2675	/* but it was simple to make and allows reusing the load_object function. */
2676
2677	/* Remember not to use load_object_str in a time-critical situation. */
2678
2679	/* Also remember that multiparts objects are not supported for now. */
2680
2681	object *
2682	load_object_str (const char *obstr)
2683	{
2684	object *
2685	op;
2686	char
2687	filename[MAX_BUF];
2688
2689	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2690
2691	FILE *
2692	tempfile = fopen (filename, "w");
2693
2694	if (tempfile == NULL)
2695	{
2696	LOG (llevError, "Error - Unable to access load object temp file\n");
2697	return NULL;
2698	}
2699
2700	fprintf (tempfile, obstr);
2701	fclose (tempfile);
2702
2703	op = get_object ();
2704
2705	object_thawer thawer (filename);
2706
2707	if (thawer)
2708	load_object (thawer, op, 0);
2709
2710	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2711	CLEAR_FLAG (op, FLAG_REMOVED);
2712
2713	return op;
2714	}	2407	}
2715		2408
2716	/* This returns the first object in who's inventory that	2409	/* This returns the first object in who's inventory that
2717	* has the same type and subtype match.	2410	* has the same type and subtype match.
2718	* returns NULL if no match.	2411	* returns NULL if no match.
2719	*/	2412	*/
2720	object *	2413	object *
2721	find_obj_by_type_subtype (const object *who, int type, int subtype)	2414	find_obj_by_type_subtype (const object *who, int type, int subtype)
2722	{	2415	{
2723	object *
2724	tmp;
2725
2726	for (tmp = who->inv; tmp; tmp = tmp->below)	2416	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2727	if (tmp->type == type && tmp->subtype == subtype)	2417	if (tmp->type == type && tmp->subtype == subtype)
2728	return tmp;	2418	return tmp;
2729		2419
2730	return NULL;	2420	return 0;
2731	}	2421	}
2732		2422
2733	/* If ob has a field named key, return the link from the list,	2423	/* If ob has a field named key, return the link from the list,
2734	* otherwise return NULL.	2424	* otherwise return NULL.
2735	*	2425	*
…		…
2737	* do the desired thing.	2427	* do the desired thing.
2738	*/	2428	*/
2739	key_value *	2429	key_value *
2740	get_ob_key_link (const object *ob, const char *key)	2430	get_ob_key_link (const object *ob, const char *key)
2741	{	2431	{
2742	key_value *
2743	link;
2744
2745	for (link = ob->key_values; link != NULL; link = link->next)	2432	for (key_value *link = ob->key_values; link; link = link->next)
2746	{
2747	if (link->key == key)	2433	if (link->key == key)
2748	{
2749	return link;	2434	return link;
2750	}
2751	}
2752		2435
2753	return NULL;	2436	return 0;
2754	}	2437	}
2755		2438
2756	/*	2439	/*
2757	* Returns the value of op has an extra_field for key, or NULL.	2440	* Returns the value of op has an extra_field for key, or NULL.
2758	*	2441	*
…		…
2783	if (link->key == canonical_key)	2466	if (link->key == canonical_key)
2784	return link->value;	2467	return link->value;
2785		2468
2786	return 0;	2469	return 0;
2787	}	2470	}
2788
2789		2471
2790	/*	2472	/*
2791	* Updates the canonical_key in op to value.	2473	* Updates the canonical_key in op to value.
2792	*	2474	*
2793	* canonical_key is a shared string (value doesn't have to be).	2475	* canonical_key is a shared string (value doesn't have to be).
…		…
2798	* Returns TRUE on success.	2480	* Returns TRUE on success.
2799	*/	2481	*/
2800	int	2482	int
2801	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2483	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2802	{	2484	{
2803	key_value *
2804	field = NULL, *last = NULL;	2485	key_value *field = NULL, *last = NULL;
2805		2486
2806	for (field = op->key_values; field != NULL; field = field->next)	2487	for (field = op->key_values; field != NULL; field = field->next)
2807	{	2488	{
2808	if (field->key != canonical_key)	2489	if (field->key != canonical_key)
2809	{	2490	{
…		…
2818	/* Basically, if the archetype has this key set,	2499	/* Basically, if the archetype has this key set,
2819	* we need to store the null value so when we save	2500	* we need to store the null value so when we save
2820	* it, we save the empty value so that when we load,	2501	* it, we save the empty value so that when we load,
2821	* we get this value back again.	2502	* we get this value back again.
2822	*/	2503	*/
2823	if (get_ob_key_link (&op->arch->clone, canonical_key))	2504	if (get_ob_key_link (op->arch, canonical_key))
2824	field->value = 0;	2505	field->value = 0;
2825	else	2506	else
2826	{	2507	{
2827	if (last)	2508	if (last)
2828	last->next = field->next;	2509	last->next = field->next;
…		…
2837	/* IF we get here, key doesn't exist */	2518	/* IF we get here, key doesn't exist */
2838		2519
2839	/* No field, we'll have to add it. */	2520	/* No field, we'll have to add it. */
2840		2521
2841	if (!add_key)	2522	if (!add_key)
2842	{
2843	return FALSE;	2523	return FALSE;
2844	}	2524
2845	/* There isn't any good reason to store a null	2525	/* There isn't any good reason to store a null
2846	* value in the key/value list. If the archetype has	2526	* value in the key/value list. If the archetype has
2847	* this key, then we should also have it, so shouldn't	2527	* this key, then we should also have it, so shouldn't
2848	* be here. If user wants to store empty strings,	2528	* be here. If user wants to store empty strings,
2849	* should pass in ""	2529	* should pass in ""
…		…
2898	}	2578	}
2899	else	2579	else
2900	item = item->env;	2580	item = item->env;
2901	}	2581	}
2902		2582
		2583	const char *
		2584	object::flag_desc (char *desc, int len) const
		2585	{
		2586	char *p = desc;
		2587	bool first = true;
		2588
		2589	*p = 0;
		2590
		2591	for (int i = 0; i < NUM_FLAGS; i++)
		2592	{
		2593	if (len <= 10) // magic constant!
		2594	{
		2595	snprintf (p, len, ",...");
		2596	break;
		2597	}
		2598
		2599	if (flag [i])
		2600	{
		2601	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2602	len -= cnt;
		2603	p += cnt;
		2604	first = false;
		2605	}
		2606	}
		2607
		2608	return desc;
		2609	}
		2610
2903	// return a suitable string describing an objetc in enough detail to find it	2611	// return a suitable string describing an object in enough detail to find it
2904	const char *	2612	const char *
2905	object::debug_desc (char *info) const	2613	object::debug_desc (char *info) const
2906	{	2614	{
		2615	char flagdesc[512];
2907	char info2[256 * 3];	2616	char info2[256 * 4];
2908	char *p = info;	2617	char *p = info;
2909		2618
2910	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2619	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2911	count,	2620	count, uuid.seq,
2912	&name,	2621	&name,
2913	title ? " " : "",	2622	title ? "\",title:\"" : "",
2914	title ? (const char *)title : "");	2623	title ? (const char *)title : "",
		2624	flag_desc (flagdesc, 512), type);
2915		2625
2916	if (env)	2626	if (!this->flag[FLAG_REMOVED] && env)
2917	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2627	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2918		2628
2919	if (map)	2629	if (map)
2920	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);
2921		2631
2922	return info;	2632	return info;
2923	}	2633	}
2924		2634
2925	const char *	2635	const char *
2926	object::debug_desc () const	2636	object::debug_desc () const
2927	{	2637	{
2928	static char info[256 * 3];	2638	static char info[3][256 * 4];
		2639	static int info_idx;
		2640
2929	return debug_desc (info);	2641	return debug_desc (info [++info_idx % 3]);
2930	}	2642	}
2931		2643
		2644	struct region *
		2645	object::region () const
		2646	{
		2647	return map ? map->region (x, y)
		2648	: region::default_region ();
		2649	}
		2650
		2651	const materialtype_t *
		2652	object::dominant_material () const
		2653	{
		2654	if (materialtype_t *mt = name_to_material (materialname))
		2655	return mt;
		2656
		2657	return name_to_material (shstr_unknown);
		2658	}
		2659
		2660	void
		2661	object::open_container (object *new_container)
		2662	{
		2663	if (container == new_container)
		2664	return;
		2665
		2666	if (object *old_container = container)
		2667	{
		2668	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2669	return;
		2670
		2671	#if 0
		2672	// remove the "Close old_container" object.
		2673	if (object *closer = old_container->inv)
		2674	if (closer->type == CLOSE_CON)
		2675	closer->destroy ();
		2676	#endif
		2677
		2678	old_container->flag [FLAG_APPLIED] = 0;
		2679	container = 0;
		2680
		2681	esrv_update_item (UPD_FLAGS, this, 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"));
		2684	}
		2685
		2686	if (new_container)
		2687	{
		2688	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2689	return;
		2690
		2691	// TODO: this does not seem to serve any purpose anymore?
		2692	#if 0
		2693	// insert the "Close Container" object.
		2694	if (archetype *closer = new_container->other_arch)
		2695	{
		2696	object *closer = arch_to_object (new_container->other_arch);
		2697	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2698	new_container->insert (closer);
		2699	}
		2700	#endif
		2701
		2702	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2703
		2704	new_container->flag [FLAG_APPLIED] = 1;
		2705	container = new_container;
		2706
		2707	esrv_update_item (UPD_FLAGS, 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)
		2755	{
		2756	if (object *pl = in_player ())
		2757	pl->contr->play_sound (sound);
		2758	}
		2759	else
		2760	map->play_sound (sound, x, y);
		2761	}
		2762

Diff Legend

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