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

Diff Legend

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