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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.151 by root, Sat Jun 16 00:12:20 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	{
…		…
362	if (ob)	364	if (ob)
363	{	365	{
364	ob->destroy_inv (false);	366	ob->destroy_inv (false);
365	ob->destroy ();	367	ob->destroy ();
366	}	368	}
		369
		370	ob = observe = 0;
367	}	371	}
368		372
369	player::~player ()	373	player::~player ()
370	{	374	{
371	/* Clear item stack */	375	/* Clear item stack */
…		…
398	* Note: there MUST be at least one player archetype!	402	* Note: there MUST be at least one player archetype!
399	*/	403	*/
400	archetype *	404	archetype *
401	get_player_archetype (archetype *at)	405	get_player_archetype (archetype *at)
402	{	406	{
403	archetype *start = at;	407	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
404		408
405	for (;;)	409	for (;;)
406	{	410	{
407	if (at == NULL \|\| at->next == NULL)	411	if (++i == archetypes.end ())
408	at = first_archetype;	412	i = archetypes.begin ();
409	else	413	else if (*i == at)
410	at = at->next;	414	cleanup ("not a single player archetype found");
411		415
412	if (at->clone.type == PLAYER)	416	if ((*i)->type == PLAYER)
413	return at;	417	return *i;
414
415	if (at == start)
416	{
417	LOG (llevError, "No Player archetypes\n");
418	exit (-1);
419	}
420	}	418	}
421	}	419	}
422		420
423	object *	421	object *
424	get_nearest_player (object *mon)	422	get_nearest_player (object *mon)
…		…
914	if (*first_map_ext_path)	912	if (*first_map_ext_path)
915	{	913	{
916	object *tmp;	914	object *tmp;
917	char mapname[MAX_BUF];	915	char mapname[MAX_BUF];
918		916
919	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	917	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
920	tmp = object::create ();	918	tmp = object::create ();
921	EXIT_PATH (tmp) = mapname;	919	EXIT_PATH (tmp) = mapname;
922	EXIT_X (tmp) = ob->x;	920	EXIT_X (tmp) = ob->x;
923	EXIT_Y (tmp) = ob->y;	921	EXIT_Y (tmp) = ob->y;
924	ob->enter_exit (tmp); /* we don't really care if it succeeded;	922	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
943	int x = ob->x, y = ob->y;	941	int x = ob->x, y = ob->y;
944		942
945	ob->remove_statbonus ();	943	ob->remove_statbonus ();
946	ob->remove ();	944	ob->remove ();
947	ob->arch = get_player_archetype (ob->arch);	945	ob->arch = get_player_archetype (ob->arch);
948	ob->arch->clone.copy_to (ob);	946	ob->arch->copy_to (ob);
949	ob->instantiate ();	947	ob->instantiate ();
950	ob->stats = ob->contr->orig_stats;	948	ob->stats = ob->contr->orig_stats;
951	ob->name = ob->name_pl = name;	949	ob->name = ob->name_pl = name;
952	ob->x = x;	950	ob->x = x;
953	ob->y = y;	951	ob->y = y;
954	SET_ANIMATION (ob, 2); /* So player faces south */	952	SET_ANIMATION (ob, 2); /* So player faces south */
955	insert_ob_in_map (ob, ob->map, ob, 0);	953	insert_ob_in_map (ob, ob->map, ob, 0);
956	assign (ob->contr->title, ob->arch->clone.name);	954	assign (ob->contr->title, ob->arch->object::name);
957	ob->add_statbonus ();	955	ob->add_statbonus ();
958	}	956	}
959	while (!allowed_class (ob));	957	while (!allowed_class (ob));
960		958
961	update_object (ob, UP_OBJ_FACE);	959	update_object (ob, UP_OBJ_FACE);
…		…
1106	if (tmp->name != NULL)	1104	if (tmp->name != NULL)
1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1105	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))));	1106	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109	else	1107	else
1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1108	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))));	1109	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112		1110
1113	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1111	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1114	}	1112	}
1115		1113
1116	/* philosophy:	1114	/* philosophy:
…		…
1309	/* careful: chairs and tables are weapons! */	1307	/* careful: chairs and tables are weapons! */
1310	if (op->contr->mode & PU_ALLWEAPON)	1308	if (op->contr->mode & PU_ALLWEAPON)
1311	{	1309	{
1312	if (tmp->type == WEAPON && tmp->name != NULL)	1310	if (tmp->type == WEAPON && tmp->name != NULL)
1313	{	1311	{
1314	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1312	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1315	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1313	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316	{	1314	{
1317	pick_up (op, tmp);	1315	pick_up (op, tmp);
1318	continue;	1316	continue;
1319	}	1317	}
1320	}	1318	}
1321		1319
1322	if (tmp->type == WEAPON && tmp->name == NULL)	1320	if (tmp->type == WEAPON && tmp->name == NULL)
1323	{	1321	{
1324	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1322	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1325	{	1323	{
1326	pick_up (op, tmp);	1324	pick_up (op, tmp);
1327	continue;	1325	continue;
1328	}	1326	}
1329	}	1327	}
…		…
1354	if (tmp->name != NULL)	1352	if (tmp->name != NULL)
1355	{	1353	{
1356	fprintf (stderr, "%s", tmp->name);	1354	fprintf (stderr, "%s", tmp->name);
1357	}	1355	}
1358	else	1356	else
1359	fprintf (stderr, "%s", tmp->arch->name);	1357	fprintf (stderr, "%s", tmp->arch->archname);
1360	fprintf (stderr, ",%d] = ", tmp->type);	1358	fprintf (stderr, ",%d] = ", tmp->type);
1361	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1359	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1362	#endif	1360	#endif
1363	continue;	1361	continue;
1364	}	1362	}
…		…
1434	else	1432	else
1435	{	1433	{
1436	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1434	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437	{	1435	{
1438	attacktype = 1 << attacknum;	1436	attacktype = 1 << attacknum;
1439	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1437	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1438	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1441	{	1439	{
1442	tmp = arrow;	1440	tmp = arrow;
1443	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1441	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1444	}	1442	}
1445	}	1443	}
1446	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1444	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447	{	1445	{
1448	tmp = arrow;	1446	tmp = arrow;
…		…
1632	arrow->stats.grace = arrow->attacktype;	1630	arrow->stats.grace = arrow->attacktype;
1633		1631
1634	if (arrow->slaying)	1632	if (arrow->slaying)
1635	arrow->spellarg = strdup (arrow->slaying);	1633	arrow->spellarg = strdup (arrow->slaying);
1636		1634
		1635	#if 0
1637	if (player *pl = op->contr)	1636	if (player *pl = op->contr)
1638	{	1637	{
1639	if (!pl->has_hit)
1640	{
1641	pl->has_hit = 1;
1642	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1643	}
1644	#if 0
1645	float speed = pl->weapon_sp;	1638	float speed = pl->weapon_sp;
1646		1639
1647	/* penalize ROF for bestarrow */	1640	/* penalize ROF for bestarrow */
1648	if (pl->bowtype == bow_bestarrow)	1641	if (pl->bowtype == bow_bestarrow)
1649	speed *= .9f;	1642	speed *= .9f;
1650	else	1643	else
1651	speed = 1.f + dex_bonus[op->stats.Dex] .2f;	1644	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
1652		1645
1653	op->speed_left += speed - op->speed;	1646	op->speed_left += speed - op->speed;
		1647	}
1654	#endif	1648	#endif
1655	}
1656		1649
1657	SET_ANIMATION (arrow, arrow->direction);	1650	SET_ANIMATION (arrow, arrow->direction);
1658		1651
1659	/* update the speed */	1652	/* update the speed */
1660	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1653	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1661	+ bow->stats.dam / 7.0;	1654	+ bow->stats.dam / 7.f;
1662		1655
1663	arrow->set_speed (max (arrow->speed, 2.0));	1656	arrow->set_speed (max (arrow->speed, 2.f));
1664	arrow->speed_left = 0;	1657	arrow->speed_left = 0;
1665		1658
1666	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1659	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1667		1660
1668	if (op->type == PLAYER)	1661	if (op->type == PLAYER)
…		…
1812	object *tmp;	1805	object *tmp;
1813		1806
1814	if (item->arch)	1807	if (item->arch)
1815	{	1808	{
1816	CLEAR_FLAG (item, FLAG_ANIMATE);	1809	CLEAR_FLAG (item, FLAG_ANIMATE);
1817	item->face = item->arch->clone.face;	1810	item->face = item->arch->face;
1818	item->set_speed (0);	1811	item->set_speed (0);
1819	}	1812	}
1820		1813
1821	if ((tmp = item->in_player ()))	1814	if ((tmp = item->in_player ()))
1822	esrv_update_item (UPD_ANIM, tmp, item);	1815	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1827	}	1820	}
1828	}	1821	}
1829		1822
1830	/* Received a fire command for the player - go and do it.	1823	/* Received a fire command for the player - go and do it.
1831	*/	1824	*/
1832	void	1825	bool
1833	fire (object *op, int dir)	1826	fire (object *op, int dir)
1834	{	1827	{
1835	int spellcost = 0;	1828	int spellcost = 0;
1836		1829
1837	/* check for loss of invisiblity/hide */	1830	/* check for loss of invisiblity/hide */
…		…
1841	player *pl = op->contr;	1834	player *pl = op->contr;
1842		1835
1843	if (pl->golem)	1836	if (pl->golem)
1844	{	1837	{
1845	control_golem (op->contr->golem, dir);	1838	control_golem (op->contr->golem, dir);
1846	return;	1839	return false;
1847	}	1840	}
1848		1841
1849	object *ob = pl->ranged_ob;	1842	object *ob = pl->ranged_ob;
1850		1843
1851	if (!ob)	1844	if (!ob)
1852	return;	1845	return false;
1853		1846
1854	if (!op->change_weapon (ob))	1847	if (!op->change_weapon (ob))
1855	return;	1848	return false;
		1849
		1850	if (op->speed_left > 0.f)
		1851	--op->speed_left;
		1852	else
		1853	return false;
1856		1854
1857	switch (ob->type)	1855	switch (ob->type)
1858	{	1856	{
1859	case BOW:	1857	case BOW:
1860	player_fire_bow (op, dir);	1858	player_fire_bow (op, dir);
…		…
1874		1872
1875	default:	1873	default:
1876	fire_misc_object (op, dir);	1874	fire_misc_object (op, dir);
1877	break;	1875	break;
1878	}	1876	}
		1877
		1878	return true;
1879	}	1879	}
1880		1880
1881	/* find_key	1881	/* find_key
1882	* We try to find a key for the door as passed. If we find a key	1882	* 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	1883	* and successfully use it, we return the key, otherwise NULL
…		…
1970	* 0 otherwise	1970	* 0 otherwise
1971	*/	1971	*/
1972	static int	1972	static int
1973	player_attack_door (object op, object door)	1973	player_attack_door (object op, object door)
1974	{	1974	{
1975	/* If its a door, try to find a use a key. If we do destroy the door,	1975	/* 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 -	1976	* might as well return immediately as there is nothing more to do -
1977	* otherwise, we fall through to the rest of the code.	1977	* otherwise, we fall through to the rest of the code.
1978	*/	1978	*/
1979	object *key = find_key (op, op, door);	1979	object *key = find_key (op, op, door);
1980		1980
1981	/* IF we found a key, do some extra work */	1981	/* If we found a key, do some extra work */
1982	if (key)	1982	if (key)
1983	{	1983	{
1984	object *container = key->env;	1984	object *container = key->env;
1985		1985
1986	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1986	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
…		…
2021	* It should keep the code cleaner.	2021	* It should keep the code cleaner.
2022	* When this is called, the players direction has been updated	2022	* When this is called, the players direction has been updated
2023	* (taking into account confusion.) The player is also actually	2023	* (taking into account confusion.) The player is also actually
2024	* going to try and move (not fire weapons).	2024	* going to try and move (not fire weapons).
2025	*/	2025	*/
2026	void	2026	bool
2027	move_player_attack (object *op, int dir)	2027	move_player_attack (object *op, int dir)
2028	{	2028	{
2029	object tmp, mon;
2030	int on_battleground;	2029	int on_battleground;
2031	maptile *m;
2032		2030
2033	sint16 nx = freearr_x[dir] + op->x;	2031	sint16 nx = freearr_x[dir] + op->x;
2034	sint16 ny = freearr_y[dir] + op->y;	2032	sint16 ny = freearr_y[dir] + op->y;
2035		2033
2036	on_battleground = op_on_battleground (op, 0, 0);	2034	on_battleground = op_on_battleground (op, 0, 0);
		2035
		2036	if (out_of_map (op->map, nx, ny))
		2037	return false;
		2038
		2039	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2040	{
		2041	--op->speed_left;
		2042	return true;
		2043	}
2037		2044
2038	/* If braced, or can't move to the square, and it is not out of the	2045	/* 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	2046	* 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	2047	* 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	2048	* 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	2049	* 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	2050	* 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	2051	* quite a bit of processing. However, it probably is less than what
2045	* move_ob uses.	2052	* move_ob uses.
2046	*/	2053	*/
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);	2054	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		2055
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	2056	/* 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.	2057	* 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	2058	* if its a door or barrel (can roll) see if there may be monsters
2065	* on the space	2059	* on the space
2066	*/	2060	*/
2067	while (tmp)	2061	object *mon;
2068	{	2062	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2069	if (tmp == op)	2063	{
2070	{	2064	if ((mon->flag [FLAG_ALIVE]
2071	tmp = tmp->above;	2065	\|\| mon->type == LOCKED_DOOR
2072	continue;	2066	\|\| mon->flag [FLAG_CAN_ROLL])
2073	}
2074
2075	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2076	{
2077	mon = tmp;	2067	&& mon != op)
2078	break;	2068	break;
2079	}	2069	}
2080		2070
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 */	2071	if (!mon) /* This happens anytime the player tries to move */
2088	return; /* into a wall */	2072	return false; /* into a wall */
2089		2073
2090	if (mon->head)
2091	mon = mon->head;	2074	mon = mon->head_ ();
2092		2075
2093	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2076	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2077	if (op->contr->weapon_sp_left > 0.f)
2094	if (player_attack_door (op, mon))	2078	if (player_attack_door (op, mon))
		2079	{
		2080	--op->contr->weapon_sp_left;
2095	return;	2081	return true;
		2082	}
2096		2083
2097	/* The following deals with possibly attacking peaceful	2084	/* The following deals with possibly attacking peaceful
2098	* or frienddly creatures. Basically, all players are considered	2085	* or friendly creatures. Basically, all players are considered
2099	* unaggressive. If the moving player has peaceful set, then the	2086	* unaggressive. If the moving player has peaceful set, then the
2100	* object should be pushed instead of attacked. It is assumed that	2087	* object should be pushed instead of attacked. It is assumed that
2101	* if you are braced, you will not attack friends accidently,	2088	* if you are braced, you will not attack friends accidently,
2102	* and thus will not push them.	2089	* and thus will not push them.
2103	*/	2090	*/
2104		2091
2105	/* If the creature is a pet, push it even if the player is not	2092	/* 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	2093	* peaceful. Our assumption is the creature is a pet if the
2107	* player owns it and it is either friendly or unagressive.	2094	* player owns it and it is either friendly or unagressive.
2108	*/	2095	*/
2109	if (op->type == PLAYER	2096	if (op->type == PLAYER
2110	&& ((mon->owner && mon->owner->contr	2097	&& ((mon->owner && mon->owner->contr
2111	&& same_party (mon->owner->contr->party, op->contr->party))	2098	&& same_party (mon->owner->contr->party, op->contr->party))
2112	\|\| mon->owner == op)	2099	\|\| mon->owner == op)
2113	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2100	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2114	{	2101	{
2115	/* If we're braced, we don't want to switch places with it */	2102	/* If we're braced, we don't want to switch places with it */
2116	if (op->contr->braced)	2103	if (op->contr->braced)
2117	return;	2104	return false;
		2105
		2106	if (op->speed_left > 0.f)
		2107	{
		2108	--op->speed_left;
2118		2109
2119	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2120	push_ob (mon, dir, op);	2111	push_ob (mon, dir, op);
		2112
2121	if (op->contr->tmp_invis \|\| op->hide)	2113	if (op->contr->tmp_invis \|\| op->hide)
2122	make_visible (op);	2114	make_visible (op);
2123		2115
2124	return;	2116	return true;
2125	}	2117	}
		2118	else
		2119	return false;
		2120	}
2126		2121
2127	/* in certain circumstances, you shouldn't attack friendly	2122	/* in certain circumstances, you shouldn't attack friendly
2128	* creatures. Note that if you are braced, you can't push	2123	* creatures. Note that if you are braced, you can't push
2129	* someone, but put it inside this loop so that you won't	2124	* someone, but put it inside this loop so that you won't
2130	* attack them either.	2125	* attack them either.
2131	*/	2126	*/
2132	if ((mon->type == PLAYER \|\| mon->enemy != op)	2127	if ((mon->type == PLAYER \|\| mon->enemy != op)
2133	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))	2128	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2134	&& ((op->contr->peaceful	2129	&& ((op->contr->peaceful
2135	\|\| (mon->type == PLAYER && mon->contr->peaceful))	2130	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2136	&& !on_battleground))	2131	&& !on_battleground))
		2132	{
		2133	if (op->speed_left > 0.f)
2137	{	2134	{
		2135	--op->speed_left;
		2136
2138	if (!op->contr->braced)	2137	if (!op->contr->braced)
2139	{	2138	{
2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2139	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2141	push_ob (mon, dir, op);	2140	push_ob (mon, dir, op);
2142	}	2141	}
2143	else	2142	else
2144	new_draw_info (0, 0, op, "You withhold your attack");	2143	new_draw_info (0, 0, op, "You withhold your attack");
2145		2144
2146	if (op->contr->tmp_invis \|\| op->hide)	2145	if (op->contr->tmp_invis \|\| op->hide)
2147	make_visible (op);	2146	make_visible (op);
2148	}
2149		2147
		2148	return true;
		2149	}
		2150	}
2150	/* If the object is a boulder or other rollable object, then	2151	/* If the object is a boulder or other rollable object, then
2151	* roll it if not braced. You can't roll it if you are braced.	2152	* roll it if not braced. You can't roll it if you are braced.
2152	*/	2153	*/
2153	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2154	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2155	{
		2156	if (op->speed_left > 0.f)
2154	{	2157	{
		2158	--op->speed_left;
		2159
2155	recursive_roll (mon, dir, op);	2160	recursive_roll (mon, dir, op);
2156	if (action_makes_visible (op))	2161	if (action_makes_visible (op))
2157	make_visible (op);	2162	make_visible (op);
2158	}
2159		2163
		2164	return true;
		2165	}
		2166	}
2160	/* Any generic living creature. Including things like doors.	2167	/* Any generic living creature. Including things like doors.
2161	* Way it works is like this: First, it must have some hit points	2168	* Way it works is like this: First, it must have some hit points
2162	* and be living. Then, it must be one of the following:	2169	* and be living. Then, it must be one of the following:
2163	* 1) Not a player, 2) A player, but of a different party. Note	2170	* 1) Not a player, 2) A player, but of a different party. Note
2164	* that party_number -1 is no party, so attacks can still happen.	2171	* that party_number -1 is no party, so attacks can still happen.
2165	*/	2172	*/
2166	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2173	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2167	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2174	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2168	{	2175	{
2169	if (!op->contr->has_hit)	2176	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2170	{	2177	{
2171	op->contr->has_hit = 1;	2178	--op->contr->weapon_sp_left;
2172	op->speed_left += op->contr->weapon_speed () - op->speed;
2173	}
2174		2179
2175	skill_attack (mon, op, 0, 0, 0);	2180	skill_attack (mon, op, 0, 0, 0);
2176
2177	/* If attacking another player, that player gets automatic
2178	* hitback, and doesn't loose luck either.
2179	* Disable hitback on the battleground or if the target is
2180	* the wiz.
2181	*/
2182	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2183	{
2184	short luck = mon->stats.luck;
2185
2186	mon->contr->has_hit = 1;
2187	skill_attack (op, mon, 0, 0, 0);
2188	mon->stats.luck = luck;
2189	}
2190		2181
2191	if (action_makes_visible (op))	2182	if (action_makes_visible (op))
2192	make_visible (op);	2183	make_visible (op);
2193	}
2194	} /* if player should attack something */
2195	}
2196		2184
2197	int	2185	return true;
		2186	}
		2187	}
		2188
		2189	return false;
		2190	}
		2191
		2192	bool
2198	move_player (object *op, int dir)	2193	move_player (object *op, int dir)
2199	{	2194	{
2200	int pick;	2195	int pick;
2201		2196
2202	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2197	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2216	op->facing = dir;	2211	op->facing = dir;
2217		2212
2218	if (op->hide)	2213	if (op->hide)
2219	do_hidden_move (op);	2214	do_hidden_move (op);
2220		2215
		2216	bool retval;
		2217
2221	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2218	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2222	/nop / ;	2219	retval = RESULT_INT (0);
2223	else if (op->contr->fire_on)	2220	else if (op->contr->fire_on)
2224	fire (op, dir);	2221	retval = fire (op, dir);
2225	else	2222	else
2226	{	2223	{
2227	move_player_attack (op, dir);	2224	retval = move_player_attack (op, dir);
2228	pick = check_pick (op);	2225	pick = check_pick (op);
2229	}	2226	}
2230		2227
2231	/* Add special check for newcs players and fire on - this way, the	2228	/* Add special check for newcs players and fire on - this way, the
2232	* server can handle repeat firing.	2229	* server can handle repeat firing.
…		…
2239	/* Update how the player looks. Use the facing, so direction may	2236	/* Update how the player looks. Use the facing, so direction may
2240	* get reset to zero. This allows for full animation capabilities	2237	* get reset to zero. This allows for full animation capabilities
2241	* for players.	2238	* for players.
2242	*/	2239	*/
2243	animate_object (op, op->facing);	2240	animate_object (op, op->facing);
2244	return 0;	2241
		2242	return retval;
2245	}	2243	}
2246		2244
2247	/* This is similar to handle_player, below, but is only used by the	2245	/* This is similar to handle_player, below, but is only used by the
2248	* new client/server stuff.	2246	* new client/server stuff.
2249	* This is sort of special, in that the new client/server actually uses	2247	* This is sort of special, in that the new client/server actually uses
2250	* the new speed values for commands.	2248	* the new speed values for commands.
2251	*	2249	*
2252	* Returns true if there are more actions we can do.	2250	* Returns true if there are more actions we can do. Should not do
		2251	* many actions in a row, as that would be too unfair to other
		2252	* players.
2253	*/	2253	*/
2254	int	2254	bool
2255	handle_newcs_player (object *op)	2255	handle_newcs_player (object *op)
2256	{	2256	{
2257	if (QUERY_FLAG (op, FLAG_SCARED))	2257	if (QUERY_FLAG (op, FLAG_SCARED))
2258	{	2258	{
2259	flee_player (op);	2259	if (op->speed_left > 0.f)
2260
2261	/* If player is still scared, that is his action for this tick */
2262	if (op->flag [FLAG_SCARED])
2263	{	2260	{
2264	--op->speed_left;	2261	--op->speed_left;
		2262	flee_player (op);
		2263
2265	return 0;	2264	return true;
2266	}	2265	}
		2266	else
		2267	return false;
2267	}	2268	}
2268		2269
2269	/* call this here - we also will call this in do_ericserver, but	2270	/* call this here - we also will call this in do_ericserver, but
2270	* the players time has been increased when doericserver has been	2271	* the players time has been increased when doericserver has been
2271	* called, so we recheck it here.	2272	* called, so we recheck it here.
2272	*/	2273	*/
2273	if (op->contr->ns->handle_command ())	2274	if (op->contr->ns->handle_command ())
2274	return 1;	2275	return true;
2275		2276
2276	if (op->speed_left > 0.f)
2277	{
2278	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2277	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2279	{
2280	/* All move commands take 1 tick, at least for now */
2281	--op->speed_left;
2282
2283	/* Instead of all the stuff below, let move_player take care
2284	* of it. Also, some of the skill stuff is only put in
2285	* there, as well as the confusion stuff.
2286	*/
2287	move_player (op, op->direction);	2278	return move_player (op, op->direction);
2288		2279
2289	return op->speed_left > 0.f;
2290	}
2291	}
2292
2293	return 0;	2280	return false;
2294	}	2281	}
2295		2282
2296	int	2283	int
2297	save_life (object *op)	2284	save_life (object *op)
2298	{	2285	{
…		…
3051	}	3038	}
3052		3039
3053	int	3040	int
3054	is_true_undead (object *op)	3041	is_true_undead (object *op)
3055	{	3042	{
3056	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3043	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3057	return 1;	3044	return 1;
3058		3045
3059	return 0;	3046	return 0;
3060	}	3047	}
3061		3048
…		…
3105	/* For Hidden creatures - a chance of becoming 'unhidden'	3092	/* For Hidden creatures - a chance of becoming 'unhidden'
3106	* every time they move - as we subtract off 'invisibility'	3093	* every time they move - as we subtract off 'invisibility'
3107	* AND, for players, if they move into a ridiculously unhideable	3094	* AND, for players, if they move into a ridiculously unhideable
3108	* spot (surrounded by clear terrain in broad daylight). -b.t.	3095	* spot (surrounded by clear terrain in broad daylight). -b.t.
3109	*/	3096	*/
3110
3111	void	3097	void
3112	do_hidden_move (object *op)	3098	do_hidden_move (object *op)
3113	{	3099	{
3114	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3100	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3115	object *skop;	3101	object *skop;
…		…
3232	* a blocked los square.	3218	* a blocked los square.
3233	* we use the archetype to figure out offsets.	3219	* we use the archetype to figure out offsets.
3234	*/	3220	*/
3235	while (op)	3221	while (op)
3236	{	3222	{
3237	dx = rv.distance_x + op->arch->clone.x;	3223	dx = rv.distance_x + op->arch->x;
3238	dy = rv.distance_y + op->arch->clone.y;	3224	dy = rv.distance_y + op->arch->y;
3239		3225
3240	/* only the viewable area the player sees is updated by LOS	3226	/* only the viewable area the player sees is updated by LOS
3241	* code, so we need to restrict ourselves to that range of values	3227	* code, so we need to restrict ourselves to that range of values
3242	* for any meaningful values.	3228	* for any meaningful values.
3243	*/	3229	*/
…		…
3368	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3354	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3369	return;	3355	return;
3370	}	3356	}
3371		3357
3372	/* everything seems okay - now bring on the gift: */	3358	/* everything seems okay - now bring on the gift: */
3373	item = &(tr->item->clone);	3359	item = tr->item;
3374		3360
3375	if (item->type == SPELL)	3361	if (item->type == SPELL)
3376	{	3362	{
3377	if (check_spell_known (who, item->name))	3363	if (check_spell_known (who, item->name))
3378	return;	3364	return;
…		…
3438	/* forces in the treasurelist can alter the player's stats */	3424	/* forces in the treasurelist can alter the player's stats */
3439	object *skin;	3425	object *skin;
3440		3426
3441	/* first get the dragon skin force */	3427	/* first get the dragon skin force */
3442	shstr_cmp dragon_skin_force ("dragon_skin_force");	3428	shstr_cmp dragon_skin_force ("dragon_skin_force");
3443	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3429	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3444	;	3430	;
3445		3431
3446	if (!skin)	3432	if (!skin)
3447	return;	3433	return;
3448		3434

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC vs. Revision 1.151 by root, Sat Jun 16 00:12:20 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.151 by root, Sat Jun 16 00:12:20 2007 UTC