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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.120 by root, Thu May 3 09:39:56 2007 UTC vs.
Revision 1.158 by root, Mon Aug 13 15:46:45 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
9	* 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
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* 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
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <pwd.h>
27	#include <sproto.h>	25	#include <sproto.h>
28	#include <sounds.h>	26	#include <sounds.h>
29	#include <living.h>	27	#include <living.h>
30	#include <object.h>	28	#include <object.h>
31	#include <spells.h>	29	#include <spells.h>
158	op->x = -1;	156	op->x = -1;
159	op->y = -1;	157	op->y = -1;
160	}	158	}
161		159
162	void	160	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;
170	ob->enter_exit (tmp);
171
172	tmp->destroy ();
173	}
174
175	void
176	player::activate ()	161	player::activate ()
177	{	162	{
178	if (active)	163	if (active)
179	return;	164	return;
180		165
…		…
182	ob->remove ();	167	ob->remove ();
183	ob->map = 0;	168	ob->map = 0;
184	ob->activate_recursive ();	169	ob->activate_recursive ();
185	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
186	add_friendly_object (ob);	171	add_friendly_object (ob);
187	enter_map ();
188	}	172	}
189		173
190	void	174	void
191	player::deactivate ()	175	player::deactivate ()
192	{	176	{
…		…
208		192
209	players.erase (this);	193	players.erase (this);
210	}	194	}
211		195
212	// connect the player with a specific client	196	// connect the player with a specific client
213	// also changed, rationalises, and fixes some incorrect settings	197	// also changes, rationalises, and fixes some incorrect settings
214	void	198	void
215	player::connect (client *ns)	199	player::connect (client *ns)
216	{	200	{
217	this->ns = ns;	201	this->ns = ns;
218	ns->pl = this;	202	ns->pl = this;
…		…
222	ob->close_container (); //TODO: client-specific	206	ob->close_container (); //TODO: client-specific
223		207
224	ns->update_look = 0;	208	ns->update_look = 0;
225	ns->look_position = 0;	209	ns->look_position = 0;
226		210
227	clear_los (ob);	211	clear_los (this);
228		212
229	ns->reset_stats ();	213	ns->reset_stats ();
230		214
231	/* make sure he's a player -- needed because of class change. */	215	/* make sure he's a player -- needed because of class change. */
232	ob->type = PLAYER; // we are paranoid	216	ob->type = PLAYER; // we are paranoid
233	ob->race = ob->arch->clone.race;	217	ob->race = ob->arch->race;
234		218
235	ob->carrying = sum_weight (ob);	219	ob->carrying = sum_weight (ob);
236	link_player_skills (ob);	220	link_player_skills (ob);
237		221
238	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
239		223
240	assign (title, ob->arch->clone.name);	224	assign (title, ob->arch->object::name);
241		225
242	/* if it's a dragon player, set the correct title here */	226	/* if it's a dragon player, set the correct title here */
243	if (is_dragon_pl (ob))	227	if (is_dragon_pl (ob))
244	{	228	{
245	object tmp, abil = 0, *skin = 0;	229	object tmp, abil = 0, *skin = 0;
246		230
247	shstr_cmp dragon_ability_force ("dragon_ability_force");
248	shstr_cmp dragon_skin_force ("dragon_skin_force");
249
250	for (tmp = ob->inv; tmp; tmp = tmp->below)	231	for (tmp = ob->inv; tmp; tmp = tmp->below)
251	if (tmp->type == FORCE)	232	if (tmp->type == FORCE)
252	if (tmp->arch->name == dragon_ability_force)	233	if (tmp->arch->archname == shstr_dragon_ability_force)
253	abil = tmp;	234	abil = tmp;
254	else if (tmp->arch->name == dragon_skin_force)	235	else if (tmp->arch->archname == shstr_dragon_skin_force)
255	skin = tmp;	236	skin = tmp;
256		237
257	set_dragon_name (ob, abil, skin);	238	set_dragon_name (ob, abil, skin);
258	}	239	}
259		240
260	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	241	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
261		242
262	esrv_new_player (this, ob->weight + ob->carrying);	243	esrv_new_player (this, ob->weight + ob->carrying);
263		244
		245	ob->flag [FLAG_READY_WEAPON] = false;
		246	ob->flag [FLAG_READY_SKILL] = false;
		247	ob->flag [FLAG_READY_BOW] = false;
		248
		249	for (object *op = ob->inv; op; op = op->below)
		250	if (op->flag [FLAG_APPLIED])
		251	switch (op->type)
		252	{
		253	case SKILL:
		254	ob->flag [FLAG_APPLIED] = false;
		255	break;
		256
		257	case WAND:
		258	case ROD:
		259	case HORN:
		260	case BOW:
		261	ranged_ob = op;
		262	break;
		263
		264	case WEAPON:
		265	combat_ob = op;
		266	break;
		267	}
		268
		269	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
264	ob->update_stats ();	270	ob->update_stats ();
		271
265	ns->floorbox_update ();	272	ns->floorbox_update ();
266
267	esrv_send_inventory (ob, ob);	273	esrv_send_inventory (ob, ob);
268	esrv_add_spells (this, 0);	274	esrv_add_spells (this, 0);
269		275
270	activate ();	276	activate ();
271		277
…		…
291	ns->pl = 0;	297	ns->pl = 0;
292	ns = 0;	298	ns = 0;
293	}	299	}
294		300
295	if (ob)	301	if (ob)
		302	{
296	ob->close_container (); //TODO: client-specific	303	ob->close_container (); //TODO: client-specific
		304	ob->drop_unpaid_items ();
		305	}
		306
		307	observe = ob;
297		308
298	deactivate ();	309	deactivate ();
299	}	310	}
300		311
301	// the need for this function can be explained	312	// the need for this function can be explained
302	// by load_object not returning the object	313	// by load_object not returning the object
303	void	314	void
304	player::set_object (object *op)	315	player::set_object (object *op)
305	{	316	{
306	ob = op;	317	ob = observe = op;
307	ob->contr = this; /* this aren't yet in archetype */	318	ob->contr = this; /* this aren't yet in archetype */
308		319
309	ob->speed_left = 0.5;
310	ob->speed = 1.0;	320	ob->speed = 1.0f;
		321	ob->speed_left = 0.5f;
		322
311	ob->direction = 5; /* So player faces south */	323	ob->direction = 5; /* So player faces south */
		324	}
		325
		326	void
		327	player::set_observe (object *op)
		328	{
		329	observe = op ? op : ob;
		330	do_los = 1;
312	}	331	}
313		332
314	player::player ()	333	player::player ()
315	{	334	{
316	/* There are some elements we want initialised to non zero value -	335	/* There are some elements we want initialised to non zero value -
…		…
327	petmode = pet_normal;	346	petmode = pet_normal;
328	listening = 10;	347	listening = 10;
329	usekeys = containers;	348	usekeys = containers;
330	peaceful = 1; /* default peaceful */	349	peaceful = 1; /* default peaceful */
331	do_los = 1;	350	do_los = 1;
		351
		352	weapon_sp = 1.0f;
		353	weapon_sp_left = 0.5f;
332	}	354	}
333		355
334	void	356	void
335	player::do_destroy ()	357	player::do_destroy ()
336	{	358	{
…		…
341	if (ob)	363	if (ob)
342	{	364	{
343	ob->destroy_inv (false);	365	ob->destroy_inv (false);
344	ob->destroy ();	366	ob->destroy ();
345	}	367	}
		368
		369	ob = observe = 0;
346	}	370	}
347		371
348	player::~player ()	372	player::~player ()
349	{	373	{
350	/* Clear item stack */	374	/* Clear item stack */
…		…
377	* Note: there MUST be at least one player archetype!	401	* Note: there MUST be at least one player archetype!
378	*/	402	*/
379	archetype *	403	archetype *
380	get_player_archetype (archetype *at)	404	get_player_archetype (archetype *at)
381	{	405	{
382	archetype *start = at;	406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
383		407
384	for (;;)	408	for (;;)
385	{	409	{
386	if (at == NULL \|\| at->next == NULL)	410	if (++i == archetypes.end ())
387	at = first_archetype;	411	i = archetypes.begin ();
388	else	412	else if (*i == at)
389	at = at->next;	413	cleanup ("not a single player archetype found");
390		414
391	if (at->clone.type == PLAYER)	415	if ((*i)->type == PLAYER)
392	return at;	416	return *i;
393
394	if (at == start)
395	{
396	LOG (llevError, "No Player archetypes\n");
397	exit (-1);
398	}
399	}	417	}
400	}	418	}
401		419
402	object *	420	object *
403	get_nearest_player (object *mon)	421	get_nearest_player (object *mon)
…		…
769	}	787	}
770		788
771	void	789	void
772	object::roll_stats ()	790	object::roll_stats ()
773	{	791	{
774	int statsort [7];	792	int statsort [NUM_STATS];
775		793
776	for (;;)	794	for (;;)
777	{	795	{
778	int sum = 0;	796	int sum = 0;
779	for (int i = 7; i--; )	797	for (int i = NUM_STATS; i--; )
780	sum += statsort [i] = roll_stat ();	798	sum += statsort [i] = roll_stat ();
781		799
782	if (sum >= 82 && sum <= 116)	800	if (sum >= 82 && sum <= 116)
783	break;	801	break;
784	}	802	}
785		803
786	// Sort the stats so that rerolling is easier...	804	// Sort the stats so that rerolling is easier...
787	std::sort (statsort, statsort + 7, std::greater<int>());	805	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
788		806
		807	for (int i = 0; i < NUM_STATS; ++i)
789	stats.Str = statsort[0];	808	stats.stat (i) = statsort [i];
790	stats.Dex = statsort[1];
791	stats.Con = statsort[2];
792	stats.Int = statsort[3];
793	stats.Wis = statsort[4];
794	stats.Pow = statsort[5];
795	stats.Cha = statsort[6];
796		809
797	stats.exp = 0;	810	stats.exp = 0;
798	stats.ac = 0;	811	stats.ac = 0;
799		812
800	stats.hp = stats.maxhp;	813	stats.hp = stats.maxhp;
…		…
812	}	825	}
813		826
814	void	827	void
815	object::swap_stats (int a, int b)	828	object::swap_stats (int a, int b)
816	{	829	{
817	int tmp = get_attr_value (&contr->orig_stats, a);	830	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
818	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
819	set_attr_value (&contr->orig_stats, b, tmp);
820		831
		832	for (int i = 0; i < NUM_STATS; ++i)
821	stats.Str = contr->orig_stats.Str;	833	stats.stat (i) = contr->orig_stats.stat (i);
822	stats.Dex = contr->orig_stats.Dex;
823	stats.Con = contr->orig_stats.Con;
824	stats.Int = contr->orig_stats.Int;
825	stats.Wis = contr->orig_stats.Wis;
826	stats.Pow = contr->orig_stats.Pow;
827	stats.Cha = contr->orig_stats.Cha;
828		834
829	//TODO: the following code looks so borked and should, at the very least,	835	//TODO: the following code looks so borked and should, at the very least,
830	// be merged with the similar code in roll_stats	836	// be merged with the similar code in roll_stats
831	stats.ac = 0;	837	stats.ac = 0;
832		838
…		…
905	if (*first_map_ext_path)	911	if (*first_map_ext_path)
906	{	912	{
907	object *tmp;	913	object *tmp;
908	char mapname[MAX_BUF];	914	char mapname[MAX_BUF];
909		915
910	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
911	tmp = object::create ();	917	tmp = object::create ();
912	EXIT_PATH (tmp) = mapname;	918	EXIT_PATH (tmp) = mapname;
913	EXIT_X (tmp) = ob->x;	919	EXIT_X (tmp) = ob->x;
914	EXIT_Y (tmp) = ob->y;	920	EXIT_Y (tmp) = ob->y;
915	ob->enter_exit (tmp); /* we don't really care if it succeeded;	921	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
934	int x = ob->x, y = ob->y;	940	int x = ob->x, y = ob->y;
935		941
936	ob->remove_statbonus ();	942	ob->remove_statbonus ();
937	ob->remove ();	943	ob->remove ();
938	ob->arch = get_player_archetype (ob->arch);	944	ob->arch = get_player_archetype (ob->arch);
939	ob->arch->clone.copy_to (ob);	945	ob->arch->copy_to (ob);
940	ob->instantiate ();	946	ob->instantiate ();
941	ob->stats = ob->contr->orig_stats;	947	ob->stats = ob->contr->orig_stats;
942	ob->name = ob->name_pl = name;	948	ob->name = ob->name_pl = name;
943	ob->x = x;	949	ob->x = x;
944	ob->y = y;	950	ob->y = y;
945	SET_ANIMATION (ob, 2); /* So player faces south */	951	SET_ANIMATION (ob, 2); /* So player faces south */
946	insert_ob_in_map (ob, ob->map, ob, 0);	952	insert_ob_in_map (ob, ob->map, ob, 0);
947	assign (ob->contr->title, ob->arch->clone.name);	953	assign (ob->contr->title, ob->arch->object::name);
948	ob->add_statbonus ();	954	ob->add_statbonus ();
949	}	955	}
950	while (!allowed_class (ob));	956	while (!allowed_class (ob));
951		957
952	update_object (ob, UP_OBJ_FACE);	958	update_object (ob, UP_OBJ_FACE);
…		…
1009	/* Cornered, get rid of scared */	1015	/* Cornered, get rid of scared */
1010	CLEAR_FLAG (op, FLAG_SCARED);	1016	CLEAR_FLAG (op, FLAG_SCARED);
1011	op->enemy = NULL;	1017	op->enemy = NULL;
1012	}	1018	}
1013		1019
1014
1015	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1020	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1016	* IT returns 1 if the player should keep on moving, 0 if he should	1021	* It returns 1 if the player should keep on moving, 0 if he should
1017	* stop.	1022	* stop.
1018	*/	1023	*/
1019	int	1024	int
1020	check_pick (object *op)	1025	check_pick (object *op)
1021	{	1026	{
…		…
1098	if (tmp->name != NULL)	1103	if (tmp->name != NULL)
1099	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1100	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1101	else	1106	else
1102	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1103	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1104		1109
1105	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1106	}	1111	}
1107		1112
1108	/* philosophy:	1113	/* philosophy:
…		…
1183	pick_up (op, tmp);	1188	pick_up (op, tmp);
1184	continue;	1189	continue;
1185	}	1190	}
1186		1191
1187	if (op->contr->mode & PU_READABLES)	1192	if (op->contr->mode & PU_READABLES)
1188	if (tmp->type == BOOK \|\| tmp->type == SCROLL)	1193	if (tmp->type == BOOK \|\| tmp->type == SCROLL \|\| tmp->type == INSCRIBABLE)
1189	{	1194	{
1190	pick_up (op, tmp);	1195	pick_up (op, tmp);
1191	continue;	1196	continue;
1192	}	1197	}
1193		1198
…		…
1301	/* careful: chairs and tables are weapons! */	1306	/* careful: chairs and tables are weapons! */
1302	if (op->contr->mode & PU_ALLWEAPON)	1307	if (op->contr->mode & PU_ALLWEAPON)
1303	{	1308	{
1304	if (tmp->type == WEAPON && tmp->name != NULL)	1309	if (tmp->type == WEAPON && tmp->name != NULL)
1305	{	1310	{
1306	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1307	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1308	{	1313	{
1309	pick_up (op, tmp);	1314	pick_up (op, tmp);
1310	continue;	1315	continue;
1311	}	1316	}
1312	}	1317	}
1313		1318
1314	if (tmp->type == WEAPON && tmp->name == NULL)	1319	if (tmp->type == WEAPON && tmp->name == NULL)
1315	{	1320	{
1316	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1321	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1317	{	1322	{
1318	pick_up (op, tmp);	1323	pick_up (op, tmp);
1319	continue;	1324	continue;
1320	}	1325	}
1321	}	1326	}
…		…
1346	if (tmp->name != NULL)	1351	if (tmp->name != NULL)
1347	{	1352	{
1348	fprintf (stderr, "%s", tmp->name);	1353	fprintf (stderr, "%s", tmp->name);
1349	}	1354	}
1350	else	1355	else
1351	fprintf (stderr, "%s", tmp->arch->name);	1356	fprintf (stderr, "%s", tmp->arch->archname);
1352	fprintf (stderr, ",%d] = ", tmp->type);	1357	fprintf (stderr, ",%d] = ", tmp->type);
1353	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1358	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1354	#endif	1359	#endif
1355	continue;	1360	continue;
1356	}	1361	}
…		…
1426	else	1431	else
1427	{	1432	{
1428	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1433	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1429	{	1434	{
1430	attacktype = 1 << attacknum;	1435	attacktype = 1 << attacknum;
1431	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1436	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1432	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1437	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1433	{	1438	{
1434	tmp = arrow;	1439	tmp = arrow;
1435	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1440	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1436	}	1441	}
1437	}	1442	}
1438	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1443	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1439	{	1444	{
1440	tmp = arrow;	1445	tmp = arrow;
…		…
1533	*/	1538	*/
1534	int	1539	int
1535	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1540	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1536	{	1541	{
1537	object left, bow;	1542	object left, bow;
1538	int bowspeed, mflags;	1543	int mflags;
1539	maptile *m;	1544	maptile *m;
1540		1545
1541	if (!dir)	1546	if (!dir)
1542	{	1547	{
1543	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1548	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1544	return 0;	1549	return 0;
1545	}	1550	}
1546		1551
1547	if (player *pl = op->contr)	1552	if (op->contr)
1548	{	1553	bow = op->current_weapon;
1549	bow = pl->ranged_ob;
1550
1551	if (op->current_weapon != pl->ranged_ob)
1552	{
1553	op->current_weapon = pl->ranged_ob;
1554	new_draw_info_format (NDI_UNIQUE, 0, op, "You switch to your %s.", &op->current_weapon->name);
1555	op->update_stats ();
1556	}
1557	}
1558	else	1554	else
1559	{	1555	{
1560	for (bow = op->inv; bow; bow = bow->below)	1556	for (bow = op->inv; bow; bow = bow->below)
1561	/* Don't check for applied - monsters don't apply bows - in that way, they	1557	/* Don't check for applied - monsters don't apply bows - in that way, they
1562	* don't need to switch back and forth between bows and weapons.	1558	* don't need to switch back and forth between bows and weapons.
…		…
1583	{	1579	{
1584	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1580	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1585	return 0;	1581	return 0;
1586	}	1582	}
1587		1583
1588	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1589
1590	/* penalize ROF for bestarrow */
1591	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1592	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1593
1594	if (bowspeed < 1)
1595	bowspeed = 1;
1596
1597	if (arrow == NULL)	1584	if (arrow == NULL)
1598	{	1585	{
1599	if ((arrow = find_arrow (op, bow->race)) == NULL)	1586	if ((arrow = find_arrow (op, bow->race)) == NULL)
1600	{	1587	{
1601	if (op->type == PLAYER)	1588	if (op->type == PLAYER)
…		…
1635		1622
1636	arrow->set_owner (op);	1623	arrow->set_owner (op);
1637	arrow->skill = bow->skill;	1624	arrow->skill = bow->skill;
1638	arrow->direction = dir;	1625	arrow->direction = dir;
1639		1626
1640	if (op->type == PLAYER)
1641	{
1642	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1643	op->update_stats ();
1644	}
1645
1646	SET_ANIMATION (arrow, arrow->direction);
1647
1648	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1627	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1649	arrow->stats.hp = arrow->stats.dam;	1628	arrow->stats.hp = arrow->stats.dam;
1650	arrow->stats.grace = arrow->attacktype;	1629	arrow->stats.grace = arrow->attacktype;
1651		1630
1652	if (arrow->slaying)	1631	if (arrow->slaying)
1653	arrow->spellarg = strdup (arrow->slaying);	1632	arrow->spellarg = strdup (arrow->slaying);
1654		1633
1655	arrow->stats.dam += op->stats.dam + arrow->magic;	1634	#if 0
		1635	if (player *pl = op->contr)
		1636	{
		1637	float speed = pl->weapon_sp;
		1638
		1639	/* penalize ROF for bestarrow */
		1640	if (pl->bowtype == bow_bestarrow)
		1641	speed *= .9f;
		1642	else
		1643	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1644
		1645	op->speed_left += speed - op->speed;
		1646	}
		1647	#endif
		1648
		1649	SET_ANIMATION (arrow, arrow->direction);
1656		1650
1657	/* update the speed */	1651	/* update the speed */
1658	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1652	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1659	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1653	+ bow->stats.dam / 7.f;
1660		1654
1661	arrow->set_speed (max (arrow->speed, 1.0));	1655	arrow->set_speed (max (arrow->speed, 2.f));
1662	arrow->speed_left = 0;	1656	arrow->speed_left = 0;
1663		1657
1664	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1658	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1665		1659
1666	if (op->type == PLAYER)	1660	if (op->type == PLAYER)
1667	{	1661	{
1668	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1662	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1669	arrow->stats.wc -= dex_bonus[op->stats.Dex];	1663	wc -= dex_bonus[op->stats.Dex];
1670		1664
1671	if (!arrow->slaying)	1665	if (!arrow->slaying)
1672	arrow->slaying = op->slaying;	1666	arrow->slaying = op->slaying;
		1667
		1668	arrow->attacktype \|= op->attacktype;
1673	}	1669	}
1674	else	1670	else
1675	{	1671	{
1676	arrow->level = op->level;	1672	arrow->level = op->level;
1677	arrow->stats.wc -= bow->magic;	1673	arrow->stats.wc -= bow->magic;
1678		1674
1679	if (!arrow->slaying)	1675	if (!arrow->slaying)
1680	arrow->slaying = bow->slaying;	1676	arrow->slaying = bow->slaying;
1681	}
1682		1677
1683	arrow->stats.wc -= arrow->level;
1684
1685	arrow->attacktype \|= bow->attacktype;	1678	arrow->attacktype \|= bow->attacktype;
		1679	}
1686		1680
		1681	wc -= arrow->level;
		1682	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
		1683
		1684	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687	arrow->move_type = MOVE_FLY_LOW;	1685	arrow->move_type = MOVE_FLY_LOW;
1688	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1686	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1689		1687
1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1688	op->play_sound (sound_find ("fire_arrow"));
1691	m->insert (arrow, sx, sy, op);	1689	m->insert (arrow, sx, sy, op);
1692		1690
1693	if (!arrow->destroyed ())	1691	if (!arrow->destroyed ())
1694	move_arrow (arrow);	1692	move_arrow (arrow);
1695		1693
…		…
1736	else if (op->contr->bowtype == bow_spreadshot)	1734	else if (op->contr->bowtype == bow_spreadshot)
1737	{	1735	{
1738	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1736	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1739	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1737	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1740	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1738	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1741
1742	}	1739	}
1743	else	1740	else
1744	{	1741	{
1745	/* Simple case */	1742	/* Simple case */
1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1743	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1747	}	1744	}
		1745
1748	return ret;	1746	return ret;
1749	}	1747	}
1750
1751		1748
1752	/* Fires a misc (wand/rod/horn) object in 'dir'.	1749	/* Fires a misc (wand/rod/horn) object in 'dir'.
1753	* Broken apart from 'fire' to keep it more readable.	1750	* Broken apart from 'fire' to keep it more readable.
1754	*/	1751	*/
1755	void	1752	void
…		…
1767	{	1764	{
1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1765	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1769	return;	1766	return;
1770	}	1767	}
1771		1768
		1769	if (!op->change_weapon (item))
		1770	return;
		1771
1772	if (item->type == WAND)	1772	if (item->type == WAND)
1773	{	1773	{
1774	if (item->stats.food <= 0)	1774	if (item->stats.food <= 0)
1775	{	1775	{
1776	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1776	op->contr->play_sound (sound_find ("wand_poof"));
1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1778
1778	return;	1779	return;
1779	}	1780	}
1780	}	1781	}
1781	else if (item->type == ROD \|\| item->type == HORN)	1782	else if (item->type == ROD \|\| item->type == HORN)
1782	{	1783	{
1783	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1784	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1784	{	1785	{
1785	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1786	op->contr->play_sound (sound_find ("wand_poof"));
		1787
1786	if (item->type == ROD)	1788	if (item->type == ROD)
1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1788	else	1790	else
1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1791	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1792
1790	return;	1793	return;
1791	}	1794	}
1792	}	1795	}
1793		1796
1794	if (cast_spell (op, item, dir, item->inv, NULL))	1797	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1801	object *tmp;	1804	object *tmp;
1802		1805
1803	if (item->arch)	1806	if (item->arch)
1804	{	1807	{
1805	CLEAR_FLAG (item, FLAG_ANIMATE);	1808	CLEAR_FLAG (item, FLAG_ANIMATE);
1806	item->face = item->arch->clone.face;	1809	item->face = item->arch->face;
1807	item->set_speed (0);	1810	item->set_speed (0);
1808	}	1811	}
1809		1812
1810	if ((tmp = item->in_player ()))	1813	if ((tmp = item->in_player ()))
1811	esrv_update_item (UPD_ANIM, tmp, item);	1814	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1816	}	1819	}
1817	}	1820	}
1818		1821
1819	/* Received a fire command for the player - go and do it.	1822	/* Received a fire command for the player - go and do it.
1820	*/	1823	*/
1821	void	1824	bool
1822	fire (object *op, int dir)	1825	fire (object *op, int dir)
1823	{	1826	{
1824	int spellcost = 0;	1827	int spellcost = 0;
1825		1828
1826	/* check for loss of invisiblity/hide */	1829	/* check for loss of invisiblity/hide */
…		…
1830	player *pl = op->contr;	1833	player *pl = op->contr;
1831		1834
1832	if (pl->golem)	1835	if (pl->golem)
1833	{	1836	{
1834	control_golem (op->contr->golem, dir);	1837	control_golem (op->contr->golem, dir);
1835	return;	1838	return false;
1836	}	1839	}
1837		1840
1838	object *ob = pl->ranged_ob;	1841	object *ob = pl->ranged_ob;
1839		1842
1840	if (!ob)	1843	if (!ob)
1841	return;	1844	return false;
		1845
		1846	if (!op->change_weapon (ob))
		1847	return false;
		1848
		1849	if (op->speed_left > 0.f)
		1850	--op->speed_left;
		1851	else
		1852	return false;
1842		1853
1843	switch (ob->type)	1854	switch (ob->type)
1844	{	1855	{
1845	case BOW:	1856	case BOW:
1846	player_fire_bow (op, dir);	1857	player_fire_bow (op, dir);
…		…
1853	case BUILDER:	1864	case BUILDER:
1854	apply_map_builder (op, dir);	1865	apply_map_builder (op, dir);
1855	break;	1866	break;
1856		1867
1857	case SKILL:	1868	case SKILL:
1858	case SKILL_TOOL:
1859	do_skill (op, op, ob, dir, 0);	1869	do_skill (op, op, ob, dir, 0);
1860	break;	1870	break;
1861		1871
1862	default:	1872	default:
1863	fire_misc_object (op, dir);	1873	fire_misc_object (op, dir);
1864	break;	1874	break;
1865	}	1875	}
		1876
		1877	return true;
1866	}	1878	}
1867		1879
1868	/* find_key	1880	/* find_key
1869	* We try to find a key for the door as passed. If we find a key	1881	* We try to find a key for the door as passed. If we find a key
1870	* and successfully use it, we return the key, otherwise NULL	1882	* and successfully use it, we return the key, otherwise NULL
…		…
1957	* 0 otherwise	1969	* 0 otherwise
1958	*/	1970	*/
1959	static int	1971	static int
1960	player_attack_door (object op, object door)	1972	player_attack_door (object op, object door)
1961	{	1973	{
1962	/* If its a door, try to find a use a key. If we do destroy the door,	1974	/* If its a door, try to find a key. If we do destroy the door,
1963	* might as well return immediately as there is nothing more to do -	1975	* might as well return immediately as there is nothing more to do -
1964	* otherwise, we fall through to the rest of the code.	1976	* otherwise, we fall through to the rest of the code.
1965	*/	1977	*/
1966	object *key = find_key (op, op, door);	1978	object *key = find_key (op, op, door);
1967		1979
1968	/* IF we found a key, do some extra work */	1980	/* If we found a key, do some extra work */
1969	if (key)	1981	if (key)
1970	{	1982	{
1971	object *container = key->env;	1983	object *container = key->env;
1972
1973	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1974		1984
1975	if (action_makes_visible (op))	1985	if (action_makes_visible (op))
1976	make_visible (op);	1986	make_visible (op);
1977		1987
1978	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1988	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
…		…
2008	* It should keep the code cleaner.	2018	* It should keep the code cleaner.
2009	* When this is called, the players direction has been updated	2019	* When this is called, the players direction has been updated
2010	* (taking into account confusion.) The player is also actually	2020	* (taking into account confusion.) The player is also actually
2011	* going to try and move (not fire weapons).	2021	* going to try and move (not fire weapons).
2012	*/	2022	*/
2013	void	2023	bool
2014	move_player_attack (object *op, int dir)	2024	move_player_attack (object *op, int dir)
2015	{	2025	{
2016	object tmp, mon;
2017	int on_battleground;	2026	int on_battleground;
2018	maptile *m;
2019		2027
2020	sint16 nx = freearr_x[dir] + op->x;	2028	sint16 nx = freearr_x[dir] + op->x;
2021	sint16 ny = freearr_y[dir] + op->y;	2029	sint16 ny = freearr_y[dir] + op->y;
2022		2030
2023	on_battleground = op_on_battleground (op, 0, 0);	2031	on_battleground = op_on_battleground (op, 0, 0);
		2032
		2033	if (out_of_map (op->map, nx, ny))
		2034	return false;
		2035
		2036	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2037	{
		2038	--op->speed_left;
		2039	return true;
		2040	}
2024		2041
2025	/* If braced, or can't move to the square, and it is not out of the	2042	/* If braced, or can't move to the square, and it is not out of the
2026	* map, attack it. Note order of if statement is important - don't	2043	* map, attack it. Note order of if statement is important - don't
2027	* want to be calling move_ob if braced, because move_ob will move the	2044	* want to be calling move_ob if braced, because move_ob will move the
2028	* player. This is a pretty nasty hack, because if we could	2045	* player. This is a pretty nasty hack, because if we could
2029	* move to some space, it then means that if we are braced, we should	2046	* move to some space, it then means that if we are braced, we should
2030	* do nothing at all. As it is, if we are braced, we go through	2047	* do nothing at all. As it is, if we are braced, we go through
2031	* quite a bit of processing. However, it probably is less than what	2048	* quite a bit of processing. However, it probably is less than what
2032	* move_ob uses.	2049	* move_ob uses.
2033	*/	2050	*/
2034	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2035	{
2036	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2037	{
2038	m = op->map->xy_find (nx, ny);	2051	maptile *m = op->map->xy_find (nx, ny);
2039	if (!m)
2040	return; /* Don't think this should happen */
2041	}
2042	else
2043	m = op->map;
2044		2052
2045	if (!(tmp = m->at (nx, ny).bot))
2046	return;
2047
2048	mon = 0;
2049	/* Go through all the objects, and find ones of interest. Only stop if	2053	/* Go through all the objects, and find ones of interest. Only stop if
2050	* we find a monster - that is something we know we want to attack.	2054	* we find a monster - that is something we know we want to attack.
2051	* if its a door or barrel (can roll) see if there may be monsters	2055	* if its a door or barrel (can roll) see if there may be monsters
2052	* on the space	2056	* on the space
2053	*/	2057	*/
2054	while (tmp)	2058	object *mon;
2055	{	2059	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2056	if (tmp == op)	2060	{
2057	{	2061	if ((mon->flag [FLAG_ALIVE]
2058	tmp = tmp->above;	2062	\|\| mon->type == LOCKED_DOOR
2059	continue;	2063	\|\| mon->flag [FLAG_CAN_ROLL])
2060	}
2061
2062	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2063	{
2064	mon = tmp;	2064	&& mon != op)
2065	break;	2065	break;
2066	}	2066	}
2067		2067
2068	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2069	mon = tmp;
2070
2071	tmp = tmp->above;
2072	}
2073
2074	if (!mon) /* This happens anytime the player tries to move */	2068	if (!mon) /* This happens anytime the player tries to move */
2075	return; /* into a wall */	2069	return false; /* into a wall */
2076		2070
2077	if (mon->head)
2078	mon = mon->head;	2071	mon = mon->head_ ();
2079		2072
2080	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2073	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2074	if (op->contr->weapon_sp_left > 0.f)
2081	if (player_attack_door (op, mon))	2075	if (player_attack_door (op, mon))
		2076	{
		2077	--op->contr->weapon_sp_left;
2082	return;	2078	return true;
		2079	}
2083		2080
2084	/* The following deals with possibly attacking peaceful	2081	/* The following deals with possibly attacking peaceful
2085	* or frienddly creatures. Basically, all players are considered	2082	* or friendly creatures. Basically, all players are considered
2086	* unaggressive. If the moving player has peaceful set, then the	2083	* unaggressive. If the moving player has peaceful set, then the
2087	* object should be pushed instead of attacked. It is assumed that	2084	* object should be pushed instead of attacked. It is assumed that
2088	* if you are braced, you will not attack friends accidently,	2085	* if you are braced, you will not attack friends accidently,
2089	* and thus will not push them.	2086	* and thus will not push them.
2090	*/	2087	*/
2091		2088
2092	/* If the creature is a pet, push it even if the player is not	2089	/* If the creature is a pet, push it even if the player is not
2093	* peaceful. Our assumption is the creature is a pet if the	2090	* peaceful. Our assumption is the creature is a pet if the
2094	* player owns it and it is either friendly or unagressive.	2091	* player owns it and it is either friendly or unagressive.
2095	*/	2092	*/
2096	if ((op->type == PLAYER)	2093	if (op->type == PLAYER
2097	#if COZY_SERVER
2098	&&
2099	((mon->owner && mon->owner->contr	2094	&& ((mon->owner && mon->owner->contr
2100	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2095	&& same_party (mon->owner->contr->party, op->contr->party))
2101	#else
2102	&& mon->owner == op	2096	\|\| mon->owner == op)
2103	#endif
2104	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2097	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2105	{	2098	{
2106	/* If we're braced, we don't want to switch places with it */	2099	/* If we're braced, we don't want to switch places with it */
2107	if (op->contr->braced)	2100	if (op->contr->braced)
2108	return;	2101	return false;
2109		2102
2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2103	if (op->speed_left > 0.f)
		2104	{
		2105	--op->speed_left;
		2106
		2107	op->play_sound (sound_find ("push_player"));
2111	push_ob (mon, dir, op);	2108	push_ob (mon, dir, op);
		2109
2112	if (op->contr->tmp_invis \|\| op->hide)	2110	if (op->contr->tmp_invis \|\| op->hide)
2113	make_visible (op);	2111	make_visible (op);
2114		2112
2115	return;	2113	return true;
2116	}	2114	}
		2115	else
		2116	return false;
		2117	}
2117		2118
2118	/* in certain circumstances, you shouldn't attack friendly	2119	/* in certain circumstances, you shouldn't attack friendly
2119	* creatures. Note that if you are braced, you can't push	2120	* creatures. Note that if you are braced, you can't push
2120	* someone, but put it inside this loop so that you won't	2121	* someone, but put it inside this loop so that you won't
2121	* attack them either.	2122	* attack them either.
2122	*/	2123	*/
2123	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2124	if ((mon->type == PLAYER \|\| mon->enemy != op)
2124	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2125	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2125	#ifdef PROHIBIT_PLAYERKILL
2126	(op->contr->peaceful	2126	&& ((op->contr->peaceful
2127	\|\| (mon->type == PLAYER	2127	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2128	&& mon->contr->
2129	peaceful)) &&
2130	#else
2131	op->contr->peaceful &&
2132	#endif
2133	!on_battleground))	2128	&& !on_battleground))
		2129	{
		2130	if (op->speed_left > 0.f)
2134	{	2131	{
		2132	--op->speed_left;
		2133
2135	if (!op->contr->braced)	2134	if (!op->contr->braced)
2136	{	2135	{
2137	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2136	op->play_sound (sound_find ("push_player"));
2138	push_ob (mon, dir, op);	2137	push_ob (mon, dir, op);
2139	}	2138	}
2140	else	2139	else
2141	new_draw_info (0, 0, op, "You withhold your attack");	2140	new_draw_info (0, 0, op, "You withhold your attack");
2142		2141
2143	if (op->contr->tmp_invis \|\| op->hide)	2142	if (op->contr->tmp_invis \|\| op->hide)
2144	make_visible (op);	2143	make_visible (op);
2145	}
2146		2144
		2145	return true;
		2146	}
		2147	}
2147	/* If the object is a boulder or other rollable object, then	2148	/* If the object is a boulder or other rollable object, then
2148	* roll it if not braced. You can't roll it if you are braced.	2149	* roll it if not braced. You can't roll it if you are braced.
2149	*/	2150	*/
2150	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2151	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2152	{
		2153	if (op->speed_left > 0.f)
2151	{	2154	{
		2155	--op->speed_left;
		2156
2152	recursive_roll (mon, dir, op);	2157	recursive_roll (mon, dir, op);
2153	if (action_makes_visible (op))	2158	if (action_makes_visible (op))
2154	make_visible (op);	2159	make_visible (op);
2155	}
2156		2160
		2161	return true;
		2162	}
		2163	}
2157	/* Any generic living creature. Including things like doors.	2164	/* Any generic living creature. Including things like doors.
2158	* Way it works is like this: First, it must have some hit points	2165	* Way it works is like this: First, it must have some hit points
2159	* and be living. Then, it must be one of the following:	2166	* and be living. Then, it must be one of the following:
2160	* 1) Not a player, 2) A player, but of a different party. Note	2167	* 1) Not a player, 2) A player, but of a different party. Note
2161	* that party_number -1 is no party, so attacks can still happen.	2168	* that party_number -1 is no party, so attacks can still happen.
2162	*/	2169	*/
2163	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2170	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2164	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2171	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2165	{	2172	{
2166		2173	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2167	/* If the player hasn't hit something this tick, and does
2168	* so, give them speed boost based on weapon speed. Doing
2169	* it here is better than process_players2, which basically
2170	* incurred a 1 tick offset.
2171	*/
2172	if (!op->contr->has_hit)
2173	{	2174	{
2174	op->speed_left += op->speed / op->contr->weapon_sp;	2175	--op->contr->weapon_sp_left;
2175
2176	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2177	}
2178		2176
2179	skill_attack (mon, op, 0, 0, 0);	2177	skill_attack (mon, op, 0, 0, 0);
2180
2181	/* If attacking another player, that player gets automatic
2182	* hitback, and doesn't loose luck either.
2183	* Disable hitback on the battleground or if the target is
2184	* the wiz.
2185	*/
2186	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2187	{
2188	short luck = mon->stats.luck;
2189
2190	mon->contr->has_hit = 1;
2191	skill_attack (op, mon, 0, 0, 0);
2192	mon->stats.luck = luck;
2193	}
2194		2178
2195	if (action_makes_visible (op))	2179	if (action_makes_visible (op))
2196	make_visible (op);	2180	make_visible (op);
2197	}
2198	} /* if player should attack something */
2199	}
2200		2181
2201	int	2182	return true;
		2183	}
		2184	}
		2185
		2186	return false;
		2187	}
		2188
		2189	bool
2202	move_player (object *op, int dir)	2190	move_player (object *op, int dir)
2203	{	2191	{
2204	int pick;	2192	int pick;
2205		2193
2206	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2194	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2220	op->facing = dir;	2208	op->facing = dir;
2221		2209
2222	if (op->hide)	2210	if (op->hide)
2223	do_hidden_move (op);	2211	do_hidden_move (op);
2224		2212
		2213	bool retval;
		2214
2225	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2215	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2226	/nop / ;	2216	retval = RESULT_INT (0);
2227	else if (op->contr->fire_on)	2217	else if (op->contr->fire_on)
2228	fire (op, dir);	2218	retval = fire (op, dir);
2229	else	2219	else
2230	{	2220	{
2231	move_player_attack (op, dir);	2221	retval = move_player_attack (op, dir);
2232	pick = check_pick (op);	2222	pick = check_pick (op);
2233	}	2223	}
2234		2224
2235	/* Add special check for newcs players and fire on - this way, the	2225	/* Add special check for newcs players and fire on - this way, the
2236	* server can handle repeat firing.	2226	* server can handle repeat firing.
…		…
2243	/* Update how the player looks. Use the facing, so direction may	2233	/* Update how the player looks. Use the facing, so direction may
2244	* get reset to zero. This allows for full animation capabilities	2234	* get reset to zero. This allows for full animation capabilities
2245	* for players.	2235	* for players.
2246	*/	2236	*/
2247	animate_object (op, op->facing);	2237	animate_object (op, op->facing);
2248	return 0;	2238
		2239	return retval;
2249	}	2240	}
2250		2241
2251	/* This is similar to handle_player, below, but is only used by the	2242	/* This is similar to handle_player, below, but is only used by the
2252	* new client/server stuff.	2243	* new client/server stuff.
2253	* This is sort of special, in that the new client/server actually uses	2244	* This is sort of special, in that the new client/server actually uses
2254	* the new speed values for commands.	2245	* the new speed values for commands.
2255	*	2246	*
2256	* Returns true if there are more actions we can do.	2247	* Returns true if there are more actions we can do. Should not do
		2248	* many actions in a row, as that would be too unfair to other
		2249	* players.
2257	*/	2250	*/
2258	int	2251	bool
2259	handle_newcs_player (object *op)	2252	handle_newcs_player (object *op)
2260	{	2253	{
2261	if (QUERY_FLAG (op, FLAG_SCARED))	2254	if (QUERY_FLAG (op, FLAG_SCARED))
2262	{	2255	{
2263	flee_player (op);	2256	if (op->speed_left > 0.f)
2264	/* If player is still scared, that is his action for this tick */
2265	if (QUERY_FLAG (op, FLAG_SCARED))
2266	{	2257	{
2267	op->speed_left--;	2258	--op->speed_left;
		2259	flee_player (op);
		2260
2268	return 0;	2261	return true;
2269	}	2262	}
		2263	else
		2264	return false;
2270	}	2265	}
2271		2266
2272	/* call this here - we also will call this in do_ericserver, but	2267	/* call this here - we also will call this in do_ericserver, but
2273	* the players time has been increased when doericserver has been	2268	* the players time has been increased when doericserver has been
2274	* called, so we recheck it here.	2269	* called, so we recheck it here.
2275	*/	2270	*/
2276	if (op->contr->ns->handle_command ())	2271	if (op->contr->ns->handle_command ())
2277	return 1;	2272	return true;
2278		2273
2279	if (op->speed_left > 0)
2280	{
2281	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2274	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2282	{
2283	/* All move commands take 1 tick, at least for now */
2284	op->speed_left--;
2285
2286	/* Instead of all the stuff below, let move_player take care
2287	* of it. Also, some of the skill stuff is only put in
2288	* there, as well as the confusion stuff.
2289	*/
2290	move_player (op, op->direction);	2275	return move_player (op, op->direction);
2291		2276
2292	return op->speed_left > 0;
2293	}
2294	}
2295
2296	return 0;	2277	return false;
2297	}	2278	}
2298		2279
2299	int	2280	int
2300	save_life (object *op)	2281	save_life (object *op)
2301	{	2282	{
…		…
2303	return 0;	2284	return 0;
2304		2285
2305	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2286	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2306	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2287	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2307	{	2288	{
2308	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2289	op->play_sound (sound_find ("ob_evaporate"));
2309	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2290	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2310		2291
2311	if (op->contr)	2292	if (op->contr)
2312	esrv_del_item (op->contr, tmp->count);	2293	esrv_del_item (op->contr, tmp->count);
2313		2294
…		…
2333	/* This goes throws the inventory and removes unpaid objects, and puts them	2314	/* This goes throws the inventory and removes unpaid objects, and puts them
2334	* back in the map (location and map determined by values of env). This	2315	* back in the map (location and map determined by values of env). This
2335	* function will descend into containers. op is the object to start the search	2316	* function will descend into containers. op is the object to start the search
2336	* from.	2317	* from.
2337	*/	2318	*/
2338	void	2319	static void
2339	remove_unpaid_objects (object op, object env)	2320	drop_unpaid_items (object op, object env)
2340	{	2321	{
2341	while (op)	2322	while (op)
2342	{	2323	{
2343	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2324	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2344		2325
…		…
2348	esrv_del_item (env->contr, op->count);	2329	esrv_del_item (env->contr, op->count);
2349		2330
2350	op->insert_at (env);	2331	op->insert_at (env);
2351	}	2332	}
2352	else if (op->inv)	2333	else if (op->inv)
2353	remove_unpaid_objects (op->inv, env);	2334	drop_unpaid_items (op->inv, env);
2354		2335
2355	op = next;	2336	op = next;
2356	}	2337	}
		2338	}
		2339
		2340	void
		2341	object::drop_unpaid_items ()
		2342	{
		2343	if (!flag [FLAG_REMOVED])
		2344	::drop_unpaid_items (inv, this);
2357	}	2345	}
2358		2346
2359	/*	2347	/*
2360	* Returns pointer a static string containing gravestone text	2348	* Returns pointer a static string containing gravestone text
2361	* Moved from apply.c to player.c - player.c is what	2349	* Moved from apply.c to player.c - player.c is what
…		…
2567	}	2555	}
2568		2556
2569	/* Digestion */	2557	/* Digestion */
2570	if (--op->last_eat < 0)	2558	if (--op->last_eat < 0)
2571	{	2559	{
2572	#ifdef COZY_SERVER	2560	int bonus = max (0, op->contr->digestion),
2573	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2561	penalty = max (0, -op->contr->digestion);
2574	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2575	#else
2576	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2577	#endif
2578		2562
2579	if (op->contr->gen_hp > 0)
2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2563	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2581	else
2582	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2583		2564
2584	/* dms do not consume food */	2565	/* dms do not consume food */
2585	if (!QUERY_FLAG (op, FLAG_WIZ))	2566	if (!QUERY_FLAG (op, FLAG_WIZ))
2586	op->stats.food--;	2567	op->stats.food--;
2587	}	2568	}
…		…
2648	object *tmp;	2629	object *tmp;
2649		2630
2650	if (save_life (op))	2631	if (save_life (op))
2651	return;	2632	return;
2652		2633
2653
2654	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2634	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2655	* in cities ONLY!!! It is very important that this doesn't get abused.	2635	* in cities ONLY!!! It is very important that this doesn't get abused.
2656	* Look at op_on_battleground() for more info --AndreasV	2636	* Look at op_on_battleground() for more info --AndreasV
2657	*/	2637	*/
2658	if (op_on_battleground (op, &x, &y))	2638	if (op_on_battleground (op, &x, &y))
…		…
2710	strcpy (op->contr->killer, "starvation");	2690	strcpy (op->contr->killer, "starvation");
2711	}	2691	}
2712	else	2692	else
2713	sprintf (buf, "%s died.", &op->name);	2693	sprintf (buf, "%s died.", &op->name);
2714		2694
2715	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2695	op->contr->play_sound (sound_find ("player_dies"));
2716		2696
2717	/* save the map location for corpse, gravestone */	2697	/* save the map location for corpse, gravestone */
2718	x = op->x;	2698	x = op->x;
2719	y = op->y;	2699	y = op->y;
2720	map = op->map;	2700	map = op->map;
…		…
2897		2877
2898	/*	2878	/*
2899	* Check to see if the player has any unpaid items. If so, remove them	2879	* Check to see if the player has any unpaid items. If so, remove them
2900	* and put them back in the map.	2880	* and put them back in the map.
2901	*/	2881	*/
2902	remove_unpaid_objects (op->inv, op);	2882	op->drop_unpaid_items ();
2903		2883
2904	/****************************************/	2884	/****************************************/
2905	/* */	2885	/* */
2906	/* Move player to his current respawn- */	2886	/* Move player to his current respawn- */
2907	/* position (usually last savebed) */	2887	/* position (usually last savebed) */
…		…
2927	object *force;	2907	object *force;
2928	int at;	2908	int at;
2929		2909
2930	force = get_archetype (FORCE_NAME);	2910	force = get_archetype (FORCE_NAME);
2931	/* 50 ticks should be enough time for the spell to abate */	2911	/* 50 ticks should be enough time for the spell to abate */
2932	force->speed = 0.1;	2912	force->speed = 0.1f;
2933	force->speed_left = -5.0;	2913	force->speed_left = -5.f;
2934	SET_FLAG (force, FLAG_APPLIED);	2914	SET_FLAG (force, FLAG_APPLIED);
2935	for (at = 0; at < NROFATTACKS; at++)	2915	for (at = 0; at < NROFATTACKS; at++)
2936	if (will_kill_again & (1 << at))	2916	if (will_kill_again & (1 << at))
2937	force->resist[at] = 100;	2917	force->resist[at] = 100;
2938		2918
…		…
3059	}	3039	}
3060		3040
3061	int	3041	int
3062	is_true_undead (object *op)	3042	is_true_undead (object *op)
3063	{	3043	{
3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3044	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3065	return 1;	3045	return 1;
3066		3046
3067	return 0;	3047	return 0;
3068	}	3048	}
3069		3049
…		…
3113	/* For Hidden creatures - a chance of becoming 'unhidden'	3093	/* For Hidden creatures - a chance of becoming 'unhidden'
3114	* every time they move - as we subtract off 'invisibility'	3094	* every time they move - as we subtract off 'invisibility'
3115	* AND, for players, if they move into a ridiculously unhideable	3095	* AND, for players, if they move into a ridiculously unhideable
3116	* spot (surrounded by clear terrain in broad daylight). -b.t.	3096	* spot (surrounded by clear terrain in broad daylight). -b.t.
3117	*/	3097	*/
3118
3119	void	3098	void
3120	do_hidden_move (object *op)	3099	do_hidden_move (object *op)
3121	{	3100	{
3122	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3101	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3123	object *skop;	3102	object *skop;
…		…
3240	* a blocked los square.	3219	* a blocked los square.
3241	* we use the archetype to figure out offsets.	3220	* we use the archetype to figure out offsets.
3242	*/	3221	*/
3243	while (op)	3222	while (op)
3244	{	3223	{
3245	dx = rv.distance_x + op->arch->clone.x;	3224	dx = rv.distance_x + op->arch->x;
3246	dy = rv.distance_y + op->arch->clone.y;	3225	dy = rv.distance_y + op->arch->y;
3247		3226
3248	/* only the viewable area the player sees is updated by LOS	3227	/* only the viewable area the player sees is updated by LOS
3249	* code, so we need to restrict ourselves to that range of values	3228	* code, so we need to restrict ourselves to that range of values
3250	* for any meaningful values.	3229	* for any meaningful values.
3251	*/	3230	*/
…		…
3376	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3355	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3377	return;	3356	return;
3378	}	3357	}
3379		3358
3380	/* everything seems okay - now bring on the gift: */	3359	/* everything seems okay - now bring on the gift: */
3381	item = &(tr->item->clone);	3360	item = tr->item;
3382		3361
3383	if (item->type == SPELL)	3362	if (item->type == SPELL)
3384	{	3363	{
3385	if (check_spell_known (who, item->name))	3364	if (check_spell_known (who, item->name))
3386	return;	3365	return;
…		…
3445	{	3424	{
3446	/* forces in the treasurelist can alter the player's stats */	3425	/* forces in the treasurelist can alter the player's stats */
3447	object *skin;	3426	object *skin;
3448		3427
3449	/* first get the dragon skin force */	3428	/* first get the dragon skin force */
3450	shstr_cmp dragon_skin_force ("dragon_skin_force");
3451	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3429	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3452	;	3430	;
3453		3431
3454	if (!skin)	3432	if (!skin)
3455	return;	3433	return;
3456		3434

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.120 by root, Thu May 3 09:39:56 2007 UTC vs. Revision 1.158 by root, Mon Aug 13 15:46:45 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.120 by root, Thu May 3 09:39:56 2007 UTC vs.
Revision 1.158 by root, Mon Aug 13 15:46:45 2007 UTC