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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.123 by root, Fri May 11 21:07:14 2007 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 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 it
9	* it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
10	* the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
11	* (at your option) any later version.	11	* 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, but
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16	* GNU General Public License for more details.	16	* 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 along
19	* along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	#include <global.h>	25	#include <global.h>
26	#include <sproto.h>	26	#include <sproto.h>
27	#include <sounds.h>	27	#include <sounds.h>
157	op->x = -1;	157	op->x = -1;
158	op->y = -1;	158	op->y = -1;
159	}	159	}
160		160
161	void	161	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 ()	162	player::activate ()
176	{	163	{
177	if (active)	164	if (active)
178	return;	165	return;
179		166
…		…
181	ob->remove ();	168	ob->remove ();
182	ob->map = 0;	169	ob->map = 0;
183	ob->activate_recursive ();	170	ob->activate_recursive ();
184	CLEAR_FLAG (ob, FLAG_FRIENDLY);	171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
185	add_friendly_object (ob);	172	add_friendly_object (ob);
186	enter_map ();
187	}	173	}
188		174
189	void	175	void
190	player::deactivate ()	176	player::deactivate ()
191	{	177	{
…		…
221	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
222		208
223	ns->update_look = 0;	209	ns->update_look = 0;
224	ns->look_position = 0;	210	ns->look_position = 0;
225		211
226	clear_los (ob);	212	clear_los (this);
227		213
228	ns->reset_stats ();	214	ns->reset_stats ();
229		215
230	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
231	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
…		…
246	shstr_cmp dragon_ability_force ("dragon_ability_force");	232	shstr_cmp dragon_ability_force ("dragon_ability_force");
247	shstr_cmp dragon_skin_force ("dragon_skin_force");	233	shstr_cmp dragon_skin_force ("dragon_skin_force");
248		234
249	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
250	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
251	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == dragon_ability_force)
252	abil = tmp;	238	abil = tmp;
253	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == dragon_skin_force)
254	skin = tmp;	240	skin = tmp;
255		241
256	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
257	}	243	}
258		244
259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
260		246
261	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
		248
		249	ob->flag [FLAG_READY_WEAPON] = false;
		250	ob->flag [FLAG_READY_SKILL] = false;
		251	ob->flag [FLAG_READY_BOW] = false;
262		252
263	for (object *op = ob->inv; op; op = op->below)	253	for (object *op = ob->inv; op; op = op->below)
264	if (op->flag [FLAG_APPLIED])	254	if (op->flag [FLAG_APPLIED])
265	switch (op->type)	255	switch (op->type)
266	{	256	{
		257	case SKILL:
		258	ob->flag [FLAG_APPLIED] = false;
		259	break;
		260
267	case WAND:	261	case WAND:
268	case ROD:	262	case ROD:
269	case HORN:	263	case HORN:
270	case BOW:	264	case BOW:
271	case SKILL:	265	ranged_ob = op;
272	case SKILL_TOOL:	266	break;
		267
273	case WEAPON:	268	case WEAPON:
274	apply_special (ob, op, AP_UNAPPLY);	269	combat_ob = op;
275	apply_special (ob, op, AP_APPLY);
276	break;	270	break;
277	}	271	}
278		272
		273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
279	ob->update_stats ();	274	ob->update_stats ();
		275
280	ns->floorbox_update ();	276	ns->floorbox_update ();
281
282	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
283	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
284		279
285	activate ();	280	activate ();
286		281
…		…
316	// the need for this function can be explained	311	// the need for this function can be explained
317	// by load_object not returning the object	312	// by load_object not returning the object
318	void	313	void
319	player::set_object (object *op)	314	player::set_object (object *op)
320	{	315	{
321	ob = op;	316	ob = observe = op;
322	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
323		318
324	ob->speed_left = 0.5;
325	ob->speed = 1.0;	319	ob->speed = 1.0f;
		320	ob->speed_left = 0.5f;
		321
326	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
		323	}
		324
		325	void
		326	player::set_observe (object *op)
		327	{
		328	observe = op ? op : ob;
		329	do_los = 1;
327	}	330	}
328		331
329	player::player ()	332	player::player ()
330	{	333	{
331	/* There are some elements we want initialised to non zero value -	334	/* There are some elements we want initialised to non zero value -
…		…
342	petmode = pet_normal;	345	petmode = pet_normal;
343	listening = 10;	346	listening = 10;
344	usekeys = containers;	347	usekeys = containers;
345	peaceful = 1; /* default peaceful */	348	peaceful = 1; /* default peaceful */
346	do_los = 1;	349	do_los = 1;
		350
		351	weapon_sp = 1.0f;
		352	weapon_sp_left = 0.5f;
347	}	353	}
348		354
349	void	355	void
350	player::do_destroy ()	356	player::do_destroy ()
351	{	357	{
…		…
784	}	790	}
785		791
786	void	792	void
787	object::roll_stats ()	793	object::roll_stats ()
788	{	794	{
789	int statsort [7];	795	int statsort [NUM_STATS];
790		796
791	for (;;)	797	for (;;)
792	{	798	{
793	int sum = 0;	799	int sum = 0;
794	for (int i = 7; i--; )	800	for (int i = NUM_STATS; i--; )
795	sum += statsort [i] = roll_stat ();	801	sum += statsort [i] = roll_stat ();
796		802
797	if (sum >= 82 && sum <= 116)	803	if (sum >= 82 && sum <= 116)
798	break;	804	break;
799	}	805	}
800		806
801	// Sort the stats so that rerolling is easier...	807	// Sort the stats so that rerolling is easier...
802	std::sort (statsort, statsort + 7, std::greater<int>());	808	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
803		809
		810	for (int i = 0; i < NUM_STATS; ++i)
804	stats.Str = statsort[0];	811	stats.stat (i) = statsort [i];
805	stats.Dex = statsort[1];
806	stats.Con = statsort[2];
807	stats.Int = statsort[3];
808	stats.Wis = statsort[4];
809	stats.Pow = statsort[5];
810	stats.Cha = statsort[6];
811		812
812	stats.exp = 0;	813	stats.exp = 0;
813	stats.ac = 0;	814	stats.ac = 0;
814		815
815	stats.hp = stats.maxhp;	816	stats.hp = stats.maxhp;
…		…
827	}	828	}
828		829
829	void	830	void
830	object::swap_stats (int a, int b)	831	object::swap_stats (int a, int b)
831	{	832	{
832	int tmp = get_attr_value (&contr->orig_stats, a);	833	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
833	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
834	set_attr_value (&contr->orig_stats, b, tmp);
835		834
		835	for (int i = 0; i < NUM_STATS; ++i)
836	stats.Str = contr->orig_stats.Str;	836	stats.stat (i) = contr->orig_stats.stat (i);
837	stats.Dex = contr->orig_stats.Dex;
838	stats.Con = contr->orig_stats.Con;
839	stats.Int = contr->orig_stats.Int;
840	stats.Wis = contr->orig_stats.Wis;
841	stats.Pow = contr->orig_stats.Pow;
842	stats.Cha = contr->orig_stats.Cha;
843		837
844	//TODO: the following code looks so borked and should, at the very least,	838	//TODO: the following code looks so borked and should, at the very least,
845	// be merged with the similar code in roll_stats	839	// be merged with the similar code in roll_stats
846	stats.ac = 0;	840	stats.ac = 0;
847		841
…		…
920	if (*first_map_ext_path)	914	if (*first_map_ext_path)
921	{	915	{
922	object *tmp;	916	object *tmp;
923	char mapname[MAX_BUF];	917	char mapname[MAX_BUF];
924		918
925	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	919	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
926	tmp = object::create ();	920	tmp = object::create ();
927	EXIT_PATH (tmp) = mapname;	921	EXIT_PATH (tmp) = mapname;
928	EXIT_X (tmp) = ob->x;	922	EXIT_X (tmp) = ob->x;
929	EXIT_Y (tmp) = ob->y;	923	EXIT_Y (tmp) = ob->y;
930	ob->enter_exit (tmp); /* we don't really care if it succeeded;	924	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
1112	if (tmp->name != NULL)	1106	if (tmp->name != NULL)
1113	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1114	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1115	else	1109	else
1116	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1117	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1111	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1118		1112
1119	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1113	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1120	}	1114	}
1121		1115
1122	/* philosophy:	1116	/* philosophy:
…		…
1315	/* careful: chairs and tables are weapons! */	1309	/* careful: chairs and tables are weapons! */
1316	if (op->contr->mode & PU_ALLWEAPON)	1310	if (op->contr->mode & PU_ALLWEAPON)
1317	{	1311	{
1318	if (tmp->type == WEAPON && tmp->name != NULL)	1312	if (tmp->type == WEAPON && tmp->name != NULL)
1319	{	1313	{
1320	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1314	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1321	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1315	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1322	{	1316	{
1323	pick_up (op, tmp);	1317	pick_up (op, tmp);
1324	continue;	1318	continue;
1325	}	1319	}
1326	}	1320	}
1327		1321
1328	if (tmp->type == WEAPON && tmp->name == NULL)	1322	if (tmp->type == WEAPON && tmp->name == NULL)
1329	{	1323	{
1330	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1324	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1331	{	1325	{
1332	pick_up (op, tmp);	1326	pick_up (op, tmp);
1333	continue;	1327	continue;
1334	}	1328	}
1335	}	1329	}
…		…
1360	if (tmp->name != NULL)	1354	if (tmp->name != NULL)
1361	{	1355	{
1362	fprintf (stderr, "%s", tmp->name);	1356	fprintf (stderr, "%s", tmp->name);
1363	}	1357	}
1364	else	1358	else
1365	fprintf (stderr, "%s", tmp->arch->name);	1359	fprintf (stderr, "%s", tmp->arch->archname);
1366	fprintf (stderr, ",%d] = ", tmp->type);	1360	fprintf (stderr, ",%d] = ", tmp->type);
1367	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1361	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1368	#endif	1362	#endif
1369	continue;	1363	continue;
1370	}	1364	}
…		…
1547	*/	1541	*/
1548	int	1542	int
1549	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1543	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1550	{	1544	{
1551	object left, bow;	1545	object left, bow;
1552	int bowspeed, mflags;	1546	int mflags;
1553	maptile *m;	1547	maptile *m;
1554		1548
1555	if (!dir)	1549	if (!dir)
1556	{	1550	{
1557	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1551	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1558	return 0;	1552	return 0;
1559	}	1553	}
1560		1554
1561	if (player *pl = op->contr)	1555	if (op->contr)
1562	{	1556	bow = op->current_weapon;
1563	bow = pl->ranged_ob;
1564	op->set_weapon (bow);
1565	}
1566	else	1557	else
1567	{	1558	{
1568	for (bow = op->inv; bow; bow = bow->below)	1559	for (bow = op->inv; bow; bow = bow->below)
1569	/* Don't check for applied - monsters don't apply bows - in that way, they	1560	/* Don't check for applied - monsters don't apply bows - in that way, they
1570	* don't need to switch back and forth between bows and weapons.	1561	* don't need to switch back and forth between bows and weapons.
…		…
1591	{	1582	{
1592	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1583	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1593	return 0;	1584	return 0;
1594	}	1585	}
1595		1586
1596	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1597
1598	/* penalize ROF for bestarrow */
1599	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1600	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1601
1602	if (bowspeed < 1)
1603	bowspeed = 1;
1604
1605	if (arrow == NULL)	1587	if (arrow == NULL)
1606	{	1588	{
1607	if ((arrow = find_arrow (op, bow->race)) == NULL)	1589	if ((arrow = find_arrow (op, bow->race)) == NULL)
1608	{	1590	{
1609	if (op->type == PLAYER)	1591	if (op->type == PLAYER)
…		…
1643		1625
1644	arrow->set_owner (op);	1626	arrow->set_owner (op);
1645	arrow->skill = bow->skill;	1627	arrow->skill = bow->skill;
1646	arrow->direction = dir;	1628	arrow->direction = dir;
1647		1629
1648	if (op->type == PLAYER)
1649	{
1650	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1651	op->update_stats ();
1652	}
1653
1654	SET_ANIMATION (arrow, arrow->direction);
1655
1656	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1630	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1657	arrow->stats.hp = arrow->stats.dam;	1631	arrow->stats.hp = arrow->stats.dam;
1658	arrow->stats.grace = arrow->attacktype;	1632	arrow->stats.grace = arrow->attacktype;
1659		1633
1660	if (arrow->slaying)	1634	if (arrow->slaying)
1661	arrow->spellarg = strdup (arrow->slaying);	1635	arrow->spellarg = strdup (arrow->slaying);
1662		1636
1663	arrow->stats.dam += op->stats.dam + arrow->magic;	1637	#if 0
		1638	if (player *pl = op->contr)
		1639	{
		1640	float speed = pl->weapon_sp;
		1641
		1642	/* penalize ROF for bestarrow */
		1643	if (pl->bowtype == bow_bestarrow)
		1644	speed *= .9f;
		1645	else
		1646	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1647
		1648	op->speed_left += speed - op->speed;
		1649	}
		1650	#endif
		1651
		1652	SET_ANIMATION (arrow, arrow->direction);
1664		1653
1665	/* update the speed */	1654	/* update the speed */
1666	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1655	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1667	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1656	+ bow->stats.dam / 7.f;
1668		1657
1669	arrow->set_speed (max (arrow->speed, 1.0));	1658	arrow->set_speed (max (arrow->speed, 2.f));
1670	arrow->speed_left = 0;	1659	arrow->speed_left = 0;
1671		1660
1672	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1661	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1673		1662
1674	if (op->type == PLAYER)	1663	if (op->type == PLAYER)
1675	{	1664	{
1676	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1665	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1677	arrow->stats.wc -= dex_bonus[op->stats.Dex];	1666	wc -= dex_bonus[op->stats.Dex];
1678		1667
1679	if (!arrow->slaying)	1668	if (!arrow->slaying)
1680	arrow->slaying = op->slaying;	1669	arrow->slaying = op->slaying;
		1670
		1671	arrow->attacktype \|= op->attacktype;
1681	}	1672	}
1682	else	1673	else
1683	{	1674	{
1684	arrow->level = op->level;	1675	arrow->level = op->level;
1685	arrow->stats.wc -= bow->magic;	1676	arrow->stats.wc -= bow->magic;
1686		1677
1687	if (!arrow->slaying)	1678	if (!arrow->slaying)
1688	arrow->slaying = bow->slaying;	1679	arrow->slaying = bow->slaying;
1689	}
1690		1680
1691	arrow->stats.wc -= arrow->level;
1692
1693	arrow->attacktype \|= bow->attacktype;	1681	arrow->attacktype \|= bow->attacktype;
		1682	}
1694		1683
		1684	wc -= arrow->level;
		1685	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
		1686
		1687	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1695	arrow->move_type = MOVE_FLY_LOW;	1688	arrow->move_type = MOVE_FLY_LOW;
1696	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1689	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1697		1690
1698	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1691	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1699	m->insert (arrow, sx, sy, op);	1692	m->insert (arrow, sx, sy, op);
…		…
1754	}	1747	}
1755		1748
1756	return ret;	1749	return ret;
1757	}	1750	}
1758		1751
1759
1760	/* Fires a misc (wand/rod/horn) object in 'dir'.	1752	/* Fires a misc (wand/rod/horn) object in 'dir'.
1761	* Broken apart from 'fire' to keep it more readable.	1753	* Broken apart from 'fire' to keep it more readable.
1762	*/	1754	*/
1763	void	1755	void
1764	fire_misc_object (object *op, int dir)	1756	fire_misc_object (object *op, int dir)
…		…
1775	{	1767	{
1776	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1777	return;	1769	return;
1778	}	1770	}
1779		1771
1780	op->set_weapon (item);	1772	if (!op->change_weapon (item))
		1773	return;
1781		1774
1782	if (item->type == WAND)	1775	if (item->type == WAND)
1783	{	1776	{
1784	if (item->stats.food <= 0)	1777	if (item->stats.food <= 0)
1785	{	1778	{
…		…
1829	}	1822	}
1830	}	1823	}
1831		1824
1832	/* Received a fire command for the player - go and do it.	1825	/* Received a fire command for the player - go and do it.
1833	*/	1826	*/
1834	void	1827	bool
1835	fire (object *op, int dir)	1828	fire (object *op, int dir)
1836	{	1829	{
1837	int spellcost = 0;	1830	int spellcost = 0;
1838		1831
1839	/* check for loss of invisiblity/hide */	1832	/* check for loss of invisiblity/hide */
…		…
1843	player *pl = op->contr;	1836	player *pl = op->contr;
1844		1837
1845	if (pl->golem)	1838	if (pl->golem)
1846	{	1839	{
1847	control_golem (op->contr->golem, dir);	1840	control_golem (op->contr->golem, dir);
1848	return;	1841	return false;
1849	}	1842	}
1850		1843
1851	object *ob = pl->ranged_ob;	1844	object *ob = pl->ranged_ob;
1852		1845
1853	if (!ob)	1846	if (!ob)
1854	return;	1847	return false;
		1848
		1849	if (!op->change_weapon (ob))
		1850	return false;
		1851
		1852	if (op->speed_left > 0.f)
		1853	--op->speed_left;
		1854	else
		1855	return false;
1855		1856
1856	switch (ob->type)	1857	switch (ob->type)
1857	{	1858	{
1858	case BOW:	1859	case BOW:
1859	player_fire_bow (op, dir);	1860	player_fire_bow (op, dir);
…		…
1866	case BUILDER:	1867	case BUILDER:
1867	apply_map_builder (op, dir);	1868	apply_map_builder (op, dir);
1868	break;	1869	break;
1869		1870
1870	case SKILL:	1871	case SKILL:
1871	case SKILL_TOOL:
1872	do_skill (op, op, ob, dir, 0);	1872	do_skill (op, op, ob, dir, 0);
1873	break;	1873	break;
1874		1874
1875	default:	1875	default:
1876	fire_misc_object (op, dir);	1876	fire_misc_object (op, dir);
1877	break;	1877	break;
1878	}	1878	}
		1879
		1880	return true;
1879	}	1881	}
1880		1882
1881	/* find_key	1883	/* find_key
1882	* We try to find a key for the door as passed. If we find a key	1884	* We try to find a key for the door as passed. If we find a key
1883	* and successfully use it, we return the key, otherwise NULL	1885	* and successfully use it, we return the key, otherwise NULL
…		…
1970	* 0 otherwise	1972	* 0 otherwise
1971	*/	1973	*/
1972	static int	1974	static int
1973	player_attack_door (object op, object door)	1975	player_attack_door (object op, object door)
1974	{	1976	{
1975	/* If its a door, try to find a use a key. If we do destroy the door,	1977	/* If its a door, try to find a key. If we do destroy the door,
1976	* might as well return immediately as there is nothing more to do -	1978	* might as well return immediately as there is nothing more to do -
1977	* otherwise, we fall through to the rest of the code.	1979	* otherwise, we fall through to the rest of the code.
1978	*/	1980	*/
1979	object *key = find_key (op, op, door);	1981	object *key = find_key (op, op, door);
1980		1982
1981	/* IF we found a key, do some extra work */	1983	/* If we found a key, do some extra work */
1982	if (key)	1984	if (key)
1983	{	1985	{
1984	object *container = key->env;	1986	object *container = key->env;
1985		1987
1986	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1988	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
…		…
2021	* It should keep the code cleaner.	2023	* It should keep the code cleaner.
2022	* When this is called, the players direction has been updated	2024	* When this is called, the players direction has been updated
2023	* (taking into account confusion.) The player is also actually	2025	* (taking into account confusion.) The player is also actually
2024	* going to try and move (not fire weapons).	2026	* going to try and move (not fire weapons).
2025	*/	2027	*/
2026	void	2028	bool
2027	move_player_attack (object *op, int dir)	2029	move_player_attack (object *op, int dir)
2028	{	2030	{
2029	object tmp, mon;
2030	int on_battleground;	2031	int on_battleground;
2031	maptile *m;
2032		2032
2033	sint16 nx = freearr_x[dir] + op->x;	2033	sint16 nx = freearr_x[dir] + op->x;
2034	sint16 ny = freearr_y[dir] + op->y;	2034	sint16 ny = freearr_y[dir] + op->y;
2035		2035
2036	on_battleground = op_on_battleground (op, 0, 0);	2036	on_battleground = op_on_battleground (op, 0, 0);
		2037
		2038	if (out_of_map (op->map, nx, ny))
		2039	return false;
		2040
		2041	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2042	{
		2043	--op->speed_left;
		2044	return true;
		2045	}
2037		2046
2038	/* If braced, or can't move to the square, and it is not out of the	2047	/* If braced, or can't move to the square, and it is not out of the
2039	* map, attack it. Note order of if statement is important - don't	2048	* map, attack it. Note order of if statement is important - don't
2040	* want to be calling move_ob if braced, because move_ob will move the	2049	* want to be calling move_ob if braced, because move_ob will move the
2041	* player. This is a pretty nasty hack, because if we could	2050	* player. This is a pretty nasty hack, because if we could
2042	* move to some space, it then means that if we are braced, we should	2051	* move to some space, it then means that if we are braced, we should
2043	* do nothing at all. As it is, if we are braced, we go through	2052	* do nothing at all. As it is, if we are braced, we go through
2044	* quite a bit of processing. However, it probably is less than what	2053	* quite a bit of processing. However, it probably is less than what
2045	* move_ob uses.	2054	* move_ob uses.
2046	*/	2055	*/
2047	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2048	{
2049	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2050	{
2051	m = op->map->xy_find (nx, ny);	2056	maptile *m = op->map->xy_find (nx, ny);
2052	if (!m)
2053	return; /* Don't think this should happen */
2054	}
2055	else
2056	m = op->map;
2057		2057
2058	if (!(tmp = m->at (nx, ny).bot))
2059	return;
2060
2061	mon = 0;
2062	/* Go through all the objects, and find ones of interest. Only stop if	2058	/* Go through all the objects, and find ones of interest. Only stop if
2063	* we find a monster - that is something we know we want to attack.	2059	* we find a monster - that is something we know we want to attack.
2064	* if its a door or barrel (can roll) see if there may be monsters	2060	* if its a door or barrel (can roll) see if there may be monsters
2065	* on the space	2061	* on the space
2066	*/	2062	*/
2067	while (tmp)	2063	object *mon;
2068	{	2064	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2069	if (tmp == op)	2065	{
2070	{	2066	if ((mon->flag [FLAG_ALIVE]
2071	tmp = tmp->above;	2067	\|\| mon->type == LOCKED_DOOR
2072	continue;	2068	\|\| mon->flag [FLAG_CAN_ROLL])
2073	}
2074
2075	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2076	{
2077	mon = tmp;	2069	&& mon != op)
2078	break;	2070	break;
2079	}	2071	}
2080		2072
2081	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2082	mon = tmp;
2083
2084	tmp = tmp->above;
2085	}
2086
2087	if (!mon) /* This happens anytime the player tries to move */	2073	if (!mon) /* This happens anytime the player tries to move */
2088	return; /* into a wall */	2074	return false; /* into a wall */
2089		2075
2090	if (mon->head)
2091	mon = mon->head;	2076	mon = mon->head_ ();
2092		2077
2093	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2078	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2079	if (op->contr->weapon_sp_left > 0.f)
2094	if (player_attack_door (op, mon))	2080	if (player_attack_door (op, mon))
		2081	{
		2082	--op->contr->weapon_sp_left;
2095	return;	2083	return true;
		2084	}
2096		2085
2097	/* The following deals with possibly attacking peaceful	2086	/* The following deals with possibly attacking peaceful
2098	* or frienddly creatures. Basically, all players are considered	2087	* or friendly creatures. Basically, all players are considered
2099	* unaggressive. If the moving player has peaceful set, then the	2088	* unaggressive. If the moving player has peaceful set, then the
2100	* object should be pushed instead of attacked. It is assumed that	2089	* object should be pushed instead of attacked. It is assumed that
2101	* if you are braced, you will not attack friends accidently,	2090	* if you are braced, you will not attack friends accidently,
2102	* and thus will not push them.	2091	* and thus will not push them.
2103	*/	2092	*/
2104		2093
2105	/* If the creature is a pet, push it even if the player is not	2094	/* If the creature is a pet, push it even if the player is not
2106	* peaceful. Our assumption is the creature is a pet if the	2095	* peaceful. Our assumption is the creature is a pet if the
2107	* player owns it and it is either friendly or unagressive.	2096	* player owns it and it is either friendly or unagressive.
2108	*/	2097	*/
2109	if ((op->type == PLAYER)	2098	if (op->type == PLAYER
2110	#if COZY_SERVER
2111	&&
2112	((mon->owner && mon->owner->contr	2099	&& ((mon->owner && mon->owner->contr
2113	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2100	&& same_party (mon->owner->contr->party, op->contr->party))
2114	#else
2115	&& mon->owner == op	2101	\|\| mon->owner == op)
2116	#endif
2117	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2102	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2118	{	2103	{
2119	/* If we're braced, we don't want to switch places with it */	2104	/* If we're braced, we don't want to switch places with it */
2120	if (op->contr->braced)	2105	if (op->contr->braced)
2121	return;	2106	return false;
		2107
		2108	if (op->speed_left > 0.f)
		2109	{
		2110	--op->speed_left;
2122		2111
2123	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2112	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2124	push_ob (mon, dir, op);	2113	push_ob (mon, dir, op);
		2114
2125	if (op->contr->tmp_invis \|\| op->hide)	2115	if (op->contr->tmp_invis \|\| op->hide)
2126	make_visible (op);	2116	make_visible (op);
2127		2117
2128	return;	2118	return true;
2129	}	2119	}
		2120	else
		2121	return false;
		2122	}
2130		2123
2131	/* in certain circumstances, you shouldn't attack friendly	2124	/* in certain circumstances, you shouldn't attack friendly
2132	* creatures. Note that if you are braced, you can't push	2125	* creatures. Note that if you are braced, you can't push
2133	* someone, but put it inside this loop so that you won't	2126	* someone, but put it inside this loop so that you won't
2134	* attack them either.	2127	* attack them either.
2135	*/	2128	*/
2136	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2129	if ((mon->type == PLAYER \|\| mon->enemy != op)
2137	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2130	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2138	#ifdef PROHIBIT_PLAYERKILL
2139	(op->contr->peaceful	2131	&& ((op->contr->peaceful
2140	\|\| (mon->type == PLAYER	2132	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2141	&& mon->contr->
2142	peaceful)) &&
2143	#else
2144	op->contr->peaceful &&
2145	#endif
2146	!on_battleground))	2133	&& !on_battleground))
		2134	{
		2135	if (op->speed_left > 0.f)
2147	{	2136	{
		2137	--op->speed_left;
		2138
2148	if (!op->contr->braced)	2139	if (!op->contr->braced)
2149	{	2140	{
2150	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2141	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2151	push_ob (mon, dir, op);	2142	push_ob (mon, dir, op);
2152	}	2143	}
2153	else	2144	else
2154	new_draw_info (0, 0, op, "You withhold your attack");	2145	new_draw_info (0, 0, op, "You withhold your attack");
2155		2146
2156	if (op->contr->tmp_invis \|\| op->hide)	2147	if (op->contr->tmp_invis \|\| op->hide)
2157	make_visible (op);	2148	make_visible (op);
2158	}
2159		2149
		2150	return true;
		2151	}
		2152	}
2160	/* If the object is a boulder or other rollable object, then	2153	/* If the object is a boulder or other rollable object, then
2161	* roll it if not braced. You can't roll it if you are braced.	2154	* roll it if not braced. You can't roll it if you are braced.
2162	*/	2155	*/
2163	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2157	{
		2158	if (op->speed_left > 0.f)
2164	{	2159	{
		2160	--op->speed_left;
		2161
2165	recursive_roll (mon, dir, op);	2162	recursive_roll (mon, dir, op);
2166	if (action_makes_visible (op))	2163	if (action_makes_visible (op))
2167	make_visible (op);	2164	make_visible (op);
2168	}
2169		2165
		2166	return true;
		2167	}
		2168	}
2170	/* Any generic living creature. Including things like doors.	2169	/* Any generic living creature. Including things like doors.
2171	* Way it works is like this: First, it must have some hit points	2170	* Way it works is like this: First, it must have some hit points
2172	* and be living. Then, it must be one of the following:	2171	* and be living. Then, it must be one of the following:
2173	* 1) Not a player, 2) A player, but of a different party. Note	2172	* 1) Not a player, 2) A player, but of a different party. Note
2174	* that party_number -1 is no party, so attacks can still happen.	2173	* that party_number -1 is no party, so attacks can still happen.
2175	*/	2174	*/
2176	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2175	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2177	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2176	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2178	{	2177	{
2179		2178	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2180	/* If the player hasn't hit something this tick, and does
2181	* so, give them speed boost based on weapon speed. Doing
2182	* it here is better than process_players2, which basically
2183	* incurred a 1 tick offset.
2184	*/
2185	if (!op->contr->has_hit)
2186	{	2179	{
2187	op->speed_left += op->speed / op->contr->weapon_sp;	2180	--op->contr->weapon_sp_left;
2188
2189	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2190	}
2191		2181
2192	skill_attack (mon, op, 0, 0, 0);	2182	skill_attack (mon, op, 0, 0, 0);
2193
2194	/* If attacking another player, that player gets automatic
2195	* hitback, and doesn't loose luck either.
2196	* Disable hitback on the battleground or if the target is
2197	* the wiz.
2198	*/
2199	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2200	{
2201	short luck = mon->stats.luck;
2202
2203	mon->contr->has_hit = 1;
2204	skill_attack (op, mon, 0, 0, 0);
2205	mon->stats.luck = luck;
2206	}
2207		2183
2208	if (action_makes_visible (op))	2184	if (action_makes_visible (op))
2209	make_visible (op);	2185	make_visible (op);
2210	}
2211	} /* if player should attack something */
2212	}
2213		2186
2214	int	2187	return true;
		2188	}
		2189	}
		2190
		2191	return false;
		2192	}
		2193
		2194	bool
2215	move_player (object *op, int dir)	2195	move_player (object *op, int dir)
2216	{	2196	{
2217	int pick;	2197	int pick;
2218		2198
2219	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2199	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2233	op->facing = dir;	2213	op->facing = dir;
2234		2214
2235	if (op->hide)	2215	if (op->hide)
2236	do_hidden_move (op);	2216	do_hidden_move (op);
2237		2217
		2218	bool retval;
		2219
2238	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2220	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2239	/nop / ;	2221	retval = RESULT_INT (0);
2240	else if (op->contr->fire_on)	2222	else if (op->contr->fire_on)
2241	fire (op, dir);	2223	retval = fire (op, dir);
2242	else	2224	else
2243	{	2225	{
2244	move_player_attack (op, dir);	2226	retval = move_player_attack (op, dir);
2245	pick = check_pick (op);	2227	pick = check_pick (op);
2246	}	2228	}
2247		2229
2248	/* Add special check for newcs players and fire on - this way, the	2230	/* Add special check for newcs players and fire on - this way, the
2249	* server can handle repeat firing.	2231	* server can handle repeat firing.
…		…
2256	/* Update how the player looks. Use the facing, so direction may	2238	/* Update how the player looks. Use the facing, so direction may
2257	* get reset to zero. This allows for full animation capabilities	2239	* get reset to zero. This allows for full animation capabilities
2258	* for players.	2240	* for players.
2259	*/	2241	*/
2260	animate_object (op, op->facing);	2242	animate_object (op, op->facing);
2261	return 0;	2243
		2244	return retval;
2262	}	2245	}
2263		2246
2264	/* This is similar to handle_player, below, but is only used by the	2247	/* This is similar to handle_player, below, but is only used by the
2265	* new client/server stuff.	2248	* new client/server stuff.
2266	* This is sort of special, in that the new client/server actually uses	2249	* This is sort of special, in that the new client/server actually uses
2267	* the new speed values for commands.	2250	* the new speed values for commands.
2268	*	2251	*
2269	* Returns true if there are more actions we can do.	2252	* Returns true if there are more actions we can do. Should not do
		2253	* many actions in a row, as that would be too unfair to other
		2254	* players.
2270	*/	2255	*/
2271	int	2256	bool
2272	handle_newcs_player (object *op)	2257	handle_newcs_player (object *op)
2273	{	2258	{
2274	if (QUERY_FLAG (op, FLAG_SCARED))	2259	if (QUERY_FLAG (op, FLAG_SCARED))
2275	{	2260	{
2276	flee_player (op);	2261	if (op->speed_left > 0.f)
2277	/* If player is still scared, that is his action for this tick */
2278	if (QUERY_FLAG (op, FLAG_SCARED))
2279	{	2262	{
2280	op->speed_left--;	2263	--op->speed_left;
		2264	flee_player (op);
		2265
2281	return 0;	2266	return true;
2282	}	2267	}
		2268	else
		2269	return false;
2283	}	2270	}
2284		2271
2285	/* call this here - we also will call this in do_ericserver, but	2272	/* call this here - we also will call this in do_ericserver, but
2286	* the players time has been increased when doericserver has been	2273	* the players time has been increased when doericserver has been
2287	* called, so we recheck it here.	2274	* called, so we recheck it here.
2288	*/	2275	*/
2289	if (op->contr->ns->handle_command ())	2276	if (op->contr->ns->handle_command ())
2290	return 1;	2277	return true;
2291		2278
2292	if (op->speed_left > 0)
2293	{
2294	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2279	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2295	{
2296	/* All move commands take 1 tick, at least for now */
2297	op->speed_left--;
2298
2299	/* Instead of all the stuff below, let move_player take care
2300	* of it. Also, some of the skill stuff is only put in
2301	* there, as well as the confusion stuff.
2302	*/
2303	move_player (op, op->direction);	2280	return move_player (op, op->direction);
2304		2281
2305	return op->speed_left > 0;
2306	}
2307	}
2308
2309	return 0;	2282	return false;
2310	}	2283	}
2311		2284
2312	int	2285	int
2313	save_life (object *op)	2286	save_life (object *op)
2314	{	2287	{
…		…
2580	}	2553	}
2581		2554
2582	/* Digestion */	2555	/* Digestion */
2583	if (--op->last_eat < 0)	2556	if (--op->last_eat < 0)
2584	{	2557	{
2585	#ifdef COZY_SERVER
2586	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2587	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2588	#else
2589	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2558	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2590	#endif
2591		2559
2592	if (op->contr->gen_hp > 0)	2560	if (op->contr->gen_hp > 0)
2593	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2561	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2594	else	2562	else
2595	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2563	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2940	object *force;	2908	object *force;
2941	int at;	2909	int at;
2942		2910
2943	force = get_archetype (FORCE_NAME);	2911	force = get_archetype (FORCE_NAME);
2944	/* 50 ticks should be enough time for the spell to abate */	2912	/* 50 ticks should be enough time for the spell to abate */
2945	force->speed = 0.1;	2913	force->speed = 0.1f;
2946	force->speed_left = -5.0;	2914	force->speed_left = -5.f;
2947	SET_FLAG (force, FLAG_APPLIED);	2915	SET_FLAG (force, FLAG_APPLIED);
2948	for (at = 0; at < NROFATTACKS; at++)	2916	for (at = 0; at < NROFATTACKS; at++)
2949	if (will_kill_again & (1 << at))	2917	if (will_kill_again & (1 << at))
2950	force->resist[at] = 100;	2918	force->resist[at] = 100;
2951		2919
…		…
3126	/* For Hidden creatures - a chance of becoming 'unhidden'	3094	/* For Hidden creatures - a chance of becoming 'unhidden'
3127	* every time they move - as we subtract off 'invisibility'	3095	* every time they move - as we subtract off 'invisibility'
3128	* AND, for players, if they move into a ridiculously unhideable	3096	* AND, for players, if they move into a ridiculously unhideable
3129	* spot (surrounded by clear terrain in broad daylight). -b.t.	3097	* spot (surrounded by clear terrain in broad daylight). -b.t.
3130	*/	3098	*/
3131
3132	void	3099	void
3133	do_hidden_move (object *op)	3100	do_hidden_move (object *op)
3134	{	3101	{
3135	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3102	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3136	object *skop;	3103	object *skop;
…		…
3459	/* forces in the treasurelist can alter the player's stats */	3426	/* forces in the treasurelist can alter the player's stats */
3460	object *skin;	3427	object *skin;
3461		3428
3462	/* first get the dragon skin force */	3429	/* first get the dragon skin force */
3463	shstr_cmp dragon_skin_force ("dragon_skin_force");	3430	shstr_cmp dragon_skin_force ("dragon_skin_force");
3464	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3431	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3465	;	3432	;
3466		3433
3467	if (!skin)	3434	if (!skin)
3468	return;	3435	return;
3469		3436

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.123 by root, Fri May 11 21:07:14 2007 UTC vs. Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.123 by root, Fri May 11 21:07:14 2007 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC