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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.130 by root, Sat May 12 20:21:54 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 <sproto.h>	25	#include <sproto.h>
27	#include <sounds.h>	26	#include <sounds.h>
157	op->x = -1;	156	op->x = -1;
158	op->y = -1;	157	op->y = -1;
159	}	158	}
160		159
161	void	160	void
162	player::enter_map ()
163	{
164	object *tmp = object::create ();
165
166	EXIT_PATH (tmp) = maplevel;
167	EXIT_X (tmp) = ob->x;
168	EXIT_Y (tmp) = ob->y;
169	ob->enter_exit (tmp);
170
171	tmp->destroy ();
172	}
173
174	void
175	player::activate ()	161	player::activate ()
176	{	162	{
177	if (active)	163	if (active)
178	return;	164	return;
179		165
…		…
181	ob->remove ();	167	ob->remove ();
182	ob->map = 0;	168	ob->map = 0;
183	ob->activate_recursive ();	169	ob->activate_recursive ();
184	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
185	add_friendly_object (ob);	171	add_friendly_object (ob);
186	enter_map ();
187	}	172	}
188		173
189	void	174	void
190	player::deactivate ()	175	player::deactivate ()
191	{	176	{
…		…
221	ob->close_container (); //TODO: client-specific	206	ob->close_container (); //TODO: client-specific
222		207
223	ns->update_look = 0;	208	ns->update_look = 0;
224	ns->look_position = 0;	209	ns->look_position = 0;
225		210
226	clear_los (ob);	211	clear_los (this);
227		212
228	ns->reset_stats ();	213	ns->reset_stats ();
229		214
230	/* make sure he's a player -- needed because of class change. */	215	/* make sure he's a player -- needed because of class change. */
231	ob->type = PLAYER; // we are paranoid	216	ob->type = PLAYER; // we are paranoid
232	ob->race = ob->arch->clone.race;	217	ob->race = ob->arch->race;
233		218
234	ob->carrying = sum_weight (ob);	219	ob->carrying = sum_weight (ob);
235	link_player_skills (ob);	220	link_player_skills (ob);
236		221
237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238		223
239	assign (title, ob->arch->clone.name);	224	assign (title, ob->arch->object::name);
240		225
241	/* if it's a dragon player, set the correct title here */	226	/* if it's a dragon player, set the correct title here */
242	if (is_dragon_pl (ob))	227	if (is_dragon_pl (ob))
243	{	228	{
244	object tmp, abil = 0, *skin = 0;	229	object tmp, abil = 0, *skin = 0;
245		230
246	shstr_cmp dragon_ability_force ("dragon_ability_force");
247	shstr_cmp dragon_skin_force ("dragon_skin_force");
248
249	for (tmp = ob->inv; tmp; tmp = tmp->below)	231	for (tmp = ob->inv; tmp; tmp = tmp->below)
250	if (tmp->type == FORCE)	232	if (tmp->type == FORCE)
251	if (tmp->arch->name == dragon_ability_force)	233	if (tmp->arch->archname == shstr_dragon_ability_force)
252	abil = tmp;	234	abil = tmp;
253	else if (tmp->arch->name == dragon_skin_force)	235	else if (tmp->arch->archname == shstr_dragon_skin_force)
254	skin = tmp;	236	skin = tmp;
255		237
256	set_dragon_name (ob, abil, skin);	238	set_dragon_name (ob, abil, skin);
257	}	239	}
258		240
259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	241	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
260		242
261	esrv_new_player (this, ob->weight + ob->carrying);	243	esrv_new_player (this, ob->weight + ob->carrying);
		244
		245	ob->flag [FLAG_READY_WEAPON] = false;
		246	ob->flag [FLAG_READY_SKILL] = false;
		247	ob->flag [FLAG_READY_BOW] = false;
262		248
263	for (object *op = ob->inv; op; op = op->below)	249	for (object *op = ob->inv; op; op = op->below)
264	if (op->flag [FLAG_APPLIED])	250	if (op->flag [FLAG_APPLIED])
265	switch (op->type)	251	switch (op->type)
266	{	252	{
		253	case SKILL:
		254	ob->flag [FLAG_APPLIED] = false;
		255	break;
		256
267	case WAND:	257	case WAND:
268	case ROD:	258	case ROD:
269	case HORN:	259	case HORN:
270	case BOW:	260	case BOW:
271	case SKILL:	261	ranged_ob = op;
272	case SKILL_TOOL:	262	break;
		263
273	case WEAPON:	264	case WEAPON:
274	apply_special (ob, op, AP_UNAPPLY);	265	combat_ob = op;
275	apply_special (ob, op, AP_APPLY);
276	break;	266	break;
277	}	267	}
278		268
		269	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
279	ob->update_stats ();	270	ob->update_stats ();
		271
280	ns->floorbox_update ();	272	ns->floorbox_update ();
281
282	esrv_send_inventory (ob, ob);	273	esrv_send_inventory (ob, ob);
283	esrv_add_spells (this, 0);	274	esrv_add_spells (this, 0);
284		275
285	activate ();	276	activate ();
286		277
…		…
306	ns->pl = 0;	297	ns->pl = 0;
307	ns = 0;	298	ns = 0;
308	}	299	}
309		300
310	if (ob)	301	if (ob)
		302	{
311	ob->close_container (); //TODO: client-specific	303	ob->close_container (); //TODO: client-specific
		304	ob->drop_unpaid_items ();
		305	}
		306
		307	observe = ob;
312		308
313	deactivate ();	309	deactivate ();
314	}	310	}
315		311
316	// the need for this function can be explained	312	// the need for this function can be explained
317	// by load_object not returning the object	313	// by load_object not returning the object
318	void	314	void
319	player::set_object (object *op)	315	player::set_object (object *op)
320	{	316	{
321	ob = op;	317	ob = observe = op;
322	ob->contr = this; /* this aren't yet in archetype */	318	ob->contr = this; /* this aren't yet in archetype */
323		319
324	ob->speed_left = 0.5;
325	ob->speed = 1.0;	320	ob->speed = 1.0f;
		321	ob->speed_left = 0.5f;
		322
326	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;
327	}	331	}
328		332
329	player::player ()	333	player::player ()
330	{	334	{
331	/* There are some elements we want initialised to non zero value -	335	/* There are some elements we want initialised to non zero value -
…		…
342	petmode = pet_normal;	346	petmode = pet_normal;
343	listening = 10;	347	listening = 10;
344	usekeys = containers;	348	usekeys = containers;
345	peaceful = 1; /* default peaceful */	349	peaceful = 1; /* default peaceful */
346	do_los = 1;	350	do_los = 1;
		351
		352	weapon_sp = 1.0f;
		353	weapon_sp_left = 0.5f;
347	}	354	}
348		355
349	void	356	void
350	player::do_destroy ()	357	player::do_destroy ()
351	{	358	{
…		…
356	if (ob)	363	if (ob)
357	{	364	{
358	ob->destroy_inv (false);	365	ob->destroy_inv (false);
359	ob->destroy ();	366	ob->destroy ();
360	}	367	}
		368
		369	ob = observe = 0;
361	}	370	}
362		371
363	player::~player ()	372	player::~player ()
364	{	373	{
365	/* Clear item stack */	374	/* Clear item stack */
…		…
392	* Note: there MUST be at least one player archetype!	401	* Note: there MUST be at least one player archetype!
393	*/	402	*/
394	archetype *	403	archetype *
395	get_player_archetype (archetype *at)	404	get_player_archetype (archetype *at)
396	{	405	{
397	archetype *start = at;	406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
398		407
399	for (;;)	408	for (;;)
400	{	409	{
401	if (at == NULL \|\| at->next == NULL)	410	if (++i == archetypes.end ())
402	at = first_archetype;	411	i = archetypes.begin ();
403	else	412	else if (*i == at)
404	at = at->next;	413	cleanup ("not a single player archetype found");
405		414
406	if (at->clone.type == PLAYER)	415	if ((*i)->type == PLAYER)
407	return at;	416	return *i;
408
409	if (at == start)
410	{
411	LOG (llevError, "No Player archetypes\n");
412	exit (-1);
413	}
414	}	417	}
415	}	418	}
416		419
417	object *	420	object *
418	get_nearest_player (object *mon)	421	get_nearest_player (object *mon)
…		…
908	if (*first_map_ext_path)	911	if (*first_map_ext_path)
909	{	912	{
910	object *tmp;	913	object *tmp;
911	char mapname[MAX_BUF];	914	char mapname[MAX_BUF];
912		915
913	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);
914	tmp = object::create ();	917	tmp = object::create ();
915	EXIT_PATH (tmp) = mapname;	918	EXIT_PATH (tmp) = mapname;
916	EXIT_X (tmp) = ob->x;	919	EXIT_X (tmp) = ob->x;
917	EXIT_Y (tmp) = ob->y;	920	EXIT_Y (tmp) = ob->y;
918	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;
…		…
937	int x = ob->x, y = ob->y;	940	int x = ob->x, y = ob->y;
938		941
939	ob->remove_statbonus ();	942	ob->remove_statbonus ();
940	ob->remove ();	943	ob->remove ();
941	ob->arch = get_player_archetype (ob->arch);	944	ob->arch = get_player_archetype (ob->arch);
942	ob->arch->clone.copy_to (ob);	945	ob->arch->copy_to (ob);
943	ob->instantiate ();	946	ob->instantiate ();
944	ob->stats = ob->contr->orig_stats;	947	ob->stats = ob->contr->orig_stats;
945	ob->name = ob->name_pl = name;	948	ob->name = ob->name_pl = name;
946	ob->x = x;	949	ob->x = x;
947	ob->y = y;	950	ob->y = y;
948	SET_ANIMATION (ob, 2); /* So player faces south */	951	SET_ANIMATION (ob, 2); /* So player faces south */
949	insert_ob_in_map (ob, ob->map, ob, 0);	952	insert_ob_in_map (ob, ob->map, ob, 0);
950	assign (ob->contr->title, ob->arch->clone.name);	953	assign (ob->contr->title, ob->arch->object::name);
951	ob->add_statbonus ();	954	ob->add_statbonus ();
952	}	955	}
953	while (!allowed_class (ob));	956	while (!allowed_class (ob));
954		957
955	update_object (ob, UP_OBJ_FACE);	958	update_object (ob, UP_OBJ_FACE);
…		…
1100	if (tmp->name != NULL)	1103	if (tmp->name != NULL)
1101	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1102	&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))));
1103	else	1106	else
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105	&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))));
1106		1109
1107	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1108	}	1111	}
1109		1112
1110	/* philosophy:	1113	/* philosophy:
…		…
1185	pick_up (op, tmp);	1188	pick_up (op, tmp);
1186	continue;	1189	continue;
1187	}	1190	}
1188		1191
1189	if (op->contr->mode & PU_READABLES)	1192	if (op->contr->mode & PU_READABLES)
1190	if (tmp->type == BOOK \|\| tmp->type == SCROLL)	1193	if (tmp->type == BOOK \|\| tmp->type == SCROLL \|\| tmp->type == INSCRIBABLE)
1191	{	1194	{
1192	pick_up (op, tmp);	1195	pick_up (op, tmp);
1193	continue;	1196	continue;
1194	}	1197	}
1195		1198
…		…
1303	/* careful: chairs and tables are weapons! */	1306	/* careful: chairs and tables are weapons! */
1304	if (op->contr->mode & PU_ALLWEAPON)	1307	if (op->contr->mode & PU_ALLWEAPON)
1305	{	1308	{
1306	if (tmp->type == WEAPON && tmp->name != NULL)	1309	if (tmp->type == WEAPON && tmp->name != NULL)
1307	{	1310	{
1308	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 &&
1309	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310	{	1313	{
1311	pick_up (op, tmp);	1314	pick_up (op, tmp);
1312	continue;	1315	continue;
1313	}	1316	}
1314	}	1317	}
1315		1318
1316	if (tmp->type == WEAPON && tmp->name == NULL)	1319	if (tmp->type == WEAPON && tmp->name == NULL)
1317	{	1320	{
1318	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)
1319	{	1322	{
1320	pick_up (op, tmp);	1323	pick_up (op, tmp);
1321	continue;	1324	continue;
1322	}	1325	}
1323	}	1326	}
…		…
1348	if (tmp->name != NULL)	1351	if (tmp->name != NULL)
1349	{	1352	{
1350	fprintf (stderr, "%s", tmp->name);	1353	fprintf (stderr, "%s", tmp->name);
1351	}	1354	}
1352	else	1355	else
1353	fprintf (stderr, "%s", tmp->arch->name);	1356	fprintf (stderr, "%s", tmp->arch->archname);
1354	fprintf (stderr, ",%d] = ", tmp->type);	1357	fprintf (stderr, ",%d] = ", tmp->type);
1355	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))));
1356	#endif	1359	#endif
1357	continue;	1360	continue;
1358	}	1361	}
…		…
1428	else	1431	else
1429	{	1432	{
1430	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1433	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1431	{	1434	{
1432	attacktype = 1 << attacknum;	1435	attacktype = 1 << attacknum;
1433	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1436	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1434	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)
1435	{	1438	{
1436	tmp = arrow;	1439	tmp = arrow;
1437	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;
1438	}	1441	}
1439	}	1442	}
1440	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1443	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1441	{	1444	{
1442	tmp = arrow;	1445	tmp = arrow;
…		…
1535	*/	1538	*/
1536	int	1539	int
1537	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)
1538	{	1541	{
1539	object left, bow;	1542	object left, bow;
1540	int bowspeed, mflags;	1543	int mflags;
1541	maptile *m;	1544	maptile *m;
1542		1545
1543	if (!dir)	1546	if (!dir)
1544	{	1547	{
1545	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!");
1546	return 0;	1549	return 0;
1547	}	1550	}
1548		1551
1549	if (player *pl = op->contr)	1552	if (op->contr)
1550	{	1553	bow = op->current_weapon;
1551	bow = pl->ranged_ob;
1552	if (!op->change_weapon (bow))
1553	return 0;
1554	}
1555	else	1554	else
1556	{	1555	{
1557	for (bow = op->inv; bow; bow = bow->below)	1556	for (bow = op->inv; bow; bow = bow->below)
1558	/* 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
1559	* 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.
…		…
1580	{	1579	{
1581	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);
1582	return 0;	1581	return 0;
1583	}	1582	}
1584		1583
1585	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1586
1587	/* penalize ROF for bestarrow */
1588	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1589	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1590
1591	if (bowspeed < 1)
1592	bowspeed = 1;
1593
1594	if (arrow == NULL)	1584	if (arrow == NULL)
1595	{	1585	{
1596	if ((arrow = find_arrow (op, bow->race)) == NULL)	1586	if ((arrow = find_arrow (op, bow->race)) == NULL)
1597	{	1587	{
1598	if (op->type == PLAYER)	1588	if (op->type == PLAYER)
…		…
1639	arrow->stats.grace = arrow->attacktype;	1629	arrow->stats.grace = arrow->attacktype;
1640		1630
1641	if (arrow->slaying)	1631	if (arrow->slaying)
1642	arrow->spellarg = strdup (arrow->slaying);	1632	arrow->spellarg = strdup (arrow->slaying);
1643		1633
1644	if (op->type == PLAYER)	1634	#if 0
1645	{	1635	if (player *pl = op->contr)
1646	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1647	op->update_stats ();
1648	}	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
1649		1648
1650	SET_ANIMATION (arrow, arrow->direction);	1649	SET_ANIMATION (arrow, arrow->direction);
1651		1650
1652	/* update the speed */	1651	/* update the speed */
1653	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1652	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1654	+ bow->stats.dam / 7.0;	1653	+ bow->stats.dam / 7.f;
1655		1654
1656	arrow->set_speed (max (arrow->speed, 2.0));	1655	arrow->set_speed (max (arrow->speed, 2.f));
1657	arrow->speed_left = 0;	1656	arrow->speed_left = 0;
1658		1657
1659	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1658	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1660		1659
1661	if (op->type == PLAYER)	1660	if (op->type == PLAYER)
…		…
1684		1683
1685	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1684	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1686	arrow->move_type = MOVE_FLY_LOW;	1685	arrow->move_type = MOVE_FLY_LOW;
1687	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1686	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1688		1687
1689	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1688	op->play_sound (sound_find ("fire_arrow"));
1690	m->insert (arrow, sx, sy, op);	1689	m->insert (arrow, sx, sy, op);
1691		1690
1692	if (!arrow->destroyed ())	1691	if (!arrow->destroyed ())
1693	move_arrow (arrow);	1692	move_arrow (arrow);
1694		1693
…		…
1745	}	1744	}
1746		1745
1747	return ret;	1746	return ret;
1748	}	1747	}
1749		1748
1750
1751	/* Fires a misc (wand/rod/horn) object in 'dir'.	1749	/* Fires a misc (wand/rod/horn) object in 'dir'.
1752	* Broken apart from 'fire' to keep it more readable.	1750	* Broken apart from 'fire' to keep it more readable.
1753	*/	1751	*/
1754	void	1752	void
1755	fire_misc_object (object *op, int dir)	1753	fire_misc_object (object *op, int dir)
…		…
1773		1771
1774	if (item->type == WAND)	1772	if (item->type == WAND)
1775	{	1773	{
1776	if (item->stats.food <= 0)	1774	if (item->stats.food <= 0)
1777	{	1775	{
1778	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1776	op->contr->play_sound (sound_find ("wand_poof"));
1779	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));
1780		1778
1781	return;	1779	return;
1782	}	1780	}
1783	}	1781	}
1784	else if (item->type == ROD \|\| item->type == HORN)	1782	else if (item->type == ROD \|\| item->type == HORN)
1785	{	1783	{
1786	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))
1787	{	1785	{
1788	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1786	op->contr->play_sound (sound_find ("wand_poof"));
1789		1787
1790	if (item->type == ROD)	1788	if (item->type == ROD)
1791	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));
1792	else	1790	else
1793	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));
…		…
1806	object *tmp;	1804	object *tmp;
1807		1805
1808	if (item->arch)	1806	if (item->arch)
1809	{	1807	{
1810	CLEAR_FLAG (item, FLAG_ANIMATE);	1808	CLEAR_FLAG (item, FLAG_ANIMATE);
1811	item->face = item->arch->clone.face;	1809	item->face = item->arch->face;
1812	item->set_speed (0);	1810	item->set_speed (0);
1813	}	1811	}
1814		1812
1815	if ((tmp = item->in_player ()))	1813	if ((tmp = item->in_player ()))
1816	esrv_update_item (UPD_ANIM, tmp, item);	1814	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1821	}	1819	}
1822	}	1820	}
1823		1821
1824	/* Received a fire command for the player - go and do it.	1822	/* Received a fire command for the player - go and do it.
1825	*/	1823	*/
1826	void	1824	bool
1827	fire (object *op, int dir)	1825	fire (object *op, int dir)
1828	{	1826	{
1829	int spellcost = 0;	1827	int spellcost = 0;
1830		1828
1831	/* check for loss of invisiblity/hide */	1829	/* check for loss of invisiblity/hide */
…		…
1835	player *pl = op->contr;	1833	player *pl = op->contr;
1836		1834
1837	if (pl->golem)	1835	if (pl->golem)
1838	{	1836	{
1839	control_golem (op->contr->golem, dir);	1837	control_golem (op->contr->golem, dir);
1840	return;	1838	return false;
1841	}	1839	}
1842		1840
1843	object *ob = pl->ranged_ob;	1841	object *ob = pl->ranged_ob;
1844		1842
1845	if (!ob)	1843	if (!ob)
1846	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;
1847		1853
1848	switch (ob->type)	1854	switch (ob->type)
1849	{	1855	{
1850	case BOW:	1856	case BOW:
1851	player_fire_bow (op, dir);	1857	player_fire_bow (op, dir);
…		…
1858	case BUILDER:	1864	case BUILDER:
1859	apply_map_builder (op, dir);	1865	apply_map_builder (op, dir);
1860	break;	1866	break;
1861		1867
1862	case SKILL:	1868	case SKILL:
1863	case SKILL_TOOL:
1864	do_skill (op, op, ob, dir, 0);	1869	do_skill (op, op, ob, dir, 0);
1865	break;	1870	break;
1866		1871
1867	default:	1872	default:
1868	fire_misc_object (op, dir);	1873	fire_misc_object (op, dir);
1869	break;	1874	break;
1870	}	1875	}
		1876
		1877	return true;
1871	}	1878	}
1872		1879
1873	/* find_key	1880	/* find_key
1874	* 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
1875	* and successfully use it, we return the key, otherwise NULL	1882	* and successfully use it, we return the key, otherwise NULL
…		…
1962	* 0 otherwise	1969	* 0 otherwise
1963	*/	1970	*/
1964	static int	1971	static int
1965	player_attack_door (object op, object door)	1972	player_attack_door (object op, object door)
1966	{	1973	{
1967	/* 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,
1968	* 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 -
1969	* otherwise, we fall through to the rest of the code.	1976	* otherwise, we fall through to the rest of the code.
1970	*/	1977	*/
1971	object *key = find_key (op, op, door);	1978	object *key = find_key (op, op, door);
1972		1979
1973	/* IF we found a key, do some extra work */	1980	/* If we found a key, do some extra work */
1974	if (key)	1981	if (key)
1975	{	1982	{
1976	object *container = key->env;	1983	object *container = key->env;
1977
1978	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1979		1984
1980	if (action_makes_visible (op))	1985	if (action_makes_visible (op))
1981	make_visible (op);	1986	make_visible (op);
1982		1987
1983	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1988	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
…		…
2013	* It should keep the code cleaner.	2018	* It should keep the code cleaner.
2014	* When this is called, the players direction has been updated	2019	* When this is called, the players direction has been updated
2015	* (taking into account confusion.) The player is also actually	2020	* (taking into account confusion.) The player is also actually
2016	* going to try and move (not fire weapons).	2021	* going to try and move (not fire weapons).
2017	*/	2022	*/
2018	void	2023	bool
2019	move_player_attack (object *op, int dir)	2024	move_player_attack (object *op, int dir)
2020	{	2025	{
2021	object tmp, mon;
2022	int on_battleground;	2026	int on_battleground;
2023	maptile *m;
2024		2027
2025	sint16 nx = freearr_x[dir] + op->x;	2028	sint16 nx = freearr_x[dir] + op->x;
2026	sint16 ny = freearr_y[dir] + op->y;	2029	sint16 ny = freearr_y[dir] + op->y;
2027		2030
2028	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	}
2029		2041
2030	/* 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
2031	* 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
2032	* 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
2033	* player. This is a pretty nasty hack, because if we could	2045	* player. This is a pretty nasty hack, because if we could
2034	* 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
2035	* 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
2036	* 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
2037	* move_ob uses.	2049	* move_ob uses.
2038	*/	2050	*/
2039	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2040	{
2041	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2042	{
2043	m = op->map->xy_find (nx, ny);	2051	maptile *m = op->map->xy_find (nx, ny);
2044	if (!m)
2045	return; /* Don't think this should happen */
2046	}
2047	else
2048	m = op->map;
2049		2052
2050	if (!(tmp = m->at (nx, ny).bot))
2051	return;
2052
2053	mon = 0;
2054	/* 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
2055	* 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.
2056	* 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
2057	* on the space	2056	* on the space
2058	*/	2057	*/
2059	while (tmp)	2058	object *mon;
2060	{	2059	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2061	if (tmp == op)	2060	{
2062	{	2061	if ((mon->flag [FLAG_ALIVE]
2063	tmp = tmp->above;	2062	\|\| mon->type == LOCKED_DOOR
2064	continue;	2063	\|\| mon->flag [FLAG_CAN_ROLL])
2065	}
2066
2067	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2068	{
2069	mon = tmp;	2064	&& mon != op)
2070	break;	2065	break;
2071	}	2066	}
2072		2067
2073	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2074	mon = tmp;
2075
2076	tmp = tmp->above;
2077	}
2078
2079	if (!mon) /* This happens anytime the player tries to move */	2068	if (!mon) /* This happens anytime the player tries to move */
2080	return; /* into a wall */	2069	return false; /* into a wall */
2081		2070
2082	if (mon->head)
2083	mon = mon->head;	2071	mon = mon->head_ ();
2084		2072
2085	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)
2086	if (player_attack_door (op, mon))	2075	if (player_attack_door (op, mon))
		2076	{
		2077	--op->contr->weapon_sp_left;
2087	return;	2078	return true;
		2079	}
2088		2080
2089	/* The following deals with possibly attacking peaceful	2081	/* The following deals with possibly attacking peaceful
2090	* or frienddly creatures. Basically, all players are considered	2082	* or friendly creatures. Basically, all players are considered
2091	* unaggressive. If the moving player has peaceful set, then the	2083	* unaggressive. If the moving player has peaceful set, then the
2092	* object should be pushed instead of attacked. It is assumed that	2084	* object should be pushed instead of attacked. It is assumed that
2093	* if you are braced, you will not attack friends accidently,	2085	* if you are braced, you will not attack friends accidently,
2094	* and thus will not push them.	2086	* and thus will not push them.
2095	*/	2087	*/
2096		2088
2097	/* 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
2098	* peaceful. Our assumption is the creature is a pet if the	2090	* peaceful. Our assumption is the creature is a pet if the
2099	* player owns it and it is either friendly or unagressive.	2091	* player owns it and it is either friendly or unagressive.
2100	*/	2092	*/
2101	if ((op->type == PLAYER)	2093	if (op->type == PLAYER
2102	#if COZY_SERVER
2103	&&
2104	((mon->owner && mon->owner->contr	2094	&& ((mon->owner && mon->owner->contr
2105	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2095	&& same_party (mon->owner->contr->party, op->contr->party))
2106	#else
2107	&& mon->owner == op	2096	\|\| mon->owner == op)
2108	#endif
2109	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2097	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2110	{	2098	{
2111	/* 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 */
2112	if (op->contr->braced)	2100	if (op->contr->braced)
2113	return;	2101	return false;
2114		2102
2115	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"));
2116	push_ob (mon, dir, op);	2108	push_ob (mon, dir, op);
		2109
2117	if (op->contr->tmp_invis \|\| op->hide)	2110	if (op->contr->tmp_invis \|\| op->hide)
2118	make_visible (op);	2111	make_visible (op);
2119		2112
2120	return;	2113	return true;
2121	}	2114	}
		2115	else
		2116	return false;
		2117	}
2122		2118
2123	/* in certain circumstances, you shouldn't attack friendly	2119	/* in certain circumstances, you shouldn't attack friendly
2124	* creatures. Note that if you are braced, you can't push	2120	* creatures. Note that if you are braced, you can't push
2125	* 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
2126	* attack them either.	2122	* attack them either.
2127	*/	2123	*/
2128	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2124	if ((mon->type == PLAYER \|\| mon->enemy != op)
2129	(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))
2130	#ifdef PROHIBIT_PLAYERKILL
2131	(op->contr->peaceful	2126	&& ((op->contr->peaceful
2132	\|\| (mon->type == PLAYER	2127	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2133	&& mon->contr->
2134	peaceful)) &&
2135	#else
2136	op->contr->peaceful &&
2137	#endif
2138	!on_battleground))	2128	&& !on_battleground))
		2129	{
		2130	if (op->speed_left > 0.f)
2139	{	2131	{
		2132	--op->speed_left;
		2133
2140	if (!op->contr->braced)	2134	if (!op->contr->braced)
2141	{	2135	{
2142	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2136	op->play_sound (sound_find ("push_player"));
2143	push_ob (mon, dir, op);	2137	push_ob (mon, dir, op);
2144	}	2138	}
2145	else	2139	else
2146	new_draw_info (0, 0, op, "You withhold your attack");	2140	new_draw_info (0, 0, op, "You withhold your attack");
2147		2141
2148	if (op->contr->tmp_invis \|\| op->hide)	2142	if (op->contr->tmp_invis \|\| op->hide)
2149	make_visible (op);	2143	make_visible (op);
2150	}
2151		2144
		2145	return true;
		2146	}
		2147	}
2152	/* If the object is a boulder or other rollable object, then	2148	/* If the object is a boulder or other rollable object, then
2153	* 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.
2154	*/	2150	*/
2155	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)
2156	{	2154	{
		2155	--op->speed_left;
		2156
2157	recursive_roll (mon, dir, op);	2157	recursive_roll (mon, dir, op);
2158	if (action_makes_visible (op))	2158	if (action_makes_visible (op))
2159	make_visible (op);	2159	make_visible (op);
2160	}
2161		2160
		2161	return true;
		2162	}
		2163	}
2162	/* Any generic living creature. Including things like doors.	2164	/* Any generic living creature. Including things like doors.
2163	* 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
2164	* and be living. Then, it must be one of the following:	2166	* and be living. Then, it must be one of the following:
2165	* 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
2166	* 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.
2167	*/	2169	*/
2168	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2170	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2169	((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)))
2170	{	2172	{
2171	/* If the player hasn't hit something this tick, and does	2173	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2172	* so, give them speed boost based on weapon speed. Doing
2173	* it here is better than process_players2, which basically
2174	* incurred a 1 tick offset.
2175	*/
2176	if (!op->contr->has_hit)
2177	{	2174	{
2178	op->speed_left += op->contr->weapon_sp - op->speed;	2175	--op->contr->weapon_sp_left;
2179
2180	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2181	}
2182		2176
2183	skill_attack (mon, op, 0, 0, 0);	2177	skill_attack (mon, op, 0, 0, 0);
2184
2185	/* If attacking another player, that player gets automatic
2186	* hitback, and doesn't loose luck either.
2187	* Disable hitback on the battleground or if the target is
2188	* the wiz.
2189	*/
2190	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2191	{
2192	short luck = mon->stats.luck;
2193
2194	mon->contr->has_hit = 1;
2195	skill_attack (op, mon, 0, 0, 0);
2196	mon->stats.luck = luck;
2197	}
2198		2178
2199	if (action_makes_visible (op))	2179	if (action_makes_visible (op))
2200	make_visible (op);	2180	make_visible (op);
2201	}
2202	} /* if player should attack something */
2203	}
2204		2181
2205	int	2182	return true;
		2183	}
		2184	}
		2185
		2186	return false;
		2187	}
		2188
		2189	bool
2206	move_player (object *op, int dir)	2190	move_player (object *op, int dir)
2207	{	2191	{
2208	int pick;	2192	int pick;
2209		2193
2210	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2194	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2224	op->facing = dir;	2208	op->facing = dir;
2225		2209
2226	if (op->hide)	2210	if (op->hide)
2227	do_hidden_move (op);	2211	do_hidden_move (op);
2228		2212
		2213	bool retval;
		2214
2229	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2215	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2230	/nop / ;	2216	retval = RESULT_INT (0);
2231	else if (op->contr->fire_on)	2217	else if (op->contr->fire_on)
2232	fire (op, dir);	2218	retval = fire (op, dir);
2233	else	2219	else
2234	{	2220	{
2235	move_player_attack (op, dir);	2221	retval = move_player_attack (op, dir);
2236	pick = check_pick (op);	2222	pick = check_pick (op);
2237	}	2223	}
2238		2224
2239	/* 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
2240	* server can handle repeat firing.	2226	* server can handle repeat firing.
…		…
2247	/* Update how the player looks. Use the facing, so direction may	2233	/* Update how the player looks. Use the facing, so direction may
2248	* get reset to zero. This allows for full animation capabilities	2234	* get reset to zero. This allows for full animation capabilities
2249	* for players.	2235	* for players.
2250	*/	2236	*/
2251	animate_object (op, op->facing);	2237	animate_object (op, op->facing);
2252	return 0;	2238
		2239	return retval;
2253	}	2240	}
2254		2241
2255	/* 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
2256	* new client/server stuff.	2243	* new client/server stuff.
2257	* 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
2258	* the new speed values for commands.	2245	* the new speed values for commands.
2259	*	2246	*
2260	* 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.
2261	*/	2250	*/
2262	int	2251	bool
2263	handle_newcs_player (object *op)	2252	handle_newcs_player (object *op)
2264	{	2253	{
2265	if (QUERY_FLAG (op, FLAG_SCARED))	2254	if (QUERY_FLAG (op, FLAG_SCARED))
2266	{	2255	{
2267	flee_player (op);	2256	if (op->speed_left > 0.f)
2268	/* If player is still scared, that is his action for this tick */
2269	if (QUERY_FLAG (op, FLAG_SCARED))
2270	{	2257	{
2271	op->speed_left--;	2258	--op->speed_left;
		2259	flee_player (op);
		2260
2272	return 0;	2261	return true;
2273	}	2262	}
		2263	else
		2264	return false;
2274	}	2265	}
2275		2266
2276	/* 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
2277	* the players time has been increased when doericserver has been	2268	* the players time has been increased when doericserver has been
2278	* called, so we recheck it here.	2269	* called, so we recheck it here.
2279	*/	2270	*/
2280	if (op->contr->ns->handle_command ())	2271	if (op->contr->ns->handle_command ())
2281	return 1;	2272	return true;
2282		2273
2283	if (op->speed_left > 0)
2284	{
2285	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2274	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2286	{
2287	/* All move commands take 1 tick, at least for now */
2288	op->speed_left--;
2289
2290	/* Instead of all the stuff below, let move_player take care
2291	* of it. Also, some of the skill stuff is only put in
2292	* there, as well as the confusion stuff.
2293	*/
2294	move_player (op, op->direction);	2275	return move_player (op, op->direction);
2295		2276
2296	return op->speed_left > 0;
2297	}
2298	}
2299
2300	return 0;	2277	return false;
2301	}	2278	}
2302		2279
2303	int	2280	int
2304	save_life (object *op)	2281	save_life (object *op)
2305	{	2282	{
…		…
2307	return 0;	2284	return 0;
2308		2285
2309	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2286	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2310	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2287	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2311	{	2288	{
2312	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2289	op->play_sound (sound_find ("ob_evaporate"));
2313	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));
2314		2291
2315	if (op->contr)	2292	if (op->contr)
2316	esrv_del_item (op->contr, tmp->count);	2293	esrv_del_item (op->contr, tmp->count);
2317		2294
…		…
2337	/* 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
2338	* 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
2339	* 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
2340	* from.	2317	* from.
2341	*/	2318	*/
2342	void	2319	static void
2343	remove_unpaid_objects (object op, object env)	2320	drop_unpaid_items (object op, object env)
2344	{	2321	{
2345	while (op)	2322	while (op)
2346	{	2323	{
2347	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' */
2348		2325
…		…
2352	esrv_del_item (env->contr, op->count);	2329	esrv_del_item (env->contr, op->count);
2353		2330
2354	op->insert_at (env);	2331	op->insert_at (env);
2355	}	2332	}
2356	else if (op->inv)	2333	else if (op->inv)
2357	remove_unpaid_objects (op->inv, env);	2334	drop_unpaid_items (op->inv, env);
2358		2335
2359	op = next;	2336	op = next;
2360	}	2337	}
		2338	}
		2339
		2340	void
		2341	object::drop_unpaid_items ()
		2342	{
		2343	if (!flag [FLAG_REMOVED])
		2344	::drop_unpaid_items (inv, this);
2361	}	2345	}
2362		2346
2363	/*	2347	/*
2364	* Returns pointer a static string containing gravestone text	2348	* Returns pointer a static string containing gravestone text
2365	* Moved from apply.c to player.c - player.c is what	2349	* Moved from apply.c to player.c - player.c is what
…		…
2571	}	2555	}
2572		2556
2573	/* Digestion */	2557	/* Digestion */
2574	if (--op->last_eat < 0)	2558	if (--op->last_eat < 0)
2575	{	2559	{
2576	#ifdef COZY_SERVER	2560	int bonus = max (0, op->contr->digestion),
2577	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2561	penalty = max (0, -op->contr->digestion);
2578	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2579	#else
2580	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2581	#endif
2582		2562
2583	if (op->contr->gen_hp > 0)
2584	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);
2585	else
2586	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2587		2564
2588	/* dms do not consume food */	2565	/* dms do not consume food */
2589	if (!QUERY_FLAG (op, FLAG_WIZ))	2566	if (!QUERY_FLAG (op, FLAG_WIZ))
2590	op->stats.food--;	2567	op->stats.food--;
2591	}	2568	}
…		…
2652	object *tmp;	2629	object *tmp;
2653		2630
2654	if (save_life (op))	2631	if (save_life (op))
2655	return;	2632	return;
2656		2633
2657
2658	/* 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
2659	* 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.
2660	* Look at op_on_battleground() for more info --AndreasV	2636	* Look at op_on_battleground() for more info --AndreasV
2661	*/	2637	*/
2662	if (op_on_battleground (op, &x, &y))	2638	if (op_on_battleground (op, &x, &y))
…		…
2714	strcpy (op->contr->killer, "starvation");	2690	strcpy (op->contr->killer, "starvation");
2715	}	2691	}
2716	else	2692	else
2717	sprintf (buf, "%s died.", &op->name);	2693	sprintf (buf, "%s died.", &op->name);
2718		2694
2719	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2695	op->contr->play_sound (sound_find ("player_dies"));
2720		2696
2721	/* save the map location for corpse, gravestone */	2697	/* save the map location for corpse, gravestone */
2722	x = op->x;	2698	x = op->x;
2723	y = op->y;	2699	y = op->y;
2724	map = op->map;	2700	map = op->map;
…		…
2901		2877
2902	/*	2878	/*
2903	* 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
2904	* and put them back in the map.	2880	* and put them back in the map.
2905	*/	2881	*/
2906	remove_unpaid_objects (op->inv, op);	2882	op->drop_unpaid_items ();
2907		2883
2908	/****************************************/	2884	/****************************************/
2909	/* */	2885	/* */
2910	/* Move player to his current respawn- */	2886	/* Move player to his current respawn- */
2911	/* position (usually last savebed) */	2887	/* position (usually last savebed) */
…		…
2931	object *force;	2907	object *force;
2932	int at;	2908	int at;
2933		2909
2934	force = get_archetype (FORCE_NAME);	2910	force = get_archetype (FORCE_NAME);
2935	/* 50 ticks should be enough time for the spell to abate */	2911	/* 50 ticks should be enough time for the spell to abate */
2936	force->speed = 0.1;	2912	force->speed = 0.1f;
2937	force->speed_left = -5.0;	2913	force->speed_left = -5.f;
2938	SET_FLAG (force, FLAG_APPLIED);	2914	SET_FLAG (force, FLAG_APPLIED);
2939	for (at = 0; at < NROFATTACKS; at++)	2915	for (at = 0; at < NROFATTACKS; at++)
2940	if (will_kill_again & (1 << at))	2916	if (will_kill_again & (1 << at))
2941	force->resist[at] = 100;	2917	force->resist[at] = 100;
2942		2918
…		…
3063	}	3039	}
3064		3040
3065	int	3041	int
3066	is_true_undead (object *op)	3042	is_true_undead (object *op)
3067	{	3043	{
3068	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3044	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3069	return 1;	3045	return 1;
3070		3046
3071	return 0;	3047	return 0;
3072	}	3048	}
3073		3049
…		…
3117	/* For Hidden creatures - a chance of becoming 'unhidden'	3093	/* For Hidden creatures - a chance of becoming 'unhidden'
3118	* every time they move - as we subtract off 'invisibility'	3094	* every time they move - as we subtract off 'invisibility'
3119	* AND, for players, if they move into a ridiculously unhideable	3095	* AND, for players, if they move into a ridiculously unhideable
3120	* spot (surrounded by clear terrain in broad daylight). -b.t.	3096	* spot (surrounded by clear terrain in broad daylight). -b.t.
3121	*/	3097	*/
3122
3123	void	3098	void
3124	do_hidden_move (object *op)	3099	do_hidden_move (object *op)
3125	{	3100	{
3126	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3101	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3127	object *skop;	3102	object *skop;
…		…
3244	* a blocked los square.	3219	* a blocked los square.
3245	* we use the archetype to figure out offsets.	3220	* we use the archetype to figure out offsets.
3246	*/	3221	*/
3247	while (op)	3222	while (op)
3248	{	3223	{
3249	dx = rv.distance_x + op->arch->clone.x;	3224	dx = rv.distance_x + op->arch->x;
3250	dy = rv.distance_y + op->arch->clone.y;	3225	dy = rv.distance_y + op->arch->y;
3251		3226
3252	/* only the viewable area the player sees is updated by LOS	3227	/* only the viewable area the player sees is updated by LOS
3253	* 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
3254	* for any meaningful values.	3229	* for any meaningful values.
3255	*/	3230	*/
…		…
3380	/* 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]); */
3381	return;	3356	return;
3382	}	3357	}
3383		3358
3384	/* everything seems okay - now bring on the gift: */	3359	/* everything seems okay - now bring on the gift: */
3385	item = &(tr->item->clone);	3360	item = tr->item;
3386		3361
3387	if (item->type == SPELL)	3362	if (item->type == SPELL)
3388	{	3363	{
3389	if (check_spell_known (who, item->name))	3364	if (check_spell_known (who, item->name))
3390	return;	3365	return;
…		…
3449	{	3424	{
3450	/* forces in the treasurelist can alter the player's stats */	3425	/* forces in the treasurelist can alter the player's stats */
3451	object *skin;	3426	object *skin;
3452		3427
3453	/* first get the dragon skin force */	3428	/* first get the dragon skin force */
3454	shstr_cmp dragon_skin_force ("dragon_skin_force");
3455	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)
3456	;	3430	;
3457		3431
3458	if (!skin)	3432	if (!skin)
3459	return;	3433	return;
3460		3434

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.130 by root, Sat May 12 20:21:54 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.130 by root, Sat May 12 20:21:54 2007 UTC vs.
Revision 1.158 by root, Mon Aug 13 15:46:45 2007 UTC