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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.135 by root, Sun May 13 15:13:57 2007 UTC vs.
Revision 1.150 by root, Sun Jun 10 03:11:17 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>
147	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);	148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
150	}	150	}
151		151
152	float
153	player::weapon_speed () const
154	{
155	return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
156	}
157
158	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
159	static void	153	static void
160	set_first_map (object *op)	154	set_first_map (object *op)
161	{	155	{
162	op->contr->maplevel = first_map_path;	156	op->contr->maplevel = first_map_path;
163	op->x = -1;	157	op->x = -1;
164	op->y = -1;	158	op->y = -1;
165	}
166
167	void
168	player::enter_map ()
169	{
170	object *tmp = object::create ();
171
172	EXIT_PATH (tmp) = maplevel;
173	EXIT_X (tmp) = ob->x;
174	EXIT_Y (tmp) = ob->y;
175	ob->enter_exit (tmp);
176
177	tmp->destroy ();
178	}	159	}
179		160
180	void	161	void
181	player::activate ()	162	player::activate ()
182	{	163	{
…		…
187	ob->remove ();	168	ob->remove ();
188	ob->map = 0;	169	ob->map = 0;
189	ob->activate_recursive ();	170	ob->activate_recursive ();
190	CLEAR_FLAG (ob, FLAG_FRIENDLY);	171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
191	add_friendly_object (ob);	172	add_friendly_object (ob);
192	enter_map ();
193	}	173	}
194		174
195	void	175	void
196	player::deactivate ()	176	player::deactivate ()
197	{	177	{
…		…
227	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
228		208
229	ns->update_look = 0;	209	ns->update_look = 0;
230	ns->look_position = 0;	210	ns->look_position = 0;
231		211
232	clear_los (ob);	212	clear_los (this);
233		213
234	ns->reset_stats ();	214	ns->reset_stats ();
235		215
236	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
237	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
238	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
239		219
240	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
241	link_player_skills (ob);	221	link_player_skills (ob);
242		222
243	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
244		224
245	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
246		226
247	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
248	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
249	{	229	{
250	object tmp, abil = 0, *skin = 0;	230	object tmp, abil = 0, *skin = 0;
…		…
252	shstr_cmp dragon_ability_force ("dragon_ability_force");	232	shstr_cmp dragon_ability_force ("dragon_ability_force");
253	shstr_cmp dragon_skin_force ("dragon_skin_force");	233	shstr_cmp dragon_skin_force ("dragon_skin_force");
254		234
255	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
256	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
257	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == dragon_ability_force)
258	abil = tmp;	238	abil = tmp;
259	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == dragon_skin_force)
260	skin = tmp;	240	skin = tmp;
261		241
262	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
263	}	243	}
264		244
265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
266		246
267	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;
268		252
269	for (object *op = ob->inv; op; op = op->below)	253	for (object *op = ob->inv; op; op = op->below)
270	if (op->flag [FLAG_APPLIED])	254	if (op->flag [FLAG_APPLIED])
271	switch (op->type)	255	switch (op->type)
272	{	256	{
		257	case SKILL:
		258	ob->flag [FLAG_APPLIED] = false;
		259	break;
		260
273	case WAND:	261	case WAND:
274	case ROD:	262	case ROD:
275	case HORN:	263	case HORN:
276	case BOW:	264	case BOW:
277	case SKILL:	265	ranged_ob = op;
278	case SKILL_TOOL:	266	break;
		267
279	case WEAPON:	268	case WEAPON:
280	apply_special (ob, op, AP_UNAPPLY);	269	combat_ob = op;
281	apply_special (ob, op, AP_APPLY);
282	break;	270	break;
283	}	271	}
284		272
		273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
285	ob->update_stats ();	274	ob->update_stats ();
		275
286	ns->floorbox_update ();	276	ns->floorbox_update ();
287
288	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
289	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
290		279
291	activate ();	280	activate ();
292		281
…		…
313	ns = 0;	302	ns = 0;
314	}	303	}
315		304
316	if (ob)	305	if (ob)
317	ob->close_container (); //TODO: client-specific	306	ob->close_container (); //TODO: client-specific
		307
		308	observe = ob;
318		309
319	deactivate ();	310	deactivate ();
320	}	311	}
321		312
322	// the need for this function can be explained	313	// the need for this function can be explained
323	// by load_object not returning the object	314	// by load_object not returning the object
324	void	315	void
325	player::set_object (object *op)	316	player::set_object (object *op)
326	{	317	{
327	ob = op;	318	ob = observe = op;
328	ob->contr = this; /* this aren't yet in archetype */	319	ob->contr = this; /* this aren't yet in archetype */
329		320
330	ob->speed_left = 0.5f;
331	ob->speed = 1.0f;	321	ob->speed = 1.0f;
		322	ob->speed_left = 0.5f;
		323
332	ob->direction = 5; /* So player faces south */	324	ob->direction = 5; /* So player faces south */
		325	}
		326
		327	void
		328	player::set_observe (object *op)
		329	{
		330	observe = op ? op : ob;
		331	do_los = 1;
333	}	332	}
334		333
335	player::player ()	334	player::player ()
336	{	335	{
337	/* There are some elements we want initialised to non zero value -	336	/* There are some elements we want initialised to non zero value -
…		…
348	petmode = pet_normal;	347	petmode = pet_normal;
349	listening = 10;	348	listening = 10;
350	usekeys = containers;	349	usekeys = containers;
351	peaceful = 1; /* default peaceful */	350	peaceful = 1; /* default peaceful */
352	do_los = 1;	351	do_los = 1;
		352
		353	weapon_sp = 1.0f;
		354	weapon_sp_left = 0.5f;
353	}	355	}
354		356
355	void	357	void
356	player::do_destroy ()	358	player::do_destroy ()
357	{	359	{
…		…
398	* Note: there MUST be at least one player archetype!	400	* Note: there MUST be at least one player archetype!
399	*/	401	*/
400	archetype *	402	archetype *
401	get_player_archetype (archetype *at)	403	get_player_archetype (archetype *at)
402	{	404	{
403	archetype *start = at;	405	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
404		406
405	for (;;)	407	for (;;)
406	{	408	{
407	if (at == NULL \|\| at->next == NULL)	409	if (++i == archetypes.end ())
408	at = first_archetype;	410	i = archetypes.begin ();
409	else	411	else if (*i == at)
410	at = at->next;	412	cleanup ("not a single player archetype found");
411		413
412	if (at->clone.type == PLAYER)	414	if ((*i)->type == PLAYER)
413	return at;	415	return *i;
414
415	if (at == start)
416	{
417	LOG (llevError, "No Player archetypes\n");
418	exit (-1);
419	}
420	}	416	}
421	}	417	}
422		418
423	object *	419	object *
424	get_nearest_player (object *mon)	420	get_nearest_player (object *mon)
…		…
914	if (*first_map_ext_path)	910	if (*first_map_ext_path)
915	{	911	{
916	object *tmp;	912	object *tmp;
917	char mapname[MAX_BUF];	913	char mapname[MAX_BUF];
918		914
919	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
920	tmp = object::create ();	916	tmp = object::create ();
921	EXIT_PATH (tmp) = mapname;	917	EXIT_PATH (tmp) = mapname;
922	EXIT_X (tmp) = ob->x;	918	EXIT_X (tmp) = ob->x;
923	EXIT_Y (tmp) = ob->y;	919	EXIT_Y (tmp) = ob->y;
924	ob->enter_exit (tmp); /* we don't really care if it succeeded;	920	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
943	int x = ob->x, y = ob->y;	939	int x = ob->x, y = ob->y;
944		940
945	ob->remove_statbonus ();	941	ob->remove_statbonus ();
946	ob->remove ();	942	ob->remove ();
947	ob->arch = get_player_archetype (ob->arch);	943	ob->arch = get_player_archetype (ob->arch);
948	ob->arch->clone.copy_to (ob);	944	ob->arch->copy_to (ob);
949	ob->instantiate ();	945	ob->instantiate ();
950	ob->stats = ob->contr->orig_stats;	946	ob->stats = ob->contr->orig_stats;
951	ob->name = ob->name_pl = name;	947	ob->name = ob->name_pl = name;
952	ob->x = x;	948	ob->x = x;
953	ob->y = y;	949	ob->y = y;
954	SET_ANIMATION (ob, 2); /* So player faces south */	950	SET_ANIMATION (ob, 2); /* So player faces south */
955	insert_ob_in_map (ob, ob->map, ob, 0);	951	insert_ob_in_map (ob, ob->map, ob, 0);
956	assign (ob->contr->title, ob->arch->clone.name);	952	assign (ob->contr->title, ob->arch->object::name);
957	ob->add_statbonus ();	953	ob->add_statbonus ();
958	}	954	}
959	while (!allowed_class (ob));	955	while (!allowed_class (ob));
960		956
961	update_object (ob, UP_OBJ_FACE);	957	update_object (ob, UP_OBJ_FACE);
…		…
1106	if (tmp->name != NULL)	1102	if (tmp->name != NULL)
1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1103	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1104	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109	else	1105	else
1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1106	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1107	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112		1108
1113	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1109	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1114	}	1110	}
1115		1111
1116	/* philosophy:	1112	/* philosophy:
…		…
1309	/* careful: chairs and tables are weapons! */	1305	/* careful: chairs and tables are weapons! */
1310	if (op->contr->mode & PU_ALLWEAPON)	1306	if (op->contr->mode & PU_ALLWEAPON)
1311	{	1307	{
1312	if (tmp->type == WEAPON && tmp->name != NULL)	1308	if (tmp->type == WEAPON && tmp->name != NULL)
1313	{	1309	{
1314	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1310	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1315	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1311	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316	{	1312	{
1317	pick_up (op, tmp);	1313	pick_up (op, tmp);
1318	continue;	1314	continue;
1319	}	1315	}
1320	}	1316	}
1321		1317
1322	if (tmp->type == WEAPON && tmp->name == NULL)	1318	if (tmp->type == WEAPON && tmp->name == NULL)
1323	{	1319	{
1324	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1320	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1325	{	1321	{
1326	pick_up (op, tmp);	1322	pick_up (op, tmp);
1327	continue;	1323	continue;
1328	}	1324	}
1329	}	1325	}
…		…
1354	if (tmp->name != NULL)	1350	if (tmp->name != NULL)
1355	{	1351	{
1356	fprintf (stderr, "%s", tmp->name);	1352	fprintf (stderr, "%s", tmp->name);
1357	}	1353	}
1358	else	1354	else
1359	fprintf (stderr, "%s", tmp->arch->name);	1355	fprintf (stderr, "%s", tmp->arch->archname);
1360	fprintf (stderr, ",%d] = ", tmp->type);	1356	fprintf (stderr, ",%d] = ", tmp->type);
1361	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1357	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1362	#endif	1358	#endif
1363	continue;	1359	continue;
1364	}	1360	}
…		…
1434	else	1430	else
1435	{	1431	{
1436	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1432	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437	{	1433	{
1438	attacktype = 1 << attacknum;	1434	attacktype = 1 << attacknum;
1439	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1435	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1436	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1441	{	1437	{
1442	tmp = arrow;	1438	tmp = arrow;
1443	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1439	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1444	}	1440	}
1445	}	1441	}
1446	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1442	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447	{	1443	{
1448	tmp = arrow;	1444	tmp = arrow;
…		…
1550	{	1546	{
1551	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1547	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1552	return 0;	1548	return 0;
1553	}	1549	}
1554		1550
1555	if (player *pl = op->contr)	1551	if (op->contr)
1556	{	1552	bow = op->current_weapon;
1557	bow = pl->ranged_ob;
1558	if (!op->change_weapon (bow))
1559	return 0;
1560	}
1561	else	1553	else
1562	{	1554	{
1563	for (bow = op->inv; bow; bow = bow->below)	1555	for (bow = op->inv; bow; bow = bow->below)
1564	/* Don't check for applied - monsters don't apply bows - in that way, they	1556	/* Don't check for applied - monsters don't apply bows - in that way, they
1565	* don't need to switch back and forth between bows and weapons.	1557	* don't need to switch back and forth between bows and weapons.
…		…
1636	arrow->stats.grace = arrow->attacktype;	1628	arrow->stats.grace = arrow->attacktype;
1637		1629
1638	if (arrow->slaying)	1630	if (arrow->slaying)
1639	arrow->spellarg = strdup (arrow->slaying);	1631	arrow->spellarg = strdup (arrow->slaying);
1640		1632
		1633	#if 0
1641	if (player *pl = op->contr)	1634	if (player *pl = op->contr)
1642	{	1635	{
1643	if (!pl->has_hit)
1644	{
1645	pl->has_hit = 1;
1646	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1647	}
1648	#if 0
1649	float speed = pl->weapon_sp;	1636	float speed = pl->weapon_sp;
1650		1637
1651	/* penalize ROF for bestarrow */	1638	/* penalize ROF for bestarrow */
1652	if (pl->bowtype == bow_bestarrow)	1639	if (pl->bowtype == bow_bestarrow)
1653	speed *= .9f;	1640	speed *= .9f;
1654	else	1641	else
1655	speed = 1.f + dex_bonus[op->stats.Dex] .2f;	1642	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
1656		1643
1657	op->speed_left += speed - op->speed;	1644	op->speed_left += speed - op->speed;
		1645	}
1658	#endif	1646	#endif
1659	}
1660		1647
1661	SET_ANIMATION (arrow, arrow->direction);	1648	SET_ANIMATION (arrow, arrow->direction);
1662		1649
1663	/* update the speed */	1650	/* update the speed */
1664	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1651	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1665	+ bow->stats.dam / 7.0;	1652	+ bow->stats.dam / 7.f;
1666		1653
1667	arrow->set_speed (max (arrow->speed, 2.0));	1654	arrow->set_speed (max (arrow->speed, 2.f));
1668	arrow->speed_left = 0;	1655	arrow->speed_left = 0;
1669		1656
1670	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1657	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1671		1658
1672	if (op->type == PLAYER)	1659	if (op->type == PLAYER)
…		…
1816	object *tmp;	1803	object *tmp;
1817		1804
1818	if (item->arch)	1805	if (item->arch)
1819	{	1806	{
1820	CLEAR_FLAG (item, FLAG_ANIMATE);	1807	CLEAR_FLAG (item, FLAG_ANIMATE);
1821	item->face = item->arch->clone.face;	1808	item->face = item->arch->face;
1822	item->set_speed (0);	1809	item->set_speed (0);
1823	}	1810	}
1824		1811
1825	if ((tmp = item->in_player ()))	1812	if ((tmp = item->in_player ()))
1826	esrv_update_item (UPD_ANIM, tmp, item);	1813	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1831	}	1818	}
1832	}	1819	}
1833		1820
1834	/* Received a fire command for the player - go and do it.	1821	/* Received a fire command for the player - go and do it.
1835	*/	1822	*/
1836	void	1823	bool
1837	fire (object *op, int dir)	1824	fire (object *op, int dir)
1838	{	1825	{
1839	int spellcost = 0;	1826	int spellcost = 0;
1840		1827
1841	/* check for loss of invisiblity/hide */	1828	/* check for loss of invisiblity/hide */
…		…
1845	player *pl = op->contr;	1832	player *pl = op->contr;
1846		1833
1847	if (pl->golem)	1834	if (pl->golem)
1848	{	1835	{
1849	control_golem (op->contr->golem, dir);	1836	control_golem (op->contr->golem, dir);
1850	return;	1837	return false;
1851	}	1838	}
1852		1839
1853	object *ob = pl->ranged_ob;	1840	object *ob = pl->ranged_ob;
1854		1841
1855	if (!ob)	1842	if (!ob)
1856	return;	1843	return false;
		1844
		1845	if (!op->change_weapon (ob))
		1846	return false;
		1847
		1848	if (op->speed_left > 0.f)
		1849	--op->speed_left;
		1850	else
		1851	return false;
1857		1852
1858	switch (ob->type)	1853	switch (ob->type)
1859	{	1854	{
1860	case BOW:	1855	case BOW:
1861	player_fire_bow (op, dir);	1856	player_fire_bow (op, dir);
…		…
1868	case BUILDER:	1863	case BUILDER:
1869	apply_map_builder (op, dir);	1864	apply_map_builder (op, dir);
1870	break;	1865	break;
1871		1866
1872	case SKILL:	1867	case SKILL:
1873	case SKILL_TOOL:
1874	do_skill (op, op, ob, dir, 0);	1868	do_skill (op, op, ob, dir, 0);
1875	break;	1869	break;
1876		1870
1877	default:	1871	default:
1878	fire_misc_object (op, dir);	1872	fire_misc_object (op, dir);
1879	break;	1873	break;
1880	}	1874	}
		1875
		1876	return true;
1881	}	1877	}
1882		1878
1883	/* find_key	1879	/* find_key
1884	* We try to find a key for the door as passed. If we find a key	1880	* We try to find a key for the door as passed. If we find a key
1885	* and successfully use it, we return the key, otherwise NULL	1881	* and successfully use it, we return the key, otherwise NULL
…		…
1972	* 0 otherwise	1968	* 0 otherwise
1973	*/	1969	*/
1974	static int	1970	static int
1975	player_attack_door (object op, object door)	1971	player_attack_door (object op, object door)
1976	{	1972	{
1977	/* If its a door, try to find a use a key. If we do destroy the door,	1973	/* If its a door, try to find a key. If we do destroy the door,
1978	* might as well return immediately as there is nothing more to do -	1974	* might as well return immediately as there is nothing more to do -
1979	* otherwise, we fall through to the rest of the code.	1975	* otherwise, we fall through to the rest of the code.
1980	*/	1976	*/
1981	object *key = find_key (op, op, door);	1977	object *key = find_key (op, op, door);
1982		1978
1983	/* IF we found a key, do some extra work */	1979	/* If we found a key, do some extra work */
1984	if (key)	1980	if (key)
1985	{	1981	{
1986	object *container = key->env;	1982	object *container = key->env;
1987		1983
1988	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1984	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
…		…
2023	* It should keep the code cleaner.	2019	* It should keep the code cleaner.
2024	* When this is called, the players direction has been updated	2020	* When this is called, the players direction has been updated
2025	* (taking into account confusion.) The player is also actually	2021	* (taking into account confusion.) The player is also actually
2026	* going to try and move (not fire weapons).	2022	* going to try and move (not fire weapons).
2027	*/	2023	*/
2028	void	2024	bool
2029	move_player_attack (object *op, int dir)	2025	move_player_attack (object *op, int dir)
2030	{	2026	{
2031	object tmp, mon;
2032	int on_battleground;	2027	int on_battleground;
2033	maptile *m;
2034		2028
2035	sint16 nx = freearr_x[dir] + op->x;	2029	sint16 nx = freearr_x[dir] + op->x;
2036	sint16 ny = freearr_y[dir] + op->y;	2030	sint16 ny = freearr_y[dir] + op->y;
2037		2031
2038	on_battleground = op_on_battleground (op, 0, 0);	2032	on_battleground = op_on_battleground (op, 0, 0);
		2033
		2034	if (out_of_map (op->map, nx, ny))
		2035	return false;
		2036
		2037	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2038	{
		2039	--op->speed_left;
		2040	return true;
		2041	}
2039		2042
2040	/* If braced, or can't move to the square, and it is not out of the	2043	/* If braced, or can't move to the square, and it is not out of the
2041	* map, attack it. Note order of if statement is important - don't	2044	* map, attack it. Note order of if statement is important - don't
2042	* want to be calling move_ob if braced, because move_ob will move the	2045	* want to be calling move_ob if braced, because move_ob will move the
2043	* player. This is a pretty nasty hack, because if we could	2046	* player. This is a pretty nasty hack, because if we could
2044	* move to some space, it then means that if we are braced, we should	2047	* move to some space, it then means that if we are braced, we should
2045	* do nothing at all. As it is, if we are braced, we go through	2048	* do nothing at all. As it is, if we are braced, we go through
2046	* quite a bit of processing. However, it probably is less than what	2049	* quite a bit of processing. However, it probably is less than what
2047	* move_ob uses.	2050	* move_ob uses.
2048	*/	2051	*/
2049	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2050	{
2051	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2052	{
2053	m = op->map->xy_find (nx, ny);	2052	maptile *m = op->map->xy_find (nx, ny);
2054	if (!m)
2055	return; /* Don't think this should happen */
2056	}
2057	else
2058	m = op->map;
2059		2053
2060	if (!(tmp = m->at (nx, ny).bot))
2061	return;
2062
2063	mon = 0;
2064	/* Go through all the objects, and find ones of interest. Only stop if	2054	/* Go through all the objects, and find ones of interest. Only stop if
2065	* we find a monster - that is something we know we want to attack.	2055	* we find a monster - that is something we know we want to attack.
2066	* if its a door or barrel (can roll) see if there may be monsters	2056	* if its a door or barrel (can roll) see if there may be monsters
2067	* on the space	2057	* on the space
2068	*/	2058	*/
2069	while (tmp)	2059	object *mon;
2070	{	2060	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2071	if (tmp == op)	2061	{
2072	{	2062	if ((mon->flag [FLAG_ALIVE]
2073	tmp = tmp->above;	2063	\|\| mon->type == LOCKED_DOOR
2074	continue;	2064	\|\| mon->flag [FLAG_CAN_ROLL])
2075	}
2076
2077	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2078	{
2079	mon = tmp;	2065	&& mon != op)
2080	break;	2066	break;
2081	}	2067	}
2082		2068
2083	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2084	mon = tmp;
2085
2086	tmp = tmp->above;
2087	}
2088
2089	if (!mon) /* This happens anytime the player tries to move */	2069	if (!mon) /* This happens anytime the player tries to move */
2090	return; /* into a wall */	2070	return false; /* into a wall */
2091		2071
2092	if (mon->head)
2093	mon = mon->head;	2072	mon = mon->head_ ();
2094		2073
2095	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2074	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2075	if (op->contr->weapon_sp_left > 0.f)
2096	if (player_attack_door (op, mon))	2076	if (player_attack_door (op, mon))
		2077	{
		2078	--op->contr->weapon_sp_left;
2097	return;	2079	return true;
		2080	}
2098		2081
2099	/* The following deals with possibly attacking peaceful	2082	/* The following deals with possibly attacking peaceful
2100	* or frienddly creatures. Basically, all players are considered	2083	* or friendly creatures. Basically, all players are considered
2101	* unaggressive. If the moving player has peaceful set, then the	2084	* unaggressive. If the moving player has peaceful set, then the
2102	* object should be pushed instead of attacked. It is assumed that	2085	* object should be pushed instead of attacked. It is assumed that
2103	* if you are braced, you will not attack friends accidently,	2086	* if you are braced, you will not attack friends accidently,
2104	* and thus will not push them.	2087	* and thus will not push them.
2105	*/	2088	*/
2106		2089
2107	/* If the creature is a pet, push it even if the player is not	2090	/* If the creature is a pet, push it even if the player is not
2108	* peaceful. Our assumption is the creature is a pet if the	2091	* peaceful. Our assumption is the creature is a pet if the
2109	* player owns it and it is either friendly or unagressive.	2092	* player owns it and it is either friendly or unagressive.
2110	*/	2093	*/
2111	if ((op->type == PLAYER)	2094	if (op->type == PLAYER
2112	#if COZY_SERVER
2113	&&
2114	((mon->owner && mon->owner->contr	2095	&& ((mon->owner && mon->owner->contr
2115	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2096	&& same_party (mon->owner->contr->party, op->contr->party))
2116	#else
2117	&& mon->owner == op	2097	\|\| mon->owner == op)
2118	#endif
2119	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2098	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2120	{	2099	{
2121	/* If we're braced, we don't want to switch places with it */	2100	/* If we're braced, we don't want to switch places with it */
2122	if (op->contr->braced)	2101	if (op->contr->braced)
2123	return;	2102	return false;
		2103
		2104	if (op->speed_left > 0.f)
		2105	{
		2106	--op->speed_left;
2124		2107
2125	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2108	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2126	push_ob (mon, dir, op);	2109	push_ob (mon, dir, op);
		2110
2127	if (op->contr->tmp_invis \|\| op->hide)	2111	if (op->contr->tmp_invis \|\| op->hide)
2128	make_visible (op);	2112	make_visible (op);
2129		2113
2130	return;	2114	return true;
2131	}	2115	}
		2116	else
		2117	return false;
		2118	}
2132		2119
2133	/* in certain circumstances, you shouldn't attack friendly	2120	/* in certain circumstances, you shouldn't attack friendly
2134	* creatures. Note that if you are braced, you can't push	2121	* creatures. Note that if you are braced, you can't push
2135	* someone, but put it inside this loop so that you won't	2122	* someone, but put it inside this loop so that you won't
2136	* attack them either.	2123	* attack them either.
2137	*/	2124	*/
2138	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2125	if ((mon->type == PLAYER \|\| mon->enemy != op)
2139	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2126	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2140	#ifdef PROHIBIT_PLAYERKILL
2141	(op->contr->peaceful	2127	&& ((op->contr->peaceful
2142	\|\| (mon->type == PLAYER	2128	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2143	&& mon->contr->
2144	peaceful)) &&
2145	#else
2146	op->contr->peaceful &&
2147	#endif
2148	!on_battleground))	2129	&& !on_battleground))
		2130	{
		2131	if (op->speed_left > 0.f)
2149	{	2132	{
		2133	--op->speed_left;
		2134
2150	if (!op->contr->braced)	2135	if (!op->contr->braced)
2151	{	2136	{
2152	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2137	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2153	push_ob (mon, dir, op);	2138	push_ob (mon, dir, op);
2154	}	2139	}
2155	else	2140	else
2156	new_draw_info (0, 0, op, "You withhold your attack");	2141	new_draw_info (0, 0, op, "You withhold your attack");
2157		2142
2158	if (op->contr->tmp_invis \|\| op->hide)	2143	if (op->contr->tmp_invis \|\| op->hide)
2159	make_visible (op);	2144	make_visible (op);
2160	}
2161		2145
		2146	return true;
		2147	}
		2148	}
2162	/* If the object is a boulder or other rollable object, then	2149	/* If the object is a boulder or other rollable object, then
2163	* roll it if not braced. You can't roll it if you are braced.	2150	* roll it if not braced. You can't roll it if you are braced.
2164	*/	2151	*/
2165	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2152	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2153	{
		2154	if (op->speed_left > 0.f)
2166	{	2155	{
		2156	--op->speed_left;
		2157
2167	recursive_roll (mon, dir, op);	2158	recursive_roll (mon, dir, op);
2168	if (action_makes_visible (op))	2159	if (action_makes_visible (op))
2169	make_visible (op);	2160	make_visible (op);
2170	}
2171		2161
		2162	return true;
		2163	}
		2164	}
2172	/* Any generic living creature. Including things like doors.	2165	/* Any generic living creature. Including things like doors.
2173	* Way it works is like this: First, it must have some hit points	2166	* Way it works is like this: First, it must have some hit points
2174	* and be living. Then, it must be one of the following:	2167	* and be living. Then, it must be one of the following:
2175	* 1) Not a player, 2) A player, but of a different party. Note	2168	* 1) Not a player, 2) A player, but of a different party. Note
2176	* that party_number -1 is no party, so attacks can still happen.	2169	* that party_number -1 is no party, so attacks can still happen.
2177	*/	2170	*/
2178	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2171	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2179	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2172	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2180	{	2173	{
2181	if (!op->contr->has_hit)	2174	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2182	{	2175	{
2183	op->contr->has_hit = 1;	2176	--op->contr->weapon_sp_left;
2184	op->speed_left += op->contr->weapon_speed () - op->speed;
2185	}
2186		2177
2187	skill_attack (mon, op, 0, 0, 0);	2178	skill_attack (mon, op, 0, 0, 0);
2188
2189	/* If attacking another player, that player gets automatic
2190	* hitback, and doesn't loose luck either.
2191	* Disable hitback on the battleground or if the target is
2192	* the wiz.
2193	*/
2194	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2195	{
2196	short luck = mon->stats.luck;
2197
2198	mon->contr->has_hit = 1;
2199	skill_attack (op, mon, 0, 0, 0);
2200	mon->stats.luck = luck;
2201	}
2202		2179
2203	if (action_makes_visible (op))	2180	if (action_makes_visible (op))
2204	make_visible (op);	2181	make_visible (op);
2205	}
2206	} /* if player should attack something */
2207	}
2208		2182
2209	int	2183	return true;
		2184	}
		2185	}
		2186
		2187	return false;
		2188	}
		2189
		2190	bool
2210	move_player (object *op, int dir)	2191	move_player (object *op, int dir)
2211	{	2192	{
2212	int pick;	2193	int pick;
2213		2194
2214	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2195	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2228	op->facing = dir;	2209	op->facing = dir;
2229		2210
2230	if (op->hide)	2211	if (op->hide)
2231	do_hidden_move (op);	2212	do_hidden_move (op);
2232		2213
		2214	bool retval;
		2215
2233	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2216	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2234	/nop / ;	2217	retval = RESULT_INT (0);
2235	else if (op->contr->fire_on)	2218	else if (op->contr->fire_on)
2236	fire (op, dir);	2219	retval = fire (op, dir);
2237	else	2220	else
2238	{	2221	{
2239	move_player_attack (op, dir);	2222	retval = move_player_attack (op, dir);
2240	pick = check_pick (op);	2223	pick = check_pick (op);
2241	}	2224	}
2242		2225
2243	/* Add special check for newcs players and fire on - this way, the	2226	/* Add special check for newcs players and fire on - this way, the
2244	* server can handle repeat firing.	2227	* server can handle repeat firing.
…		…
2251	/* Update how the player looks. Use the facing, so direction may	2234	/* Update how the player looks. Use the facing, so direction may
2252	* get reset to zero. This allows for full animation capabilities	2235	* get reset to zero. This allows for full animation capabilities
2253	* for players.	2236	* for players.
2254	*/	2237	*/
2255	animate_object (op, op->facing);	2238	animate_object (op, op->facing);
2256	return 0;	2239
		2240	return retval;
2257	}	2241	}
2258		2242
2259	/* This is similar to handle_player, below, but is only used by the	2243	/* This is similar to handle_player, below, but is only used by the
2260	* new client/server stuff.	2244	* new client/server stuff.
2261	* This is sort of special, in that the new client/server actually uses	2245	* This is sort of special, in that the new client/server actually uses
2262	* the new speed values for commands.	2246	* the new speed values for commands.
2263	*	2247	*
2264	* Returns true if there are more actions we can do.	2248	* Returns true if there are more actions we can do. Should not do
		2249	* many actions in a row, as that would be too unfair to other
		2250	* players.
2265	*/	2251	*/
2266	int	2252	bool
2267	handle_newcs_player (object *op)	2253	handle_newcs_player (object *op)
2268	{	2254	{
2269	if (QUERY_FLAG (op, FLAG_SCARED))	2255	if (QUERY_FLAG (op, FLAG_SCARED))
2270	{	2256	{
2271	flee_player (op);	2257	if (op->speed_left > 0.f)
2272
2273	/* If player is still scared, that is his action for this tick */
2274	if (op->flag [FLAG_SCARED])
2275	{	2258	{
2276	--op->speed_left;	2259	--op->speed_left;
		2260	flee_player (op);
		2261
2277	return 0;	2262	return true;
2278	}	2263	}
		2264	else
		2265	return false;
2279	}	2266	}
2280		2267
2281	/* call this here - we also will call this in do_ericserver, but	2268	/* call this here - we also will call this in do_ericserver, but
2282	* the players time has been increased when doericserver has been	2269	* the players time has been increased when doericserver has been
2283	* called, so we recheck it here.	2270	* called, so we recheck it here.
2284	*/	2271	*/
2285	if (op->contr->ns->handle_command ())	2272	if (op->contr->ns->handle_command ())
2286	return 1;	2273	return true;
2287		2274
2288	if (op->speed_left > 0.f)
2289	{
2290	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2275	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2291	{
2292	/* All move commands take 1 tick, at least for now */
2293	--op->speed_left;
2294
2295	/* Instead of all the stuff below, let move_player take care
2296	* of it. Also, some of the skill stuff is only put in
2297	* there, as well as the confusion stuff.
2298	*/
2299	move_player (op, op->direction);	2276	return move_player (op, op->direction);
2300		2277
2301	return op->speed_left > 0.f;
2302	}
2303	}
2304
2305	return 0;	2278	return false;
2306	}	2279	}
2307		2280
2308	int	2281	int
2309	save_life (object *op)	2282	save_life (object *op)
2310	{	2283	{
…		…
2576	}	2549	}
2577		2550
2578	/* Digestion */	2551	/* Digestion */
2579	if (--op->last_eat < 0)	2552	if (--op->last_eat < 0)
2580	{	2553	{
2581	#ifdef COZY_SERVER
2582	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2583	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2584	#else
2585	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2554	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2586	#endif
2587		2555
2588	if (op->contr->gen_hp > 0)	2556	if (op->contr->gen_hp > 0)
2589	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2557	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2590	else	2558	else
2591	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2559	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
3068	}	3036	}
3069		3037
3070	int	3038	int
3071	is_true_undead (object *op)	3039	is_true_undead (object *op)
3072	{	3040	{
3073	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3041	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3074	return 1;	3042	return 1;
3075		3043
3076	return 0;	3044	return 0;
3077	}	3045	}
3078		3046
…		…
3122	/* For Hidden creatures - a chance of becoming 'unhidden'	3090	/* For Hidden creatures - a chance of becoming 'unhidden'
3123	* every time they move - as we subtract off 'invisibility'	3091	* every time they move - as we subtract off 'invisibility'
3124	* AND, for players, if they move into a ridiculously unhideable	3092	* AND, for players, if they move into a ridiculously unhideable
3125	* spot (surrounded by clear terrain in broad daylight). -b.t.	3093	* spot (surrounded by clear terrain in broad daylight). -b.t.
3126	*/	3094	*/
3127
3128	void	3095	void
3129	do_hidden_move (object *op)	3096	do_hidden_move (object *op)
3130	{	3097	{
3131	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3098	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3132	object *skop;	3099	object *skop;
…		…
3249	* a blocked los square.	3216	* a blocked los square.
3250	* we use the archetype to figure out offsets.	3217	* we use the archetype to figure out offsets.
3251	*/	3218	*/
3252	while (op)	3219	while (op)
3253	{	3220	{
3254	dx = rv.distance_x + op->arch->clone.x;	3221	dx = rv.distance_x + op->arch->x;
3255	dy = rv.distance_y + op->arch->clone.y;	3222	dy = rv.distance_y + op->arch->y;
3256		3223
3257	/* only the viewable area the player sees is updated by LOS	3224	/* only the viewable area the player sees is updated by LOS
3258	* code, so we need to restrict ourselves to that range of values	3225	* code, so we need to restrict ourselves to that range of values
3259	* for any meaningful values.	3226	* for any meaningful values.
3260	*/	3227	*/
…		…
3385	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3352	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3386	return;	3353	return;
3387	}	3354	}
3388		3355
3389	/* everything seems okay - now bring on the gift: */	3356	/* everything seems okay - now bring on the gift: */
3390	item = &(tr->item->clone);	3357	item = tr->item;
3391		3358
3392	if (item->type == SPELL)	3359	if (item->type == SPELL)
3393	{	3360	{
3394	if (check_spell_known (who, item->name))	3361	if (check_spell_known (who, item->name))
3395	return;	3362	return;
…		…
3455	/* forces in the treasurelist can alter the player's stats */	3422	/* forces in the treasurelist can alter the player's stats */
3456	object *skin;	3423	object *skin;
3457		3424
3458	/* first get the dragon skin force */	3425	/* first get the dragon skin force */
3459	shstr_cmp dragon_skin_force ("dragon_skin_force");	3426	shstr_cmp dragon_skin_force ("dragon_skin_force");
3460	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3427	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3461	;	3428	;
3462		3429
3463	if (!skin)	3430	if (!skin)
3464	return;	3431	return;
3465		3432

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.135 by root, Sun May 13 15:13:57 2007 UTC vs. Revision 1.150 by root, Sun Jun 10 03:11:17 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.135 by root, Sun May 13 15:13:57 2007 UTC vs.
Revision 1.150 by root, Sun Jun 10 03:11:17 2007 UTC