ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.9 by root, Tue Aug 29 07:34:00 2006 UTC vs.
Revision 1.15 by root, Mon Sep 4 11:08:00 2006 UTC

1	/*	1	/*
2	* static char *rcsid_player_c =	2	* static char *rcsid_player_c =
3	* "$Id: player.C,v 1.9 2006/08/29 07:34:00 root Exp $";	3	* "$Id: player.C,v 1.15 2006/09/04 11:08:00 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
…		…
86	int comp;	86	int comp;
87	int size;	87	int size;
88		88
89	sprintf(buf, "%s/%s", settings.confdir, settings.motd);	89	sprintf(buf, "%s/%s", settings.confdir, settings.motd);
90	if ((fp=open_and_uncompress(buf, 0, &comp)) == NULL) {	90	if ((fp=open_and_uncompress(buf, 0, &comp)) == NULL) {
91	return;	91	return;
92	}	92	}
93	motd[0]='\0';	93	motd[0]='\0';
94	size=0;	94	size=0;
95	while (fgets(buf, MAX_BUF, fp) != NULL) {	95	while (fgets(buf, MAX_BUF, fp) != NULL) {
96	if( *buf == '#')	96	if( *buf == '#')
97	continue;	97	continue;
98	strncat(motd+size,buf,HUGE_BUF-size);	98	strncat(motd+size,buf,HUGE_BUF-size);
99	size+=strlen(buf);	99	size+=strlen(buf);
100	}	100	}
101	draw_ext_info(NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);	101	draw_ext_info(NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
102	close_and_delete(fp, comp);	102	close_and_delete(fp, comp);
…		…
181	int playername_ok(const char *cp) {	181	int playername_ok(const char *cp) {
182	/* Don't allow - or _ as first character in the name */	182	/* Don't allow - or _ as first character in the name */
183	if (*cp == '-' || *cp == '_') return 0;	183	if (*cp == '-' || *cp == '_') return 0;
184		184
185	for(;*cp!='\0';cp++)	185	for(;*cp!='\0';cp++)
186	if(!((*cp>='a'&&*cp<='z')||(*cp>='A'&&*cp<='Z'))&&*cp!='-'&&*cp!='_')	186	if(!((*cp>='a'&&*cp<='z')||(*cp>='A'&&*cp<='Z'))&&*cp!='-'&&*cp!='_')
187	return 0;	187	return 0;
188	return 1;	188	return 1;
189	}	189	}
190		190
191	/* This no longer sets the player map. Also, it now updates	191	/* This no longer sets the player map. Also, it now updates
192	* all the pointers so the caller doesn't need to do that.	192	* all the pointers so the caller doesn't need to do that.
…		…
197	* Hopefully this will be less bugfree and simpler.	197	* Hopefully this will be less bugfree and simpler.
198	* Returns the player structure. If 'p' is null,	198	* Returns the player structure. If 'p' is null,
199	* we create a new one. Otherwise, we recycle	199	* we create a new one. Otherwise, we recycle
200	* the one that is passed.	200	* the one that is passed.
201	*/	201	*/
202	static player* get_player(player *p) {	202	static player *
		203	get_player (player * p)
		204	{
203	object *op=arch_to_object(get_player_archetype(NULL));	205	object *op = arch_to_object (get_player_archetype (NULL));
204	int i;	206	int i;
205		207
206	if (!p) {	208	if (!p)
207	p = (player *) malloc(sizeof(player));	209	{
208	if(p==NULL)	210	p = new player;
209	fatal(OUT_OF_MEMORY);
210		211
211	/* This adds the player in the linked list. There is extra	212	/* This adds the player in the linked list. There is extra
212	* complexity here because we want to add the new player at the	213	* complexity here because we want to add the new player at the
213	* end of the list - there is in fact no compelling reason that	214	* end of the list - there is in fact no compelling reason that
214	* that needs to be done except for things like output of	215	* that needs to be done except for things like output of
215	* 'who'.	216	* 'who'.
216	*/	217	*/
217	player *tmp = first_player;	218	player *tmp = first_player;
218	while(tmp!=NULL&&tmp->next!=NULL)	219	while (tmp != NULL && tmp->next != NULL)
219	tmp=tmp->next;	220	tmp = tmp->next;
220	if(tmp!=NULL)	221	if (tmp != NULL)
221	tmp->next=p;	222	tmp->next = p;
222	else	223	else
223	first_player=p;	224	first_player = p;
224		225
225	p->next = NULL;	226	p->next = NULL;
226	}	227	}
227		228
228	/* Clears basically the entire player structure except	229	/* Clears basically the entire player structure except
229	* for next and socket.	230	* for next and socket.
230	*/	231	*/
231	memset (static_cast<player_memset *>(p), 0, sizeof (player_memset));	232	memset (static_cast<player_pod *>(p), 0, sizeof (player_pod));
232	p->attachable_init (); //HACK	233	p->attachable_clear ();
233		234
234	/* There are some elements we want initialized to non zero value -	235	/* There are some elements we want initialized to non zero value -
235	* we deal with that below this point.	236	* we deal with that below this point.
236	*/	237	*/
237	p->party=NULL;	238	p->party = NULL;
238	p->outputs_sync=16; /* Every 2 seconds */	239	p->outputs_sync = 16; /* Every 2 seconds */
239	p->outputs_count=1; /* Keeps present behaviour */	240	p->outputs_count = 8; /* Keeps present behaviour */
240	p->unapply = unapply_nochoice;	241	p->unapply = unapply_nochoice;
241	p->Swap_First = -1;	242	p->Swap_First = -1;
242		243
243	#ifdef AUTOSAVE	244	#ifdef AUTOSAVE
244	p->last_save_tick = 9999999;	245	p->last_save_tick = 9999999;
245	#endif	246	#endif
246		247
247	strcpy(p->savebed_map, first_map_path); /* Init. respawn position */	248	strcpy (p->savebed_map, first_map_path); /* Init. respawn position */
248		249
249	op->contr=p; /* this aren't yet in archetype */	250	op->contr = p; /* this aren't yet in archetype */
250	p->ob = op;	251	p->ob = op;
251	op->speed_left=0.5;	252	op->speed_left = 0.5;
252	op->speed=1.0;	253	op->speed = 1.0;
253	op->direction=5; /* So player faces south */	254	op->direction = 5; /* So player faces south */
254	op->stats.wc=2;	255	op->stats.wc = 2;
255	op->run_away = 25; /* Then we panick... */	256	op->run_away = 25; /* Then we panick... */
256	p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */	257	p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
257		258
258	roll_stats(op);	259	roll_stats (op);
259	p->state=ST_ROLL_STAT;	260	p->state = ST_ROLL_STAT;
260	clear_los(op);	261	clear_los (op);
261		262
262	p->gen_sp_armour=10;	263	p->gen_sp_armour = 10;
263	p->last_speed= -1;	264	p->last_speed = -1;
264	p->shoottype=range_none;	265	p->shoottype = range_none;
265	p->bowtype=bow_normal;	266	p->bowtype = bow_normal;
266	p->petmode=pet_normal;	267	p->petmode = pet_normal;
267	p->listening=10;	268	p->listening = 10;
268	p->usekeys=containers;	269	p->usekeys = containers;
269	p->last_weapon_sp= -1;	270	p->last_weapon_sp = -1;
270	p->peaceful=1; /* default peaceful */	271	p->peaceful = 1; /* default peaceful */
271	p->do_los=1;	272	p->do_los = 1;
272	p->explore=0;	273	p->explore = 0;
273	p->no_shout=0; /* default can shout */	274	p->no_shout = 0; /* default can shout */
274		275
275	strncpy(p->title, op->arch->clone.name, sizeof(p->title)-1);	276	strncpy (p->title, op->arch->clone.name, sizeof (p->title) - 1);
276	p->title[sizeof(p->title)-1] = '\0';	277	p->title[sizeof (p->title) - 1] = '\0';
277	op->race = add_string (op->arch->clone.race);	278	op->race = op->arch->clone.race;
278		279
279	CLEAR_FLAG(op,FLAG_READY_SKILL);	280	CLEAR_FLAG (op, FLAG_READY_SKILL);
280		281
281	/* we need to clear these to -1 and not zero - otherwise,	282	/* we need to clear these to -1 and not zero - otherwise,
282	* if a player quits and starts a new character, we wont	283	* if a player quits and starts a new character, we wont
283	* send new values to the client, as things like exp start	284	* send new values to the client, as things like exp start
284	* at zero.	285	* at zero.
285	*/	286	*/
286	for (i=0; i < NUM_SKILLS; i++) {	287	for (i = 0; i < NUM_SKILLS; i++)
		288	{
287	p->last_skill_exp[i] = -1;	289	p->last_skill_exp[i] = -1;
288	p->last_skill_ob[i] = NULL;	290	p->last_skill_ob[i] = NULL;
289	}	291	}
290	for (i=0; i < NROFATTACKS; i++) {	292	for (i = 0; i < NROFATTACKS; i++)
		293	{
291	p->last_resist[i] = -1;	294	p->last_resist[i] = -1;
292	}	295	}
293	p->last_stats.exp = -1;	296	p->last_stats.exp = -1;
294	p->last_weight = (uint32)-1;	297	p->last_weight = (uint32) - 1;
295		298
296	p->socket.update_look=0;	299	p->socket.update_look = 0;
297	p->socket.look_position=0;	300	p->socket.look_position = 0;
298	return p;	301	return p;
299	}	302	}
300
301		303
302	/* This loads the first map an puts the player on it. */	304	/* This loads the first map an puts the player on it. */
303	static void set_first_map(object *op)	305	static void set_first_map(object *op)
304	{	306	{
305	strcpy(op->contr->maplevel, first_map_path);	307	strcpy(op->contr->maplevel, first_map_path);
…		…
318		320
319	p=get_player(NULL);	321	p=get_player(NULL);
320	p->socket = *ns;	322	p->socket = *ns;
321	p->socket.faces_sent = (uint8*) malloc(p->socket.faces_sent_len*sizeof(*p->socket.faces_sent));	323	p->socket.faces_sent = (uint8*) malloc(p->socket.faces_sent_len*sizeof(*p->socket.faces_sent));
322	if(p->socket.faces_sent == NULL)	324	if(p->socket.faces_sent == NULL)
323	fatal(OUT_OF_MEMORY);	325	fatal(OUT_OF_MEMORY);
324	memcpy(p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len*sizeof(*p->socket.faces_sent));	326	memcpy(p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len*sizeof(*p->socket.faces_sent));
325	/* Needed because the socket we just copied over needs to be cleared.	327	/* Needed because the socket we just copied over needs to be cleared.
326	* Note that this can result in a client reset if there is partial data	328	* Note that this can result in a client reset if there is partial data
327	* on the uncoming socket.	329	* on the uncoming socket.
328	*/	330	*/
…		…
345	*/	347	*/
346	archetype *get_player_archetype(archetype* at)	348	archetype *get_player_archetype(archetype* at)
347	{	349	{
348	archetype *start = at;	350	archetype *start = at;
349	for (;;) {	351	for (;;) {
350	if (at==NULL || at->next==NULL)	352	if (at==NULL || at->next==NULL)
351	at=first_archetype;	353	at=first_archetype;
352	else	354	else
353	at=at->next;	355	at=at->next;
354	if(at->clone.type==PLAYER)	356	if(at->clone.type==PLAYER)
355	return at;	357	return at;
356	if (at == start) {	358	if (at == start) {
357	LOG (llevError, "No Player archetypes\n");	359	LOG (llevError, "No Player archetypes\n");
358	exit (-1);	360	exit (-1);
359	}	361	}
360	}	362	}
361	}	363	}
362		364
363		365
364	object *get_nearest_player(object *mon) {	366	object *get_nearest_player(object *mon) {
…		…
367	objectlink *ol;	369	objectlink *ol;
368	unsigned lastdist;	370	unsigned lastdist;
369	rv_vector rv;	371	rv_vector rv;
370		372
371	for(ol=first_friendly_object,lastdist=1000;ol!=NULL;ol=ol->next) {	373	for(ol=first_friendly_object,lastdist=1000;ol!=NULL;ol=ol->next) {
372	/* We should not find free objects on this friendly list, but it	374	/* We should not find free objects on this friendly list, but it
373	* does periodically happen. Given that, lets deal with it.	375	* does periodically happen. Given that, lets deal with it.
374	* While unlikely, it is possible the next object on the friendly	376	* While unlikely, it is possible the next object on the friendly
375	* list is also free, so encapsulate this in a while loop.	377	* list is also free, so encapsulate this in a while loop.
376	*/	378	*/
377	while (QUERY_FLAG(ol->ob, FLAG_FREED) || !QUERY_FLAG(ol->ob, FLAG_FRIENDLY)) {	379	while (QUERY_FLAG(ol->ob, FLAG_FREED) || !QUERY_FLAG(ol->ob, FLAG_FRIENDLY)) {
378	object *tmp=ol->ob;	380	object *tmp=ol->ob;
379		381
380	/* Can't do much more other than log the fact, because the object	382	/* Can't do much more other than log the fact, because the object
381	* itself will have been cleared.	383	* itself will have been cleared.
382	*/	384	*/
383	LOG(llevDebug,"get_nearest_player: Found free/non friendly object on friendly list\n");	385	LOG(llevDebug,"get_nearest_player: Found free/non friendly object on friendly list\n");
384	ol = ol->next;	386	ol = ol->next;
385	remove_friendly_object(tmp);	387	remove_friendly_object(tmp);
386	if (!ol) return op;	388	if (!ol) return op;
387	}	389	}
388		390
389	/* Remove special check for player from this. First, it looks to cause	391	/* Remove special check for player from this. First, it looks to cause
390	* some crashes (ol->ob->contr not set properly?), but secondly, a more	392	* some crashes (ol->ob->contr not set properly?), but secondly, a more
391	* complicated method of state checking would be needed in any case -	393	* complicated method of state checking would be needed in any case -
392	* as it was, a clever player could type quit, and the function would	394	* as it was, a clever player could type quit, and the function would
393	* skip them over while waiting for confirmation. Remove	395	* skip them over while waiting for confirmation. Remove
394	* on_same_map check, as can_detect_enemy also does this	396	* on_same_map check, as can_detect_enemy also does this
395	*/	397	*/
396	if (!can_detect_enemy(mon,ol->ob,&rv))	398	if (!can_detect_enemy(mon,ol->ob,&rv))
397	continue;	399	continue;
398		400
399	if(lastdist>rv.distance) {	401	if(lastdist>rv.distance) {
400	op=ol->ob;	402	op=ol->ob;
401	lastdist=rv.distance;	403	lastdist=rv.distance;
402	}	404	}
403	}	405	}
404	for (pl=first_player; pl != NULL; pl=pl->next) {	406	for (pl=first_player; pl != NULL; pl=pl->next) {
405	if (can_detect_enemy(mon, pl->ob,&rv)) {	407	if (can_detect_enemy(mon, pl->ob,&rv)) {
406		408
407	if(lastdist>rv.distance) {	409	if(lastdist>rv.distance) {
408	op=pl->ob;	410	op=pl->ob;
409	lastdist=rv.distance;	411	lastdist=rv.distance;
410	}	412	}
411	}	413	}
412	}	414	}
413	#if 0	415	#if 0
414	LOG(llevDebug,"get_nearest_player() finds player: %s\n",op?op->name:"(null)");	416	LOG(llevDebug,"get_nearest_player() finds player: %s\n",op?&op->name:"(null)");
415	#endif	417	#endif
416	return op;	418	return op;
417	}	419	}
418		420
419	/* I believe this can safely go to 2, 3 is questionable, 4 will likely	421	/* I believe this can safely go to 2, 3 is questionable, 4 will likely
…		…
477	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	479	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
478	diff = FABS(rv.distance_x)>FABS(rv.distance_y)?FABS(rv.distance_x):FABS(rv.distance_y);	480	diff = FABS(rv.distance_x)>FABS(rv.distance_y)?FABS(rv.distance_x):FABS(rv.distance_y);
479	/* If we can't solve it within the search distance, return now. */	481	/* If we can't solve it within the search distance, return now. */
480	if (diff>max) return 0;	482	if (diff>max) return 0;
481	while (diff >1 && max>0) {	483	while (diff >1 && max>0) {
482	lastx = x;	484	lastx = x;
483	lasty = y;	485	lasty = y;
484	lastmap = m;	486	lastmap = m;
485	x = lastx + freearr_x[dir];	487	x = lastx + freearr_x[dir];
486	y = lasty + freearr_y[dir];	488	y = lasty + freearr_y[dir];
487		489
488	mflags = get_map_flags(m, &m, x, y, &x, &y);	490	mflags = get_map_flags(m, &m, x, y, &x, &y);
489	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK(m, x, y);	491	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK(m, x, y);
490		492
491	/* Space is blocked - try changing direction a little */	493	/* Space is blocked - try changing direction a little */
492	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK(mon, blocked) || (mflags&P_BLOCKSVIEW))	494	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK(mon, blocked) || (mflags&P_BLOCKSVIEW))
493	&& (m == mon->map && blocked_link(mon, m, x, y)))) {	495	&& (m == mon->map && blocked_link(mon, m, x, y)))) {
494	/* recalculate direction from last good location. Possible	496	/* recalculate direction from last good location. Possible
495	* we were not traversing ideal location before.	497	* we were not traversing ideal location before.
496	*/	498	*/
497	get_rangevector_from_mapcoord(lastmap, lastx, lasty, pl, &rv, 0);	499	get_rangevector_from_mapcoord(lastmap, lastx, lasty, pl, &rv, 0);
498	if (rv.direction != dir) {	500	if (rv.direction != dir) {
499	/* OK - says direction should be different - lets reset the	501	/* OK - says direction should be different - lets reset the
500	* the values so it will try again.	502	* the values so it will try again.
501	*/	503	*/
502	x = lastx;	504	x = lastx;
503	y = lasty;	505	y = lasty;
504	m = lastmap;	506	m = lastmap;
505	dir = firstdir = rv.direction;	507	dir = firstdir = rv.direction;
506	} else {	508	} else {
507	/* direct path is blocked - try taking a side step to	509	/* direct path is blocked - try taking a side step to
508	* either the left or right.	510	* either the left or right.
509	* Note increase the values in the loop below to be	511	* Note increase the values in the loop below to be
510	* more than -1/1 respectively will mean the monster takes	512	* more than -1/1 respectively will mean the monster takes
511	* bigger detour. Have to be careful about these values getting	513	* bigger detour. Have to be careful about these values getting
512	* too big (3 or maybe 4 or higher) as the monster may just try	514	* too big (3 or maybe 4 or higher) as the monster may just try
513	* stepping back and forth	515	* stepping back and forth
514	*/	516	*/
515	for (i=-DETOUR_AMOUNT; i<=DETOUR_AMOUNT; i++) {	517	for (i=-DETOUR_AMOUNT; i<=DETOUR_AMOUNT; i++) {
516	if (i==0) continue; /* already did this, so skip it */	518	if (i==0) continue; /* already did this, so skip it */
517	/* Use lastdir here - otherwise,	519	/* Use lastdir here - otherwise,
518	* since the direction that the creature should move in	520	* since the direction that the creature should move in
519	* may change, you could get infinite loops.	521	* may change, you could get infinite loops.
520	* ie, player is northwest, but monster can only	522	* ie, player is northwest, but monster can only
521	* move west, so it does that. It goes some distance,	523	* move west, so it does that. It goes some distance,
522	* gets blocked, finds that it should move north,	524	* gets blocked, finds that it should move north,
523	* can't do that, but now finds it can move east, and	525	* can't do that, but now finds it can move east, and
524	* gets back to its original point. lastdir contains	526	* gets back to its original point. lastdir contains
525	* the last direction the creature has successfully	527	* the last direction the creature has successfully
526	* moved.	528	* moved.
527	*/	529	*/
528		530
529	x = lastx + freearr_x[absdir(lastdir+i)];	531	x = lastx + freearr_x[absdir(lastdir+i)];
530	y = lasty + freearr_y[absdir(lastdir+i)];	532	y = lasty + freearr_y[absdir(lastdir+i)];
531	m = lastmap;	533	m = lastmap;
532	mflags = get_map_flags(m, &m, x, y, &x, &y);	534	mflags = get_map_flags(m, &m, x, y, &x, &y);
533	if (mflags & P_OUT_OF_MAP) continue;	535	if (mflags & P_OUT_OF_MAP) continue;
534	blocked = GET_MAP_MOVE_BLOCK(m, x, y);	536	blocked = GET_MAP_MOVE_BLOCK(m, x, y);
535	if (OB_TYPE_MOVE_BLOCK(mon, blocked)) continue;	537	if (OB_TYPE_MOVE_BLOCK(mon, blocked)) continue;
536	if (mflags & P_BLOCKSVIEW) continue;	538	if (mflags & P_BLOCKSVIEW) continue;
537		539
538	if (m == mon->map && blocked_link(mon, m, x, y)) break;	540	if (m == mon->map && blocked_link(mon, m, x, y)) break;
539	}	541	}
540	/* go through entire loop without finding a valid	542	/* go through entire loop without finding a valid
541	* sidestep to take - thus, no valid path.	543	* sidestep to take - thus, no valid path.
542	*/	544	*/
543	if (i==(DETOUR_AMOUNT+1))	545	if (i==(DETOUR_AMOUNT+1))
544	return 0;	546	return 0;
545	diff--;	547	diff--;
546	lastdir=dir;	548	lastdir=dir;
547	max--;	549	max--;
548	if (!firstdir) firstdir = dir+i;	550	if (!firstdir) firstdir = dir+i;
549	} /* else check alternate directions */	551	} /* else check alternate directions */
550	} /* if blocked */	552	} /* if blocked */
551	else {	553	else {
552	/* we moved towards creature, so diff is less */	554	/* we moved towards creature, so diff is less */
553	diff--;	555	diff--;
554	max--;	556	max--;
555	lastdir=dir;	557	lastdir=dir;
556	if (!firstdir) firstdir = dir;	558	if (!firstdir) firstdir = dir;
557	}	559	}
558	if (diff<=1) {	560	if (diff<=1) {
559	/* Recalculate diff (distance) because we may not have actually	561	/* Recalculate diff (distance) because we may not have actually
560	* headed toward player for entire distance.	562	* headed toward player for entire distance.
561	*/	563	*/
562	get_rangevector_from_mapcoord(m, x, y, pl, &rv, 0);	564	get_rangevector_from_mapcoord(m, x, y, pl, &rv, 0);
563	diff = FABS(rv.distance_x)>FABS(rv.distance_y)?FABS(rv.distance_x):FABS(rv.distance_y);	565	diff = FABS(rv.distance_x)>FABS(rv.distance_y)?FABS(rv.distance_x):FABS(rv.distance_y);
564	}	566	}
565	if (diff>max) return 0;	567	if (diff>max) return 0;
566	}	568	}
567	/* If we reached the max, didn't find a direction in time */	569	/* If we reached the max, didn't find a direction in time */
568	if (!max) return 0;	570	if (!max) return 0;
569		571
570	return firstdir;	572	return firstdir;
…		…
572		574
573	void give_initial_items(object *pl,treasurelist *items) {	575	void give_initial_items(object *pl,treasurelist *items) {
574	object *op,*next=NULL;	576	object *op,*next=NULL;
575		577
576	if(pl->randomitems!=NULL)	578	if(pl->randomitems!=NULL)
577	create_treasure(items,pl,GT_STARTEQUIP | GT_ONLY_GOOD,1,0);	579	create_treasure(items,pl,GT_STARTEQUIP | GT_ONLY_GOOD,1,0);
578		580
579	for (op=pl->inv; op; op=next) {	581	for (op=pl->inv; op; op=next) {
580	next = op->below;	582	next = op->below;
581		583
582	/* Forces get applied per default, unless they have the	584	/* Forces get applied per default, unless they have the
583	* flag "neutral" set. Sorry but I can't think of a better way	585	* flag "neutral" set. Sorry but I can't think of a better way
584	*/	586	*/
585	if(op->type==FORCE && !QUERY_FLAG(op, FLAG_NEUTRAL))	587	if(op->type==FORCE && !QUERY_FLAG(op, FLAG_NEUTRAL))
586	SET_FLAG(op,FLAG_APPLIED);	588	SET_FLAG(op,FLAG_APPLIED);
587		589
588	/* we never give weapons/armour if these cannot be used	590	/* we never give weapons/armour if these cannot be used
589	* by this player due to race restrictions	591	* by this player due to race restrictions
590	*/	592	*/
591	if (pl->type == PLAYER) {	593	if (pl->type == PLAYER) {
592	if ((!QUERY_FLAG(pl, FLAG_USE_ARMOUR) &&	594	if ((!QUERY_FLAG(pl, FLAG_USE_ARMOUR) &&
593	(op->type == ARMOUR || op->type == BOOTS ||	595	(op->type == ARMOUR || op->type == BOOTS ||
594	op->type == CLOAK || op->type == HELMET ||	596	op->type == CLOAK || op->type == HELMET ||
595	op->type == SHIELD || op->type == GLOVES ||	597	op->type == SHIELD || op->type == GLOVES ||
596	op->type == BRACERS || op->type == GIRDLE)) ||	598	op->type == BRACERS || op->type == GIRDLE)) ||
597	(!QUERY_FLAG(pl, FLAG_USE_WEAPON) && op->type == WEAPON)) {	599	(!QUERY_FLAG(pl, FLAG_USE_WEAPON) && op->type == WEAPON)) {
598	remove_ob (op);	600	remove_ob (op);
599	free_object (op);	601	free_object (op);
600	continue;	602	continue;
601	}	603	}
602	}	604	}
603		605
604	/* This really needs to be better - we should really give	606	/* This really needs to be better - we should really give
605	* a substitute spellbook. The problem is that we don't really	607	* a substitute spellbook. The problem is that we don't really
606	* have a good idea what to replace it with (need something like	608	* have a good idea what to replace it with (need something like
607	* a first level treasurelist for each skill.)	609	* a first level treasurelist for each skill.)
608	* remove duplicate skills also	610	* remove duplicate skills also
609	*/	611	*/
610	if(op->type==SPELLBOOK || op->type == SKILL) {	612	if(op->type==SPELLBOOK || op->type == SKILL) {
611	object *tmp;	613	object *tmp;
612		614
613	for (tmp=op->below; tmp; tmp=tmp->below)	615	for (tmp=op->below; tmp; tmp=tmp->below)
614	if (tmp->type == op->type && tmp->name == op->name) break;	616	if (tmp->type == op->type && tmp->name == op->name) break;
615		617
616	if (tmp) {	618	if (tmp) {
617	remove_ob(op);	619	remove_ob(op);
618	free_object(op);	620	free_object(op);
619	LOG(llevError,"give_initial_items: Removing duplicate object %s\n",	621	LOG(llevError,"give_initial_items: Removing duplicate object %s\n",
620	tmp->name);	622	&tmp->name);
621	continue;	623	continue;
622	}	624	}
623	if (op->nrof > 1) op->nrof = 1;	625	if (op->nrof > 1) op->nrof = 1;
624	}	626	}
625		627
626	if (op->type == SPELLBOOK && op->inv) {	628	if (op->type == SPELLBOOK && op->inv) {
627	CLEAR_FLAG(op->inv, FLAG_STARTEQUIP);	629	CLEAR_FLAG(op->inv, FLAG_STARTEQUIP);
628	}	630	}
629		631
630	/* Give starting characters identified, uncursed, and undamned	632	/* Give starting characters identified, uncursed, and undamned
631	* items. Just don't identify gold or silver, or it won't be	633	* items. Just don't identify gold or silver, or it won't be
632	* merged properly.	634	* merged properly.
633	*/	635	*/
634	if (need_identify(op)) {	636	if (need_identify(op)) {
635	SET_FLAG(op, FLAG_IDENTIFIED);	637	SET_FLAG(op, FLAG_IDENTIFIED);
636	CLEAR_FLAG(op, FLAG_CURSED);	638	CLEAR_FLAG(op, FLAG_CURSED);
637	CLEAR_FLAG(op, FLAG_DAMNED);	639	CLEAR_FLAG(op, FLAG_DAMNED);
638	}	640	}
639	if(op->type==SPELL) {	641	if(op->type==SPELL) {
640	remove_ob(op);	642	remove_ob(op);
641	free_object(op);	643	free_object(op);
642	continue;	644	continue;
643	}	645	}
644	else if(op->type==SKILL) {	646	else if(op->type==SKILL) {
645	SET_FLAG(op, FLAG_CAN_USE_SKILL);	647	SET_FLAG(op, FLAG_CAN_USE_SKILL);
646	op->stats.exp = 0;	648	op->stats.exp = 0;
647	op->level = 1;	649	op->level = 1;
648	}	650	}
649	/* lock all 'normal items by default */	651	/* lock all 'normal items by default */
650	else SET_FLAG(op, FLAG_INV_LOCKED);	652	else SET_FLAG(op, FLAG_INV_LOCKED);
651	} /* for loop of objects in player inv */	653	} /* for loop of objects in player inv */
652		654
653	/* Need to set up the skill pointers */	655	/* Need to set up the skill pointers */
654	link_player_skills(pl);	656	link_player_skills(pl);
655	}	657	}
…		…
678	* removing the player - it probably makes more sense	680	* removing the player - it probably makes more sense
679	* to leave it to play_again to remove the object in all	681	* to leave it to play_again to remove the object in all
680	* cases.	682	* cases.
681	*/	683	*/
682	if (!QUERY_FLAG(op, FLAG_REMOVED))	684	if (!QUERY_FLAG(op, FLAG_REMOVED))
683	remove_ob(op);	685	remove_ob(op);
684	/* Need to set this to null - otherwise, it could point to garbage,	686	/* Need to set this to null - otherwise, it could point to garbage,
685	* and draw() doesn't check to see if the player is removed, only if	687	* and draw() doesn't check to see if the player is removed, only if
686	* the map is null or not swapped out.	688	* the map is null or not swapped out.
687	*/	689	*/
688	op->map = NULL;	690	op->map = NULL;
…		…
690		692
691		693
692	int receive_play_again(object *op, char key)	694	int receive_play_again(object *op, char key)
693	{	695	{
694	if(key=='q'||key=='Q') {	696	if(key=='q'||key=='Q') {
695	remove_friendly_object(op);	697	remove_friendly_object(op);
696	leave(op->contr,0); /* ericserver will draw the message */	698	leave(op->contr,0); /* ericserver will draw the message */
697	return 2;	699	return 2;
698	}	700	}
699	else if(key=='a'||key=='A') {	701	else if(key=='a'||key=='A') {
700	player *pl = op->contr;	702	player *pl = op->contr;
701	const char *name = op->name;	703	shstr name = op->name;
702		704
703	add_refcount(name);
704	remove_friendly_object(op);	705	remove_friendly_object(op);
705	free_object(op);	706	free_object(op);
706	pl = get_player(pl);	707	pl = get_player(pl);
707	op = pl->ob;	708	op = pl->ob;
708	add_friendly_object(op);	709	add_friendly_object(op);
709	op->contr->password[0]='~';	710	op->contr->password[0]='~';
710	FREE_AND_CLEAR_STR(op->name);	711	op->name = op->name_pl = 0;
711	FREE_AND_CLEAR_STR(op->name_pl);
712
713	/* Lets put a space in here */	712	/* Lets put a space in here */
714	new_draw_info(NDI_UNIQUE, 0, op, "\n");	713	new_draw_info(NDI_UNIQUE, 0, op, "\n");
715	get_name(op);	714	get_name(op);
716	op->name = name; /* Alrady added a refcount above */	715	op->name = op->name_pl = name;
717	op->name_pl = add_string(name);
718	set_first_map(op);	716	set_first_map(op);
719	} else {	717	} else {
720	/* user pressed something else so just ask again... */	718	/* user pressed something else so just ask again... */
721	play_again(op);	719	play_again(op);
722	}	720	}
723	return 0;	721	return 0;
724	}	722	}
725		723
726	void confirm_password(object *op) {	724	void confirm_password(object *op) {
…		…
730	send_query(&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");	728	send_query(&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
731	}	729	}
732		730
733	void get_party_password(object *op, partylist *party) {	731	void get_party_password(object *op, partylist *party) {
734	if (party == NULL) {	732	if (party == NULL) {
735	LOG(llevError, "get_party_password(): tried to make player %s join a NULL party", op->name);	733	LOG(llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
736	return;	734	return;
737	}	735	}
738	op->contr->write_buf[0]='\0';	736	op->contr->write_buf[0]='\0';
739	op->contr->state=ST_GET_PARTY_PASSWORD;	737	op->contr->state=ST_GET_PARTY_PASSWORD;
740	op->contr->party_to_join = party;	738	op->contr->party_to_join = party;
741	send_query(&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");	739	send_query(&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");
…		…
745	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	743	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
746	int roll_stat(void) {	744	int roll_stat(void) {
747	int a[4],i,j,k;	745	int a[4],i,j,k;
748		746
749	for(i=0;i<4;i++)	747	for(i=0;i<4;i++)
750	a[i]=(int)RANDOM()%6+1;	748	a[i]=(int)RANDOM()%6+1;
751		749
752	for(i=0,j=0,k=7;i<4;i++)	750	for(i=0,j=0,k=7;i<4;i++)
753	if(a[i]<k)	751	if(a[i]<k)
754	k=a[i],j=i;	752	k=a[i],j=i;
755		753
756	for(i=0,k=0;i<4;i++) {	754	for(i=0,k=0;i<4;i++) {
757	if(i!=j)	755	if(i!=j)
758	k+=a[i];	756	k+=a[i];
759	}	757	}
760	return k;	758	return k;
761	}	759	}
762		760
763	void roll_stats(object *op) {	761	void roll_stats(object *op) {
764	int sum=0;	762	int sum=0;
765	int i = 0, j = 0;	763	int i = 0, j = 0;
766	int statsort[7];	764	int statsort[7];
767		765
768	do {	766	do {
769	op->stats.Str=roll_stat();	767	op->stats.Str=roll_stat();
770	op->stats.Dex=roll_stat();	768	op->stats.Dex=roll_stat();
771	op->stats.Int=roll_stat();	769	op->stats.Int=roll_stat();
772	op->stats.Con=roll_stat();	770	op->stats.Con=roll_stat();
773	op->stats.Wis=roll_stat();	771	op->stats.Wis=roll_stat();
774	op->stats.Pow=roll_stat();	772	op->stats.Pow=roll_stat();
775	op->stats.Cha=roll_stat();	773	op->stats.Cha=roll_stat();
776	sum=op->stats.Str+op->stats.Dex+op->stats.Int+	774	sum=op->stats.Str+op->stats.Dex+op->stats.Int+
777	op->stats.Con+op->stats.Wis+op->stats.Pow+	775	op->stats.Con+op->stats.Wis+op->stats.Pow+
778	op->stats.Cha;	776	op->stats.Cha;
779	} while(sum<82||sum>116);	777	} while(sum<82||sum>116);
780		778
781	/* Sort the stats so that rerolling is easier... */	779	/* Sort the stats so that rerolling is easier... */
782	statsort[0] = op->stats.Str;	780	statsort[0] = op->stats.Str;
783	statsort[1] = op->stats.Dex;	781	statsort[1] = op->stats.Dex;
…		…
787	statsort[5] = op->stats.Pow;	785	statsort[5] = op->stats.Pow;
788	statsort[6] = op->stats.Cha;	786	statsort[6] = op->stats.Cha;
789		787
790	/* a quick and dirty bubblesort? */	788	/* a quick and dirty bubblesort? */
791	do {	789	do {
792	if (statsort[i] < statsort[i + 1]) {	790	if (statsort[i] < statsort[i + 1]) {
793	j = statsort[i];	791	j = statsort[i];
794	statsort[i] = statsort[i + 1];	792	statsort[i] = statsort[i + 1];
795	statsort[i + 1] = j;	793	statsort[i + 1] = j;
796	i = 0;	794	i = 0;
797	} else {	795	} else {
798	i++;	796	i++;
799	}	797	}
800	} while (i < 6);	798	} while (i < 6);
801		799
802	op->stats.Str = statsort[0];	800	op->stats.Str = statsort[0];
803	op->stats.Dex = statsort[1];	801	op->stats.Dex = statsort[1];
804	op->stats.Con = statsort[2];	802	op->stats.Con = statsort[2];
…		…
841	{	839	{
842	signed char tmp;	840	signed char tmp;
843	char buf[MAX_BUF];	841	char buf[MAX_BUF];
844		842
845	if ( op->contr->Swap_First == -1 ) {	843	if ( op->contr->Swap_First == -1 ) {
846	new_draw_info(NDI_UNIQUE, 0,op,"How the hell did you get here?!?!!!");	844	new_draw_info(NDI_UNIQUE, 0,op,"How the hell did you get here?!?!!!");
847	new_draw_info(NDI_UNIQUE, 0,op,"Error in Swap_Stat code,");	845	new_draw_info(NDI_UNIQUE, 0,op,"Error in Swap_Stat code,");
848	new_draw_info(NDI_UNIQUE, 0,op,"mail korg@rdt.monash.edu.au");	846	new_draw_info(NDI_UNIQUE, 0,op,"mail korg@rdt.monash.edu.au");
849	return;	847	return;
850	}	848	}
851		849
852	tmp = get_attr_value(&op->contr->orig_stats, op->contr->Swap_First);	850	tmp = get_attr_value(&op->contr->orig_stats, op->contr->Swap_First);
853		851
854	set_attr_value(&op->contr->orig_stats, op->contr->Swap_First,	852	set_attr_value(&op->contr->orig_stats, op->contr->Swap_First,
855	get_attr_value(&op->contr->orig_stats, Swap_Second));	853	get_attr_value(&op->contr->orig_stats, Swap_Second));
856		854
857	set_attr_value(&op->contr->orig_stats, Swap_Second, tmp);	855	set_attr_value(&op->contr->orig_stats, Swap_Second, tmp);
858		856
859	sprintf(buf,"%s done\n", short_stat_name[Swap_Second]);	857	sprintf(buf,"%s done\n", short_stat_name[Swap_Second]);
860	new_draw_info(NDI_UNIQUE, 0,op, buf);	858	new_draw_info(NDI_UNIQUE, 0,op, buf);
…		…
896	int keynum = key -'0';	894	int keynum = key -'0';
897	char buf[MAX_BUF];	895	char buf[MAX_BUF];
898	static sint8 stat_trans[] = {-1, STR, DEX, CON, INT, WIS, POW, CHA};	896	static sint8 stat_trans[] = {-1, STR, DEX, CON, INT, WIS, POW, CHA};
899		897
900	if (keynum>0 && keynum<=7) {	898	if (keynum>0 && keynum<=7) {
901	if (op->contr->Swap_First==-1) {	899	if (op->contr->Swap_First==-1) {
902	op->contr->Swap_First=stat_trans[keynum];	900	op->contr->Swap_First=stat_trans[keynum];
903	sprintf(buf,"%s ->", short_stat_name[stat_trans[keynum]]);	901	sprintf(buf,"%s ->", short_stat_name[stat_trans[keynum]]);
904	new_draw_info(NDI_UNIQUE, 0,op,buf);	902	new_draw_info(NDI_UNIQUE, 0,op,buf);
905	}	903	}
906	else	904	else
907	Swap_Stat(op,stat_trans[keynum]);	905	Swap_Stat(op,stat_trans[keynum]);
908		906
909	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"");	907	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"");
910	return 1;	908	return 1;
911	}	909	}
912	switch (key) {	910	switch (key) {
913	case 'n':	911	case 'n':
914	case 'N': {	912	case 'N': {
915	SET_FLAG(op, FLAG_WIZ);	913	SET_FLAG(op, FLAG_WIZ);
916	if(op->map==NULL) {	914	if(op->map==NULL) {
917	LOG(llevError,"Map == NULL in state 2\n");	915	LOG(llevError,"Map == NULL in state 2\n");
918	break;	916	break;
919	}	917	}
920		918
921	#if 0	919	#if 0
922	/* So that enter_exit will put us at startx/starty */	920	/* So that enter_exit will put us at startx/starty */
923	op->x= -1;	921	op->x= -1;
924		922
925	enter_exit(op,NULL);	923	enter_exit(op,NULL);
926	#endif	924	#endif
927	SET_ANIMATION(op, 2); /* So player faces south */	925	SET_ANIMATION(op, 2); /* So player faces south */
928	/* Enter exit adds a player otherwise */	926	/* Enter exit adds a player otherwise */
929	add_statbonus(op);	927	add_statbonus(op);
930	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");	928	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
931	op->contr->state = ST_CHANGE_CLASS;	929	op->contr->state = ST_CHANGE_CLASS;
932	if (op->msg)	930	if (op->msg)
933	new_draw_info(NDI_BLUE, 0, op, op->msg);	931	new_draw_info(NDI_BLUE, 0, op, op->msg);
934	return 0;	932	return 0;
935	}	933	}
936	case 'y':	934	case 'y':
937	case 'Y':	935	case 'Y':
938	roll_stats(op);	936	roll_stats(op);
939	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"");	937	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"");
940	return 1;	938	return 1;
941		939
942	case 'q':	940	case 'q':
943	case 'Q':	941	case 'Q':
944	play_again(op);	942	play_again(op);
945	return 1;	943	return 1;
946		944
947	default:	945	default:
948	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Yes, No, Quit or 1-6. Roll again?");	946	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Yes, No, Quit or 1-6. Roll again?");
949	return 0;	947	return 0;
950	}	948	}
951	return 0;	949	return 0;
952	}	950	}
953		951
954	/* This function takes the key that is passed, and does the	952	/* This function takes the key that is passed, and does the
…		…
966	remove_ob(op);	964	remove_ob(op);
967	play_again(op);	965	play_again(op);
968	return 0;	966	return 0;
969	}	967	}
970	if(key=='d'||key=='D') {	968	if(key=='d'||key=='D') {
971	char buf[MAX_BUF];	969	char buf[MAX_BUF];
972		970
973	/* this must before then initial items are given */	971	/* this must before then initial items are given */
974	esrv_new_player(op->contr, op->weight+op->carrying);	972	esrv_new_player(op->contr, op->weight+op->carrying);
975	create_treasure(find_treasurelist("starting_wealth"),op, 0, 0, 0);	973	create_treasure(find_treasurelist("starting_wealth"),op, 0, 0, 0);
976		974
977	INVOKE_PLAYER (BIRTH, op->contr);	975	INVOKE_PLAYER (BIRTH, op->contr);
978	INVOKE_PLAYER (LOGIN, op->contr);	976	INVOKE_PLAYER (LOGIN, op->contr);
979		977
980	op->contr->state=ST_PLAYING;	978	op->contr->state=ST_PLAYING;
981		979
982	if (op->msg) {	980	if (op->msg)
983	free_string(op->msg);
984	op->msg=NULL;	981	op->msg=NULL;
985	}
986		982
987	/* We create this now because some of the unique maps will need it	983	/* We create this now because some of the unique maps will need it
988	* to save here.	984	* to save here.
989	*/	985	*/
990	sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,op->name);	986	sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,&op->name);
991	make_path_to_file(buf);	987	make_path_to_file(buf);
992		988
993	#ifdef AUTOSAVE	989	#ifdef AUTOSAVE
994	op->contr->last_save_tick = pticks;	990	op->contr->last_save_tick = pticks;
995	#endif	991	#endif
996	start_info(op);	992	start_info(op);
997	CLEAR_FLAG(op, FLAG_WIZ);	993	CLEAR_FLAG(op, FLAG_WIZ);
998	give_initial_items(op,op->randomitems);	994	give_initial_items(op,op->randomitems);
999	link_player_skills(op);	995	link_player_skills(op);
1000	esrv_send_inventory(op, op);	996	esrv_send_inventory(op, op);
1001	fix_player(op);	997	fix_player(op);
1002		998
1003	/* This moves the player to a different start map, if there	999	/* This moves the player to a different start map, if there
1004	* is one for this race	1000	* is one for this race
1005	*/	1001	*/
1006	if(*first_map_ext_path) {	1002	if(*first_map_ext_path) {
1007	object *tmp;	1003	object *tmp;
1008	mapstruct *oldmap = op->map;	1004	mapstruct *oldmap = op->map;
1009	char mapname[MAX_BUF];	1005	char mapname[MAX_BUF];
1010	snprintf(mapname, MAX_BUF-1, "%s/%s",	1006	snprintf(mapname, MAX_BUF-1, "%s/%s",
1011	first_map_ext_path, op->arch->name);	1007	first_map_ext_path, &op->arch->name);
1012	tmp=get_object();	1008	tmp=get_object();
1013	EXIT_PATH(tmp) = add_string(mapname);	1009	EXIT_PATH(tmp) = mapname;
1014	EXIT_X(tmp) = op->x;	1010	EXIT_X(tmp) = op->x;
1015	EXIT_Y(tmp) = op->y;	1011	EXIT_Y(tmp) = op->y;
1016	enter_exit(op,tmp); /* we don't really care if it succeeded;	1012	enter_exit(op,tmp); /* we don't really care if it succeeded;
1017	* if the map isn't there, then stay on the	1013	* if the map isn't there, then stay on the
1018	* default initial map */	1014	* default initial map */
1019	free_object(tmp);	1015	free_object(tmp);
1020	} else {	1016	} else {
1021	LOG(llevDebug,"first_map_ext_path not set\n");	1017	LOG(llevDebug,"first_map_ext_path not set\n");
1022	}	1018	}
1023	return 0;	1019	return 0;
1024	}	1020	}
1025		1021
1026	/* Following actually changes the race - this is the default command	1022	/* Following actually changes the race - this is the default command
1027	* if we don't match with one of the options above.	1023	* if we don't match with one of the options above.
1028	*/	1024	*/
1029		1025
1030	tmp_loop = 0;	1026	tmp_loop = 0;
1031	while(!tmp_loop) {	1027	while(!tmp_loop) {
1032	const char *name = add_string (op->name);	1028	shstr name = op->name;
1033	int x = op->x, y = op->y;	1029	int x = op->x, y = op->y;
1034	remove_statbonus(op);	1030	remove_statbonus(op);
1035	remove_ob (op);	1031	remove_ob (op);
1036	op->arch = get_player_archetype(op->arch);	1032	op->arch = get_player_archetype(op->arch);
1037	copy_object (&op->arch->clone, op);	1033	copy_object (&op->arch->clone, op);
1038	op->instantiate ();	1034	op->instantiate ();
1039	op->stats = op->contr->orig_stats;	1035	op->stats = op->contr->orig_stats;
1040	free_string (op->name);	1036	op->name = op->name_pl = name;
1041	op->name = name;	1037	op->x = x;
1042	free_string(op->name_pl);	1038	op->y = y;
1043	op->name_pl = add_string(name);
1044	op->x = x;
1045	op->y = y;
1046	SET_ANIMATION(op, 2); /* So player faces south */	1039	SET_ANIMATION(op, 2); /* So player faces south */
1047	insert_ob_in_map (op, op->map, op,0);	1040	insert_ob_in_map (op, op->map, op,0);
1048	strncpy(op->contr->title, op->arch->clone.name, sizeof(op->contr->title)-1);	1041	strncpy(op->contr->title, op->arch->clone.name, sizeof(op->contr->title)-1);
1049	op->contr->title[sizeof(op->contr->title)-1] = '\0';	1042	op->contr->title[sizeof(op->contr->title)-1] = '\0';
1050	add_statbonus(op);	1043	add_statbonus(op);
1051	tmp_loop=allowed_class(op);	1044	tmp_loop=allowed_class(op);
1052
1053	if (!strncmp (op->msg, "Edit me", 7)) tmp_loop = 0; // pippijn fucked it up //D//TODO
1054	}	1045	}
1055	update_object(op,UP_OBJ_FACE);	1046	update_object(op,UP_OBJ_FACE);
1056	esrv_update_item(UPD_FACE,op,op);	1047	esrv_update_item(UPD_FACE,op,op);
1057	fix_player(op);	1048	fix_player(op);
1058	op->stats.hp=op->stats.maxhp;	1049	op->stats.hp=op->stats.maxhp;
1059	op->stats.sp=op->stats.maxsp;	1050	op->stats.sp=op->stats.maxsp;
1060	op->stats.grace=0;	1051	op->stats.grace=0;
1061	if (op->msg)	1052	if (op->msg)
1062	new_draw_info(NDI_BLUE, 0, op, op->msg);	1053	new_draw_info(NDI_BLUE, 0, op, op->msg);
1063	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Press any key for the next race.\nPress `d' to play this race.\n");	1054	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Press any key for the next race.\nPress `d' to play this race.\n");
1064	return 0;	1055	return 0;
1065	}	1056	}
1066		1057
1067	int key_confirm_quit(object *op, char key)	1058	int key_confirm_quit(object *op, char key)
1068	{	1059	{
1069	char buf[MAX_BUF];	1060	char buf[MAX_BUF];
1070		1061
1071	if(key!='y'&&key!='Y'&&key!='q'&&key!='Q') {	1062	if(key!='y'&&key!='Y'&&key!='q'&&key!='Q') {
1072	op->contr->state=ST_PLAYING;	1063	op->contr->state=ST_PLAYING;
1073	new_draw_info(NDI_UNIQUE, 0,op,"OK, continuing to play.");	1064	new_draw_info(NDI_UNIQUE, 0,op,"OK, continuing to play.");
1074	return 1;	1065	return 1;
1075	}	1066	}
1076		1067
1077	INVOKE_PLAYER (LOGOUT, op->contr);	1068	INVOKE_PLAYER (LOGOUT, op->contr);
1078	INVOKE_PLAYER (QUIT , op->contr);	1069	INVOKE_PLAYER (QUIT , op->contr);
1079		1070
1080	terminate_all_pets(op);	1071	terminate_all_pets(op);
1081	leave_map(op);	1072	leave_map(op);
1082	op->direction=0;	1073	op->direction=0;
1083	new_draw_info_format(NDI_UNIQUE | NDI_ALL, 5, NULL,	1074	new_draw_info_format(NDI_UNIQUE | NDI_ALL, 5, NULL,
1084	"%s quits the game.",op->name);	1075	"%s quits the game.", &op->name);
1085		1076
1086	strcpy(op->contr->killer,"quit");	1077	strcpy(op->contr->killer,"quit");
1087	check_score(op);	1078	check_score(op);
1088	op->contr->party=NULL;	1079	op->contr->party=NULL;
1089	if (settings.set_title == TRUE)	1080	if (settings.set_title == TRUE)
1090	op->contr->own_title[0]='\0';	1081	op->contr->own_title[0]='\0';
1091		1082
1092	if(!QUERY_FLAG(op,FLAG_WAS_WIZ)) {	1083	if(!QUERY_FLAG(op,FLAG_WAS_WIZ)) {
1093	mapstruct *mp, *next;	1084	mapstruct *mp, *next;
1094		1085
1095	/* We need to hunt for any per player unique maps in memory and	1086	/* We need to hunt for any per player unique maps in memory and
1096	* get rid of them. The trailing slash in the path is intentional,	1087	* get rid of them. The trailing slash in the path is intentional,
1097	* so that players named 'Ab' won't match against players 'Abe' pathname	1088	* so that players named 'Ab' won't match against players 'Abe' pathname
1098	*/	1089	*/
1099	sprintf(buf,"%s/%s/%s/", settings.localdir, settings.playerdir, op->name);	1090	sprintf(buf,"%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1100	for (mp=first_map; mp!=NULL; mp=next) {	1091	for (mp=first_map; mp!=NULL; mp=next) {
1101	next = mp->next;	1092	next = mp->next;
1102	if (!strncmp(mp->path, buf, strlen(buf)))	1093	if (!strncmp(mp->path, buf, strlen(buf)))
1103	delete_map(mp);	1094	delete_map(mp);
1104	}	1095	}
1105		1096
1106	delete_character(op->name, 1);	1097	delete_character(op->name, 1);
1107	}	1098	}
1108	play_again(op);	1099	play_again(op);
1109	return 1;	1100	return 1;
1110	}	1101	}
1111		1102
1112	void flee_player(object *op) {	1103	void flee_player(object *op) {
1113	int dir,diff;	1104	int dir,diff;
1114	rv_vector rv;	1105	rv_vector rv;
1115		1106
1116	if(op->stats.hp < 0) {	1107	if(op->stats.hp < 0) {
1117	LOG(llevDebug, "Fleeing player is dead.\n");	1108	LOG(llevDebug, "Fleeing player is dead.\n");
1118	CLEAR_FLAG(op, FLAG_SCARED);	1109	CLEAR_FLAG(op, FLAG_SCARED);
1119	return;	1110	return;
1120	}	1111	}
1121		1112
1122	if(op->enemy==NULL) {	1113	if(op->enemy==NULL) {
1123	LOG(llevDebug,"Fleeing player had no enemy.\n");	1114	LOG(llevDebug,"Fleeing player had no enemy.\n");
1124	CLEAR_FLAG(op, FLAG_SCARED);	1115	CLEAR_FLAG(op, FLAG_SCARED);
1125	return;	1116	return;
1126	}	1117	}
1127		1118
1128	/* Seen some crashes here. Since we don't store an	1119	/* Seen some crashes here. Since we don't store an
1129	* op->enemy_count, it is possible that something destroys the	1120	* op->enemy_count, it is possible that something destroys the
1130	* actual enemy, and the object is recycled.	1121	* actual enemy, and the object is recycled.
1131	*/	1122	*/
1132	if (op->enemy->map == NULL) {	1123	if (op->enemy->map == NULL) {
1133	CLEAR_FLAG(op, FLAG_SCARED);	1124	CLEAR_FLAG(op, FLAG_SCARED);
1134	op->enemy=NULL;	1125	op->enemy=NULL;
1135	return;	1126	return;
1136	}	1127	}
1137		1128
1138	if(!(random_roll(0, 4, op, PREFER_LOW)) && did_make_save(op, op->level, 0)) {	1129	if(!(random_roll(0, 4, op, PREFER_LOW)) && did_make_save(op, op->level, 0)) {
1139	op->enemy=NULL;	1130	op->enemy=NULL;
1140	CLEAR_FLAG(op, FLAG_SCARED);	1131	CLEAR_FLAG(op, FLAG_SCARED);
1141	return;	1132	return;
1142	}	1133	}
1143	get_rangevector(op, op->enemy, &rv, 0);	1134	get_rangevector(op, op->enemy, &rv, 0);
1144		1135
1145	dir=absdir(4+rv.direction);	1136	dir=absdir(4+rv.direction);
1146	for(diff=0;diff<3;diff++) {	1137	for(diff=0;diff<3;diff++) {
1147	int m=1-(RANDOM()&2);	1138	int m=1-(RANDOM()&2);
1148	if(move_ob(op,absdir(dir+diff*m),op)||	1139	if(move_ob(op,absdir(dir+diff*m),op)||
1149	(diff==0 && move_ob(op,absdir(dir-diff*m),op))) {	1140	(diff==0 && move_ob(op,absdir(dir-diff*m),op))) {
1150	return;	1141	return;
1151	}	1142	}
1152	}	1143	}
1153	/* Cornered, get rid of scared */	1144	/* Cornered, get rid of scared */
1154	CLEAR_FLAG(op, FLAG_SCARED);	1145	CLEAR_FLAG(op, FLAG_SCARED);
1155	op->enemy=NULL;	1146	op->enemy=NULL;
1156	}	1147	}
…		…
1200	continue;	1191	continue;
1201	}	1192	}
1202		1193
1203	/* high not bit set? We're using the old autopickup model */	1194	/* high not bit set? We're using the old autopickup model */
1204	if(!(op->contr->mode & PU_NEWMODE)) {	1195	if(!(op->contr->mode & PU_NEWMODE)) {
1205	switch (op->contr->mode) {	1196	switch (op->contr->mode) {
1206	case 0: return 1; /* don't pick up */	1197	case 0: return 1; /* don't pick up */
1207	case 1: pick_up (op, tmp);	1198	case 1: pick_up (op, tmp);
1208	return 1;	1199	return 1;
1209	case 2: pick_up (op, tmp);	1200	case 2: pick_up (op, tmp);
1210	return 0;	1201	return 0;
1211	case 3: return 0; /* stop before pickup */	1202	case 3: return 0; /* stop before pickup */
1212	case 4: pick_up (op, tmp);	1203	case 4: pick_up (op, tmp);
1213	break;	1204	break;
1214	case 5: pick_up (op, tmp);	1205	case 5: pick_up (op, tmp);
1215	stop = 1;	1206	stop = 1;
1216	break;	1207	break;
1217	case 6:	1208	case 6:
1218	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) &&	1209	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) &&
1219	! QUERY_FLAG(tmp, FLAG_KNOWN_CURSED))	1210	! QUERY_FLAG(tmp, FLAG_KNOWN_CURSED))
1220	pick_up(op, tmp);	1211	pick_up(op, tmp);
1221	break;	1212	break;
1222		1213
1223	case 7:	1214	case 7:
1224	if (tmp->type == MONEY || tmp->type == GEM)	1215	if (tmp->type == MONEY || tmp->type == GEM)
1225	pick_up(op, tmp);	1216	pick_up(op, tmp);
1226	break;	1217	break;
1227		1218
1228	default:	1219	default:
1229	/* use value density */	1220	/* use value density */
1230	if ( ! QUERY_FLAG (tmp, FLAG_UNPAID)	1221	if ( ! QUERY_FLAG (tmp, FLAG_UNPAID)
1231	&& (query_cost (tmp, op, F_TRUE) * 100	1222	&& (query_cost (tmp, op, F_TRUE) * 100
1232	/ (tmp->weight * MAX (tmp->nrof, 1)))	1223	/ (tmp->weight * MAX (tmp->nrof, 1)))
1233	>= op->contr->mode)	1224	>= op->contr->mode)
1234	pick_up(op,tmp);	1225	pick_up(op,tmp);
1235	}	1226	}
1236	}	1227	}
1237	else { /* old model */	1228	else { /* old model */
1238	/* NEW pickup handling */	1229	/* NEW pickup handling */
1239	if(op->contr->mode & PU_DEBUG)	1230	if(op->contr->mode & PU_DEBUG)
1240	{	1231	{
1241	/* some debugging code to figure out item information */	1232	/* some debugging code to figure out item information */
1242	if(tmp->name!=NULL)	1233	if(tmp->name!=NULL)
1243	sprintf(putstring,"item name: %s item type: %d weight/value: %d",	1234	sprintf(putstring,"item name: %s item type: %d weight/value: %d",
1244	tmp->name, tmp->type,	1235	&tmp->name, tmp->type,
1245	(int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));	1236	(int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));
1246	else	1237	else
1247	sprintf(putstring,"item name: %s item type: %d weight/value: %d",	1238	sprintf(putstring,"item name: %s item type: %d weight/value: %d",
1248	tmp->arch->name, tmp->type,	1239	&tmp->arch->name, tmp->type,
1249	(int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));	1240	(int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));
1250	new_draw_info(NDI_UNIQUE, 0,op,putstring);	1241	new_draw_info(NDI_UNIQUE, 0,op,putstring);
1251		1242
1252	sprintf(putstring,"...flags: ");	1243	sprintf(putstring,"...flags: ");
1253	for(k=0;k<4;k++)	1244	for(k=0;k<4;k++)
1254	{	1245	{
1255	for(j=0;j<32;j++)	1246	for(j=0;j<32;j++)
1256	{	1247	{
1257	if((tmp->flags[k]>>j)&0x01)	1248	if((tmp->flags[k]>>j)&0x01)
1258	{	1249	{
1259	sprintf(tmpstr,"%d ",k*32+j);	1250	sprintf(tmpstr,"%d ",k*32+j);
1260	strcat(putstring, tmpstr);	1251	strcat(putstring, tmpstr);
1261	}	1252	}
1262	}	1253	}
1263	}	1254	}
1264	new_draw_info(NDI_UNIQUE, 0,op,putstring);	1255	new_draw_info(NDI_UNIQUE, 0,op,putstring);
1265		1256
1266	#if 0	1257	#if 0
1267	/* print the flags too */	1258	/* print the flags too */
1268	for(k=0;k<4;k++)	1259	for(k=0;k<4;k++)
1269	{	1260	{
1270	fprintf(stderr,"%d [%d] ", k, k*32+31);	1261	fprintf(stderr,"%d [%d] ", k, k*32+31);
1271	for(j=0;j<32;j++)	1262	for(j=0;j<32;j++)
1272	{	1263	{
1273	fprintf(stderr,"%d",tmp->flags[k]>>(31-j)&0x01);	1264	fprintf(stderr,"%d",tmp->flags[k]>>(31-j)&0x01);
1274	if(!((j+1)%4))fprintf(stderr," ");	1265	if(!((j+1)%4))fprintf(stderr," ");
1275	}	1266	}
1276	fprintf(stderr," [%d]\n", k*32);	1267	fprintf(stderr," [%d]\n", k*32);
1277	}	1268	}
1278	#endif	1269	#endif
1279	}	1270	}
1280	/* philosophy:	1271	/* philosophy:
1281	* It's easy to grab an item type from a pile, as long as it's	1272	* It's easy to grab an item type from a pile, as long as it's
1282	* generic. This takes no game-time. For more detailed pickups	1273	* generic. This takes no game-time. For more detailed pickups
…		…
1314	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) continue;	1305	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) continue;
1315		1306
1316	/* all food and drink if desired */	1307	/* all food and drink if desired */
1317	/* question: don't pick up known-poisonous stuff? */	1308	/* question: don't pick up known-poisonous stuff? */
1318	if(op->contr->mode & PU_FOOD)	1309	if(op->contr->mode & PU_FOOD)
1319	if (tmp->type == FOOD)	1310	if (tmp->type == FOOD)
1320	{ pick_up(op, tmp); if(0)fprintf(stderr,"FOOD\n"); continue; }	1311	{ pick_up(op, tmp); if(0)fprintf(stderr,"FOOD\n"); continue; }
1321	if(op->contr->mode & PU_DRINK)	1312	if(op->contr->mode & PU_DRINK)
1322	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG(tmp, FLAG_KNOWN_CURSED)))	1313	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG(tmp, FLAG_KNOWN_CURSED)))
1323	{ pick_up(op, tmp); if(0)fprintf(stderr,"DRINK\n"); continue; }	1314	{ pick_up(op, tmp); if(0)fprintf(stderr,"DRINK\n"); continue; }
1324		1315
1325	if(op->contr->mode & PU_POTION)	1316	if(op->contr->mode & PU_POTION)
1326	if (tmp->type == POTION)	1317	if (tmp->type == POTION)
1327	{ pick_up(op, tmp); if(0)fprintf(stderr,"POTION\n"); continue; }	1318	{ pick_up(op, tmp); if(0)fprintf(stderr,"POTION\n"); continue; }
1328		1319
1329	/* spellbooks, skillscrolls and normal books/scrolls */	1320	/* spellbooks, skillscrolls and normal books/scrolls */
1330	if(op->contr->mode & PU_SPELLBOOK)	1321	if(op->contr->mode & PU_SPELLBOOK)
1331	if (tmp->type == SPELLBOOK)	1322	if (tmp->type == SPELLBOOK)
1332	{ pick_up(op, tmp); if(0)fprintf(stderr,"SPELLBOOK\n"); continue; }	1323	{ pick_up(op, tmp); if(0)fprintf(stderr,"SPELLBOOK\n"); continue; }
1333	if(op->contr->mode & PU_SKILLSCROLL)	1324	if(op->contr->mode & PU_SKILLSCROLL)
1334	if (tmp->type == SKILLSCROLL)	1325	if (tmp->type == SKILLSCROLL)
1335	{ pick_up(op, tmp); if(0)fprintf(stderr,"SKILLSCROLL\n"); continue; }	1326	{ pick_up(op, tmp); if(0)fprintf(stderr,"SKILLSCROLL\n"); continue; }
1336	if(op->contr->mode & PU_READABLES)	1327	if(op->contr->mode & PU_READABLES)
1337	if (tmp->type == BOOK || tmp->type == SCROLL)	1328	if (tmp->type == BOOK || tmp->type == SCROLL)
1338	{ pick_up(op, tmp); if(0)fprintf(stderr,"READABLES\n"); continue; }	1329	{ pick_up(op, tmp); if(0)fprintf(stderr,"READABLES\n"); continue; }
1339		1330
1340	/* wands/staves/rods/horns */	1331	/* wands/staves/rods/horns */
1341	if (op->contr->mode & PU_MAGIC_DEVICE)	1332	if (op->contr->mode & PU_MAGIC_DEVICE)
1342	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1333	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1343	{ pick_up(op, tmp); if(0)fprintf(stderr,"MAGIC_DEVICE\n"); continue; }	1334	{ pick_up(op, tmp); if(0)fprintf(stderr,"MAGIC_DEVICE\n"); continue; }
1344		1335
1345	/* pick up all magical items */	1336	/* pick up all magical items */
1346	if(op->contr->mode & PU_MAGICAL)	1337	if(op->contr->mode & PU_MAGICAL)
1347	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && ! QUERY_FLAG(tmp, FLAG_KNOWN_CURSED))	1338	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && ! QUERY_FLAG(tmp, FLAG_KNOWN_CURSED))
1348	{ pick_up(op, tmp); if(0)fprintf(stderr,"MAGICAL\n"); continue; }	1339	{ pick_up(op, tmp); if(0)fprintf(stderr,"MAGICAL\n"); continue; }
1349		1340
1350	if(op->contr->mode & PU_VALUABLES)	1341	if(op->contr->mode & PU_VALUABLES)
1351	{	1342	{
1352	if (tmp->type == MONEY || tmp->type == GEM)	1343	if (tmp->type == MONEY || tmp->type == GEM)
1353	{ pick_up(op, tmp); if(0)fprintf(stderr,"MONEY/GEM\n"); continue; }	1344	{ pick_up(op, tmp); if(0)fprintf(stderr,"MONEY/GEM\n"); continue; }
1354	}	1345	}
1355		1346
1356	/* rings & amulets - talismans seems to be typed AMULET */	1347	/* rings & amulets - talismans seems to be typed AMULET */
1357	if(op->contr->mode & PU_JEWELS)	1348	if(op->contr->mode & PU_JEWELS)
1358	if (tmp->type == RING || tmp->type == AMULET)	1349	if (tmp->type == RING || tmp->type == AMULET)
1359	{ pick_up(op, tmp); if(0)fprintf(stderr,"JEWELS\n"); continue; }	1350	{ pick_up(op, tmp); if(0)fprintf(stderr,"JEWELS\n"); continue; }
1360		1351
1361	/* bows and arrows. Bows are good for selling! */	1352	/* bows and arrows. Bows are good for selling! */
1362	if(op->contr->mode & PU_BOW)	1353	if(op->contr->mode & PU_BOW)
1363	if (tmp->type == BOW)	1354	if (tmp->type == BOW)
1364	{ pick_up(op, tmp); if(0)fprintf(stderr,"BOW\n"); continue; }	1355	{ pick_up(op, tmp); if(0)fprintf(stderr,"BOW\n"); continue; }
1365	if(op->contr->mode & PU_ARROW)	1356	if(op->contr->mode & PU_ARROW)
1366	if (tmp->type == ARROW)	1357	if (tmp->type == ARROW)
1367	{ pick_up(op, tmp); if(0)fprintf(stderr,"ARROW\n"); continue; }	1358	{ pick_up(op, tmp); if(0)fprintf(stderr,"ARROW\n"); continue; }
1368		1359
1369	/* all kinds of armor etc. */	1360	/* all kinds of armor etc. */
1370	if(op->contr->mode & PU_ARMOUR)	1361	if(op->contr->mode & PU_ARMOUR)
1371	if (tmp->type == ARMOUR)	1362	if (tmp->type == ARMOUR)
1372	{ pick_up(op, tmp); if(0)fprintf(stderr,"ARMOUR\n"); continue; }	1363	{ pick_up(op, tmp); if(0)fprintf(stderr,"ARMOUR\n"); continue; }
1373	if(op->contr->mode & PU_HELMET)	1364	if(op->contr->mode & PU_HELMET)
1374	if (tmp->type == HELMET)	1365	if (tmp->type == HELMET)
1375	{ pick_up(op, tmp); if(0)fprintf(stderr,"HELMET\n"); continue; }	1366	{ pick_up(op, tmp); if(0)fprintf(stderr,"HELMET\n"); continue; }
1376	if(op->contr->mode & PU_SHIELD)	1367	if(op->contr->mode & PU_SHIELD)
1377	if (tmp->type == SHIELD)	1368	if (tmp->type == SHIELD)
1378	{ pick_up(op, tmp); if(0)fprintf(stderr,"SHIELD\n"); continue; }	1369	{ pick_up(op, tmp); if(0)fprintf(stderr,"SHIELD\n"); continue; }
1379	if(op->contr->mode & PU_BOOTS)	1370	if(op->contr->mode & PU_BOOTS)
1380	if (tmp->type == BOOTS)	1371	if (tmp->type == BOOTS)
1381	{ pick_up(op, tmp); if(0)fprintf(stderr,"BOOTS\n"); continue; }	1372	{ pick_up(op, tmp); if(0)fprintf(stderr,"BOOTS\n"); continue; }
1382	if(op->contr->mode & PU_GLOVES)	1373	if(op->contr->mode & PU_GLOVES)
1383	if (tmp->type == GLOVES)	1374	if (tmp->type == GLOVES)
1384	{ pick_up(op, tmp); if(0)fprintf(stderr,"GLOVES\n"); continue; }	1375	{ pick_up(op, tmp); if(0)fprintf(stderr,"GLOVES\n"); continue; }
1385	if(op->contr->mode & PU_CLOAK)	1376	if(op->contr->mode & PU_CLOAK)
1386	if (tmp->type == CLOAK)	1377	if (tmp->type == CLOAK)
1387	{ pick_up(op, tmp); if(0)fprintf(stderr,"GLOVES\n"); continue; }	1378	{ pick_up(op, tmp); if(0)fprintf(stderr,"GLOVES\n"); continue; }
1388		1379
1389	/* hoping to catch throwing daggers here */	1380	/* hoping to catch throwing daggers here */
1390	if(op->contr->mode & PU_MISSILEWEAPON)	1381	if(op->contr->mode & PU_MISSILEWEAPON)
1391	if(tmp->type == WEAPON && QUERY_FLAG(tmp, FLAG_IS_THROWN))	1382	if(tmp->type == WEAPON && QUERY_FLAG(tmp, FLAG_IS_THROWN))
1392	{ pick_up(op, tmp); if(0)fprintf(stderr,"MISSILEWEAPON\n"); continue; }	1383	{ pick_up(op, tmp); if(0)fprintf(stderr,"MISSILEWEAPON\n"); continue; }
1393		1384
1394	/* careful: chairs and tables are weapons! */	1385	/* careful: chairs and tables are weapons! */
1395	if(op->contr->mode & PU_ALLWEAPON)	1386	if(op->contr->mode & PU_ALLWEAPON)
1396	{	1387	{
1397	if(tmp->type == WEAPON && tmp->name!=NULL)	1388	if(tmp->type == WEAPON && tmp->name!=NULL)
1398	{	1389	{
1399	if(strstr(tmp->name,"table")==NULL && strstr(tmp->arch->name,"table")==NULL &&	1390	if(strstr(tmp->name,"table")==NULL && strstr(tmp->arch->name,"table")==NULL &&
1400	strstr(tmp->name,"chair") && strstr(tmp->arch->name,"chair")==NULL)	1391	strstr(tmp->name,"chair") && strstr(tmp->arch->name,"chair")==NULL)
1401	{ pick_up(op, tmp); if(0)fprintf(stderr,"WEAPON\n"); continue; }	1392	{ pick_up(op, tmp); if(0)fprintf(stderr,"WEAPON\n"); continue; }
1402	}	1393	}
1403	if(tmp->type == WEAPON && tmp->name==NULL)	1394	if(tmp->type == WEAPON && tmp->name==NULL)
1404	{	1395	{
1405	if(strstr(tmp->arch->name,"table")==NULL &&	1396	if(strstr(tmp->arch->name,"table")==NULL &&
1406	strstr(tmp->arch->name,"chair")==NULL)	1397	strstr(tmp->arch->name,"chair")==NULL)
1407	{ pick_up(op, tmp); if(0)fprintf(stderr,"WEAPON\n"); continue; }	1398	{ pick_up(op, tmp); if(0)fprintf(stderr,"WEAPON\n"); continue; }
1408	}	1399	}
1409	}	1400	}
1410		1401
1411	/* misc stuff that's useful */	1402	/* misc stuff that's useful */
1412	if(op->contr->mode & PU_KEY)	1403	if(op->contr->mode & PU_KEY)
1413	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1404	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1414	{ pick_up(op, tmp); if(0)fprintf(stderr,"KEY\n"); continue; }	1405	{ pick_up(op, tmp); if(0)fprintf(stderr,"KEY\n"); continue; }
1415		1406
1416	/* any of the last 4 bits set means we use the ratio for value	1407	/* any of the last 4 bits set means we use the ratio for value
1417	* pickups */	1408	* pickups */
1418	if(op->contr->mode & PU_RATIO)	1409	if(op->contr->mode & PU_RATIO)
1419	{	1410	{
1420	/* use value density to decide what else to grab */	1411	/* use value density to decide what else to grab */
1421	/* >=7 was >= op->contr->mode */	1412	/* >=7 was >= op->contr->mode */
1422	/* >=7 is the old standard setting. Now we take the last 4 bits	1413	/* >=7 is the old standard setting. Now we take the last 4 bits
1423	* and multiply them by 5, giving 0..15*5== 5..75 */	1414	* and multiply them by 5, giving 0..15*5== 5..75 */
1424	wvratio=(op->contr->mode & PU_RATIO) * 5;	1415	wvratio=(op->contr->mode & PU_RATIO) * 5;
1425	if ((query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof, 1))) >= wvratio)	1416	if ((query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof, 1))) >= wvratio)
1426	{	1417	{
1427	pick_up(op, tmp);	1418	pick_up(op, tmp);
1428	#if 0	1419	#if 0
1429	fprintf(stderr,"HIGH WEIGHT/VALUE [");	1420	fprintf(stderr,"HIGH WEIGHT/VALUE [");
1430	if(tmp->name!=NULL) {	1421	if(tmp->name!=NULL) {
1431	fprintf(stderr,"%s", tmp->name);	1422	fprintf(stderr,"%s", tmp->name);
1432	}	1423	}
1433	else fprintf(stderr,"%s",tmp->arch->name);	1424	else fprintf(stderr,"%s",tmp->arch->name);
1434	fprintf(stderr,",%d] = ", tmp->type);	1425	fprintf(stderr,",%d] = ", tmp->type);
1435	fprintf(stderr,"%d\n",(int)(query_cost(tmp,op,F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));	1426	fprintf(stderr,"%d\n",(int)(query_cost(tmp,op,F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));
1436	#endif	1427	#endif
1437	continue;	1428	continue;
1438	}	1429	}
1439	}	1430	}
1440	} /* the new pickup model */	1431	} /* the new pickup model */
1441	}	1432	}
1442	return ! stop;	1433	return ! stop;
1443	}	1434	}
…		…
1450	object *find_arrow(object *op, const char *type)	1441	object *find_arrow(object *op, const char *type)
1451	{	1442	{
1452	object *tmp = NULL;	1443	object *tmp = NULL;
1453		1444
1454	for(op=op->inv; op; op=op->below)	1445	for(op=op->inv; op; op=op->below)
1455	if(!tmp && op->type==CONTAINER && op->race==type &&	1446	if(!tmp && op->type==CONTAINER && op->race==type &&
1456	QUERY_FLAG(op,FLAG_APPLIED))	1447	QUERY_FLAG(op,FLAG_APPLIED))
1457	tmp = find_arrow (op, type);	1448	tmp = find_arrow (op, type);
1458	else if (op->type==ARROW && op->race==type)	1449	else if (op->type==ARROW && op->race==type)
1459	return op;	1450	return op;
1460	return tmp;	1451	return tmp;
1461	}	1452	}
1462		1453
1463	/*	1454	/*
1464	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1455	* Similar to find_arrow, but looks for (roughly) the best arrow to use
…		…
1471	{	1462	{
1472	object *tmp = NULL, *arrow, *ntmp;	1463	object *tmp = NULL, *arrow, *ntmp;
1473	int attacknum, attacktype, betterby=0, i;	1464	int attacknum, attacktype, betterby=0, i;
1474		1465
1475	if (!type)	1466	if (!type)
1476	return NULL;	1467	return NULL;
1477		1468
1478	for (arrow=op->inv; arrow; arrow=arrow->below) {	1469	for (arrow=op->inv; arrow; arrow=arrow->below) {
1479	if (arrow->type==CONTAINER && arrow->race==type &&	1470	if (arrow->type==CONTAINER && arrow->race==type &&
1480	QUERY_FLAG(arrow, FLAG_APPLIED)) {	1471	QUERY_FLAG(arrow, FLAG_APPLIED)) {
1481	i = 0;	1472	i = 0;
1482	ntmp = find_better_arrow(arrow, target, type, &i);	1473	ntmp = find_better_arrow(arrow, target, type, &i);
1483	if (i > betterby) {	1474	if (i > betterby) {
1484	tmp = ntmp;	1475	tmp = ntmp;
1485	betterby = i;	1476	betterby = i;
1486	}	1477	}
1487	} else if (arrow->type==ARROW && arrow->race==type) {	1478	} else if (arrow->type==ARROW && arrow->race==type) {
1488	/* allways prefer assasination/slaying */	1479	/* allways prefer assasination/slaying */
1489	if (target->race != NULL && arrow->slaying != NULL &&	1480	if (target->race != NULL && arrow->slaying != NULL &&
1490	strstr(arrow->slaying, target->race)) {	1481	strstr(arrow->slaying, target->race)) {
1491	if (arrow->attacktype & AT_DEATH) {	1482	if (arrow->attacktype & AT_DEATH) {
1492	*better = 100;	1483	*better = 100;
1493	return arrow;	1484	return arrow;
1494	} else {	1485	} else {
1495	tmp = arrow;	1486	tmp = arrow;
1496	betterby = (arrow->magic + arrow->stats.dam) * 2;	1487	betterby = (arrow->magic + arrow->stats.dam) * 2;
1497	}	1488	}
1498	} else {	1489	} else {
1499	for (attacknum=0; attacknum < NROFATTACKS; attacknum++) {	1490	for (attacknum=0; attacknum < NROFATTACKS; attacknum++) {
1500	attacktype = 1<<attacknum;	1491	attacktype = 1<<attacknum;
1501	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1492	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)
1502	if (((arrow->magic + arrow->stats.dam)*(100-target->arch->clone.resist[attacknum])/100) > betterby) {	1493	if (((arrow->magic + arrow->stats.dam)*(100-target->arch->clone.resist[attacknum])/100) > betterby) {
1503	tmp = arrow;	1494	tmp = arrow;
1504	betterby = (arrow->magic + arrow->stats.dam)*(100-target->arch->clone.resist[attacknum])/100;	1495	betterby = (arrow->magic + arrow->stats.dam)*(100-target->arch->clone.resist[attacknum])/100;
1505	}	1496	}
1506	}	1497	}
1507	if ((2 + arrow->magic + arrow->stats.dam) > betterby) {	1498	if ((2 + arrow->magic + arrow->stats.dam) > betterby) {
1508	tmp = arrow;	1499	tmp = arrow;
1509	betterby = 2 + arrow->magic + arrow->stats.dam;	1500	betterby = 2 + arrow->magic + arrow->stats.dam;
1510	}	1501	}
1511	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) {	1502	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) {
1512	tmp = arrow;	1503	tmp = arrow;
1513	betterby = 1 + arrow->magic + arrow->stats.dam;	1504	betterby = 1 + arrow->magic + arrow->stats.dam;
1514	}	1505	}
1515	}	1506	}
1516	}	1507	}
1517	}	1508	}
1518	if (tmp == NULL && arrow == NULL)	1509	if (tmp == NULL && arrow == NULL)
1519	return find_arrow(op, type);	1510	return find_arrow(op, type);
1520		1511
1521	*better = betterby;	1512	*better = betterby;
1522	return tmp;	1513	return tmp;
1523	}	1514	}
1524		1515
…		…
1535	mapstruct *m;	1526	mapstruct *m;
1536	int i, mflags, found, number;	1527	int i, mflags, found, number;
1537	sint16 x, y;	1528	sint16 x, y;
1538		1529
1539	if (op->map == NULL)	1530	if (op->map == NULL)
1540	return find_arrow(op, type);	1531	return find_arrow(op, type);
1541		1532
1542	/* do a dex check */	1533	/* do a dex check */
1543	number = (die_roll(2, 40, op, PREFER_LOW)-2)/2;	1534	number = (die_roll(2, 40, op, PREFER_LOW)-2)/2;
1544	if (number > (op->stats.Dex + (op->chosen_skill?op->chosen_skill->level:op->level)))	1535	if (number > (op->stats.Dex + (op->chosen_skill?op->chosen_skill->level:op->level)))
1545	return find_arrow(op, type);	1536	return find_arrow(op, type);
1546		1537
1547	m = op->map;	1538	m = op->map;
1548	x = op->x;	1539	x = op->x;
1549	y = op->y;	1540	y = op->y;
1550		1541
1551	/* find the first target */	1542	/* find the first target */
1552	for (i=0, found=0; i<20; i++) {	1543	for (i=0, found=0; i<20; i++) {
1553	x += freearr_x[dir];	1544	x += freearr_x[dir];
1554	y += freearr_y[dir];	1545	y += freearr_y[dir];
1555	mflags = get_map_flags(m, &m, x, y, &x, &y);	1546	mflags = get_map_flags(m, &m, x, y, &x, &y);
1556	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) {	1547	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) {
1557	tmp = NULL;	1548	tmp = NULL;
1558	break;	1549	break;
1559	} else if (GET_MAP_MOVE_BLOCK(m, x, y) == MOVE_FLY_LOW) {	1550	} else if (GET_MAP_MOVE_BLOCK(m, x, y) == MOVE_FLY_LOW) {
1560	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1551	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1561	* perhaps a bad assumption.	1552	* perhaps a bad assumption.
1562	*/	1553	*/
1563	tmp = NULL;	1554	tmp = NULL;
1564	break;	1555	break;
1565	}	1556	}
1566	if (mflags & P_IS_ALIVE) {	1557	if (mflags & P_IS_ALIVE) {
1567	for (tmp = GET_MAP_OB(m, x, y); tmp; tmp=tmp->above)	1558	for (tmp = GET_MAP_OB(m, x, y); tmp; tmp=tmp->above)
1568	if (QUERY_FLAG(tmp, FLAG_ALIVE)) {	1559	if (QUERY_FLAG(tmp, FLAG_ALIVE)) {
1569	found++;	1560	found++;
1570	break;	1561	break;
1571	}	1562	}
1572	if (found)	1563	if (found)
1573	break;	1564	break;
1574	}	1565	}
1575	}	1566	}
1576	if (tmp == NULL)	1567	if (tmp == NULL)
1577	return find_arrow(op, type);	1568	return find_arrow(op, type);
1578		1569
1579	if (tmp->head)	1570	if (tmp->head)
1580	tmp = tmp->head;	1571	tmp = tmp->head;
1581		1572
1582	return find_better_arrow(op, tmp, type, &i);	1573	return find_better_arrow(op, tmp, type, &i);
1583	}	1574	}
1584		1575
1585	/*	1576	/*
…		…
1599	tag_t left_tag, tag;	1590	tag_t left_tag, tag;
1600	int bowspeed, mflags;	1591	int bowspeed, mflags;
1601	mapstruct *m;	1592	mapstruct *m;
1602		1593
1603	if (!dir) {	1594	if (!dir) {
1604	new_draw_info(NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1595	new_draw_info(NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1605	return 0;	1596	return 0;
1606	}	1597	}
1607	if (op->type == PLAYER)	1598	if (op->type == PLAYER)
1608	bow=op->contr->ranges[range_bow];	1599	bow=op->contr->ranges[range_bow];
1609	else {	1600	else {
1610	for(bow=op->inv; bow; bow=bow->below)	1601	for(bow=op->inv; bow; bow=bow->below)
1611	/* Don't check for applied - monsters don't apply bows - in that way, they	1602	/* Don't check for applied - monsters don't apply bows - in that way, they
1612	* don't need to switch back and forth between bows and weapons.	1603	* don't need to switch back and forth between bows and weapons.
1613	*/	1604	*/
1614	if(bow->type==BOW)	1605	if(bow->type==BOW)
1615	break;	1606	break;
1616		1607
1617	if (!bow) {	1608	if (!bow) {
1618	LOG (llevError, "Range: bow without activated bow (%s).\n", op->name);	1609	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1619	return 0;	1610	return 0;
1620	}	1611	}
1621	}	1612	}
1622	if( !bow->race || !bow->skill) {	1613	if( !bow->race || !bow->skill) {
1623	new_draw_info_format(NDI_UNIQUE, 0, op, "Your %s is broken.", bow->name);	1614	new_draw_info_format(NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1624	return 0;	1615	return 0;
1625	}	1616	}
1626		1617
1627	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];	1618	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1628		1619
1629	/* penalize ROF for bestarrow */	1620	/* penalize ROF for bestarrow */
1630	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)	1621	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1631	bowspeed -= dex_bonus[op->stats.Dex] + 5;	1622	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1632	if (bowspeed < 1)	1623	if (bowspeed < 1)
1633	bowspeed = 1;	1624	bowspeed = 1;
1634		1625
1635	if (arrow == NULL) {	1626	if (arrow == NULL) {
1636	if ((arrow=find_arrow(op, bow->race)) == NULL) {	1627	if ((arrow=find_arrow(op, bow->race)) == NULL) {
1637	if (op->type == PLAYER)	1628	if (op->type == PLAYER)
1638	new_draw_info_format(NDI_UNIQUE, 0, op,	1629	new_draw_info_format(NDI_UNIQUE, 0, op,
1639	"You have no %s left.", bow->race);	1630	"You have no %s left.", &bow->race);
1640	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1631	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1641	else	1632	else
1642	CLEAR_FLAG(op, FLAG_READY_BOW);	1633	CLEAR_FLAG(op, FLAG_READY_BOW);
1643	return 0;	1634	return 0;
1644	}	1635	}
1645	}	1636	}
1646	mflags = get_map_flags(op->map, &m, sx, sy, &sx, &sy);	1637	mflags = get_map_flags(op->map, &m, sx, sy, &sx, &sy);
1647	if (mflags & P_OUT_OF_MAP) {	1638	if (mflags & P_OUT_OF_MAP) {
1648	return 0;	1639	return 0;
1649	}	1640	}
1650	if (GET_MAP_MOVE_BLOCK(m, sx, sy) == MOVE_FLY_LOW) {	1641	if (GET_MAP_MOVE_BLOCK(m, sx, sy) == MOVE_FLY_LOW) {
1651	new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way.");	1642	new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way.");
1652	return 0;	1643	return 0;
1653	}	1644	}
1654		1645
1655	/* this should not happen, but sometimes does */	1646	/* this should not happen, but sometimes does */
1656	if (arrow->nrof==0) {	1647	if (arrow->nrof==0) {
1657	remove_ob(arrow);	1648	remove_ob(arrow);
1658	free_object(arrow);	1649	free_object(arrow);
1659	return 0;	1650	return 0;
1660	}	1651	}
1661		1652
1662	left = arrow; /* these are arrows left to the player */	1653	left = arrow; /* these are arrows left to the player */
1663	left_tag = left->count;	1654	left_tag = left->count;
1664	arrow = get_split_ob(arrow, 1);	1655	arrow = get_split_ob(arrow, 1);
1665	if (arrow == NULL) {	1656	if (arrow == NULL) {
1666	new_draw_info_format(NDI_UNIQUE, 0, op, "You have no %s left.",	1657	new_draw_info_format(NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1667	bow->race);	1658	return 0;
1668	return 0;
1669	}	1659	}
1670	set_owner(arrow, op);	1660	set_owner(arrow, op);
1671	if (arrow->skill) free_string(arrow->skill);
1672	arrow->skill = add_refcount(bow->skill);	1661	arrow->skill = bow->skill;
1673		1662
1674	arrow->direction=dir;	1663	arrow->direction=dir;
1675	arrow->x = sx;	1664	arrow->x = sx;
1676	arrow->y = sy;	1665	arrow->y = sy;
1677		1666
1678	if (op->type == PLAYER) {	1667	if (op->type == PLAYER) {
1679	op->speed_left = 0.01 - (float)FABS(op->speed) * 100 / bowspeed;	1668	op->speed_left = 0.01 - (float)FABS(op->speed) * 100 / bowspeed;
1680	fix_player(op);	1669	fix_player(op);
1681	}	1670	}
1682		1671
1683	SET_ANIMATION(arrow, arrow->direction);	1672	SET_ANIMATION(arrow, arrow->direction);
1684	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1673	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1685	arrow->stats.hp = arrow->stats.dam;	1674	arrow->stats.hp = arrow->stats.dam;
1686	arrow->stats.grace = arrow->attacktype;	1675	arrow->stats.grace = arrow->attacktype;
1687	if (arrow->slaying != NULL)	1676	if (arrow->slaying != NULL)
1688	arrow->spellarg = strdup_local(arrow->slaying);	1677	arrow->spellarg = strdup_local(arrow->slaying);
1689		1678
1690	/* Note that this was different for monsters - they got their level	1679	/* Note that this was different for monsters - they got their level
1691	* added to the damage. I think the strength bonus is more proper.	1680	* added to the damage. I think the strength bonus is more proper.
1692	*/	1681	*/
1693		1682
1694	arrow->stats.dam += (QUERY_FLAG(bow, FLAG_NO_STRENGTH) ?	1683	arrow->stats.dam += (QUERY_FLAG(bow, FLAG_NO_STRENGTH) ?
1695	0 : dam_bonus[op->stats.Str]) +	1684	0 : dam_bonus[op->stats.Str]) +
1696	bow->stats.dam + bow->magic + arrow->magic;	1685	bow->stats.dam + bow->magic + arrow->magic;
1697		1686
1698	/* update the speed */	1687	/* update the speed */
1699	arrow->speed = (float)((QUERY_FLAG(bow, FLAG_NO_STRENGTH) ?	1688	arrow->speed = (float)((QUERY_FLAG(bow, FLAG_NO_STRENGTH) ?
1700	0 : dam_bonus[op->stats.Str]) +	1689	0 : dam_bonus[op->stats.Str]) +
1701	bow->magic + arrow->magic) / 5.0 +	1690	bow->magic + arrow->magic) / 5.0 +
1702	(float)bow->stats.dam / 7.0;	1691	(float)bow->stats.dam / 7.0;
1703		1692
1704	if (arrow->speed < 1.0)	1693	if (arrow->speed < 1.0)
1705	arrow->speed = 1.0;	1694	arrow->speed = 1.0;
1706	update_ob_speed(arrow);	1695	update_ob_speed(arrow);
1707	arrow->speed_left = 0;	1696	arrow->speed_left = 0;
1708		1697
1709	if (op->type == PLAYER) {	1698	if (op->type == PLAYER) {
1710	arrow->stats.wc = 20 - bow->magic - arrow->magic -	1699	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1711	(op->chosen_skill?op->chosen_skill->level:op->level) -	1700	(op->chosen_skill?op->chosen_skill->level:op->level) -
1712	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] -	1701	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] -
1713	arrow->stats.wc - bow->stats.wc + wc_mod;	1702	arrow->stats.wc - bow->stats.wc + wc_mod;
1714		1703
1715	arrow->level = op->chosen_skill?op->chosen_skill->level:op->level;	1704	arrow->level = op->chosen_skill?op->chosen_skill->level:op->level;
1716	} else {	1705	} else {
1717	arrow->stats.wc= op->stats.wc - bow->magic - arrow->magic -	1706	arrow->stats.wc= op->stats.wc - bow->magic - arrow->magic -
1718	arrow->stats.wc + wc_mod;	1707	arrow->stats.wc + wc_mod;
1719		1708
1720	arrow->level = op->level;	1709	arrow->level = op->level;
1721	}	1710	}
1722	if (arrow->attacktype == AT_PHYSICAL)	1711	if (arrow->attacktype == AT_PHYSICAL)
1723	arrow->attacktype |= bow->attacktype;	1712	arrow->attacktype |= bow->attacktype;
1724	if (bow->slaying != NULL)	1713	if (bow->slaying != NULL)
1725	arrow->slaying = add_string(bow->slaying);	1714	arrow->slaying = bow->slaying;
1726		1715
1727	arrow->map = m;	1716	arrow->map = m;
1728	arrow->move_type = MOVE_FLY_LOW;	1717	arrow->move_type = MOVE_FLY_LOW;
1729	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1718	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1730		1719
1731	play_sound_map(op->map, op->x, op->y, SOUND_FIRE_ARROW);	1720	play_sound_map(op->map, op->x, op->y, SOUND_FIRE_ARROW);
1732	tag = arrow->count;	1721	tag = arrow->count;
1733	insert_ob_in_map(arrow, m, op, 0);	1722	insert_ob_in_map(arrow, m, op, 0);
1734		1723
1735	if (!was_destroyed(arrow, tag))	1724	if (!was_destroyed(arrow, tag))
1736	move_arrow(arrow);	1725	move_arrow(arrow);
1737		1726
1738	if (op->type == PLAYER) {	1727	if (op->type == PLAYER) {
1739	if (was_destroyed (left, left_tag))	1728	if (was_destroyed (left, left_tag))
1740	esrv_del_item(op->contr, left_tag);	1729	esrv_del_item(op->contr, left_tag);
1741	else	1730	else
1742	esrv_send_item(op, left);	1731	esrv_send_item(op, left);
1743	}	1732	}
1744	return 1;	1733	return 1;
1745	}	1734	}
1746		1735
1747	/* Special fire code for players - this takes into	1736	/* Special fire code for players - this takes into
…		…
1754	int player_fire_bow(object *op, int dir)	1743	int player_fire_bow(object *op, int dir)
1755	{	1744	{
1756	int ret=0, wcmod=0;	1745	int ret=0, wcmod=0;
1757		1746
1758	if (op->contr->bowtype == bow_bestarrow) {	1747	if (op->contr->bowtype == bow_bestarrow) {
1759	ret = fire_bow(op, op,	1748	ret = fire_bow(op, op,
1760	pick_arrow_target(op, op->contr->ranges[range_bow]->race, dir),	1749	pick_arrow_target(op, op->contr->ranges[range_bow]->race, dir),
1761	dir, 0, op->x, op->y);	1750	dir, 0, op->x, op->y);
1762	} else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) {	1751	} else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) {
1763	if (!similar_direction(dir, op->contr->bowtype - bow_n + 1))	1752	if (!similar_direction(dir, op->contr->bowtype - bow_n + 1))
1764	wcmod =-1;	1753	wcmod =-1;
1765	ret = fire_bow(op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod,	1754	ret = fire_bow(op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod,
1766	op->x, op->y);	1755	op->x, op->y);
1767	} else if (op->contr->bowtype == bow_threewide) {	1756	} else if (op->contr->bowtype == bow_threewide) {
1768	ret = fire_bow(op, op, NULL, dir, 0, op->x, op->y);	1757	ret = fire_bow(op, op, NULL, dir, 0, op->x, op->y);
1769	ret |= fire_bow(op, op, NULL, dir, -5, op->x + freearr_x[absdir(dir+2)], op->y + freearr_y[absdir(dir+2)]);	1758	ret |= fire_bow(op, op, NULL, dir, -5, op->x + freearr_x[absdir(dir+2)], op->y + freearr_y[absdir(dir+2)]);
1770	ret |= fire_bow(op, op, NULL, dir, -5, op->x + freearr_x[absdir(dir-2)], op->y + freearr_y[absdir(dir-2)]);	1759	ret |= fire_bow(op, op, NULL, dir, -5, op->x + freearr_x[absdir(dir-2)], op->y + freearr_y[absdir(dir-2)]);
1771	} else if (op->contr->bowtype == bow_spreadshot) {	1760	} else if (op->contr->bowtype == bow_spreadshot) {
1772	ret |= fire_bow(op, op, NULL, dir, 0, op->x, op->y);	1761	ret |= fire_bow(op, op, NULL, dir, 0, op->x, op->y);
1773	ret |= fire_bow(op, op, NULL, absdir(dir-1), -5, op->x, op->y);	1762	ret |= fire_bow(op, op, NULL, absdir(dir-1), -5, op->x, op->y);
1774	ret |= fire_bow(op, op, NULL, absdir(dir+1), -5, op->x, op->y);	1763	ret |= fire_bow(op, op, NULL, absdir(dir+1), -5, op->x, op->y);
1775		1764
1776	} else {	1765	} else {
1777	/* Simple case */	1766	/* Simple case */
1778	ret = fire_bow(op, op, NULL, dir, 0, op->x, op->y);	1767	ret = fire_bow(op, op, NULL, dir, 0, op->x, op->y);
1779	}	1768	}
1780	return ret;	1769	return ret;
1781	}	1770	}
1782		1771
1783		1772
…		…
1787	void fire_misc_object(object *op, int dir)	1776	void fire_misc_object(object *op, int dir)
1788	{	1777	{
1789	object *item;	1778	object *item;
1790		1779
1791	if (!op->contr->ranges[range_misc]) {	1780	if (!op->contr->ranges[range_misc]) {
1792	new_draw_info(NDI_UNIQUE, 0,op,"You have range item readied.");	1781	new_draw_info(NDI_UNIQUE, 0,op,"You have range item readied.");
1793	return;	1782	return;
1794	}	1783	}
1795		1784
1796	item = op->contr->ranges[range_misc];	1785	item = op->contr->ranges[range_misc];
1797	if (!item->inv) {	1786	if (!item->inv) {
1798	LOG(llevError,"Object %s lacks a spell\n", item->name);	1787	LOG(llevError,"Object %s lacks a spell\n", &item->name);
1799	return;	1788	return;
1800	}	1789	}
1801	if (item->type == WAND) {	1790	if (item->type == WAND) {
1802	if(item->stats.food<=0) {	1791	if(item->stats.food<=0) {
1803	play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0);	1792	play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0);
1804	new_draw_info_format(NDI_UNIQUE, 0,op,"The %s goes poof.", query_base_name(item, 0));	1793	new_draw_info_format(NDI_UNIQUE, 0,op,"The %s goes poof.", query_base_name(item, 0));
1805	return;	1794	return;
1806	}	1795	}
1807	} else if (item->type == ROD || item->type==HORN) {	1796	} else if (item->type == ROD || item->type==HORN) {
1808	if(item->stats.hp<MAX(item->inv->stats.sp, item->inv->stats.grace)) {	1797	if(item->stats.hp<MAX(item->inv->stats.sp, item->inv->stats.grace)) {
1809	play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0);	1798	play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0);
1810	if (item->type== ROD)	1799	if (item->type== ROD)
1811	new_draw_info_format(NDI_UNIQUE, 0,op,	1800	new_draw_info_format(NDI_UNIQUE, 0,op,
1812	"The %s whines for a while, but nothing happens.", query_base_name(item,0));	1801	"The %s whines for a while, but nothing happens.", query_base_name(item,0));
1813	else	1802	else
1814	new_draw_info_format(NDI_UNIQUE, 0,op,	1803	new_draw_info_format(NDI_UNIQUE, 0,op,
1815	"The %s needs more time to charge.", query_base_name(item,0));	1804	"The %s needs more time to charge.", query_base_name(item,0));
1816	return;	1805	return;
1817	}	1806	}
1818	}	1807	}
1819		1808
1820	if(cast_spell(op,item,dir,item->inv,NULL)) {	1809	if(cast_spell(op,item,dir,item->inv,NULL)) {
1821	SET_FLAG(op, FLAG_BEEN_APPLIED); /* You now know something about it */	1810	SET_FLAG(op, FLAG_BEEN_APPLIED); /* You now know something about it */
1822	if (item->type == WAND) {	1811	if (item->type == WAND) {
1823	if (!(--item->stats.food)) {	1812	if (!(--item->stats.food)) {
1824	object *tmp;	1813	object *tmp;
1825	if (item->arch) {	1814	if (item->arch) {
1826	CLEAR_FLAG(item, FLAG_ANIMATE);	1815	CLEAR_FLAG(item, FLAG_ANIMATE);
1827	item->face = item->arch->clone.face;	1816	item->face = item->arch->clone.face;
1828	item->speed = 0;	1817	item->speed = 0;
1829	update_ob_speed(item);	1818	update_ob_speed(item);
1830	}	1819	}
1831	if ((tmp=is_player_inv(item)))	1820	if ((tmp=is_player_inv(item)))
1832	esrv_update_item(UPD_ANIM, tmp, item);	1821	esrv_update_item(UPD_ANIM, tmp, item);
1833	}	1822	}
1834	}	1823	}
1835	else if (item->type == ROD || item->type==HORN) {	1824	else if (item->type == ROD || item->type==HORN) {
1836	drain_rod_charge(item);	1825	drain_rod_charge(item);
1837	}	1826	}
1838	}	1827	}
1839	}	1828	}
1840		1829
1841	/* Received a fire command for the player - go and do it.	1830	/* Received a fire command for the player - go and do it.
1842	*/	1831	*/
…		…
1845		1834
1846	/* check for loss of invisiblity/hide */	1835	/* check for loss of invisiblity/hide */
1847	if (action_makes_visible(op)) make_visible(op);	1836	if (action_makes_visible(op)) make_visible(op);
1848		1837
1849	switch(op->contr->shoottype) {	1838	switch(op->contr->shoottype) {
1850	case range_none:	1839	case range_none:
1851	return;	1840	return;
1852		1841
1853	case range_bow:	1842	case range_bow:
1854	player_fire_bow(op, dir);	1843	player_fire_bow(op, dir);
1855	return;	1844	return;
1856		1845
1857	case range_magic: /* Casting spells */	1846	case range_magic: /* Casting spells */
1858	spellcost=(cast_spell(op,op,dir,op->contr->ranges[range_magic],op->contr->spellparam[0]?op->contr->spellparam:NULL));	1847	spellcost=(cast_spell(op,op,dir,op->contr->ranges[range_magic],op->contr->spellparam[0]?op->contr->spellparam:NULL));
1859	return;	1848	return;
1860		1849
1861	case range_misc:	1850	case range_misc:
1862	fire_misc_object(op, dir);	1851	fire_misc_object(op, dir);
1863	return;	1852	return;
1864		1853
1865	case range_golem: /* Control summoned monsters from scrolls */	1854	case range_golem: /* Control summoned monsters from scrolls */
1866	if(op->contr->ranges[range_golem]==NULL ||	1855	if(op->contr->ranges[range_golem]==NULL ||
1867	op->contr->golem_count != op->contr->ranges[range_golem]->count) {	1856	op->contr->golem_count != op->contr->ranges[range_golem]->count) {
1868	op->contr->ranges[range_golem] = NULL;	1857	op->contr->ranges[range_golem] = NULL;
1869	op->contr->shoottype=range_none;	1858	op->contr->shoottype=range_none;
1870	op->contr->golem_count = 0;	1859	op->contr->golem_count = 0;
1871	}	1860	}
1872	else	1861	else
1873	control_golem(op->contr->ranges[range_golem], dir);	1862	control_golem(op->contr->ranges[range_golem], dir);
1874	return;	1863	return;
1875		1864
1876	case range_skill:	1865	case range_skill:
1877	if(!op->chosen_skill) {	1866	if(!op->chosen_skill) {
1878	if(op->type==PLAYER)	1867	if(op->type==PLAYER)
1879	new_draw_info(NDI_UNIQUE, 0,op,"You have no applicable skill to use.");	1868	new_draw_info(NDI_UNIQUE, 0,op,"You have no applicable skill to use.");
1880	return;	1869	return;
1881	}	1870	}
1882	(void) do_skill(op,op,op->chosen_skill,dir,NULL);	1871	(void) do_skill(op,op,op->chosen_skill,dir,NULL);
1883	return;	1872	return;
1884	case range_builder:	1873	case range_builder:
1885	apply_map_builder( op, dir );	1874	apply_map_builder( op, dir );
1886	return;	1875	return;
1887	default:	1876	default:
1888	new_draw_info(NDI_UNIQUE, 0,op,"Illegal shoot type.");	1877	new_draw_info(NDI_UNIQUE, 0,op,"Illegal shoot type.");
1889	return;	1878	return;
1890	}	1879	}
1891	}	1880	}
1892		1881
1893		1882
1894		1883
…		…
1910	/* Should not happen, but sanity checking is never bad */	1899	/* Should not happen, but sanity checking is never bad */
1911	if (container->inv == NULL) return NULL;	1900	if (container->inv == NULL) return NULL;
1912		1901
1913	/* First, lets try to find a key in the top level inventory */	1902	/* First, lets try to find a key in the top level inventory */
1914	for (tmp=container->inv; tmp!=NULL; tmp=tmp->below) {	1903	for (tmp=container->inv; tmp!=NULL; tmp=tmp->below) {
1915	if (door->type==DOOR && tmp->type==KEY) break;	1904	if (door->type==DOOR && tmp->type==KEY) break;
1916	/* For sanity, we should really check door type, but other stuff	1905	/* For sanity, we should really check door type, but other stuff
1917	* (like containers) can be locked with special keys	1906	* (like containers) can be locked with special keys
1918	*/	1907	*/
1919	if (tmp->slaying && tmp->type==SPECIAL_KEY &&	1908	if (tmp->slaying && tmp->type==SPECIAL_KEY &&
1920	tmp->slaying==door->slaying) break;	1909	tmp->slaying==door->slaying) break;
1921	}	1910	}
1922	/* No key found - lets search inventories now */	1911	/* No key found - lets search inventories now */
1923	/* If we find and use a key in an inventory, return at that time.	1912	/* If we find and use a key in an inventory, return at that time.
1924	* otherwise, if we search all the inventories and still don't find	1913	* otherwise, if we search all the inventories and still don't find
1925	* a key, return	1914	* a key, return
1926	*/	1915	*/
1927	if (!tmp) {	1916	if (!tmp) {
1928	for (tmp=container->inv; tmp!=NULL; tmp=tmp->below) {	1917	for (tmp=container->inv; tmp!=NULL; tmp=tmp->below) {
1929	/* No reason to search empty containers */	1918	/* No reason to search empty containers */
1930	if (tmp->type==CONTAINER && tmp->inv) {	1919	if (tmp->type==CONTAINER && tmp->inv) {
1931	if ((key=find_key(pl, tmp, door))!=NULL) return key;	1920	if ((key=find_key(pl, tmp, door))!=NULL) return key;
1932	}	1921	}
1933	}	1922	}
1934	if (!tmp) return NULL;	1923	if (!tmp) return NULL;
1935	}	1924	}
1936	/* We get down here if we have found a key. Now if its in a container,	1925	/* We get down here if we have found a key. Now if its in a container,
1937	* see if we actually want to use it	1926	* see if we actually want to use it
1938	*/	1927	*/
1939	if (pl!=container) {	1928	if (pl!=container) {
1940	/* Only let players use keys in containers */	1929	/* Only let players use keys in containers */
1941	if (!pl->contr) return NULL;	1930	if (!pl->contr) return NULL;
1942	/* cases where this fails:	1931	/* cases where this fails:
1943	* If we only search the player inventory, return now since we	1932	* If we only search the player inventory, return now since we
1944	* are not in the players inventory.	1933	* are not in the players inventory.
1945	* If the container is not active, return now since only active	1934	* If the container is not active, return now since only active
1946	* containers can be used.	1935	* containers can be used.
1947	* If we only search keyrings and the container does not have	1936	* If we only search keyrings and the container does not have
1948	* a race/isn't a keyring.	1937	* a race/isn't a keyring.
1949	* No checking for all containers - to fall through past here,	1938	* No checking for all containers - to fall through past here,
1950	* inv must have been an container and must have been active.	1939	* inv must have been an container and must have been active.
1951	*	1940	*
1952	* Change the color so that the message doesn't disappear with	1941	* Change the color so that the message doesn't disappear with
1953	* all the others.	1942	* all the others.
1954	*/	1943	*/
1955	if (pl->contr->usekeys == key_inventory ||	1944	if (pl->contr->usekeys == key_inventory ||
1956	!QUERY_FLAG(container, FLAG_APPLIED) ||	1945	!QUERY_FLAG(container, FLAG_APPLIED) ||
1957	(pl->contr->usekeys == keyrings &&	1946	(pl->contr->usekeys == keyrings &&
1958	(!container->race || strcmp(container->race, "keys")))	1947	(!container->race || strcmp(container->race, "keys")))
1959	) {	1948	) {
1960	new_draw_info_format(NDI_UNIQUE|NDI_BROWN, 0, pl,	1949	new_draw_info_format(NDI_UNIQUE|NDI_BROWN, 0, pl,
1961	"The %s in your %s vibrates as you approach the door",	1950	"The %s in your %s vibrates as you approach the door",
1962	query_name(tmp), query_name(container));	1951	query_name(tmp), query_name(container));
1963	return NULL;	1952	return NULL;
1964	}	1953	}
1965	}	1954	}
1966	return tmp;	1955	return tmp;
1967	}	1956	}
1968		1957
1969	/* moved door processing out of move_player_attack.	1958	/* moved door processing out of move_player_attack.
…		…
1980	*/	1969	*/
1981	object *key=find_key(op, op, door);	1970	object *key=find_key(op, op, door);
1982		1971
1983	/* IF we found a key, do some extra work */	1972	/* IF we found a key, do some extra work */
1984	if (key) {	1973	if (key) {
1985	object *container=key->env;	1974	object *container=key->env;
1986		1975
1987	play_sound_map(op->map, op->x, op->y, SOUND_OPEN_DOOR);	1976	play_sound_map(op->map, op->x, op->y, SOUND_OPEN_DOOR);
1988	if(action_makes_visible(op)) make_visible(op);	1977	if(action_makes_visible(op)) make_visible(op);
1989	if(door->inv &&(door->inv->type ==RUNE || door->inv->type ==TRAP)) spring_trap(door->inv,op);	1978	if(door->inv &&(door->inv->type ==RUNE || door->inv->type ==TRAP)) spring_trap(door->inv,op);
1990	if (door->type == DOOR) {	1979	if (door->type == DOOR) {
1991	hit_player(door,9998,op,AT_PHYSICAL,1); /* Break through the door */	1980	hit_player(door,9998,op,AT_PHYSICAL,1); /* Break through the door */
1992	}	1981	}
1993	else if(door->type==LOCKED_DOOR) {	1982	else if(door->type==LOCKED_DOOR) {
1994	new_draw_info_format(NDI_UNIQUE, NDI_BROWN, op,	1983	new_draw_info_format(NDI_UNIQUE, NDI_BROWN, op,
1995	"You open the door with the %s", query_short_name(key));	1984	"You open the door with the %s", query_short_name(key));
1996	remove_door2(door); /* remove door without violence ;-) */	1985	remove_door2(door); /* remove door without violence ;-) */
1997	}	1986	}
1998	/* Do this after we print the message */	1987	/* Do this after we print the message */
1999	decrease_ob(key); /* Use up one of the keys */	1988	decrease_ob(key); /* Use up one of the keys */
2000	/* Need to update the weight the container the key was in */	1989	/* Need to update the weight the container the key was in */
2001	if (container != op)	1990	if (container != op)
2002	esrv_update_item(UPD_WEIGHT, op, container);	1991	esrv_update_item(UPD_WEIGHT, op, container);
2003	return 1; /* Nothing more to do below */	1992	return 1; /* Nothing more to do below */
2004	} else if (door->type==LOCKED_DOOR) {	1993	} else if (door->type==LOCKED_DOOR) {
2005	/* Might as well return now - no other way to open this */	1994	/* Might as well return now - no other way to open this */
2006	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1995	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2007	return 1;	1996	return 1;
2008	}	1997	}
2009	return 0;	1998	return 0;
2010	}	1999	}
2011		2000
2012	/* This function is just part of a breakup from move_player.	2001	/* This function is just part of a breakup from move_player.
…		…
2036	* do nothing at all. As it is, if we are braced, we go through	2025	* do nothing at all. As it is, if we are braced, we go through
2037	* quite a bit of processing. However, it probably is less than what	2026	* quite a bit of processing. However, it probably is less than what
2038	* move_ob uses.	2027	* move_ob uses.
2039	*/	2028	*/
2040	if ((op->contr->braced || !move_ob(op,dir,op)) && !out_of_map(op->map,nx,ny)) {	2029	if ((op->contr->braced || !move_ob(op,dir,op)) && !out_of_map(op->map,nx,ny)) {
2041	if (OUT_OF_REAL_MAP(op->map, nx, ny)) {	2030	if (OUT_OF_REAL_MAP(op->map, nx, ny)) {
2042	m = get_map_from_coord(op->map, &nx, &ny);	2031	m = get_map_from_coord(op->map, &nx, &ny);
2043	if (!m) return; /* Don't think this should happen */	2032	if (!m) return; /* Don't think this should happen */
2044	}	2033	}
2045	else m =op->map;	2034	else m =op->map;
2046		2035
2047	if ((tmp=get_map_ob(m,nx,ny))==NULL) {	2036	if ((tmp=get_map_ob(m,nx,ny))==NULL) {
2048	/* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n");*/	2037	/* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n");*/
2049	return;	2038	return;
2050	}	2039	}
2051		2040
2052	mon = NULL;	2041	mon = NULL;
2053	/* Go through all the objects, and find ones of interest. Only stop if	2042	/* Go through all the objects, and find ones of interest. Only stop if
2054	* we find a monster - that is something we know we want to attack.	2043	* we find a monster - that is something we know we want to attack.
2055	* if its a door or barrel (can roll) see if there may be monsters	2044	* if its a door or barrel (can roll) see if there may be monsters
2056	* on the space	2045	* on the space
2057	*/	2046	*/
2058	while (tmp!=NULL) {	2047	while (tmp!=NULL) {
2059	if (tmp == op) {	2048	if (tmp == op) {
2060	tmp=tmp->above;	2049	tmp=tmp->above;
2061	continue;	2050	continue;
2062	}	2051	}
2063	if (QUERY_FLAG(tmp,FLAG_ALIVE)) {	2052	if (QUERY_FLAG(tmp,FLAG_ALIVE)) {
2064	mon = tmp;	2053	mon = tmp;
2065	break;	2054	break;
2066	}	2055	}
2067	if (tmp->type==LOCKED_DOOR || QUERY_FLAG(tmp,FLAG_CAN_ROLL))	2056	if (tmp->type==LOCKED_DOOR || QUERY_FLAG(tmp,FLAG_CAN_ROLL))
2068	mon = tmp;	2057	mon = tmp;
2069	tmp=tmp->above;	2058	tmp=tmp->above;
2070	}	2059	}
2071		2060
2072	if (mon==NULL) /* This happens anytime the player tries to move */	2061	if (mon==NULL) /* This happens anytime the player tries to move */
2073	return; /* into a wall */	2062	return; /* into a wall */
2074		2063
2075	if(mon->head != NULL)	2064	if(mon->head != NULL)
2076	mon = mon->head;	2065	mon = mon->head;
2077		2066
2078	if ((mon->type==DOOR && mon->stats.hp>=0) || (mon->type==LOCKED_DOOR))	2067	if ((mon->type==DOOR && mon->stats.hp>=0) || (mon->type==LOCKED_DOOR))
2079	if (player_attack_door(op, mon)) return;	2068	if (player_attack_door(op, mon)) return;
2080		2069
2081	/* The following deals with possibly attacking peaceful	2070	/* The following deals with possibly attacking peaceful
2082	* or frienddly creatures. Basically, all players are considered	2071	* or frienddly creatures. Basically, all players are considered
2083	* unaggressive. If the moving player has peaceful set, then the	2072	* unaggressive. If the moving player has peaceful set, then the
2084	* object should be pushed instead of attacked. It is assumed that	2073	* object should be pushed instead of attacked. It is assumed that
2085	* if you are braced, you will not attack friends accidently,	2074	* if you are braced, you will not attack friends accidently,
2086	* and thus will not push them.	2075	* and thus will not push them.
2087	*/	2076	*/
2088		2077
2089	/* If the creature is a pet, push it even if the player is not	2078	/* If the creature is a pet, push it even if the player is not
2090	* peaceful. Our assumption is the creature is a pet if the	2079	* peaceful. Our assumption is the creature is a pet if the
2091	* player owns it and it is either friendly or unagressive.	2080	* player owns it and it is either friendly or unagressive.
2092	*/	2081	*/
2093	if ((op->type==PLAYER)	2082	if ((op->type==PLAYER)
2094	#if COZY_SERVER	2083	#if COZY_SERVER
2095	&&	2084	&&
2096	(	2085	(
2097	(get_owner(mon) && get_owner(mon)->contr	2086	(get_owner(mon) && get_owner(mon)->contr
2098	&& same_party (get_owner(mon)->contr->party, op->contr->party))	2087	&& same_party (get_owner(mon)->contr->party, op->contr->party))
…		…
2100	)	2089	)
2101	#else	2090	#else
2102	&& get_owner(mon)==op	2091	&& get_owner(mon)==op
2103	#endif	2092	#endif
2104	&& (QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)))	2093	&& (QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)))
2105	{	2094	{
2106	/* If we're braced, we don't want to switch places with it */	2095	/* If we're braced, we don't want to switch places with it */
2107	if (op->contr->braced) return;	2096	if (op->contr->braced) return;
2108	play_sound_map(op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2097	play_sound_map(op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2109	(void) push_ob(mon,dir,op);	2098	(void) push_ob(mon,dir,op);
2110	if(op->contr->tmp_invis||op->hide) make_visible(op);	2099	if(op->contr->tmp_invis||op->hide) make_visible(op);
2111	return;	2100	return;
2112	}	2101	}
2113		2102
2114	/* in certain circumstances, you shouldn't attack friendly	2103	/* in certain circumstances, you shouldn't attack friendly
2115	* creatures. Note that if you are braced, you can't push	2104	* creatures. Note that if you are braced, you can't push
2116	* someone, but put it inside this loop so that you won't	2105	* someone, but put it inside this loop so that you won't
2117	* attack them either.	2106	* attack them either.
2118	*/	2107	*/
2119	if ((mon->type==PLAYER || mon->enemy != op) &&	2108	if ((mon->type==PLAYER || mon->enemy != op) &&
2120	(mon->type==PLAYER || QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)) &&	2109	(mon->type==PLAYER || QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)) &&
2121	(	2110	(
2122	#ifdef PROHIBIT_PLAYERKILL	2111	#ifdef PROHIBIT_PLAYERKILL
2123	(op->contr->peaceful || (mon->type == PLAYER && mon->contr->peaceful)) &&	2112	(op->contr->peaceful || (mon->type == PLAYER && mon->contr->peaceful)) &&
2124	#else	2113	#else
2125	op->contr->peaceful &&	2114	op->contr->peaceful &&
2126	#endif	2115	#endif
2127	!on_battleground	2116	!on_battleground
2128	)) {	2117	)) {
2129	if (!op->contr->braced) {	2118	if (!op->contr->braced) {
2130	play_sound_map(op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2119	play_sound_map(op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2131	(void) push_ob(mon,dir,op);	2120	(void) push_ob(mon,dir,op);
2132	} else {	2121	} else {
2133	new_draw_info(0, 0,op,"You withhold your attack");	2122	new_draw_info(0, 0,op,"You withhold your attack");
2134	}	2123	}
2135	if(op->contr->tmp_invis||op->hide) make_visible(op);	2124	if(op->contr->tmp_invis||op->hide) make_visible(op);
2136	}	2125	}
2137		2126
2138	/* If the object is a boulder or other rollable object, then	2127	/* If the object is a boulder or other rollable object, then
2139	* roll it if not braced. You can't roll it if you are braced.	2128	* roll it if not braced. You can't roll it if you are braced.
2140	*/	2129	*/
2141	else if(QUERY_FLAG(mon,FLAG_CAN_ROLL)&&(!op->contr->braced)) {	2130	else if(QUERY_FLAG(mon,FLAG_CAN_ROLL)&&(!op->contr->braced)) {
2142	recursive_roll(mon,dir,op);	2131	recursive_roll(mon,dir,op);
2143	if(action_makes_visible(op)) make_visible(op);	2132	if(action_makes_visible(op)) make_visible(op);
2144	}	2133	}
2145		2134
2146	/* Any generic living creature. Including things like doors.	2135	/* Any generic living creature. Including things like doors.
2147	* Way it works is like this: First, it must have some hit points	2136	* Way it works is like this: First, it must have some hit points
2148	* and be living. Then, it must be one of the following:	2137	* and be living. Then, it must be one of the following:
2149	* 1) Not a player, 2) A player, but of a different party. Note	2138	* 1) Not a player, 2) A player, but of a different party. Note
2150	* that party_number -1 is no party, so attacks can still happen.	2139	* that party_number -1 is no party, so attacks can still happen.
2151	*/	2140	*/
2152		2141
2153	else if ((mon->stats.hp>=0) && QUERY_FLAG(mon, FLAG_ALIVE) &&	2142	else if ((mon->stats.hp>=0) && QUERY_FLAG(mon, FLAG_ALIVE) &&
2154	((mon->type!=PLAYER || op->contr->party==NULL ||	2143	((mon->type!=PLAYER || op->contr->party==NULL ||
2155	op->contr->party!=mon->contr->party))) {	2144	op->contr->party!=mon->contr->party))) {
2156		2145
2157	/* If the player hasn't hit something this tick, and does	2146	/* If the player hasn't hit something this tick, and does
2158	* so, give them speed boost based on weapon speed. Doing	2147	* so, give them speed boost based on weapon speed. Doing
2159	* it here is better than process_players2, which basically	2148	* it here is better than process_players2, which basically
2160	* incurred a 1 tick offset.	2149	* incurred a 1 tick offset.
2161	*/	2150	*/
2162	if (!op->contr->has_hit) {	2151	if (!op->contr->has_hit) {
2163	op->speed_left += op->speed / op->contr->weapon_sp;	2152	op->speed_left += op->speed / op->contr->weapon_sp;
2164		2153
2165	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */	2154	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2166	}	2155	}
2167		2156
2168	skill_attack(mon, op, 0, NULL, NULL);	2157	skill_attack(mon, op, 0, NULL, NULL);
2169		2158
2170	/* If attacking another player, that player gets automatic	2159	/* If attacking another player, that player gets automatic
2171	* hitback, and doesn't loose luck either.	2160	* hitback, and doesn't loose luck either.
2172	* Disable hitback on the battleground or if the target is	2161	* Disable hitback on the battleground or if the target is
2173	* the wiz.	2162	* the wiz.
2174	*/	2163	*/
2175	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit &&	2164	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit &&
2176	!on_battleground && !QUERY_FLAG(mon, FLAG_WIZ)) {	2165	!on_battleground && !QUERY_FLAG(mon, FLAG_WIZ)) {
2177	short luck = mon->stats.luck;	2166	short luck = mon->stats.luck;
2178	mon->contr->has_hit = 1;	2167	mon->contr->has_hit = 1;
2179	skill_attack(op, mon, 0, NULL, NULL);	2168	skill_attack(op, mon, 0, NULL, NULL);
2180	mon->stats.luck = luck;	2169	mon->stats.luck = luck;
2181	}	2170	}
2182	if(action_makes_visible(op)) make_visible(op);	2171	if(action_makes_visible(op)) make_visible(op);
2183	}	2172	}
2184	} /* if player should attack something */	2173	} /* if player should attack something */
2185	}	2174	}
2186		2175
2187	int move_player(object *op,int dir) {	2176	int move_player(object *op,int dir) {
2188	int pick;	2177	int pick;
2189		2178
2190	if(op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2179	if(op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)
2191	return 0;	2180	return 0;
2192		2181
2193	/* Sanity check: make sure dir is valid */	2182	/* Sanity check: make sure dir is valid */
2194	if ( ( dir < 0 ) || ( dir >= 9 ) ) {	2183	if ( ( dir < 0 ) || ( dir >= 9 ) ) {
2195	LOG( llevError, "move_player: invalid direction %d\n", dir);	2184	LOG( llevError, "move_player: invalid direction %d\n", dir);
2196	return 0;	2185	return 0;
2197	}	2186	}
2198		2187
2199	/* peterm: added following line */	2188	/* peterm: added following line */
2200	if(QUERY_FLAG(op,FLAG_CONFUSED) && dir)	2189	if(QUERY_FLAG(op,FLAG_CONFUSED) && dir)
2201	dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2);	2190	dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2);
2202		2191
2203	op->facing = dir;	2192	op->facing = dir;
2204		2193
2205	if(op->hide) do_hidden_move(op);	2194	if(op->hide) do_hidden_move(op);
2206		2195
		2196	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
		2197	/*nop*/;
2207	if(op->contr->fire_on) {	2198	else if (op->contr->fire_on)
2208	fire(op,dir);	2199	fire (op, dir);
2209	}	2200	else
		2201	{
2210	else move_player_attack(op,dir);	2202	move_player_attack (op, dir);
2211
2212	pick = check_pick(op);	2203	pick = check_pick(op);
2213		2204	}
2214		2205
2215	/* Add special check for newcs players and fire on - this way, the	2206	/* Add special check for newcs players and fire on - this way, the
2216	* server can handle repeat firing.	2207	* server can handle repeat firing.
2217	*/	2208	*/
2218	if (op->contr->fire_on || (op->contr->run_on && pick!=0)) {	2209	if (op->contr->fire_on || (op->contr->run_on && pick!=0)) {
2219	op->direction = dir;	2210	op->direction = dir;
2220	} else {	2211	} else {
2221	op->direction=0;	2212	op->direction=0;
2222	}	2213	}
2223	/* Update how the player looks. Use the facing, so direction may	2214	/* Update how the player looks. Use the facing, so direction may
2224	* get reset to zero. This allows for full animation capabilities	2215	* get reset to zero. This allows for full animation capabilities
2225	* for players.	2216	* for players.
2226	*/	2217	*/
…		…
2236	* Returns true if there are more actions we can do.	2227	* Returns true if there are more actions we can do.
2237	*/	2228	*/
2238	int handle_newcs_player(object *op)	2229	int handle_newcs_player(object *op)
2239	{	2230	{
2240	if (op->contr->hidden) {	2231	if (op->contr->hidden) {
2241	op->invisible = 1000;	2232	op->invisible = 1000;
2242	/* the socket code flashes the player visible/invisible	2233	/* the socket code flashes the player visible/invisible
2243	* depending on the value of invisible, so we need to	2234	* depending on the value of invisible, so we need to
2244	* alternate it here for it to work correctly.	2235	* alternate it here for it to work correctly.
2245	*/	2236	*/
2246	if (pticks & 2) op->invisible--;	2237	if (pticks & 2) op->invisible--;
2247	}	2238	}
2248	else if(op->invisible&&!(QUERY_FLAG(op,FLAG_MAKE_INVIS))) {	2239	else if(op->invisible&&!(QUERY_FLAG(op,FLAG_MAKE_INVIS))) {
2249	op->invisible--;	2240	op->invisible--;
2250	if(!op->invisible) {	2241	if(!op->invisible) {
2251	make_visible(op);	2242	make_visible(op);
2252	new_draw_info(NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2243	new_draw_info(NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2253	}	2244	}
2254	}	2245	}
2255		2246
2256	if (QUERY_FLAG(op, FLAG_SCARED)) {	2247	if (QUERY_FLAG(op, FLAG_SCARED)) {
2257	flee_player(op);	2248	flee_player(op);
2258	/* If player is still scared, that is his action for this tick */	2249	/* If player is still scared, that is his action for this tick */
2259	if (QUERY_FLAG(op, FLAG_SCARED)) {	2250	if (QUERY_FLAG(op, FLAG_SCARED)) {
2260	op->speed_left--;	2251	op->speed_left--;
2261	return 0;	2252	return 0;
2262	}	2253	}
2263	}	2254	}
2264		2255
2265	/* I've been seeing crashes where the golem has been destroyed, but	2256	/* I've been seeing crashes where the golem has been destroyed, but
2266	* the player object still points to the defunct golem. The code that	2257	* the player object still points to the defunct golem. The code that
2267	* destroys the golem looks correct, and it doesn't always happen, so	2258	* destroys the golem looks correct, and it doesn't always happen, so
2268	* put this in a a workaround to clean up the golem pointer.	2259	* put this in a a workaround to clean up the golem pointer.
2269	*/	2260	*/
2270	if (op->contr->ranges[range_golem] &&	2261	if (op->contr->ranges[range_golem] &&
2271	((op->contr->golem_count != op->contr->ranges[range_golem]->count) ||	2262	((op->contr->golem_count != op->contr->ranges[range_golem]->count) ||
2272	QUERY_FLAG(op->contr->ranges[range_golem], FLAG_REMOVED))) {	2263	QUERY_FLAG(op->contr->ranges[range_golem], FLAG_REMOVED))) {
2273	op->contr->ranges[range_golem] = NULL;	2264	op->contr->ranges[range_golem] = NULL;
2274	op->contr->golem_count = 0;	2265	op->contr->golem_count = 0;
2275	}	2266	}
2276		2267
2277	/* call this here - we also will call this in do_ericserver, but	2268	/* call this here - we also will call this in do_ericserver, but
2278	* the players time has been increased when doericserver has been	2269	* the players time has been increased when doericserver has been
2279	* called, so we recheck it here.	2270	* called, so we recheck it here.
2280	*/	2271	*/
2281	HandleClient(&op->contr->socket, op->contr);	2272	HandleClient(&op->contr->socket, op->contr);
2282	if (op->speed_left<0) return 0;	2273	if (op->speed_left<0) return 0;
2283		2274
2284	if(op->direction && (op->contr->run_on || op->contr->fire_on)) {	2275	if(op->direction && (op->contr->run_on || op->contr->fire_on)) {
2285	/* All move commands take 1 tick, at least for now */	2276	/* All move commands take 1 tick, at least for now */
2286	op->speed_left--;	2277	op->speed_left--;
2287		2278
2288	/* Instead of all the stuff below, let move_player take care	2279	/* Instead of all the stuff below, let move_player take care
2289	* of it. Also, some of the skill stuff is only put in	2280	* of it. Also, some of the skill stuff is only put in
2290	* there, as well as the confusion stuff.	2281	* there, as well as the confusion stuff.
2291	*/	2282	*/
2292	move_player(op, op->direction);	2283	move_player(op, op->direction);
2293	if (op->speed_left>0) return 1;	2284	if (op->speed_left>0) return 1;
2294	else return 0;	2285	else return 0;
2295	}	2286	}
2296	return 0;	2287	return 0;
2297	}	2288	}
2298		2289
2299	int save_life(object *op) {	2290	int save_life(object *op) {
2300	object *tmp;	2291	object *tmp;
2301		2292
2302	if(!QUERY_FLAG(op,FLAG_LIFESAVE))	2293	if(!QUERY_FLAG(op,FLAG_LIFESAVE))
2303	return 0;	2294	return 0;
2304		2295
2305	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below)	2296	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below)
2306	if(QUERY_FLAG(tmp, FLAG_APPLIED)&&QUERY_FLAG(tmp,FLAG_LIFESAVE)) {	2297	if(QUERY_FLAG(tmp, FLAG_APPLIED)&&QUERY_FLAG(tmp,FLAG_LIFESAVE)) {
2307	play_sound_map(op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2298	play_sound_map(op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2308	new_draw_info_format(NDI_UNIQUE, 0,op,	2299	new_draw_info_format(NDI_UNIQUE, 0,op,
2309	"Your %s vibrates violently, then evaporates.",	2300	"Your %s vibrates violently, then evaporates.",
2310	query_name(tmp));	2301	query_name(tmp));
2311	if (op->contr)	2302	if (op->contr)
2312	esrv_del_item(op->contr, tmp->count);	2303	esrv_del_item(op->contr, tmp->count);
2313	remove_ob(tmp);	2304	remove_ob(tmp);
2314	free_object(tmp);	2305	free_object(tmp);
2315	CLEAR_FLAG(op, FLAG_LIFESAVE);	2306	CLEAR_FLAG(op, FLAG_LIFESAVE);
2316	if(op->stats.hp<0)	2307	if(op->stats.hp<0)
2317	op->stats.hp = op->stats.maxhp;	2308	op->stats.hp = op->stats.maxhp;
2318	if(op->stats.food<0)	2309	if(op->stats.food<0)
2319	op->stats.food = 999;	2310	op->stats.food = 999;
2320	fix_player(op);	2311	fix_player(op);
2321	return 1;	2312	return 1;
2322	}	2313	}
2323	LOG(llevError,"Error: LIFESAVE set without applied object.\n");	2314	LOG(llevError,"Error: LIFESAVE set without applied object.\n");
2324	CLEAR_FLAG(op, FLAG_LIFESAVE);	2315	CLEAR_FLAG(op, FLAG_LIFESAVE);
2325	enter_player_savebed(op); /* bring him home. */	2316	enter_player_savebed(op); /* bring him home. */
2326	return 0;	2317	return 0;
2327	}	2318	}
…		…
2334	void remove_unpaid_objects(object *op, object *env)	2325	void remove_unpaid_objects(object *op, object *env)
2335	{	2326	{
2336	object *next;	2327	object *next;
2337		2328
2338	while (op) {	2329	while (op) {
2339	next=op->below; /* Make sure we have a good value, in case	2330	next=op->below; /* Make sure we have a good value, in case
2340	* we remove object 'op'	2331	* we remove object 'op'
2341	*/	2332	*/
2342	if (QUERY_FLAG(op, FLAG_UNPAID)) {	2333	if (QUERY_FLAG(op, FLAG_UNPAID)) {
2343	remove_ob(op);	2334	remove_ob(op);
2344	op->x = env->x;	2335	op->x = env->x;
2345	op->y = env->y;	2336	op->y = env->y;
2346	if (env->type == PLAYER)	2337	if (env->type == PLAYER)
2347	esrv_del_item(env->contr, op->count);	2338	esrv_del_item(env->contr, op->count);
2348	insert_ob_in_map(op, env->map, NULL,0);	2339	insert_ob_in_map(op, env->map, NULL,0);
2349	}	2340	}
2350	else if (op->inv) remove_unpaid_objects(op->inv, env);	2341	else if (op->inv) remove_unpaid_objects(op->inv, env);
2351	op=next;	2342	op=next;
2352	}	2343	}
2353	}	2344	}
2354		2345
2355		2346
2356	/*	2347	/*
…		…
2366	char buf[MAX_BUF];	2357	char buf[MAX_BUF];
2367	time_t now = time (NULL);	2358	time_t now = time (NULL);
2368		2359
2369	strcpy (buf2, " R.I.P.\n\n");	2360	strcpy (buf2, " R.I.P.\n\n");
2370	if (op->type == PLAYER)	2361	if (op->type == PLAYER)
2371	sprintf (buf, "%s the %s\n", op->name, op->contr->title);	2362	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2372	else	2363	else
2373	sprintf (buf, "%s\n", op->name);	2364	sprintf (buf, "%s\n", &op->name);
2374	strncat (buf2, " ", 20 - strlen (buf) / 2);	2365	strncat (buf2, " ", 20 - strlen (buf) / 2);
2375	strcat (buf2, buf);	2366	strcat (buf2, buf);
2376	if (op->type == PLAYER)	2367	if (op->type == PLAYER)
2377	sprintf (buf, "who was in level %d when killed\n", op->level);	2368	sprintf (buf, "who was in level %d when killed\n", op->level);
2378	else	2369	else
…		…
2405	const int max_grace = 1;	2396	const int max_grace = 1;
2406		2397
2407	if (op->contr->outputs_sync) {	2398	if (op->contr->outputs_sync) {
2408	for (i=0; i<NUM_OUTPUT_BUFS; i++)	2399	for (i=0; i<NUM_OUTPUT_BUFS; i++)
2409	if (op->contr->outputs[i].buf!=NULL &&	2400	if (op->contr->outputs[i].buf!=NULL &&
2410	(op->contr->outputs[i].first_update+op->contr->outputs_sync)<pticks)	2401	(op->contr->outputs[i].first_update+op->contr->outputs_sync)<pticks)
2411	flush_output_element(op, &op->contr->outputs[i]);	2402	flush_output_element(op, &op->contr->outputs[i]);
2412	}	2403	}
2413		2404
2414	if(op->contr->state==ST_PLAYING) {	2405	if(op->contr->state==ST_PLAYING) {
2415		2406
2416	/* these next three if clauses make it possible to SLOW DOWN	2407	/* these next three if clauses make it possible to SLOW DOWN
…		…
2436		2427
2437	/* Regenerate Spell Points */	2428	/* Regenerate Spell Points */
2438	if(op->contr->ranges[range_golem]==NULL && --op->last_sp<0) {	2429	if(op->contr->ranges[range_golem]==NULL && --op->last_sp<0) {
2439	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10? 10 : op->contr->gen_sp_armour);	2430	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10? 10 : op->contr->gen_sp_armour);
2440	if(op->stats.sp<op->stats.maxsp) {	2431	if(op->stats.sp<op->stats.maxsp) {
2441	op->stats.sp++;	2432	op->stats.sp++;
2442	/* dms do not consume food */	2433	/* dms do not consume food */
2443	if (!QUERY_FLAG(op,FLAG_WIZ)) {	2434	if (!QUERY_FLAG(op,FLAG_WIZ)) {
2444	op->stats.food--;	2435	op->stats.food--;
2445	if(op->contr->digestion<0)	2436	if(op->contr->digestion<0)
2446	op->stats.food+=op->contr->digestion;	2437	op->stats.food+=op->contr->digestion;
…		…
2448	random_roll(0, op->contr->digestion, op, PREFER_HIGH))	2439	random_roll(0, op->contr->digestion, op, PREFER_HIGH))
2449	op->stats.food=last_food;	2440	op->stats.food=last_food;
2450	}	2441	}
2451	}	2442	}
2452	if (max_sp>1) {	2443	if (max_sp>1) {
2453	over_sp = (gen_sp+10)/rate_sp;	2444	over_sp = (gen_sp+10)/rate_sp;
2454	if (over_sp > 0) {	2445	if (over_sp > 0) {
2455	if(op->stats.sp<op->stats.maxsp) {	2446	if(op->stats.sp<op->stats.maxsp) {
2456	op->stats.sp += over_sp>max_sp ? max_sp : over_sp;	2447	op->stats.sp += over_sp>max_sp ? max_sp : over_sp;
2457	if(random_roll(0, rate_sp-1, op, PREFER_LOW) > ((gen_sp+10)%rate_sp))	2448	if(random_roll(0, rate_sp-1, op, PREFER_LOW) > ((gen_sp+10)%rate_sp))
2458	op->stats.sp--;	2449	op->stats.sp--;
2459	if(op->stats.sp>op->stats.maxsp)	2450	if(op->stats.sp>op->stats.maxsp)
2460	op->stats.sp=op->stats.maxsp;	2451	op->stats.sp=op->stats.maxsp;
2461	}	2452	}
2462	op->last_sp=0;	2453	op->last_sp=0;
2463	} else {	2454	} else {
2464	op->last_sp=rate_sp/(gen_sp<20 ? 30 : gen_sp+10);	2455	op->last_sp=rate_sp/(gen_sp<20 ? 30 : gen_sp+10);
2465	}	2456	}
2466	} else {	2457	} else {
2467	op->last_sp=rate_sp/(gen_sp<20 ? 30 : gen_sp+10);	2458	op->last_sp=rate_sp/(gen_sp<20 ? 30 : gen_sp+10);
2468	}	2459	}
2469	}	2460	}
2470		2461
2471	/* Regenerate Grace */	2462	/* Regenerate Grace */
2472	/* I altered this a little - maximum grace is ony achieved through prayer -b.t.*/	2463	/* I altered this a little - maximum grace is ony achieved through prayer -b.t.*/
2473	if(--op->last_grace<0) {	2464	if(--op->last_grace<0) {
2474	if(op->stats.grace<op->stats.maxgrace/2)	2465	if(op->stats.grace<op->stats.maxgrace/2)
2475	op->stats.grace++; /* no penalty in food for regaining grace */	2466	op->stats.grace++; /* no penalty in food for regaining grace */
2476	if(max_grace>1) {	2467	if(max_grace>1) {
2477	over_grace = (gen_grace<20 ? 30 : gen_grace+10)/rate_grace;	2468	over_grace = (gen_grace<20 ? 30 : gen_grace+10)/rate_grace;
2478	if (over_grace > 0) {	2469	if (over_grace > 0) {
2479	op->stats.sp += over_grace	2470	op->stats.sp += over_grace
2480	+ (random_roll(0, rate_grace-1, op, PREFER_HIGH) > ((gen_grace<20 ? 30 : gen_grace+10)%rate_grace))? -1 : 0;	2471	+ (random_roll(0, rate_grace-1, op, PREFER_HIGH) > ((gen_grace<20 ? 30 : gen_grace+10)%rate_grace))? -1 : 0;
2481	op->last_grace=0;	2472	op->last_grace=0;
2482	} else {	2473	} else {
2483	op->last_grace=rate_grace/(gen_grace<20 ? 30 : gen_grace+10);	2474	op->last_grace=rate_grace/(gen_grace<20 ? 30 : gen_grace+10);
2484	}	2475	}
2485	} else {	2476	} else {
2486	op->last_grace=rate_grace/(gen_grace<20 ? 30 : gen_grace+10);	2477	op->last_grace=rate_grace/(gen_grace<20 ? 30 : gen_grace+10);
2487	}	2478	}
2488	/* wearing stuff doesn't detract from grace generation. */	2479	/* wearing stuff doesn't detract from grace generation. */
2489	}	2480	}
2490		2481
2491	/* Regenerate Hit Points */	2482	/* Regenerate Hit Points */
2492	if(--op->last_heal<0) {	2483	if(--op->last_heal<0) {
2493	if(op->stats.hp<op->stats.maxhp) {	2484	if(op->stats.hp<op->stats.maxhp) {
2494	op->stats.hp++;	2485	op->stats.hp++;
2495	/* dms do not consume food */	2486	/* dms do not consume food */
2496	if (!QUERY_FLAG(op,FLAG_WIZ)) {	2487	if (!QUERY_FLAG(op,FLAG_WIZ)) {
2497	op->stats.food--;	2488	op->stats.food--;
2498	if(op->contr->digestion<0)	2489	if(op->contr->digestion<0)
2499	op->stats.food+=op->contr->digestion;	2490	op->stats.food+=op->contr->digestion;
…		…
2501	random_roll(0, op->contr->digestion, op, PREFER_HIGH))	2492	random_roll(0, op->contr->digestion, op, PREFER_HIGH))
2502	op->stats.food=last_food;	2493	op->stats.food=last_food;
2503	}	2494	}
2504	}	2495	}
2505	if(max_hp>1) {	2496	if(max_hp>1) {
2506	over_hp = (gen_hp<20 ? 30 : gen_hp+10)/rate_hp;	2497	over_hp = (gen_hp<20 ? 30 : gen_hp+10)/rate_hp;
2507	if (over_hp > 0) {	2498	if (over_hp > 0) {
2508	op->stats.sp += over_hp	2499	op->stats.sp += over_hp
2509	+ (RANDOM()%rate_hp > ((gen_hp<20 ? 30 : gen_hp+10)%rate_hp))? -1 : 0;	2500	+ (RANDOM()%rate_hp > ((gen_hp<20 ? 30 : gen_hp+10)%rate_hp))? -1 : 0;
2510	op->last_heal=0;	2501	op->last_heal=0;
2511	} else {	2502	} else {
2512	op->last_heal=rate_hp/(gen_hp<20 ? 30 : gen_hp+10);	2503	op->last_heal=rate_hp/(gen_hp<20 ? 30 : gen_hp+10);
2513	}	2504	}
2514	} else {	2505	} else {
2515	op->last_heal=rate_hp/(gen_hp<20 ? 30 : gen_hp+10);	2506	op->last_heal=rate_hp/(gen_hp<20 ? 30 : gen_hp+10);
2516	}	2507	}
2517	}	2508	}
2518		2509
2519	/* Digestion */	2510	/* Digestion */
2520	if(--op->last_eat<0) {	2511	if(--op->last_eat<0) {
2521	#ifdef COZY_SERVER	2512	#ifdef COZY_SERVER
2522	int dg = op->contr->digestion>=0 && op->contr->digestion<2 ? 2 : op->contr->digestion;	2513	int dg = op->contr->digestion>=0 && op->contr->digestion<2 ? 2 : op->contr->digestion;
2523	int bonus=dg>0?dg:0,	2514	int bonus=dg>0?dg:0,
2524	penalty=dg<0?-dg:0;	2515	penalty=dg<0?-dg:0;
2525	#else	2516	#else
2526	int bonus=op->contr->digestion>0?op->contr->digestion:0,	2517	int bonus=op->contr->digestion>0?op->contr->digestion:0,
2527	penalty=op->contr->digestion<0?-op->contr->digestion:0;	2518	penalty=op->contr->digestion<0?-op->contr->digestion:0;
2528	#endif	2519	#endif
2529		2520
2530	if(op->contr->gen_hp > 0)	2521	if(op->contr->gen_hp > 0)
2531	op->last_eat=25*(1+bonus)/(op->contr->gen_hp+penalty+1);	2522	op->last_eat=25*(1+bonus)/(op->contr->gen_hp+penalty+1);
2532	else	2523	else
2533	op->last_eat=25*(1+bonus)/(penalty +1);	2524	op->last_eat=25*(1+bonus)/(penalty +1);
2534	/* dms do not consume food */	2525	/* dms do not consume food */
2535	if (!QUERY_FLAG(op,FLAG_WIZ)) op->stats.food--;	2526	if (!QUERY_FLAG(op,FLAG_WIZ)) op->stats.food--;
2536	}	2527	}
2537	}	2528	}
2538		2529
2539	if(op->contr->state==ST_PLAYING&&op->stats.food<0&&op->stats.hp>=0) {	2530	if(op->contr->state==ST_PLAYING&&op->stats.food<0&&op->stats.hp>=0) {
2540	object *tmp, *flesh=NULL;	2531	object *tmp, *flesh=NULL;
2541		2532
2542	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) {	2533	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) {
2543	if(!QUERY_FLAG(tmp, FLAG_UNPAID)) {	2534	if(!QUERY_FLAG(tmp, FLAG_UNPAID)) {
2544	if (tmp->type==FOOD || tmp->type==DRINK || tmp->type==POISON) {	2535	if (tmp->type==FOOD || tmp->type==DRINK || tmp->type==POISON) {
2545	new_draw_info(NDI_UNIQUE, 0,op,"You blindly grab for a bite of food.");	2536	new_draw_info(NDI_UNIQUE, 0,op,"You blindly grab for a bite of food.");
2546	manual_apply(op,tmp,0);	2537	manual_apply(op,tmp,0);
2547	if(op->stats.food>=0||op->stats.hp<0)	2538	if(op->stats.food>=0||op->stats.hp<0)
2548	break;	2539	break;
2549	}	2540	}
2550	else if (tmp->type==FLESH) flesh=tmp;	2541	else if (tmp->type==FLESH) flesh=tmp;
2551	} /* End if paid for object */	2542	} /* End if paid for object */
2552	} /* end of for loop */	2543	} /* end of for loop */
2553	/* If player is still starving, it means they don't have any food, so	2544	/* If player is still starving, it means they don't have any food, so
2554	* eat flesh instead.	2545	* eat flesh instead.
2555	*/	2546	*/
2556	if (op->stats.food<0 && op->stats.hp>=0 && flesh) {	2547	if (op->stats.food<0 && op->stats.hp>=0 && flesh) {
2557	new_draw_info(NDI_UNIQUE, 0,op,"You blindly grab for a bite of food.");	2548	new_draw_info(NDI_UNIQUE, 0,op,"You blindly grab for a bite of food.");
2558	manual_apply(op,flesh,0);	2549	manual_apply(op,flesh,0);
2559	}	2550	}
2560	} /* end if player is starving */	2551	} /* end if player is starving */
2561		2552
2562	while(op->stats.food<0&&op->stats.hp>0)	2553	while(op->stats.food<0&&op->stats.hp>0)
2563	op->stats.food++,op->stats.hp--;	2554	op->stats.food++,op->stats.hp--;
2564		2555
2565	if (!op->contr->state&&!QUERY_FLAG(op,FLAG_WIZ)&&(op->stats.hp<0||op->stats.food<0))	2556	if (!op->contr->state&&!QUERY_FLAG(op,FLAG_WIZ)&&(op->stats.hp<0||op->stats.food<0))
2566	kill_player(op);	2557	kill_player(op);
2567	}	2558	}
2568		2559
2569		2560
2570		2561
2571	/* If the player should die (lack of hp, food, etc), we call this.	2562	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2586	int will_kill_again;	2577	int will_kill_again;
2587	archetype *at;	2578	archetype *at;
2588	object *tmp;	2579	object *tmp;
2589		2580
2590	if(save_life(op))	2581	if(save_life(op))
2591	return;	2582	return;
2592		2583
2593		2584
2594	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2585	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2595	* in cities ONLY!!! It is very important that this doesn't get abused.	2586	* in cities ONLY!!! It is very important that this doesn't get abused.
2596	* Look at op_on_battleground() for more info --AndreasV	2587	* Look at op_on_battleground() for more info --AndreasV
2597	*/	2588	*/
2598	if (op_on_battleground(op, &x, &y)) {	2589	if (op_on_battleground(op, &x, &y)) {
2599	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0,op,	2590	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0,op,
2600	"You have been defeated in combat!");	2591	"You have been defeated in combat!");
2601	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0,op,	2592	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0,op,
2602	"Local medics have saved your life...");	2593	"Local medics have saved your life...");
2603		2594
2604	/* restore player */	2595	/* restore player */
2605	at = find_archetype("poisoning");	2596	at = find_archetype("poisoning");
2606	tmp=present_arch_in_ob(at,op);	2597	tmp=present_arch_in_ob(at,op);
2607	if (tmp) {	2598	if (tmp) {
2608	remove_ob(tmp);	2599	remove_ob(tmp);
2609	free_object(tmp);	2600	free_object(tmp);
2610	new_draw_info(NDI_UNIQUE, 0,op, "Your body feels cleansed");	2601	new_draw_info(NDI_UNIQUE, 0,op, "Your body feels cleansed");
2611	}	2602	}
2612		2603
2613	at = find_archetype("confusion");	2604	at = find_archetype("confusion");
2614	tmp=present_arch_in_ob(at,op);	2605	tmp=present_arch_in_ob(at,op);
2615	if (tmp) {	2606	if (tmp) {
2616	remove_ob(tmp);	2607	remove_ob(tmp);
2617	free_object(tmp);	2608	free_object(tmp);
2618	new_draw_info(NDI_UNIQUE, 0,tmp, "Your mind feels clearer");	2609	new_draw_info(NDI_UNIQUE, 0,tmp, "Your mind feels clearer");
2619	}	2610	}
2620		2611
2621	cure_disease(op,0); /* remove any disease */	2612	cure_disease(op,0); /* remove any disease */
2622	op->stats.hp=op->stats.maxhp;	2613	op->stats.hp=op->stats.maxhp;
2623	if (op->stats.food<=0) op->stats.food=999;	2614	if (op->stats.food<=0) op->stats.food=999;
2624		2615
2625	/* create a bodypart-trophy to make the winner happy */	2616	/* create a bodypart-trophy to make the winner happy */
2626	tmp=arch_to_object(find_archetype("finger"));	2617	tmp=arch_to_object(find_archetype("finger"));
2627	if (tmp != NULL)	2618	if (tmp != NULL)
2628	{	2619	{
2629	sprintf(buf,"%s's finger",op->name);	2620	sprintf(buf,"%s's finger", &op->name);
2630	tmp->name = add_string(buf);	2621	tmp->name = buf;
2631	sprintf(buf," This finger has been cut off %s\n"	2622	sprintf(buf," This finger has been cut off %s\n"
2632	" the %s, when he was defeated at\n level %d by %s.\n",	2623	" the %s, when he was defeated at\n level %d by %s.\n",
2633	op->name, op->contr->title, (int)(op->level),	2624	&op->name, op->contr->title, (int)(op->level),
2634	op->contr->killer);	2625	op->contr->killer);
2635	tmp->msg=add_string(buf);	2626	tmp->msg=buf;
2636	tmp->value=0, tmp->material=0, tmp->type=0;	2627	tmp->value=0, tmp->material=0, tmp->type=0;
2637	tmp->materialname = NULL;	2628	tmp->materialname = NULL;
2638	tmp->x = op->x, tmp->y = op->y;	2629	tmp->x = op->x, tmp->y = op->y;
2639	insert_ob_in_map(tmp,op->map,op,0);	2630	insert_ob_in_map(tmp,op->map,op,0);
2640	}	2631	}
2641		2632
2642	/* teleport defeated player to new destination*/	2633	/* teleport defeated player to new destination*/
2643	transfer_ob(op, x, y, 0, NULL);	2634	transfer_ob(op, x, y, 0, NULL);
2644	op->contr->braced=0;	2635	op->contr->braced=0;
2645	return;	2636	return;
2646	}	2637	}
2647		2638
2648	INVOKE_PLAYER (DEATH, op->contr);	2639	INVOKE_PLAYER (DEATH, op->contr);
2649		2640
2650	command_kill_pets (op, 0);	2641	command_kill_pets (op, 0);
2651		2642
2652	if(op->stats.food<0) {	2643	if(op->stats.food<0) {
2653	if (op->contr->explore) {	2644	if (op->contr->explore) {
2654	new_draw_info(NDI_UNIQUE, 0,op,"You would have starved, but you are");	2645	new_draw_info(NDI_UNIQUE, 0,op,"You would have starved, but you are");
2655	new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so...");	2646	new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so...");
2656	op->stats.food=999;	2647	op->stats.food=999;
2657	return;	2648	return;
2658	}	2649	}
2659	sprintf(buf,"%s starved to death.",op->name);	2650	sprintf(buf,"%s starved to death.",&op->name);
2660	strcpy(op->contr->killer,"starvation");	2651	strcpy(op->contr->killer,"starvation");
2661	}	2652	}
2662	else {	2653	else {
2663	if (op->contr->explore) {	2654	if (op->contr->explore) {
2664	new_draw_info(NDI_UNIQUE, 0,op,"You would have died, but you are");	2655	new_draw_info(NDI_UNIQUE, 0,op,"You would have died, but you are");
2665	new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so...");	2656	new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so...");
2666	op->stats.hp=op->stats.maxhp;	2657	op->stats.hp=op->stats.maxhp;
2667	return;	2658	return;
2668	}	2659	}
2669	sprintf(buf,"%s died.",op->name);	2660	sprintf(buf,"%s died.", &op->name);
2670	}	2661	}
2671	play_sound_player_only(op->contr, SOUND_PLAYER_DIES,0,0);	2662	play_sound_player_only(op->contr, SOUND_PLAYER_DIES,0,0);
2672		2663
2673	/* save the map location for corpse, gravestone*/	2664	/* save the map location for corpse, gravestone*/
2674	x=op->x;y=op->y;map=op->map;	2665	x=op->x;y=op->y;map=op->map;
2675		2666
2676		2667
2677	if (settings.not_permadeth == TRUE) {	2668	if (settings.not_permadeth == TRUE) {
2678	/* NOT_PERMADEATH code. This basically brings the character back to	2669	/* NOT_PERMADEATH code. This basically brings the character back to
2679	* life if they are dead - it takes some exp and a random stat.	2670	* life if they are dead - it takes some exp and a random stat.
2680	* See the config.h file for a little more in depth detail about this.	2671	* See the config.h file for a little more in depth detail about this.
2681	*/	2672	*/
2682		2673
2683	/* Basically two ways to go - remove a stat permanently, or just	2674	/* Basically two ways to go - remove a stat permanently, or just
2684	* make it depletion. This bunch of code deals with that aspect	2675	* make it depletion. This bunch of code deals with that aspect
2685	* of death.	2676	* of death.
2686	*/	2677	*/
2687	#ifndef COZY_SERVER	2678	#ifndef COZY_SERVER
2688	if (settings.balanced_stat_loss) {	2679	if (settings.balanced_stat_loss) {
2689	/* If stat loss is permanent, lose one stat only. */	2680	/* If stat loss is permanent, lose one stat only. */
2690	/* Lower level chars don't lose as many stats because they suffer	2681	/* Lower level chars don't lose as many stats because they suffer
2691	more if they do. */	2682	more if they do. */
2692	/* Higher level characters can afford things such as potions of	2683	/* Higher level characters can afford things such as potions of
2693	restoration, or better, stat potions. So we slug them that	2684	restoration, or better, stat potions. So we slug them that
2694	little bit harder. */	2685	little bit harder. */
2695	/* GD */	2686	/* GD */
2696	if (settings.stat_loss_on_death)	2687	if (settings.stat_loss_on_death)
2697	num_stats_lose = 1;	2688	num_stats_lose = 1;
2698	else	2689	else
2699	num_stats_lose = 1 + op->level/BALSL_NUMBER_LOSSES_RATIO;	2690	num_stats_lose = 1 + op->level/BALSL_NUMBER_LOSSES_RATIO;
2700	} else {	2691	} else {
2701	num_stats_lose = 1;	2692	num_stats_lose = 1;
2702	}	2693	}
2703	lost_a_stat = 0;	2694	lost_a_stat = 0;
2704		2695
2705	for (z=0; z<num_stats_lose; z++) {	2696	for (z=0; z<num_stats_lose; z++) {
2706	i = RANDOM() % NUM_STATS;	2697	i = RANDOM() % NUM_STATS;
2707		2698
2708	if (settings.stat_loss_on_death) {	2699	if (settings.stat_loss_on_death) {
2709	/* Pick a random stat and take a point off it. Tell the player	2700	/* Pick a random stat and take a point off it. Tell the player
2710	* what he lost.	2701	* what he lost.
2711	*/	2702	*/
2712	change_attr_value(&(op->stats), i,-1);	2703	change_attr_value(&(op->stats), i,-1);
2713	check_stat_bounds(&(op->stats));	2704	check_stat_bounds(&(op->stats));
2714	change_attr_value(&(op->contr->orig_stats), i,-1);	2705	change_attr_value(&(op->contr->orig_stats), i,-1);
2715	check_stat_bounds(&(op->contr->orig_stats));	2706	check_stat_bounds(&(op->contr->orig_stats));
2716	new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]);	2707	new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]);
2717	lost_a_stat = 1;	2708	lost_a_stat = 1;
2718	} else {	2709	} else {
2719	/* deplete a stat */	2710	/* deplete a stat */
2720	archetype *deparch=find_archetype("depletion");	2711	archetype *deparch=find_archetype("depletion");
2721	object *dep;	2712	object *dep;
2722		2713
2723	dep = present_arch_in_ob(deparch,op);	2714	dep = present_arch_in_ob(deparch,op);
2724	if(!dep) {	2715	if(!dep) {
2725	dep = arch_to_object(deparch);	2716	dep = arch_to_object(deparch);
2726	insert_ob_in_ob(dep, op);	2717	insert_ob_in_ob(dep, op);
2727	}	2718	}
2728	lose_this_stat = 1;	2719	lose_this_stat = 1;
2729	if (settings.balanced_stat_loss) {	2720	if (settings.balanced_stat_loss) {
2730	/* GD */	2721	/* GD */
2731	/* Get the stat that we're about to deplete. */	2722	/* Get the stat that we're about to deplete. */
2732	this_stat = get_attr_value(&(dep->stats), i);	2723	this_stat = get_attr_value(&(dep->stats), i);
2733	if (this_stat < 0) {	2724	if (this_stat < 0) {
2734	int loss_chance = 1 + op->level/BALSL_LOSS_CHANCE_RATIO;	2725	int loss_chance = 1 + op->level/BALSL_LOSS_CHANCE_RATIO;
2735	int keep_chance = this_stat * this_stat;	2726	int keep_chance = this_stat * this_stat;
2736	/* Yes, I am paranoid. Sue me. */	2727	/* Yes, I am paranoid. Sue me. */
2737	if (keep_chance < 1)	2728	if (keep_chance < 1)
2738	keep_chance = 1;	2729	keep_chance = 1;
2739		2730
2740	/* There is a maximum depletion total per level. */	2731	/* There is a maximum depletion total per level. */
2741	if (this_stat < -1 - op->level/BALSL_MAX_LOSS_RATIO) {	2732	if (this_stat < -1 - op->level/BALSL_MAX_LOSS_RATIO) {
2742	lose_this_stat = 0;	2733	lose_this_stat = 0;
2743	/* Take loss chance vs keep chance to see if we	2734	/* Take loss chance vs keep chance to see if we
2744	retain the stat. */	2735	retain the stat. */
2745	} else {	2736	} else {
2746	if (random_roll(0, loss_chance + keep_chance-1,	2737	if (random_roll(0, loss_chance + keep_chance-1,
2747	op, PREFER_LOW) < keep_chance)	2738	op, PREFER_LOW) < keep_chance)
2748	lose_this_stat = 0;	2739	lose_this_stat = 0;
2749	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",	2740	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2750	this_stat, keep_chance, loss_chance,	2741	this_stat, keep_chance, loss_chance,
2751	lose_this_stat?"LOSE":"KEEP"); */	2742	lose_this_stat?"LOSE":"KEEP"); */
2752	}	2743	}
2753	}	2744	}
2754	}	2745	}
2755		2746
2756	if (lose_this_stat) {	2747	if (lose_this_stat) {
2757	this_stat = get_attr_value(&(dep->stats), i);	2748	this_stat = get_attr_value(&(dep->stats), i);
2758	/* We could try to do something clever like find another	2749	/* We could try to do something clever like find another
2759	* stat to reduce if this fails. But chances are, if	2750	* stat to reduce if this fails. But chances are, if
2760	* stats have been depleted to -50, all are pretty low	2751	* stats have been depleted to -50, all are pretty low
2761	* and should be roughly the same, so it shouldn't make a	2752	* and should be roughly the same, so it shouldn't make a
2762	* difference.	2753	* difference.
2763	*/	2754	*/
2764	if (this_stat>=-50) {	2755	if (this_stat>=-50) {
2765	change_attr_value(&(dep->stats), i, -1);	2756	change_attr_value(&(dep->stats), i, -1);
2766	SET_FLAG(dep, FLAG_APPLIED);	2757	SET_FLAG(dep, FLAG_APPLIED);
2767	new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]);	2758	new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]);
2768	fix_player(op);	2759	fix_player(op);
2769	lost_a_stat = 1;	2760	lost_a_stat = 1;
2770	}	2761	}
2771	}	2762	}
2772	}	2763	}
2773	}	2764	}
2774	/* If no stat lost, tell the player. */	2765	/* If no stat lost, tell the player. */
2775	if (!lost_a_stat)	2766	if (!lost_a_stat)
2776	{	2767	{
2777	/* determine_god() seems to not work sometimes... why is this?	2768	/* determine_god() seems to not work sometimes... why is this?
2778	Should I be using something else? GD */	2769	Should I be using something else? GD */
2779	const char *god = determine_god(op);	2770	const char *god = determine_god(op);
2780	if (god && (strcmp(god, "none")))	2771	if (god && (strcmp(god, "none")))
2781	new_draw_info_format(NDI_UNIQUE, 0, op, "For a brief "	2772	new_draw_info_format(NDI_UNIQUE, 0, op, "For a brief "
2782	"moment you feel the holy presence of %s protecting"	2773	"moment you feel the holy presence of %s protecting"
2783	" you.", god);	2774	" you.", god);
2784	else	2775	else
2785	new_draw_info(NDI_UNIQUE, 0, op, "For a brief moment you"	2776	new_draw_info(NDI_UNIQUE, 0, op, "For a brief moment you"
2786	" feel a holy presence protecting you.");	2777	" feel a holy presence protecting you.");
2787	}	2778	}
2788	#endif	2779	#endif
2789	new_draw_info(NDI_UNIQUE, 0, op, "For a brief moment you"	2780	new_draw_info(NDI_UNIQUE, 0, op, "For a brief moment you"
2790	" feel a holy presence protecting you from losing yourself completely.");	2781	" feel a holy presence protecting you from losing yourself completely.");
2791		2782
2792	/* Put a gravestone up where the character 'almost' died. List the	2783	/* Put a gravestone up where the character 'almost' died. List the
2793	* exp loss on the stone.	2784	* exp loss on the stone.
2794	*/	2785	*/
2795	tmp=arch_to_object(find_archetype("gravestone"));	2786	tmp=arch_to_object(find_archetype("gravestone"));
2796	sprintf(buf,"%s's gravestone",op->name);	2787	sprintf(buf,"%s's gravestone",&op->name); tmp->name = buf;
2797	FREE_AND_COPY(tmp->name, buf);	2788	sprintf(buf,"%s's gravestones",&op->name); tmp->name_pl = buf;
2798	sprintf(buf,"%s's gravestones",op->name);
2799	FREE_AND_COPY(tmp->name_pl, buf);
2800	sprintf(buf,"RIP\nHere rests the hero %s the %s,\n"	2789	sprintf(buf,"RIP\nHere rests the hero %s the %s,\n"
2801	"who was killed\n"	2790	"who was killed\n"
2802	"by %s.\n",	2791	"by %s.\n",
2803	op->name, op->contr->title,	2792	&op->name, op->contr->title,
2804	op->contr->killer);	2793	op->contr->killer);
2805	tmp->msg = add_string(buf);	2794	tmp->msg = buf;
2806	tmp->x=op->x,tmp->y=op->y;	2795	tmp->x=op->x,tmp->y=op->y;
2807	insert_ob_in_map (tmp, op->map, NULL,0);	2796	insert_ob_in_map (tmp, op->map, NULL,0);
2808		2797
2809	/**************************************/	2798	/**************************************/
2810	/* */	2799	/* */
2811	/* Subtract the experience points, */	2800	/* Subtract the experience points, */
2812	/* if we died cause of food, give us */	2801	/* if we died cause of food, give us */
2813	/* food, and reset HP's... */	2802	/* food, and reset HP's... */
2814	/* */	2803	/* */
2815	/**************************************/	2804	/**************************************/
2816		2805
2817	/* remove any poisoning and confusion the character may be suffering.*/	2806	/* remove any poisoning and confusion the character may be suffering.*/
2818	/* restore player */	2807	/* restore player */
2819	at = find_archetype("poisoning");	2808	at = find_archetype("poisoning");
2820	tmp=present_arch_in_ob(at,op);	2809	tmp=present_arch_in_ob(at,op);
2821	if (tmp) {	2810	if (tmp) {
2822	remove_ob(tmp);	2811	remove_ob(tmp);
2823	free_object(tmp);	2812	free_object(tmp);
2824	new_draw_info(NDI_UNIQUE, 0,op, "Your body feels cleansed");	2813	new_draw_info(NDI_UNIQUE, 0,op, "Your body feels cleansed");
2825	}	2814	}
2826		2815
2827	at = find_archetype("confusion");	2816	at = find_archetype("confusion");
2828	tmp=present_arch_in_ob(at,op);	2817	tmp=present_arch_in_ob(at,op);
2829	if (tmp) {	2818	if (tmp) {
2830	remove_ob(tmp);	2819	remove_ob(tmp);
2831	free_object(tmp);	2820	free_object(tmp);
2832	new_draw_info(NDI_UNIQUE, 0,tmp, "Your mind feels clearer");	2821	new_draw_info(NDI_UNIQUE, 0,tmp, "Your mind feels clearer");
2833	}	2822	}
2834	cure_disease(op,0); /* remove any disease */	2823	cure_disease(op,0); /* remove any disease */
2835		2824
2836	/*add_exp(op, (op->stats.exp * -0.20)); */	2825	/*add_exp(op, (op->stats.exp * -0.20)); */
2837	apply_death_exp_penalty(op);	2826	apply_death_exp_penalty(op);
2838	if(op->stats.food < 100) op->stats.food = 900;	2827	if(op->stats.food < 100) op->stats.food = 900;
2839	op->stats.hp = op->stats.maxhp;	2828	op->stats.hp = op->stats.maxhp;
2840	op->stats.sp = MAX(op->stats.sp, op->stats.maxsp);	2829	op->stats.sp = MAX(op->stats.sp, op->stats.maxsp);
2841	op->stats.grace = MAX(op->stats.grace, op->stats.maxgrace);	2830	op->stats.grace = MAX(op->stats.grace, op->stats.maxgrace);
2842		2831
2843	/*	2832	/*
2844	* Check to see if the player is in a shop. IF so, then check to see if	2833	* Check to see if the player is in a shop. IF so, then check to see if
2845	* the player has any unpaid items. If so, remove them and put them back	2834	* the player has any unpaid items. If so, remove them and put them back
2846	* in the map.	2835	* in the map.
2847	*/	2836	*/
2848		2837
		2838	if (is_in_shop (op))
		2839	remove_unpaid_objects(op->inv, op);
		2840
		2841	/****************************************/
		2842	/* */
		2843	/* Move player to his current respawn- */
		2844	/* position (usually last savebed) */
		2845	/* */
		2846	/****************************************/
		2847
		2848	enter_player_savebed(op);
		2849
		2850	/* Save the player before inserting the force to reduce
		2851	* chance of abuse.
		2852	*/
		2853	op->contr->braced=0;
		2854	save_player(op,1);
		2855
		2856	/* it is possible that the player has blown something up
		2857	* at his savebed location, and that can have long lasting
		2858	* spell effects. So first see if there is a spell effect
		2859	* on the space that might harm the player.
		2860	*/
		2861	will_kill_again=0;
2849	for (tmp= get_map_ob(op->map, op->x, op->y); tmp; tmp=tmp->above) {	2862	for (tmp= get_map_ob(op->map, op->x, op->y); tmp; tmp=tmp->above) {
2850	if (tmp->type == SHOP_FLOOR) {
2851	remove_unpaid_objects(op->inv, op);
2852	break;
2853	}
2854	}
2855
2856
2857	/****************************************/
2858	/* */
2859	/* Move player to his current respawn- */
2860	/* position (usually last savebed) */
2861	/* */
2862	/****************************************/
2863
2864	enter_player_savebed(op);
2865
2866	/* Save the player before inserting the force to reduce
2867	* chance of abuse.
2868	*/
2869	op->contr->braced=0;
2870	save_player(op,1);
2871
2872	/* it is possible that the player has blown something up
2873	* at his savebed location, and that can have long lasting
2874	* spell effects. So first see if there is a spell effect
2875	* on the space that might harm the player.
2876	*/
2877	will_kill_again=0;
2878	for (tmp= get_map_ob(op->map, op->x, op->y); tmp; tmp=tmp->above) {
2879	if (tmp->type ==SPELL_EFFECT)	2863	if (tmp->type ==SPELL_EFFECT)
2880	will_kill_again|=tmp->attacktype;	2864	will_kill_again|=tmp->attacktype;
2881	}	2865	}
2882	if (will_kill_again) {	2866	if (will_kill_again) {
2883	object *force;	2867	object *force;
2884	int at;	2868	int at;
2885		2869
2886	force=get_archetype(FORCE_NAME);	2870	force=get_archetype(FORCE_NAME);
2887	/* 50 ticks should be enough time for the spell to abate */	2871	/* 50 ticks should be enough time for the spell to abate */
2888	force->speed=0.1;	2872	force->speed=0.1;
2889	force->speed_left=-5.0;	2873	force->speed_left=-5.0;
2890	SET_FLAG(force, FLAG_APPLIED);	2874	SET_FLAG(force, FLAG_APPLIED);
2891	for (at=0; at<NROFATTACKS; at++) {	2875	for (at=0; at<NROFATTACKS; at++) {
2892	if (will_kill_again & (1 << at))	2876	if (will_kill_again & (1 << at))
2893	force->resist[at] = 100;	2877	force->resist[at] = 100;
2894	}	2878	}
2895	insert_ob_in_ob(force, op);	2879	insert_ob_in_ob(force, op);
2896	fix_player(op);	2880	fix_player(op);
2897		2881
2898	}	2882	}
2899	/**************************************/	2883	/**************************************/
2900	/* */	2884	/* */
2901	/* Repaint the characters inv, and */	2885	/* Repaint the characters inv, and */
2902	/* stats, and show a nasty message ;) */	2886	/* stats, and show a nasty message ;) */
2903	/* */	2887	/* */
2904	/**************************************/	2888	/**************************************/
2905		2889
2906	new_draw_info(NDI_UNIQUE, 0,op,"YOU HAVE DIED.");	2890	new_draw_info(NDI_UNIQUE, 0,op,"YOU HAVE DIED.");
2907	return;	2891	return;
2908	} /* NOT_PERMADETH */	2892	} /* NOT_PERMADETH */
2909	else {	2893	else {
2910	/* If NOT_PERMADETH is set, then the rest of this is not reachable. This	2894	/* If NOT_PERMADETH is set, then the rest of this is not reachable. This
2911	* should probably be embedded in an else statement.	2895	* should probably be embedded in an else statement.
2912	*/	2896	*/
2913		2897
2914	op->contr->party=NULL;	2898	op->contr->party=NULL;
2915	if (settings.set_title == TRUE)	2899	if (settings.set_title == TRUE)
2916	op->contr->own_title[0]='\0';	2900	op->contr->own_title[0]='\0';
2917	new_draw_info(NDI_UNIQUE|NDI_ALL, 0,NULL, buf);	2901	new_draw_info(NDI_UNIQUE|NDI_ALL, 0,NULL, buf);
2918	check_score(op);	2902	check_score(op);
2919	if(op->contr->ranges[range_golem]!=NULL) {	2903	if(op->contr->ranges[range_golem]!=NULL) {
2920	remove_friendly_object(op->contr->ranges[range_golem]);	2904	remove_friendly_object(op->contr->ranges[range_golem]);
2921	remove_ob(op->contr->ranges[range_golem]);	2905	remove_ob(op->contr->ranges[range_golem]);
2922	free_object(op->contr->ranges[range_golem]);	2906	free_object(op->contr->ranges[range_golem]);
2923	op->contr->ranges[range_golem]=NULL;	2907	op->contr->ranges[range_golem]=NULL;
2924	op->contr->golem_count=0;	2908	op->contr->golem_count=0;
2925	}	2909	}
2926	loot_object(op); /* Remove some of the items for good */	2910	loot_object(op); /* Remove some of the items for good */
2927	remove_ob(op);	2911	remove_ob(op);
2928	op->direction=0;	2912	op->direction=0;
2929		2913
2930	if(!QUERY_FLAG(op,FLAG_WAS_WIZ)&&op->stats.exp) {	2914	if(!QUERY_FLAG(op,FLAG_WAS_WIZ)&&op->stats.exp) {
2931	delete_character(op->name,0);	2915	delete_character(op->name,0);
2932	if (settings.resurrection == TRUE) {	2916	if (settings.resurrection == TRUE) {
2933	/* save playerfile sans equipment when player dies	2917	/* save playerfile sans equipment when player dies
2934	** then save it as player.pl.dead so that future resurrection	2918	** then save it as player.pl.dead so that future resurrection
2935	** type spells will work on them nicely	2919	** type spells will work on them nicely
2936	*/	2920	*/
2937	delete_character(op->name,0);	2921	delete_character(op->name,0);
2938	op->stats.hp = op->stats.maxhp;	2922	op->stats.hp = op->stats.maxhp;
2939	op->stats.food = 999;	2923	op->stats.food = 999;
2940		2924
2941	/* set the location of where the person will reappear when */	2925	/* set the location of where the person will reappear when */
2942	/* maybe resurrection code should fix map also */	2926	/* maybe resurrection code should fix map also */
2943	strcpy(op->contr->maplevel, settings.emergency_mapname);	2927	strcpy(op->contr->maplevel, settings.emergency_mapname);
2944	if(op->map!=NULL)	2928	if(op->map!=NULL)
2945	op->map = NULL;	2929	op->map = NULL;
2946	op->x = settings.emergency_x;	2930	op->x = settings.emergency_x;
2947	op->y = settings.emergency_y;	2931	op->y = settings.emergency_y;
2948	save_player(op,0);	2932	save_player(op,0);
2949	op->map = map;	2933	op->map = map;
2950	/* please see resurrection.c: peterm */	2934	/* please see resurrection.c: peterm */
2951	dead_player(op);	2935	dead_player(op);
2952	} else {	2936	} else {
2953	delete_character(op->name,1);	2937	delete_character(op->name,1);
2954	}	2938	}
2955	}	2939	}
2956	play_again(op);	2940	play_again(op);
2957		2941
2958	/* peterm: added to create a corpse at deathsite. */	2942	/* peterm: added to create a corpse at deathsite. */
2959	tmp=arch_to_object(find_archetype("corpse_pl"));	2943	tmp=arch_to_object(find_archetype("corpse_pl"));
2960	sprintf(buf,"%s", op->name);	2944	sprintf(buf,"%s", &op->name);
2961	FREE_AND_COPY(tmp->name, buf);	2945	tmp->name = tmp->name_pl = buf;
2962	FREE_AND_COPY(tmp->name_pl, buf);
2963	tmp->level=op->level;	2946	tmp->level=op->level;
2964	tmp->x=x;tmp->y=y;	2947	tmp->x=x;tmp->y=y;
2965	if (tmp->msg)	2948	tmp->msg = gravestone_text(op);
2966	free_string(tmp->msg);
2967	tmp->msg = add_string (gravestone_text(op));
2968	SET_FLAG (tmp, FLAG_UNIQUE);	2949	SET_FLAG (tmp, FLAG_UNIQUE);
2969	insert_ob_in_map (tmp, map, NULL,0);	2950	insert_ob_in_map (tmp, map, NULL,0);
2970	}	2951	}
2971	}	2952	}
2972		2953
2973		2954
2974	void loot_object(object *op) { /* Grab and destroy some treasure */	2955	void loot_object(object *op) { /* Grab and destroy some treasure */
…		…
2982	next=tmp->below;	2963	next=tmp->below;
2983	if (tmp->type==EXPERIENCE || tmp->invisible) continue;	2964	if (tmp->type==EXPERIENCE || tmp->invisible) continue;
2984	remove_ob(tmp);	2965	remove_ob(tmp);
2985	tmp->x=op->x,tmp->y=op->y;	2966	tmp->x=op->x,tmp->y=op->y;
2986	if (tmp->type == CONTAINER) { /* empty container to ground */	2967	if (tmp->type == CONTAINER) { /* empty container to ground */
2987	loot_object(tmp);	2968	loot_object(tmp);
2988	}	2969	}
2989	if(!QUERY_FLAG(tmp, FLAG_UNIQUE) && (QUERY_FLAG(tmp, FLAG_STARTEQUIP)	2970	if(!QUERY_FLAG(tmp, FLAG_UNIQUE) && (QUERY_FLAG(tmp, FLAG_STARTEQUIP)
2990	|| QUERY_FLAG(tmp,FLAG_NO_DROP) || !(RANDOM()%3))) {	2971	|| QUERY_FLAG(tmp,FLAG_NO_DROP) || !(RANDOM()%3))) {
2991	if(tmp->nrof>1) {	2972	if(tmp->nrof>1) {
2992	tmp2=get_split_ob(tmp,1+RANDOM()%(tmp->nrof-1));	2973	tmp2=get_split_ob(tmp,1+RANDOM()%(tmp->nrof-1));
2993	free_object(tmp2);	2974	free_object(tmp2);
2994	insert_ob_in_map(tmp,op->map,NULL,0);	2975	insert_ob_in_map(tmp,op->map,NULL,0);
2995	} else	2976	} else
2996	free_object(tmp);	2977	free_object(tmp);
2997	} else	2978	} else
2998	insert_ob_in_map(tmp,op->map,NULL,0);	2979	insert_ob_in_map(tmp,op->map,NULL,0);
2999	}	2980	}
3000	}	2981	}
3001		2982
…		…
3011	int old = pl->ob->carrying, sum = sum_weight(pl->ob);	2992	int old = pl->ob->carrying, sum = sum_weight(pl->ob);
3012	if(old == sum)	2993	if(old == sum)
3013	continue;	2994	continue;
3014	fix_player(pl->ob);	2995	fix_player(pl->ob);
3015	LOG(llevDebug,"Fixed inventory in %s (%d -> %d)\n",	2996	LOG(llevDebug,"Fixed inventory in %s (%d -> %d)\n",
3016	pl->ob->name, old, sum);	2997	&pl->ob->name, old, sum);
3017	}	2998	}
3018	}	2999	}
3019		3000
3020	void fix_luck(void) {	3001	void fix_luck(void) {
3021	player *pl;	3002	player *pl;
…		…
3039		3020
3040	/* casting POTION 'dusts' is really a use_magic_item skill */	3021	/* casting POTION 'dusts' is really a use_magic_item skill */
3041	if (op->type == PLAYER && throw_ob->type == POTION && !skop)	3022	if (op->type == PLAYER && throw_ob->type == POTION && !skop)
3042	{	3023	{
3043	LOG (llevError, "Player %s lacks critical skill use_magic_item!\n",	3024	LOG (llevError, "Player %s lacks critical skill use_magic_item!\n",
3044	op->name);	3025	&op->name);
3045	return;	3026	return;
3046	}	3027	}
3047		3028
3048	spob = throw_ob->inv;	3029	spob = throw_ob->inv;
3049		3030
…		…
3051	// not pass NULL to cast_spell (which did indeed check itself, but	3032	// not pass NULL to cast_spell (which did indeed check itself, but
3052	// errors should be reported as early as possible IMHO)	3033	// errors should be reported as early as possible IMHO)
3053	if (!spob)	3034	if (!spob)
3054	{	3035	{
3055	LOG (llevError, "cast_dust: thrown object %s (by %s) had no spell in it!",	3036	LOG (llevError, "cast_dust: thrown object %s (by %s) had no spell in it!",
3056	throw_ob->name, op->name);	3037	&throw_ob->name, &op->name);
3057	return;	3038	return;
3058	}	3039	}
3059		3040
3060	if (op->type == PLAYER)	3041	if (op->type == PLAYER)
3061	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", spob->name);	3042	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3062		3043
3063	cast_spell (op, throw_ob, dir, spob, NULL);	3044	cast_spell (op, throw_ob, dir, spob, NULL);
3064		3045
3065	if (!QUERY_FLAG (throw_ob, FLAG_REMOVED))	3046	if (!QUERY_FLAG (throw_ob, FLAG_REMOVED))
3066	remove_ob (throw_ob);	3047	remove_ob (throw_ob);
…		…
3069		3050
3070	void make_visible (object *op) {	3051	void make_visible (object *op) {
3071	op->hide = 0;	3052	op->hide = 0;
3072	op->invisible = 0;	3053	op->invisible = 0;
3073	if(op->type==PLAYER) {	3054	if(op->type==PLAYER) {
3074	op->contr->tmp_invis = 0;	3055	op->contr->tmp_invis = 0;
3075	if (op->contr->invis_race) FREE_AND_CLEAR_STR(op->contr->invis_race);	3056	op->contr->invis_race = 0;
3076	}	3057	}
3077	update_object(op,UP_OBJ_FACE);	3058	update_object(op,UP_OBJ_FACE);
3078	}	3059	}
3079		3060
3080	int is_true_undead(object *op) {	3061	int is_true_undead(object *op) {
…		…
3083	if(QUERY_FLAG(&op->arch->clone,FLAG_UNDEAD)) return 1;	3064	if(QUERY_FLAG(&op->arch->clone,FLAG_UNDEAD)) return 1;
3084		3065
3085	if(op->type==PLAYER)	3066	if(op->type==PLAYER)
3086	for(tmp=op->inv;tmp;tmp=tmp->below)	3067	for(tmp=op->inv;tmp;tmp=tmp->below)
3087	if(tmp->type==EXPERIENCE && tmp->stats.Wis)	3068	if(tmp->type==EXPERIENCE && tmp->stats.Wis)
3088	if(QUERY_FLAG(tmp,FLAG_UNDEAD)) return 1;	3069	if(QUERY_FLAG(tmp,FLAG_UNDEAD)) return 1;
3089	return 0;	3070	return 0;
3090	}	3071	}
3091		3072
3092	/* look at the surrounding terrain to determine	3073	/* look at the surrounding terrain to determine
3093	* the hideability of this object. Positive levels	3074	* the hideability of this object. Positive levels
…		…
3108	* as bad as carrying a light on a pitch dark map */	3089	* as bad as carrying a light on a pitch dark map */
3109	if(has_carried_lights(ob)) level =- (10 + (2*ob->map->darkness));	3090	if(has_carried_lights(ob)) level =- (10 + (2*ob->map->darkness));
3110		3091
3111	/* scan through all nearby squares for terrain to hide in */	3092	/* scan through all nearby squares for terrain to hide in */
3112	for(i=0,x=ob->x,y=ob->y;i<9;i++,x=ob->x+freearr_x[i],y=ob->y+freearr_y[i]) {	3093	for(i=0,x=ob->x,y=ob->y;i<9;i++,x=ob->x+freearr_x[i],y=ob->y+freearr_y[i]) {
3113	mflag = get_map_flags(ob->map, NULL, x, y, NULL, NULL);	3094	mflag = get_map_flags(ob->map, NULL, x, y, NULL, NULL);
3114	if (mflag & P_OUT_OF_MAP) { continue; }	3095	if (mflag & P_OUT_OF_MAP) { continue; }
3115	if(mflag & P_BLOCKSVIEW) /* something to hide near! */	3096	if(mflag & P_BLOCKSVIEW) /* something to hide near! */
3116	level += 2;	3097	level += 2;
3117	else /* open terrain! */	3098	else /* open terrain! */
3118	level -= 1;	3099	level -= 1;
3119	}	3100	}
3120		3101
3121	#if 0	3102	#if 0
3122	LOG(llevDebug,"hideability of %s is %d\n",ob->name,level);	3103	LOG(llevDebug,"hideability of %s is %d\n",ob->name,level);
3123	#endif	3104	#endif
…		…
3138		3119
3139	skop = find_obj_by_type_subtype(op, SKILL, SK_HIDING);	3120	skop = find_obj_by_type_subtype(op, SKILL, SK_HIDING);
3140		3121
3141	/* its *extremely* hard to run and sneak/hide at the same time! */	3122	/* its *extremely* hard to run and sneak/hide at the same time! */
3142	if(op->type==PLAYER && op->contr->run_on) {	3123	if(op->type==PLAYER && op->contr->run_on) {
3143	if(!skop || num >= skop->level) {	3124	if(!skop || num >= skop->level) {
3144	new_draw_info(NDI_UNIQUE,0,op,"You ran too much! You are no longer hidden!");	3125	new_draw_info(NDI_UNIQUE,0,op,"You ran too much! You are no longer hidden!");
3145	make_visible(op);	3126	make_visible(op);
3146	return;	3127	return;
3147	} else num += 20;	3128	} else num += 20;
3148	}	3129	}
3149	num += op->map->difficulty;	3130	num += op->map->difficulty;
3150	hide = hideability(op); /* modify by terrain hidden level */	3131	hide = hideability(op); /* modify by terrain hidden level */
3151	num -= hide;	3132	num -= hide;
3152	if((op->type==PLAYER && hide<-10) || ((op->invisible-=num)<=0)) {	3133	if((op->type==PLAYER && hide<-10) || ((op->invisible-=num)<=0)) {
3153	make_visible(op);	3134	make_visible(op);
3154	if(op->type==PLAYER) new_draw_info(NDI_UNIQUE, 0,op,	3135	if(op->type==PLAYER) new_draw_info(NDI_UNIQUE, 0,op,
3155	"You moved out of hiding! You are visible!");	3136	"You moved out of hiding! You are visible!");
3156	}	3137	}
3157	else if (op->type == PLAYER && skop) {	3138	else if (op->type == PLAYER && skop) {
3158	change_exp(op, calc_skill_exp(op, NULL, skop), skop->skill, 0);	3139	change_exp(op, calc_skill_exp(op, NULL, skop), skop->skill, 0);
3159	}	3140	}
3160	}	3141	}
3161		3142
3162	/* determine if who is standing near a hostile creature. */	3143	/* determine if who is standing near a hostile creature. */
3163		3144
…		…
3172	if(who->type==PLAYER) player=1;	3153	if(who->type==PLAYER) player=1;
3173	else friendly = QUERY_FLAG(who,FLAG_FRIENDLY);	3154	else friendly = QUERY_FLAG(who,FLAG_FRIENDLY);
3174		3155
3175	/* search adjacent squares */	3156	/* search adjacent squares */
3176	for(i=1;i<9;i++) {	3157	for(i=1;i<9;i++) {
3177	x = who->x+freearr_x[i];	3158	x = who->x+freearr_x[i];
3178	y = who->y+freearr_y[i];	3159	y = who->y+freearr_y[i];
3179	m = who->map;	3160	m = who->map;
3180	mflags = get_map_flags(m, &m, x, y, &x, &y);	3161	mflags = get_map_flags(m, &m, x, y, &x, &y);
3181	/* space must be blocked if there is a monster. If not	3162	/* space must be blocked if there is a monster. If not
3182	* blocked, don't need to check this space.	3163	* blocked, don't need to check this space.
3183	*/	3164	*/
3184	if (mflags & P_OUT_OF_MAP) continue;	3165	if (mflags & P_OUT_OF_MAP) continue;
3185	if (OB_TYPE_MOVE_BLOCK(who, GET_MAP_MOVE_BLOCK(m, x, y))) continue;	3166	if (OB_TYPE_MOVE_BLOCK(who, GET_MAP_MOVE_BLOCK(m, x, y))) continue;
3186		3167
3187	for(tmp=get_map_ob(m,x,y);tmp;tmp=tmp->above) {	3168	for(tmp=get_map_ob(m,x,y);tmp;tmp=tmp->above) {
3188	if((player||friendly)	3169	if((player||friendly)
3189	&&QUERY_FLAG(tmp,FLAG_MONSTER)&&!QUERY_FLAG(tmp,FLAG_UNAGGRESSIVE))	3170	&&QUERY_FLAG(tmp,FLAG_MONSTER)&&!QUERY_FLAG(tmp,FLAG_UNAGGRESSIVE))
3190	return 1;	3171	return 1;
3191	else if(tmp->type==PLAYER)	3172	else if(tmp->type==PLAYER)
3192	{	3173	{
3193	/*don't let a hidden DM prevent you from hiding*/	3174	/*don't let a hidden DM prevent you from hiding*/
3194	if(!QUERY_FLAG(tmp, FLAG_WIZ) || tmp->contr->hidden == 0)	3175	if(!QUERY_FLAG(tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3195	return 1;	3176	return 1;
3196	}	3177	}
3197	}	3178	}
3198	}	3179	}
3199	return 0;	3180	return 0;
3200	}	3181	}
3201		3182
3202	/* check the player los field for viewability of the	3183	/* check the player los field for viewability of the
…		…
3216	int player_can_view (object *pl,object *op) {	3197	int player_can_view (object *pl,object *op) {
3217	rv_vector rv;	3198	rv_vector rv;
3218	int dx,dy;	3199	int dx,dy;
3219		3200
3220	if(pl->type!=PLAYER) {	3201	if(pl->type!=PLAYER) {
3221	LOG(llevError,"player_can_view() called for non-player object\n");	3202	LOG(llevError,"player_can_view() called for non-player object\n");
3222	return -1;	3203	return -1;
3223	}	3204	}
3224	if (!pl || !op) return 0;	3205	if (!pl || !op) return 0;
3225		3206
3226	if(op->head) { op = op->head; }	3207	if(op->head) { op = op->head; }
3227	get_rangevector(pl, op, &rv, 0x1);	3208	get_rangevector(pl, op, &rv, 0x1);
…		…
3231	* part that is in the los array but isnt on	3212	* part that is in the los array but isnt on
3232	* a blocked los square.	3213	* a blocked los square.
3233	* we use the archetype to figure out offsets.	3214	* we use the archetype to figure out offsets.
3234	*/	3215	*/
3235	while(op) {	3216	while(op) {
3236	dx = rv.distance_x + op->arch->clone.x;	3217	dx = rv.distance_x + op->arch->clone.x;
3237	dy = rv.distance_y + op->arch->clone.y;	3218	dy = rv.distance_y + op->arch->clone.y;
3238		3219
3239	/* only the viewable area the player sees is updated by LOS	3220	/* only the viewable area the player sees is updated by LOS
3240	* code, so we need to restrict ourselves to that range of values	3221	* code, so we need to restrict ourselves to that range of values
3241	* for any meaningful values.	3222	* for any meaningful values.
3242	*/	3223	*/
3243	if (FABS(dx) <= (pl->contr->socket.mapx/2) &&	3224	if (FABS(dx) <= (pl->contr->socket.mapx/2) &&
3244	FABS(dy) <= (pl->contr->socket.mapy/2) &&	3225	FABS(dy) <= (pl->contr->socket.mapy/2) &&
3245	!pl->contr->blocked_los[dx + (pl->contr->socket.mapx/2)][dy+(pl->contr->socket.mapy/2)] )	3226	!pl->contr->blocked_los[dx + (pl->contr->socket.mapx/2)][dy+(pl->contr->socket.mapy/2)] )
3246	return 1;	3227	return 1;
3247	op = op->more;	3228	op = op->more;
3248	}	3229	}
3249	return 0;	3230	return 0;
3250	}	3231	}
3251		3232
3252	/* routine for both players and monsters. We call this when	3233	/* routine for both players and monsters. We call this when
…		…
3256	* return 0.	3237	* return 0.
3257	*/	3238	*/
3258	int action_makes_visible (object *op) {	3239	int action_makes_visible (object *op) {
3259		3240
3260	if(op->invisible && QUERY_FLAG(op,FLAG_ALIVE)) {	3241	if(op->invisible && QUERY_FLAG(op,FLAG_ALIVE)) {
3261	if(QUERY_FLAG(op,FLAG_MAKE_INVIS))	3242	if(QUERY_FLAG(op,FLAG_MAKE_INVIS))
3262	return 0;	3243	return 0;
3263		3244
3264	if (op->contr && op->contr->tmp_invis == 0) return 0;	3245	if (op->contr && op->contr->tmp_invis == 0) return 0;
3265		3246
3266	/* If monsters, they should become visible */	3247	/* If monsters, they should become visible */
3267	if(op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) {	3248	if(op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) {
3268	new_draw_info_format(NDI_UNIQUE, 0,op,"You become %s!",op->hide?"unhidden":"visible");	3249	new_draw_info_format(NDI_UNIQUE, 0,op,"You become %s!",op->hide?"unhidden":"visible");
3269	return 1;	3250	return 1;
3270	}	3251	}
3271	}	3252	}
3272	return 0;	3253	return 0;
3273	}	3254	}
3274		3255
3275	/* op_on_battleground - checks if the given object op (usually	3256	/* op_on_battleground - checks if the given object op (usually
…		…
3290	* => The intention here is to prevent abuse of the battleground-	3271	* => The intention here is to prevent abuse of the battleground-
3291	* feature (like pickable or hidden battleground tiles). */	3272	* feature (like pickable or hidden battleground tiles). */
3292	for (tmp=op->below; tmp!=NULL; tmp=tmp->below) {	3273	for (tmp=op->below; tmp!=NULL; tmp=tmp->below) {
3293	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) {	3274	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) {
3294	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3275	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&
3295	strcmp(tmp->name, "battleground")==0 &&	3276	strcmp(tmp->name, "battleground")==0 &&
3296	tmp->type == BATTLEGROUND && EXIT_X(tmp) && EXIT_Y(tmp)) {	3277	tmp->type == BATTLEGROUND && EXIT_X(tmp) && EXIT_Y(tmp)) {
3297	/*before we assign the exit, check if this is a teambattle*/	3278	/*before we assign the exit, check if this is a teambattle*/
3298	if ( EXIT_ALT_X(tmp) && EXIT_ALT_Y(tmp) && EXIT_PATH(tmp) ){	3279	if ( EXIT_ALT_X(tmp) && EXIT_ALT_Y(tmp) && EXIT_PATH(tmp) ){
3299	object *invtmp;	3280	object *invtmp;
3300	for(invtmp=op->inv; invtmp != NULL; invtmp=invtmp->below) {	3281	for(invtmp=op->inv; invtmp != NULL; invtmp=invtmp->below) {
3301	if(invtmp->type==FORCE && invtmp->slaying &&	3282	if(invtmp->type==FORCE && invtmp->slaying &&
3302	!strcmp(EXIT_PATH(tmp), invtmp->slaying)){	3283	!strcmp(EXIT_PATH(tmp), invtmp->slaying)){
		3284	if (x != NULL && y != NULL)
		3285	*x=EXIT_ALT_X(tmp), *y=EXIT_ALT_Y(tmp);
		3286	return 1;
		3287	}
		3288	}
		3289	}
3303	if (x != NULL && y != NULL)	3290	if (x != NULL && y != NULL)
3304	*x=EXIT_ALT_X(tmp), *y=EXIT_ALT_Y(tmp);	3291	*x=EXIT_X(tmp), *y=EXIT_Y(tmp);
3305	return 1;	3292	return 1;
3306	}
3307	}
3308	}
3309	if (x != NULL && y != NULL)
3310	*x=EXIT_X(tmp), *y=EXIT_Y(tmp);
3311	return 1;
3312	}	3293	}
3313	}	3294	}
3314	}	3295	}
3315	/* If we got here, did not find a battleground */	3296	/* If we got here, did not find a battleground */
3316	return 0;	3297	return 0;
…		…
3333	char buf[MAX_BUF]; /* tmp. string buffer */	3314	char buf[MAX_BUF]; /* tmp. string buffer */
3334	int i=0, j=0;	3315	int i=0, j=0;
3335		3316
3336	/* get the appropriate treasurelist */	3317	/* get the appropriate treasurelist */
3337	if (atnr == ATNR_FIRE)	3318	if (atnr == ATNR_FIRE)
3338	trlist = find_treasurelist("dragon_ability_fire");	3319	trlist = find_treasurelist("dragon_ability_fire");
3339	else if (atnr == ATNR_COLD)	3320	else if (atnr == ATNR_COLD)
3340	trlist = find_treasurelist("dragon_ability_cold");	3321	trlist = find_treasurelist("dragon_ability_cold");
3341	else if (atnr == ATNR_ELECTRICITY)	3322	else if (atnr == ATNR_ELECTRICITY)
3342	trlist = find_treasurelist("dragon_ability_elec");	3323	trlist = find_treasurelist("dragon_ability_elec");
3343	else if (atnr == ATNR_POISON)	3324	else if (atnr == ATNR_POISON)
3344	trlist = find_treasurelist("dragon_ability_poison");	3325	trlist = find_treasurelist("dragon_ability_poison");
3345		3326
3346	if (trlist == NULL || who->type != PLAYER)	3327	if (trlist == NULL || who->type != PLAYER)
3347	return;	3328	return;
3348		3329
3349	for (i=0, tr = trlist->items; tr != NULL && i<level-1;	3330	for (i=0, tr = trlist->items; tr != NULL && i<level-1;
3350	tr = tr->next, i++);	3331	tr = tr->next, i++);
3351		3332
3352	if (tr == NULL || tr->item == NULL) {	3333	if (tr == NULL || tr->item == NULL) {
3353	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3334	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3354	return;	3335	return;
3355	}	3336	}
3356		3337
3357	/* everything seems okay - now bring on the gift: */	3338	/* everything seems okay - now bring on the gift: */
3358	item = &(tr->item->clone);	3339	item = &(tr->item->clone);
3359		3340
3360	if (item->type == SPELL) {	3341	if (item->type == SPELL) {
3361	if (check_spell_known (who, item->name))	3342	if (check_spell_known (who, item->name))
3362	return;	3343	return;
3363		3344
3364	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", item->name);	3345	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", &item->name);
3365	do_learn_spell (who, item, 0);	3346	do_learn_spell (who, item, 0);
3366	return;	3347	return;
3367	}	3348	}
3368		3349
3369	/* grant direct spell */	3350	/* grant direct spell */
3370	if (item->type == SPELLBOOK) {	3351	if (item->type == SPELLBOOK) {
3371	if (!item->inv) {	3352	if (!item->inv) {
3372	LOG(llevDebug,"dragon_ability_gain: Broken spellbook %s\n",	3353	LOG(llevDebug,"dragon_ability_gain: Broken spellbook %s\n", &item->name);
3373	item->name);	3354	return;
3374	return;	3355	}
3375	}
3376	if (check_spell_known (who, item->inv->name))	3356	if (check_spell_known (who, item->inv->name))
3377	return;	3357	return;
3378	if (item->invisible) {	3358	if (item->invisible) {
3379	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", item->inv->name);	3359	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", &item->inv->name);
3380	do_learn_spell (who, item->inv, 0);	3360	do_learn_spell (who, item->inv, 0);
3381	return;	3361	return;
3382	}	3362	}
3383	}	3363	}
3384	else if (item->type == SKILL_TOOL && item->invisible) {	3364	else if (item->type == SKILL_TOOL && item->invisible) {
3385	if (item->subtype == SK_CLAWING && (skop=find_skill_by_name(who, item->skill))!=NULL) {	3365	if (item->subtype == SK_CLAWING && (skop=find_skill_by_name(who, item->skill))!=NULL) {
3386		3366
3387	/* should this perhaps be (skop->attackyp & item->attacktype)!=item->attacktype ...	3367	/* should this perhaps be (skop->attackyp & item->attacktype)!=item->attacktype ...
3388	* in this way, if the player is missing any of the attacktypes, he gets	3368	* in this way, if the player is missing any of the attacktypes, he gets
3389	* them. As it is now, if the player has any that match the granted skill,	3369	* them. As it is now, if the player has any that match the granted skill,
3390	* but not all of them, he gets nothing.	3370	* but not all of them, he gets nothing.
3391	*/	3371	*/
3392	if (!(skop->attacktype & item->attacktype)) {	3372	if (!(skop->attacktype & item->attacktype)) {
3393	/* Give new attacktype */	3373	/* Give new attacktype */
3394	skop->attacktype |= item->attacktype;	3374	skop->attacktype |= item->attacktype;
3395		3375
3396	/* always add physical if there's none */	3376	/* always add physical if there's none */
3397	skop->attacktype |= AT_PHYSICAL;	3377	skop->attacktype |= AT_PHYSICAL;
3398		3378
3399	if (item->msg != NULL)	3379	if (item->msg != NULL)
3400	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, item->msg);	3380	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, item->msg);
3401		3381
3402	/* Give player new face */	3382	/* Give player new face */
3403	if (item->animation_id) {	3383	if (item->animation_id) {
3404	who->face = skop->face;	3384	who->face = skop->face;
3405	who->animation_id = item->animation_id;	3385	who->animation_id = item->animation_id;
3406	who->anim_speed = item->anim_speed;	3386	who->anim_speed = item->anim_speed;
3407	who->last_anim = 0;	3387	who->last_anim = 0;
3408	who->state = 0;	3388	who->state = 0;
3409	animate_object(who, who->direction);	3389	animate_object(who, who->direction);
3410	}	3390	}
3411	}	3391	}
3412	}	3392	}
3413	}	3393	}
3414	else if (item->type == FORCE) {	3394	else if (item->type == FORCE) {
3415	/* forces in the treasurelist can alter the player's stats */	3395	/* forces in the treasurelist can alter the player's stats */
3416	object *skin;	3396	object *skin;
3417	/* first get the dragon skin force */	3397	/* first get the dragon skin force */
3418	for (skin=who->inv; skin!=NULL && strcmp(skin->arch->name, "dragon_skin_force")!=0;	3398	for (skin=who->inv; skin!=NULL && strcmp(skin->arch->name, "dragon_skin_force")!=0;
3419	skin=skin->below);	3399	skin=skin->below);
3420	if (skin == NULL) return;	3400	if (skin == NULL) return;
3421		3401
3422	/* adding new spellpath attunements */	3402	/* adding new spellpath attunements */
3423	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) {	3403	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) {
3424	skin->path_attuned |= item->path_attuned; /* add attunement to skin */	3404	skin->path_attuned |= item->path_attuned; /* add attunement to skin */
3425		3405
3426	/* print message */	3406	/* print message */
3427	sprintf(buf, "You feel attuned to ");	3407	sprintf(buf, "You feel attuned to ");
3428	for(i=0, j=0; i<NRSPELLPATHS; i++) {	3408	for(i=0, j=0; i<NRSPELLPATHS; i++) {
3429	if(item->path_attuned & (1<<i)) {	3409	if(item->path_attuned & (1<<i)) {
3430	if (j)	3410	if (j)
3431	strcat(buf," and ");	3411	strcat(buf," and ");
3432	else	3412	else
3433	j = 1;	3413	j = 1;
3434	strcat(buf, spellpathnames[i]);	3414	strcat(buf, spellpathnames[i]);
3435	}	3415	}
3436	}	3416	}
3437	strcat(buf,".");	3417	strcat(buf,".");
3438	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, buf);	3418	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, buf);
3439	}	3419	}
3440		3420
3441	/* evtl. adding flags: */	3421	/* evtl. adding flags: */
3442	if(QUERY_FLAG(item, FLAG_XRAYS))	3422	if(QUERY_FLAG(item, FLAG_XRAYS))
3443	SET_FLAG(skin, FLAG_XRAYS);	3423	SET_FLAG(skin, FLAG_XRAYS);
3444	if(QUERY_FLAG(item, FLAG_STEALTH))	3424	if(QUERY_FLAG(item, FLAG_STEALTH))
3445	SET_FLAG(skin, FLAG_STEALTH);	3425	SET_FLAG(skin, FLAG_STEALTH);
3446	if(QUERY_FLAG(item, FLAG_SEE_IN_DARK))	3426	if(QUERY_FLAG(item, FLAG_SEE_IN_DARK))
3447	SET_FLAG(skin, FLAG_SEE_IN_DARK);	3427	SET_FLAG(skin, FLAG_SEE_IN_DARK);
3448		3428
3449	/* print message if there is one */	3429	/* print message if there is one */
3450	if (item->msg != NULL)	3430	if (item->msg != NULL)
3451	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, item->msg);	3431	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, item->msg);
3452	}	3432	}
3453	else {	3433	else {
3454	/* generate misc. treasure */	3434	/* generate misc. treasure */
3455	tmp = arch_to_object (tr->item);	3435	tmp = arch_to_object (tr->item);
3456	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained %s", query_short_name(tmp));	3436	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained %s", query_short_name(tmp));
3457	tmp = insert_ob_in_ob (tmp, who);	3437	tmp = insert_ob_in_ob (tmp, who);
3458	if (who->type == PLAYER)	3438	if (who->type == PLAYER)
3459	esrv_send_item(who, tmp);	3439	esrv_send_item(who, tmp);
3460	}	3440	}
3461	}	3441	}
3462		3442
3463	/**	3443	/**
3464	* Unready an object for a player. This function does nothing if the object was	3444	* Unready an object for a player. This function does nothing if the object was

Diff Legend

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