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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.128 by root, Sat May 12 18:40:40 2007 UTC vs.
Revision 1.153 by root, Tue Jul 10 05:51:38 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
…		…
307	ns = 0;	298	ns = 0;
308	}	299	}
309		300
310	if (ob)	301	if (ob)
311	ob->close_container (); //TODO: client-specific	302	ob->close_container (); //TODO: client-specific
		303
		304	observe = ob;
312		305
313	deactivate ();	306	deactivate ();
314	}	307	}
315		308
316	// the need for this function can be explained	309	// the need for this function can be explained
317	// by load_object not returning the object	310	// by load_object not returning the object
318	void	311	void
319	player::set_object (object *op)	312	player::set_object (object *op)
320	{	313	{
321	ob = op;	314	ob = observe = op;
322	ob->contr = this; /* this aren't yet in archetype */	315	ob->contr = this; /* this aren't yet in archetype */
323		316
324	ob->speed_left = 0.5;
325	ob->speed = 1.0;	317	ob->speed = 1.0f;
		318	ob->speed_left = 0.5f;
		319
326	ob->direction = 5; /* So player faces south */	320	ob->direction = 5; /* So player faces south */
		321	}
		322
		323	void
		324	player::set_observe (object *op)
		325	{
		326	observe = op ? op : ob;
		327	do_los = 1;
327	}	328	}
328		329
329	player::player ()	330	player::player ()
330	{	331	{
331	/* There are some elements we want initialised to non zero value -	332	/* There are some elements we want initialised to non zero value -
…		…
342	petmode = pet_normal;	343	petmode = pet_normal;
343	listening = 10;	344	listening = 10;
344	usekeys = containers;	345	usekeys = containers;
345	peaceful = 1; /* default peaceful */	346	peaceful = 1; /* default peaceful */
346	do_los = 1;	347	do_los = 1;
		348
		349	weapon_sp = 1.0f;
		350	weapon_sp_left = 0.5f;
347	}	351	}
348		352
349	void	353	void
350	player::do_destroy ()	354	player::do_destroy ()
351	{	355	{
…		…
356	if (ob)	360	if (ob)
357	{	361	{
358	ob->destroy_inv (false);	362	ob->destroy_inv (false);
359	ob->destroy ();	363	ob->destroy ();
360	}	364	}
		365
		366	ob = observe = 0;
361	}	367	}
362		368
363	player::~player ()	369	player::~player ()
364	{	370	{
365	/* Clear item stack */	371	/* Clear item stack */
…		…
392	* Note: there MUST be at least one player archetype!	398	* Note: there MUST be at least one player archetype!
393	*/	399	*/
394	archetype *	400	archetype *
395	get_player_archetype (archetype *at)	401	get_player_archetype (archetype *at)
396	{	402	{
397	archetype *start = at;	403	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
398		404
399	for (;;)	405	for (;;)
400	{	406	{
401	if (at == NULL \|\| at->next == NULL)	407	if (++i == archetypes.end ())
402	at = first_archetype;	408	i = archetypes.begin ();
403	else	409	else if (*i == at)
404	at = at->next;	410	cleanup ("not a single player archetype found");
405		411
406	if (at->clone.type == PLAYER)	412	if ((*i)->type == PLAYER)
407	return at;	413	return *i;
408
409	if (at == start)
410	{
411	LOG (llevError, "No Player archetypes\n");
412	exit (-1);
413	}
414	}	414	}
415	}	415	}
416		416
417	object *	417	object *
418	get_nearest_player (object *mon)	418	get_nearest_player (object *mon)
…		…
908	if (*first_map_ext_path)	908	if (*first_map_ext_path)
909	{	909	{
910	object *tmp;	910	object *tmp;
911	char mapname[MAX_BUF];	911	char mapname[MAX_BUF];
912		912
913	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	913	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
914	tmp = object::create ();	914	tmp = object::create ();
915	EXIT_PATH (tmp) = mapname;	915	EXIT_PATH (tmp) = mapname;
916	EXIT_X (tmp) = ob->x;	916	EXIT_X (tmp) = ob->x;
917	EXIT_Y (tmp) = ob->y;	917	EXIT_Y (tmp) = ob->y;
918	ob->enter_exit (tmp); /* we don't really care if it succeeded;	918	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
937	int x = ob->x, y = ob->y;	937	int x = ob->x, y = ob->y;
938		938
939	ob->remove_statbonus ();	939	ob->remove_statbonus ();
940	ob->remove ();	940	ob->remove ();
941	ob->arch = get_player_archetype (ob->arch);	941	ob->arch = get_player_archetype (ob->arch);
942	ob->arch->clone.copy_to (ob);	942	ob->arch->copy_to (ob);
943	ob->instantiate ();	943	ob->instantiate ();
944	ob->stats = ob->contr->orig_stats;	944	ob->stats = ob->contr->orig_stats;
945	ob->name = ob->name_pl = name;	945	ob->name = ob->name_pl = name;
946	ob->x = x;	946	ob->x = x;
947	ob->y = y;	947	ob->y = y;
948	SET_ANIMATION (ob, 2); /* So player faces south */	948	SET_ANIMATION (ob, 2); /* So player faces south */
949	insert_ob_in_map (ob, ob->map, ob, 0);	949	insert_ob_in_map (ob, ob->map, ob, 0);
950	assign (ob->contr->title, ob->arch->clone.name);	950	assign (ob->contr->title, ob->arch->object::name);
951	ob->add_statbonus ();	951	ob->add_statbonus ();
952	}	952	}
953	while (!allowed_class (ob));	953	while (!allowed_class (ob));
954		954
955	update_object (ob, UP_OBJ_FACE);	955	update_object (ob, UP_OBJ_FACE);
…		…
1100	if (tmp->name != NULL)	1100	if (tmp->name != NULL)
1101	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1101	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))));	1102	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1103	else	1103	else
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1104	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))));	1105	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106		1106
1107	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1107	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1108	}	1108	}
1109		1109
1110	/* philosophy:	1110	/* philosophy:
…		…
1303	/* careful: chairs and tables are weapons! */	1303	/* careful: chairs and tables are weapons! */
1304	if (op->contr->mode & PU_ALLWEAPON)	1304	if (op->contr->mode & PU_ALLWEAPON)
1305	{	1305	{
1306	if (tmp->type == WEAPON && tmp->name != NULL)	1306	if (tmp->type == WEAPON && tmp->name != NULL)
1307	{	1307	{
1308	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1308	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1309	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1309	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310	{	1310	{
1311	pick_up (op, tmp);	1311	pick_up (op, tmp);
1312	continue;	1312	continue;
1313	}	1313	}
1314	}	1314	}
1315		1315
1316	if (tmp->type == WEAPON && tmp->name == NULL)	1316	if (tmp->type == WEAPON && tmp->name == NULL)
1317	{	1317	{
1318	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1318	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1319	{	1319	{
1320	pick_up (op, tmp);	1320	pick_up (op, tmp);
1321	continue;	1321	continue;
1322	}	1322	}
1323	}	1323	}
…		…
1348	if (tmp->name != NULL)	1348	if (tmp->name != NULL)
1349	{	1349	{
1350	fprintf (stderr, "%s", tmp->name);	1350	fprintf (stderr, "%s", tmp->name);
1351	}	1351	}
1352	else	1352	else
1353	fprintf (stderr, "%s", tmp->arch->name);	1353	fprintf (stderr, "%s", tmp->arch->archname);
1354	fprintf (stderr, ",%d] = ", tmp->type);	1354	fprintf (stderr, ",%d] = ", tmp->type);
1355	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1355	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1356	#endif	1356	#endif
1357	continue;	1357	continue;
1358	}	1358	}
…		…
1428	else	1428	else
1429	{	1429	{
1430	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1430	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1431	{	1431	{
1432	attacktype = 1 << attacknum;	1432	attacktype = 1 << attacknum;
1433	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1433	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1434	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1434	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1435	{	1435	{
1436	tmp = arrow;	1436	tmp = arrow;
1437	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1437	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1438	}	1438	}
1439	}	1439	}
1440	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1440	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1441	{	1441	{
1442	tmp = arrow;	1442	tmp = arrow;
…		…
1535	*/	1535	*/
1536	int	1536	int
1537	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1537	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1538	{	1538	{
1539	object left, bow;	1539	object left, bow;
1540	int bowspeed, mflags;	1540	int mflags;
1541	maptile *m;	1541	maptile *m;
1542		1542
1543	if (!dir)	1543	if (!dir)
1544	{	1544	{
1545	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1545	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1546	return 0;	1546	return 0;
1547	}	1547	}
1548		1548
1549	if (player *pl = op->contr)	1549	if (op->contr)
1550	{	1550	bow = op->current_weapon;
1551	bow = pl->ranged_ob;
1552	if (!op->change_weapon (bow))
1553	return 0;
1554	}
1555	else	1551	else
1556	{	1552	{
1557	for (bow = op->inv; bow; bow = bow->below)	1553	for (bow = op->inv; bow; bow = bow->below)
1558	/* Don't check for applied - monsters don't apply bows - in that way, they	1554	/* 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.	1555	* don't need to switch back and forth between bows and weapons.
…		…
1580	{	1576	{
1581	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1577	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1582	return 0;	1578	return 0;
1583	}	1579	}
1584		1580
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)	1581	if (arrow == NULL)
1595	{	1582	{
1596	if ((arrow = find_arrow (op, bow->race)) == NULL)	1583	if ((arrow = find_arrow (op, bow->race)) == NULL)
1597	{	1584	{
1598	if (op->type == PLAYER)	1585	if (op->type == PLAYER)
…		…
1639	arrow->stats.grace = arrow->attacktype;	1626	arrow->stats.grace = arrow->attacktype;
1640		1627
1641	if (arrow->slaying)	1628	if (arrow->slaying)
1642	arrow->spellarg = strdup (arrow->slaying);	1629	arrow->spellarg = strdup (arrow->slaying);
1643		1630
		1631	#if 0
		1632	if (player *pl = op->contr)
		1633	{
		1634	float speed = pl->weapon_sp;
		1635
		1636	/* penalize ROF for bestarrow */
		1637	if (pl->bowtype == bow_bestarrow)
		1638	speed *= .9f;
		1639	else
		1640	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1641
		1642	op->speed_left += speed - op->speed;
		1643	}
		1644	#endif
		1645
		1646	SET_ANIMATION (arrow, arrow->direction);
		1647
		1648	/* update the speed */
		1649	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1650	+ bow->stats.dam / 7.f;
		1651
		1652	arrow->set_speed (max (arrow->speed, 2.f));
		1653	arrow->speed_left = 0;
		1654
		1655	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1656
1644	if (op->type == PLAYER)	1657	if (op->type == PLAYER)
1645	{	1658	{
1646	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1647	op->update_stats ();
1648	}
1649
1650	SET_ANIMATION (arrow, arrow->direction);
1651
1652	arrow->stats.dam += op->stats.dam + arrow->magic;
1653
1654	/* update the speed */
1655	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1656	+ bow->stats.dam / 7.0;
1657
1658	arrow->set_speed (max (arrow->speed, 2.0));
1659	arrow->speed_left = 0;
1660
1661	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1662
1663	if (op->type == PLAYER)
1664	{
1665	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1659	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1666	arrow->stats.wc -= dex_bonus[op->stats.Dex];	1660	wc -= dex_bonus[op->stats.Dex];
1667		1661
1668	if (!arrow->slaying)	1662	if (!arrow->slaying)
1669	arrow->slaying = op->slaying;	1663	arrow->slaying = op->slaying;
1670		1664
1671	arrow->attacktype \|= op->attacktype;	1665	arrow->attacktype \|= op->attacktype;
…		…
1679	arrow->slaying = bow->slaying;	1673	arrow->slaying = bow->slaying;
1680		1674
1681	arrow->attacktype \|= bow->attacktype;	1675	arrow->attacktype \|= bow->attacktype;
1682	}	1676	}
1683		1677
1684	arrow->stats.wc -= arrow->level;	1678	wc -= arrow->level;
		1679	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1685		1680
		1681	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1686	arrow->move_type = MOVE_FLY_LOW;	1682	arrow->move_type = MOVE_FLY_LOW;
1687	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1683	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1688		1684
1689	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1685	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1690	m->insert (arrow, sx, sy, op);	1686	m->insert (arrow, sx, sy, op);
…		…
1745	}	1741	}
1746		1742
1747	return ret;	1743	return ret;
1748	}	1744	}
1749		1745
1750
1751	/* Fires a misc (wand/rod/horn) object in 'dir'.	1746	/* Fires a misc (wand/rod/horn) object in 'dir'.
1752	* Broken apart from 'fire' to keep it more readable.	1747	* Broken apart from 'fire' to keep it more readable.
1753	*/	1748	*/
1754	void	1749	void
1755	fire_misc_object (object *op, int dir)	1750	fire_misc_object (object *op, int dir)
…		…
1806	object *tmp;	1801	object *tmp;
1807		1802
1808	if (item->arch)	1803	if (item->arch)
1809	{	1804	{
1810	CLEAR_FLAG (item, FLAG_ANIMATE);	1805	CLEAR_FLAG (item, FLAG_ANIMATE);
1811	item->face = item->arch->clone.face;	1806	item->face = item->arch->face;
1812	item->set_speed (0);	1807	item->set_speed (0);
1813	}	1808	}
1814		1809
1815	if ((tmp = item->in_player ()))	1810	if ((tmp = item->in_player ()))
1816	esrv_update_item (UPD_ANIM, tmp, item);	1811	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1821	}	1816	}
1822	}	1817	}
1823		1818
1824	/* Received a fire command for the player - go and do it.	1819	/* Received a fire command for the player - go and do it.
1825	*/	1820	*/
1826	void	1821	bool
1827	fire (object *op, int dir)	1822	fire (object *op, int dir)
1828	{	1823	{
1829	int spellcost = 0;	1824	int spellcost = 0;
1830		1825
1831	/* check for loss of invisiblity/hide */	1826	/* check for loss of invisiblity/hide */
…		…
1835	player *pl = op->contr;	1830	player *pl = op->contr;
1836		1831
1837	if (pl->golem)	1832	if (pl->golem)
1838	{	1833	{
1839	control_golem (op->contr->golem, dir);	1834	control_golem (op->contr->golem, dir);
1840	return;	1835	return false;
1841	}	1836	}
1842		1837
1843	object *ob = pl->ranged_ob;	1838	object *ob = pl->ranged_ob;
1844		1839
1845	if (!ob)	1840	if (!ob)
1846	return;	1841	return false;
		1842
		1843	if (!op->change_weapon (ob))
		1844	return false;
		1845
		1846	if (op->speed_left > 0.f)
		1847	--op->speed_left;
		1848	else
		1849	return false;
1847		1850
1848	switch (ob->type)	1851	switch (ob->type)
1849	{	1852	{
1850	case BOW:	1853	case BOW:
1851	player_fire_bow (op, dir);	1854	player_fire_bow (op, dir);
…		…
1858	case BUILDER:	1861	case BUILDER:
1859	apply_map_builder (op, dir);	1862	apply_map_builder (op, dir);
1860	break;	1863	break;
1861		1864
1862	case SKILL:	1865	case SKILL:
1863	case SKILL_TOOL:
1864	do_skill (op, op, ob, dir, 0);	1866	do_skill (op, op, ob, dir, 0);
1865	break;	1867	break;
1866		1868
1867	default:	1869	default:
1868	fire_misc_object (op, dir);	1870	fire_misc_object (op, dir);
1869	break;	1871	break;
1870	}	1872	}
		1873
		1874	return true;
1871	}	1875	}
1872		1876
1873	/* find_key	1877	/* find_key
1874	* We try to find a key for the door as passed. If we find a key	1878	* 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	1879	* and successfully use it, we return the key, otherwise NULL
…		…
1962	* 0 otherwise	1966	* 0 otherwise
1963	*/	1967	*/
1964	static int	1968	static int
1965	player_attack_door (object op, object door)	1969	player_attack_door (object op, object door)
1966	{	1970	{
1967	/* If its a door, try to find a use a key. If we do destroy the door,	1971	/* 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 -	1972	* might as well return immediately as there is nothing more to do -
1969	* otherwise, we fall through to the rest of the code.	1973	* otherwise, we fall through to the rest of the code.
1970	*/	1974	*/
1971	object *key = find_key (op, op, door);	1975	object *key = find_key (op, op, door);
1972		1976
1973	/* IF we found a key, do some extra work */	1977	/* If we found a key, do some extra work */
1974	if (key)	1978	if (key)
1975	{	1979	{
1976	object *container = key->env;	1980	object *container = key->env;
1977		1981
1978	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1982	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
…		…
2013	* It should keep the code cleaner.	2017	* It should keep the code cleaner.
2014	* When this is called, the players direction has been updated	2018	* When this is called, the players direction has been updated
2015	* (taking into account confusion.) The player is also actually	2019	* (taking into account confusion.) The player is also actually
2016	* going to try and move (not fire weapons).	2020	* going to try and move (not fire weapons).
2017	*/	2021	*/
2018	void	2022	bool
2019	move_player_attack (object *op, int dir)	2023	move_player_attack (object *op, int dir)
2020	{	2024	{
2021	object tmp, mon;
2022	int on_battleground;	2025	int on_battleground;
2023	maptile *m;
2024		2026
2025	sint16 nx = freearr_x[dir] + op->x;	2027	sint16 nx = freearr_x[dir] + op->x;
2026	sint16 ny = freearr_y[dir] + op->y;	2028	sint16 ny = freearr_y[dir] + op->y;
2027		2029
2028	on_battleground = op_on_battleground (op, 0, 0);	2030	on_battleground = op_on_battleground (op, 0, 0);
		2031
		2032	if (out_of_map (op->map, nx, ny))
		2033	return false;
		2034
		2035	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2036	{
		2037	--op->speed_left;
		2038	return true;
		2039	}
2029		2040
2030	/* If braced, or can't move to the square, and it is not out of the	2041	/* 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	2042	* 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	2043	* 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	2044	* 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	2045	* 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	2046	* 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	2047	* quite a bit of processing. However, it probably is less than what
2037	* move_ob uses.	2048	* move_ob uses.
2038	*/	2049	*/
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);	2050	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		2051
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	2052	/* 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.	2053	* 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	2054	* if its a door or barrel (can roll) see if there may be monsters
2057	* on the space	2055	* on the space
2058	*/	2056	*/
2059	while (tmp)	2057	object *mon;
2060	{	2058	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2061	if (tmp == op)	2059	{
2062	{	2060	if ((mon->flag [FLAG_ALIVE]
2063	tmp = tmp->above;	2061	\|\| mon->type == LOCKED_DOOR
2064	continue;	2062	\|\| mon->flag [FLAG_CAN_ROLL])
2065	}
2066
2067	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2068	{
2069	mon = tmp;	2063	&& mon != op)
2070	break;	2064	break;
2071	}	2065	}
2072		2066
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 */	2067	if (!mon) /* This happens anytime the player tries to move */
2080	return; /* into a wall */	2068	return false; /* into a wall */
2081		2069
2082	if (mon->head)
2083	mon = mon->head;	2070	mon = mon->head_ ();
2084		2071
2085	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2072	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2073	if (op->contr->weapon_sp_left > 0.f)
2086	if (player_attack_door (op, mon))	2074	if (player_attack_door (op, mon))
		2075	{
		2076	--op->contr->weapon_sp_left;
2087	return;	2077	return true;
		2078	}
2088		2079
2089	/* The following deals with possibly attacking peaceful	2080	/* The following deals with possibly attacking peaceful
2090	* or frienddly creatures. Basically, all players are considered	2081	* or friendly creatures. Basically, all players are considered
2091	* unaggressive. If the moving player has peaceful set, then the	2082	* unaggressive. If the moving player has peaceful set, then the
2092	* object should be pushed instead of attacked. It is assumed that	2083	* object should be pushed instead of attacked. It is assumed that
2093	* if you are braced, you will not attack friends accidently,	2084	* if you are braced, you will not attack friends accidently,
2094	* and thus will not push them.	2085	* and thus will not push them.
2095	*/	2086	*/
2096		2087
2097	/* If the creature is a pet, push it even if the player is not	2088	/* 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	2089	* peaceful. Our assumption is the creature is a pet if the
2099	* player owns it and it is either friendly or unagressive.	2090	* player owns it and it is either friendly or unagressive.
2100	*/	2091	*/
2101	if ((op->type == PLAYER)	2092	if (op->type == PLAYER
2102	#if COZY_SERVER
2103	&&
2104	((mon->owner && mon->owner->contr	2093	&& ((mon->owner && mon->owner->contr
2105	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2094	&& same_party (mon->owner->contr->party, op->contr->party))
2106	#else
2107	&& mon->owner == op	2095	\|\| mon->owner == op)
2108	#endif
2109	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2096	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2110	{	2097	{
2111	/* If we're braced, we don't want to switch places with it */	2098	/* If we're braced, we don't want to switch places with it */
2112	if (op->contr->braced)	2099	if (op->contr->braced)
2113	return;	2100	return false;
		2101
		2102	if (op->speed_left > 0.f)
		2103	{
		2104	--op->speed_left;
2114		2105
2115	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2106	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2116	push_ob (mon, dir, op);	2107	push_ob (mon, dir, op);
		2108
2117	if (op->contr->tmp_invis \|\| op->hide)	2109	if (op->contr->tmp_invis \|\| op->hide)
2118	make_visible (op);	2110	make_visible (op);
2119		2111
2120	return;	2112	return true;
2121	}	2113	}
		2114	else
		2115	return false;
		2116	}
2122		2117
2123	/* in certain circumstances, you shouldn't attack friendly	2118	/* in certain circumstances, you shouldn't attack friendly
2124	* creatures. Note that if you are braced, you can't push	2119	* creatures. Note that if you are braced, you can't push
2125	* someone, but put it inside this loop so that you won't	2120	* someone, but put it inside this loop so that you won't
2126	* attack them either.	2121	* attack them either.
2127	*/	2122	*/
2128	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2123	if ((mon->type == PLAYER \|\| mon->enemy != op)
2129	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2124	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2130	#ifdef PROHIBIT_PLAYERKILL
2131	(op->contr->peaceful	2125	&& ((op->contr->peaceful
2132	\|\| (mon->type == PLAYER	2126	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2133	&& mon->contr->
2134	peaceful)) &&
2135	#else
2136	op->contr->peaceful &&
2137	#endif
2138	!on_battleground))	2127	&& !on_battleground))
		2128	{
		2129	if (op->speed_left > 0.f)
2139	{	2130	{
		2131	--op->speed_left;
		2132
2140	if (!op->contr->braced)	2133	if (!op->contr->braced)
2141	{	2134	{
2142	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2135	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2143	push_ob (mon, dir, op);	2136	push_ob (mon, dir, op);
2144	}	2137	}
2145	else	2138	else
2146	new_draw_info (0, 0, op, "You withhold your attack");	2139	new_draw_info (0, 0, op, "You withhold your attack");
2147		2140
2148	if (op->contr->tmp_invis \|\| op->hide)	2141	if (op->contr->tmp_invis \|\| op->hide)
2149	make_visible (op);	2142	make_visible (op);
2150	}
2151		2143
		2144	return true;
		2145	}
		2146	}
2152	/* If the object is a boulder or other rollable object, then	2147	/* 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.	2148	* roll it if not braced. You can't roll it if you are braced.
2154	*/	2149	*/
2155	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2150	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2151	{
		2152	if (op->speed_left > 0.f)
2156	{	2153	{
		2154	--op->speed_left;
		2155
2157	recursive_roll (mon, dir, op);	2156	recursive_roll (mon, dir, op);
2158	if (action_makes_visible (op))	2157	if (action_makes_visible (op))
2159	make_visible (op);	2158	make_visible (op);
2160	}
2161		2159
		2160	return true;
		2161	}
		2162	}
2162	/* Any generic living creature. Including things like doors.	2163	/* Any generic living creature. Including things like doors.
2163	* Way it works is like this: First, it must have some hit points	2164	* 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:	2165	* 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	2166	* 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.	2167	* that party_number -1 is no party, so attacks can still happen.
2167	*/	2168	*/
2168	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2169	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)))	2170	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2170	{	2171	{
2171		2172	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2172	/* If the player hasn't hit something this tick, and does
2173	* so, give them speed boost based on weapon speed. Doing
2174	* it here is better than process_players2, which basically
2175	* incurred a 1 tick offset.
2176	*/
2177	if (!op->contr->has_hit)
2178	{	2173	{
2179	op->speed_left += op->speed / op->contr->weapon_sp;	2174	--op->contr->weapon_sp_left;
2180
2181	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2182	}
2183		2175
2184	skill_attack (mon, op, 0, 0, 0);	2176	skill_attack (mon, op, 0, 0, 0);
2185
2186	/* If attacking another player, that player gets automatic
2187	* hitback, and doesn't loose luck either.
2188	* Disable hitback on the battleground or if the target is
2189	* the wiz.
2190	*/
2191	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2192	{
2193	short luck = mon->stats.luck;
2194
2195	mon->contr->has_hit = 1;
2196	skill_attack (op, mon, 0, 0, 0);
2197	mon->stats.luck = luck;
2198	}
2199		2177
2200	if (action_makes_visible (op))	2178	if (action_makes_visible (op))
2201	make_visible (op);	2179	make_visible (op);
2202	}
2203	} /* if player should attack something */
2204	}
2205		2180
2206	int	2181	return true;
		2182	}
		2183	}
		2184
		2185	return false;
		2186	}
		2187
		2188	bool
2207	move_player (object *op, int dir)	2189	move_player (object *op, int dir)
2208	{	2190	{
2209	int pick;	2191	int pick;
2210		2192
2211	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2193	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2225	op->facing = dir;	2207	op->facing = dir;
2226		2208
2227	if (op->hide)	2209	if (op->hide)
2228	do_hidden_move (op);	2210	do_hidden_move (op);
2229		2211
		2212	bool retval;
		2213
2230	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2214	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2231	/nop / ;	2215	retval = RESULT_INT (0);
2232	else if (op->contr->fire_on)	2216	else if (op->contr->fire_on)
2233	fire (op, dir);	2217	retval = fire (op, dir);
2234	else	2218	else
2235	{	2219	{
2236	move_player_attack (op, dir);	2220	retval = move_player_attack (op, dir);
2237	pick = check_pick (op);	2221	pick = check_pick (op);
2238	}	2222	}
2239		2223
2240	/* Add special check for newcs players and fire on - this way, the	2224	/* Add special check for newcs players and fire on - this way, the
2241	* server can handle repeat firing.	2225	* server can handle repeat firing.
…		…
2248	/* Update how the player looks. Use the facing, so direction may	2232	/* Update how the player looks. Use the facing, so direction may
2249	* get reset to zero. This allows for full animation capabilities	2233	* get reset to zero. This allows for full animation capabilities
2250	* for players.	2234	* for players.
2251	*/	2235	*/
2252	animate_object (op, op->facing);	2236	animate_object (op, op->facing);
2253	return 0;	2237
		2238	return retval;
2254	}	2239	}
2255		2240
2256	/* This is similar to handle_player, below, but is only used by the	2241	/* This is similar to handle_player, below, but is only used by the
2257	* new client/server stuff.	2242	* new client/server stuff.
2258	* This is sort of special, in that the new client/server actually uses	2243	* This is sort of special, in that the new client/server actually uses
2259	* the new speed values for commands.	2244	* the new speed values for commands.
2260	*	2245	*
2261	* Returns true if there are more actions we can do.	2246	* Returns true if there are more actions we can do. Should not do
		2247	* many actions in a row, as that would be too unfair to other
		2248	* players.
2262	*/	2249	*/
2263	int	2250	bool
2264	handle_newcs_player (object *op)	2251	handle_newcs_player (object *op)
2265	{	2252	{
2266	if (QUERY_FLAG (op, FLAG_SCARED))	2253	if (QUERY_FLAG (op, FLAG_SCARED))
2267	{	2254	{
2268	flee_player (op);	2255	if (op->speed_left > 0.f)
2269	/* If player is still scared, that is his action for this tick */
2270	if (QUERY_FLAG (op, FLAG_SCARED))
2271	{	2256	{
2272	op->speed_left--;	2257	--op->speed_left;
		2258	flee_player (op);
		2259
2273	return 0;	2260	return true;
2274	}	2261	}
		2262	else
		2263	return false;
2275	}	2264	}
2276		2265
2277	/* call this here - we also will call this in do_ericserver, but	2266	/* call this here - we also will call this in do_ericserver, but
2278	* the players time has been increased when doericserver has been	2267	* the players time has been increased when doericserver has been
2279	* called, so we recheck it here.	2268	* called, so we recheck it here.
2280	*/	2269	*/
2281	if (op->contr->ns->handle_command ())	2270	if (op->contr->ns->handle_command ())
2282	return 1;	2271	return true;
2283		2272
2284	if (op->speed_left > 0)
2285	{
2286	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2273	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2287	{
2288	/* All move commands take 1 tick, at least for now */
2289	op->speed_left--;
2290
2291	/* Instead of all the stuff below, let move_player take care
2292	* of it. Also, some of the skill stuff is only put in
2293	* there, as well as the confusion stuff.
2294	*/
2295	move_player (op, op->direction);	2274	return move_player (op, op->direction);
2296		2275
2297	return op->speed_left > 0;
2298	}
2299	}
2300
2301	return 0;	2276	return false;
2302	}	2277	}
2303		2278
2304	int	2279	int
2305	save_life (object *op)	2280	save_life (object *op)
2306	{	2281	{
…		…
2572	}	2547	}
2573		2548
2574	/* Digestion */	2549	/* Digestion */
2575	if (--op->last_eat < 0)	2550	if (--op->last_eat < 0)
2576	{	2551	{
2577	#ifdef COZY_SERVER
2578	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2579	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2580	#else
2581	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2552	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2582	#endif
2583		2553
2584	if (op->contr->gen_hp > 0)	2554	if (op->contr->gen_hp > 0)
2585	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2555	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2586	else	2556	else
2587	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2557	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2932	object *force;	2902	object *force;
2933	int at;	2903	int at;
2934		2904
2935	force = get_archetype (FORCE_NAME);	2905	force = get_archetype (FORCE_NAME);
2936	/* 50 ticks should be enough time for the spell to abate */	2906	/* 50 ticks should be enough time for the spell to abate */
2937	force->speed = 0.1;	2907	force->speed = 0.1f;
2938	force->speed_left = -5.0;	2908	force->speed_left = -5.f;
2939	SET_FLAG (force, FLAG_APPLIED);	2909	SET_FLAG (force, FLAG_APPLIED);
2940	for (at = 0; at < NROFATTACKS; at++)	2910	for (at = 0; at < NROFATTACKS; at++)
2941	if (will_kill_again & (1 << at))	2911	if (will_kill_again & (1 << at))
2942	force->resist[at] = 100;	2912	force->resist[at] = 100;
2943		2913
…		…
3064	}	3034	}
3065		3035
3066	int	3036	int
3067	is_true_undead (object *op)	3037	is_true_undead (object *op)
3068	{	3038	{
3069	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3039	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3070	return 1;	3040	return 1;
3071		3041
3072	return 0;	3042	return 0;
3073	}	3043	}
3074		3044
…		…
3118	/* For Hidden creatures - a chance of becoming 'unhidden'	3088	/* For Hidden creatures - a chance of becoming 'unhidden'
3119	* every time they move - as we subtract off 'invisibility'	3089	* every time they move - as we subtract off 'invisibility'
3120	* AND, for players, if they move into a ridiculously unhideable	3090	* AND, for players, if they move into a ridiculously unhideable
3121	* spot (surrounded by clear terrain in broad daylight). -b.t.	3091	* spot (surrounded by clear terrain in broad daylight). -b.t.
3122	*/	3092	*/
3123
3124	void	3093	void
3125	do_hidden_move (object *op)	3094	do_hidden_move (object *op)
3126	{	3095	{
3127	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3096	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3128	object *skop;	3097	object *skop;
…		…
3245	* a blocked los square.	3214	* a blocked los square.
3246	* we use the archetype to figure out offsets.	3215	* we use the archetype to figure out offsets.
3247	*/	3216	*/
3248	while (op)	3217	while (op)
3249	{	3218	{
3250	dx = rv.distance_x + op->arch->clone.x;	3219	dx = rv.distance_x + op->arch->x;
3251	dy = rv.distance_y + op->arch->clone.y;	3220	dy = rv.distance_y + op->arch->y;
3252		3221
3253	/* only the viewable area the player sees is updated by LOS	3222	/* only the viewable area the player sees is updated by LOS
3254	* code, so we need to restrict ourselves to that range of values	3223	* code, so we need to restrict ourselves to that range of values
3255	* for any meaningful values.	3224	* for any meaningful values.
3256	*/	3225	*/
…		…
3381	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3350	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3382	return;	3351	return;
3383	}	3352	}
3384		3353
3385	/* everything seems okay - now bring on the gift: */	3354	/* everything seems okay - now bring on the gift: */
3386	item = &(tr->item->clone);	3355	item = tr->item;
3387		3356
3388	if (item->type == SPELL)	3357	if (item->type == SPELL)
3389	{	3358	{
3390	if (check_spell_known (who, item->name))	3359	if (check_spell_known (who, item->name))
3391	return;	3360	return;
…		…
3450	{	3419	{
3451	/* forces in the treasurelist can alter the player's stats */	3420	/* forces in the treasurelist can alter the player's stats */
3452	object *skin;	3421	object *skin;
3453		3422
3454	/* first get the dragon skin force */	3423	/* first get the dragon skin force */
3455	shstr_cmp dragon_skin_force ("dragon_skin_force");
3456	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3424	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3457	;	3425	;
3458		3426
3459	if (!skin)	3427	if (!skin)
3460	return;	3428	return;
3461		3429

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.128 by root, Sat May 12 18:40:40 2007 UTC vs. Revision 1.153 by root, Tue Jul 10 05:51:38 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.128 by root, Sat May 12 18:40:40 2007 UTC vs.
Revision 1.153 by root, Tue Jul 10 05:51:38 2007 UTC