ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.38 by root, Wed Sep 13 01:09:24 2006 UTC vs.
Revision 1.79 by root, Sat Dec 23 06:30:49 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
		35	#include <bitset>
		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
37		40
38	object *objects; /* Pointer to the list of used objects */
39	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
40		42
41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	45	};
…		…
50	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	55	};
54		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
55	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56	static int	135	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	137	{
59	key_value *wants_field;	138	key_value *wants_field;
…		…
106	*	185	*
107	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
110	*	189	*
111	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
112	*	191	*
113	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
114	* check weight	193	* check weight
115	*/	194	*/
116		195
117	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	197	{
119	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
120	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
121	return 0;	204	return 0;
122		205
123	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
127	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
128	* used to store nrof).	209	* used to store nrof).
129	*/	210	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
140	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141		222
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		225
145		226	if ((ob1->flags ^ ob2->flags).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, 3);
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;
		487
		488	if (self || cb)
		489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
568		490
569	if (is_freed)	491	if (is_freed)
570	SET_FLAG (op, FLAG_FREED);	492	SET_FLAG (dst, FLAG_FREED);
		493
571	if (is_removed)	494	if (is_removed)
572	SET_FLAG (op, FLAG_REMOVED);	495	SET_FLAG (dst, FLAG_REMOVED);
573		496
574	if (op2->speed < 0)	497	if (speed < 0)
575	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
576		499
577	/* Copy over key_values, if any. */	500	/* Copy over key_values, if any. */
578	if (op2->key_values)	501	if (key_values)
579	{	502	{
580	key_value *tail = 0;	503	key_value *tail = 0;
581	key_value *i;	504	key_value *i;
582		505
583	op->key_values = 0;	506	dst->key_values = 0;
584		507
585	for (i = op2->key_values; i; i = i->next)	508	for (i = key_values; i; i = i->next)
586	{	509	{
587	key_value *new_link = new key_value;	510	key_value *new_link = new key_value;
588		511
589	new_link->next = 0;	512	new_link->next = 0;
590	new_link->key = i->key;	513	new_link->key = i->key;
591	new_link->value = i->value;	514	new_link->value = i->value;
592		515
593	/* Try and be clever here, too. */	516	/* Try and be clever here, too. */
594	if (!op->key_values)	517	if (!dst->key_values)
595	{	518	{
596	op->key_values = new_link;	519	dst->key_values = new_link;
597	tail = new_link;	520	tail = new_link;
598	}	521	}
599	else	522	else
600	{	523	{
601	tail->next = new_link;	524	tail->next = new_link;
602	tail = new_link;	525	tail = new_link;
603	}	526	}
604	}	527	}
605	}	528	}
606		529
607	update_ob_speed (op);	530	update_ob_speed (dst);
		531	}
		532
		533	object *
		534	object::clone ()
		535	{
		536	object *neu = create ();
		537	copy_to (neu);
		538	return neu;
608	}	539	}
609		540
610	/*	541	/*
611	* If an object with the IS_TURNABLE() flag needs to be turned due	542	* 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	543	* to the closest player being on the other side, this function can
…		…
720	op->active_next = NULL;	651	op->active_next = NULL;
721	op->active_prev = NULL;	652	op->active_prev = NULL;
722	}	653	}
723		654
724	/*	655	/*
725	* update_object() updates the array which represents the map.	656	* update_object() updates the the map.
726	* It takes into account invisible objects (and represent squares covered	657	* It takes into account invisible objects (and represent squares covered
727	* by invisible objects by whatever is below them (unless it's another	658	* by invisible objects by whatever is below them (unless it's another
728	* invisible object, etc...)	659	* invisible object, etc...)
729	* If the object being updated is beneath a player, the look-window	660	* 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	661	* of that player is updated (this might be a suboptimal way of
731	* updating that window, though, since update_object() is called _often_)	662	* updating that window, though, since update_object() is called _often_)
732	*	663	*
733	* action is a hint of what the caller believes need to be done.	664	* 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:	665	* current action are:
739	* UP_OBJ_INSERT: op was inserted	666	* UP_OBJ_INSERT: op was inserted
740	* UP_OBJ_REMOVE: op was removed	667	* UP_OBJ_REMOVE: op was removed
741	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	668	* 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.	669	* as that is easier than trying to look at what may have changed.
743	* UP_OBJ_FACE: only the objects face has changed.	670	* UP_OBJ_FACE: only the objects face has changed.
744	*/	671	*/
745
746	void	672	void
747	update_object (object *op, int action)	673	update_object (object *op, int action)
748	{	674	{
749	int update_now = 0, flags;
750	MoveType move_on, move_off, move_block, move_slow;	675	MoveType move_on, move_off, move_block, move_slow;
751		676
752	if (op == NULL)	677	if (op == NULL)
753	{	678	{
754	/* this should never happen */	679	/* this should never happen */
755	LOG (llevDebug, "update_object() called for NULL object.\n");	680	LOG (llevDebug, "update_object() called for NULL object.\n");
756	return;	681	return;
757	}	682	}
758		683
759	if (op->env != NULL)	684	if (op->env)
760	{	685	{
761	/* Animation is currently handled by client, so nothing	686	/* Animation is currently handled by client, so nothing
762	* to do in this case.	687	* to do in this case.
763	*/	688	*/
764	return;	689	return;
…		…
778	abort ();	703	abort ();
779	#endif	704	#endif
780	return;	705	return;
781	}	706	}
782		707
783	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	708	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		709
		710	if (m.flags_ & P_NEED_UPDATE)
		711	/* nop */;
790	if (action == UP_OBJ_INSERT)	712	else if (action == UP_OBJ_INSERT)
791	{	713	{
		714	// this is likely overkill, TODO: revisit (schmorp)
792	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	715	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))	716	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
796	update_now = 1;	717	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
797		718	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		719	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
798	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	720	|| (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)	721	|| (m.move_on | op->move_on ) != m.move_on
808	update_now = 1;
809
810	if ((move_off | op->move_off) != move_off)	722	|| (m.move_off | op->move_off ) != m.move_off
811	update_now = 1;	723	|| (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	724	/* This isn't perfect, but I don't expect a lot of objects to
814	* to have move_allow right now.	725	* to have move_allow right now.
815	*/	726	*/
816	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
817	update_now = 1;	728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
818		729	m.flags_ = P_NEED_UPDATE;
819	if ((move_slow | op->move_slow) != move_slow)
820	update_now = 1;
821	}	730	}
822	/* if the object is being removed, we can't make intelligent	731	/* if the object is being removed, we can't make intelligent
823	* decisions, because remove_ob can't really pass the object	732	* decisions, because remove_ob can't really pass the object
824	* that is being removed.	733	* that is being removed.
825	*/	734	*/
826	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
827	update_now = 1;	736	m.flags_ = P_NEED_UPDATE;
828	else if (action == UP_OBJ_FACE)	737	else if (action == UP_OBJ_FACE)
829	/* Nothing to do for that case */ ;	738	/* Nothing to do for that case */ ;
830	else	739	else
831	LOG (llevError, "update_object called with invalid action: %d\n", action);	740	LOG (llevError, "update_object called with invalid action: %d\n", action);
832		741
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)	742	if (op->more)
840	update_object (op->more, action);	743	update_object (op->more, action);
841	}	744	}
842		745
843	static unordered_vector<object *> mortals;	746	object::vector object::mortals;
844	static std::vector<object *, slice_allocator <object *> > freed;	747	object::vector object::objects; // not yet used
		748	object *object::first;
845		749
846	void object::free_mortals ()	750	void object::free_mortals ()
847	{	751	{
848	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849	if ((*i)->refcnt)	753	if ((*i)->refcnt)
850	++i; // further delay freeing	754	++i; // further delay freeing
851	else	755	else
852	{	756	{
853	freed.push_back (*i);//D
854	//delete *i;	757	delete *i;
855	mortals.erase (i);	758	mortals.erase (i);
856	}	759	}
857
858	if (mortals.size() && 0)//D
859	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
860	}	760	}
861		761
862	object::object ()	762	object::object ()
863	{	763	{
864	SET_FLAG (this, FLAG_REMOVED);	764	SET_FLAG (this, FLAG_REMOVED);
865		765
866	expmul = 1.0;	766	expmul = 1.0;
867	face = blank_face;	767	face = blank_face;
868	attacked_by_count = -1;
869	}	768	}
870		769
871	object::~object ()	770	object::~object ()
872	{	771	{
873	free_key_values (this);	772	free_key_values (this);
874	}	773	}
875		774
876	void object::link ()	775	void object::link ()
877	{	776	{
878	count = ++ob_count;	777	count = ++ob_count;
		778	uuid = gen_uuid ();
879		779
880	prev = 0;	780	prev = 0;
881	next = objects;	781	next = object::first;
882		782
883	if (objects)	783	if (object::first)
884	objects->prev = this;	784	object::first->prev = this;
885		785
886	objects = this;	786	object::first = this;
887	}	787	}
888		788
889	void object::unlink ()	789	void object::unlink ()
890	{	790	{
891	count = 0;
892
893	if (this == objects)	791	if (this == object::first)
894	objects = next;	792	object::first = next;
895		793
896	/* Remove this object from the list of used objects */	794	/* Remove this object from the list of used objects */
897	if (prev)
898	{
899	prev->next = next;	795	if (prev) prev->next = next;
		796	if (next) next->prev = prev;
		797
900	prev = 0;	798	prev = 0;
901	}
902
903	if (next)
904	{
905	next->prev = prev;
906	next = 0;	799	next = 0;
907	}
908	}	800	}
909		801
910	object *object::create ()	802	object *object::create ()
911	{	803	{
912	object *op;
913
914	if (freed.empty ())
915	op = new object;	804	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 ();	805	op->link ();
926	return op;	806	return op;
927	}	807	}
928		808
929	/*	809	/*
…		…
931	* it from the list of used objects, and puts it on the list of	811	* 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.	812	* free objects. The IS_FREED() flag is set in the object.
933	* The object must have been removed by remove_ob() first for	813	* The object must have been removed by remove_ob() first for
934	* this function to succeed.	814	* this function to succeed.
935	*	815	*
936	* If free_inventory is set, free inventory as well. Else drop items in	816	* If destroy_inventory is set, free inventory as well. Else drop items in
937	* inventory to the ground.	817	* inventory to the ground.
938	*/	818	*/
939	void object::free (bool free_inventory)	819	void object::destroy (bool destroy_inventory)
940	{	820	{
941	if (QUERY_FLAG (this, FLAG_FREED))	821	if (QUERY_FLAG (this, FLAG_FREED))
942	return;	822	return;
943		823
944	if (QUERY_FLAG (this, FLAG_FRIENDLY))	824	if (QUERY_FLAG (this, FLAG_FRIENDLY))
945	remove_friendly_object (this);	825	remove_friendly_object (this);
946		826
947	if (!QUERY_FLAG (this, FLAG_REMOVED))	827	if (!QUERY_FLAG (this, FLAG_REMOVED))
948	remove_ob (this);	828	remove ();
949		829
950	SET_FLAG (this, FLAG_FREED);	830	SET_FLAG (this, FLAG_FREED);
951		831
952	if (more)	832	if (more)
953	{	833	{
954	more->free (free_inventory);	834	more->destroy (destroy_inventory);
955	more = 0;	835	more = 0;
956	}	836	}
957		837
958	if (inv)	838	if (inv)
959	{	839	{
960	/* Only if the space blocks everything do we not process -	840	/* Only if the space blocks everything do we not process -
961	* if some form of movement is allowed, let objects	841	* if some form of movement is allowed, let objects
962	* drop on that space.	842	* drop on that space.
963	*/	843	*/
964	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
965	{	845	{
966	object *op = inv;	846	object *op = inv;
967		847
968	while (op)	848	while (op)
969	{	849	{
970	object *tmp = op->below;	850	object *tmp = op->below;
971	op->free (free_inventory);	851	op->destroy (destroy_inventory);
972	op = tmp;	852	op = tmp;
973	}	853	}
974	}	854	}
975	else	855	else
976	{ /* Put objects in inventory onto this space */	856	{ /* Put objects in inventory onto this space */
…		…
978		858
979	while (op)	859	while (op)
980	{	860	{
981	object *tmp = op->below;	861	object *tmp = op->below;
982		862
983	remove_ob (op);	863	op->remove ();
984		864
985	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	865	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))	866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
987	free_object (op);	867	op->destroy ();
988	else	868	else
989	{	869	{
990	op->x = x;	870	op->x = x;
991	op->y = y;	871	op->y = y;
992	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
995	op = tmp;	875	op = tmp;
996	}	876	}
997	}	877	}
998	}	878	}
999		879
		880	// hack to ensure that freed objects still have a valid map
		881	{
		882	static maptile *freed_map; // freed objects are moved here to avoid crashes
		883
		884	if (!freed_map)
		885	{
		886	freed_map = new maptile;
		887
		888	freed_map->name = "/internal/freed_objects_map";
		889	freed_map->width = 3;
		890	freed_map->height = 3;
		891
		892	freed_map->allocate ();
		893	}
		894
		895	map = freed_map;
		896	x = 1;
		897	y = 1;
		898	}
		899
		900	// clear those pointers that likely might have circular references to us
1000	owner = 0;	901	owner = 0;
		902	enemy = 0;
		903	attacked_by = 0;
		904
		905	// only relevant for players(?), but make sure of it anyways
		906	contr = 0;
1001		907
1002	/* Remove object from the active list */	908	/* Remove object from the active list */
1003	speed = 0;	909	speed = 0;
1004	update_ob_speed (this);	910	update_ob_speed (this);
1005		911
…		…
1010		916
1011	/*	917	/*
1012	* sub_weight() recursively (outwards) subtracts a number from the	918	* sub_weight() recursively (outwards) subtracts a number from the
1013	* weight of an object (and what is carried by it's environment(s)).	919	* weight of an object (and what is carried by it's environment(s)).
1014	*/	920	*/
1015
1016	void	921	void
1017	sub_weight (object *op, signed long weight)	922	sub_weight (object *op, signed long weight)
1018	{	923	{
1019	while (op != NULL)	924	while (op != NULL)
1020	{	925	{
1021	if (op->type == CONTAINER)	926	if (op->type == CONTAINER)
1022	{
1023	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	927	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024	}	928
1025	op->carrying -= weight;	929	op->carrying -= weight;
1026	op = op->env;	930	op = op->env;
1027	}	931	}
1028	}	932	}
1029		933
1030	/* remove_ob(op):	934	/* op->remove ():
1031	* This function removes the object op from the linked list of objects	935	* 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	936	* which it is currently tied to. When this function is done, the
1033	* object will have no environment. If the object previously had an	937	* object will have no environment. If the object previously had an
1034	* environment, the x and y coordinates will be updated to	938	* environment, the x and y coordinates will be updated to
1035	* the previous environment.	939	* the previous environment.
1036	* Beware: This function is called from the editor as well!	940	* Beware: This function is called from the editor as well!
1037	*/	941	*/
1038
1039	void	942	void
1040	remove_ob (object *op)	943	object::remove ()
1041	{	944	{
		945	object *tmp, *last = 0;
1042	object *	946	object *otmp;
1043	tmp, *
1044	last = NULL;
1045	object *
1046	otmp;
1047		947
1048	tag_t
1049	tag;
1050	int
1051	check_walk_off;	948	int check_walk_off;
1052	mapstruct *
1053	m;
1054		949
1055	sint16
1056	x,
1057	y;
1058
1059	if (QUERY_FLAG (op, FLAG_REMOVED))	950	if (QUERY_FLAG (this, FLAG_REMOVED))
1060	return;	951	return;
1061		952
1062	SET_FLAG (op, FLAG_REMOVED);	953	SET_FLAG (this, FLAG_REMOVED);
1063		954
1064	if (op->more != NULL)	955	if (more)
1065	remove_ob (op->more);	956	more->remove ();
1066		957
1067	/*	958	/*
1068	* In this case, the object to be removed is in someones	959	* In this case, the object to be removed is in someones
1069	* inventory.	960	* inventory.
1070	*/	961	*/
1071	if (op->env != NULL)	962	if (env)
1072	{	963	{
1073	if (op->nrof)	964	if (nrof)
1074	sub_weight (op->env, op->weight * op->nrof);	965	sub_weight (env, weight * nrof);
1075	else	966	else
1076	sub_weight (op->env, op->weight + op->carrying);	967	sub_weight (env, weight + carrying);
1077		968
1078	/* NO_FIX_PLAYER is set when a great many changes are being	969	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	970	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	971	* to save cpu time.
1081	*/	972	*/
1082	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1083	fix_player (otmp);	974	otmp->update_stats ();
1084		975
1085	if (op->above != NULL)	976	if (above != NULL)
1086	op->above->below = op->below;	977	above->below = below;
1087	else	978	else
1088	op->env->inv = op->below;	979	env->inv = below;
1089		980
1090	if (op->below != NULL)	981	if (below != NULL)
1091	op->below->above = op->above;	982	below->above = above;
1092		983
1093	/* we set up values so that it could be inserted into	984	/* we set up values so that it could be inserted into
1094	* the map, but we don't actually do that - it is up	985	* the map, but we don't actually do that - it is up
1095	* to the caller to decide what we want to do.	986	* to the caller to decide what we want to do.
1096	*/	987	*/
1097	op->x = op->env->x, op->y = op->env->y;	988	x = env->x, y = env->y;
1098	op->map = op->env->map;	989	map = env->map;
1099	op->above = NULL, op->below = NULL;	990	above = 0, below = 0;
1100	op->env = NULL;	991	env = 0;
1101	}	992	}
1102	else if (op->map)	993	else if (map)
1103	{	994	{
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	995	/* Re did the following section of code - it looks like it had
1124	* lots of logic for things we no longer care about	996	* lots of logic for things we no longer care about
1125	*/	997	*/
1126		998
1127	/* link the object above us */	999	/* link the object above us */
1128	if (op->above)	1000	if (above)
1129	op->above->below = op->below;	1001	above->below = below;
1130	else	1002	else
1131	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1003	map->at (x, y).top = below; /* we were top, set new top */
1132		1004
1133	/* Relink the object below us, if there is one */	1005	/* Relink the object below us, if there is one */
1134	if (op->below)	1006	if (below)
1135	op->below->above = op->above;	1007	below->above = above;
1136	else	1008	else
1137	{	1009	{
1138	/* Nothing below, which means we need to relink map object for this space	1010	/* 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	1011	* use translated coordinates in case some oddness with map tiling is
1140	* evident	1012	* evident
1141	*/	1013	*/
1142	if (GET_MAP_OB (m, x, y) != op)	1014	if (GET_MAP_OB (map, x, y) != this)
1143	{	1015	{
1144	dump_object (op);	1016	char *dump = dump_object (this);
1145	LOG (llevError,	1017	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);	1018	"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);
		1019	free (dump);
1147	dump_object (GET_MAP_OB (m, x, y));	1020	dump = dump_object (GET_MAP_OB (map, x, y));
1148	LOG (llevError, "%s\n", errmsg);	1021	LOG (llevError, "%s\n", dump);
		1022	free (dump);
1149	}	1023	}
1150		1024
1151	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1025	map->at (x, y).bottom = above; /* goes on above it. */
1152	}	1026	}
1153		1027
1154	op->above = 0;	1028	above = 0;
1155	op->below = 0;	1029	below = 0;
1156		1030
1157	if (op->map->in_memory == MAP_SAVING)	1031	if (map->in_memory == MAP_SAVING)
1158	return;	1032	return;
1159		1033
1160	tag = op->count;
1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1162		1035
1163	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1164	{	1037	{
1165	/* No point updating the players look faces if he is the object	1038	/* No point updating the players look faces if he is the object
1166	* being removed.	1039	* being removed.
1167	*/	1040	*/
1168		1041
1169	if (tmp->type == PLAYER && tmp != op)	1042	if (tmp->type == PLAYER && tmp != this)
1170	{	1043	{
1171	/* If a container that the player is currently using somehow gets	1044	/* If a container that the player is currently using somehow gets
1172	* removed (most likely destroyed), update the player view	1045	* removed (most likely destroyed), update the player view
1173	* appropriately.	1046	* appropriately.
1174	*/	1047	*/
1175	if (tmp->container == op)	1048	if (tmp->container == this)
1176	{	1049	{
1177	CLEAR_FLAG (op, FLAG_APPLIED);	1050	CLEAR_FLAG (this, FLAG_APPLIED);
1178	tmp->container = NULL;	1051	tmp->container = 0;
1179	}	1052	}
1180		1053
1181	tmp->contr->socket.update_look = 1;	1054	tmp->contr->ns->floorbox_update ();
1182	}	1055	}
1183		1056
1184	/* See if player moving off should effect something */	1057	/* 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))	1058	if (check_walk_off
		1059	&& ((move_type & tmp->move_off)
		1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186	{	1061	{
1187	move_apply (tmp, op, NULL);	1062	move_apply (tmp, this, 0);
1188		1063
1189	if (was_destroyed (op, tag))	1064	if (destroyed ())
1190	{
1191	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192	}
1193	}	1066	}
1194		1067
1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196		1069
1197	if (tmp->above == tmp)	1070	if (tmp->above == tmp)
1198	tmp->above = NULL;	1071	tmp->above = 0;
1199		1072
1200	last = tmp;	1073	last = tmp;
1201	}	1074	}
1202		1075
1203	/* last == NULL of there are no objects on this space */	1076	/* last == NULL of there are no objects on this space */
1204	if (last == NULL)	1077	if (!last)
1205	{	1078	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	1079	else
1215	update_object (last, UP_OBJ_REMOVE);	1080	update_object (last, UP_OBJ_REMOVE);
1216		1081
1217	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1218	update_all_los (op->map, op->x, op->y);	1083	update_all_los (map, x, y);
1219	}	1084	}
1220	}	1085	}
1221		1086
1222	/*	1087	/*
1223	* merge_ob(op,top):	1088	* merge_ob(op,top):
…		…
1238		1103
1239	for (; top != NULL; top = top->below)	1104	for (; top != NULL; top = top->below)
1240	{	1105	{
1241	if (top == op)	1106	if (top == op)
1242	continue;	1107	continue;
1243	if (CAN_MERGE (op, top))	1108
		1109	if (object::can_merge (op, top))
1244	{	1110	{
1245	top->nrof += op->nrof;	1111	top->nrof += op->nrof;
1246		1112
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1113	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1114	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1115	op->destroy ();
1250	free_object (op);
1251	return top;	1116	return top;
1252	}	1117	}
1253	}	1118	}
1254		1119
1255	return NULL;	1120	return 0;
1256	}	1121	}
1257		1122
1258	/*	1123	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1125	* job preparing multi-part monsters
1261	*/	1126	*/
1262	object *	1127	object *
1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264	{	1129	{
1265	object *tmp;	1130	object *tmp;
1266		1131
1267	if (op->head)	1132	if (op->head)
1268	op = op->head;	1133	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1161	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1162	* just 'op' otherwise
1298	*/	1163	*/
1299		1164
1300	object *	1165	object *
1301	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302	{	1167	{
1303	object *tmp, *top, *floor = NULL;	1168	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1169	sint16 x, y;
1305		1170
1306	if (QUERY_FLAG (op, FLAG_FREED))	1171	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1174	return NULL;
1310	}	1175	}
1311		1176
1312	if (m == NULL)	1177	if (m == NULL)
1313	{	1178	{
1314	dump_object (op);	1179	char *dump = dump_object (op);
1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1181	free (dump);
1316	return op;	1182	return op;
1317	}	1183	}
1318		1184
1319	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1320	{	1186	{
1321	dump_object (op);	1187	char *dump = dump_object (op);
1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323	#ifdef MANY_CORES	1189	#ifdef MANY_CORES
1324	/* Better to catch this here, as otherwise the next use of this object	1190	/* 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	1191	* is likely to cause a crash. Better to find out where it is getting
1326	* improperly inserted.	1192	* improperly inserted.
1327	*/	1193	*/
1328	abort ();	1194	abort ();
1329	#endif	1195	#endif
		1196	free (dump);
1330	return op;	1197	return op;
1331	}	1198	}
1332		1199
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1201	{
1335	dump_object (op);	1202	char *dump = dump_object (op);
1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1204	free (dump);
1337	return op;	1205	return op;
1338	}	1206	}
1339		1207
1340	if (op->more != NULL)	1208	if (op->more != NULL)
1341	{	1209	{
…		…
1379		1247
1380	/* this has to be done after we translate the coordinates.	1248	/* this has to be done after we translate the coordinates.
1381	*/	1249	*/
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1250	if (op->nrof && !(flag & INS_NO_MERGE))
1383	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1384	if (CAN_MERGE (op, tmp))	1252	if (object::can_merge (op, tmp))
1385	{	1253	{
1386	op->nrof += tmp->nrof;	1254	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1255	tmp->destroy ();
1388	free_object (tmp);
1389	}	1256	}
1390		1257
1391	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1258	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1259	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1260
…		…
1406	op->below = originator->below;	1273	op->below = originator->below;
1407		1274
1408	if (op->below)	1275	if (op->below)
1409	op->below->above = op;	1276	op->below->above = op;
1410	else	1277	else
1411	SET_MAP_OB (op->map, op->x, op->y, op);	1278	op->ms ().bottom = op;
1412		1279
1413	/* since *below* originator, no need to update top */	1280	/* since *below* originator, no need to update top */
1414	originator->below = op;	1281	originator->below = op;
1415	}	1282	}
1416	else	1283	else
…		…
1462	* If INS_ON_TOP is used, don't do this processing	1329	* If INS_ON_TOP is used, don't do this processing
1463	* Need to find the object that in fact blocks view, otherwise	1330	* Need to find the object that in fact blocks view, otherwise
1464	* stacking is a bit odd.	1331	* stacking is a bit odd.
1465	*/	1332	*/
1466	if (!(flag & INS_ON_TOP) &&	1333	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))	1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1468	{	1335	{
1469	for (last = top; last != floor; last = last->below)	1336	for (last = top; last != floor; last = last->below)
1470	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1471	break;	1338	break;
1472	/* Check to see if we found the object that blocks view,	1339	/* Check to see if we found the object that blocks view,
…		…
1495		1362
1496	if (op->above)	1363	if (op->above)
1497	op->above->below = op;	1364	op->above->below = op;
1498		1365
1499	op->below = NULL;	1366	op->below = NULL;
1500	SET_MAP_OB (op->map, op->x, op->y, op);	1367	op->ms ().bottom = op;
1501	}	1368	}
1502	else	1369	else
1503	{ /* get inserted into the stack above top */	1370	{ /* get inserted into the stack above top */
1504	op->above = top->above;	1371	op->above = top->above;
1505		1372
…		…
1509	op->below = top;	1376	op->below = top;
1510	top->above = op;	1377	top->above = op;
1511	}	1378	}
1512		1379
1513	if (op->above == NULL)	1380	if (op->above == NULL)
1514	SET_MAP_TOP (op->map, op->x, op->y, op);	1381	op->ms ().top = op;
1515	} /* else not INS_BELOW_ORIGINATOR */	1382	} /* else not INS_BELOW_ORIGINATOR */
1516		1383
1517	if (op->type == PLAYER)	1384	if (op->type == PLAYER)
1518	op->contr->do_los = 1;	1385	op->contr->do_los = 1;
1519		1386
1520	/* If we have a floor, we know the player, if any, will be above	1387	/* 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.	1388	* it, so save a few ticks and start from there.
1522	*/	1389	*/
1523	if (!(flag & INS_MAP_LOAD))	1390	if (!(flag & INS_MAP_LOAD))
1524	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1391	if (object *pl = op->ms ().player ())
1525	if (tmp->type == PLAYER)	1392	pl->contr->ns->floorbox_update ();
1526	tmp->contr->socket.update_look = 1;
1527		1393
1528	/* If this object glows, it may affect lighting conditions that are	1394	/* If this object glows, it may affect lighting conditions that are
1529	* visible to others on this map. But update_all_los is really	1395	* 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	1396	* 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	1397	* on the map will get recalculated. The players could very well
…		…
1539		1405
1540	/* updates flags (blocked, alive, no magic, etc) for this map space */	1406	/* updates flags (blocked, alive, no magic, etc) for this map space */
1541	update_object (op, UP_OBJ_INSERT);	1407	update_object (op, UP_OBJ_INSERT);
1542		1408
1543	/* Don't know if moving this to the end will break anything. However,	1409	/* 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.	1410	* we want to have floorbox_update called before calling this.
1545	*	1411	*
1546	* check_move_on() must be after this because code called from	1412	* check_move_on() must be after this because code called from
1547	* check_move_on() depends on correct map flags (so functions like	1413	* check_move_on() depends on correct map flags (so functions like
1548	* blocked() and wall() work properly), and these flags are updated by	1414	* blocked() and wall() work properly), and these flags are updated by
1549	* update_object().	1415	* update_object().
…		…
1565		1431
1566	return op;	1432	return op;
1567	}	1433	}
1568		1434
1569	/* this function inserts an object in the map, but if it	1435	/* 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.	1436	* 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.	1437	* op is the object to insert it under: supplies x and the map.
1572	*/	1438	*/
1573	void	1439	void
1574	replace_insert_ob_in_map (const char *arch_string, object *op)	1440	replace_insert_ob_in_map (const char *arch_string, object *op)
1575	{	1441	{
1576	object *	1442	object *tmp, *tmp1;
1577	tmp;
1578	object *
1579	tmp1;
1580		1443
1581	/* first search for itself and remove any old instances */	1444	/* first search for itself and remove any old instances */
1582		1445
1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1446	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 */	1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1448	tmp->destroy ();
1587	remove_ob (tmp);
1588	free_object (tmp);
1589	}
1590	}
1591		1449
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1450	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1451
1594	tmp1->x = op->x;	1452	tmp1->x = op->x;
1595	tmp1->y = op->y;	1453	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1454	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1455	}
…		…
1605	*/	1463	*/
1606		1464
1607	object *	1465	object *
1608	get_split_ob (object *orig_ob, uint32 nr)	1466	get_split_ob (object *orig_ob, uint32 nr)
1609	{	1467	{
1610	object *	1468	object *newob;
1611	newob;
1612	int
1613	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614		1470
1615	if (orig_ob->nrof < nr)	1471	if (orig_ob->nrof < nr)
1616	{	1472	{
1617	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1473	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1618	return NULL;	1474	return NULL;
1619	}	1475	}
1620		1476
1621	newob = object_create_clone (orig_ob);	1477	newob = object_create_clone (orig_ob);
1622		1478
1623	if ((orig_ob->nrof -= nr) < 1)	1479	if ((orig_ob->nrof -= nr) < 1)
1624	{	1480	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)	1481	else if (!is_removed)
1630	{	1482	{
1631	if (orig_ob->env != NULL)	1483	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1484	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1485	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1663	if (i > op->nrof)	1515	if (i > op->nrof)
1664	i = op->nrof;	1516	i = op->nrof;
1665		1517
1666	if (QUERY_FLAG (op, FLAG_REMOVED))	1518	if (QUERY_FLAG (op, FLAG_REMOVED))
1667	op->nrof -= i;	1519	op->nrof -= i;
1668	else if (op->env != NULL)	1520	else if (op->env)
1669	{	1521	{
1670	/* is this object in the players inventory, or sub container	1522	/* is this object in the players inventory, or sub container
1671	* therein?	1523	* therein?
1672	*/	1524	*/
1673	tmp = is_player_inv (op->env);	1525	tmp = op->in_player ();
1674	/* nope. Is this a container the player has opened?	1526	/* nope. Is this a container the player has opened?
1675	* If so, set tmp to that player.	1527	* If so, set tmp to that player.
1676	* IMO, searching through all the players will mostly	1528	* IMO, searching through all the players will mostly
1677	* likely be quicker than following op->env to the map,	1529	* likely be quicker than following op->env to the map,
1678	* and then searching the map for a player.	1530	* and then searching the map for a player.
1679	*/	1531	*/
1680	if (!tmp)	1532	if (!tmp)
1681	{	1533	{
1682	for (pl = first_player; pl; pl = pl->next)	1534	for (pl = first_player; pl; pl = pl->next)
1683	if (pl->ob->container == op->env)	1535	if (pl->ob->container == op->env)
		1536	{
		1537	tmp = pl->ob;
1684	break;	1538	break;
1685	if (pl)	1539	}
1686	tmp = pl->ob;
1687	else
1688	tmp = NULL;
1689	}	1540	}
1690		1541
1691	if (i < op->nrof)	1542	if (i < op->nrof)
1692	{	1543	{
1693	sub_weight (op->env, op->weight * i);	1544	sub_weight (op->env, op->weight * i);
1694	op->nrof -= i;	1545	op->nrof -= i;
1695	if (tmp)	1546	if (tmp)
1696	{
1697	esrv_send_item (tmp, op);	1547	esrv_send_item (tmp, op);
1698	}
1699	}	1548	}
1700	else	1549	else
1701	{	1550	{
1702	remove_ob (op);	1551	op->remove ();
1703	op->nrof = 0;	1552	op->nrof = 0;
1704	if (tmp)	1553	if (tmp)
1705	{
1706	esrv_del_item (tmp->contr, op->count);	1554	esrv_del_item (tmp->contr, op->count);
1707	}
1708	}	1555	}
1709	}	1556	}
1710	else	1557	else
1711	{	1558	{
1712	object *above = op->above;	1559	object *above = op->above;
1713		1560
1714	if (i < op->nrof)	1561	if (i < op->nrof)
1715	op->nrof -= i;	1562	op->nrof -= i;
1716	else	1563	else
1717	{	1564	{
1718	remove_ob (op);	1565	op->remove ();
1719	op->nrof = 0;	1566	op->nrof = 0;
1720	}	1567	}
1721		1568
1722	/* Since we just removed op, op->above is null */	1569	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1570	for (tmp = above; tmp; tmp = tmp->above)
1724	if (tmp->type == PLAYER)	1571	if (tmp->type == PLAYER)
1725	{	1572	{
1726	if (op->nrof)	1573	if (op->nrof)
1727	esrv_send_item (tmp, op);	1574	esrv_send_item (tmp, op);
1728	else	1575	else
…		…
1732		1579
1733	if (op->nrof)	1580	if (op->nrof)
1734	return op;	1581	return op;
1735	else	1582	else
1736	{	1583	{
1737	free_object (op);	1584	op->destroy ();
1738	return NULL;	1585	return 0;
1739	}	1586	}
1740	}	1587	}
1741		1588
1742	/*	1589	/*
1743	* add_weight(object, weight) adds the specified weight to an object,	1590	* add_weight(object, weight) adds the specified weight to an object,
…		…
1755	op->carrying += weight;	1602	op->carrying += weight;
1756	op = op->env;	1603	op = op->env;
1757	}	1604	}
1758	}	1605	}
1759		1606
		1607	object *
		1608	insert_ob_in_ob (object *op, object *where)
		1609	{
		1610	if (!where)
		1611	{
		1612	char *dump = dump_object (op);
		1613	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1614	free (dump);
		1615	return op;
		1616	}
		1617
		1618	if (where->head)
		1619	{
		1620	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1621	where = where->head;
		1622	}
		1623
		1624	return where->insert (op);
		1625	}
		1626
1760	/*	1627	/*
1761	* insert_ob_in_ob(op,environment):	1628	* env->insert (op)
1762	* This function inserts the object op in the linked list	1629	* This function inserts the object op in the linked list
1763	* inside the object environment.	1630	* inside the object environment.
1764	*	1631	*
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	1632	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1633	* be != op, if items are merged. -Tero
1772	*/	1634	*/
1773		1635
1774	object *	1636	object *
1775	insert_ob_in_ob (object *op, object *where)	1637	object::insert (object *op)
1776	{	1638	{
1777	object *	1639	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1640
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1641	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1642	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		1643
1801	if (op->more)	1644	if (op->more)
1802	{	1645	{
1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1646	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804	return op;	1647	return op;
…		…
1806		1649
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1650	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1651	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1652	if (op->nrof)
1810	{	1653	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1654	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1655	if (object::can_merge (tmp, op))
1813	{	1656	{
1814	/* return the original object and remove inserted object	1657	/* return the original object and remove inserted object
1815	(client needs the original object) */	1658	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1659	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1660	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1661	* tmp->nrof, we need to increase the weight.
1819	*/	1662	*/
1820	add_weight (where, op->weight * op->nrof);	1663	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1664	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1665	op->destroy (); /* free the inserted object */
1823	op = tmp;	1666	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1667	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1669	break;
1827	}	1670	}
1828		1671
1829	/* I assume combined objects have no inventory	1672	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1673	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1674	* (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	1675	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1676	* the linking below
1834	*/	1677	*/
1835	add_weight (where, op->weight * op->nrof);	1678	add_weight (this, op->weight * op->nrof);
1836	}	1679	}
1837	else	1680	else
1838	add_weight (where, (op->weight + op->carrying));	1681	add_weight (this, (op->weight + op->carrying));
1839		1682
1840	otmp = is_player_inv (where);	1683	otmp = this->in_player ();
1841	if (otmp && otmp->contr != NULL)	1684	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1685	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1686	otmp->update_stats ();
1845	}
1846		1687
1847	op->map = NULL;	1688	op->map = 0;
1848	op->env = where;	1689	op->env = this;
1849	op->above = NULL;	1690	op->above = 0;
1850	op->below = NULL;	1691	op->below = 0;
1851	op->x = 0, op->y = 0;	1692	op->x = 0, op->y = 0;
1852		1693
1853	/* reset the light list and los of the players on the map */	1694	/* reset the light list and los of the players on the map */
1854	if ((op->glow_radius != 0) && where->map)	1695	if ((op->glow_radius != 0) && map)
1855	{	1696	{
1856	#ifdef DEBUG_LIGHTS	1697	#ifdef DEBUG_LIGHTS
1857	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1698	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858	#endif /* DEBUG_LIGHTS */	1699	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1700	if (MAP_DARKNESS (map))
1860	update_all_los (where->map, where->x, where->y);	1701	update_all_los (map, x, y);
1861	}	1702	}
1862		1703
1863	/* Client has no idea of ordering so lets not bother ordering it here.	1704	/* Client has no idea of ordering so lets not bother ordering it here.
1864	* It sure simplifies this function...	1705	* It sure simplifies this function...
1865	*/	1706	*/
1866	if (where->inv == NULL)	1707	if (!inv)
1867	where->inv = op;	1708	inv = op;
1868	else	1709	else
1869	{	1710	{
1870	op->below = where->inv;	1711	op->below = inv;
1871	op->below->above = op;	1712	op->below->above = op;
1872	where->inv = op;	1713	inv = op;
1873	}	1714	}
		1715
1874	return op;	1716	return op;
1875	}	1717	}
1876		1718
1877	/*	1719	/*
1878	* Checks if any objects has a move_type that matches objects	1720	* Checks if any objects has a move_type that matches objects
…		…
1896	*/	1738	*/
1897		1739
1898	int	1740	int
1899	check_move_on (object *op, object *originator)	1741	check_move_on (object *op, object *originator)
1900	{	1742	{
1901	object *	1743	object *tmp;
1902	tmp;	1744	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1745	int x = op->x, y = op->y;
1909		1746
1910	MoveType	1747	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1748
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1749	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1750	return 0;
1917
1918	tag = op->count;
1919		1751
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1752	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);	1753	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);	1754	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1755
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1816	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))	1817	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1818	{
1987	move_apply (tmp, op, originator);	1819	move_apply (tmp, op, originator);
1988		1820
1989	if (was_destroyed (op, tag))	1821	if (op->destroyed ())
1990	return 1;	1822	return 1;
1991		1823
1992	/* what the person/creature stepped onto has moved the object	1824	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1825	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1826	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1838	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1839	* The first matching object is returned, or NULL if none.
2008	*/	1840	*/
2009		1841
2010	object *	1842	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1843	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1844	{
2013	object *	1845	object *
2014	tmp;	1846	tmp;
2015		1847
2016	if (m == NULL || out_of_map (m, x, y))	1848	if (m == NULL || out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	1861	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1862	* The first matching object is returned, or NULL if none.
2031	*/	1863	*/
2032		1864
2033	object *	1865	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1866	present (unsigned char type, maptile *m, int x, int y)
2035	{	1867	{
2036	object *	1868	object *
2037	tmp;	1869	tmp;
2038		1870
2039	if (out_of_map (m, x, y))	1871	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2011	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2012	* customized, changed states, etc.
2181	*/	2013	*/
2182		2014
2183	int	2015	int
2184	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2016	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185	{	2017	{
2186	int	2018	int
2187	i,	2019	i,
2188	index = 0, flag;	2020	index = 0, flag;
2189	static int	2021	static int
…		…
2201	* if the space being examined only has a wall to the north and empty	2033	* 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	2034	* spaces in all the other directions, this will reduce the search space
2203	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
2204	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
2205	*/	2037	*/
2206	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2038	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2207	stop = maxfree[i];	2039	stop = maxfree[i];
2208	}	2040	}
		2041
2209	if (!index)	2042	if (!index)
2210	return -1;	2043	return -1;
		2044
2211	return altern[RANDOM () % index];	2045	return altern[RANDOM () % index];
2212	}	2046	}
2213		2047
2214	/*	2048	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2049	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2050	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2051	* 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.	2052	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2053	*/
2220		2054
2221	int	2055	int
2222	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2056	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223	{	2057	{
2224	int	2058	int
2225	i;	2059	i;
2226		2060
2227	for (i = 0; i < SIZEOFFREE; i++)	2061	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2125	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2126	* there is capable of.
2293	*/	2127	*/
2294		2128
2295	int	2129	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2130	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2131	{
2298	int	2132	int
2299	i,	2133	i,
2300	max = SIZEOFFREE, mflags;	2134	max = SIZEOFFREE, mflags;
2301		2135
2302	sint16 nx, ny;	2136	sint16 nx, ny;
2303	object *	2137	object *
2304	tmp;	2138	tmp;
2305	mapstruct *	2139	maptile *
2306	mp;	2140	mp;
2307		2141
2308	MoveType blocked, move_type;	2142	MoveType blocked, move_type;
2309		2143
2310	if (exclude && exclude->head)	2144	if (exclude && exclude->head)
…		…
2323	mp = m;	2157	mp = m;
2324	nx = x + freearr_x[i];	2158	nx = x + freearr_x[i];
2325	ny = y + freearr_y[i];	2159	ny = y + freearr_y[i];
2326		2160
2327	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2161	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2162
2328	if (mflags & P_OUT_OF_MAP)	2163	if (mflags & P_OUT_OF_MAP)
2329	{
2330	max = maxfree[i];	2164	max = maxfree[i];
2331	}
2332	else	2165	else
2333	{	2166	{
2334	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2167	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2335		2168
2336	if ((move_type & blocked) == move_type)	2169	if ((move_type & blocked) == move_type)
2337	{
2338	max = maxfree[i];	2170	max = maxfree[i];
2339	}
2340	else if (mflags & P_IS_ALIVE)	2171	else if (mflags & P_IS_ALIVE)
2341	{	2172	{
2342	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2173	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2343	{
2344	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2174	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2345	{
2346	break;	2175	break;
2347	}	2176
2348	}
2349	if (tmp)	2177	if (tmp)
2350	{
2351	return freedir[i];	2178	return freedir[i];
2352	}
2353	}	2179	}
2354	}	2180	}
2355	}	2181	}
		2182
2356	return 0;	2183	return 0;
2357	}	2184	}
2358		2185
2359	/*	2186	/*
2360	* distance(object 1, object 2) will return the square of the	2187	* distance(object 1, object 2) will return the square of the
…		…
2362	*/	2189	*/
2363		2190
2364	int	2191	int
2365	distance (const object *ob1, const object *ob2)	2192	distance (const object *ob1, const object *ob2)
2366	{	2193	{
2367	int	2194	int i;
2368	i;
2369		2195
2370	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2196	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2371	return i;	2197	return i;
2372	}	2198	}
2373		2199
…		…
2378	*/	2204	*/
2379		2205
2380	int	2206	int
2381	find_dir_2 (int x, int y)	2207	find_dir_2 (int x, int y)
2382	{	2208	{
2383	int	2209	int q;
2384	q;
2385		2210
2386	if (y)	2211	if (y)
2387	q = x * 100 / y;	2212	q = x * 100 / y;
2388	else if (x)	2213	else if (x)
2389	q = -300 * x;	2214	q = -300 * x;
…		…
2515	* find a path to that monster that we found. If not,	2340	* find a path to that monster that we found. If not,
2516	* we don't bother going toward it. Returns 1 if we	2341	* we don't bother going toward it. Returns 1 if we
2517	* can see a direct way to get it	2342	* can see a direct way to get it
2518	* Modified to be map tile aware -.MSW	2343	* Modified to be map tile aware -.MSW
2519	*/	2344	*/
2520
2521
2522	int	2345	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2346	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2347	{
2525	sint16 dx, dy;	2348	sint16 dx, dy;
2526	int
2527	mflags;	2349	int mflags;
2528		2350
2529	if (dir < 0)	2351	if (dir < 0)
2530	return 0; /* exit condition: invalid direction */	2352	return 0; /* exit condition: invalid direction */
2531		2353
2532	dx = x + freearr_x[dir];	2354	dx = x + freearr_x[dir];
…		…
2545	return 0;	2367	return 0;
2546		2368
2547	/* yes, can see. */	2369	/* yes, can see. */
2548	if (dir < 9)	2370	if (dir < 9)
2549	return 1;	2371	return 1;
		2372
2550	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2373	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]);	2374	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2375	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2552	}	2376	}
2553
2554
2555		2377
2556	/*	2378	/*
2557	* can_pick(picker, item): finds out if an object is possible to be	2379	* 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	2380	* picked up by the picker. Returnes 1 if it can be
2559	* picked up, otherwise 0.	2381	* picked up, otherwise 0.
…		…
2570	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2392	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2571	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2393	(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));	2394	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2573	}	2395	}
2574		2396
2575
2576	/*	2397	/*
2577	* create clone from object to another	2398	* create clone from object to another
2578	*/	2399	*/
2579	object *	2400	object *
2580	object_create_clone (object *asrc)	2401	object_create_clone (object *asrc)
2581	{	2402	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2403	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2404
2585	if (!asrc)	2405	if (!asrc)
2586	return NULL;	2406	return 0;
		2407
2587	src = asrc;	2408	src = asrc;
2588	if (src->head)	2409	if (src->head)
2589	src = src->head;	2410	src = src->head;
2590		2411
2591	prev = NULL;	2412	prev = 0;
2592	for (part = src; part; part = part->more)	2413	for (part = src; part; part = part->more)
2593	{	2414	{
2594	tmp = get_object ();	2415	tmp = part->clone ();
2595	copy_object (part, tmp);
2596	tmp->x -= src->x;	2416	tmp->x -= src->x;
2597	tmp->y -= src->y;	2417	tmp->y -= src->y;
		2418
2598	if (!part->head)	2419	if (!part->head)
2599	{	2420	{
2600	dst = tmp;	2421	dst = tmp;
2601	tmp->head = NULL;	2422	tmp->head = 0;
2602	}	2423	}
2603	else	2424	else
2604	{
2605	tmp->head = dst;	2425	tmp->head = dst;
2606	}	2426
2607	tmp->more = NULL;	2427	tmp->more = 0;
		2428
2608	if (prev)	2429	if (prev)
2609	prev->more = tmp;	2430	prev->more = tmp;
		2431
2610	prev = tmp;	2432	prev = tmp;
2611	}	2433	}
2612		2434
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2435	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2436	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2437
2619	return dst;	2438	return dst;
2620	}	2439	}
2621		2440
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. */	2441	/* 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 */	2442	/* 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, */	2443	/* 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. */	2444	/* 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. */	2445	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2446	/* Also remember that multiparts objects are not supported for now. */
2642		2447
2643	object *	2448	object *
2644	load_object_str (const char *obstr)	2449	load_object_str (const char *obstr)
2645	{	2450	{
2646	object *	2451	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2452	char filename[MAX_BUF];
2650		2453
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2454	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2455
2653	FILE *
2654	tempfile = fopen (filename, "w");	2456	FILE *tempfile = fopen (filename, "w");
2655		2457
2656	if (tempfile == NULL)	2458	if (tempfile == NULL)
2657	{	2459	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2460	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2461	return NULL;
2660	};	2462	}
		2463
2661	fprintf (tempfile, obstr);	2464	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2465	fclose (tempfile);
2663		2466
2664	op = get_object ();	2467	op = object::create ();
2665		2468
2666	object_thawer thawer (filename);	2469	object_thawer thawer (filename);
2667		2470
2668	if (thawer)	2471	if (thawer)
2669	load_object (thawer, op, 0);	2472	load_object (thawer, op, 0);
…		…
2679	* returns NULL if no match.	2482	* returns NULL if no match.
2680	*/	2483	*/
2681	object *	2484	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2485	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2486	{
2684	object *	2487	object *tmp;
2685	tmp;
2686		2488
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2489	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2490	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2491	return tmp;
2690		2492
…		…
2698	* do the desired thing.	2500	* do the desired thing.
2699	*/	2501	*/
2700	key_value *	2502	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2503	get_ob_key_link (const object *ob, const char *key)
2702	{	2504	{
2703	key_value *	2505	key_value *link;
2704	link;
2705		2506
2706	for (link = ob->key_values; link != NULL; link = link->next)	2507	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2508	if (link->key == key)
2709	{
2710	return link;	2509	return link;
2711	}
2712	}
2713		2510
2714	return NULL;	2511	return NULL;
2715	}	2512	}
2716		2513
2717	/*	2514	/*

Diff Legend

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