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.43 by root, Thu Sep 14 17:10:24 2006 UTC vs.
Revision 1.148 by root, Mon May 14 19:08:25 2007 UTC

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

Diff Legend

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