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

Diff Legend

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