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.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.83 by root, Mon Dec 25 14:43:22 2006 UTC

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

Diff Legend

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