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.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.9 by root, Wed Aug 30 06:06:26 2006 UTC

1	/*	1	/*
2	* static char *rcsid_object_c =	2	* static char *rcsid_object_c =
3	* "$Id: object.C,v 1.2 2006/08/25 17:11:52 root Exp $";	3	* "$Id: object.C,v 1.9 2006/08/30 06:06:26 root Exp $";
4	*/	4	*/
5		5
6	/*	6	/*
7	CrossFire, A Multiplayer game for X-windows	7	CrossFire, A Multiplayer game for X-windows
8		8
…		…
52		52
53	object *objects; /* Pointer to the list of used objects */	53	object *objects; /* Pointer to the list of used objects */
54	object *free_objects; /* Pointer to the list of unused objects */	54	object *free_objects; /* Pointer to the list of unused objects */
55	object *active_objects; /* List of active objects that need to be processed */	55	object *active_objects; /* List of active objects that need to be processed */
56		56
57	void (*object_free_callback)(object *ob);
58
59	short freearr_x[SIZEOFFREE]=	57	short freearr_x[SIZEOFFREE]=
60	{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,	58	{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,
61	0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3,-3,-3,-3,-3,-2,-1};	59	0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3,-3,-3,-3,-3,-2,-1};
62	short freearr_y[SIZEOFFREE]=	60	short freearr_y[SIZEOFFREE]=
63	{0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,	61	{0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,
…		…
134	/* Note sure why the following is the case - either the object has to	132	/* Note sure why the following is the case - either the object has to
135	* be animated or have a very low speed. Is this an attempted monster	133	* be animated or have a very low speed. Is this an attempted monster
136	* check?	134	* check?
137	*/	135	*/
138	if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)	136	if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)
139	return 0;	137	return 0;
140		138
141	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	139	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
142	* value could not be stored in a sint32 (which unfortunately sometimes is	140	* value could not be stored in a sint32 (which unfortunately sometimes is
143	* used to store nrof).	141	* used to store nrof).
144	*/	142	*/
145	if (ob1->nrof+ob2->nrof >= 1UL<<31)	143	if (ob1->nrof+ob2->nrof >= 1UL<<31)
146	return 0;	144	return 0;
147		145
148	/* This is really a spellbook check - really, we should	146	/* This is really a spellbook check - really, we should
149	* check all objects in the inventory.	147	* check all objects in the inventory.
150	*/	148	*/
151	if (ob1->inv || ob2->inv) {	149	if (ob1->inv || ob2->inv) {
152	/* if one object has inventory but the other doesn't, not equiv */	150	/* if one object has inventory but the other doesn't, not equiv */
153	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0;	151	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0;
154		152
155	/* Now check to see if the two inventory objects could merge */	153	/* Now check to see if the two inventory objects could merge */
156	if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0;	154	if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0;
157		155
158	/* inventory ok - still need to check rest of this object to see	156	/* inventory ok - still need to check rest of this object to see
159	* if it is valid.	157	* if it is valid.
160	*/	158	*/
161	}	159	}
162		160
163	/* If the objects have been identified, set the BEEN_APPLIED flag.	161	/* If the objects have been identified, set the BEEN_APPLIED flag.
164	* This is to the comparison of the flags below will be OK. We	162	* This is to the comparison of the flags below will be OK. We
165	* just can't ignore the been applied or identified flags, as they	163	* just can't ignore the been applied or identified flags, as they
166	* are not equal - just if it has been identified, the been_applied	164	* are not equal - just if it has been identified, the been_applied
167	* flags lose any meaning.	165	* flags lose any meaning.
168	*/	166	*/
169	if (QUERY_FLAG(ob1, FLAG_IDENTIFIED))	167	if (QUERY_FLAG(ob1, FLAG_IDENTIFIED))
170	SET_FLAG(ob1, FLAG_BEEN_APPLIED);	168	SET_FLAG(ob1, FLAG_BEEN_APPLIED);
171		169
172	if (QUERY_FLAG(ob2, FLAG_IDENTIFIED))	170	if (QUERY_FLAG(ob2, FLAG_IDENTIFIED))
173	SET_FLAG(ob2, FLAG_BEEN_APPLIED);	171	SET_FLAG(ob2, FLAG_BEEN_APPLIED);
174		172
175		173
176	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	174	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
177	* being locked in inventory should prevent merging.	175	* being locked in inventory should prevent merging.
178	* 0x4 in flags3 is CLIENT_SENT	176	* 0x4 in flags3 is CLIENT_SENT
179	*/	177	*/
180	if ((ob1->arch != ob2->arch) ||	178	if ((ob1->arch != ob2->arch) ||
181	(ob1->flags[0] != ob2->flags[0]) ||	179	(ob1->flags[0] != ob2->flags[0]) ||
182	(ob1->flags[1] != ob2->flags[1]) ||	180	(ob1->flags[1] != ob2->flags[1]) ||
183	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) ||	181	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) ||
184	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||	182	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
185	(ob1->name != ob2->name) ||	183	(ob1->name != ob2->name) ||
186	(ob1->title != ob2->title) ||	184	(ob1->title != ob2->title) ||
187	(ob1->msg != ob2->msg) ||	185	(ob1->msg != ob2->msg) ||
188	(ob1->weight != ob2->weight) ||	186	(ob1->weight != ob2->weight) ||
189	(memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) ||	187	(memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) ||
190	(memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) ||	188	(memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) ||
191	(ob1->attacktype != ob2->attacktype) ||	189	(ob1->attacktype != ob2->attacktype) ||
192	(ob1->magic != ob2->magic) ||	190	(ob1->magic != ob2->magic) ||
193	(ob1->slaying != ob2->slaying) ||	191	(ob1->slaying != ob2->slaying) ||
194	(ob1->skill != ob2->skill) ||	192	(ob1->skill != ob2->skill) ||
195	(ob1->value != ob2->value) ||	193	(ob1->value != ob2->value) ||
196	(ob1->animation_id != ob2->animation_id) ||	194	(ob1->animation_id != ob2->animation_id) ||
197	(ob1->client_type != ob2->client_type) ||	195	(ob1->client_type != ob2->client_type) ||
198	(ob1->materialname != ob2->materialname) ||	196	(ob1->materialname != ob2->materialname) ||
199	(ob1->lore != ob2->lore) ||	197	(ob1->lore != ob2->lore) ||
200	(ob1->subtype != ob2->subtype) ||	198	(ob1->subtype != ob2->subtype) ||
201	(ob1->move_type != ob2->move_type) ||	199	(ob1->move_type != ob2->move_type) ||
202	(ob1->move_block != ob2->move_block) ||	200	(ob1->move_block != ob2->move_block) ||
203	(ob1->move_allow != ob2->move_allow) ||	201	(ob1->move_allow != ob2->move_allow) ||
204	(ob1->move_on != ob2->move_on) ||	202	(ob1->move_on != ob2->move_on) ||
205	(ob1->move_off != ob2->move_off) ||	203	(ob1->move_off != ob2->move_off) ||
206	(ob1->move_slow != ob2->move_slow) ||	204	(ob1->move_slow != ob2->move_slow) ||
207	(ob1->move_slow_penalty != ob2->move_slow_penalty)	205	(ob1->move_slow_penalty != ob2->move_slow_penalty)
208	)	206	)
209	return 0;	207	return 0;
210		208
211	/* Don't merge objects that are applied. With the new 'body' code,	209	/* Don't merge objects that are applied. With the new 'body' code,
212	* it is possible for most any character to have more than one of	210	* it is possible for most any character to have more than one of
213	* some items equipped, and we don't want those to merge.	211	* some items equipped, and we don't want those to merge.
214	*/	212	*/
215	if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED))	213	if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED))
216	return 0;	214	return 0;
217		215
218	switch (ob1->type) {	216	switch (ob1->type) {
219	case SCROLL:	217	case SCROLL:
220	if (ob1->level != ob2->level) return 0;	218	if (ob1->level != ob2->level) return 0;
221	break;	219	break;
222		220
223	}	221	}
224	if (ob1->key_values != NULL || ob2->key_values != NULL) {	222	if (ob1->key_values != NULL || ob2->key_values != NULL) {
225	/* At least one of these has key_values. */	223	/* At least one of these has key_values. */
226	if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) {	224	if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) {
…		…
243	signed long sum_weight(object *op) {	241	signed long sum_weight(object *op) {
244	signed long sum;	242	signed long sum;
245	object *inv;	243	object *inv;
246	for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) {	244	for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) {
247	if (inv->inv)	245	if (inv->inv)
248	sum_weight(inv);	246	sum_weight(inv);
249	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	247	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
250	}	248	}
251	if (op->type == CONTAINER && op->stats.Str)	249	if (op->type == CONTAINER && op->stats.Str)
252	sum = (sum * (100 - op->stats.Str))/100;	250	sum = (sum * (100 - op->stats.Str))/100;
253	if(op->carrying != sum)	251	if(op->carrying != sum)
…		…
272	*/	270	*/
273		271
274	object *is_player_inv (object *op) {	272	object *is_player_inv (object *op) {
275	for (;op!=NULL&&op->type!=PLAYER; op=op->env)	273	for (;op!=NULL&&op->type!=PLAYER; op=op->env)
276	if (op->env==op)	274	if (op->env==op)
277	op->env = NULL;	275	op->env = NULL;
278	return op;	276	return op;
279	}	277	}
280		278
281	/*	279	/*
282	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	280	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
…		…
291	if(op->arch!=NULL) {	289	if(op->arch!=NULL) {
292	strcat(errmsg,"arch ");	290	strcat(errmsg,"arch ");
293	strcat(errmsg,op->arch->name?op->arch->name:"(null)");	291	strcat(errmsg,op->arch->name?op->arch->name:"(null)");
294	strcat(errmsg,"\n");	292	strcat(errmsg,"\n");
295	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)	293	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)
296	strcat(errmsg,cp);	294	strcat(errmsg,cp);
297	#if 0	295	#if 0
298	/* Don't dump player diffs - they are too long, mostly meaningless, and	296	/* Don't dump player diffs - they are too long, mostly meaningless, and
299	* will overflow the buffer.	297	* will overflow the buffer.
300	* Changed so that we don't dump inventory either. This may	298	* Changed so that we don't dump inventory either. This may
301	* also overflow the buffer.	299	* also overflow the buffer.
…		…
430	void free_all_object_data(void) {	428	void free_all_object_data(void) {
431	#ifdef MEMORY_DEBUG	429	#ifdef MEMORY_DEBUG
432	object *op, *next;	430	object *op, *next;
433		431
434	for (op=free_objects; op!=NULL; ) {	432	for (op=free_objects; op!=NULL; ) {
435	next=op->next;	433	next=op->next;
436	free(op);	434	free(op);
437	nrofallocobjects--;	435	nrofallocobjects--;
438	nroffreeobjects--;	436	nroffreeobjects--;
439	op=next;	437	op=next;
440	}	438	}
441	#endif	439	#endif
442	LOG(llevDebug,"%d allocated objects, %d free objects, STARMAX=%d\n",	440	LOG(llevDebug,"%d allocated objects, %d free objects, STARMAX=%d\n",
443	nrofallocobjects, nroffreeobjects,STARTMAX);	441	nrofallocobjects, nroffreeobjects,STARTMAX);
444	}	442	}
445		443
446	/*	444	/*
447	* Returns the object which this object marks as being the owner.	445	* Returns the object which this object marks as being the owner.
448	* A id-scheme is used to avoid pointing to objects which have been	446	* A id-scheme is used to avoid pointing to objects which have been
…		…
454	* anything - once an object is removed, it is basically dead anyways.	452	* anything - once an object is removed, it is basically dead anyways.
455	*/	453	*/
456		454
457	object *get_owner(object *op) {	455	object *get_owner(object *op) {
458	if(op->owner==NULL)	456	if(op->owner==NULL)
459	return NULL;	457	return NULL;
460		458
461	if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&	459	if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&
462	op->owner->count==op->ownercount)	460	op->owner->count==op->ownercount)
463	return op->owner;	461	return op->owner;
464		462
465	op->owner=NULL;	463	op->owner=NULL;
466	op->ownercount=0;	464	op->ownercount=0;
467	return NULL;	465	return NULL;
468	}	466	}
…		…
470	void clear_owner(object *op)	468	void clear_owner(object *op)
471	{	469	{
472	if (!op) return;	470	if (!op) return;
473		471
474	if (op->owner && op->ownercount == op->owner->count)	472	if (op->owner && op->ownercount == op->owner->count)
475	op->owner->refcount--;	473	op->owner->refcount--;
476		474
477	op->owner = NULL;	475	op->owner = NULL;
478	op->ownercount = 0;	476	op->ownercount = 0;
479	}	477	}
480		478
…		…
485	* skill and experience objects.	483	* skill and experience objects.
486	*/	484	*/
487	void set_owner (object *op, object *owner)	485	void set_owner (object *op, object *owner)
488	{	486	{
489	if(owner==NULL||op==NULL)	487	if(owner==NULL||op==NULL)
490	return;	488	return;
491		489
492	/* next line added to allow objects which own objects */	490	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	491	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	492	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	493	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	494	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	495	* didn't match, this check is valid and I believe that cause is valid.
498	*/	496	*/
499	while (owner->owner && owner!=owner->owner &&	497	while (owner->owner && owner!=owner->owner &&
500	owner->ownercount==owner->owner->count) owner=owner->owner;	498	owner->ownercount==owner->owner->count) owner=owner->owner;
501		499
502	/* IF the owner still has an owner, we did not resolve to a final owner.	500	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.	501	* so lets not add to that.
504	*/	502	*/
505	if (owner->owner) return;	503	if (owner->owner) return;
…		…
523	*/	521	*/
524	void copy_owner (object *op, object *clone)	522	void copy_owner (object *op, object *clone)
525	{	523	{
526	object *owner = get_owner (clone);	524	object *owner = get_owner (clone);
527	if (owner == NULL) {	525	if (owner == NULL) {
528	/* players don't have owners - they own themselves. Update	526	/* players don't have owners - they own themselves. Update
529	* as appropriate.	527	* as appropriate.
530	*/	528	*/
531	if (clone->type == PLAYER) owner=clone;	529	if (clone->type == PLAYER) owner=clone;
532	else return;	530	else return;
533	}	531	}
534	set_owner(op, owner);	532	set_owner(op, owner);
535		533
536	}	534	}
537		535
…		…
548	op->slaying = NULL;	546	op->slaying = NULL;
549	op->skill = NULL;	547	op->skill = NULL;
550	op->msg = NULL;	548	op->msg = NULL;
551	op->materialname = NULL;	549	op->materialname = NULL;
552	op->lore = NULL;	550	op->lore = NULL;
553	op->current_weapon_script = NULL;
554	clear_object(op);	551	clear_object(op);
555	}	552	}
556		553
557	/* Zero the key_values on op, decrementing the shared-string	554	/* Zero the key_values on op, decrementing the shared-string
558	* refcounts and freeing the links.	555	* refcounts and freeing the links.
…		…
565		562
566	for (i = op->key_values; i != NULL; i = next) {	563	for (i = op->key_values; i != NULL; i = next) {
567	/* Store next *first*. */	564	/* Store next *first*. */
568	next = i->next;	565	next = i->next;
569		566
570	if (i->key) FREE_AND_CLEAR_STR(i->key);	567	if (i->key) FREE_AND_CLEAR_STR(i->key);
571	if (i->value) FREE_AND_CLEAR_STR(i->value);	568	if (i->value) FREE_AND_CLEAR_STR(i->value);
572	i->next = NULL;	569	i->next = NULL;
573	free(i);	570	free(i);
574	}	571	}
575		572
576	op->key_values = NULL;	573	op->key_values = NULL;
…		…
581	* clear_object() frees everything allocated by an object, and also	578	* clear_object() frees everything allocated by an object, and also
582	* clears all variables and flags to default settings.	579	* clears all variables and flags to default settings.
583	*/	580	*/
584		581
585	void clear_object(object *op) {	582	void clear_object(object *op) {
586		583	op->clear ();
587	if (object_free_callback)
588	object_free_callback (op);
589		584
590	event *evt;	585	event *evt;
591	event *evt2;	586	event *evt2;
592		587
593	/* redo this to be simpler/more efficient. Was also seeing	588	/* redo this to be simpler/more efficient. Was also seeing
594	* crashes in the old code. Move this to the top - am	589	* crashes in the old code. Move this to the top - am
595	* seeing periodic crashes in this code, and would like to have	590	* seeing periodic crashes in this code, and would like to have
596	* as much info available as possible (eg, object name).	591	* as much info available as possible (eg, object name).
597	*/	592	*/
598	for (evt = op->events; evt; evt=evt2) {	593	for (evt = op->events; evt; evt=evt2) {
599	evt2 = evt->next;	594	evt2 = evt->next;
600		595
601	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);	596	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
602	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);	597	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
603	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);	598	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
604		599
…		…
647		642
648	op->expmul=1.0;	643	op->expmul=1.0;
649	op->face = blank_face;	644	op->face = blank_face;
650	op->attacked_by_count = (tag_t) -1;	645	op->attacked_by_count = (tag_t) -1;
651	if (settings.casting_time)	646	if (settings.casting_time)
652	op->casting_time = -1;	647	op->casting_time = -1;
653		648
654	}	649	}
655		650
656	/*	651	/*
657	* copy object first frees everything allocated by the second object,	652	* copy object first frees everything allocated by the second object,
…		…
664		659
665	void copy_object(object *op2, object *op) {	660	void copy_object(object *op2, object *op) {
666	int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED);	661	int is_freed=QUERY_FLAG(op,FLAG_FREED),is_removed=QUERY_FLAG(op,FLAG_REMOVED);
667	event *evt, *evt2, *evt_new;	662	event *evt, *evt2, *evt_new;
668		663
669	if (object_free_callback)	664	op->clear ();
670	object_free_callback (op);
671
672	// callback registries and self are empty for copied objects
673	// this ought to change in the future
674		665
675	/* Decrement the refcounts, but don't bother zeroing the fields;	666	/* Decrement the refcounts, but don't bother zeroing the fields;
676	they'll be overwritten by memcpy. */	667	they'll be overwritten by memcpy. */
677	if(op->name!=NULL) free_string(op->name);	668	if(op->name!=NULL) free_string(op->name);
678	if(op->name_pl!=NULL) free_string(op->name_pl);	669	if(op->name_pl!=NULL) free_string(op->name_pl);
…		…
685	if(op->materialname != NULL) free_string(op->materialname);	676	if(op->materialname != NULL) free_string(op->materialname);
686	if(op->custom_name != NULL) free_string(op->custom_name);	677	if(op->custom_name != NULL) free_string(op->custom_name);
687		678
688	/* Basically, same code as from clear_object() */	679	/* Basically, same code as from clear_object() */
689	for (evt = op->events; evt; evt=evt2) {	680	for (evt = op->events; evt; evt=evt2) {
690	evt2 = evt->next;	681	evt2 = evt->next;
691		682
692	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);	683	if (evt->hook != NULL) FREE_AND_CLEAR_STR(evt->hook);
693	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);	684	if (evt->plugin != NULL) FREE_AND_CLEAR_STR(evt->plugin);
694	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);	685	if (evt->options != NULL) FREE_AND_CLEAR_STR(evt->options);
695		686
696	free(evt);	687	free(evt);
697	}	688	}
698	op->events = NULL;	689	op->events = NULL;
699		690
700	free_key_values(op);	691	free_key_values(op);
701		692
702	*(object_special *)op = *(object_special *)op2;	693	*(object_special *)op = *(object_special *)op2;
		694	op2->clone (op);
703		695
704	if(is_freed) SET_FLAG(op,FLAG_FREED);	696	if(is_freed) SET_FLAG(op,FLAG_FREED);
705	if(is_removed) SET_FLAG(op,FLAG_REMOVED);	697	if(is_removed) SET_FLAG(op,FLAG_REMOVED);
706	if(op->name!=NULL) add_refcount(op->name);	698	if(op->name!=NULL) add_refcount(op->name);
707	if(op->name_pl!=NULL) add_refcount(op->name_pl);	699	if(op->name_pl!=NULL) add_refcount(op->name_pl);
…		…
713	if(op->msg!=NULL) add_refcount(op->msg);	705	if(op->msg!=NULL) add_refcount(op->msg);
714	if(op->custom_name!=NULL) add_refcount(op->custom_name);	706	if(op->custom_name!=NULL) add_refcount(op->custom_name);
715	if (op->materialname != NULL) add_refcount(op->materialname);	707	if (op->materialname != NULL) add_refcount(op->materialname);
716		708
717	if((op2->speed<0) && !editor)	709	if((op2->speed<0) && !editor)
718	op->speed_left=op2->speed_left-RANDOM()%200/100.0;	710	op->speed_left=op2->speed_left-RANDOM()%200/100.0;
719		711
720	/* Copy over event information */	712	/* Copy over event information */
721	evt2 = NULL;	713	evt2 = NULL;
722	for (evt = op2->events; evt; evt=evt->next) {	714	for (evt = op2->events; evt; evt=evt->next) {
723	evt_new = (event *) malloc(sizeof(event));	715	evt_new = (event *) malloc(sizeof(event));
724	memcpy(evt_new, evt, sizeof(event));	716	memcpy(evt_new, evt, sizeof(event));
725	if (evt_new->hook) add_refcount(evt_new->hook);	717	if (evt_new->hook) add_refcount(evt_new->hook);
726	if (evt_new->plugin) add_refcount(evt_new->plugin);	718	if (evt_new->plugin) add_refcount(evt_new->plugin);
727	if (evt_new->options) add_refcount(evt_new->options);	719	if (evt_new->options) add_refcount(evt_new->options);
728	evt_new->next = NULL;	720	evt_new->next = NULL;
729		721
730	/* Try to be a little clever here, and store away the	722	/* Try to be a little clever here, and store away the
731	* last event we copied, so that its simpler to update the	723	* last event we copied, so that its simpler to update the
732	* pointer.	724	* pointer.
733	*/	725	*/
734	if (evt2)	726	if (evt2)
735	evt2->next = evt_new;	727	evt2->next = evt_new;
736	else	728	else
737	op->events = evt_new;	729	op->events = evt_new;
738		730
739	evt2 = evt_new;	731	evt2 = evt_new;
740	}	732	}
741	/* Copy over key_values, if any. */	733	/* Copy over key_values, if any. */
742	if (op2->key_values != NULL) {	734	if (op2->key_values != NULL) {
743	key_value * tail = NULL;	735	key_value * tail = NULL;
744	key_value * i;	736	key_value * i;
745		737
746	op->key_values = NULL;	738	op->key_values = NULL;
747		739
748	for (i = op2->key_values; i != NULL; i = i->next) {	740	for (i = op2->key_values; i != NULL; i = i->next) {
749	key_value * new_link = (key_value *) malloc(sizeof(key_value));	741	key_value * new_link = (key_value *) malloc(sizeof(key_value));
750		742
751	new_link->next = NULL;	743	new_link->next = NULL;
752	new_link->key = add_refcount(i->key);	744	new_link->key = add_refcount(i->key);
753	if (i->value)	745	if (i->value)
754	new_link->value = add_refcount(i->value);	746	new_link->value = add_refcount(i->value);
755	else	747	else
756	new_link->value = NULL;	748	new_link->value = NULL;
757		749
758	/* Try and be clever here, too. */	750	/* Try and be clever here, too. */
759	if (op->key_values == NULL) {	751	if (op->key_values == NULL) {
760	op->key_values = new_link;	752	op->key_values = new_link;
761	tail = new_link;	753	tail = new_link;
762	} else {	754	} else {
763	tail->next = new_link;	755	tail->next = new_link;
764	tail = new_link;	756	tail = new_link;
765	}	757	}
766	}	758	}
767	}	759	}
768		760
769	update_ob_speed(op);	761	update_ob_speed(op);
770	}	762	}
771		763
…		…
860	* be called to update the face variable, _and_ how it looks on the map.	852	* be called to update the face variable, _and_ how it looks on the map.
861	*/	853	*/
862		854
863	void update_turn_face(object *op) {	855	void update_turn_face(object *op) {
864	if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)	856	if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)
865	return;	857	return;
866	SET_ANIMATION(op, op->direction);	858	SET_ANIMATION(op, op->direction);
867	update_object(op,UP_OBJ_FACE);	859	update_object(op,UP_OBJ_FACE);
868	}	860	}
869		861
870	/*	862	/*
…		…
879	/* No reason putting the archetypes objects on the speed list,	871	/* No reason putting the archetypes objects on the speed list,
880	* since they never really need to be updated.	872	* since they never really need to be updated.
881	*/	873	*/
882		874
883	if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {	875	if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {
884	LOG(llevError,"Object %s is freed but has speed.\n", op->name);	876	LOG(llevError,"Object %s is freed but has speed.\n", op->name);
885	#ifdef MANY_CORES	877	#ifdef MANY_CORES
886	abort();	878	abort();
887	#else	879	#else
888	op->speed = 0;	880	op->speed = 0;
889	#endif	881	#endif
890	}	882	}
891	if (arch_init) {	883	if (arch_init) {
892	return;	884	return;
893	}	885	}
894	if (FABS(op->speed)>MIN_ACTIVE_SPEED) {	886	if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
895	/* If already on active list, don't do anything */	887	/* If already on active list, don't do anything */
896	if (op->active_next || op->active_prev || op==active_objects)	888	if (op->active_next || op->active_prev || op==active_objects)
897	return;	889	return;
898		890
899	/* process_events() expects us to insert the object at the beginning	891	/* process_events() expects us to insert the object at the beginning
900	* of the list. */	892	* of the list. */
901	op->active_next = active_objects;	893	op->active_next = active_objects;
902	if (op->active_next!=NULL)	894	if (op->active_next!=NULL)
903	op->active_next->active_prev = op;	895	op->active_next->active_prev = op;
904	active_objects = op;	896	active_objects = op;
905	}	897	}
906	else {	898	else {
907	/* If not on the active list, nothing needs to be done */	899	/* If not on the active list, nothing needs to be done */
908	if (!op->active_next && !op->active_prev && op!=active_objects)	900	if (!op->active_next && !op->active_prev && op!=active_objects)
909	return;	901	return;
910		902
911	if (op->active_prev==NULL) {	903	if (op->active_prev==NULL) {
912	active_objects = op->active_next;	904	active_objects = op->active_next;
913	if (op->active_next!=NULL)	905	if (op->active_next!=NULL)
914	op->active_next->active_prev = NULL;	906	op->active_next->active_prev = NULL;
915	}	907	}
916	else {	908	else {
917	op->active_prev->active_next = op->active_next;	909	op->active_prev->active_next = op->active_next;
918	if (op->active_next)	910	if (op->active_next)
919	op->active_next->active_prev = op->active_prev;	911	op->active_next->active_prev = op->active_prev;
920	}	912	}
921	op->active_next = NULL;	913	op->active_next = NULL;
922	op->active_prev = NULL;	914	op->active_prev = NULL;
923	}	915	}
924	}	916	}
925		917
926	/* This function removes object 'op' from the list of active	918	/* This function removes object 'op' from the list of active
927	* objects.	919	* objects.
…		…
933	*/	925	*/
934	void remove_from_active_list(object *op)	926	void remove_from_active_list(object *op)
935	{	927	{
936	/* If not on the active list, nothing needs to be done */	928	/* If not on the active list, nothing needs to be done */
937	if (!op->active_next && !op->active_prev && op!=active_objects)	929	if (!op->active_next && !op->active_prev && op!=active_objects)
938	return;	930	return;
939		931
940	if (op->active_prev==NULL) {	932	if (op->active_prev==NULL) {
941	active_objects = op->active_next;	933	active_objects = op->active_next;
942	if (op->active_next!=NULL)	934	if (op->active_next!=NULL)
943	op->active_next->active_prev = NULL;	935	op->active_next->active_prev = NULL;
944	}	936	}
945	else {	937	else {
946	op->active_prev->active_next = op->active_next;	938	op->active_prev->active_next = op->active_next;
947	if (op->active_next)	939	if (op->active_next)
948	op->active_next->active_prev = op->active_prev;	940	op->active_next->active_prev = op->active_prev;
949	}	941	}
950	op->active_next = NULL;	942	op->active_next = NULL;
951	op->active_prev = NULL;	943	op->active_prev = NULL;
952	}	944	}
953		945
…		…
978	MoveType move_on, move_off, move_block, move_slow;	970	MoveType move_on, move_off, move_block, move_slow;
979		971
980	if (op == NULL) {	972	if (op == NULL) {
981	/* this should never happen */	973	/* this should never happen */
982	LOG(llevDebug,"update_object() called for NULL object.\n");	974	LOG(llevDebug,"update_object() called for NULL object.\n");
983	return;	975	return;
984	}	976	}
985		977
986	if(op->env!=NULL) {	978	if(op->env!=NULL) {
987	/* Animation is currently handled by client, so nothing	979	/* Animation is currently handled by client, so nothing
988	* to do in this case.	980	* to do in this case.
989	*/	981	*/
990	return;	982	return;
991	}	983	}
992		984
993	/* If the map is saving, don't do anything as everything is	985	/* If the map is saving, don't do anything as everything is
994	* going to get freed anyways.	986	* going to get freed anyways.
995	*/	987	*/
996	if (!op->map || op->map->in_memory == MAP_SAVING) return;	988	if (!op->map || op->map->in_memory == MAP_SAVING) return;
997		989
998	/* make sure the object is within map boundaries */	990	/* make sure the object is within map boundaries */
999	if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||	991	if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||
1000	op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {	992	op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {
1001	LOG(llevError,"update_object() called for object out of map!\n");	993	LOG(llevError,"update_object() called for object out of map!\n");
1002	#ifdef MANY_CORES	994	#ifdef MANY_CORES
1003	abort();	995	abort();
1004	#endif	996	#endif
1005	return;	997	return;
1006	}	998	}
1007		999
1008	flags = GET_MAP_FLAGS(op->map, op->x, op->y);	1000	flags = GET_MAP_FLAGS(op->map, op->x, op->y);
1009	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE);	1001	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE);
1010	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	1002	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);
…		…
1023	update_now=1;	1015	update_now=1;
1024		1016
1025	if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))	1017	if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
1026	update_now=1;	1018	update_now=1;
1027		1019
1028	if ((move_on | op->move_on) != move_on) update_now=1;	1020	if ((move_on | op->move_on) != move_on) update_now=1;
1029	if ((move_off | op->move_off) != move_off) update_now=1;	1021	if ((move_off | op->move_off) != move_off) update_now=1;
1030	/* This isn't perfect, but I don't expect a lot of objects to	1022	/* This isn't perfect, but I don't expect a lot of objects to
1031	* to have move_allow right now.	1023	* to have move_allow right now.
1032	*/	1024	*/
1033	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	1025	if (((move_block | op->move_block) & ~op->move_allow) != move_block)
1034	update_now=1;	1026	update_now=1;
1035	if ((move_slow | op->move_slow) != move_slow) update_now=1;	1027	if ((move_slow | op->move_slow) != move_slow) update_now=1;
1036	}	1028	}
1037	/* if the object is being removed, we can't make intelligent	1029	/* if the object is being removed, we can't make intelligent
1038	* decisions, because remove_ob can't really pass the object	1030	* decisions, because remove_ob can't really pass the object
1039	* that is being removed.	1031	* that is being removed.
1040	*/	1032	*/
1041	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {	1033	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {
1042	update_now=1;	1034	update_now=1;
1043	} else if (action == UP_OBJ_FACE) {	1035	} else if (action == UP_OBJ_FACE) {
1044	/* Nothing to do for that case */	1036	/* Nothing to do for that case */
1045	}	1037	}
1046	else {	1038	else {
1047	LOG(llevError,"update_object called with invalid action: %d\n", action);	1039	LOG(llevError,"update_object called with invalid action: %d\n", action);
1048	}	1040	}
1049		1041
1050	if (update_now) {	1042	if (update_now) {
1051	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	1043	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
1052	update_position(op->map, op->x, op->y);	1044	update_position(op->map, op->x, op->y);
1053	}	1045	}
1054		1046
1055	if(op->more!=NULL)	1047	if(op->more!=NULL)
1056	update_object(op->more, action);	1048	update_object(op->more, action);
1057	}	1049	}
1058		1050
1059		1051
1060	/*	1052	/*
1061	* free_object() frees everything allocated by an object, removes	1053	* free_object() frees everything allocated by an object, removes
…		…
1072	free_object2(ob, 0);	1064	free_object2(ob, 0);
1073	}	1065	}
1074	void free_object2(object *ob, int free_inventory) {	1066	void free_object2(object *ob, int free_inventory) {
1075	object *tmp,*op;	1067	object *tmp,*op;
1076		1068
1077	if (object_free_callback)	1069	ob->clear ();
1078	object_free_callback (ob);
1079		1070
1080	if (!QUERY_FLAG(ob,FLAG_REMOVED)) {	1071	if (!QUERY_FLAG(ob,FLAG_REMOVED)) {
1081	LOG(llevDebug,"Free object called with non removed object\n");	1072	LOG(llevDebug,"Free object called with non removed object\n");
1082	dump_object(ob);	1073	dump_object(ob);
1083	#ifdef MANY_CORES	1074	#ifdef MANY_CORES
1084	abort();	1075	abort();
1085	#endif	1076	#endif
1086	}	1077	}
1087	if(QUERY_FLAG(ob,FLAG_FRIENDLY)) {	1078	if(QUERY_FLAG(ob,FLAG_FRIENDLY)) {
1088	LOG(llevMonster,"Warning: tried to free friendly object.\n");	1079	LOG(llevMonster,"Warning: tried to free friendly object.\n");
1089	remove_friendly_object(ob);	1080	remove_friendly_object(ob);
1090	}	1081	}
1091	if(QUERY_FLAG(ob,FLAG_FREED)) {	1082	if(QUERY_FLAG(ob,FLAG_FREED)) {
1092	dump_object(ob);	1083	dump_object(ob);
1093	LOG(llevError,"Trying to free freed object.\n%s\n",errmsg);	1084	LOG(llevError,"Trying to free freed object.\n%s\n",errmsg);
1094	return;	1085	return;
1095	}	1086	}
1096	if(ob->more!=NULL) {	1087	if(ob->more!=NULL) {
1097	free_object2(ob->more, free_inventory);	1088	free_object2(ob->more, free_inventory);
1098	ob->more=NULL;	1089	ob->more=NULL;
1099	}	1090	}
1100	if (ob->inv) {	1091	if (ob->inv) {
1101	/* Only if the space blocks everything do we not process -	1092	/* Only if the space blocks everything do we not process -
1102	* if some form of movemnt is allowed, let objects	1093	* if some form of movemnt is allowed, let objects
1103	* drop on that space.	1094	* drop on that space.
1104	*/	1095	*/
1105	if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY ||	1096	if (free_inventory || ob->map==NULL || ob->map->in_memory!=MAP_IN_MEMORY ||
1106	(GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL))	1097	(GET_MAP_MOVE_BLOCK(ob->map, ob->x, ob->y) == MOVE_ALL))
1107	{	1098	{
1108	op=ob->inv;	1099	op=ob->inv;
1109	while(op!=NULL) {	1100	while(op!=NULL) {
1110	tmp=op->below;	1101	tmp=op->below;
1111	remove_ob(op);	1102	remove_ob(op);
1112	free_object2(op, free_inventory);	1103	free_object2(op, free_inventory);
1113	op=tmp;	1104	op=tmp;
1114	}	1105	}
1115	}	1106	}
1116	else { /* Put objects in inventory onto this space */	1107	else { /* Put objects in inventory onto this space */
1117	op=ob->inv;	1108	op=ob->inv;
1118	while(op!=NULL) {	1109	while(op!=NULL) {
1119	tmp=op->below;	1110	tmp=op->below;
1120	remove_ob(op);	1111	remove_ob(op);
1121	if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) ||	1112	if(QUERY_FLAG(op,FLAG_STARTEQUIP)||QUERY_FLAG(op,FLAG_NO_DROP) ||
1122	op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE))	1113	op->type==RUNE || op->type==TRAP || QUERY_FLAG(op,FLAG_IS_A_TEMPLATE))
1123	free_object(op);	1114	free_object(op);
1124	else {	1115	else {
1125	op->x=ob->x;	1116	op->x=ob->x;
1126	op->y=ob->y;	1117	op->y=ob->y;
1127	insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */	1118	insert_ob_in_map(op,ob->map,NULL,0); /* Insert in same map as the envir */
1128	}	1119	}
1129	op=tmp;	1120	op=tmp;
1130	}	1121	}
1131	}	1122	}
1132	}	1123	}
1133	/* Remove object from the active list */	1124	/* Remove object from the active list */
1134	ob->speed = 0;	1125	ob->speed = 0;
1135	update_ob_speed(ob);	1126	update_ob_speed(ob);
1136		1127
1137	SET_FLAG(ob, FLAG_FREED);	1128	SET_FLAG(ob, FLAG_FREED);
1138	ob->count = 0;	1129	ob->count = 0;
1139		1130
1140	/* Remove this object from the list of used objects */	1131	/* Remove this object from the list of used objects */
1141	if(ob->prev==NULL) {	1132	if(ob->prev==NULL) {
1142	objects=ob->next;	1133	objects=ob->next;
1143	if(objects!=NULL)	1134	if(objects!=NULL)
1144	objects->prev=NULL;	1135	objects->prev=NULL;
1145	}	1136	}
1146	else {	1137	else {
1147	ob->prev->next=ob->next;	1138	ob->prev->next=ob->next;
1148	if(ob->next!=NULL)	1139	if(ob->next!=NULL)
1149	ob->next->prev=ob->prev;	1140	ob->next->prev=ob->prev;
1150	}	1141	}
1151		1142
1152	if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name);	1143	if(ob->name!=NULL) FREE_AND_CLEAR_STR(ob->name);
1153	if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl);	1144	if(ob->name_pl!=NULL) FREE_AND_CLEAR_STR(ob->name_pl);
1154	if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title);	1145	if(ob->title!=NULL) FREE_AND_CLEAR_STR(ob->title);
…		…
1179		1170
1180	/* Now link it with the free_objects list: */	1171	/* Now link it with the free_objects list: */
1181	ob->prev=NULL;	1172	ob->prev=NULL;
1182	ob->next=free_objects;	1173	ob->next=free_objects;
1183	if(free_objects!=NULL)	1174	if(free_objects!=NULL)
1184	free_objects->prev=ob;	1175	free_objects->prev=ob;
1185	free_objects=ob;	1176	free_objects=ob;
1186	nroffreeobjects++;	1177	nroffreeobjects++;
1187	#endif	1178	#endif
1188	}	1179	}
1189		1180
…		…
1255	mapstruct *m;	1246	mapstruct *m;
1256	sint16 x,y;	1247	sint16 x,y;
1257		1248
1258		1249
1259	if(QUERY_FLAG(op,FLAG_REMOVED)) {	1250	if(QUERY_FLAG(op,FLAG_REMOVED)) {
1260	dump_object(op);	1251	dump_object(op);
1261	LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);	1252	LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);
1262		1253
1263	/* Changed it to always dump core in this case. As has been learned	1254	/* Changed it to always dump core in this case. As has been learned
1264	* in the past, trying to recover from errors almost always	1255	* in the past, trying to recover from errors almost always
1265	* make things worse, and this is a real error here - something	1256	* make things worse, and this is a real error here - something
1266	* that should not happen.	1257	* that should not happen.
1267	* Yes, if this was a mission critical app, trying to do something	1258	* Yes, if this was a mission critical app, trying to do something
1268	* to recover may make sense, but that is because failure of the app	1259	* to recover may make sense, but that is because failure of the app
1269	* may have other disastrous problems. Cf runs out of a script	1260	* may have other disastrous problems. Cf runs out of a script
1270	* so is easily enough restarted without any real problems.	1261	* so is easily enough restarted without any real problems.
1271	* MSW 2001-07-01	1262	* MSW 2001-07-01
1272	*/	1263	*/
1273	abort();	1264	abort();
1274	}	1265	}
1275	if(op->more!=NULL)	1266	if(op->more!=NULL)
1276	remove_ob(op->more);	1267	remove_ob(op->more);
1277		1268
1278	SET_FLAG(op, FLAG_REMOVED);	1269	SET_FLAG(op, FLAG_REMOVED);
1279		1270
1280	/*	1271	/*
1281	* In this case, the object to be removed is in someones	1272	* In this case, the object to be removed is in someones
1282	* inventory.	1273	* inventory.
1283	*/	1274	*/
1284	if(op->env!=NULL) {	1275	if(op->env!=NULL) {
1285	if(op->nrof)	1276	if(op->nrof)
1286	sub_weight(op->env, op->weight*op->nrof);	1277	sub_weight(op->env, op->weight*op->nrof);
1287	else	1278	else
1288	sub_weight(op->env, op->weight+op->carrying);	1279	sub_weight(op->env, op->weight+op->carrying);
1289		1280
1290	/* NO_FIX_PLAYER is set when a great many changes are being	1281	/* NO_FIX_PLAYER is set when a great many changes are being
1291	* made to players inventory. If set, avoiding the call	1282	* made to players inventory. If set, avoiding the call
1292	* to save cpu time.	1283	* to save cpu time.
1293	*/	1284	*/
1294	if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&	1285	if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&
1295	!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))	1286	!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1296	fix_player(otmp);	1287	fix_player(otmp);
1297		1288
1298	if(op->above!=NULL)	1289	if(op->above!=NULL)
1299	op->above->below=op->below;	1290	op->above->below=op->below;
1300	else	1291	else
1301	op->env->inv=op->below;	1292	op->env->inv=op->below;
1302		1293
1303	if(op->below!=NULL)	1294	if(op->below!=NULL)
1304	op->below->above=op->above;	1295	op->below->above=op->above;
1305		1296
1306	/* we set up values so that it could be inserted into	1297	/* we set up values so that it could be inserted into
1307	* the map, but we don't actually do that - it is up	1298	* the map, but we don't actually do that - it is up
1308	* to the caller to decide what we want to do.	1299	* to the caller to decide what we want to do.
1309	*/	1300	*/
1310	op->x=op->env->x,op->y=op->env->y;	1301	op->x=op->env->x,op->y=op->env->y;
1311	op->ox=op->x,op->oy=op->y;	1302	op->ox=op->x,op->oy=op->y;
1312	op->map=op->env->map;	1303	op->map=op->env->map;
1313	op->above=NULL,op->below=NULL;	1304	op->above=NULL,op->below=NULL;
1314	op->env=NULL;	1305	op->env=NULL;
1315	return;	1306	return;
1316	}	1307	}
1317		1308
1318	/* If we get here, we are removing it from a map */	1309	/* If we get here, we are removing it from a map */
1319	if (op->map == NULL) return;	1310	if (op->map == NULL) return;
1320		1311
1321	x = op->x;	1312	x = op->x;
1322	y = op->y;	1313	y = op->y;
1323	m = get_map_from_coord(op->map, &x, &y);	1314	m = get_map_from_coord(op->map, &x, &y);
1324		1315
1325	if (!m) {	1316	if (!m) {
1326	LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1317	LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1327	op->map->path, op->x, op->y);	1318	op->map->path, op->x, op->y);
1328	/* in old days, we used to set x and y to 0 and continue.	1319	/* in old days, we used to set x and y to 0 and continue.
1329	* it seems if we get into this case, something is probablye	1320	* it seems if we get into this case, something is probablye
1330	* screwed up and should be fixed.	1321	* screwed up and should be fixed.
1331	*/	1322	*/
1332	abort();	1323	abort();
1333	}	1324	}
1334	if (op->map != m) {	1325	if (op->map != m) {
1335	LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	1326	LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1336	op->map->path, m->path, op->x, op->y, x, y);	1327	op->map->path, m->path, op->x, op->y, x, y);
1337	}	1328	}
1338		1329
1339	/* Re did the following section of code - it looks like it had	1330	/* Re did the following section of code - it looks like it had
1340	* lots of logic for things we no longer care about	1331	* lots of logic for things we no longer care about
1341	*/	1332	*/
1342		1333
1343	/* link the object above us */	1334	/* link the object above us */
1344	if (op->above)	1335	if (op->above)
1345	op->above->below=op->below;	1336	op->above->below=op->below;
1346	else	1337	else
1347	SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */	1338	SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1348		1339
1349	/* Relink the object below us, if there is one */	1340	/* Relink the object below us, if there is one */
1350	if(op->below) {	1341	if(op->below) {
1351	op->below->above=op->above;	1342	op->below->above=op->above;
1352	} else {	1343	} else {
1353	/* Nothing below, which means we need to relink map object for this space	1344	/* Nothing below, which means we need to relink map object for this space
1354	* use translated coordinates in case some oddness with map tiling is	1345	* use translated coordinates in case some oddness with map tiling is
1355	* evident	1346	* evident
1356	*/	1347	*/
1357	if(GET_MAP_OB(m,x,y)!=op) {	1348	if(GET_MAP_OB(m,x,y)!=op) {
1358	dump_object(op);	1349	dump_object(op);
1359	LOG(llevError,"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);	1350	LOG(llevError,"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);
1360	dump_object(GET_MAP_OB(m,x,y));	1351	dump_object(GET_MAP_OB(m,x,y));
1361	LOG(llevError,"%s\n",errmsg);	1352	LOG(llevError,"%s\n",errmsg);
1362	}	1353	}
1363	SET_MAP_OB(m,x,y,op->above); /* goes on above it. */	1354	SET_MAP_OB(m,x,y,op->above); /* goes on above it. */
1364	}	1355	}
1365	op->above=NULL;	1356	op->above=NULL;
1366	op->below=NULL;	1357	op->below=NULL;
1367		1358
1368	if (op->map->in_memory == MAP_SAVING)	1359	if (op->map->in_memory == MAP_SAVING)
1369	return;	1360	return;
1370		1361
1371	tag = op->count;	1362	tag = op->count;
1372	check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);	1363	check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);
1373	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {	1364	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {
1374	/* No point updating the players look faces if he is the object	1365	/* No point updating the players look faces if he is the object
1375	* being removed.	1366	* being removed.
1376	*/	1367	*/
1377		1368
1378	if(tmp->type==PLAYER && tmp!=op) {	1369	if(tmp->type==PLAYER && tmp!=op) {
1379	/* If a container that the player is currently using somehow gets	1370	/* If a container that the player is currently using somehow gets
1380	* removed (most likely destroyed), update the player view	1371	* removed (most likely destroyed), update the player view
1381	* appropriately.	1372	* appropriately.
1382	*/	1373	*/
1383	if (tmp->container==op) {	1374	if (tmp->container==op) {
1384	CLEAR_FLAG(op, FLAG_APPLIED);	1375	CLEAR_FLAG(op, FLAG_APPLIED);
1385	tmp->container=NULL;	1376	tmp->container=NULL;
1386	}	1377	}
1387	tmp->contr->socket.update_look=1;	1378	tmp->contr->socket.update_look=1;
1388	}	1379	}
1389	/* See if player moving off should effect something */	1380	/* See if player moving off should effect something */
1390	if (check_walk_off && ((op->move_type & tmp->move_off) &&	1381	if (check_walk_off && ((op->move_type & tmp->move_off) &&
1391	(op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {	1382	(op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {
1392		1383
1393	move_apply(tmp, op, NULL);	1384	move_apply(tmp, op, NULL);
1394	if (was_destroyed (op, tag)) {	1385	if (was_destroyed (op, tag)) {
1395	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "	1386	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "
1396	"leaving object\n", tmp->name, tmp->arch->name);	1387	"leaving object\n", tmp->name, tmp->arch->name);
1397	}	1388	}
1398	}	1389	}
1399		1390
1400	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1391	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1401		1392
1402	if(tmp->above == tmp)	1393	if(tmp->above == tmp)
1403	tmp->above = NULL;	1394	tmp->above = NULL;
1404	last=tmp;	1395	last=tmp;
1405	}	1396	}
1406	/* last == NULL of there are no objects on this space */	1397	/* last == NULL of there are no objects on this space */
1407	if (last==NULL) {	1398	if (last==NULL) {
1408	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1399	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1409	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1400	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1410	* those out anyways, and if there are any flags set right now, they won't	1401	* those out anyways, and if there are any flags set right now, they won't
1411	* be correct anyways.	1402	* be correct anyways.
1412	*/	1403	*/
1413	SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);	1404	SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);
1414	update_position(op->map, op->x, op->y);	1405	update_position(op->map, op->x, op->y);
1415	}	1406	}
1416	else	1407	else
1417	update_object(last, UP_OBJ_REMOVE);	1408	update_object(last, UP_OBJ_REMOVE);
1418		1409
1419	if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))	1410	if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))
1420	update_all_los(op->map, op->x, op->y);	1411	update_all_los(op->map, op->x, op->y);
1421		1412
1422	}	1413	}
1423		1414
1424	/*	1415	/*
1425	* merge_ob(op,top):	1416	* merge_ob(op,top):
…		…
1491	{	1482	{
1492	object *tmp, *top, *floor=NULL;	1483	object *tmp, *top, *floor=NULL;
1493	sint16 x,y;	1484	sint16 x,y;
1494		1485
1495	if (QUERY_FLAG (op, FLAG_FREED)) {	1486	if (QUERY_FLAG (op, FLAG_FREED)) {
1496	LOG (llevError, "Trying to insert freed object!\n");	1487	LOG (llevError, "Trying to insert freed object!\n");
1497	return NULL;	1488	return NULL;
1498	}	1489	}
1499	if(m==NULL) {	1490	if(m==NULL) {
1500	dump_object(op);	1491	dump_object(op);
1501	LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);	1492	LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1502	return op;	1493	return op;
1503	}	1494	}
1504	if(out_of_map(m,op->x,op->y)) {	1495	if(out_of_map(m,op->x,op->y)) {
1505	dump_object(op);	1496	dump_object(op);
1506	LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);	1497	LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);
1507	#ifdef MANY_CORES	1498	#ifdef MANY_CORES
1508	/* Better to catch this here, as otherwise the next use of this object	1499	/* Better to catch this here, as otherwise the next use of this object
1509	* is likely to cause a crash. Better to find out where it is getting	1500	* is likely to cause a crash. Better to find out where it is getting
1510	* improperly inserted.	1501	* improperly inserted.
1511	*/	1502	*/
1512	abort();	1503	abort();
1513	#endif	1504	#endif
1514	return op;	1505	return op;
1515	}	1506	}
1516	if(!QUERY_FLAG(op,FLAG_REMOVED)) {	1507	if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1517	dump_object(op);	1508	dump_object(op);
1518	LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);	1509	LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1519	return op;	1510	return op;
1520	}	1511	}
1521	if(op->more!=NULL) {	1512	if(op->more!=NULL) {
1522	/* The part may be on a different map. */	1513	/* The part may be on a different map. */
1523		1514
1524	object *more = op->more;	1515	object *more = op->more;
1525		1516
1526	/* We really need the caller to normalize coordinates - if	1517	/* We really need the caller to normalize coordinates - if
1527	* we set the map, that doesn't work if the location is within	1518	* we set the map, that doesn't work if the location is within
1528	* a map and this is straddling an edge. So only if coordinate	1519	* a map and this is straddling an edge. So only if coordinate
1529	* is clear wrong do we normalize it.	1520	* is clear wrong do we normalize it.
1530	*/	1521	*/
1531	if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {	1522	if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {
1532	/* Debugging information so you can see the last coordinates this object had */	1523	/* Debugging information so you can see the last coordinates this object had */
1533	more->ox = more->x;	1524	more->ox = more->x;
1534	more->oy = more->y;	1525	more->oy = more->y;
1535	more->map = get_map_from_coord(m, &more->x, &more->y);	1526	more->map = get_map_from_coord(m, &more->x, &more->y);
1536	} else if (!more->map) {	1527	} else if (!more->map) {
1537	/* For backwards compatibility - when not dealing with tiled maps,	1528	/* For backwards compatibility - when not dealing with tiled maps,
1538	* more->map should always point to the parent.	1529	* more->map should always point to the parent.
1539	*/	1530	*/
1540	more->map = m;	1531	more->map = m;
1541	}	1532	}
1542		1533
1543	if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {	1534	if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {
1544	if ( ! op->head)	1535	if ( ! op->head)
1545	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1536	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1546	return NULL;	1537	return NULL;
1547	}	1538	}
1548	}	1539	}
1549	CLEAR_FLAG(op,FLAG_REMOVED);	1540	CLEAR_FLAG(op,FLAG_REMOVED);
1550		1541
1551	/* Debugging information so you can see the last coordinates this object had */	1542	/* Debugging information so you can see the last coordinates this object had */
1552	op->ox=op->x;	1543	op->ox=op->x;
…		…
1561	y = op->y;	1552	y = op->y;
1562		1553
1563	/* this has to be done after we translate the coordinates.	1554	/* this has to be done after we translate the coordinates.
1564	*/	1555	*/
1565	if(op->nrof && !(flag & INS_NO_MERGE)) {	1556	if(op->nrof && !(flag & INS_NO_MERGE)) {
1566	for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)	1557	for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1567	if (CAN_MERGE(op,tmp)) {	1558	if (CAN_MERGE(op,tmp)) {
1568	op->nrof+=tmp->nrof;	1559	op->nrof+=tmp->nrof;
1569	remove_ob(tmp);	1560	remove_ob(tmp);
1570	free_object(tmp);	1561	free_object(tmp);
1571	}	1562	}
1572	}	1563	}
1573		1564
1574	CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1565	CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1575	CLEAR_FLAG(op, FLAG_INV_LOCKED);	1566	CLEAR_FLAG(op, FLAG_INV_LOCKED);
1576	if (!QUERY_FLAG(op, FLAG_ALIVE))	1567	if (!QUERY_FLAG(op, FLAG_ALIVE))
1577	CLEAR_FLAG(op, FLAG_NO_STEAL);	1568	CLEAR_FLAG(op, FLAG_NO_STEAL);
1578		1569
1579	if (flag & INS_BELOW_ORIGINATOR) {	1570	if (flag & INS_BELOW_ORIGINATOR) {
1580	if (originator->map != op->map || originator->x != op->x ||	1571	if (originator->map != op->map || originator->x != op->x ||
1581	originator->y != op->y) {	1572	originator->y != op->y) {
1582	LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1573	LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1583	abort();	1574	abort();
1584	}	1575	}
1585	op->above = originator;	1576	op->above = originator;
1586	op->below = originator->below;	1577	op->below = originator->below;
1587	if (op->below) op->below->above = op;	1578	if (op->below) op->below->above = op;
1588	else SET_MAP_OB(op->map, op->x, op->y, op);	1579	else SET_MAP_OB(op->map, op->x, op->y, op);
1589	/* since *below* originator, no need to update top */	1580	/* since *below* originator, no need to update top */
1590	originator->below = op;	1581	originator->below = op;
1591	} else {	1582	} else {
1592	/* If there are other objects, then */	1583	/* If there are other objects, then */
1593	if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {	1584	if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1594	object *last=NULL;	1585	object *last=NULL;
1595	/*	1586	/*
1596	* If there are multiple objects on this space, we do some trickier handling.	1587	* If there are multiple objects on this space, we do some trickier handling.
1597	* We've already dealt with merging if appropriate.	1588	* We've already dealt with merging if appropriate.
1598	* Generally, we want to put the new object on top. But if	1589	* Generally, we want to put the new object on top. But if
1599	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1590	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1600	* floor, we want to insert above that and no further.	1591	* floor, we want to insert above that and no further.
1601	* Also, if there are spell objects on this space, we stop processing	1592	* Also, if there are spell objects on this space, we stop processing
1602	* once we get to them. This reduces the need to traverse over all of	1593	* once we get to them. This reduces the need to traverse over all of
1603	* them when adding another one - this saves quite a bit of cpu time	1594	* them when adding another one - this saves quite a bit of cpu time
1604	* when lots of spells are cast in one area. Currently, it is presumed	1595	* when lots of spells are cast in one area. Currently, it is presumed
1605	* that flying non pickable objects are spell objects.	1596	* that flying non pickable objects are spell objects.
1606	*/	1597	*/
1607		1598
1608	while (top != NULL) {	1599	while (top != NULL) {
1609	if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||	1600	if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1610	QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;	1601	QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1611	if (QUERY_FLAG(top, FLAG_NO_PICK)	1602	if (QUERY_FLAG(top, FLAG_NO_PICK)
1612	&& (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))	1603	&& (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1613	&& !QUERY_FLAG(top, FLAG_IS_FLOOR))	1604	&& !QUERY_FLAG(top, FLAG_IS_FLOOR))
1614	{	1605	{
1615	/* We insert above top, so we want this object below this */	1606	/* We insert above top, so we want this object below this */
1616	top=top->below;	1607	top=top->below;
1617	break;	1608	break;
1618	}	1609	}
1619	last = top;	1610	last = top;
1620	top = top->above;	1611	top = top->above;
1621	}	1612	}
1622	/* Don't want top to be NULL, so set it to the last valid object */	1613	/* Don't want top to be NULL, so set it to the last valid object */
1623	top = last;	1614	top = last;
1624		1615
1625	/* We let update_position deal with figuring out what the space	1616	/* We let update_position deal with figuring out what the space
1626	* looks like instead of lots of conditions here.	1617	* looks like instead of lots of conditions here.
1627	* makes things faster, and effectively the same result.	1618	* makes things faster, and effectively the same result.
1628	*/	1619	*/
1629		1620
1630	/* Have object 'fall below' other objects that block view.	1621	/* Have object 'fall below' other objects that block view.
1631	* Unless those objects are exits, type 66	1622	* Unless those objects are exits, type 66
1632	* If INS_ON_TOP is used, don't do this processing	1623	* If INS_ON_TOP is used, don't do this processing
1633	* Need to find the object that in fact blocks view, otherwise	1624	* Need to find the object that in fact blocks view, otherwise
1634	* stacking is a bit odd.	1625	* stacking is a bit odd.
1635	*/	1626	*/
1636	if (!(flag & INS_ON_TOP) &&	1627	if (!(flag & INS_ON_TOP) &&
1637	(get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&	1628	(get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1638	(op->face && !op->face->visibility)) {	1629	(op->face && !op->face->visibility)) {
1639	for (last=top; last != floor; last=last->below)	1630	for (last=top; last != floor; last=last->below)
1640	if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;	1631	if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1641	/* Check to see if we found the object that blocks view,	1632	/* Check to see if we found the object that blocks view,
1642	* and make sure we have a below pointer for it so that	1633	* and make sure we have a below pointer for it so that
1643	* we can get inserted below this one, which requires we	1634	* we can get inserted below this one, which requires we
1644	* set top to the object below us.	1635	* set top to the object below us.
1645	*/	1636	*/
1646	if (last && last->below && last != floor) top=last->below;	1637	if (last && last->below && last != floor) top=last->below;
1647	}	1638	}
1648	} /* If objects on this space */	1639	} /* If objects on this space */
1649	if (flag & INS_MAP_LOAD)	1640	if (flag & INS_MAP_LOAD)
1650	top = GET_MAP_TOP(op->map,op->x,op->y);	1641	top = GET_MAP_TOP(op->map,op->x,op->y);
1651	if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;	1642	if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1652		1643
1653	/* Top is the object that our object (op) is going to get inserted above.	1644	/* Top is the object that our object (op) is going to get inserted above.
1654	*/	1645	*/
1655		1646
1656	/* First object on this space */	1647	/* First object on this space */
1657	if (!top) {	1648	if (!top) {
1658	op->above = GET_MAP_OB(op->map, op->x, op->y);	1649	op->above = GET_MAP_OB(op->map, op->x, op->y);
1659	if (op->above) op->above->below = op;	1650	if (op->above) op->above->below = op;
1660	op->below = NULL;	1651	op->below = NULL;
1661	SET_MAP_OB(op->map, op->x, op->y, op);	1652	SET_MAP_OB(op->map, op->x, op->y, op);
1662	} else { /* get inserted into the stack above top */	1653	} else { /* get inserted into the stack above top */
1663	op->above = top->above;	1654	op->above = top->above;
1664	if (op->above) op->above->below = op;	1655	if (op->above) op->above->below = op;
1665	op->below = top;	1656	op->below = top;
1666	top->above = op;	1657	top->above = op;
1667	}	1658	}
1668	if (op->above==NULL)	1659	if (op->above==NULL)
1669	SET_MAP_TOP(op->map,op->x, op->y, op);	1660	SET_MAP_TOP(op->map,op->x, op->y, op);
1670	} /* else not INS_BELOW_ORIGINATOR */	1661	} /* else not INS_BELOW_ORIGINATOR */
1671		1662
1672	if(op->type==PLAYER)	1663	if(op->type==PLAYER)
1673	op->contr->do_los=1;	1664	op->contr->do_los=1;
1674		1665
1675	/* If we have a floor, we know the player, if any, will be above	1666	/* If we have a floor, we know the player, if any, will be above
1676	* it, so save a few ticks and start from there.	1667	* it, so save a few ticks and start from there.
1677	*/	1668	*/
1678	if (!(flag & INS_MAP_LOAD))	1669	if (!(flag & INS_MAP_LOAD))
1679	for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {	1670	for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1680	if (tmp->type == PLAYER)	1671	if (tmp->type == PLAYER)
1681	tmp->contr->socket.update_look=1;	1672	tmp->contr->socket.update_look=1;
1682	}	1673	}
1683		1674
1684	/* If this object glows, it may affect lighting conditions that are	1675	/* If this object glows, it may affect lighting conditions that are
1685	* visible to others on this map. But update_all_los is really	1676	* visible to others on this map. But update_all_los is really
1686	* an inefficient way to do this, as it means los for all players	1677	* an inefficient way to do this, as it means los for all players
…		…
1689	* this should get redone to only look for players within range,	1680	* this should get redone to only look for players within range,
1690	* or just updating the P_NEED_UPDATE for spaces within this area	1681	* or just updating the P_NEED_UPDATE for spaces within this area
1691	* of effect may be sufficient.	1682	* of effect may be sufficient.
1692	*/	1683	*/
1693	if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))	1684	if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))
1694	update_all_los(op->map, op->x, op->y);	1685	update_all_los(op->map, op->x, op->y);
1695		1686
1696		1687
1697	/* updates flags (blocked, alive, no magic, etc) for this map space */	1688	/* updates flags (blocked, alive, no magic, etc) for this map space */
1698	update_object(op,UP_OBJ_INSERT);	1689	update_object(op,UP_OBJ_INSERT);
1699		1690
…		…
1709		1700
1710	/* if this is not the head or flag has been passed, don't check walk on status */	1701	/* if this is not the head or flag has been passed, don't check walk on status */
1711		1702
1712	if (!(flag & INS_NO_WALK_ON) && !op->head) {	1703	if (!(flag & INS_NO_WALK_ON) && !op->head) {
1713	if (check_move_on(op, originator))	1704	if (check_move_on(op, originator))
1714	return NULL;	1705	return NULL;
1715		1706
1716	/* If we are a multi part object, lets work our way through the check	1707	/* If we are a multi part object, lets work our way through the check
1717	* walk on's.	1708	* walk on's.
1718	*/	1709	*/
1719	for (tmp=op->more; tmp!=NULL; tmp=tmp->more)	1710	for (tmp=op->more; tmp!=NULL; tmp=tmp->more)
1720	if (check_move_on (tmp, originator))	1711	if (check_move_on (tmp, originator))
1721	return NULL;	1712	return NULL;
1722	}	1713	}
1723	return op;	1714	return op;
1724	}	1715	}
1725		1716
1726	/* this function inserts an object in the map, but if it	1717	/* this function inserts an object in the map, but if it
…		…
1732	object *tmp1;	1723	object *tmp1;
1733		1724
1734	/* first search for itself and remove any old instances */	1725	/* first search for itself and remove any old instances */
1735		1726
1736	for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {	1727	for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {
1737	if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {	1728	if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {
1738	remove_ob(tmp);	1729	remove_ob(tmp);
1739	free_object(tmp);	1730	free_object(tmp);
1740	}	1731	}
1741	}	1732	}
1742		1733
1743	tmp1=arch_to_object(find_archetype(arch_string));	1734	tmp1=arch_to_object(find_archetype(arch_string));
1744		1735
1745		1736
…		…
1758	object *get_split_ob(object *orig_ob, uint32 nr) {	1749	object *get_split_ob(object *orig_ob, uint32 nr) {
1759	object *newob;	1750	object *newob;
1760	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1751	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1761		1752
1762	if(orig_ob->nrof<nr) {	1753	if(orig_ob->nrof<nr) {
1763	sprintf(errmsg,"There are only %d %ss.",	1754	sprintf(errmsg,"There are only %d %ss.",
1764	orig_ob->nrof?orig_ob->nrof:1, orig_ob->name);	1755	orig_ob->nrof?orig_ob->nrof:1, orig_ob->name);
1765	return NULL;	1756	return NULL;
1766	}	1757	}
1767	newob = object_create_clone(orig_ob);	1758	newob = object_create_clone(orig_ob);
1768	if((orig_ob->nrof-=nr)<1) {	1759	if((orig_ob->nrof-=nr)<1) {
1769	if ( ! is_removed)	1760	if ( ! is_removed)
1770	remove_ob(orig_ob);	1761	remove_ob(orig_ob);
1771	free_object2(orig_ob, 1);	1762	free_object2(orig_ob, 1);
1772	}	1763	}
1773	else if ( ! is_removed) {	1764	else if ( ! is_removed) {
1774	if(orig_ob->env!=NULL)	1765	if(orig_ob->env!=NULL)
1775	sub_weight (orig_ob->env,orig_ob->weight*nr);	1766	sub_weight (orig_ob->env,orig_ob->weight*nr);
1776	if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {	1767	if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {
1777	strcpy(errmsg, "Tried to split object whose map is not in memory.");	1768	strcpy(errmsg, "Tried to split object whose map is not in memory.");
1778	LOG(llevDebug,	1769	LOG(llevDebug,
1779	"Error, Tried to split object whose map is not in memory.\n");	1770	"Error, Tried to split object whose map is not in memory.\n");
1780	return NULL;	1771	return NULL;
1781	}	1772	}
1782	}	1773	}
1783	newob->nrof=nr;	1774	newob->nrof=nr;
1784		1775
1785	return newob;	1776	return newob;
1786	}	1777	}
…		…
1808	{	1799	{
1809	op->nrof -= i;	1800	op->nrof -= i;
1810	}	1801	}
1811	else if (op->env != NULL)	1802	else if (op->env != NULL)
1812	{	1803	{
1813	/* is this object in the players inventory, or sub container	1804	/* is this object in the players inventory, or sub container
1814	* therein?	1805	* therein?
1815	*/	1806	*/
1816	tmp = is_player_inv (op->env);	1807	tmp = is_player_inv (op->env);
1817	/* nope. Is this a container the player has opened?	1808	/* nope. Is this a container the player has opened?
1818	* If so, set tmp to that player.	1809	* If so, set tmp to that player.
1819	* IMO, searching through all the players will mostly	1810	* IMO, searching through all the players will mostly
1820	* likely be quicker than following op->env to the map,	1811	* likely be quicker than following op->env to the map,
1821	* and then searching the map for a player.	1812	* and then searching the map for a player.
1822	*/	1813	*/
1823	if (!tmp) {	1814	if (!tmp) {
1824	for (pl=first_player; pl; pl=pl->next)	1815	for (pl=first_player; pl; pl=pl->next)
1825	if (pl->ob->container == op->env) break;	1816	if (pl->ob->container == op->env) break;
1826	if (pl) tmp=pl->ob;	1817	if (pl) tmp=pl->ob;
1827	else tmp=NULL;	1818	else tmp=NULL;
1828	}	1819	}
1829		1820
1830	if (i < op->nrof) {	1821	if (i < op->nrof) {
1831	sub_weight (op->env, op->weight * i);	1822	sub_weight (op->env, op->weight * i);
1832	op->nrof -= i;	1823	op->nrof -= i;
1833	if (tmp) {	1824	if (tmp) {
…		…
1841	}	1832	}
1842	}	1833	}
1843	}	1834	}
1844	else	1835	else
1845	{	1836	{
1846	object *above = op->above;	1837	object *above = op->above;
1847		1838
1848	if (i < op->nrof) {	1839	if (i < op->nrof) {
1849	op->nrof -= i;	1840	op->nrof -= i;
1850	} else {	1841	} else {
1851	remove_ob (op);	1842	remove_ob (op);
1852	op->nrof = 0;	1843	op->nrof = 0;
1853	}	1844	}
1854	/* Since we just removed op, op->above is null */	1845	/* Since we just removed op, op->above is null */
1855	for (tmp = above; tmp != NULL; tmp = tmp->above)	1846	for (tmp = above; tmp != NULL; tmp = tmp->above)
1856	if (tmp->type == PLAYER) {	1847	if (tmp->type == PLAYER) {
1857	if (op->nrof)	1848	if (op->nrof)
1858	esrv_send_item(tmp, op);	1849	esrv_send_item(tmp, op);
1859	else	1850	else
…		…
1911	LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);	1902	LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);
1912	return op;	1903	return op;
1913	}	1904	}
1914	if (where->head) {	1905	if (where->head) {
1915	LOG(llevDebug,	1906	LOG(llevDebug,
1916	"Warning: Tried to insert object wrong part of multipart object.\n");	1907	"Warning: Tried to insert object wrong part of multipart object.\n");
1917	where = where->head;	1908	where = where->head;
1918	}	1909	}
1919	if (op->more) {	1910	if (op->more) {
1920	LOG(llevError, "Tried to insert multipart object %s (%d)\n",	1911	LOG(llevError, "Tried to insert multipart object %s (%d)\n",
1921	op->name, op->count);	1912	op->name, op->count);
…		…
1924	CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);	1915	CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);
1925	CLEAR_FLAG(op, FLAG_REMOVED);	1916	CLEAR_FLAG(op, FLAG_REMOVED);
1926	if(op->nrof) {	1917	if(op->nrof) {
1927	for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)	1918	for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)
1928	if ( CAN_MERGE(tmp,op) ) {	1919	if ( CAN_MERGE(tmp,op) ) {
1929	/* return the original object and remove inserted object	1920	/* return the original object and remove inserted object
1930	(client needs the original object) */	1921	(client needs the original object) */
1931	tmp->nrof += op->nrof;	1922	tmp->nrof += op->nrof;
1932	/* Weight handling gets pretty funky. Since we are adding to	1923	/* Weight handling gets pretty funky. Since we are adding to
1933	* tmp->nrof, we need to increase the weight.	1924	* tmp->nrof, we need to increase the weight.
1934	*/	1925	*/
1935	add_weight (where, op->weight*op->nrof);	1926	add_weight (where, op->weight*op->nrof);
1936	SET_FLAG(op, FLAG_REMOVED);	1927	SET_FLAG(op, FLAG_REMOVED);
1937	free_object(op); /* free the inserted object */	1928	free_object(op); /* free the inserted object */
1938	op = tmp;	1929	op = tmp;
1939	remove_ob (op); /* and fix old object's links */	1930	remove_ob (op); /* and fix old object's links */
1940	CLEAR_FLAG(op, FLAG_REMOVED);	1931	CLEAR_FLAG(op, FLAG_REMOVED);
1941	break;	1932	break;
1942	}	1933	}
1943		1934
1944	/* I assume combined objects have no inventory	1935	/* I assume combined objects have no inventory
1945	* We add the weight - this object could have just been removed	1936	* We add the weight - this object could have just been removed
1946	* (if it was possible to merge). calling remove_ob will subtract	1937	* (if it was possible to merge). calling remove_ob will subtract
…		…
1967	/* reset the light list and los of the players on the map */	1958	/* reset the light list and los of the players on the map */
1968	if((op->glow_radius!=0)&&where->map)	1959	if((op->glow_radius!=0)&&where->map)
1969	{	1960	{
1970	#ifdef DEBUG_LIGHTS	1961	#ifdef DEBUG_LIGHTS
1971	LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",	1962	LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",
1972	op->name);	1963	op->name);
1973	#endif /* DEBUG_LIGHTS */	1964	#endif /* DEBUG_LIGHTS */
1974	if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);	1965	if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);
1975	}	1966	}
1976		1967
1977	/* Client has no idea of ordering so lets not bother ordering it here.	1968	/* Client has no idea of ordering so lets not bother ordering it here.
…		…
2015	mapstruct *m=op->map;	2006	mapstruct *m=op->map;
2016	int x=op->x, y=op->y;	2007	int x=op->x, y=op->y;
2017	MoveType move_on, move_slow, move_block;	2008	MoveType move_on, move_slow, move_block;
2018		2009
2019	if(QUERY_FLAG(op,FLAG_NO_APPLY))	2010	if(QUERY_FLAG(op,FLAG_NO_APPLY))
2020	return 0;	2011	return 0;
2021		2012
2022	tag = op->count;	2013	tag = op->count;
2023		2014
2024	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);	2015	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);
2025	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	2016	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);
…		…
2029	* no need to do checking below. have to make sure move_type	2020	* no need to do checking below. have to make sure move_type
2030	* is set, as lots of objects don't have it set - we treat that	2021	* is set, as lots of objects don't have it set - we treat that
2031	* as walking.	2022	* as walking.
2032	*/	2023	*/
2033	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))	2024	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))
2034	return 0;	2025	return 0;
2035		2026
2036	/* This is basically inverse logic of that below - basically,	2027	/* This is basically inverse logic of that below - basically,
2037	* if the object can avoid the move on or slow move, they do so,	2028	* if the object can avoid the move on or slow move, they do so,
2038	* but can't do it if the alternate movement they are using is	2029	* but can't do it if the alternate movement they are using is
2039	* blocked. Logic on this seems confusing, but does seem correct.	2030	* blocked. Logic on this seems confusing, but does seem correct.
2040	*/	2031	*/
2041	if ((op->move_type & ~move_on & ~move_block) != 0 &&	2032	if ((op->move_type & ~move_on & ~move_block) != 0 &&
2042	(op->move_type & ~move_slow & ~move_block) != 0) return 0;	2033	(op->move_type & ~move_slow & ~move_block) != 0) return 0;
2043		2034
2044	/* The objects have to be checked from top to bottom.	2035	/* The objects have to be checked from top to bottom.
2045	* Hence, we first go to the top:	2036	* Hence, we first go to the top:
2046	*/	2037	*/
2047		2038
2048	for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&	2039	for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&
2049	tmp->above!=NULL; tmp=tmp->above) {	2040	tmp->above!=NULL; tmp=tmp->above) {
2050	/* Trim the search when we find the first other spell effect	2041	/* Trim the search when we find the first other spell effect
2051	* this helps performance so that if a space has 50 spell objects,	2042	* this helps performance so that if a space has 50 spell objects,
2052	* we don't need to check all of them.	2043	* we don't need to check all of them.
2053	*/	2044	*/
2054	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;	2045	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;
2055	}	2046	}
2056	for(;tmp!=NULL; tmp=tmp->below) {	2047	for(;tmp!=NULL; tmp=tmp->below) {
2057	if (tmp == op) continue; /* Can't apply yourself */	2048	if (tmp == op) continue; /* Can't apply yourself */
2058		2049
2059	/* Check to see if one of the movement types should be slowed down.	2050	/* Check to see if one of the movement types should be slowed down.
2060	* Second check makes sure that the movement types not being slowed	2051	* Second check makes sure that the movement types not being slowed
2061	* (~slow_move) is not blocked on this space - just because the	2052	* (~slow_move) is not blocked on this space - just because the
2062	* space doesn't slow down swimming (for example), if you can't actually	2053	* space doesn't slow down swimming (for example), if you can't actually
2063	* swim on that space, can't use it to avoid the penalty.	2054	* swim on that space, can't use it to avoid the penalty.
2064	*/	2055	*/
2065	if (!QUERY_FLAG(op, FLAG_WIZPASS)) {	2056	if (!QUERY_FLAG(op, FLAG_WIZPASS)) {
2066	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	2057	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2067	((op->move_type & tmp->move_slow) &&	2058	((op->move_type & tmp->move_slow) &&
2068	(op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {	2059	(op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {
2069		2060
2070	float diff;	2061	float diff;
2071		2062
2072	diff = tmp->move_slow_penalty*FABS(op->speed);	2063	diff = tmp->move_slow_penalty*FABS(op->speed);
2073	if (op->type == PLAYER) {	2064	if (op->type == PLAYER) {
2074	if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||	2065	if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||
2075	(QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {	2066	(QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {
2076	diff /= 4.0;	2067	diff /= 4.0;
2077	}	2068	}
2078	}	2069	}
2079	op->speed_left -= diff;	2070	op->speed_left -= diff;
2080	}	2071	}
2081	}	2072	}
2082		2073
2083	/* Basically same logic as above, except now for actual apply. */	2074	/* Basically same logic as above, except now for actual apply. */
2084	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2075	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2085	((op->move_type & tmp->move_on) &&	2076	((op->move_type & tmp->move_on) &&
2086	(op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {	2077	(op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {
2087		2078
2088	move_apply(tmp, op, originator);	2079	move_apply(tmp, op, originator);
2089	if (was_destroyed (op, tag))	2080	if (was_destroyed (op, tag))
2090	return 1;	2081	return 1;
2091		2082
2092	/* what the person/creature stepped onto has moved the object	2083	/* what the person/creature stepped onto has moved the object
2093	* someplace new. Don't process any further - if we did,	2084	* someplace new. Don't process any further - if we did,
2094	* have a feeling strange problems would result.	2085	* have a feeling strange problems would result.
2095	*/	2086	*/
2096	if (op->map != m || op->x != x || op->y != y) return 0;	2087	if (op->map != m || op->x != x || op->y != y) return 0;
2097	}	2088	}
2098	}	2089	}
2099	return 0;	2090	return 0;
2100	}	2091	}
2101		2092
2102	/*	2093	/*
…		…
2166		2157
2167	object *present_in_ob_by_name(int type, const char *str, const object *op) {	2158	object *present_in_ob_by_name(int type, const char *str, const object *op) {
2168	object *tmp;	2159	object *tmp;
2169		2160
2170	for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {	2161	for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {
2171	if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))	2162	if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))
2172	return tmp;	2163	return tmp;
2173	}	2164	}
2174	return NULL;	2165	return NULL;
2175	}	2166	}
2176		2167
2177	/*	2168	/*
…		…
2247	int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {	2238	int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {
2248	int i,index=0, flag;	2239	int i,index=0, flag;
2249	static int altern[SIZEOFFREE];	2240	static int altern[SIZEOFFREE];
2250		2241
2251	for(i=start;i<stop;i++) {	2242	for(i=start;i<stop;i++) {
2252	flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);	2243	flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);
2253	if(!flag)	2244	if(!flag)
2254	altern[index++]=i;	2245	altern[index++]=i;
2255		2246
2256	/* Basically, if we find a wall on a space, we cut down the search size.	2247	/* Basically, if we find a wall on a space, we cut down the search size.
2257	* In this way, we won't return spaces that are on another side of a wall.	2248	* In this way, we won't return spaces that are on another side of a wall.
2258	* This mostly work, but it cuts down the search size in all directions -	2249	* This mostly work, but it cuts down the search size in all directions -
2259	* if the space being examined only has a wall to the north and empty	2250	* if the space being examined only has a wall to the north and empty
2260	* spaces in all the other directions, this will reduce the search space	2251	* spaces in all the other directions, this will reduce the search space
2261	* to only the spaces immediately surrounding the target area, and	2252	* to only the spaces immediately surrounding the target area, and
2262	* won't look 2 spaces south of the target space.	2253	* won't look 2 spaces south of the target space.
2263	*/	2254	*/
2264	else if ((flag & AB_NO_PASS) && maxfree[i]<stop)	2255	else if ((flag & AB_NO_PASS) && maxfree[i]<stop)
2265	stop=maxfree[i];	2256	stop=maxfree[i];
2266	}	2257	}
2267	if(!index) return -1;	2258	if(!index) return -1;
2268	return altern[RANDOM()%index];	2259	return altern[RANDOM()%index];
2269	}	2260	}
2270		2261
…		…
2276	*/	2267	*/
2277		2268
2278	int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {	2269	int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {
2279	int i;	2270	int i;
2280	for(i=0;i<SIZEOFFREE;i++) {	2271	for(i=0;i<SIZEOFFREE;i++) {
2281	if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))	2272	if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))
2282	return i;	2273	return i;
2283	}	2274	}
2284	return -1;	2275	return -1;
2285	}	2276	}
2286		2277
2287	/*	2278	/*
…		…
2293	int i, j, tmp, len;	2284	int i, j, tmp, len;
2294		2285
2295	len = end-begin;	2286	len = end-begin;
2296	for(i = begin; i < end; i++)	2287	for(i = begin; i < end; i++)
2297	{	2288	{
2298	j = begin+RANDOM()%len;	2289	j = begin+RANDOM()%len;
2299		2290
2300	tmp = arr[i];	2291	tmp = arr[i];
2301	arr[i] = arr[j];	2292	arr[i] = arr[j];
2302	arr[j] = tmp;	2293	arr[j] = tmp;
2303	}	2294	}
2304	}	2295	}
2305		2296
2306	/* new function to make monster searching more efficient, and effective!	2297	/* new function to make monster searching more efficient, and effective!
2307	* This basically returns a randomized array (in the passed pointer) of	2298	* This basically returns a randomized array (in the passed pointer) of
…		…
2314	{	2305	{
2315	int i;	2306	int i;
2316		2307
2317	for(i = 0; i < SIZEOFFREE; i++)	2308	for(i = 0; i < SIZEOFFREE; i++)
2318	{	2309	{
2319	search_arr[i] = i;	2310	search_arr[i] = i;
2320	}	2311	}
2321		2312
2322	permute(search_arr, 1, SIZEOFFREE1+1);	2313	permute(search_arr, 1, SIZEOFFREE1+1);
2323	permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);	2314	permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);
2324	permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);	2315	permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);
…		…
2343	object *tmp;	2334	object *tmp;
2344	mapstruct *mp;	2335	mapstruct *mp;
2345	MoveType blocked, move_type;	2336	MoveType blocked, move_type;
2346		2337
2347	if (exclude && exclude->head) {	2338	if (exclude && exclude->head) {
2348	exclude = exclude->head;	2339	exclude = exclude->head;
2349	move_type = exclude->move_type;	2340	move_type = exclude->move_type;
2350	} else {	2341	} else {
2351	/* If we don't have anything, presume it can use all movement types. */	2342	/* If we don't have anything, presume it can use all movement types. */
2352	move_type=MOVE_ALL;	2343	move_type=MOVE_ALL;
2353	}	2344	}
2354		2345
2355	for(i=1;i<max;i++) {	2346	for(i=1;i<max;i++) {
2356	mp = m;	2347	mp = m;
2357	nx = x + freearr_x[i];	2348	nx = x + freearr_x[i];
2358	ny = y + freearr_y[i];	2349	ny = y + freearr_y[i];
2359		2350
2360	mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);	2351	mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);
2361	if (mflags & P_OUT_OF_MAP) {	2352	if (mflags & P_OUT_OF_MAP) {
2362	max = maxfree[i];	2353	max = maxfree[i];
2363	} else {	2354	} else {
2364	blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);	2355	blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);
2365		2356
2366	if ((move_type & blocked) == move_type) {	2357	if ((move_type & blocked) == move_type) {
2367	max=maxfree[i];	2358	max=maxfree[i];
2368	} else if (mflags & P_IS_ALIVE) {	2359	} else if (mflags & P_IS_ALIVE) {
2369	for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {	2360	for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {
2370	if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&	2361	if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&
2371	(tmp != exclude ||(tmp->head && tmp->head != exclude))) {	2362	(tmp != exclude ||(tmp->head && tmp->head != exclude))) {
2372	break;	2363	break;
2373	}	2364	}
2374	}	2365	}
2375	if(tmp) {	2366	if(tmp) {
2376	return freedir[i];	2367	return freedir[i];
2377	}	2368	}
2378	}	2369	}
2379	}	2370	}
2380	}	2371	}
2381	return 0;	2372	return 0;
2382	}	2373	}
2383		2374
2384	/*	2375	/*
…		…
2548	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;	2539	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;
2549		2540
2550	/* yes, can see. */	2541	/* yes, can see. */
2551	if(dir < 9) return 1;	2542	if(dir < 9) return 1;
2552	return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |	2543	return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |
2553	can_see_monsterP(m,x,y, reduction_dir[dir][1]) |	2544	can_see_monsterP(m,x,y, reduction_dir[dir][1]) |
2554	can_see_monsterP(m,x,y, reduction_dir[dir][2]);	2545	can_see_monsterP(m,x,y, reduction_dir[dir][2]);
2555	}	2546	}
2556		2547
2557		2548
2558		2549
2559	/*	2550	/*
2560	* can_pick(picker, item): finds out if an object is possible to be	2551	* can_pick(picker, item): finds out if an object is possible to be
2561	* picked up by the picker. Returnes 1 if it can be	2552	* picked up by the picker. Returnes 1 if it can be
2562	* picked up, otherwise 0.	2553	* picked up, otherwise 0.
2563	*	2554	*
…		…
2568	*/	2559	*/
2569		2560
2570	int can_pick(const object *who, const object *item) {	2561	int can_pick(const object *who, const object *item) {
2571	return /*QUERY_FLAG(who,FLAG_WIZ)||*/	2562	return /*QUERY_FLAG(who,FLAG_WIZ)||*/
2572	(item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&	2563	(item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&
2573	!QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&	2564	!QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&
2574	(who->type==PLAYER||item->weight<who->weight/3));	2565	(who->type==PLAYER||item->weight<who->weight/3));
2575	}	2566	}
2576		2567
2577		2568
2578	/*	2569	/*
…		…
2603	prev->more = tmp;	2594	prev->more = tmp;
2604	prev = tmp;	2595	prev = tmp;
2605	}	2596	}
2606	/*** copy inventory ***/	2597	/*** copy inventory ***/
2607	for(item = src->inv; item; item = item->below) {	2598	for(item = src->inv; item; item = item->below) {
2608	(void) insert_ob_in_ob(object_create_clone(item),dst);	2599	(void) insert_ob_in_ob(object_create_clone(item),dst);
2609	}	2600	}
2610		2601
2611	return dst;	2602	return dst;
2612	}	2603	}
2613		2604
…		…
2627	/* Also remember that multiparts objects are not supported for now. */	2618	/* Also remember that multiparts objects are not supported for now. */
2628		2619
2629	object* load_object_str(const char *obstr)	2620	object* load_object_str(const char *obstr)
2630	{	2621	{
2631	object *op;	2622	object *op;
2632	FILE *tempfile;
2633	char filename[MAX_BUF];	2623	char filename[MAX_BUF];
2634	sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);	2624	sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);
		2625
2635	tempfile=fopen(filename,"w");	2626	FILE *tempfile=fopen(filename,"w");
2636	if (tempfile == NULL)	2627	if (tempfile == NULL)
2637	{	2628	{
2638	LOG(llevError,"Error - Unable to access load object temp file\n");	2629	LOG(llevError,"Error - Unable to access load object temp file\n");
2639	return NULL;	2630	return NULL;
2640	};	2631	};
2641	fprintf(tempfile,obstr);	2632	fprintf(tempfile,obstr);
2642	fclose(tempfile);	2633	fclose(tempfile);
2643		2634
2644	op=get_object();	2635	op=get_object();
2645		2636
2646	tempfile=fopen(filename,"r");	2637	object_thawer thawer (filename);
2647	if (tempfile == NULL)	2638	if (thawer)
2648	{
2649	LOG(llevError,"Error - Unable to read object temp file\n");
2650	return NULL;
2651	};
2652	load_object(tempfile,op,LO_NEWFILE,0);	2639	load_object(thawer,op,LO_NEWFILE,0);
2653	LOG(llevDebug," load str completed, object=%s\n",op->name);	2640	LOG(llevDebug," load str completed, object=%s\n",op->name);
2654	CLEAR_FLAG(op,FLAG_REMOVED);	2641	CLEAR_FLAG(op,FLAG_REMOVED);
2655	fclose(tempfile);	2642
2656	return op;	2643	return op;
2657	}	2644	}
2658		2645
2659	/* This returns the first object in who's inventory that	2646	/* This returns the first object in who's inventory that
2660	* has the same type and subtype match.	2647	* has the same type and subtype match.
…		…
2663	object *find_obj_by_type_subtype(const object *who, int type, int subtype)	2650	object *find_obj_by_type_subtype(const object *who, int type, int subtype)
2664	{	2651	{
2665	object *tmp;	2652	object *tmp;
2666		2653
2667	for (tmp=who->inv; tmp; tmp=tmp->below)	2654	for (tmp=who->inv; tmp; tmp=tmp->below)
2668	if (tmp->type == type && tmp->subtype == subtype) return tmp;	2655	if (tmp->type == type && tmp->subtype == subtype) return tmp;
2669		2656
2670	return NULL;	2657	return NULL;
2671	}	2658	}
2672		2659
2673	/* If ob has a field named key, return the link from the list,	2660	/* If ob has a field named key, return the link from the list,
…		…
2734	*/	2721	*/
2735	int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) {	2722	int set_ob_key_value_s(object * op, const char * canonical_key, const char * value, int add_key) {
2736	key_value * field = NULL, *last=NULL;	2723	key_value * field = NULL, *last=NULL;
2737		2724
2738	for (field=op->key_values; field != NULL; field=field->next) {	2725	for (field=op->key_values; field != NULL; field=field->next) {
2739	if (field->key != canonical_key) {	2726	if (field->key != canonical_key) {
2740	last = field;	2727	last = field;
2741	continue;	2728	continue;
2742	}	2729	}
2743		2730
2744	if (field->value) FREE_AND_CLEAR_STR(field->value);	2731	if (field->value) FREE_AND_CLEAR_STR(field->value);
2745	if (value)	2732	if (value)
2746	field->value = add_string(value);	2733	field->value = add_string(value);
2747	else {	2734	else {
2748	/* Basically, if the archetype has this key set,	2735	/* Basically, if the archetype has this key set,
2749	* we need to store the null value so when we save	2736	* we need to store the null value so when we save
2750	* it, we save the empty value so that when we load,	2737	* it, we save the empty value so that when we load,
2751	* we get this value back again.	2738	* we get this value back again.
2752	*/	2739	*/
2753	if (get_ob_key_link(&op->arch->clone, canonical_key))	2740	if (get_ob_key_link(&op->arch->clone, canonical_key))
2754	field->value = NULL;	2741	field->value = NULL;
2755	else {	2742	else {
2756	/* Delete this link */	2743	/* Delete this link */
2757	if (field->key) FREE_AND_CLEAR_STR(field->key);	2744	if (field->key) FREE_AND_CLEAR_STR(field->key);
2758	if (field->value) FREE_AND_CLEAR_STR(field->value);	2745	if (field->value) FREE_AND_CLEAR_STR(field->value);
2759	if (last) last->next = field->next;	2746	if (last) last->next = field->next;
2760	else op->key_values = field->next;	2747	else op->key_values = field->next;
2761	free(field);	2748	free(field);
2762	}	2749	}
2763	}	2750	}
2764	return TRUE;	2751	return TRUE;
2765	}	2752	}
2766	/* IF we get here, key doesn't exist */	2753	/* IF we get here, key doesn't exist */
2767		2754
2768	/* No field, we'll have to add it. */	2755	/* No field, we'll have to add it. */

Diff Legend

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