[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.54 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.97 by root, Mon Jan 8 22:32:11 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <pwd.h>	26	#include <pwd.h>
26	#include <sproto.h>	27	#include <sproto.h>
27	#include <sounds.h>	28	#include <sounds.h>
31	#include <skills.h>	32	#include <skills.h>
32		33
33	#include <algorithm>	34	#include <algorithm>
34	#include <functional>	35	#include <functional>
35		36
36	player *	37	playervec players;
37	find_player (const char *plname)
38	{
39	player *pl;
40
41	for (pl = first_player; pl; pl = pl->next)
42	if (pl->ob && !strcmp (query_name (pl->ob), plname))
43	return pl;
44
45	return 0;
46	}
47		38
48	void	39	void
49	display_motd (const object *op)	40	display_motd (const object *op)
50	{	41	{
51	char buf[MAX_BUF];	42	char buf[MAX_BUF];
…		…
134		125
135	if (*buf == '%')	126	if (*buf == '%')
136	{ /* send one news */	127	{ /* send one news */
137	if (size > 0)	128	if (size > 0)
138	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /send previously read news /	129	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /send previously read news /
		130
139	strcpy (subject, buf + 1);	131	strcpy (subject, buf + 1);
140	strip_endline (subject);	132	strip_endline (subject);
141	size = 0;	133	size = 0;
142	news[0] = '\0';	134	news[0] = '\0';
143	}	135	}
…		…
160		152
161	/* This loads the first map an puts the player on it. */	153	/* This loads the first map an puts the player on it. */
162	static void	154	static void
163	set_first_map (object *op)	155	set_first_map (object *op)
164	{	156	{
165	strcpy (op->contr->maplevel, first_map_path);	157	op->contr->maplevel = first_map_path;
166	op->x = -1;	158	op->x = -1;
167	op->y = -1;	159	op->y = -1;
		160	}
		161
		162	void
		163	player::enter_map ()
		164	{
		165	object *tmp = object::create ();
		166
		167	EXIT_PATH (tmp) = maplevel;
		168	EXIT_X (tmp) = ob->x;
		169	EXIT_Y (tmp) = ob->y;
168	enter_exit (op, 0);	170	ob->enter_exit (tmp);
169	}
170		171
		172	tmp->destroy ();
		173	}
		174
		175	void
		176	player::activate ()
		177	{
		178	if (active)
		179	return;
		180
		181	players.insert (this);
		182	ob->remove ();
		183	ob->map = 0;
		184	ob->activate_recursive ();
		185	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		186	add_friendly_object (ob);
		187	enter_map ();
		188	}
		189
		190	void
		191	player::deactivate ()
		192	{
		193	if (!active)
		194	return;
		195
		196	terminate_all_pets (ob);
		197	remove_friendly_object (ob);
		198	ob->deactivate_recursive ();
		199	ob->remove ();
		200	ob->map = 0;
		201
		202	// for weird reasons, this is often "ob", keeping a circular reference
		203	ranges [range_skill] = 0;
		204
		205	players.erase (this);
		206	}
		207
		208	// connect the player with a specific client
		209	// also changed, rationalises, and fixes some incorrect settings
171	void	210	void
172	player::connect (client *ns)	211	player::connect (client *ns)
173	{	212	{
174	this->ns = ns;	213	this->ns = ns;
175	ns->pl = this;	214	ns->pl = this;
176		215
177	next = first_player;	216	run_on = 0;
178	first_player = this;	217	fire_on = 0;
		218	ob->container = 0; //TODO: client-specific
179		219
180	ns->update_look = 0;	220	ns->update_look = 0;
181	ns->look_position = 0;	221	ns->look_position = 0;
182		222
183	clear_los (ob);	223	clear_los (ob);
184		224
		225	ns->reset_stats ();
		226
		227	/* make sure he's a player -- needed because of class change. */
185	ob->type = PLAYER; // we are paranoid	228	ob->type = PLAYER; // we are paranoid
186	ob->race = ob->arch->clone.race;	229	ob->race = ob->arch->clone.race;
187		230
188	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	231	if (!legal_range (ob, shoottype))
189	ob->update_stats ();	232	shoottype = range_none;
190	update_ob_speed (ob);
191		233
192	ob->carrying = sum_weight (ob);	234	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	235	link_player_skills (ob);
194		236
195	if (!legal_range (ob, shoottype))	237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196	shoottype = range_none;
197		238
198	assign (title, ob->arch->clone.name);	239	assign (title, ob->arch->clone.name);
199		240
200	/* can_use_shield is a new flag. However, the can_use.. seems to largely come	241	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
201	* from the class, and not race. I don't see any way to get the class information	242	* from the class, and not race. I don't see any way to get the class information
…		…
223	skin = tmp;	264	skin = tmp;
224		265
225	set_dragon_name (ob, abil, skin);	266	set_dragon_name (ob, abil, skin);
226	}	267	}
227		268
228	CLEAR_FLAG (ob, FLAG_FRIENDLY);
229	add_friendly_object (ob);
230
231	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	269	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234	new_draw_info_format (NDI_UNIQUE \| NDI_ALL \| NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235		270
		271	esrv_new_player (this, ob->weight + ob->carrying);
		272
		273	ob->update_stats ();
236	ns->floorbox_update ();	274	ns->floorbox_update ();
237		275
238	esrv_new_player (this, ob->weight + ob->carrying);
239	esrv_send_inventory (ob, ob);	276	esrv_send_inventory (ob, ob);
240	esrv_add_spells (this, 0);	277	esrv_add_spells (this, 0);
241		278
242	enter_exit (ob, 0);	279	activate ();
243		280
244	// send_rules (ob);//TODO	281	send_rules (ob);
245	// send_news (ob);//TODO	282	send_news (ob);
246	// display_motd (ob);//TODO	283	display_motd (ob);
		284
		285	INVOKE_PLAYER (CONNECT, this);
247	INVOKE_PLAYER (LOGIN, this);	286	INVOKE_PLAYER (LOGIN, this);
		287	}
		288
		289	void
		290	player::disconnect ()
		291	{
		292	if (ns)
		293	{
		294	if (active)
		295	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		296
		297	INVOKE_PLAYER (DISCONNECT, this);
		298
		299	ns->reset_stats ();
		300	ns->pl = 0;
		301	this->ns = 0;
		302	}
		303
		304	ob->container = 0; //TODO: client-specific
		305	deactivate ();
248	}	306	}
249		307
250	// the need for this function can be explained	308	// the need for this function can be explained
251	// by load_object not returning the object	309	// by load_object not returning the object
252	void	310	void
…		…
259	ob->speed = 1.0;	317	ob->speed = 1.0;
260	ob->direction = 5; /* So player faces south */	318	ob->direction = 5; /* So player faces south */
261	ob->stats.wc = 2;	319	ob->stats.wc = 2;
262	ob->run_away = 25; /* Then we panick... */	320	ob->run_away = 25; /* Then we panick... */
263		321
264	set_first_map (ob);
265
266	ob->roll_stats ();	322	ob->roll_stats ();
267	}	323	}
268		324
269	player::player ()	325	player::player ()
270	{	326	{
271	/* There are some elements we want initialized to non zero value -	327	/* There are some elements we want initialised to non zero value -
272	* we deal with that below this point.	328	* we deal with that below this point.
273	*/	329	*/
274	outputs_sync = 16; /* Every 2 seconds */	330	outputs_sync = 16; /* Every 2 seconds */
275	outputs_count = 8; /* Keeps present behaviour */	331	outputs_count = 8; /* Keeps present behaviour */
276	unapply = unapply_nochoice;	332	unapply = unapply_nochoice;
277		333
278	assign (savebed_map, first_map_path); /* Init. respawn position */	334	savebed_map = first_map_path; /* Init. respawn position */
279		335
280	gen_sp_armour = 10;	336	gen_sp_armour = 10;
281	last_speed = -1;
282	shoottype = range_none;	337	shoottype = range_none;
283	bowtype = bow_normal;	338	bowtype = bow_normal;
284	petmode = pet_normal;	339	petmode = pet_normal;
285	listening = 10;	340	listening = 10;
286	usekeys = containers;	341	usekeys = containers;
287	last_weapon_sp = -1;
288	peaceful = 1; /* default peaceful */	342	peaceful = 1; /* default peaceful */
289	do_los = 1;	343	do_los = 1;
		344	}
290		345
291	/* we need to clear these to -1 and not zero - otherwise,	346	void
292	* if a player quits and starts a new character, we wont	347	player::do_destroy ()
293	* send new values to the client, as things like exp start	348	{
294	* at zero.	349	disconnect ();
295	*/
296	for (int i = 0; i < NUM_SKILLS; i++)
297	last_skill_exp[i] = -1;
298		350
299	for (int i = 0; i < NROFATTACKS; i++)	351	attachable::do_destroy ();
300	last_resist[i] = -1;
301		352
302	last_stats.exp = -1;	353	if (ob)
303	last_weight = (uint32) - 1;	354	{
		355	ob->destroy_inv (false);
		356	ob->destroy ();
		357	}
304	}	358	}
305		359
306	player::~player ()	360	player::~player ()
307	{	361	{
308	terminate_all_pets (ob);
309
310	if (first_player != this)
311	{
312	player *prev = first_player;
313
314	while (prev && prev->next && prev->next != this)
315	prev = prev->next;
316
317	if (prev->next != this)
318	{
319	LOG (llevError, "Free_player: Can't find previous player.\n");
320	abort ();
321	}
322
323	prev->next = next;
324	}
325	else
326	first_player = next;
327
328	if (ob)
329	{
330	ob->contr = 0;
331	ob->destroy (1);
332	}
333
334	if (ns)
335	{
336	ns->send_packet ("goodbye");
337	ns->flush ();
338	ns->pl = 0;
339	ns->destroy ();
340	}
341
342	/* Clear item stack */	362	/* Clear item stack */
343	free (stack_items);	363	free (stack_items);
344	}	364	}
345		365
346	/* Tries to add player on the connection passed in ns.	366	/* Tries to add player on the connection passed in ns.
…		…
351	player::create ()	371	player::create ()
352	{	372	{
353	player *pl = new player;	373	player *pl = new player;
354		374
355	pl->set_object (arch_to_object (get_player_archetype (0)));	375	pl->set_object (arch_to_object (get_player_archetype (0)));
		376	set_first_map (pl->ob);
356		377
357	return pl;	378	return pl;
358	}	379	}
359		380
360	/*	381	/*
…		…
387		408
388	object *	409	object *
389	get_nearest_player (object *mon)	410	get_nearest_player (object *mon)
390	{	411	{
391	object *op = NULL;	412	object *op = NULL;
392	player *pl = NULL;
393	objectlink *ol;	413	objectlink *ol;
394	unsigned lastdist;	414	unsigned lastdist;
395	rv_vector rv;	415	rv_vector rv;
396		416
397	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	417	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
398	{	418	{
399	/* We should not find free objects on this friendly list, but it	419	/* We should not find free objects on this friendly list, but it
400	* does periodically happen. Given that, lets deal with it.	420	* does periodically happen. Given that, lets deal with it.
401	* While unlikely, it is possible the next object on the friendly	421	* While unlikely, it is possible the next object on the friendly
402	* list is also free, so encapsulate this in a while loop.	422	* list is also free, so encapsulate this in a while loop.
…		…
406	object *tmp = ol->ob;	426	object *tmp = ol->ob;
407		427
408	/* Can't do much more other than log the fact, because the object	428	/* Can't do much more other than log the fact, because the object
409	* itself will have been cleared.	429	* itself will have been cleared.
410	*/	430	*/
411	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	431	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		432	tmp->debug_desc ());
412	ol = ol->next;	433	ol = ol->next;
413	remove_friendly_object (tmp);	434	remove_friendly_object (tmp);
414	if (!ol)	435	if (!ol)
415	return op;	436	return op;
416	}	437	}
…		…
429	{	450	{
430	op = ol->ob;	451	op = ol->ob;
431	lastdist = rv.distance;	452	lastdist = rv.distance;
432	}	453	}
433	}	454	}
434	for (pl = first_player; pl != NULL; pl = pl->next)	455
435	{	456	for_all_players (pl)
436	if (can_detect_enemy (mon, pl->ob, &rv))	457	if (can_detect_enemy (mon, pl->ob, &rv))
437	{
438
439	if (lastdist > rv.distance)	458	if (lastdist > rv.distance)
440	{	459	{
441	op = pl->ob;	460	op = pl->ob;
442	lastdist = rv.distance;	461	lastdist = rv.distance;
443	}	462	}
444	}	463
445	}
446	#if 0	464	#if 0
447	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");	465	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
448	#endif	466	#endif
449	return op;	467	return op;
450	}	468	}
…		…
830		848
831	contr->orig_stats = stats;	849	contr->orig_stats = stats;
832	}	850	}
833	}	851	}
834		852
		853	static void
		854	start_info (object *op)
		855	{
		856	char buf[MAX_BUF];
		857
		858	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		859	new_draw_info (NDI_UNIQUE, 0, op, buf);
		860	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		861	//new_draw_info (NDI_UNIQUE, 0, op, " ");
		862	}
		863
835	/* This function takes the key that is passed, and does the	864	/* This function takes the key that is passed, and does the
836	* appropriate action with it (change race, or other things).	865	* appropriate action with it (change race, or other things).
837	* The function name is for historical reasons - now we have	866	* The function name is for historical reasons - now we have
838	* separate race and class; this actually changes the RACE,	867	* separate race and class; this actually changes the RACE,
839	* not the class.	868	* not the class.
…		…
866	* to save here.	895	* to save here.
867	*/	896	*/
868	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
869	make_path_to_file (buf);	898	make_path_to_file (buf);
870		899
871	#ifdef AUTOSAVE
872	op->contr->last_save_tick = pticks;
873	#endif
874	start_info (op);	900	start_info (op);
875	CLEAR_FLAG (op, FLAG_WIZ);	901	CLEAR_FLAG (op, FLAG_WIZ);
876	give_initial_items (op, op->randomitems);	902	give_initial_items (op, op->randomitems);
877	link_player_skills (op);	903	link_player_skills (op);
878	esrv_send_inventory (op, op);	904	esrv_send_inventory (op, op);
…		…
884	if (*first_map_ext_path)	910	if (*first_map_ext_path)
885	{	911	{
886	object *tmp;	912	object *tmp;
887	char mapname[MAX_BUF];	913	char mapname[MAX_BUF];
888		914
889	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
890	tmp = object::create ();	916	tmp = object::create ();
891	EXIT_PATH (tmp) = mapname;	917	EXIT_PATH (tmp) = mapname;
892	EXIT_X (tmp) = op->x;	918	EXIT_X (tmp) = op->x;
893	EXIT_Y (tmp) = op->y;	919	EXIT_Y (tmp) = op->y;
894	enter_exit (op, tmp); /* we don't really care if it succeeded;	920	op->enter_exit (tmp); /* we don't really care if it succeeded;
895	* if the map isn't there, then stay on the	921	* if the map isn't there, then stay on the
896	* default initial map */	922	* default initial map */
897	tmp->destroy ();	923	tmp->destroy ();
898	}	924	}
899	else	925	else
…		…
938	if (op->msg)	964	if (op->msg)
939	new_draw_info (NDI_BLUE, 0, op, op->msg);	965	new_draw_info (NDI_BLUE, 0, op, op->msg);
940		966
941	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");	967	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
942	return 0;	968	return 0;
943	}
944
945	int
946	key_confirm_quit (object *op, char key)
947	{
948	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
949	{
950	op->contr->ns->state = ST_PLAYING;
951	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
952	return 1;
953	}
954
955	INVOKE_PLAYER (LOGOUT, op->contr);
956	INVOKE_PLAYER (QUIT, op->contr);
957
958	terminate_all_pets (op);
959	leave_map (op);
960	op->direction = 0;
961	new_draw_info_format (NDI_UNIQUE \| NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
962
963	strcpy (op->contr->killer, "quit");
964	check_score (op);
965	op->contr->party = 0;
966	op->contr->own_title[0] = '\0';
967
968	object_ptr ob = op;
969
970	delete ob->contr;
971
972	/* We need to hunt for any per player unique maps in memory and
973	* get rid of them. The trailing slash in the path is intentional,
974	* so that players named 'Ab' won't match against players 'Abe' pathname
975	*/
976	char buf[MAX_BUF];
977	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
978
979	for (maptile next, mp = first_map; mp; mp = next)
980	{
981	next = mp->next;
982
983	if (!strncmp (mp->path, buf, strlen (buf)))
984	delete_map (mp);
985	}
986
987	delete_character (ob->name, 1);
988
989	return 1;
990	}	969	}
991		970
992	void	971	void
993	flee_player (object *op)	972	flee_player (object *op)
994	{	973	{
…		…
1131	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1132	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1111	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1133	else	1112	else
1134	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1113	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1135	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1114	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1115
1136	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1116	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1137
1138	sprintf (putstring, "...flags: ");
1139	for (k = 0; k < 4; k++)
1140	{
1141	for (j = 0; j < 32; j++)
1142	{
1143	if ((tmp->flags[k] >> j) & 0x01)
1144	{
1145	sprintf (tmpstr, "%d ", k * 32 + j);
1146	strcat (putstring, tmpstr);
1147	}
1148	}
1149	}
1150	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1151
1152	#if 0
1153	/* print the flags too */
1154	for (k = 0; k < 4; k++)
1155	{
1156	fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1157	for (j = 0; j < 32; j++)
1158	{
1159	fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1160	if (!((j + 1) % 4))
1161	fprintf (stderr, " ");
1162	}
1163	fprintf (stderr, " [%d]\n", k * 32);
1164	}
1165	#endif
1166	}	1117	}
		1118
1167	/* philosophy:	1119	/* philosophy:
1168	* It's easy to grab an item type from a pile, as long as it's	1120	* It's easy to grab an item type from a pile, as long as it's
1169	* generic. This takes no game-time. For more detailed pickups	1121	* generic. This takes no game-time. For more detailed pickups
1170	* and selections, select-items shoul dbe used. This is a	1122	* and selections, select-items should be used. This is a
1171	* grab-as-you-run type mode that's really useful for arrows for	1123	* grab-as-you-run type mode that's really useful for arrows for
1172	* example.	1124	* example.
1173	* The drawback: right now it has no frontend, so you need to	1125	* The drawback: right now it has no frontend, so you need to
1174	* stick the bits you want into a calculator in hex mode and then	1126	* stick the bits you want into a calculator in hex mode and then
1175	* convert to decimal and then 'pickup <#>	1127	* convert to decimal and then 'pickup <#>
…		…
1675	return 0;	1627	return 0;
1676	}	1628	}
1677		1629
1678	arrow->set_owner (op);	1630	arrow->set_owner (op);
1679	arrow->skill = bow->skill;	1631	arrow->skill = bow->skill;
1680
1681	arrow->direction = dir;	1632	arrow->direction = dir;
1682	arrow->x = sx;
1683	arrow->y = sy;
1684		1633
1685	if (op->type == PLAYER)	1634	if (op->type == PLAYER)
1686	{	1635	{
1687	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1636	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1688	op->update_stats ();	1637	op->update_stats ();
…		…
1703		1652
1704	/* update the speed */	1653	/* update the speed */
1705	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1654	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1706	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1655	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1707		1656
1708	if (arrow->speed < 1.0)	1657	arrow->set_speed (max (arrow->speed, 1.0));
1709	arrow->speed = 1.0;
1710	update_ob_speed (arrow);
1711	arrow->speed_left = 0;	1658	arrow->speed_left = 0;
1712		1659
1713	if (op->type == PLAYER)	1660	if (op->type == PLAYER)
1714	{	1661	{
1715	arrow->stats.wc = 20 - bow->magic - arrow->magic -	1662	arrow->stats.wc = 20 - bow->magic - arrow->magic -
…		…
1728	arrow->attacktype \|= bow->attacktype;	1675	arrow->attacktype \|= bow->attacktype;
1729		1676
1730	if (bow->slaying)	1677	if (bow->slaying)
1731	arrow->slaying = bow->slaying;	1678	arrow->slaying = bow->slaying;
1732		1679
1733	arrow->map = m;
1734	arrow->move_type = MOVE_FLY_LOW;	1680	arrow->move_type = MOVE_FLY_LOW;
1735	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1681	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1736		1682
1737	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1683	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1738	insert_ob_in_map (arrow, m, op, 0);	1684	m->insert (arrow, sx, sy, op);
1739		1685
1740	if (!arrow->destroyed ())	1686	if (!arrow->destroyed ())
1741	move_arrow (arrow);	1687	move_arrow (arrow);
1742		1688
1743	if (op->type == PLAYER)	1689	if (op->type == PLAYER)
…		…
1769	}	1715	}
1770	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1716	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1771	{	1717	{
1772	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1718	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1773	wcmod = -1;	1719	wcmod = -1;
		1720
1774	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1721	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1775	}	1722	}
1776	else if (op->contr->bowtype == bow_threewide)	1723	else if (op->contr->bowtype == bow_threewide)
1777	{	1724	{
1778	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1725	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1848		1795
1849	if (item->arch)	1796	if (item->arch)
1850	{	1797	{
1851	CLEAR_FLAG (item, FLAG_ANIMATE);	1798	CLEAR_FLAG (item, FLAG_ANIMATE);
1852	item->face = item->arch->clone.face;	1799	item->face = item->arch->clone.face;
1853	item->speed = 0;	1800	item->set_speed (0);
1854	update_ob_speed (item);
1855	}	1801	}
		1802
1856	if ((tmp = item->in_player ()))	1803	if ((tmp = item->in_player ()))
1857	esrv_update_item (UPD_ANIM, tmp, item);	1804	esrv_update_item (UPD_ANIM, tmp, item);
1858	}	1805	}
1859	}	1806	}
1860	else if (item->type == ROD \|\| item->type == HORN)	1807	else if (item->type == ROD \|\| item->type == HORN)
1861	{
1862	drain_rod_charge (item);	1808	drain_rod_charge (item);
1863	}
1864	}	1809	}
1865	}	1810	}
1866		1811
1867	/* Received a fire command for the player - go and do it.	1812	/* Received a fire command for the player - go and do it.
1868	*/	1813	*/
…		…
1907	{	1852	{
1908	if (op->type == PLAYER)	1853	if (op->type == PLAYER)
1909	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");	1854	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1910	return;	1855	return;
1911	}	1856	}
		1857
1912	(void) do_skill (op, op, op->chosen_skill, dir, NULL);	1858	do_skill (op, op, op->chosen_skill, dir, NULL);
1913	return;	1859	return;
1914	case range_builder:	1860	case range_builder:
1915	apply_map_builder (op, dir);	1861	apply_map_builder (op, dir);
1916	return;	1862	return;
1917	default:	1863	default:
…		…
2084	*/	2030	*/
2085	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2031	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2086	{	2032	{
2087	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2033	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2088	{	2034	{
2089	m = get_map_from_coord (op->map, &nx, &ny);	2035	m = op->map->xy_find (nx, ny);
2090	if (!m)	2036	if (!m)
2091	return; /* Don't think this should happen */	2037	return; /* Don't think this should happen */
2092	}	2038	}
2093	else	2039	else
2094	m = op->map;	2040	m = op->map;
2095		2041
2096	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)	2042	if (!(tmp = m->at (nx, ny).bot))
2097	{
2098	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2099	return;	2043	return;
2100	}
2101		2044
2102	mon = 0;	2045	mon = 0;
2103	/* Go through all the objects, and find ones of interest. Only stop if	2046	/* Go through all the objects, and find ones of interest. Only stop if
2104	* we find a monster - that is something we know we want to attack.	2047	* we find a monster - that is something we know we want to attack.
2105	* if its a door or barrel (can roll) see if there may be monsters	2048	* if its a door or barrel (can roll) see if there may be monsters
…		…
2158	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2101	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2159	{	2102	{
2160	/* If we're braced, we don't want to switch places with it */	2103	/* If we're braced, we don't want to switch places with it */
2161	if (op->contr->braced)	2104	if (op->contr->braced)
2162	return;	2105	return;
		2106
2163	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2107	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2164	(void) push_ob (mon, dir, op);	2108	(void) push_ob (mon, dir, op);
2165	if (op->contr->tmp_invis \|\| op->hide)	2109	if (op->contr->tmp_invis \|\| op->hide)
2166	make_visible (op);	2110	make_visible (op);
		2111
2167	return;	2112	return;
2168	}	2113	}
2169		2114
2170	/* in certain circumstances, you shouldn't attack friendly	2115	/* in certain circumstances, you shouldn't attack friendly
2171	* creatures. Note that if you are braced, you can't push	2116	* creatures. Note that if you are braced, you can't push
…		…
2185	!on_battleground))	2130	!on_battleground))
2186	{	2131	{
2187	if (!op->contr->braced)	2132	if (!op->contr->braced)
2188	{	2133	{
2189	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2134	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2190	(void) push_ob (mon, dir, op);	2135	push_ob (mon, dir, op);
2191	}	2136	}
2192	else	2137	else
2193	new_draw_info (0, 0, op, "You withhold your attack");	2138	new_draw_info (0, 0, op, "You withhold your attack");
2194		2139
2195	if (op->contr->tmp_invis \|\| op->hide)	2140	if (op->contr->tmp_invis \|\| op->hide)
…		…
2210	* Way it works is like this: First, it must have some hit points	2155	* Way it works is like this: First, it must have some hit points
2211	* and be living. Then, it must be one of the following:	2156	* and be living. Then, it must be one of the following:
2212	* 1) Not a player, 2) A player, but of a different party. Note	2157	* 1) Not a player, 2) A player, but of a different party. Note
2213	* that party_number -1 is no party, so attacks can still happen.	2158	* that party_number -1 is no party, so attacks can still happen.
2214	*/	2159	*/
2215
2216	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2160	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2217	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2161	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2218	{	2162	{
2219		2163
2220	/* If the player hasn't hit something this tick, and does	2164	/* If the player hasn't hit something this tick, and does
…		…
2254	int	2198	int
2255	move_player (object *op, int dir)	2199	move_player (object *op, int dir)
2256	{	2200	{
2257	int pick;	2201	int pick;
2258		2202
2259	if (op->map == NULL \|\| op->map->in_memory != MAP_IN_MEMORY)	2203	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
2260	return 0;	2204	return 0;
2261		2205
2262	/* Sanity check: make sure dir is valid */	2206	/* Sanity check: make sure dir is valid */
2263	if ((dir < 0) \|\| (dir >= 9))	2207	if ((dir < 0) \|\| (dir >= 9))
2264	{	2208	{
2265	LOG (llevError, "move_player: invalid direction %d\n", dir);	2209	LOG (llevError, "move_player: invalid direction %d\n", dir);
2266	return 0;	2210	return 0;
2267	}	2211	}
2268		2212
2269	/* peterm: added following line */	2213	/* peterm: added following line */
2270	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2214	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2271	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2215	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
2272		2216
2273	op->facing = dir;	2217	op->facing = dir;
2274		2218
…		…
2352		2296
2353	/* call this here - we also will call this in do_ericserver, but	2297	/* call this here - we also will call this in do_ericserver, but
2354	* the players time has been increased when doericserver has been	2298	* the players time has been increased when doericserver has been
2355	* called, so we recheck it here.	2299	* called, so we recheck it here.
2356	*/	2300	*/
2357	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2301	if (op->contr->ns->handle_command ())
2358	for (int rep = 8; --rep && op->contr->ns->handle_command (); )	2302	return 1;
2359	;
2360		2303
2361	if (op->speed_left < 0)	2304	if (op->speed_left > 0)
2362	return 0;	2305	{
2363
2364	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2306	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2365	{	2307	{
2366	/* All move commands take 1 tick, at least for now */	2308	/* All move commands take 1 tick, at least for now */
2367	op->speed_left--;	2309	op->speed_left--;
2368		2310
2369	/* Instead of all the stuff below, let move_player take care	2311	/* Instead of all the stuff below, let move_player take care
2370	* of it. Also, some of the skill stuff is only put in	2312	* of it. Also, some of the skill stuff is only put in
2371	* there, as well as the confusion stuff.	2313	* there, as well as the confusion stuff.
2372	*/	2314	*/
2373	move_player (op, op->direction);	2315	move_player (op, op->direction);
2374	if (op->speed_left > 0)	2316
2375	return 1;	2317	return op->speed_left > 0;
2376	else	2318	}
2377	return 0;
2378	}	2319	}
2379		2320
2380	return 0;	2321	return 0;
2381	}	2322	}
2382		2323
…		…
2424	{	2365	{
2425	object *next;	2366	object *next;
2426		2367
2427	while (op)	2368	while (op)
2428	{	2369	{
2429	next = op->below; /* Make sure we have a good value, in case	2370	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2430	* we remove object 'op'	2371
2431	*/
2432	if (QUERY_FLAG (op, FLAG_UNPAID))	2372	if (QUERY_FLAG (op, FLAG_UNPAID))
2433	{	2373	{
2434	op->remove ();
2435	op->x = env->x;
2436	op->y = env->y;
2437	if (env->type == PLAYER)	2374	if (env->type == PLAYER)
2438	esrv_del_item (env->contr, op->count);	2375	esrv_del_item (env->contr, op->count);
2439	insert_ob_in_map (op, env->map, NULL, 0);	2376
		2377	op->insert_at (env);
2440	}	2378	}
2441	else if (op->inv)	2379	else if (op->inv)
2442	remove_unpaid_objects (op->inv, env);	2380	remove_unpaid_objects (op->inv, env);
2443		2381
2444	op = next;	2382	op = next;
2445	}	2383	}
2446	}	2384	}
2447
2448		2385
2449	/*	2386	/*
2450	* Returns pointer a static string containing gravestone text	2387	* Returns pointer a static string containing gravestone text
2451	* Moved from apply.c to player.c - player.c is what	2388	* Moved from apply.c to player.c - player.c is what
2452	* actually uses this function. player.c may not be quite the	2389	* actually uses this function. player.c may not be quite the
…		…
2486	strncat (buf2, " ", 20 - strlen (buf) / 2);	2423	strncat (buf2, " ", 20 - strlen (buf) / 2);
2487	strcat (buf2, buf);	2424	strcat (buf2, buf);
2488		2425
2489	return buf2;	2426	return buf2;
2490	}	2427	}
2491
2492
2493		2428
2494	void	2429	void
2495	do_some_living (object *op)	2430	do_some_living (object *op)
2496	{	2431	{
2497	int last_food = op->stats.food;	2432	int last_food = op->stats.food;
…		…
2506	const int max_grace = 1;	2441	const int max_grace = 1;
2507		2442
2508	if (op->contr->outputs_sync)	2443	if (op->contr->outputs_sync)
2509	{	2444	{
2510	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2445	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2511	if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2446	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2512	flush_output_element (op, &op->contr->outputs[i]);	2447	flush_output_element (op, &op->contr->outputs[i]);
2513	}	2448	}
2514		2449
2515	if (op->contr->ns->state == ST_PLAYING)	2450	if (op->contr->ns->state == ST_PLAYING)
2516	{	2451	{
2517
2518	/* these next three if clauses make it possible to SLOW DOWN	2452	/* these next three if clauses make it possible to SLOW DOWN
2519	hp/grace/spellpoint regeneration. */	2453	hp/grace/spellpoint regeneration. */
2520	if (op->contr->gen_hp >= 0)	2454	if (op->contr->gen_hp >= 0)
2521	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;	2455	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2522	else	2456	else
2523	{	2457	{
2524	gen_hp = op->stats.maxhp;	2458	gen_hp = op->stats.maxhp;
2525	rate_hp -= rate_hp / 2 * op->contr->gen_hp;	2459	rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2526	}	2460	}
		2461
2527	if (op->contr->gen_sp >= 0)	2462	if (op->contr->gen_sp >= 0)
2528	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;	2463	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2529	else	2464	else
2530	{	2465	{
2531	gen_sp = op->stats.maxsp;	2466	gen_sp = op->stats.maxsp;
2532	rate_sp -= rate_sp / 2 * op->contr->gen_sp;	2467	rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2533	}	2468	}
		2469
2534	if (op->contr->gen_grace >= 0)	2470	if (op->contr->gen_grace >= 0)
2535	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2471	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2536	else	2472	else
2537	{	2473	{
2538	gen_grace = op->stats.maxgrace;	2474	gen_grace = op->stats.maxgrace;
…		…
2554	op->stats.food += op->contr->digestion;	2490	op->stats.food += op->contr->digestion;
2555	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2491	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2556	op->stats.food = last_food;	2492	op->stats.food = last_food;
2557	}	2493	}
2558	}	2494	}
		2495
2559	if (max_sp > 1)	2496	if (max_sp > 1)
2560	{	2497	{
2561	over_sp = (gen_sp + 10) / rate_sp;	2498	over_sp = (gen_sp + 10) / rate_sp;
2562	if (over_sp > 0)	2499	if (over_sp > 0)
2563	{	2500	{
2564	if (op->stats.sp < op->stats.maxsp)	2501	if (op->stats.sp < op->stats.maxsp)
2565	{	2502	{
2566	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2503	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2504
2567	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))	2505	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2568	op->stats.sp--;	2506	op->stats.sp--;
		2507
2569	if (op->stats.sp > op->stats.maxsp)	2508	if (op->stats.sp > op->stats.maxsp)
2570	op->stats.sp = op->stats.maxsp;	2509	op->stats.sp = op->stats.maxsp;
2571	}	2510	}
2572	op->last_sp = 0;	2511	op->last_sp = 0;
2573	}	2512	}
2574	else	2513	else
2575	{
2576	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2514	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2577	}
2578	}	2515	}
2579	else	2516	else
2580	{
2581	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2517	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2582	}
2583	}	2518	}
2584		2519
2585	/* Regenerate Grace */	2520	/* Regenerate Grace */
2586	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2521	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2587	if (--op->last_grace < 0)	2522	if (--op->last_grace < 0)
2588	{	2523	{
2589	if (op->stats.grace < op->stats.maxgrace / 2)	2524	if (op->stats.grace < op->stats.maxgrace / 2)
2590	op->stats.grace++; /* no penalty in food for regaining grace */	2525	op->stats.grace++; /* no penalty in food for regaining grace */
		2526
2591	if (max_grace > 1)	2527	if (max_grace > 1)
2592	{	2528	{
2593	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2529	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2594	if (over_grace > 0)	2530	if (over_grace > 0)
2595	{	2531	{
…		…
2623	op->stats.food += op->contr->digestion;	2559	op->stats.food += op->contr->digestion;
2624	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2560	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2625	op->stats.food = last_food;	2561	op->stats.food = last_food;
2626	}	2562	}
2627	}	2563	}
		2564
2628	if (max_hp > 1)	2565	if (max_hp > 1)
2629	{	2566	{
2630	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2567	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2631	if (over_hp > 0)	2568	if (over_hp > 0)
2632	{	2569	{
…		…
2656		2593
2657	if (op->contr->gen_hp > 0)	2594	if (op->contr->gen_hp > 0)
2658	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2595	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2659	else	2596	else
2660	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2597	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
		2598
2661	/* dms do not consume food */	2599	/* dms do not consume food */
2662	if (!QUERY_FLAG (op, FLAG_WIZ))	2600	if (!QUERY_FLAG (op, FLAG_WIZ))
2663	op->stats.food--;	2601	op->stats.food--;
2664	}	2602	}
2665	}
2666		2603
2667	if (op->contr->ns->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)	2604	if (op->stats.food < 0 && op->stats.hp >= 0)
2668	{	2605	{
2669	object tmp, flesh = NULL;	2606	object tmp, flesh = 0;
2670		2607
2671	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2608	for (tmp = op->inv; tmp; tmp = tmp->below)
2672	{	2609	{
2673	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2610	if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2674	{
2675	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)
2676	{	2611	{
		2612	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)
		2613	{
2677	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2614	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2678	manual_apply (op, tmp, 0);	2615	manual_apply (op, tmp, 0);
2679	if (op->stats.food >= 0 \|\| op->stats.hp < 0)	2616	if (op->stats.food >= 0 \|\| op->stats.hp < 0)
2680	break;	2617	break;
2681	}	2618	}
2682	else if (tmp->type == FLESH)	2619	else if (tmp->type == FLESH)
2683	flesh = tmp;	2620	flesh = tmp;
2684	} /* End if paid for object */	2621	} /* End if paid for object */
2685	} /* end of for loop */	2622	} /* end of for loop */
		2623
2686	/* If player is still starving, it means they don't have any food, so	2624	/* If player is still starving, it means they don't have any food, so
2687	* eat flesh instead.	2625	* eat flesh instead.
2688	*/	2626	*/
2689	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2627	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2690	{	2628	{
2691	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2629	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2692	manual_apply (op, flesh, 0);	2630	manual_apply (op, flesh, 0);
2693	}	2631	}
2694	} /* end if player is starving */	2632	}
2695		2633
2696	while (op->stats.food < 0 && op->stats.hp > 0)	2634	while (op->stats.food < 0 && op->stats.hp >= 0)
2697	op->stats.food++, op->stats.hp--;	2635	op->stats.food++, op->stats.hp--;
2698		2636
2699	if (!op->contr->ns->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 \|\| op->stats.food < 0))	2637	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2700	kill_player (op);	2638	kill_player (op);
		2639	}
2701	}	2640	}
2702
2703
2704		2641
2705	/* If the player should die (lack of hp, food, etc), we call this.	2642	/* If the player should die (lack of hp, food, etc), we call this.
2706	* op is the player in jeopardy. If the player can not be saved (not	2643	* op is the player in jeopardy. If the player can not be saved (not
2707	* permadeath, no lifesave), this will take care of removing the player	2644	* permadeath, no lifesave), this will take care of removing the player
2708	* file.	2645	* file.
…		…
2738	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");	2675	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");
2739	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");	2676	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");
2740		2677
2741	/* restore player */	2678	/* restore player */
2742	at = archetype::find ("poisoning");	2679	at = archetype::find ("poisoning");
2743	tmp = present_arch_in_ob (at, op);	2680	if (object *tmp = present_arch_in_ob (at, op))
2744	if (tmp)
2745	{	2681	{
2746	tmp->destroy ();	2682	tmp->destroy ();
2747	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2683	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2748	}	2684	}
2749		2685
2750	at = archetype::find ("confusion");	2686	at = archetype::find ("confusion");
2751	tmp = present_arch_in_ob (at, op);	2687	if (object *tmp = present_arch_in_ob (at, op))
2752	if (tmp)
2753	{	2688	{
2754	tmp->destroy ();	2689	tmp->destroy ();
2755	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2690	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2756	}	2691	}
2757		2692
…		…
2759	op->stats.hp = op->stats.maxhp;	2694	op->stats.hp = op->stats.maxhp;
2760	if (op->stats.food <= 0)	2695	if (op->stats.food <= 0)
2761	op->stats.food = 999;	2696	op->stats.food = 999;
2762		2697
2763	/* create a bodypart-trophy to make the winner happy */	2698	/* create a bodypart-trophy to make the winner happy */
2764	tmp = arch_to_object (archetype::find ("finger"));	2699	if (object *tmp = arch_to_object (archetype::find ("finger")))
2765	if (tmp != NULL)
2766	{	2700	{
2767	sprintf (buf, "%s's finger", &op->name);	2701	sprintf (buf, "%s's finger", &op->name);
2768	tmp->name = buf;	2702	tmp->name = buf;
2769	sprintf (buf, " This finger has been cut off %s\n"	2703	sprintf (buf, " This finger has been cut off %s\n"
2770	" the %s, when he was defeated at\n level %d by %s.\n",	2704	" the %s, when he was defeated at\n level %d by %s.\n",
2771	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2705	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2772	tmp->msg = buf;	2706	tmp->msg = buf;
2773	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2707	tmp->value = 0, tmp->material = 0, tmp->type = 0;
2774	tmp->materialname = NULL;	2708	tmp->materialname = NULL;
2775	tmp->x = op->x, tmp->y = op->y;	2709	tmp->insert_at (op, tmp);
2776	insert_ob_in_map (tmp, op->map, op, 0);
2777	}	2710	}
2778		2711
2779	/* teleport defeated player to new destination */	2712	/* teleport defeated player to new destination */
2780	transfer_ob (op, x, y, 0, NULL);	2713	transfer_ob (op, x, y, 0, NULL);
2781	op->contr->braced = 0;	2714	op->contr->braced = 0;
…		…
2786		2719
2787	command_kill_pets (op, 0);	2720	command_kill_pets (op, 0);
2788		2721
2789	if (op->stats.food < 0)	2722	if (op->stats.food < 0)
2790	{	2723	{
2791	if (op->contr->explore)
2792	{
2793	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2794	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2795	op->stats.food = 999;
2796	return;
2797	}
2798	sprintf (buf, "%s starved to death.", &op->name);	2724	sprintf (buf, "%s starved to death.", &op->name);
2799	strcpy (op->contr->killer, "starvation");	2725	strcpy (op->contr->killer, "starvation");
2800	}	2726	}
2801	else	2727	else
2802	{
2803	if (op->contr->explore)
2804	{
2805	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2806	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2807	op->stats.hp = op->stats.maxhp;
2808	return;
2809	}
2810	sprintf (buf, "%s died.", &op->name);	2728	sprintf (buf, "%s died.", &op->name);
2811	}	2729
2812	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2730	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2813		2731
2814	/* save the map location for corpse, gravestone */	2732	/* save the map location for corpse, gravestone */
2815	x = op->x;	2733	x = op->x;
2816	y = op->y;	2734	y = op->y;
2817	map = op->map;	2735	map = op->map;
2818
2819		2736
2820	/* NOT_PERMADEATH code. This basically brings the character back to	2737	/* NOT_PERMADEATH code. This basically brings the character back to
2821	* life if they are dead - it takes some exp and a random stat.	2738	* life if they are dead - it takes some exp and a random stat.
2822	* See the config.h file for a little more in depth detail about this.	2739	* See the config.h file for a little more in depth detail about this.
2823	*/	2740	*/
…		…
2840	num_stats_lose = 1;	2757	num_stats_lose = 1;
2841	else	2758	else
2842	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2759	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2843	}	2760	}
2844	else	2761	else
2845	{
2846	num_stats_lose = 1;	2762	num_stats_lose = 1;
2847	}	2763
2848	lost_a_stat = 0;	2764	lost_a_stat = 0;
2849		2765
2850	for (z = 0; z < num_stats_lose; z++)	2766	for (z = 0; z < num_stats_lose; z++)
2851	{	2767	{
2852	i = RANDOM () % NUM_STATS;	2768	i = RANDOM () % NUM_STATS;
…		…
3010	/* */	2926	/* */
3011	/****************************************/	2927	/****************************************/
3012		2928
3013	enter_player_savebed (op);	2929	enter_player_savebed (op);
3014		2930
3015	/* Save the player before inserting the force to reduce
3016	* chance of abuse.
3017	*/
3018	op->contr->braced = 0;	2931	op->contr->braced = 0;
3019	op->contr->save ();
3020		2932
3021	/* it is possible that the player has blown something up	2933	/* it is possible that the player has blown something up
3022	* at his savebed location, and that can have long lasting	2934	* at his savebed location, and that can have long lasting
3023	* spell effects. So first see if there is a spell effect	2935	* spell effects. So first see if there is a spell effect
3024	* on the space that might harm the player.	2936	* on the space that might harm the player.
…		…
3094	*/	3006	*/
3095		3007
3096	void	3008	void
3097	fix_weight (void)	3009	fix_weight (void)
3098	{	3010	{
3099	for (player *pl = first_player; pl; pl = pl->next)	3011	for_all_players (pl)
3100	{	3012	{
3101	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	3013	int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3102		3014
3103	if (old == sum)	3015	if (old == sum)
3104	continue;	3016	continue;
…		…
3108	}	3020	}
3109		3021
3110	void	3022	void
3111	fix_luck (void)	3023	fix_luck (void)
3112	{	3024	{
3113	for (player *pl = first_player; pl; pl = pl->next)	3025	for_all_players (pl)
3114	if (!pl->ob->contr->ns->state)	3026	if (!pl->ob->contr->ns->state)
3115	pl->ob->change_luck (0);	3027	pl->ob->change_luck (0);
3116	}	3028	}
3117		3029
3118	/* cast_dust() - handles op throwing objects of type 'DUST'.	3030	/* cast_dust() - handles op throwing objects of type 'DUST'.
…		…
3236		3148
3237	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3149	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3238		3150
3239	/* its extremely hard to run and sneak/hide at the same time! */	3151	/* its extremely hard to run and sneak/hide at the same time! */
3240	if (op->type == PLAYER && op->contr->run_on)	3152	if (op->type == PLAYER && op->contr->run_on)
3241	{
3242	if (!skop \|\| num >= skop->level)	3153	if (!skop \|\| num >= skop->level)
3243	{	3154	{
3244	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3155	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3245	make_visible (op);	3156	make_visible (op);
3246	return;	3157	return;
3247	}	3158	}
3248	else	3159	else
3249	num += 20;	3160	num += 20;
3250	}	3161
3251	num += op->map->difficulty;	3162	num += op->map->difficulty;
3252	hide = hideability (op); /* modify by terrain hidden level */	3163	hide = hideability (op); /* modify by terrain hidden level */
3253	num -= hide;	3164	num -= hide;
		3165
3254	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))	3166	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))
3255	{	3167	{
3256	make_visible (op);	3168	make_visible (op);
3257	if (op->type == PLAYER)	3169	if (op->type == PLAYER)
3258	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3170	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3259	}	3171	}
3260	else if (op->type == PLAYER && skop)	3172	else if (op->type == PLAYER && skop)
3261	{
3262	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3173	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3263	}
3264	}	3174	}
3265		3175
3266	/* determine if who is standing near a hostile creature. */	3176	/* determine if who is standing near a hostile creature. */
3267		3177
3268	int	3178	int
…		…
3335	if (pl->type != PLAYER)	3245	if (pl->type != PLAYER)
3336	{	3246	{
3337	LOG (llevError, "player_can_view() called for non-player object\n");	3247	LOG (llevError, "player_can_view() called for non-player object\n");
3338	return -1;	3248	return -1;
3339	}	3249	}
		3250
3340	if (!pl \|\| !op)	3251	if (!pl \|\| !op)
3341	return 0;	3252	return 0;
3342		3253
3343	if (op->head)
3344	{
3345	op = op->head;	3254	op = op->head_ ();
3346	}	3255
3347	get_rangevector (pl, op, &rv, 0x1);	3256	get_rangevector (pl, op, &rv, 0x1);
3348		3257
3349	/* starting with the 'head' part, lets loop	3258	/* starting with the 'head' part, lets loop
3350	* through the object and find if it has any	3259	* through the object and find if it has any
3351	* part that is in the los array but isnt on	3260	* part that is in the los array but isnt on
…		…
3481	if (trlist == NULL \|\| who->type != PLAYER)	3390	if (trlist == NULL \|\| who->type != PLAYER)
3482	return;	3391	return;
3483		3392
3484	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3393	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3485		3394
3486	if (tr == NULL \|\| tr->item == NULL)	3395	if (!tr \|\| !tr->item)
3487	{	3396	{
3488	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3397	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3489	return;	3398	return;
3490	}	3399	}
3491		3400
…		…
3616	* not readied.	3525	* not readied.
3617	*/	3526	*/
3618	void	3527	void
3619	player_unready_range_ob (player pl, object ob)	3528	player_unready_range_ob (player pl, object ob)
3620	{	3529	{
3621	rangetype i;
3622
3623	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3530	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3624	{
3625	if (pl->ranges[i] == ob)	3531	if (pl->ranges[i] == ob)
3626	{	3532	{
3627	pl->ranges[i] = NULL;	3533	pl->ranges[i] = 0;
3628	if (pl->shoottype == i)	3534	if (pl->shoottype == i)
3629	{
3630	pl->shoottype = range_none;	3535	pl->shoottype = range_none;
3631	}
3632	}	3536	}
3633	}
3634	}	3537	}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.54 by root, Fri Dec 22 16:34:00 2006 UTC vs. Revision 1.97 by root, Mon Jan 8 22:32:11 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.54 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.97 by root, Mon Jan 8 22:32:11 2007 UTC