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.37 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.95 by root, Wed Dec 27 05:42:08 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	dst->set_speed (dst->speed);
		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
…		…
626	* Updates the speed of an object. If the speed changes from 0 to another	554	* Updates the speed of an object. If the speed changes from 0 to another
627	* value, or vice versa, then add/remove the object from the active list.	555	* value, or vice versa, then add/remove the object from the active list.
628	* This function needs to be called whenever the speed of an object changes.	556	* This function needs to be called whenever the speed of an object changes.
629	*/	557	*/
630	void	558	void
631	update_ob_speed (object *op)	559	object::set_speed (float speed)
632	{	560	{
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		566	if (flag [FLAG_FREED] && speed)
639	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", &name);
642	#ifdef MANY_CORES
643	abort ();
644	#else
645	op->speed = 0;	569	speed = 0;
646	#endif
647	}	570	}
		571
		572	this->speed = speed;
648		573
649	if (arch_init)	574	if (arch_init)
650	return;	575	return;
651		576
652	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	577	if (FABS (speed) > MIN_ACTIVE_SPEED)
653	{	578	{
654	/* If already on active list, don't do anything */	579	/* If already on active list, don't do anything */
655	if (op->active_next || op->active_prev || op == active_objects)	580	if (active_next || active_prev || this == active_objects)
656	return;	581	return;
657		582
658	/* process_events() expects us to insert the object at the beginning	583	/* process_events() expects us to insert the object at the beginning
659	* of the list. */	584	* of the list. */
660	op->active_next = active_objects;	585	active_next = active_objects;
661		586
662	if (op->active_next != NULL)	587	if (active_next)
663	op->active_next->active_prev = op;	588	active_next->active_prev = this;
664		589
665	active_objects = op;	590	active_objects = this;
666	}	591	}
667	else	592	else
668	{	593	{
669	/* If not on the active list, nothing needs to be done */	594	/* If not on the active list, nothing needs to be done */
670	if (!op->active_next && !op->active_prev && op != active_objects)	595	if (!active_next && !active_prev && this != active_objects)
671	return;	596	return;
672		597
673	if (op->active_prev == NULL)	598	if (!active_prev)
674	{	599	{
675	active_objects = op->active_next;	600	active_objects = active_next;
676		601
677	if (op->active_next != NULL)	602	if (active_next)
678	op->active_next->active_prev = NULL;	603	active_next->active_prev = 0;
679	}	604	}
680	else	605	else
681	{	606	{
682	op->active_prev->active_next = op->active_next;	607	active_prev->active_next = active_next;
683		608
684	if (op->active_next)	609	if (active_next)
685	op->active_next->active_prev = op->active_prev;	610	active_next->active_prev = active_prev;
686	}	611	}
687		612
688	op->active_next = NULL;	613	active_next = 0;
689	op->active_prev = NULL;	614	active_prev = 0;
690	}	615	}
691	}	616	}
692		617
693	/* This function removes object 'op' from the list of active	618	/* This function removes object 'op' from the list of active
694	* objects.	619	* objects.
…		…
720	op->active_next = NULL;	645	op->active_next = NULL;
721	op->active_prev = NULL;	646	op->active_prev = NULL;
722	}	647	}
723		648
724	/*	649	/*
725	* update_object() updates the array which represents the map.	650	* update_object() updates the the map.
726	* It takes into account invisible objects (and represent squares covered	651	* It takes into account invisible objects (and represent squares covered
727	* by invisible objects by whatever is below them (unless it's another	652	* by invisible objects by whatever is below them (unless it's another
728	* invisible object, etc...)	653	* invisible object, etc...)
729	* If the object being updated is beneath a player, the look-window	654	* 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	655	* of that player is updated (this might be a suboptimal way of
731	* updating that window, though, since update_object() is called _often_)	656	* updating that window, though, since update_object() is called _often_)
732	*	657	*
733	* action is a hint of what the caller believes need to be done.	658	* 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:	659	* current action are:
739	* UP_OBJ_INSERT: op was inserted	660	* UP_OBJ_INSERT: op was inserted
740	* UP_OBJ_REMOVE: op was removed	661	* UP_OBJ_REMOVE: op was removed
741	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	662	* 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.	663	* as that is easier than trying to look at what may have changed.
743	* UP_OBJ_FACE: only the objects face has changed.	664	* UP_OBJ_FACE: only the objects face has changed.
744	*/	665	*/
745
746	void	666	void
747	update_object (object *op, int action)	667	update_object (object *op, int action)
748	{	668	{
749	int update_now = 0, flags;
750	MoveType move_on, move_off, move_block, move_slow;	669	MoveType move_on, move_off, move_block, move_slow;
751		670
752	if (op == NULL)	671	if (op == NULL)
753	{	672	{
754	/* this should never happen */	673	/* this should never happen */
755	LOG (llevDebug, "update_object() called for NULL object.\n");	674	LOG (llevDebug, "update_object() called for NULL object.\n");
756	return;	675	return;
757	}	676	}
758		677
759	if (op->env != NULL)	678	if (op->env)
760	{	679	{
761	/* Animation is currently handled by client, so nothing	680	/* Animation is currently handled by client, so nothing
762	* to do in this case.	681	* to do in this case.
763	*/	682	*/
764	return;	683	return;
…		…
769	*/	688	*/
770	if (!op->map || op->map->in_memory == MAP_SAVING)	689	if (!op->map || op->map->in_memory == MAP_SAVING)
771	return;	690	return;
772		691
773	/* make sure the object is within map boundaries */	692	/* 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))	693	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
775	{	694	{
776	LOG (llevError, "update_object() called for object out of map!\n");	695	LOG (llevError, "update_object() called for object out of map!\n");
777	#ifdef MANY_CORES	696	#ifdef MANY_CORES
778	abort ();	697	abort ();
779	#endif	698	#endif
780	return;	699	return;
781	}	700	}
782		701
783	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	702	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		703
		704	if (m.flags_ & P_NEED_UPDATE)
		705	/* nop */;
790	if (action == UP_OBJ_INSERT)	706	else if (action == UP_OBJ_INSERT)
791	{	707	{
		708	// this is likely overkill, TODO: revisit (schmorp)
792	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	709	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))	710	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
796	update_now = 1;	711	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
797		712	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		713	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
798	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	714	|| (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)	715	|| (m.move_on | op->move_on ) != m.move_on
808	update_now = 1;
809
810	if ((move_off | op->move_off) != move_off)	716	|| (m.move_off | op->move_off ) != m.move_off
811	update_now = 1;	717	|| (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	718	/* This isn't perfect, but I don't expect a lot of objects to
814	* to have move_allow right now.	719	* to have move_allow right now.
815	*/	720	*/
816	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
817	update_now = 1;	722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
818		723	m.flags_ = P_NEED_UPDATE;
819	if ((move_slow | op->move_slow) != move_slow)
820	update_now = 1;
821	}	724	}
822	/* if the object is being removed, we can't make intelligent	725	/* if the object is being removed, we can't make intelligent
823	* decisions, because remove_ob can't really pass the object	726	* decisions, because remove_ob can't really pass the object
824	* that is being removed.	727	* that is being removed.
825	*/	728	*/
826	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
827	update_now = 1;	730	m.flags_ = P_NEED_UPDATE;
828	else if (action == UP_OBJ_FACE)	731	else if (action == UP_OBJ_FACE)
829	/* Nothing to do for that case */ ;	732	/* Nothing to do for that case */ ;
830	else	733	else
831	LOG (llevError, "update_object called with invalid action: %d\n", action);	734	LOG (llevError, "update_object called with invalid action: %d\n", action);
832		735
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)	736	if (op->more)
840	update_object (op->more, action);	737	update_object (op->more, action);
841	}	738	}
842		739
843	static unordered_vector<object *> mortals;	740	object::vector object::objects; // not yet used
844	static std::vector<object *, slice_allocator <object *> > freed;	741	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		742
862	object::object ()	743	object::object ()
863	{	744	{
864	SET_FLAG (this, FLAG_REMOVED);	745	SET_FLAG (this, FLAG_REMOVED);
865		746
866	expmul = 1.0;	747	expmul = 1.0;
867	face = blank_face;	748	face = blank_face;
868	attacked_by_count = -1;
869	}	749	}
870		750
871	object::~object ()	751	object::~object ()
872	{	752	{
873	free_key_values (this);	753	free_key_values (this);
874	}	754	}
875		755
876	void object::link ()	756	void object::link ()
877	{	757	{
878	count = ++ob_count;	758	count = ++ob_count;
		759	uuid = gen_uuid ();
879		760
880	prev = 0;	761	prev = 0;
881	next = objects;	762	next = object::first;
882		763
883	if (objects)	764	if (object::first)
884	objects->prev = this;	765	object::first->prev = this;
885		766
886	objects = this;	767	object::first = this;
887	}	768	}
888		769
889	void object::unlink ()	770	void object::unlink ()
890	{	771	{
891	count = 0;	772	if (this == object::first)
		773	object::first = next;
892		774
893	/* Remove this object from the list of used objects */	775	/* Remove this object from the list of used objects */
894	if (prev)
895	{
896	prev->next = next;	776	if (prev) prev->next = next;
		777	if (next) next->prev = prev;
		778
897	prev = 0;	779	prev = 0;
898	}
899
900	if (next)
901	{
902	next->prev = prev;
903	next = 0;	780	next = 0;
		781	}
		782
		783	/*
		784	* Remove and free all objects in the inventory of the given object.
		785	* object.c ?
		786	*/
		787	void
		788	object::destroy_inv (bool drop_to_ground)
		789	{
		790	// need to check first, because the checks below might segfault
		791	// as we might be on an invalid mapspace and crossfire code
		792	// is too buggy to ensure that the inventory is empty.
		793	// corollary: if you create arrows etc. with stuff in tis inventory,
		794	// cf will crash below with off-map x and y
		795	if (!inv)
		796	return;
		797
		798	/* Only if the space blocks everything do we not process -
		799	* if some form of movement is allowed, let objects
		800	* drop on that space.
		801	*/
		802	if (!drop_to_ground
		803	|| !map
		804	|| map->in_memory != MAP_IN_MEMORY
		805	|| ms ().move_block == MOVE_ALL)
904	}	806	{
		807	while (inv)
		808	{
		809	inv->destroy_inv (drop_to_ground);
		810	inv->destroy ();
		811	}
		812	}
		813	else
		814	{ /* Put objects in inventory onto this space */
		815	while (inv)
		816	{
		817	object *op = inv;
905		818
906	if (this == objects)	819	if (op->flag [FLAG_STARTEQUIP]
907	objects = next;	820	|| op->flag [FLAG_NO_DROP]
		821	|| op->type == RUNE
		822	|| op->type == TRAP
		823	|| op->flag [FLAG_IS_A_TEMPLATE])
		824	op->destroy ();
		825	else
		826	map->insert (op, x, y);
		827	}
		828	}
908	}	829	}
909		830
910	object *object::create ()	831	object *object::create ()
911	{	832	{
912	object *op;
913
914	if (freed.empty ())
915	op = new object;	833	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 ();	834	op->link ();
926	return op;	835	return op;
927	}	836	}
928		837
929	/*	838	void
930	* free_object() frees everything allocated by an object, removes	839	object::do_destroy ()
931	* 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.
933	* The object must have been removed by remove_ob() first for
934	* this function to succeed.
935	*
936	* If free_inventory is set, free inventory as well. Else drop items in
937	* inventory to the ground.
938	*/
939	void object::free (bool free_inventory)
940	{	840	{
941	if (QUERY_FLAG (this, FLAG_FREED))	841	if (flag [FLAG_IS_LINKED])
		842	remove_button_link (this);
		843
		844	if (flag [FLAG_FRIENDLY])
		845	remove_friendly_object (this);
		846
		847	if (!flag [FLAG_REMOVED])
		848	remove ();
		849
		850	if (flag [FLAG_FREED])
942	return;	851	return;
943		852
944	if (QUERY_FLAG (this, FLAG_FRIENDLY))	853	set_speed (0);
945	remove_friendly_object (this);
946		854
947	if (!QUERY_FLAG (this, FLAG_REMOVED))	855	flag [FLAG_FREED] = 1;
948	remove_ob (this);
949		856
950	SET_FLAG (this, FLAG_FREED);	857	attachable::do_destroy ();
		858
		859	destroy_inv (true);
		860	unlink ();
		861
		862	// hack to ensure that freed objects still have a valid map
		863	{
		864	static maptile *freed_map; // freed objects are moved here to avoid crashes
		865
		866	if (!freed_map)
		867	{
		868	freed_map = new maptile;
		869
		870	freed_map->name = "/internal/freed_objects_map";
		871	freed_map->width = 3;
		872	freed_map->height = 3;
		873
		874	freed_map->allocate ();
		875	}
		876
		877	map = freed_map;
		878	x = 1;
		879	y = 1;
		880	}
		881
		882	head = 0;
951		883
952	if (more)	884	if (more)
953	{	885	{
954	more->free (free_inventory);	886	more->destroy ();
955	more = 0;	887	more = 0;
956	}	888	}
957		889
958	if (inv)	890	// clear those pointers that likely might have circular references to us
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	{
966	object *op = inv;
967
968	while (op)
969	{
970	object *tmp = op->below;
971	op->free (free_inventory);
972	op = tmp;
973	}
974	}
975	else
976	{ /* Put objects in inventory onto this space */
977	object *op = inv;
978
979	while (op)
980	{
981	object *tmp = op->below;
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	}
999
1000	owner = 0;	891	owner = 0;
		892	enemy = 0;
		893	attacked_by = 0;
1001		894
1002	/* Remove object from the active list */	895	// only relevant for players(?), but make sure of it anyways
1003	speed = 0;	896	contr = 0;
1004	update_ob_speed (this);	897	}
1005		898
1006	unlink ();	899	void
		900	object::destroy (bool destroy_inventory)
		901	{
		902	if (destroyed ())
		903	return;
1007		904
1008	mortals.push_back (this);	905	if (destroy_inventory)
		906	destroy_inv (false);
		907
		908	attachable::destroy ();
1009	}	909	}
1010		910
1011	/*	911	/*
1012	* sub_weight() recursively (outwards) subtracts a number from the	912	* sub_weight() recursively (outwards) subtracts a number from the
1013	* weight of an object (and what is carried by it's environment(s)).	913	* weight of an object (and what is carried by it's environment(s)).
1014	*/	914	*/
1015
1016	void	915	void
1017	sub_weight (object *op, signed long weight)	916	sub_weight (object *op, signed long weight)
1018	{	917	{
1019	while (op != NULL)	918	while (op != NULL)
1020	{	919	{
1021	if (op->type == CONTAINER)	920	if (op->type == CONTAINER)
1022	{
1023	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	921	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024	}	922
1025	op->carrying -= weight;	923	op->carrying -= weight;
1026	op = op->env;	924	op = op->env;
1027	}	925	}
1028	}	926	}
1029		927
1030	/* remove_ob(op):	928	/* op->remove ():
1031	* This function removes the object op from the linked list of objects	929	* 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	930	* which it is currently tied to. When this function is done, the
1033	* object will have no environment. If the object previously had an	931	* object will have no environment. If the object previously had an
1034	* environment, the x and y coordinates will be updated to	932	* environment, the x and y coordinates will be updated to
1035	* the previous environment.	933	* the previous environment.
1036	* Beware: This function is called from the editor as well!	934	* Beware: This function is called from the editor as well!
1037	*/	935	*/
1038
1039	void	936	void
1040	remove_ob (object *op)	937	object::remove ()
1041	{	938	{
		939	object *tmp, *last = 0;
1042	object *	940	object *otmp;
1043	tmp, *
1044	last = NULL;
1045	object *
1046	otmp;
1047		941
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))	942	if (QUERY_FLAG (this, FLAG_REMOVED))
1060	return;	943	return;
1061		944
1062	SET_FLAG (op, FLAG_REMOVED);	945	SET_FLAG (this, FLAG_REMOVED);
		946	INVOKE_OBJECT (REMOVE, this);
1063		947
1064	if (op->more != NULL)	948	if (more)
1065	remove_ob (op->more);	949	more->remove ();
1066		950
1067	/*	951	/*
1068	* In this case, the object to be removed is in someones	952	* In this case, the object to be removed is in someones
1069	* inventory.	953	* inventory.
1070	*/	954	*/
1071	if (op->env != NULL)	955	if (env)
1072	{	956	{
1073	if (op->nrof)	957	if (nrof)
1074	sub_weight (op->env, op->weight * op->nrof);	958	sub_weight (env, weight * nrof);
1075	else	959	else
1076	sub_weight (op->env, op->weight + op->carrying);	960	sub_weight (env, weight + carrying);
1077		961
1078	/* NO_FIX_PLAYER is set when a great many changes are being	962	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	963	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	964	* to save cpu time.
1081	*/	965	*/
1082	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1083	fix_player (otmp);	967	otmp->update_stats ();
1084		968
1085	if (op->above != NULL)	969	if (above != NULL)
1086	op->above->below = op->below;	970	above->below = below;
1087	else	971	else
1088	op->env->inv = op->below;	972	env->inv = below;
1089		973
1090	if (op->below != NULL)	974	if (below != NULL)
1091	op->below->above = op->above;	975	below->above = above;
1092		976
1093	/* we set up values so that it could be inserted into	977	/* we set up values so that it could be inserted into
1094	* the map, but we don't actually do that - it is up	978	* the map, but we don't actually do that - it is up
1095	* to the caller to decide what we want to do.	979	* to the caller to decide what we want to do.
1096	*/	980	*/
1097	op->x = op->env->x, op->y = op->env->y;	981	x = env->x, y = env->y;
1098	op->map = op->env->map;	982	map = env->map;
1099	op->above = NULL, op->below = NULL;	983	above = 0, below = 0;
1100	op->env = NULL;	984	env = 0;
1101	}	985	}
1102	else if (op->map)	986	else if (map)
1103	{	987	{
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	988	/* Re did the following section of code - it looks like it had
1124	* lots of logic for things we no longer care about	989	* lots of logic for things we no longer care about
1125	*/	990	*/
1126		991
1127	/* link the object above us */	992	/* link the object above us */
1128	if (op->above)	993	if (above)
1129	op->above->below = op->below;	994	above->below = below;
1130	else	995	else
1131	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	996	map->at (x, y).top = below; /* we were top, set new top */
1132		997
1133	/* Relink the object below us, if there is one */	998	/* Relink the object below us, if there is one */
1134	if (op->below)	999	if (below)
1135	op->below->above = op->above;	1000	below->above = above;
1136	else	1001	else
1137	{	1002	{
1138	/* Nothing below, which means we need to relink map object for this space	1003	/* 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	1004	* use translated coordinates in case some oddness with map tiling is
1140	* evident	1005	* evident
1141	*/	1006	*/
1142	if (GET_MAP_OB (m, x, y) != op)	1007	if (GET_MAP_OB (map, x, y) != this)
1143	{	1008	{
1144	dump_object (op);	1009	char *dump = dump_object (this);
1145	LOG (llevError,	1010	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);	1011	"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);
		1012	free (dump);
1147	dump_object (GET_MAP_OB (m, x, y));	1013	dump = dump_object (GET_MAP_OB (map, x, y));
1148	LOG (llevError, "%s\n", errmsg);	1014	LOG (llevError, "%s\n", dump);
		1015	free (dump);
1149	}	1016	}
1150		1017
1151	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1018	map->at (x, y).bot = above; /* goes on above it. */
1152	}	1019	}
1153		1020
1154	op->above = 0;	1021	above = 0;
1155	op->below = 0;	1022	below = 0;
1156		1023
1157	if (op->map->in_memory == MAP_SAVING)	1024	if (map->in_memory == MAP_SAVING)
1158	return;	1025	return;
1159		1026
1160	tag = op->count;	1027	int check_walk_off = !flag [FLAG_NO_APPLY];
1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1162		1028
1163	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1029	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1164	{	1030	{
1165	/* No point updating the players look faces if he is the object	1031	/* No point updating the players look faces if he is the object
1166	* being removed.	1032	* being removed.
1167	*/	1033	*/
1168		1034
1169	if (tmp->type == PLAYER && tmp != op)	1035	if (tmp->type == PLAYER && tmp != this)
1170	{	1036	{
1171	/* If a container that the player is currently using somehow gets	1037	/* If a container that the player is currently using somehow gets
1172	* removed (most likely destroyed), update the player view	1038	* removed (most likely destroyed), update the player view
1173	* appropriately.	1039	* appropriately.
1174	*/	1040	*/
1175	if (tmp->container == op)	1041	if (tmp->container == this)
1176	{	1042	{
1177	CLEAR_FLAG (op, FLAG_APPLIED);	1043	flag [FLAG_APPLIED] = 0;
1178	tmp->container = NULL;	1044	tmp->container = 0;
1179	}	1045	}
1180		1046
1181	tmp->contr->socket.update_look = 1;	1047	if (tmp->contr->ns)
		1048	tmp->contr->ns->floorbox_update ();
1182	}	1049	}
1183		1050
1184	/* See if player moving off should effect something */	1051	/* 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))	1052	if (check_walk_off
		1053	&& ((move_type & tmp->move_off)
		1054	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186	{	1055	{
1187	move_apply (tmp, op, NULL);	1056	move_apply (tmp, this, 0);
1188		1057
1189	if (was_destroyed (op, tag))	1058	if (destroyed ())
1190	{
1191	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1059	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192	}
1193	}	1060	}
1194		1061
1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1062	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196		1063
1197	if (tmp->above == tmp)	1064	if (tmp->above == tmp)
1198	tmp->above = NULL;	1065	tmp->above = 0;
1199		1066
1200	last = tmp;	1067	last = tmp;
1201	}	1068	}
1202		1069
1203	/* last == NULL of there are no objects on this space */	1070	/* last == NULL of there are no objects on this space */
1204	if (last == NULL)	1071	if (!last)
1205	{	1072	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	1073	else
1215	update_object (last, UP_OBJ_REMOVE);	1074	update_object (last, UP_OBJ_REMOVE);
1216		1075
1217	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1076	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1218	update_all_los (op->map, op->x, op->y);	1077	update_all_los (map, x, y);
1219	}	1078	}
1220	}	1079	}
1221		1080
1222	/*	1081	/*
1223	* merge_ob(op,top):	1082	* merge_ob(op,top):
…		…
1231	merge_ob (object *op, object *top)	1090	merge_ob (object *op, object *top)
1232	{	1091	{
1233	if (!op->nrof)	1092	if (!op->nrof)
1234	return 0;	1093	return 0;
1235		1094
1236	if (top == NULL)	1095	if (top)
1237	for (top = op; top != NULL && top->above != NULL; top = top->above);	1096	for (top = op; top && top->above; top = top->above)
		1097	;
1238		1098
1239	for (; top != NULL; top = top->below)	1099	for (; top; top = top->below)
1240	{	1100	{
1241	if (top == op)	1101	if (top == op)
1242	continue;	1102	continue;
1243	if (CAN_MERGE (op, top))	1103
		1104	if (object::can_merge (op, top))
1244	{	1105	{
1245	top->nrof += op->nrof;	1106	top->nrof += op->nrof;
1246		1107
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1108	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1109	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1110	op->destroy ();
1250	free_object (op);
1251	return top;	1111	return top;
1252	}	1112	}
1253	}	1113	}
1254		1114
1255	return NULL;	1115	return 0;
1256	}	1116	}
1257		1117
1258	/*	1118	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1119	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1120	* job preparing multi-part monsters
1261	*/	1121	*/
1262	object *	1122	object *
1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1123	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264	{	1124	{
1265	object *tmp;
1266
1267	if (op->head)
1268	op = op->head;
1269
1270	for (tmp = op; tmp; tmp = tmp->more)	1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1271	{	1126	{
1272	tmp->x = x + tmp->arch->clone.x;	1127	tmp->x = x + tmp->arch->clone.x;
1273	tmp->y = y + tmp->arch->clone.y;	1128	tmp->y = y + tmp->arch->clone.y;
1274	}	1129	}
1275		1130
…		…
1294	* Return value:	1149	* Return value:
1295	* new object if 'op' was merged with other object	1150	* new object if 'op' was merged with other object
1296	* NULL if 'op' was destroyed	1151	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1152	* just 'op' otherwise
1298	*/	1153	*/
1299
1300	object *	1154	object *
1301	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1155	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302	{	1156	{
1303	object *tmp, *top, *floor = NULL;	1157	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1158	sint16 x, y;
1305		1159
1306	if (QUERY_FLAG (op, FLAG_FREED))	1160	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1163	return NULL;
1310	}	1164	}
1311		1165
1312	if (m == NULL)	1166	if (m == NULL)
1313	{	1167	{
1314	dump_object (op);	1168	char *dump = dump_object (op);
1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1169	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1170	free (dump);
1316	return op;	1171	return op;
1317	}	1172	}
1318		1173
1319	if (out_of_map (m, op->x, op->y))	1174	if (out_of_map (m, op->x, op->y))
1320	{	1175	{
1321	dump_object (op);	1176	char *dump = dump_object (op);
1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1177	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323	#ifdef MANY_CORES	1178	#ifdef MANY_CORES
1324	/* Better to catch this here, as otherwise the next use of this object	1179	/* 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	1180	* is likely to cause a crash. Better to find out where it is getting
1326	* improperly inserted.	1181	* improperly inserted.
1327	*/	1182	*/
1328	abort ();	1183	abort ();
1329	#endif	1184	#endif
		1185	free (dump);
1330	return op;	1186	return op;
1331	}	1187	}
1332		1188
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1189	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1190	{
1335	dump_object (op);	1191	char *dump = dump_object (op);
1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1192	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1193	free (dump);
1337	return op;	1194	return op;
1338	}	1195	}
1339		1196
1340	if (op->more != NULL)	1197	if (op->more)
1341	{	1198	{
1342	/* The part may be on a different map. */	1199	/* The part may be on a different map. */
1343		1200
1344	object *more = op->more;	1201	object *more = op->more;
1345		1202
…		…
1361	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1218	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1362	{	1219	{
1363	if (!op->head)	1220	if (!op->head)
1364	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1221	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1365		1222
1366	return NULL;	1223	return 0;
1367	}	1224	}
1368	}	1225	}
1369		1226
1370	CLEAR_FLAG (op, FLAG_REMOVED);	1227	CLEAR_FLAG (op, FLAG_REMOVED);
1371		1228
…		…
1379		1236
1380	/* this has to be done after we translate the coordinates.	1237	/* this has to be done after we translate the coordinates.
1381	*/	1238	*/
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1239	if (op->nrof && !(flag & INS_NO_MERGE))
1383	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1240	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1384	if (CAN_MERGE (op, tmp))	1241	if (object::can_merge (op, tmp))
1385	{	1242	{
1386	op->nrof += tmp->nrof;	1243	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1244	tmp->destroy ();
1388	free_object (tmp);
1389	}	1245	}
1390		1246
1391	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1247	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1248	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1249
…		…
1406	op->below = originator->below;	1262	op->below = originator->below;
1407		1263
1408	if (op->below)	1264	if (op->below)
1409	op->below->above = op;	1265	op->below->above = op;
1410	else	1266	else
1411	SET_MAP_OB (op->map, op->x, op->y, op);	1267	op->ms ().bot = op;
1412		1268
1413	/* since *below* originator, no need to update top */	1269	/* since *below* originator, no need to update top */
1414	originator->below = op;	1270	originator->below = op;
1415	}	1271	}
1416	else	1272	else
…		…
1462	* If INS_ON_TOP is used, don't do this processing	1318	* If INS_ON_TOP is used, don't do this processing
1463	* Need to find the object that in fact blocks view, otherwise	1319	* Need to find the object that in fact blocks view, otherwise
1464	* stacking is a bit odd.	1320	* stacking is a bit odd.
1465	*/	1321	*/
1466	if (!(flag & INS_ON_TOP) &&	1322	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))	1323	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1468	{	1324	{
1469	for (last = top; last != floor; last = last->below)	1325	for (last = top; last != floor; last = last->below)
1470	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1326	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1471	break;	1327	break;
1472	/* Check to see if we found the object that blocks view,	1328	/* Check to see if we found the object that blocks view,
…		…
1495		1351
1496	if (op->above)	1352	if (op->above)
1497	op->above->below = op;	1353	op->above->below = op;
1498		1354
1499	op->below = NULL;	1355	op->below = NULL;
1500	SET_MAP_OB (op->map, op->x, op->y, op);	1356	op->ms ().bot = op;
1501	}	1357	}
1502	else	1358	else
1503	{ /* get inserted into the stack above top */	1359	{ /* get inserted into the stack above top */
1504	op->above = top->above;	1360	op->above = top->above;
1505		1361
…		…
1509	op->below = top;	1365	op->below = top;
1510	top->above = op;	1366	top->above = op;
1511	}	1367	}
1512		1368
1513	if (op->above == NULL)	1369	if (op->above == NULL)
1514	SET_MAP_TOP (op->map, op->x, op->y, op);	1370	op->ms ().top = op;
1515	} /* else not INS_BELOW_ORIGINATOR */	1371	} /* else not INS_BELOW_ORIGINATOR */
1516		1372
1517	if (op->type == PLAYER)	1373	if (op->type == PLAYER)
1518	op->contr->do_los = 1;	1374	op->contr->do_los = 1;
1519		1375
1520	/* If we have a floor, we know the player, if any, will be above	1376	/* 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.	1377	* it, so save a few ticks and start from there.
1522	*/	1378	*/
1523	if (!(flag & INS_MAP_LOAD))	1379	if (!(flag & INS_MAP_LOAD))
1524	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1380	if (object *pl = op->ms ().player ())
1525	if (tmp->type == PLAYER)	1381	if (pl->contr->ns)
1526	tmp->contr->socket.update_look = 1;	1382	pl->contr->ns->floorbox_update ();
1527		1383
1528	/* If this object glows, it may affect lighting conditions that are	1384	/* If this object glows, it may affect lighting conditions that are
1529	* visible to others on this map. But update_all_los is really	1385	* 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	1386	* 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	1387	* on the map will get recalculated. The players could very well
1532	* be far away from this change and not affected in any way -	1388	* be far away from this change and not affected in any way -
1533	* this should get redone to only look for players within range,	1389	* this should get redone to only look for players within range,
1534	* or just updating the P_NEED_UPDATE for spaces within this area	1390	* or just updating the P_NEED_UPDATE for spaces within this area
1535	* of effect may be sufficient.	1391	* of effect may be sufficient.
1536	*/	1392	*/
1537	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1393	if (op->map->darkness && (op->glow_radius != 0))
1538	update_all_los (op->map, op->x, op->y);	1394	update_all_los (op->map, op->x, op->y);
1539		1395
1540	/* updates flags (blocked, alive, no magic, etc) for this map space */	1396	/* updates flags (blocked, alive, no magic, etc) for this map space */
1541	update_object (op, UP_OBJ_INSERT);	1397	update_object (op, UP_OBJ_INSERT);
1542		1398
		1399	INVOKE_OBJECT (INSERT, op);
		1400
1543	/* Don't know if moving this to the end will break anything. However,	1401	/* 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.	1402	* we want to have floorbox_update called before calling this.
1545	*	1403	*
1546	* check_move_on() must be after this because code called from	1404	* check_move_on() must be after this because code called from
1547	* check_move_on() depends on correct map flags (so functions like	1405	* check_move_on() depends on correct map flags (so functions like
1548	* blocked() and wall() work properly), and these flags are updated by	1406	* blocked() and wall() work properly), and these flags are updated by
1549	* update_object().	1407	* update_object().
…		…
1551		1409
1552	/* if this is not the head or flag has been passed, don't check walk on status */	1410	/* 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)	1411	if (!(flag & INS_NO_WALK_ON) && !op->head)
1554	{	1412	{
1555	if (check_move_on (op, originator))	1413	if (check_move_on (op, originator))
1556	return NULL;	1414	return 0;
1557		1415
1558	/* If we are a multi part object, lets work our way through the check	1416	/* If we are a multi part object, lets work our way through the check
1559	* walk on's.	1417	* walk on's.
1560	*/	1418	*/
1561	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1419	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1562	if (check_move_on (tmp, originator))	1420	if (check_move_on (tmp, originator))
1563	return NULL;	1421	return 0;
1564	}	1422	}
1565		1423
1566	return op;	1424	return op;
1567	}	1425	}
1568		1426
1569	/* this function inserts an object in the map, but if it	1427	/* 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.	1428	* 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.	1429	* op is the object to insert it under: supplies x and the map.
1572	*/	1430	*/
1573	void	1431	void
1574	replace_insert_ob_in_map (const char *arch_string, object *op)	1432	replace_insert_ob_in_map (const char *arch_string, object *op)
1575	{	1433	{
1576	object *	1434	object *tmp, *tmp1;
1577	tmp;
1578	object *
1579	tmp1;
1580		1435
1581	/* first search for itself and remove any old instances */	1436	/* first search for itself and remove any old instances */
1582		1437
1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1438	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 */	1439	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1440	tmp->destroy ();
1587	remove_ob (tmp);
1588	free_object (tmp);
1589	}
1590	}
1591		1441
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1442	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1443
1594	tmp1->x = op->x;	1444	tmp1->x = op->x;
1595	tmp1->y = op->y;	1445	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1446	insert_ob_in_map (tmp1, op->map, op, 0);
		1447	}
		1448
		1449	object *
		1450	object::insert_at (object *where, object *originator, int flags)
		1451	{
		1452	where->map->insert (this, where->x, where->y, originator, flags);
1597	}	1453	}
1598		1454
1599	/*	1455	/*
1600	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1456	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1601	* is returned contains nr objects, and the remaining parts contains	1457	* is returned contains nr objects, and the remaining parts contains
1602	* the rest (or is removed and freed if that number is 0).	1458	* the rest (or is removed and freed if that number is 0).
1603	* On failure, NULL is returned, and the reason put into the	1459	* On failure, NULL is returned, and the reason put into the
1604	* global static errmsg array.	1460	* global static errmsg array.
1605	*/	1461	*/
1606
1607	object *	1462	object *
1608	get_split_ob (object *orig_ob, uint32 nr)	1463	get_split_ob (object *orig_ob, uint32 nr)
1609	{	1464	{
1610	object *	1465	object *newob;
1611	newob;
1612	int
1613	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1466	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614		1467
1615	if (orig_ob->nrof < nr)	1468	if (orig_ob->nrof < nr)
1616	{	1469	{
1617	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1470	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1618	return NULL;	1471	return NULL;
1619	}	1472	}
1620		1473
1621	newob = object_create_clone (orig_ob);	1474	newob = object_create_clone (orig_ob);
1622		1475
1623	if ((orig_ob->nrof -= nr) < 1)	1476	if ((orig_ob->nrof -= nr) < 1)
1624	{	1477	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)	1478	else if (!is_removed)
1630	{	1479	{
1631	if (orig_ob->env != NULL)	1480	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1481	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1482	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1653		1502
1654	object *	1503	object *
1655	decrease_ob_nr (object *op, uint32 i)	1504	decrease_ob_nr (object *op, uint32 i)
1656	{	1505	{
1657	object *tmp;	1506	object *tmp;
1658	player *pl;
1659		1507
1660	if (i == 0) /* objects with op->nrof require this check */	1508	if (i == 0) /* objects with op->nrof require this check */
1661	return op;	1509	return op;
1662		1510
1663	if (i > op->nrof)	1511	if (i > op->nrof)
1664	i = op->nrof;	1512	i = op->nrof;
1665		1513
1666	if (QUERY_FLAG (op, FLAG_REMOVED))	1514	if (QUERY_FLAG (op, FLAG_REMOVED))
1667	op->nrof -= i;	1515	op->nrof -= i;
1668	else if (op->env != NULL)	1516	else if (op->env)
1669	{	1517	{
1670	/* is this object in the players inventory, or sub container	1518	/* is this object in the players inventory, or sub container
1671	* therein?	1519	* therein?
1672	*/	1520	*/
1673	tmp = is_player_inv (op->env);	1521	tmp = op->in_player ();
1674	/* nope. Is this a container the player has opened?	1522	/* nope. Is this a container the player has opened?
1675	* If so, set tmp to that player.	1523	* If so, set tmp to that player.
1676	* IMO, searching through all the players will mostly	1524	* IMO, searching through all the players will mostly
1677	* likely be quicker than following op->env to the map,	1525	* likely be quicker than following op->env to the map,
1678	* and then searching the map for a player.	1526	* and then searching the map for a player.
1679	*/	1527	*/
1680	if (!tmp)	1528	if (!tmp)
1681	{	1529	for_all_players (pl)
1682	for (pl = first_player; pl; pl = pl->next)
1683	if (pl->ob->container == op->env)	1530	if (pl->ob->container == op->env)
		1531	{
		1532	tmp = pl->ob;
1684	break;	1533	break;
1685	if (pl)
1686	tmp = pl->ob;
1687	else
1688	tmp = NULL;
1689	}	1534	}
1690		1535
1691	if (i < op->nrof)	1536	if (i < op->nrof)
1692	{	1537	{
1693	sub_weight (op->env, op->weight * i);	1538	sub_weight (op->env, op->weight * i);
1694	op->nrof -= i;	1539	op->nrof -= i;
1695	if (tmp)	1540	if (tmp)
1696	{
1697	esrv_send_item (tmp, op);	1541	esrv_send_item (tmp, op);
1698	}
1699	}	1542	}
1700	else	1543	else
1701	{	1544	{
1702	remove_ob (op);	1545	op->remove ();
1703	op->nrof = 0;	1546	op->nrof = 0;
1704	if (tmp)	1547	if (tmp)
1705	{
1706	esrv_del_item (tmp->contr, op->count);	1548	esrv_del_item (tmp->contr, op->count);
1707	}
1708	}	1549	}
1709	}	1550	}
1710	else	1551	else
1711	{	1552	{
1712	object *above = op->above;	1553	object *above = op->above;
1713		1554
1714	if (i < op->nrof)	1555	if (i < op->nrof)
1715	op->nrof -= i;	1556	op->nrof -= i;
1716	else	1557	else
1717	{	1558	{
1718	remove_ob (op);	1559	op->remove ();
1719	op->nrof = 0;	1560	op->nrof = 0;
1720	}	1561	}
1721		1562
1722	/* Since we just removed op, op->above is null */	1563	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1564	for (tmp = above; tmp; tmp = tmp->above)
1724	if (tmp->type == PLAYER)	1565	if (tmp->type == PLAYER)
1725	{	1566	{
1726	if (op->nrof)	1567	if (op->nrof)
1727	esrv_send_item (tmp, op);	1568	esrv_send_item (tmp, op);
1728	else	1569	else
…		…
1732		1573
1733	if (op->nrof)	1574	if (op->nrof)
1734	return op;	1575	return op;
1735	else	1576	else
1736	{	1577	{
1737	free_object (op);	1578	op->destroy ();
1738	return NULL;	1579	return 0;
1739	}	1580	}
1740	}	1581	}
1741		1582
1742	/*	1583	/*
1743	* add_weight(object, weight) adds the specified weight to an object,	1584	* add_weight(object, weight) adds the specified weight to an object,
…		…
1755	op->carrying += weight;	1596	op->carrying += weight;
1756	op = op->env;	1597	op = op->env;
1757	}	1598	}
1758	}	1599	}
1759		1600
		1601	object *
		1602	insert_ob_in_ob (object *op, object *where)
		1603	{
		1604	if (!where)
		1605	{
		1606	char *dump = dump_object (op);
		1607	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1608	free (dump);
		1609	return op;
		1610	}
		1611
		1612	if (where->head)
		1613	{
		1614	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1615	where = where->head;
		1616	}
		1617
		1618	return where->insert (op);
		1619	}
		1620
1760	/*	1621	/*
1761	* insert_ob_in_ob(op,environment):	1622	* env->insert (op)
1762	* This function inserts the object op in the linked list	1623	* This function inserts the object op in the linked list
1763	* inside the object environment.	1624	* inside the object environment.
1764	*	1625	*
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	1626	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1627	* be != op, if items are merged. -Tero
1772	*/	1628	*/
1773		1629
1774	object *	1630	object *
1775	insert_ob_in_ob (object *op, object *where)	1631	object::insert (object *op)
1776	{	1632	{
1777	object *	1633	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1634
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1635	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1636	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		1637
1801	if (op->more)	1638	if (op->more)
1802	{	1639	{
1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1640	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804	return op;	1641	return op;
…		…
1806		1643
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1644	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1645	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1646	if (op->nrof)
1810	{	1647	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1648	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1649	if (object::can_merge (tmp, op))
1813	{	1650	{
1814	/* return the original object and remove inserted object	1651	/* return the original object and remove inserted object
1815	(client needs the original object) */	1652	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1653	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1654	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1655	* tmp->nrof, we need to increase the weight.
1819	*/	1656	*/
1820	add_weight (where, op->weight * op->nrof);	1657	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1658	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1659	op->destroy (); /* free the inserted object */
1823	op = tmp;	1660	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1661	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1662	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1663	break;
1827	}	1664	}
1828		1665
1829	/* I assume combined objects have no inventory	1666	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1667	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1668	* (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	1669	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1670	* the linking below
1834	*/	1671	*/
1835	add_weight (where, op->weight * op->nrof);	1672	add_weight (this, op->weight * op->nrof);
1836	}	1673	}
1837	else	1674	else
1838	add_weight (where, (op->weight + op->carrying));	1675	add_weight (this, (op->weight + op->carrying));
1839		1676
1840	otmp = is_player_inv (where);	1677	otmp = this->in_player ();
1841	if (otmp && otmp->contr != NULL)	1678	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1679	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1680	otmp->update_stats ();
1845	}
1846		1681
1847	op->map = NULL;	1682	op->map = 0;
1848	op->env = where;	1683	op->env = this;
1849	op->above = NULL;	1684	op->above = 0;
1850	op->below = NULL;	1685	op->below = 0;
1851	op->x = 0, op->y = 0;	1686	op->x = 0, op->y = 0;
1852		1687
1853	/* reset the light list and los of the players on the map */	1688	/* reset the light list and los of the players on the map */
1854	if ((op->glow_radius != 0) && where->map)	1689	if ((op->glow_radius != 0) && map)
1855	{	1690	{
1856	#ifdef DEBUG_LIGHTS	1691	#ifdef DEBUG_LIGHTS
1857	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1692	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858	#endif /* DEBUG_LIGHTS */	1693	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1694	if (map->darkness)
1860	update_all_los (where->map, where->x, where->y);	1695	update_all_los (map, x, y);
1861	}	1696	}
1862		1697
1863	/* Client has no idea of ordering so lets not bother ordering it here.	1698	/* Client has no idea of ordering so lets not bother ordering it here.
1864	* It sure simplifies this function...	1699	* It sure simplifies this function...
1865	*/	1700	*/
1866	if (where->inv == NULL)	1701	if (!inv)
1867	where->inv = op;	1702	inv = op;
1868	else	1703	else
1869	{	1704	{
1870	op->below = where->inv;	1705	op->below = inv;
1871	op->below->above = op;	1706	op->below->above = op;
1872	where->inv = op;	1707	inv = op;
1873	}	1708	}
		1709
		1710	INVOKE_OBJECT (INSERT, this);
		1711
1874	return op;	1712	return op;
1875	}	1713	}
1876		1714
1877	/*	1715	/*
1878	* Checks if any objects has a move_type that matches objects	1716	* Checks if any objects has a move_type that matches objects
…		…
1892	*	1730	*
1893	* MSW 2001-07-08: Check all objects on space, not just those below	1731	* MSW 2001-07-08: Check all objects on space, not just those below
1894	* object being inserted. insert_ob_in_map may not put new objects	1732	* object being inserted. insert_ob_in_map may not put new objects
1895	* on top.	1733	* on top.
1896	*/	1734	*/
1897
1898	int	1735	int
1899	check_move_on (object *op, object *originator)	1736	check_move_on (object *op, object *originator)
1900	{	1737	{
1901	object *	1738	object *tmp;
1902	tmp;	1739	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1740	int x = op->x, y = op->y;
1909		1741
1910	MoveType	1742	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1743
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1744	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1745	return 0;
1917
1918	tag = op->count;
1919		1746
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1747	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);	1748	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);	1749	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1750
…		…
1939		1766
1940	/* The objects have to be checked from top to bottom.	1767	/* The objects have to be checked from top to bottom.
1941	* Hence, we first go to the top:	1768	* Hence, we first go to the top:
1942	*/	1769	*/
1943		1770
1944	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1771	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1945	{	1772	{
1946	/* Trim the search when we find the first other spell effect	1773	/* Trim the search when we find the first other spell effect
1947	* this helps performance so that if a space has 50 spell objects,	1774	* this helps performance so that if a space has 50 spell objects,
1948	* we don't need to check all of them.	1775	* we don't need to check all of them.
1949	*/	1776	*/
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1811	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))	1812	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1813	{
1987	move_apply (tmp, op, originator);	1814	move_apply (tmp, op, originator);
1988		1815
1989	if (was_destroyed (op, tag))	1816	if (op->destroyed ())
1990	return 1;	1817	return 1;
1991		1818
1992	/* what the person/creature stepped onto has moved the object	1819	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1820	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1821	* have a feeling strange problems would result.
…		…
2004	/*	1831	/*
2005	* present_arch(arch, map, x, y) searches for any objects with	1832	* present_arch(arch, map, x, y) searches for any objects with
2006	* a matching archetype at the given map and coordinates.	1833	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1834	* The first matching object is returned, or NULL if none.
2008	*/	1835	*/
2009
2010	object *	1836	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1837	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1838	{
2013	object *
2014	tmp;
2015
2016	if (m == NULL || out_of_map (m, x, y))	1839	if (m == NULL || out_of_map (m, x, y))
2017	{	1840	{
2018	LOG (llevError, "Present_arch called outside map.\n");	1841	LOG (llevError, "Present_arch called outside map.\n");
2019	return NULL;	1842	return NULL;
2020	}	1843	}
		1844
2021	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1845	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2022	if (tmp->arch == at)	1846	if (tmp->arch == at)
2023	return tmp;	1847	return tmp;
		1848
2024	return NULL;	1849	return NULL;
2025	}	1850	}
2026		1851
2027	/*	1852	/*
2028	* present(type, map, x, y) searches for any objects with	1853	* present(type, map, x, y) searches for any objects with
2029	* a matching type variable at the given map and coordinates.	1854	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1855	* The first matching object is returned, or NULL if none.
2031	*/	1856	*/
2032
2033	object *	1857	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1858	present (unsigned char type, maptile *m, int x, int y)
2035	{	1859	{
2036	object *
2037	tmp;
2038
2039	if (out_of_map (m, x, y))	1860	if (out_of_map (m, x, y))
2040	{	1861	{
2041	LOG (llevError, "Present called outside map.\n");	1862	LOG (llevError, "Present called outside map.\n");
2042	return NULL;	1863	return NULL;
2043	}	1864	}
		1865
2044	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1866	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2045	if (tmp->type == type)	1867	if (tmp->type == type)
2046	return tmp;	1868	return tmp;
		1869
2047	return NULL;	1870	return NULL;
2048	}	1871	}
2049		1872
2050	/*	1873	/*
2051	* present_in_ob(type, object) searches for any objects with	1874	* present_in_ob(type, object) searches for any objects with
2052	* a matching type variable in the inventory of the given object.	1875	* a matching type variable in the inventory of the given object.
2053	* The first matching object is returned, or NULL if none.	1876	* The first matching object is returned, or NULL if none.
2054	*/	1877	*/
2055
2056	object *	1878	object *
2057	present_in_ob (unsigned char type, const object *op)	1879	present_in_ob (unsigned char type, const object *op)
2058	{	1880	{
2059	object *
2060	tmp;
2061
2062	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1881	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2063	if (tmp->type == type)	1882	if (tmp->type == type)
2064	return tmp;	1883	return tmp;
		1884
2065	return NULL;	1885	return NULL;
2066	}	1886	}
2067		1887
2068	/*	1888	/*
2069	* present_in_ob (type, str, object) searches for any objects with	1889	* present_in_ob (type, str, object) searches for any objects with
…		…
2077	* str is the string to match against. Note that we match against	1897	* 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	1898	* 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	1899	* spell code can use one object type (force), but change it's name
2080	* to be unique.	1900	* to be unique.
2081	*/	1901	*/
2082
2083	object *	1902	object *
2084	present_in_ob_by_name (int type, const char *str, const object *op)	1903	present_in_ob_by_name (int type, const char *str, const object *op)
2085	{	1904	{
2086	object *
2087	tmp;
2088
2089	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1905	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2090	{
2091	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1906	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2092	return tmp;	1907	return tmp;
2093	}	1908
2094	return NULL;	1909	return 0;
2095	}	1910	}
2096		1911
2097	/*	1912	/*
2098	* present_arch_in_ob(archetype, object) searches for any objects with	1913	* present_arch_in_ob(archetype, object) searches for any objects with
2099	* a matching archetype in the inventory of the given object.	1914	* a matching archetype in the inventory of the given object.
2100	* The first matching object is returned, or NULL if none.	1915	* The first matching object is returned, or NULL if none.
2101	*/	1916	*/
2102
2103	object *	1917	object *
2104	present_arch_in_ob (const archetype *at, const object *op)	1918	present_arch_in_ob (const archetype *at, const object *op)
2105	{	1919	{
2106	object *
2107	tmp;
2108
2109	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2110	if (tmp->arch == at)	1921	if (tmp->arch == at)
2111	return tmp;	1922	return tmp;
		1923
2112	return NULL;	1924	return NULL;
2113	}	1925	}
2114		1926
2115	/*	1927	/*
2116	* activate recursively a flag on an object inventory	1928	* activate recursively a flag on an object inventory
2117	*/	1929	*/
2118	void	1930	void
2119	flag_inv (object *op, int flag)	1931	flag_inv (object *op, int flag)
2120	{	1932	{
2121	object *
2122	tmp;
2123
2124	if (op->inv)	1933	if (op->inv)
2125	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1934	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2126	{	1935	{
2127	SET_FLAG (tmp, flag);	1936	SET_FLAG (tmp, flag);
2128	flag_inv (tmp, flag);	1937	flag_inv (tmp, flag);
2129	}	1938	}
2130	} /*	1939	}
		1940
		1941	/*
2131	* desactivate recursively a flag on an object inventory	1942	* deactivate recursively a flag on an object inventory
2132	*/	1943	*/
2133	void	1944	void
2134	unflag_inv (object *op, int flag)	1945	unflag_inv (object *op, int flag)
2135	{	1946	{
2136	object *
2137	tmp;
2138
2139	if (op->inv)	1947	if (op->inv)
2140	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1948	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2141	{	1949	{
2142	CLEAR_FLAG (tmp, flag);	1950	CLEAR_FLAG (tmp, flag);
2143	unflag_inv (tmp, flag);	1951	unflag_inv (tmp, flag);
2144	}	1952	}
2145	}	1953	}
…		…
2148	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1956	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2149	* all it's inventory (recursively).	1957	* all it's inventory (recursively).
2150	* If checksums are used, a player will get set_cheat called for	1958	* 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.	1959	* him/her-self and all object carried by a call to this function.
2152	*/	1960	*/
2153
2154	void	1961	void
2155	set_cheat (object *op)	1962	set_cheat (object *op)
2156	{	1963	{
2157	SET_FLAG (op, FLAG_WAS_WIZ);	1964	SET_FLAG (op, FLAG_WAS_WIZ);
2158	flag_inv (op, FLAG_WAS_WIZ);	1965	flag_inv (op, FLAG_WAS_WIZ);
…		…
2177	* because arch_blocked (now ob_blocked) needs to know the movement type	1984	* 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	1985	* 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	1986	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	1987	* customized, changed states, etc.
2181	*/	1988	*/
2182
2183	int	1989	int
2184	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	1990	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185	{	1991	{
2186	int
2187	i,
2188	index = 0, flag;	1992	int index = 0, flag;
2189	static int
2190	altern[SIZEOFFREE];	1993	int altern[SIZEOFFREE];
2191		1994
2192	for (i = start; i < stop; i++)	1995	for (int i = start; i < stop; i++)
2193	{	1996	{
2194	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1997	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2195	if (!flag)	1998	if (!flag)
2196	altern[index++] = i;	1999	altern [index++] = i;
2197		2000
2198	/* Basically, if we find a wall on a space, we cut down the search size.	2001	/* 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.	2002	* 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 -	2003	* 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	2004	* 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	2005	* spaces in all the other directions, this will reduce the search space
2203	* to only the spaces immediately surrounding the target area, and	2006	* to only the spaces immediately surrounding the target area, and
2204	* won't look 2 spaces south of the target space.	2007	* won't look 2 spaces south of the target space.
2205	*/	2008	*/
2206	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2009	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2207	stop = maxfree[i];	2010	stop = maxfree[i];
2208	}	2011	}
		2012
2209	if (!index)	2013	if (!index)
2210	return -1;	2014	return -1;
		2015
2211	return altern[RANDOM () % index];	2016	return altern[RANDOM () % index];
2212	}	2017	}
2213		2018
2214	/*	2019	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2020	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2021	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2022	* 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.	2023	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2024	*/
2220
2221	int	2025	int
2222	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2026	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223	{	2027	{
2224	int
2225	i;
2226
2227	for (i = 0; i < SIZEOFFREE; i++)	2028	for (int i = 0; i < SIZEOFFREE; i++)
2228	{
2229	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2029	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2230	return i;	2030	return i;
2231	}	2031
2232	return -1;	2032	return -1;
2233	}	2033	}
2234		2034
2235	/*	2035	/*
2236	* The function permute(arr, begin, end) randomly reorders the array	2036	* The function permute(arr, begin, end) randomly reorders the array
2237	* arr[begin..end-1].	2037	* arr[begin..end-1].
		2038	* now uses a fisher-yates shuffle, old permute was broken
2238	*/	2039	*/
2239	static void	2040	static void
2240	permute (int *arr, int begin, int end)	2041	permute (int *arr, int begin, int end)
2241	{	2042	{
2242	int	2043	arr += begin;
2243	i,
2244	j,
2245	tmp,
2246	len;
2247
2248	len = end - begin;	2044	end -= begin;
2249	for (i = begin; i < end; i++)
2250	{
2251	j = begin + RANDOM () % len;
2252		2045
2253	tmp = arr[i];	2046	while (--end)
2254	arr[i] = arr[j];	2047	swap (arr [end], arr [RANDOM () % (end + 1)]);
2255	arr[j] = tmp;
2256	}
2257	}	2048	}
2258		2049
2259	/* new function to make monster searching more efficient, and effective!	2050	/* new function to make monster searching more efficient, and effective!
2260	* This basically returns a randomized array (in the passed pointer) of	2051	* 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	2052	* 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.	2055	* the 3x3 area will be searched, just not in a predictable order.
2265	*/	2056	*/
2266	void	2057	void
2267	get_search_arr (int *search_arr)	2058	get_search_arr (int *search_arr)
2268	{	2059	{
2269	int	2060	int i;
2270	i;
2271		2061
2272	for (i = 0; i < SIZEOFFREE; i++)	2062	for (i = 0; i < SIZEOFFREE; i++)
2273	{
2274	search_arr[i] = i;	2063	search_arr[i] = i;
2275	}
2276		2064
2277	permute (search_arr, 1, SIZEOFFREE1 + 1);	2065	permute (search_arr, 1, SIZEOFFREE1 + 1);
2278	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2066	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2279	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2067	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2280	}	2068	}
…		…
2289	* Perhaps incorrectly, but I'm making the assumption that exclude	2077	* 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	2078	* 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	2079	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2080	* there is capable of.
2293	*/	2081	*/
2294
2295	int	2082	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2083	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2084	{
2298	int
2299	i,
2300	max = SIZEOFFREE, mflags;	2085	int i, max = SIZEOFFREE, mflags;
2301		2086
2302	sint16 nx, ny;	2087	sint16 nx, ny;
2303	object *	2088	object *tmp;
2304	tmp;	2089	maptile *mp;
2305	mapstruct *
2306	mp;
2307		2090
2308	MoveType blocked, move_type;	2091	MoveType blocked, move_type;
2309		2092
2310	if (exclude && exclude->head)	2093	if (exclude && exclude->head)
2311	{	2094	{
…		…
2323	mp = m;	2106	mp = m;
2324	nx = x + freearr_x[i];	2107	nx = x + freearr_x[i];
2325	ny = y + freearr_y[i];	2108	ny = y + freearr_y[i];
2326		2109
2327	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2110	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2111
2328	if (mflags & P_OUT_OF_MAP)	2112	if (mflags & P_OUT_OF_MAP)
2329	{
2330	max = maxfree[i];	2113	max = maxfree[i];
2331	}
2332	else	2114	else
2333	{	2115	{
2334	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2116	mapspace &ms = mp->at (nx, ny);
		2117
		2118	blocked = ms.move_block;
2335		2119
2336	if ((move_type & blocked) == move_type)	2120	if ((move_type & blocked) == move_type)
2337	{
2338	max = maxfree[i];	2121	max = maxfree[i];
2339	}
2340	else if (mflags & P_IS_ALIVE)	2122	else if (mflags & P_IS_ALIVE)
2341	{	2123	{
2342	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2124	for (tmp = ms.bot; tmp; tmp = tmp->above)
2343	{	2125	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)))	2126	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2345	{
2346	break;	2127	break;
2347	}	2128
2348	}
2349	if (tmp)	2129	if (tmp)
2350	{
2351	return freedir[i];	2130	return freedir[i];
2352	}
2353	}	2131	}
2354	}	2132	}
2355	}	2133	}
		2134
2356	return 0;	2135	return 0;
2357	}	2136	}
2358		2137
2359	/*	2138	/*
2360	* distance(object 1, object 2) will return the square of the	2139	* distance(object 1, object 2) will return the square of the
2361	* distance between the two given objects.	2140	* distance between the two given objects.
2362	*/	2141	*/
2363
2364	int	2142	int
2365	distance (const object *ob1, const object *ob2)	2143	distance (const object *ob1, const object *ob2)
2366	{	2144	{
2367	int
2368	i;
2369
2370	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2145	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2371	return i;
2372	}	2146	}
2373		2147
2374	/*	2148	/*
2375	* find_dir_2(delta-x,delta-y) will return a direction in which	2149	* 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	2150	* an object which has subtracted the x and y coordinates of another
2377	* object, needs to travel toward it.	2151	* object, needs to travel toward it.
2378	*/	2152	*/
2379
2380	int	2153	int
2381	find_dir_2 (int x, int y)	2154	find_dir_2 (int x, int y)
2382	{	2155	{
2383	int	2156	int q;
2384	q;
2385		2157
2386	if (y)	2158	if (y)
2387	q = x * 100 / y;	2159	q = x * 100 / y;
2388	else if (x)	2160	else if (x)
2389	q = -300 * x;	2161	q = -300 * x;
…		…
2424	int	2196	int
2425	absdir (int d)	2197	absdir (int d)
2426	{	2198	{
2427	while (d < 1)	2199	while (d < 1)
2428	d += 8;	2200	d += 8;
		2201
2429	while (d > 8)	2202	while (d > 8)
2430	d -= 8;	2203	d -= 8;
		2204
2431	return d;	2205	return d;
2432	}	2206	}
2433		2207
2434	/*	2208	/*
2435	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2209	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2437	*/	2211	*/
2438		2212
2439	int	2213	int
2440	dirdiff (int dir1, int dir2)	2214	dirdiff (int dir1, int dir2)
2441	{	2215	{
2442	int	2216	int d;
2443	d;
2444		2217
2445	d = abs (dir1 - dir2);	2218	d = abs (dir1 - dir2);
2446	if (d > 4)	2219	if (d > 4)
2447	d = 8 - d;	2220	d = 8 - d;
		2221
2448	return d;	2222	return d;
2449	}	2223	}
2450		2224
2451	/* peterm:	2225	/* peterm:
2452	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2226	* 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	2229	* 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.	2230	* 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	2231	* Moved from spell_util.c to object.c with the other related direction
2458	* functions.	2232	* functions.
2459	*/	2233	*/
2460
2461	int
2462	reduction_dir[SIZEOFFREE][3] = {	2234	int reduction_dir[SIZEOFFREE][3] = {
2463	{0, 0, 0}, /* 0 */	2235	{0, 0, 0}, /* 0 */
2464	{0, 0, 0}, /* 1 */	2236	{0, 0, 0}, /* 1 */
2465	{0, 0, 0}, /* 2 */	2237	{0, 0, 0}, /* 2 */
2466	{0, 0, 0}, /* 3 */	2238	{0, 0, 0}, /* 3 */
2467	{0, 0, 0}, /* 4 */	2239	{0, 0, 0}, /* 4 */
…		…
2515	* find a path to that monster that we found. If not,	2287	* find a path to that monster that we found. If not,
2516	* we don't bother going toward it. Returns 1 if we	2288	* we don't bother going toward it. Returns 1 if we
2517	* can see a direct way to get it	2289	* can see a direct way to get it
2518	* Modified to be map tile aware -.MSW	2290	* Modified to be map tile aware -.MSW
2519	*/	2291	*/
2520
2521
2522	int	2292	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2293	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2294	{
2525	sint16 dx, dy;	2295	sint16 dx, dy;
2526	int
2527	mflags;	2296	int mflags;
2528		2297
2529	if (dir < 0)	2298	if (dir < 0)
2530	return 0; /* exit condition: invalid direction */	2299	return 0; /* exit condition: invalid direction */
2531		2300
2532	dx = x + freearr_x[dir];	2301	dx = x + freearr_x[dir];
…		…
2545	return 0;	2314	return 0;
2546		2315
2547	/* yes, can see. */	2316	/* yes, can see. */
2548	if (dir < 9)	2317	if (dir < 9)
2549	return 1;	2318	return 1;
		2319
2550	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2320	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]);	2321	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2322	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2552	}	2323	}
2553
2554
2555		2324
2556	/*	2325	/*
2557	* can_pick(picker, item): finds out if an object is possible to be	2326	* 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	2327	* picked up by the picker. Returnes 1 if it can be
2559	* picked up, otherwise 0.	2328	* picked up, otherwise 0.
…		…
2570	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2339	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2571	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2340	(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));	2341	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2573	}	2342	}
2574		2343
2575
2576	/*	2344	/*
2577	* create clone from object to another	2345	* create clone from object to another
2578	*/	2346	*/
2579	object *	2347	object *
2580	object_create_clone (object *asrc)	2348	object_create_clone (object *asrc)
2581	{	2349	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2350	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2351
2585	if (!asrc)	2352	if (!asrc)
2586	return NULL;	2353	return 0;
		2354
2587	src = asrc;	2355	src = asrc;
2588	if (src->head)	2356	if (src->head)
2589	src = src->head;	2357	src = src->head;
2590		2358
2591	prev = NULL;	2359	prev = 0;
2592	for (part = src; part; part = part->more)	2360	for (part = src; part; part = part->more)
2593	{	2361	{
2594	tmp = get_object ();	2362	tmp = part->clone ();
2595	copy_object (part, tmp);
2596	tmp->x -= src->x;	2363	tmp->x -= src->x;
2597	tmp->y -= src->y;	2364	tmp->y -= src->y;
		2365
2598	if (!part->head)	2366	if (!part->head)
2599	{	2367	{
2600	dst = tmp;	2368	dst = tmp;
2601	tmp->head = NULL;	2369	tmp->head = 0;
2602	}	2370	}
2603	else	2371	else
2604	{
2605	tmp->head = dst;	2372	tmp->head = dst;
2606	}	2373
2607	tmp->more = NULL;	2374	tmp->more = 0;
		2375
2608	if (prev)	2376	if (prev)
2609	prev->more = tmp;	2377	prev->more = tmp;
		2378
2610	prev = tmp;	2379	prev = tmp;
2611	}	2380	}
2612		2381
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2382	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2383	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2384
2619	return dst;	2385	return dst;
2620	}	2386	}
2621		2387
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. */	2388	/* 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 */	2389	/* 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, */	2390	/* 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. */	2391	/* 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. */	2392	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2393	/* Also remember that multiparts objects are not supported for now. */
2642
2643	object *	2394	object *
2644	load_object_str (const char *obstr)	2395	load_object_str (const char *obstr)
2645	{	2396	{
2646	object *	2397	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2398	char filename[MAX_BUF];
2650		2399
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2400	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2401
2653	FILE *
2654	tempfile = fopen (filename, "w");	2402	FILE *tempfile = fopen (filename, "w");
2655		2403
2656	if (tempfile == NULL)	2404	if (tempfile == NULL)
2657	{	2405	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2406	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2407	return NULL;
2660	};	2408	}
		2409
2661	fprintf (tempfile, obstr);	2410	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2411	fclose (tempfile);
2663		2412
2664	op = get_object ();	2413	op = object::create ();
2665		2414
2666	object_thawer thawer (filename);	2415	object_thawer thawer (filename);
2667		2416
2668	if (thawer)	2417	if (thawer)
2669	load_object (thawer, op, 0);	2418	load_object (thawer, op, 0);
…		…
2679	* returns NULL if no match.	2428	* returns NULL if no match.
2680	*/	2429	*/
2681	object *	2430	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2431	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2432	{
2684	object *
2685	tmp;
2686
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2433	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2434	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2435	return tmp;
2690		2436
2691	return NULL;	2437	return 0;
2692	}	2438	}
2693		2439
2694	/* If ob has a field named key, return the link from the list,	2440	/* If ob has a field named key, return the link from the list,
2695	* otherwise return NULL.	2441	* otherwise return NULL.
2696	*	2442	*
…		…
2698	* do the desired thing.	2444	* do the desired thing.
2699	*/	2445	*/
2700	key_value *	2446	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2447	get_ob_key_link (const object *ob, const char *key)
2702	{	2448	{
2703	key_value *
2704	link;
2705
2706	for (link = ob->key_values; link != NULL; link = link->next)	2449	for (key_value *link = ob->key_values; link; link = link->next)
2707	{
2708	if (link->key == key)	2450	if (link->key == key)
2709	{
2710	return link;	2451	return link;
2711	}
2712	}
2713		2452
2714	return NULL;	2453	return 0;
2715	}	2454	}
2716		2455
2717	/*	2456	/*
2718	* Returns the value of op has an extra_field for key, or NULL.	2457	* Returns the value of op has an extra_field for key, or NULL.
2719	*	2458	*
…		…
2759	* Returns TRUE on success.	2498	* Returns TRUE on success.
2760	*/	2499	*/
2761	int	2500	int
2762	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2501	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2763	{	2502	{
2764	key_value *
2765	field = NULL, *last = NULL;	2503	key_value *field = NULL, *last = NULL;
2766		2504
2767	for (field = op->key_values; field != NULL; field = field->next)	2505	for (field = op->key_values; field != NULL; field = field->next)
2768	{	2506	{
2769	if (field->key != canonical_key)	2507	if (field->key != canonical_key)
2770	{	2508	{
…		…
2798	/* IF we get here, key doesn't exist */	2536	/* IF we get here, key doesn't exist */
2799		2537
2800	/* No field, we'll have to add it. */	2538	/* No field, we'll have to add it. */
2801		2539
2802	if (!add_key)	2540	if (!add_key)
2803	{
2804	return FALSE;	2541	return FALSE;
2805	}	2542
2806	/* There isn't any good reason to store a null	2543	/* There isn't any good reason to store a null
2807	* value in the key/value list. If the archetype has	2544	* value in the key/value list. If the archetype has
2808	* this key, then we should also have it, so shouldn't	2545	* this key, then we should also have it, so shouldn't
2809	* be here. If user wants to store empty strings,	2546	* be here. If user wants to store empty strings,
2810	* should pass in ""	2547	* should pass in ""

Diff Legend

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