ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.136 by root, Wed May 16 11:10:01 2007 UTC vs.
Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <sproto.h>	25	#include <sproto.h>
27	#include <sounds.h>	26	#include <sounds.h>
…		…
147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	146	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);	147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149	close_and_delete (fp, comp);	148	close_and_delete (fp, comp);
150	}	149	}
151		150
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. */	151	/* This loads the first map an puts the player on it. */
159	static void	152	static void
160	set_first_map (object *op)	153	set_first_map (object *op)
161	{	154	{
162	op->contr->maplevel = first_map_path;	155	op->contr->maplevel = first_map_path;
163	op->x = -1;	156	op->x = -1;
164	op->y = -1;	157	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	}	158	}
179		159
180	void	160	void
181	player::activate ()	161	player::activate ()
182	{	162	{
…		…
187	ob->remove ();	167	ob->remove ();
188	ob->map = 0;	168	ob->map = 0;
189	ob->activate_recursive ();	169	ob->activate_recursive ();
190	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
191	add_friendly_object (ob);	171	add_friendly_object (ob);
192	enter_map ();
193	}	172	}
194		173
195	void	174	void
196	player::deactivate ()	175	player::deactivate ()
197	{	176	{
…		…
204		183
205	if (ob->map)	184	if (ob->map)
206	maplevel = ob->map->path;	185	maplevel = ob->map->path;
207		186
208	ob->remove ();	187	ob->remove ();
		188	ob->enemy = 0; // sometimes keeps an extra refcount on itself
209	ob->map = 0;	189	ob->map = 0;
210	party = 0;	190	party = 0;
211		191
212	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this	192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
213		193
…		…
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;
251		231
252	shstr_cmp dragon_ability_force ("dragon_ability_force");
253	shstr_cmp dragon_skin_force ("dragon_skin_force");
254
255	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
256	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
257	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
258	abil = tmp;	235	abil = tmp;
259	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
260	skin = tmp;	237	skin = tmp;
261		238
262	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
263	}	240	}
264		241
265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
266		243
267	esrv_new_player (this, ob->weight + ob->carrying);	244	esrv_new_player (this, ob->weight + ob->carrying);
		245
		246	ob->update_stats ();
		247
		248	ns->floorbox_update ();
		249	esrv_send_inventory (ob, ob);
		250	esrv_add_spells (this, 0);
		251
		252	activate ();
		253
		254	send_rules (ob);
		255	send_news (ob);
		256	display_motd (ob);
		257
		258	INVOKE_PLAYER (CONNECT, this);
		259	INVOKE_PLAYER (LOGIN, this);
		260	}
		261
		262	void
		263	player::disconnect ()
		264	{
		265	if (ob)
		266	{
		267	ob->close_container (); //TODO: client-specific
		268	ob->drop_unpaid_items ();
		269	}
		270
		271	if (ns)
		272	{
		273	if (active)
		274	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		275
		276	INVOKE_PLAYER (DISCONNECT, this);
		277
		278	ns->reset_stats ();
		279	ns->pl = 0;
		280	ns = 0;
		281	}
		282
		283	observe = ob;
		284
		285	deactivate ();
		286	}
		287
		288	// the need for this function can be explained
		289	// by load_object not returning the object
		290	void
		291	player::set_object (object *op)
		292	{
		293	ob = observe = op;
		294	ob->contr = this; /* this aren't yet in archetype */
		295
		296	ob->speed = 1.0f;
		297	ob->speed_left = 0.5f;
		298
		299	ob->direction = 5; /* So player faces south */
		300
		301	ob->flag [FLAG_READY_WEAPON] = false;
		302	ob->flag [FLAG_READY_SKILL] = false;
		303	ob->flag [FLAG_READY_BOW] = false;
268		304
269	for (object *op = ob->inv; op; op = op->below)	305	for (object *op = ob->inv; op; op = op->below)
270	if (op->flag [FLAG_APPLIED])	306	if (op->flag [FLAG_APPLIED])
271	switch (op->type)	307	switch (op->type)
272	{	308	{
		309	case SKILL:
		310	ob->flag [FLAG_APPLIED] = false;
		311	break;
		312
273	case WAND:	313	case WAND:
274	case ROD:	314	case ROD:
275	case HORN:	315	case HORN:
276	case BOW:	316	case BOW:
277	case SKILL:	317	ranged_ob = op;
278	case SKILL_TOOL:	318	break;
		319
279	case WEAPON:	320	case WEAPON:
280	apply_special (ob, op, AP_UNAPPLY);	321	combat_ob = op;
281	apply_special (ob, op, AP_APPLY);
282	break;	322	break;
283	}	323	}
284		324
285	ob->update_stats ();	325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
286	ns->floorbox_update ();
287
288	esrv_send_inventory (ob, ob);
289	esrv_add_spells (this, 0);
290
291	activate ();
292
293	send_rules (ob);
294	send_news (ob);
295	display_motd (ob);
296
297	INVOKE_PLAYER (CONNECT, this);
298	INVOKE_PLAYER (LOGIN, this);
299	}	326	}
300		327
301	void	328	void
302	player::disconnect ()
303	{
304	if (ns)
305	{
306	if (active)
307	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
308
309	INVOKE_PLAYER (DISCONNECT, this);
310
311	ns->reset_stats ();
312	ns->pl = 0;
313	ns = 0;
314	}
315
316	if (ob)
317	ob->close_container (); //TODO: client-specific
318
319	deactivate ();
320	}
321
322	// the need for this function can be explained
323	// by load_object not returning the object
324	void
325	player::set_object (object *op)	329	player::set_observe (object *op)
326	{	330	{
327	ob = op;	331	observe = op ? op : ob;
328	ob->contr = this; /* this aren't yet in archetype */	332	do_los = 1;
329
330	ob->speed_left = 0.5f;
331	ob->speed = 1.0f;
332	ob->direction = 5; /* So player faces south */
333	}	333	}
334		334
335	player::player ()	335	player::player ()
336	{	336	{
337	/* There are some elements we want initialised to non zero value -	337	/* There are some elements we want initialised to non zero value -
…		…
348	petmode = pet_normal;	348	petmode = pet_normal;
349	listening = 10;	349	listening = 10;
350	usekeys = containers;	350	usekeys = containers;
351	peaceful = 1; /* default peaceful */	351	peaceful = 1; /* default peaceful */
352	do_los = 1;	352	do_los = 1;
		353
		354	weapon_sp = 1.0f;
		355	weapon_sp_left = 0.5f;
353	}	356	}
354		357
355	void	358	void
356	player::do_destroy ()	359	player::do_destroy ()
357	{	360	{
…		…
362	if (ob)	365	if (ob)
363	{	366	{
364	ob->destroy_inv (false);	367	ob->destroy_inv (false);
365	ob->destroy ();	368	ob->destroy ();
366	}	369	}
		370
		371	ob = observe = 0;
367	}	372	}
368		373
369	player::~player ()	374	player::~player ()
370	{	375	{
371	/* Clear item stack */	376	/* Clear item stack */
…		…
398	* Note: there MUST be at least one player archetype!	403	* Note: there MUST be at least one player archetype!
399	*/	404	*/
400	archetype *	405	archetype *
401	get_player_archetype (archetype *at)	406	get_player_archetype (archetype *at)
402	{	407	{
403	archetype *start = at;	408	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
404		409
405	for (;;)	410	for (;;)
406	{	411	{
407	if (at == NULL || at->next == NULL)	412	if (++i == archetypes.end ())
408	at = first_archetype;	413	i = archetypes.begin ();
409	else	414	else if (*i == at)
410	at = at->next;	415	cleanup ("not a single player archetype found");
411		416
412	if (at->clone.type == PLAYER)	417	if ((*i)->type == PLAYER)
413	return at;	418	return *i;
414
415	if (at == start)
416	{
417	LOG (llevError, "No Player archetypes\n");
418	exit (-1);
419	}
420	}	419	}
421	}	420	}
422		421
423	object *	422	object *
424	get_nearest_player (object *mon)	423	get_nearest_player (object *mon)
…		…
428	unsigned lastdist;	427	unsigned lastdist;
429	rv_vector rv;	428	rv_vector rv;
430		429
431	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	430	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
432	{	431	{
433	/* We should not find free objects on this friendly list, but it
434	* does periodically happen. Given that, lets deal with it.
435	* While unlikely, it is possible the next object on the friendly
436	* list is also free, so encapsulate this in a while loop.
437	*/
438	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
439	{
440	object *tmp = ol->ob;
441
442	/* Can't do much more other than log the fact, because the object
443	* itself will have been cleared.
444	*/
445	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
446	tmp->debug_desc ());
447	ol = ol->next;
448	remove_friendly_object (tmp);
449	if (!ol)
450	return op;
451	}
452
453	/* Remove special check for player from this. First, it looks to cause
454	* some crashes (ol->ob->contr not set properly?), but secondly, a more
455	* complicated method of state checking would be needed in any case -
456	* as it was, a clever player could type quit, and the function would
457	* skip them over while waiting for confirmation. Remove
458	* on_same_map check, as can_detect_enemy also does this
459	*/
460	if (!can_detect_enemy (mon, ol->ob, &rv))	432	if (!can_detect_enemy (mon, ol->ob, &rv))
461	continue;	433	continue;
462		434
463	if (lastdist > rv.distance)	435	if (lastdist > rv.distance)
464	{	436	{
…		…
914	if (*first_map_ext_path)	886	if (*first_map_ext_path)
915	{	887	{
916	object *tmp;	888	object *tmp;
917	char mapname[MAX_BUF];	889	char mapname[MAX_BUF];
918		890
919	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	891	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
920	tmp = object::create ();	892	tmp = object::create ();
921	EXIT_PATH (tmp) = mapname;	893	EXIT_PATH (tmp) = mapname;
922	EXIT_X (tmp) = ob->x;	894	EXIT_X (tmp) = ob->x;
923	EXIT_Y (tmp) = ob->y;	895	EXIT_Y (tmp) = ob->y;
924	ob->enter_exit (tmp); /* we don't really care if it succeeded;	896	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
943	int x = ob->x, y = ob->y;	915	int x = ob->x, y = ob->y;
944		916
945	ob->remove_statbonus ();	917	ob->remove_statbonus ();
946	ob->remove ();	918	ob->remove ();
947	ob->arch = get_player_archetype (ob->arch);	919	ob->arch = get_player_archetype (ob->arch);
948	ob->arch->clone.copy_to (ob);	920	ob->arch->copy_to (ob);
949	ob->instantiate ();	921	ob->instantiate ();
950	ob->stats = ob->contr->orig_stats;	922	ob->stats = ob->contr->orig_stats;
951	ob->name = ob->name_pl = name;	923	ob->name = ob->name_pl = name;
952	ob->x = x;	924	ob->x = x;
953	ob->y = y;	925	ob->y = y;
954	SET_ANIMATION (ob, 2); /* So player faces south */	926	SET_ANIMATION (ob, 2); /* So player faces south */
955	insert_ob_in_map (ob, ob->map, ob, 0);	927	insert_ob_in_map (ob, ob->map, ob, 0);
956	assign (ob->contr->title, ob->arch->clone.name);	928	assign (ob->contr->title, ob->arch->object::name);
957	ob->add_statbonus ();	929	ob->add_statbonus ();
958	}	930	}
959	while (!allowed_class (ob));	931	while (!allowed_class (ob));
960		932
961	update_object (ob, UP_OBJ_FACE);	933	update_object (ob, UP_OBJ_FACE);
…		…
1106	if (tmp->name != NULL)	1078	if (tmp->name != NULL)
1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1079	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))));	1080	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109	else	1081	else
1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1082	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))));	1083	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112		1084
1113	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1085	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1114	}	1086	}
1115		1087
1116	/* philosophy:	1088	/* philosophy:
…		…
1191	pick_up (op, tmp);	1163	pick_up (op, tmp);
1192	continue;	1164	continue;
1193	}	1165	}
1194		1166
1195	if (op->contr->mode & PU_READABLES)	1167	if (op->contr->mode & PU_READABLES)
1196	if (tmp->type == BOOK || tmp->type == SCROLL)	1168	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1197	{	1169	{
1198	pick_up (op, tmp);	1170	pick_up (op, tmp);
1199	continue;	1171	continue;
1200	}	1172	}
1201		1173
…		…
1309	/* careful: chairs and tables are weapons! */	1281	/* careful: chairs and tables are weapons! */
1310	if (op->contr->mode & PU_ALLWEAPON)	1282	if (op->contr->mode & PU_ALLWEAPON)
1311	{	1283	{
1312	if (tmp->type == WEAPON && tmp->name != NULL)	1284	if (tmp->type == WEAPON && tmp->name != NULL)
1313	{	1285	{
1314	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1286	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1315	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1287	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316	{	1288	{
1317	pick_up (op, tmp);	1289	pick_up (op, tmp);
1318	continue;	1290	continue;
1319	}	1291	}
1320	}	1292	}
1321		1293
1322	if (tmp->type == WEAPON && tmp->name == NULL)	1294	if (tmp->type == WEAPON && tmp->name == NULL)
1323	{	1295	{
1324	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1296	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1325	{	1297	{
1326	pick_up (op, tmp);	1298	pick_up (op, tmp);
1327	continue;	1299	continue;
1328	}	1300	}
1329	}	1301	}
…		…
1354	if (tmp->name != NULL)	1326	if (tmp->name != NULL)
1355	{	1327	{
1356	fprintf (stderr, "%s", tmp->name);	1328	fprintf (stderr, "%s", tmp->name);
1357	}	1329	}
1358	else	1330	else
1359	fprintf (stderr, "%s", tmp->arch->name);	1331	fprintf (stderr, "%s", tmp->arch->archname);
1360	fprintf (stderr, ",%d] = ", tmp->type);	1332	fprintf (stderr, ",%d] = ", tmp->type);
1361	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1333	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1362	#endif	1334	#endif
1363	continue;	1335	continue;
1364	}	1336	}
…		…
1379	{	1351	{
1380	object *tmp = 0;	1352	object *tmp = 0;
1381		1353
1382	for (op = op->inv; op; op = op->below)	1354	for (op = op->inv; op; op = op->below)
1383	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1355	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384	tmp = find_arrow (op, type);	1356	tmp = find_arrow (splay (op), type);
1385	else if (op->type == ARROW && op->race == type)	1357	else if (op->type == ARROW && op->race == type)
1386	return op;	1358	return splay (op);
1387		1359
1388	return tmp;	1360	return tmp;
1389	}	1361	}
1390		1362
1391	/*	1363	/*
…		…
1434	else	1406	else
1435	{	1407	{
1436	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1408	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437	{	1409	{
1438	attacktype = 1 << attacknum;	1410	attacktype = 1 << attacknum;
1439	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1411	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1412	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1441	{	1413	{
1442	tmp = arrow;	1414	tmp = arrow;
1443	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1415	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1444	}	1416	}
1445	}	1417	}
1446	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1418	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447	{	1419	{
1448	tmp = arrow;	1420	tmp = arrow;
…		…
1632	arrow->stats.grace = arrow->attacktype;	1604	arrow->stats.grace = arrow->attacktype;
1633		1605
1634	if (arrow->slaying)	1606	if (arrow->slaying)
1635	arrow->spellarg = strdup (arrow->slaying);	1607	arrow->spellarg = strdup (arrow->slaying);
1636		1608
		1609	#if 0
1637	if (player *pl = op->contr)	1610	if (player *pl = op->contr)
1638	{	1611	{
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;	1612	float speed = pl->weapon_sp;
1646		1613
1647	/* penalize ROF for bestarrow */	1614	/* penalize ROF for bestarrow */
1648	if (pl->bowtype == bow_bestarrow)	1615	if (pl->bowtype == bow_bestarrow)
1649	speed *= .9f;	1616	speed *= .9f;
1650	else	1617	else
1651	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;	1618	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1652		1619
1653	op->speed_left += speed - op->speed;	1620	op->speed_left += speed - op->speed;
		1621	}
1654	#endif	1622	#endif
1655	}
1656		1623
1657	SET_ANIMATION (arrow, arrow->direction);	1624	SET_ANIMATION (arrow, arrow->direction);
1658		1625
1659	/* update the speed */	1626	/* update the speed */
1660	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1627	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;	1628	+ bow->stats.dam / 7.f;
1662		1629
1663	arrow->set_speed (max (arrow->speed, 2.0));	1630	arrow->set_speed (max (arrow->speed, 2.f));
1664	arrow->speed_left = 0;	1631	arrow->speed_left = 0;
1665		1632
1666	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1633	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1667		1634
1668	if (op->type == PLAYER)	1635	if (op->type == PLAYER)
…		…
1691		1658
1692	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1659	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1693	arrow->move_type = MOVE_FLY_LOW;	1660	arrow->move_type = MOVE_FLY_LOW;
1694	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1661	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1695		1662
1696	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1663	op->play_sound (sound_find ("fire_arrow"));
1697	m->insert (arrow, sx, sy, op);	1664	m->insert (arrow, sx, sy, op);
1698		1665
1699	if (!arrow->destroyed ())	1666	if (!arrow->destroyed ())
1700	move_arrow (arrow);	1667	move_arrow (arrow);
1701		1668
…		…
1779		1746
1780	if (item->type == WAND)	1747	if (item->type == WAND)
1781	{	1748	{
1782	if (item->stats.food <= 0)	1749	if (item->stats.food <= 0)
1783	{	1750	{
1784	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1751	op->contr->play_sound (sound_find ("wand_poof"));
1785	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1752	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1786		1753
1787	return;	1754	return;
1788	}	1755	}
1789	}	1756	}
1790	else if (item->type == ROD || item->type == HORN)	1757	else if (item->type == ROD || item->type == HORN)
1791	{	1758	{
1792	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1759	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1793	{	1760	{
1794	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1761	op->contr->play_sound (sound_find ("wand_poof"));
1795		1762
1796	if (item->type == ROD)	1763	if (item->type == ROD)
1797	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1764	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1798	else	1765	else
1799	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1766	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1812	object *tmp;	1779	object *tmp;
1813		1780
1814	if (item->arch)	1781	if (item->arch)
1815	{	1782	{
1816	CLEAR_FLAG (item, FLAG_ANIMATE);	1783	CLEAR_FLAG (item, FLAG_ANIMATE);
1817	item->face = item->arch->clone.face;	1784	item->face = item->arch->face;
1818	item->set_speed (0);	1785	item->set_speed (0);
1819	}	1786	}
1820		1787
1821	if ((tmp = item->in_player ()))	1788	if ((tmp = item->in_player ()))
1822	esrv_update_item (UPD_ANIM, tmp, item);	1789	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1827	}	1794	}
1828	}	1795	}
1829		1796
1830	/* Received a fire command for the player - go and do it.	1797	/* Received a fire command for the player - go and do it.
1831	*/	1798	*/
1832	void	1799	bool
1833	fire (object *op, int dir)	1800	fire (object *op, int dir)
1834	{	1801	{
1835	int spellcost = 0;	1802	int spellcost = 0;
1836		1803
1837	/* check for loss of invisiblity/hide */	1804	/* check for loss of invisiblity/hide */
…		…
1841	player *pl = op->contr;	1808	player *pl = op->contr;
1842		1809
1843	if (pl->golem)	1810	if (pl->golem)
1844	{	1811	{
1845	control_golem (op->contr->golem, dir);	1812	control_golem (op->contr->golem, dir);
1846	return;	1813	return false;
1847	}	1814	}
1848		1815
1849	object *ob = pl->ranged_ob;	1816	object *ob = pl->ranged_ob;
1850		1817
1851	if (!ob)	1818	if (!ob)
1852	return;	1819	return false;
1853		1820
1854	if (!op->change_weapon (ob))	1821	if (!op->change_weapon (ob))
1855	return;	1822	return false;
		1823
		1824	if (op->speed_left > 0.f)
		1825	--op->speed_left;
		1826	else
		1827	return false;
1856		1828
1857	switch (ob->type)	1829	switch (ob->type)
1858	{	1830	{
1859	case BOW:	1831	case BOW:
1860	player_fire_bow (op, dir);	1832	player_fire_bow (op, dir);
…		…
1874		1846
1875	default:	1847	default:
1876	fire_misc_object (op, dir);	1848	fire_misc_object (op, dir);
1877	break;	1849	break;
1878	}	1850	}
		1851
		1852	return true;
1879	}	1853	}
1880		1854
1881	/* find_key	1855	/* find_key
1882	* We try to find a key for the door as passed. If we find a key	1856	* 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	1857	* and successfully use it, we return the key, otherwise NULL
…		…
1970	* 0 otherwise	1944	* 0 otherwise
1971	*/	1945	*/
1972	static int	1946	static int
1973	player_attack_door (object *op, object *door)	1947	player_attack_door (object *op, object *door)
1974	{	1948	{
1975	/* If its a door, try to find a use a key. If we do destroy the door,	1949	/* 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 -	1950	* might as well return immediately as there is nothing more to do -
1977	* otherwise, we fall through to the rest of the code.	1951	* otherwise, we fall through to the rest of the code.
1978	*/	1952	*/
1979	object *key = find_key (op, op, door);	1953	object *key = find_key (op, op, door);
1980		1954
1981	/* IF we found a key, do some extra work */	1955	/* If we found a key, do some extra work */
1982	if (key)	1956	if (key)
1983	{	1957	{
1984	object *container = key->env;	1958	object *container = key->env;
1985
1986	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1987		1959
1988	if (action_makes_visible (op))	1960	if (action_makes_visible (op))
1989	make_visible (op);	1961	make_visible (op);
1990		1962
1991	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1963	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
1993		1965
1994	if (door->type == DOOR)	1966	if (door->type == DOOR)
1995	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1967	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1996	else if (door->type == LOCKED_DOOR)	1968	else if (door->type == LOCKED_DOOR)
1997	{	1969	{
1998	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1970	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1999	remove_door2 (door); /* remove door without violence ;-) */	1971	remove_door2 (door); /* remove door without violence ;-) */
2000	}	1972	}
2001		1973
2002	/* Do this after we print the message */	1974	/* Do this after we print the message */
2003	decrease_ob (key); /* Use up one of the keys */	1975	decrease_ob (key); /* Use up one of the keys */
…		…
2008	return 1; /* Nothing more to do below */	1980	return 1; /* Nothing more to do below */
2009	}	1981	}
2010	else if (door->type == LOCKED_DOOR)	1982	else if (door->type == LOCKED_DOOR)
2011	{	1983	{
2012	/* Might as well return now - no other way to open this */	1984	/* Might as well return now - no other way to open this */
2013	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1985	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2014	return 1;	1986	return 1;
2015	}	1987	}
2016		1988
2017	return 0;	1989	return 0;
2018	}	1990	}
…		…
2021	* It should keep the code cleaner.	1993	* It should keep the code cleaner.
2022	* When this is called, the players direction has been updated	1994	* When this is called, the players direction has been updated
2023	* (taking into account confusion.) The player is also actually	1995	* (taking into account confusion.) The player is also actually
2024	* going to try and move (not fire weapons).	1996	* going to try and move (not fire weapons).
2025	*/	1997	*/
2026	void	1998	bool
2027	move_player_attack (object *op, int dir)	1999	move_player_attack (object *op, int dir)
2028	{	2000	{
2029	object *tmp, *mon;
2030	int on_battleground;	2001	int on_battleground;
2031	maptile *m;
2032		2002
2033	sint16 nx = freearr_x[dir] + op->x;	2003	sint16 nx = freearr_x[dir] + op->x;
2034	sint16 ny = freearr_y[dir] + op->y;	2004	sint16 ny = freearr_y[dir] + op->y;
2035		2005
2036	on_battleground = op_on_battleground (op, 0, 0);	2006	on_battleground = op_on_battleground (op, 0, 0);
		2007
		2008	if (out_of_map (op->map, nx, ny))
		2009	return false;
		2010
		2011	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2012	{
		2013	--op->speed_left;
		2014	return true;
		2015	}
2037		2016
2038	/* If braced, or can't move to the square, and it is not out of the	2017	/* 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	2018	* 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	2019	* 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	2020	* 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	2021	* 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	2022	* 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	2023	* quite a bit of processing. However, it probably is less than what
2045	* move_ob uses.	2024	* move_ob uses.
2046	*/	2025	*/
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);	2026	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		2027
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	2028	/* 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.	2029	* 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	2030	* if its a door or barrel (can roll) see if there may be monsters
2065	* on the space	2031	* on the space
2066	*/	2032	*/
2067	while (tmp)	2033	object *mon;
2068	{	2034	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2069	if (tmp == op)	2035	{
2070	{	2036	if ((mon->flag [FLAG_ALIVE]
2071	tmp = tmp->above;	2037	|| mon->type == LOCKED_DOOR
2072	continue;	2038	|| mon->flag [FLAG_CAN_ROLL])
2073	}
2074
2075	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2076	{
2077	mon = tmp;	2039	&& mon != op)
2078	break;	2040	break;
2079	}	2041	}
2080		2042
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 */	2043	if (!mon) /* This happens anytime the player tries to move */
2088	return; /* into a wall */	2044	return false; /* into a wall */
2089		2045
2090	if (mon->head)
2091	mon = mon->head;	2046	mon = mon->head_ ();
2092		2047
2093	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2048	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2049	if (op->contr->weapon_sp_left > 0.f)
2094	if (player_attack_door (op, mon))	2050	if (player_attack_door (op, mon))
		2051	{
		2052	--op->contr->weapon_sp_left;
2095	return;	2053	return true;
		2054	}
2096		2055
2097	/* The following deals with possibly attacking peaceful	2056	/* The following deals with possibly attacking peaceful
2098	* or frienddly creatures. Basically, all players are considered	2057	* or friendly creatures. Basically, all players are considered
2099	* unaggressive. If the moving player has peaceful set, then the	2058	* unaggressive. If the moving player has peaceful set, then the
2100	* object should be pushed instead of attacked. It is assumed that	2059	* object should be pushed instead of attacked. It is assumed that
2101	* if you are braced, you will not attack friends accidently,	2060	* if you are braced, you will not attack friends accidently,
2102	* and thus will not push them.	2061	* and thus will not push them.
2103	*/	2062	*/
2104		2063
2105	/* If the creature is a pet, push it even if the player is not	2064	/* 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	2065	* peaceful. Our assumption is the creature is a pet if the
2107	* player owns it and it is either friendly or unagressive.	2066	* player owns it and it is either friendly or unagressive.
2108	*/	2067	*/
2109	if ((op->type == PLAYER)	2068	if (op->type == PLAYER
2110	#if COZY_SERVER
2111	&&
2112	((mon->owner && mon->owner->contr	2069	&& ((mon->owner && mon->owner->contr
2113	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2070	&& same_party (mon->owner->contr->party, op->contr->party))
2114	#else
2115	&& mon->owner == op	2071	|| mon->owner == op)
2116	#endif
2117	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2072	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2118	{	2073	{
2119	/* If we're braced, we don't want to switch places with it */	2074	/* If we're braced, we don't want to switch places with it */
2120	if (op->contr->braced)	2075	if (op->contr->braced)
2121	return;	2076	return false;
2122		2077
2123	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2078	if (op->speed_left > 0.f)
		2079	{
		2080	--op->speed_left;
		2081
		2082	op->play_sound (sound_find ("push_player"));
2124	push_ob (mon, dir, op);	2083	push_ob (mon, dir, op);
		2084
2125	if (op->contr->tmp_invis || op->hide)	2085	if (op->contr->tmp_invis || op->hide)
2126	make_visible (op);	2086	make_visible (op);
2127		2087
2128	return;	2088	return true;
2129	}	2089	}
		2090	else
		2091	return false;
		2092	}
2130		2093
2131	/* in certain circumstances, you shouldn't attack friendly	2094	/* in certain circumstances, you shouldn't attack friendly
2132	* creatures. Note that if you are braced, you can't push	2095	* creatures. Note that if you are braced, you can't push
2133	* someone, but put it inside this loop so that you won't	2096	* someone, but put it inside this loop so that you won't
2134	* attack them either.	2097	* attack them either.
2135	*/	2098	*/
2136	if ((mon->type == PLAYER || mon->enemy != op) &&	2099	if ((mon->type == PLAYER || mon->enemy != op)
2137	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2100	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2138	#ifdef PROHIBIT_PLAYERKILL
2139	(op->contr->peaceful	2101	&& ((op->contr->peaceful
2140	|| (mon->type == PLAYER	2102	|| (mon->type == PLAYER && mon->contr->peaceful))
2141	&& mon->contr->
2142	peaceful)) &&
2143	#else
2144	op->contr->peaceful &&
2145	#endif
2146	!on_battleground))	2103	&& !on_battleground))
		2104	{
		2105	if (op->speed_left > 0.f)
2147	{	2106	{
		2107	--op->speed_left;
		2108
2148	if (!op->contr->braced)	2109	if (!op->contr->braced)
2149	{	2110	{
2150	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2111	op->play_sound (sound_find ("push_player"));
2151	push_ob (mon, dir, op);	2112	push_ob (mon, dir, op);
2152	}	2113	}
2153	else	2114	else
2154	new_draw_info (0, 0, op, "You withhold your attack");	2115	op->statusmsg ("You withhold your attack");
2155		2116
2156	if (op->contr->tmp_invis || op->hide)	2117	if (op->contr->tmp_invis || op->hide)
2157	make_visible (op);	2118	make_visible (op);
2158	}
2159		2119
		2120	return true;
		2121	}
		2122	}
2160	/* If the object is a boulder or other rollable object, then	2123	/* 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.	2124	* roll it if not braced. You can't roll it if you are braced.
2162	*/	2125	*/
2163	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2126	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2127	{
		2128	if (op->speed_left > 0.f)
2164	{	2129	{
		2130	--op->speed_left;
		2131
2165	recursive_roll (mon, dir, op);	2132	recursive_roll (mon, dir, op);
2166	if (action_makes_visible (op))	2133	if (action_makes_visible (op))
2167	make_visible (op);	2134	make_visible (op);
2168	}
2169		2135
		2136	return true;
		2137	}
		2138	}
2170	/* Any generic living creature. Including things like doors.	2139	/* Any generic living creature. Including things like doors.
2171	* Way it works is like this: First, it must have some hit points	2140	* 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:	2141	* 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	2142	* 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.	2143	* that party_number -1 is no party, so attacks can still happen.
2175	*/	2144	*/
2176	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2145	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)))	2146	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2178	{	2147	{
2179	if (!op->contr->has_hit)	2148	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2180	{	2149	{
2181	op->contr->has_hit = 1;	2150	--op->contr->weapon_sp_left;
2182	op->speed_left += op->contr->weapon_speed () - op->speed;
2183	}
2184		2151
2185	skill_attack (mon, op, 0, 0, 0);	2152	skill_attack (mon, op, 0, 0, 0);
2186
2187	/* If attacking another player, that player gets automatic
2188	* hitback, and doesn't loose luck either.
2189	* Disable hitback on the battleground or if the target is
2190	* the wiz.
2191	*/
2192	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2193	{
2194	short luck = mon->stats.luck;
2195
2196	mon->contr->has_hit = 1;
2197	skill_attack (op, mon, 0, 0, 0);
2198	mon->stats.luck = luck;
2199	}
2200		2153
2201	if (action_makes_visible (op))	2154	if (action_makes_visible (op))
2202	make_visible (op);	2155	make_visible (op);
2203	}
2204	} /* if player should attack something */
2205	}
2206		2156
2207	int	2157	return true;
		2158	}
		2159	}
		2160
		2161	return false;
		2162	}
		2163
		2164	bool
2208	move_player (object *op, int dir)	2165	move_player (object *op, int dir)
2209	{	2166	{
2210	int pick;	2167	int pick;
2211		2168
2212	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2169	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
…		…
2226	op->facing = dir;	2183	op->facing = dir;
2227		2184
2228	if (op->hide)	2185	if (op->hide)
2229	do_hidden_move (op);	2186	do_hidden_move (op);
2230		2187
		2188	bool retval;
		2189
2231	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2190	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2232	/*nop */ ;	2191	retval = RESULT_INT (0);
2233	else if (op->contr->fire_on)	2192	else if (op->contr->fire_on)
2234	fire (op, dir);	2193	retval = fire (op, dir);
2235	else	2194	else
2236	{	2195	{
2237	move_player_attack (op, dir);	2196	retval = move_player_attack (op, dir);
2238	pick = check_pick (op);	2197	pick = check_pick (op);
2239	}	2198	}
2240		2199
2241	/* Add special check for newcs players and fire on - this way, the	2200	/* Add special check for newcs players and fire on - this way, the
2242	* server can handle repeat firing.	2201	* server can handle repeat firing.
…		…
2249	/* Update how the player looks. Use the facing, so direction may	2208	/* Update how the player looks. Use the facing, so direction may
2250	* get reset to zero. This allows for full animation capabilities	2209	* get reset to zero. This allows for full animation capabilities
2251	* for players.	2210	* for players.
2252	*/	2211	*/
2253	animate_object (op, op->facing);	2212	animate_object (op, op->facing);
2254	return 0;	2213
		2214	return retval;
2255	}	2215	}
2256		2216
2257	/* This is similar to handle_player, below, but is only used by the	2217	/* This is similar to handle_player, below, but is only used by the
2258	* new client/server stuff.	2218	* new client/server stuff.
2259	* This is sort of special, in that the new client/server actually uses	2219	* This is sort of special, in that the new client/server actually uses
2260	* the new speed values for commands.	2220	* the new speed values for commands.
2261	*	2221	*
2262	* Returns true if there are more actions we can do.	2222	* Returns true if there are more actions we can do. Should not do
		2223	* many actions in a row, as that would be too unfair to other
		2224	* players.
2263	*/	2225	*/
2264	int	2226	bool
2265	handle_newcs_player (object *op)	2227	handle_newcs_player (object *op)
2266	{	2228	{
2267	if (QUERY_FLAG (op, FLAG_SCARED))	2229	if (QUERY_FLAG (op, FLAG_SCARED))
2268	{	2230	{
2269	flee_player (op);	2231	if (op->speed_left > 0.f)
2270
2271	/* If player is still scared, that is his action for this tick */
2272	if (op->flag [FLAG_SCARED])
2273	{	2232	{
2274	--op->speed_left;	2233	--op->speed_left;
		2234	flee_player (op);
		2235
2275	return 0;	2236	return true;
2276	}	2237	}
		2238	else
		2239	return false;
2277	}	2240	}
2278		2241
2279	/* call this here - we also will call this in do_ericserver, but	2242	/* call this here - we also will call this in do_ericserver, but
2280	* the players time has been increased when doericserver has been	2243	* the players time has been increased when doericserver has been
2281	* called, so we recheck it here.	2244	* called, so we recheck it here.
2282	*/	2245	*/
2283	if (op->contr->ns->handle_command ())	2246	if (op->contr->ns->handle_command ())
2284	return 1;	2247	return true;
2285		2248
2286	if (op->speed_left > 0.f)
2287	{
2288	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2249	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2289	{
2290	/* All move commands take 1 tick, at least for now */
2291	--op->speed_left;
2292
2293	/* Instead of all the stuff below, let move_player take care
2294	* of it. Also, some of the skill stuff is only put in
2295	* there, as well as the confusion stuff.
2296	*/
2297	move_player (op, op->direction);	2250	return move_player (op, op->direction);
2298		2251
2299	return op->speed_left > 0.f;
2300	}
2301	}
2302
2303	return 0;	2252	return false;
2304	}	2253	}
2305		2254
2306	int	2255	int
2307	save_life (object *op)	2256	save_life (object *op)
2308	{	2257	{
…		…
2310	return 0;	2259	return 0;
2311		2260
2312	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2261	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2313	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2262	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2314	{	2263	{
2315	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2264	op->play_sound (sound_find ("ob_evaporate"));
2316	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2265	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2317		2266
2318	if (op->contr)	2267	if (op->contr)
2319	esrv_del_item (op->contr, tmp->count);	2268	esrv_del_item (op->contr, tmp->count);
2320		2269
…		…
2340	/* This goes throws the inventory and removes unpaid objects, and puts them	2289	/* This goes throws the inventory and removes unpaid objects, and puts them
2341	* back in the map (location and map determined by values of env). This	2290	* back in the map (location and map determined by values of env). This
2342	* function will descend into containers. op is the object to start the search	2291	* function will descend into containers. op is the object to start the search
2343	* from.	2292	* from.
2344	*/	2293	*/
2345	void	2294	static void
2346	remove_unpaid_objects (object *op, object *env)	2295	drop_unpaid_items (object *op, object *env)
2347	{	2296	{
2348	while (op)	2297	while (op)
2349	{	2298	{
2350	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2299	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2351		2300
…		…
2355	esrv_del_item (env->contr, op->count);	2304	esrv_del_item (env->contr, op->count);
2356		2305
2357	op->insert_at (env);	2306	op->insert_at (env);
2358	}	2307	}
2359	else if (op->inv)	2308	else if (op->inv)
2360	remove_unpaid_objects (op->inv, env);	2309	drop_unpaid_items (op->inv, env);
2361		2310
2362	op = next;	2311	op = next;
2363	}	2312	}
		2313	}
		2314
		2315	void
		2316	object::drop_unpaid_items ()
		2317	{
		2318	if (!flag [FLAG_REMOVED])
		2319	::drop_unpaid_items (inv, this);
2364	}	2320	}
2365		2321
2366	/*	2322	/*
2367	* Returns pointer a static string containing gravestone text	2323	* Returns pointer a static string containing gravestone text
2368	* Moved from apply.c to player.c - player.c is what	2324	* Moved from apply.c to player.c - player.c is what
…		…
2463	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2419	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2464	else	2420	else
2465	{	2421	{
2466	gen_grace = op->stats.maxgrace;	2422	gen_grace = op->stats.maxgrace;
2467	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2423	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2468	}
2469
2470	/* Regenerate Spell Points */
2471	if (!op->contr->golem && --op->last_sp < 0)
2472	{
2473	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2474	if (op->stats.sp < op->stats.maxsp)
2475	{
2476	op->stats.sp++;
2477	/* dms do not consume food */
2478	if (!QUERY_FLAG (op, FLAG_WIZ))
2479	{
2480	op->stats.food--;
2481	if (op->contr->digestion < 0)
2482	op->stats.food += op->contr->digestion;
2483	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2484	op->stats.food = last_food;
2485	}
2486	}
2487
2488	if (max_sp > 1)
2489	{
2490	over_sp = (gen_sp + 10) / rate_sp;
2491	if (over_sp > 0)
2492	{
2493	if (op->stats.sp < op->stats.maxsp)
2494	{
2495	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2496
2497	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2498	op->stats.sp--;
2499
2500	if (op->stats.sp > op->stats.maxsp)
2501	op->stats.sp = op->stats.maxsp;
2502	}
2503	op->last_sp = 0;
2504	}
2505	else
2506	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2507	}
2508	else
2509	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2510	}	2424	}
2511		2425
2512	/* Regenerate Grace */	2426	/* Regenerate Grace */
2513	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2427	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2514	if (--op->last_grace < 0)	2428	if (--op->last_grace < 0)
…		…
2535	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2449	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2536	}	2450	}
2537	/* wearing stuff doesn't detract from grace generation. */	2451	/* wearing stuff doesn't detract from grace generation. */
2538	}	2452	}
2539		2453
		2454	if (op->stats.food > 0)
		2455	{
2540	/* Regenerate Hit Points */	2456	/* Regenerate Spell Points */
2541	if (--op->last_heal < 0)	2457	if (!op->contr->golem && --op->last_sp < 0)
2542	{
2543	if (op->stats.hp < op->stats.maxhp)
2544	{	2458	{
2545	op->stats.hp++;	2459	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2546	/* dms do not consume food */	2460
2547	if (!QUERY_FLAG (op, FLAG_WIZ))	2461	if (op->stats.sp < op->stats.maxsp)
2548	{	2462	{
		2463	op->stats.sp++;
		2464
		2465	/* dms do not consume food */
		2466	if (!QUERY_FLAG (op, FLAG_WIZ))
		2467	{
2549	op->stats.food--;	2468	op->stats.food--;
		2469
2550	if (op->contr->digestion < 0)	2470	if (op->contr->digestion < 0)
2551	op->stats.food += op->contr->digestion;	2471	op->stats.food += op->contr->digestion;
2552	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2472	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2553	op->stats.food = last_food;	2473	op->stats.food = last_food;
		2474	}
2554	}	2475	}
2555	}
2556		2476
2557	if (max_hp > 1)	2477	if (max_sp > 1)
2558	{
2559	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2560	if (over_hp > 0)
2561	{	2478	{
2562	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2479	over_sp = (gen_sp + 10) / rate_sp;
		2480	if (over_sp > 0)
		2481	{
		2482	if (op->stats.sp < op->stats.maxsp)
		2483	{
		2484	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2485
		2486	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2487	op->stats.sp--;
		2488
		2489	if (op->stats.sp > op->stats.maxsp)
		2490	op->stats.sp = op->stats.maxsp;
		2491	}
		2492
2563	op->last_heal = 0;	2493	op->last_sp = 0;
		2494	}
		2495	else
		2496	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2564	}	2497	}
2565	else	2498	else
		2499	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2500	}
		2501
		2502	/* Regenerate Hit Points */
		2503	if (--op->last_heal < 0)
		2504	{
		2505	if (op->stats.hp < op->stats.maxhp)
2566	{	2506	{
2567	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2507	op->stats.hp++;
		2508
		2509	/* dms do not consume food */
		2510	if (!QUERY_FLAG (op, FLAG_WIZ))
		2511	{
		2512	op->stats.food--;
		2513
		2514	if (op->contr->digestion < 0)
		2515	op->stats.food += op->contr->digestion;
		2516	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2517	op->stats.food = last_food;
		2518	}
2568	}	2519	}
		2520
		2521	if (max_hp > 1)
		2522	{
		2523	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2524
		2525	if (over_hp > 0)
		2526	{
		2527	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2528	op->last_heal = 0;
		2529	}
		2530	else
		2531	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2569	}	2532	}
2570	else	2533	else
2571	{
2572	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2534	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2573	}	2535	}
2574	}	2536	}
2575		2537
2576	/* Digestion */	2538	/* Digestion */
2577	if (--op->last_eat < 0)	2539	if (--op->last_eat < 0)
2578	{	2540	{
2579	#ifdef COZY_SERVER	2541	int bonus = max (0, op->contr->digestion),
2580	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2542	penalty = max (0, -op->contr->digestion);
2581	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2582	#else
2583	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2584	#endif
2585		2543
2586	if (op->contr->gen_hp > 0)
2587	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2544	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2588	else
2589	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2590		2545
2591	/* dms do not consume food */	2546	/* dms do not consume food */
2592	if (!QUERY_FLAG (op, FLAG_WIZ))	2547	if (!QUERY_FLAG (op, FLAG_WIZ))
2593	op->stats.food--;	2548	op->stats.food--;
2594	}	2549	}
…		…
2621	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2576	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2622	manual_apply (op, flesh, 0);	2577	manual_apply (op, flesh, 0);
2623	}	2578	}
2624	}	2579	}
2625		2580
2626	while (op->stats.food < 0 && op->stats.hp >= 0)	2581	if (op->stats.food < 0)
2627	op->stats.food++, op->stats.hp--;	2582	{
		2583	op->stats.hp += op->stats.food;
		2584	op->stats.food = 0;
		2585	}
2628		2586
2629	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2587	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2630	kill_player (op);	2588	kill_player (op);
2631	}	2589	}
2632	}	2590	}
…		…
2637	* file.	2595	* file.
2638	*/	2596	*/
2639	void	2597	void
2640	kill_player (object *op)	2598	kill_player (object *op)
2641	{	2599	{
		2600	int x, y;
2642	char buf[MAX_BUF];	2601	char buf[MAX_BUF];
2643	int x, y;
2644
2645	//int i;
2646	maptile *map; /* this is for resurrection */	2602	maptile *map; /* this is for resurrection */
2647
2648	/* int z;
2649	int num_stats_lose;
2650	int lost_a_stat;
2651	int lose_this_stat;
2652	int this_stat; */
2653	int will_kill_again;	2603	int will_kill_again;
2654	archetype *at;	2604	archetype *at;
2655	object *tmp;	2605	object *tmp;
2656		2606
2657	if (save_life (op))	2607	if (save_life (op))
2658	return;	2608	return;
2659
2660		2609
2661	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2610	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2662	* in cities ONLY!!! It is very important that this doesn't get abused.	2611	* in cities ONLY!!! It is very important that this doesn't get abused.
2663	* Look at op_on_battleground() for more info --AndreasV	2612	* Look at op_on_battleground() for more info --AndreasV
2664	*/	2613	*/
…		…
2680	{	2629	{
2681	tmp->destroy ();	2630	tmp->destroy ();
2682	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2631	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2683	}	2632	}
2684		2633
2685	cure_disease (op, 0); /* remove any disease */	2634	cure_disease (op, 0, 0); /* remove any disease */
2686	op->stats.hp = op->stats.maxhp;	2635	op->stats.hp = op->stats.maxhp;
2687	if (op->stats.food <= 0)	2636	if (op->stats.food <= 0)
2688	op->stats.food = 999;	2637	op->stats.food = 999;
2689		2638
2690	/* create a bodypart-trophy to make the winner happy */	2639	/* create a bodypart-trophy to make the winner happy */
2691	if (object *tmp = arch_to_object (archetype::find ("finger")))	2640	if (object *tmp = arch_to_object (archetype::find ("finger")))
2692	{	2641	{
2693	sprintf (buf, "%s's finger", &op->name);	2642	tmp->name = format ("%s's finger" , &op->name);
2694	tmp->name = buf;	2643	tmp->name_pl = format ("%s's fingers", &op->name);
2695	sprintf (buf, " This finger has been cut off %s\n"	2644	tmp->msg = format (
2696	" the %s, when he was defeated at\n level %d by %s.\n",	2645	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2697	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2646	&op->name, op->contr->title, (int) (op->level), op->contr->killer
2698	tmp->msg = buf;	2647	);
2699	tmp->value = 0, tmp->type = 0;	2648	tmp->value = 0, tmp->type = 0;
2700	tmp->materialname = "organics";	2649	tmp->materialname = "organics";
2701	tmp->insert_at (op, tmp);	2650	tmp->insert_at (op, tmp);
2702	}	2651	}
2703		2652
…		…
2710	INVOKE_PLAYER (DEATH, op->contr);	2659	INVOKE_PLAYER (DEATH, op->contr);
2711		2660
2712	command_kill_pets (op, 0);	2661	command_kill_pets (op, 0);
2713		2662
2714	if (op->stats.food < 0)	2663	if (op->stats.food < 0)
2715	{
2716	sprintf (buf, "%s starved to death.", &op->name);
2717	strcpy (op->contr->killer, "starvation");	2664	strcpy (op->contr->killer, "starvation");
2718	}
2719	else
2720	sprintf (buf, "%s died.", &op->name);
2721		2665
2722	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2666	op->contr->play_sound (sound_find ("player_dies"));
2723		2667
2724	/* save the map location for corpse, gravestone */	2668	/* save the map location for corpse, gravestone */
2725	x = op->x;	2669	x = op->x;
2726	y = op->y;	2670	y = op->y;
2727	map = op->map;	2671	map = op->map;
…		…
2890	{	2834	{
2891	tmp->destroy ();	2835	tmp->destroy ();
2892	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2836	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2893	}	2837	}
2894		2838
2895	cure_disease (op, 0); /* remove any disease */	2839	cure_disease (op, 0, 0); /* remove any disease */
2896		2840
2897	/*add_exp(op, (op->stats.exp * -0.20)); */	2841	/*add_exp(op, (op->stats.exp * -0.20)); */
2898	apply_death_exp_penalty (op);	2842	apply_death_exp_penalty (op);
2899	if (op->stats.food < 100)	2843	if (op->stats.food < 100)
2900	op->stats.food = 900;	2844	op->stats.food = 900;
…		…
2904		2848
2905	/*	2849	/*
2906	* Check to see if the player has any unpaid items. If so, remove them	2850	* Check to see if the player has any unpaid items. If so, remove them
2907	* and put them back in the map.	2851	* and put them back in the map.
2908	*/	2852	*/
2909	remove_unpaid_objects (op->inv, op);	2853	op->drop_unpaid_items ();
2910		2854
2911	/****************************************/	2855	/****************************************/
2912	/* */	2856	/* */
2913	/* Move player to his current respawn- */	2857	/* Move player to his current respawn- */
2914	/* position (usually last savebed) */	2858	/* position (usually last savebed) */
…		…
3054	void	2998	void
3055	make_visible (object *op)	2999	make_visible (object *op)
3056	{	3000	{
3057	op->hide = 0;	3001	op->hide = 0;
3058	op->invisible = 0;	3002	op->invisible = 0;
		3003
3059	if (op->type == PLAYER)	3004	if (op->type == PLAYER)
3060	{	3005	{
3061	op->contr->tmp_invis = 0;	3006	op->contr->tmp_invis = 0;
3062	op->contr->invis_race = 0;	3007	op->contr->invis_race = 0;
3063	}	3008	}
…		…
3066	}	3011	}
3067		3012
3068	int	3013	int
3069	is_true_undead (object *op)	3014	is_true_undead (object *op)
3070	{	3015	{
3071	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3016	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3072	return 1;	3017	return 1;
3073		3018
3074	return 0;	3019	return 0;
3075	}	3020	}
3076		3021
3077	/* look at the surrounding terrain to determine	3022	/* look at the surrounding terrain to determine
3078	* the hideability of this object. Positive levels	3023	* the hideability of this object. Positive levels
3079	* indicate greater hideability.	3024	* indicate greater hideability.
3080	*/	3025	*/
3081
3082	int	3026	int
3083	hideability (object *ob)	3027	hideability (object *ob)
3084	{	3028	{
3085	int i, level = 0, mflag;	3029	int i, level = 0, mflag;
3086	sint16 x, y;	3030	sint16 x, y;
…		…
3120	/* For Hidden creatures - a chance of becoming 'unhidden'	3064	/* For Hidden creatures - a chance of becoming 'unhidden'
3121	* every time they move - as we subtract off 'invisibility'	3065	* every time they move - as we subtract off 'invisibility'
3122	* AND, for players, if they move into a ridiculously unhideable	3066	* AND, for players, if they move into a ridiculously unhideable
3123	* spot (surrounded by clear terrain in broad daylight). -b.t.	3067	* spot (surrounded by clear terrain in broad daylight). -b.t.
3124	*/	3068	*/
3125
3126	void	3069	void
3127	do_hidden_move (object *op)	3070	do_hidden_move (object *op)
3128	{	3071	{
3129	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3072	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3130	object *skop;	3073	object *skop;
…		…
3212	* object op. This function works fine for monsters,	3155	* object op. This function works fine for monsters,
3213	* but we dont worry if the object isnt the top one in	3156	* but we dont worry if the object isnt the top one in
3214	* a pile (say a coin under a table would return "viewable"	3157	* a pile (say a coin under a table would return "viewable"
3215	* by this routine). Another question, should we be	3158	* by this routine). Another question, should we be
3216	* concerned with the direction the player is looking	3159	* concerned with the direction the player is looking
3217	* in? Realistically, most of use cant see stuff behind	3160	* in? Realistically, most of us can't see stuff behind
3218	* our backs...on the other hand, does the "facing" direction	3161	* our backs...on the other hand, does the "facing" direction
3219	* imply the way your head, or body is facing? Its possible	3162	* imply the way your head, or body is facing? It's possible
3220	* for them to differ. Sigh, this fctn could get a bit more complex.	3163	* for them to differ. Sigh, this fctn could get a bit more complex.
3221	* -b.t.	3164	* -b.t.
3222	* This function is now map tiling safe.	3165	* This function is now map tiling safe.
3223	*/	3166	*/
3224
3225	int	3167	int
3226	player_can_view (object *pl, object *op)	3168	player_can_view (object *pl, object *op)
3227	{	3169	{
3228	rv_vector rv;	3170	rv_vector rv;
3229	int dx, dy;	3171	int dx, dy;
…		…
3241		3183
3242	get_rangevector (pl, op, &rv, 0x1);	3184	get_rangevector (pl, op, &rv, 0x1);
3243		3185
3244	/* starting with the 'head' part, lets loop	3186	/* starting with the 'head' part, lets loop
3245	* through the object and find if it has any	3187	* through the object and find if it has any
3246	* part that is in the los array but isnt on	3188	* part that is in the los array but isn't on
3247	* a blocked los square.	3189	* a blocked los square.
3248	* we use the archetype to figure out offsets.	3190	* we use the archetype to figure out offsets.
3249	*/	3191	*/
3250	while (op)	3192	while (op)
3251	{	3193	{
3252	dx = rv.distance_x + op->arch->clone.x;	3194	dx = rv.distance_x + op->arch->x;
3253	dy = rv.distance_y + op->arch->clone.y;	3195	dy = rv.distance_y + op->arch->y;
3254		3196
3255	/* only the viewable area the player sees is updated by LOS	3197	/* only the viewable area the player sees is updated by LOS
3256	* code, so we need to restrict ourselves to that range of values	3198	* code, so we need to restrict ourselves to that range of values
3257	* for any meaningful values.	3199	* for any meaningful values.
3258	*/	3200	*/
3259	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3201	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3260	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3202	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3261	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3203	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3262	return 1;	3204	return 1;
		3205
3263	op = op->more;	3206	op = op->more;
3264	}	3207	}
		3208
3265	return 0;	3209	return 0;
3266	}	3210	}
3267		3211
3268	/* routine for both players and monsters. We call this when	3212	/* routine for both players and monsters. We call this when
3269	* there is a possibility for our action distrubing our hiding	3213	* there is a possibility for our action distrubing our hiding
…		…
3272	* return 0.	3216	* return 0.
3273	*/	3217	*/
3274	int	3218	int
3275	action_makes_visible (object *op)	3219	action_makes_visible (object *op)
3276	{	3220	{
3277
3278	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3221	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3279	{	3222	{
3280	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3223	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3281	return 0;	3224	return 0;
3282		3225
…		…
3288	{	3231	{
3289	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3232	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3290	return 1;	3233	return 1;
3291	}	3234	}
3292	}	3235	}
		3236
3293	return 0;	3237	return 0;
3294	}	3238	}
3295		3239
3296	/* op_on_battleground - checks if the given object op (usually	3240	/* op_on_battleground - checks if the given object op (usually
3297	* a player) is standing on a valid battleground-tile,	3241	* a player) is standing on a valid battleground-tile,
…		…
3302	* Default is to do the same as before, so only people wanting to have different points need worry about this	3246	* Default is to do the same as before, so only people wanting to have different points need worry about this
3303	*/	3247	*/
3304	int	3248	int
3305	op_on_battleground (object *op, int *x, int *y)	3249	op_on_battleground (object *op, int *x, int *y)
3306	{	3250	{
3307	object *tmp;
3308
3309	/* A battleground-tile needs the following attributes to be valid:	3251	/* A battleground-tile needs the following attributes to be valid:
3310	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3252	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3311	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3253	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3312	* and the exit-coordinates sp/hp must both be > 0.	3254	* and the exit-coordinates sp/hp must both be > 0.
3313	* => The intention here is to prevent abuse of the battleground-	3255	* => The intention here is to prevent abuse of the battleground-
3314	* feature (like pickable or hidden battleground tiles). */	3256	* feature (like pickable or hidden battleground tiles). */
3315	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3257	for (object *tmp = op->below; tmp; tmp = tmp->below)
3316	{	3258	{
3317	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3259	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3318	{	3260	{
3319	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3261	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3320	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3262	&& tmp->type == BATTLEGROUND
		3263	&& tmp->name == shstr_battleground
		3264	&& EXIT_X (tmp) && EXIT_Y (tmp))
3321	{	3265	{
3322	/*before we assign the exit, check if this is a teambattle */	3266	/* before we assign the exit, check if this is a teambattle */
3323	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3267	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3324	{	3268	{
3325	object *invtmp;
3326
3327	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3269	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3328	{	3270	{
3329	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3271	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3330	{	3272	{
3331	if (x != NULL && y != NULL)	3273	if (x && y)
3332	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3274	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3275
3333	return 1;	3276	return 1;
3334	}	3277	}
3335	}	3278	}
3336	}	3279	}
		3280
3337	if (x != NULL && y != NULL)	3281	if (x && y)
3338	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3282	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3283
3339	return 1;	3284	return 1;
3340	}	3285	}
3341	}	3286	}
3342	}	3287	}
		3288
3343	/* If we got here, did not find a battleground */	3289	/* If we got here, did not find a battleground */
3344	return 0;	3290	return 0;
3345	}	3291	}
3346		3292
3347	/*	3293	/*
…		…
3363	char buf[MAX_BUF]; /* tmp. string buffer */	3309	char buf[MAX_BUF]; /* tmp. string buffer */
3364	int i = 0, j = 0;	3310	int i = 0, j = 0;
3365		3311
3366	/* get the appropriate treasurelist */	3312	/* get the appropriate treasurelist */
3367	if (atnr == ATNR_FIRE)	3313	if (atnr == ATNR_FIRE)
3368	trlist = treasurelist::find ("dragon_ability_fire");	3314	trlist = treasurelist::find (shstr_dragon_ability_fire);
3369	else if (atnr == ATNR_COLD)	3315	else if (atnr == ATNR_COLD)
3370	trlist = treasurelist::find ("dragon_ability_cold");	3316	trlist = treasurelist::find (shstr_dragon_ability_cold);
3371	else if (atnr == ATNR_ELECTRICITY)	3317	else if (atnr == ATNR_ELECTRICITY)
3372	trlist = treasurelist::find ("dragon_ability_elec");	3318	trlist = treasurelist::find (shstr_dragon_ability_elec);
3373	else if (atnr == ATNR_POISON)	3319	else if (atnr == ATNR_POISON)
3374	trlist = treasurelist::find ("dragon_ability_poison");	3320	trlist = treasurelist::find (shstr_dragon_ability_poison);
3375		3321
3376	if (trlist == NULL || who->type != PLAYER)	3322	if (trlist == NULL || who->type != PLAYER)
3377	return;	3323	return;
3378		3324
3379	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3325	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3383	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3329	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3384	return;	3330	return;
3385	}	3331	}
3386		3332
3387	/* everything seems okay - now bring on the gift: */	3333	/* everything seems okay - now bring on the gift: */
3388	item = &(tr->item->clone);	3334	item = tr->item;
3389		3335
3390	if (item->type == SPELL)	3336	if (item->type == SPELL)
3391	{	3337	{
3392	if (check_spell_known (who, item->name))	3338	if (check_spell_known (who, item->name))
3393	return;	3339	return;
…		…
3452	{	3398	{
3453	/* forces in the treasurelist can alter the player's stats */	3399	/* forces in the treasurelist can alter the player's stats */
3454	object *skin;	3400	object *skin;
3455		3401
3456	/* first get the dragon skin force */	3402	/* first get the dragon skin force */
3457	shstr_cmp dragon_skin_force ("dragon_skin_force");
3458	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3403	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3459	;	3404	;
3460		3405
3461	if (!skin)	3406	if (!skin)
3462	return;	3407	return;
3463		3408
…		…
3539	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3484	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3540	return 0;	3485	return 0;
3541		3486
3542	return 100 - blocked_los [x][y];	3487	return 100 - blocked_los [x][y];
3543	}	3488	}
		3489
		3490	void
		3491	player::infobox (const char *title, const char *msg, int color)
		3492	{
		3493	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3494	}
		3495
		3496	void
		3497	player::statusmsg (const char *msg, int color)
		3498	{
		3499	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3500	}
		3501
		3502	void
		3503	player::failmsg (const char *msg, int color)
		3504	{
		3505	play_sound (sound_find ("generic_failure"));
		3506	statusmsg (msg, color);
		3507	}
		3508

Diff Legend

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