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.123 by root, Fri May 11 21:07:14 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>
…		…
157	op->x = -1;	156	op->x = -1;
158	op->y = -1;	157	op->y = -1;
159	}	158	}
160		159
161	void	160	void
162	player::enter_map ()
163	{
164	object *tmp = object::create ();
165
166	EXIT_PATH (tmp) = maplevel;
167	EXIT_X (tmp) = ob->x;
168	EXIT_Y (tmp) = ob->y;
169	ob->enter_exit (tmp);
170
171	tmp->destroy ();
172	}
173
174	void
175	player::activate ()	161	player::activate ()
176	{	162	{
177	if (active)	163	if (active)
178	return;	164	return;
179		165
…		…
181	ob->remove ();	167	ob->remove ();
182	ob->map = 0;	168	ob->map = 0;
183	ob->activate_recursive ();	169	ob->activate_recursive ();
184	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
185	add_friendly_object (ob);	171	add_friendly_object (ob);
186	enter_map ();
187	}	172	}
188		173
189	void	174	void
190	player::deactivate ()	175	player::deactivate ()
191	{	176	{
…		…
198		183
199	if (ob->map)	184	if (ob->map)
200	maplevel = ob->map->path;	185	maplevel = ob->map->path;
201		186
202	ob->remove ();	187	ob->remove ();
		188	ob->enemy = 0; // sometimes keeps an extra refcount on itself
203	ob->map = 0;	189	ob->map = 0;
204	party = 0;	190	party = 0;
205		191
206	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
207		193
…		…
221	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
222		208
223	ns->update_look = 0;	209	ns->update_look = 0;
224	ns->look_position = 0;	210	ns->look_position = 0;
225		211
226	clear_los (ob);	212	clear_los (this);
227		213
228	ns->reset_stats ();	214	ns->reset_stats ();
229		215
230	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
231	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
232	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
233		219
234	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
235	link_player_skills (ob);	221	link_player_skills (ob);
236		222
237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238		224
239	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
240		226
241	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
242	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
243	{	229	{
244	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
245		231
246	shstr_cmp dragon_ability_force ("dragon_ability_force");
247	shstr_cmp dragon_skin_force ("dragon_skin_force");
248
249	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
250	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
251	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
252	abil = tmp;	235	abil = tmp;
253	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
254	skin = tmp;	237	skin = tmp;
255		238
256	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
257	}	240	}
258		241
259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
260		243
261	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;
262		304
263	for (object *op = ob->inv; op; op = op->below)	305	for (object *op = ob->inv; op; op = op->below)
264	if (op->flag [FLAG_APPLIED])	306	if (op->flag [FLAG_APPLIED])
265	switch (op->type)	307	switch (op->type)
266	{	308	{
		309	case SKILL:
		310	ob->flag [FLAG_APPLIED] = false;
		311	break;
		312
267	case WAND:	313	case WAND:
268	case ROD:	314	case ROD:
269	case HORN:	315	case HORN:
270	case BOW:	316	case BOW:
271	case SKILL:	317	ranged_ob = op;
272	case SKILL_TOOL:	318	break;
		319
273	case WEAPON:	320	case WEAPON:
274	apply_special (ob, op, AP_UNAPPLY);	321	combat_ob = op;
275	apply_special (ob, op, AP_APPLY);
276	break;	322	break;
277	}	323	}
278		324
279	ob->update_stats ();	325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
280	ns->floorbox_update ();
281
282	esrv_send_inventory (ob, ob);
283	esrv_add_spells (this, 0);
284
285	activate ();
286
287	send_rules (ob);
288	send_news (ob);
289	display_motd (ob);
290
291	INVOKE_PLAYER (CONNECT, this);
292	INVOKE_PLAYER (LOGIN, this);
293	}	326	}
294		327
295	void	328	void
296	player::disconnect ()
297	{
298	if (ns)
299	{
300	if (active)
301	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
302
303	INVOKE_PLAYER (DISCONNECT, this);
304
305	ns->reset_stats ();
306	ns->pl = 0;
307	ns = 0;
308	}
309
310	if (ob)
311	ob->close_container (); //TODO: client-specific
312
313	deactivate ();
314	}
315
316	// the need for this function can be explained
317	// by load_object not returning the object
318	void
319	player::set_object (object *op)	329	player::set_observe (object *op)
320	{	330	{
321	ob = op;	331	observe = op ? op : ob;
322	ob->contr = this; /* this aren't yet in archetype */	332	do_los = 1;
323
324	ob->speed_left = 0.5;
325	ob->speed = 1.0;
326	ob->direction = 5; /* So player faces south */
327	}	333	}
328		334
329	player::player ()	335	player::player ()
330	{	336	{
331	/* There are some elements we want initialised to non zero value -	337	/* There are some elements we want initialised to non zero value -
…		…
342	petmode = pet_normal;	348	petmode = pet_normal;
343	listening = 10;	349	listening = 10;
344	usekeys = containers;	350	usekeys = containers;
345	peaceful = 1; /* default peaceful */	351	peaceful = 1; /* default peaceful */
346	do_los = 1;	352	do_los = 1;
		353
		354	weapon_sp = 1.0f;
		355	weapon_sp_left = 0.5f;
347	}	356	}
348		357
349	void	358	void
350	player::do_destroy ()	359	player::do_destroy ()
351	{	360	{
…		…
356	if (ob)	365	if (ob)
357	{	366	{
358	ob->destroy_inv (false);	367	ob->destroy_inv (false);
359	ob->destroy ();	368	ob->destroy ();
360	}	369	}
		370
		371	ob = observe = 0;
361	}	372	}
362		373
363	player::~player ()	374	player::~player ()
364	{	375	{
365	/* Clear item stack */	376	/* Clear item stack */
…		…
392	* Note: there MUST be at least one player archetype!	403	* Note: there MUST be at least one player archetype!
393	*/	404	*/
394	archetype *	405	archetype *
395	get_player_archetype (archetype *at)	406	get_player_archetype (archetype *at)
396	{	407	{
397	archetype *start = at;	408	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
398		409
399	for (;;)	410	for (;;)
400	{	411	{
401	if (at == NULL || at->next == NULL)	412	if (++i == archetypes.end ())
402	at = first_archetype;	413	i = archetypes.begin ();
403	else	414	else if (*i == at)
404	at = at->next;	415	cleanup ("not a single player archetype found");
405		416
406	if (at->clone.type == PLAYER)	417	if ((*i)->type == PLAYER)
407	return at;	418	return *i;
408
409	if (at == start)
410	{
411	LOG (llevError, "No Player archetypes\n");
412	exit (-1);
413	}
414	}	419	}
415	}	420	}
416		421
417	object *	422	object *
418	get_nearest_player (object *mon)	423	get_nearest_player (object *mon)
…		…
422	unsigned lastdist;	427	unsigned lastdist;
423	rv_vector rv;	428	rv_vector rv;
424		429
425	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	430	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426	{	431	{
427	/* We should not find free objects on this friendly list, but it
428	* does periodically happen. Given that, lets deal with it.
429	* While unlikely, it is possible the next object on the friendly
430	* list is also free, so encapsulate this in a while loop.
431	*/
432	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
433	{
434	object *tmp = ol->ob;
435
436	/* Can't do much more other than log the fact, because the object
437	* itself will have been cleared.
438	*/
439	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440	tmp->debug_desc ());
441	ol = ol->next;
442	remove_friendly_object (tmp);
443	if (!ol)
444	return op;
445	}
446
447	/* Remove special check for player from this. First, it looks to cause
448	* some crashes (ol->ob->contr not set properly?), but secondly, a more
449	* complicated method of state checking would be needed in any case -
450	* as it was, a clever player could type quit, and the function would
451	* skip them over while waiting for confirmation. Remove
452	* on_same_map check, as can_detect_enemy also does this
453	*/
454	if (!can_detect_enemy (mon, ol->ob, &rv))	432	if (!can_detect_enemy (mon, ol->ob, &rv))
455	continue;	433	continue;
456		434
457	if (lastdist > rv.distance)	435	if (lastdist > rv.distance)
458	{	436	{
…		…
784	}	762	}
785		763
786	void	764	void
787	object::roll_stats ()	765	object::roll_stats ()
788	{	766	{
789	int statsort [7];	767	int statsort [NUM_STATS];
790		768
791	for (;;)	769	for (;;)
792	{	770	{
793	int sum = 0;	771	int sum = 0;
794	for (int i = 7; i--; )	772	for (int i = NUM_STATS; i--; )
795	sum += statsort [i] = roll_stat ();	773	sum += statsort [i] = roll_stat ();
796		774
797	if (sum >= 82 && sum <= 116)	775	if (sum >= 82 && sum <= 116)
798	break;	776	break;
799	}	777	}
800		778
801	// Sort the stats so that rerolling is easier...	779	// Sort the stats so that rerolling is easier...
802	std::sort (statsort, statsort + 7, std::greater<int>());	780	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
803		781
		782	for (int i = 0; i < NUM_STATS; ++i)
804	stats.Str = statsort[0];	783	stats.stat (i) = statsort [i];
805	stats.Dex = statsort[1];
806	stats.Con = statsort[2];
807	stats.Int = statsort[3];
808	stats.Wis = statsort[4];
809	stats.Pow = statsort[5];
810	stats.Cha = statsort[6];
811		784
812	stats.exp = 0;	785	stats.exp = 0;
813	stats.ac = 0;	786	stats.ac = 0;
814		787
815	stats.hp = stats.maxhp;	788	stats.hp = stats.maxhp;
…		…
827	}	800	}
828		801
829	void	802	void
830	object::swap_stats (int a, int b)	803	object::swap_stats (int a, int b)
831	{	804	{
832	int tmp = get_attr_value (&contr->orig_stats, a);	805	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
833	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
834	set_attr_value (&contr->orig_stats, b, tmp);
835		806
		807	for (int i = 0; i < NUM_STATS; ++i)
836	stats.Str = contr->orig_stats.Str;	808	stats.stat (i) = contr->orig_stats.stat (i);
837	stats.Dex = contr->orig_stats.Dex;
838	stats.Con = contr->orig_stats.Con;
839	stats.Int = contr->orig_stats.Int;
840	stats.Wis = contr->orig_stats.Wis;
841	stats.Pow = contr->orig_stats.Pow;
842	stats.Cha = contr->orig_stats.Cha;
843		809
844	//TODO: the following code looks so borked and should, at the very least,	810	//TODO: the following code looks so borked and should, at the very least,
845	// be merged with the similar code in roll_stats	811	// be merged with the similar code in roll_stats
846	stats.ac = 0;	812	stats.ac = 0;
847		813
…		…
920	if (*first_map_ext_path)	886	if (*first_map_ext_path)
921	{	887	{
922	object *tmp;	888	object *tmp;
923	char mapname[MAX_BUF];	889	char mapname[MAX_BUF];
924		890
925	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);
926	tmp = object::create ();	892	tmp = object::create ();
927	EXIT_PATH (tmp) = mapname;	893	EXIT_PATH (tmp) = mapname;
928	EXIT_X (tmp) = ob->x;	894	EXIT_X (tmp) = ob->x;
929	EXIT_Y (tmp) = ob->y;	895	EXIT_Y (tmp) = ob->y;
930	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;
…		…
949	int x = ob->x, y = ob->y;	915	int x = ob->x, y = ob->y;
950		916
951	ob->remove_statbonus ();	917	ob->remove_statbonus ();
952	ob->remove ();	918	ob->remove ();
953	ob->arch = get_player_archetype (ob->arch);	919	ob->arch = get_player_archetype (ob->arch);
954	ob->arch->clone.copy_to (ob);	920	ob->arch->copy_to (ob);
955	ob->instantiate ();	921	ob->instantiate ();
956	ob->stats = ob->contr->orig_stats;	922	ob->stats = ob->contr->orig_stats;
957	ob->name = ob->name_pl = name;	923	ob->name = ob->name_pl = name;
958	ob->x = x;	924	ob->x = x;
959	ob->y = y;	925	ob->y = y;
960	SET_ANIMATION (ob, 2); /* So player faces south */	926	SET_ANIMATION (ob, 2); /* So player faces south */
961	insert_ob_in_map (ob, ob->map, ob, 0);	927	insert_ob_in_map (ob, ob->map, ob, 0);
962	assign (ob->contr->title, ob->arch->clone.name);	928	assign (ob->contr->title, ob->arch->object::name);
963	ob->add_statbonus ();	929	ob->add_statbonus ();
964	}	930	}
965	while (!allowed_class (ob));	931	while (!allowed_class (ob));
966		932
967	update_object (ob, UP_OBJ_FACE);	933	update_object (ob, UP_OBJ_FACE);
…		…
1112	if (tmp->name != NULL)	1078	if (tmp->name != NULL)
1113	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1079	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1114	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1080	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1115	else	1081	else
1116	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1082	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1117	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1083	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1118		1084
1119	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1085	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1120	}	1086	}
1121		1087
1122	/* philosophy:	1088	/* philosophy:
…		…
1197	pick_up (op, tmp);	1163	pick_up (op, tmp);
1198	continue;	1164	continue;
1199	}	1165	}
1200		1166
1201	if (op->contr->mode & PU_READABLES)	1167	if (op->contr->mode & PU_READABLES)
1202	if (tmp->type == BOOK || tmp->type == SCROLL)	1168	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1203	{	1169	{
1204	pick_up (op, tmp);	1170	pick_up (op, tmp);
1205	continue;	1171	continue;
1206	}	1172	}
1207		1173
…		…
1315	/* careful: chairs and tables are weapons! */	1281	/* careful: chairs and tables are weapons! */
1316	if (op->contr->mode & PU_ALLWEAPON)	1282	if (op->contr->mode & PU_ALLWEAPON)
1317	{	1283	{
1318	if (tmp->type == WEAPON && tmp->name != NULL)	1284	if (tmp->type == WEAPON && tmp->name != NULL)
1319	{	1285	{
1320	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 &&
1321	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1287	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1322	{	1288	{
1323	pick_up (op, tmp);	1289	pick_up (op, tmp);
1324	continue;	1290	continue;
1325	}	1291	}
1326	}	1292	}
1327		1293
1328	if (tmp->type == WEAPON && tmp->name == NULL)	1294	if (tmp->type == WEAPON && tmp->name == NULL)
1329	{	1295	{
1330	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)
1331	{	1297	{
1332	pick_up (op, tmp);	1298	pick_up (op, tmp);
1333	continue;	1299	continue;
1334	}	1300	}
1335	}	1301	}
…		…
1360	if (tmp->name != NULL)	1326	if (tmp->name != NULL)
1361	{	1327	{
1362	fprintf (stderr, "%s", tmp->name);	1328	fprintf (stderr, "%s", tmp->name);
1363	}	1329	}
1364	else	1330	else
1365	fprintf (stderr, "%s", tmp->arch->name);	1331	fprintf (stderr, "%s", tmp->arch->archname);
1366	fprintf (stderr, ",%d] = ", tmp->type);	1332	fprintf (stderr, ",%d] = ", tmp->type);
1367	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))));
1368	#endif	1334	#endif
1369	continue;	1335	continue;
1370	}	1336	}
…		…
1385	{	1351	{
1386	object *tmp = 0;	1352	object *tmp = 0;
1387		1353
1388	for (op = op->inv; op; op = op->below)	1354	for (op = op->inv; op; op = op->below)
1389	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))
1390	tmp = find_arrow (op, type);	1356	tmp = find_arrow (splay (op), type);
1391	else if (op->type == ARROW && op->race == type)	1357	else if (op->type == ARROW && op->race == type)
1392	return op;	1358	return splay (op);
1393		1359
1394	return tmp;	1360	return tmp;
1395	}	1361	}
1396		1362
1397	/*	1363	/*
…		…
1440	else	1406	else
1441	{	1407	{
1442	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1408	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1443	{	1409	{
1444	attacktype = 1 << attacknum;	1410	attacktype = 1 << attacknum;
1445	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1411	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1446	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)
1447	{	1413	{
1448	tmp = arrow;	1414	tmp = arrow;
1449	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;
1450	}	1416	}
1451	}	1417	}
1452	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1418	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1453	{	1419	{
1454	tmp = arrow;	1420	tmp = arrow;
…		…
1547	*/	1513	*/
1548	int	1514	int
1549	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1515	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1550	{	1516	{
1551	object *left, *bow;	1517	object *left, *bow;
1552	int bowspeed, mflags;	1518	int mflags;
1553	maptile *m;	1519	maptile *m;
1554		1520
1555	if (!dir)	1521	if (!dir)
1556	{	1522	{
1557	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1523	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1558	return 0;	1524	return 0;
1559	}	1525	}
1560		1526
1561	if (player *pl = op->contr)	1527	if (op->contr)
1562	{	1528	bow = op->current_weapon;
1563	bow = pl->ranged_ob;
1564	op->set_weapon (bow);
1565	}
1566	else	1529	else
1567	{	1530	{
1568	for (bow = op->inv; bow; bow = bow->below)	1531	for (bow = op->inv; bow; bow = bow->below)
1569	/* Don't check for applied - monsters don't apply bows - in that way, they	1532	/* Don't check for applied - monsters don't apply bows - in that way, they
1570	* don't need to switch back and forth between bows and weapons.	1533	* don't need to switch back and forth between bows and weapons.
…		…
1591	{	1554	{
1592	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1555	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1593	return 0;	1556	return 0;
1594	}	1557	}
1595		1558
1596	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1597
1598	/* penalize ROF for bestarrow */
1599	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1600	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1601
1602	if (bowspeed < 1)
1603	bowspeed = 1;
1604
1605	if (arrow == NULL)	1559	if (arrow == NULL)
1606	{	1560	{
1607	if ((arrow = find_arrow (op, bow->race)) == NULL)	1561	if ((arrow = find_arrow (op, bow->race)) == NULL)
1608	{	1562	{
1609	if (op->type == PLAYER)	1563	if (op->type == PLAYER)
…		…
1643		1597
1644	arrow->set_owner (op);	1598	arrow->set_owner (op);
1645	arrow->skill = bow->skill;	1599	arrow->skill = bow->skill;
1646	arrow->direction = dir;	1600	arrow->direction = dir;
1647		1601
1648	if (op->type == PLAYER)
1649	{
1650	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1651	op->update_stats ();
1652	}
1653
1654	SET_ANIMATION (arrow, arrow->direction);
1655
1656	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1602	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1657	arrow->stats.hp = arrow->stats.dam;	1603	arrow->stats.hp = arrow->stats.dam;
1658	arrow->stats.grace = arrow->attacktype;	1604	arrow->stats.grace = arrow->attacktype;
1659		1605
1660	if (arrow->slaying)	1606	if (arrow->slaying)
1661	arrow->spellarg = strdup (arrow->slaying);	1607	arrow->spellarg = strdup (arrow->slaying);
1662		1608
1663	arrow->stats.dam += op->stats.dam + arrow->magic;	1609	#if 0
		1610	if (player *pl = op->contr)
		1611	{
		1612	float speed = pl->weapon_sp;
		1613
		1614	/* penalize ROF for bestarrow */
		1615	if (pl->bowtype == bow_bestarrow)
		1616	speed *= .9f;
		1617	else
		1618	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1619
		1620	op->speed_left += speed - op->speed;
		1621	}
		1622	#endif
		1623
		1624	SET_ANIMATION (arrow, arrow->direction);
1664		1625
1665	/* update the speed */	1626	/* update the speed */
1666	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1627	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1667	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1628	+ bow->stats.dam / 7.f;
1668		1629
1669	arrow->set_speed (max (arrow->speed, 1.0));	1630	arrow->set_speed (max (arrow->speed, 2.f));
1670	arrow->speed_left = 0;	1631	arrow->speed_left = 0;
1671		1632
1672	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1633	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1673		1634
1674	if (op->type == PLAYER)	1635	if (op->type == PLAYER)
1675	{	1636	{
1676	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1637	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1677	arrow->stats.wc -= dex_bonus[op->stats.Dex];	1638	wc -= dex_bonus[op->stats.Dex];
1678		1639
1679	if (!arrow->slaying)	1640	if (!arrow->slaying)
1680	arrow->slaying = op->slaying;	1641	arrow->slaying = op->slaying;
		1642
		1643	arrow->attacktype |= op->attacktype;
1681	}	1644	}
1682	else	1645	else
1683	{	1646	{
1684	arrow->level = op->level;	1647	arrow->level = op->level;
1685	arrow->stats.wc -= bow->magic;	1648	arrow->stats.wc -= bow->magic;
1686		1649
1687	if (!arrow->slaying)	1650	if (!arrow->slaying)
1688	arrow->slaying = bow->slaying;	1651	arrow->slaying = bow->slaying;
1689	}
1690		1652
1691	arrow->stats.wc -= arrow->level;
1692
1693	arrow->attacktype |= bow->attacktype;	1653	arrow->attacktype |= bow->attacktype;
		1654	}
1694		1655
		1656	wc -= arrow->level;
		1657	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
		1658
		1659	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1695	arrow->move_type = MOVE_FLY_LOW;	1660	arrow->move_type = MOVE_FLY_LOW;
1696	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1661	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1697		1662
1698	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1663	op->play_sound (sound_find ("fire_arrow"));
1699	m->insert (arrow, sx, sy, op);	1664	m->insert (arrow, sx, sy, op);
1700		1665
1701	if (!arrow->destroyed ())	1666	if (!arrow->destroyed ())
1702	move_arrow (arrow);	1667	move_arrow (arrow);
1703		1668
…		…
1754	}	1719	}
1755		1720
1756	return ret;	1721	return ret;
1757	}	1722	}
1758		1723
1759
1760	/* Fires a misc (wand/rod/horn) object in 'dir'.	1724	/* Fires a misc (wand/rod/horn) object in 'dir'.
1761	* Broken apart from 'fire' to keep it more readable.	1725	* Broken apart from 'fire' to keep it more readable.
1762	*/	1726	*/
1763	void	1727	void
1764	fire_misc_object (object *op, int dir)	1728	fire_misc_object (object *op, int dir)
…		…
1775	{	1739	{
1776	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1740	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1777	return;	1741	return;
1778	}	1742	}
1779		1743
1780	op->set_weapon (item);	1744	if (!op->change_weapon (item))
		1745	return;
1781		1746
1782	if (item->type == WAND)	1747	if (item->type == WAND)
1783	{	1748	{
1784	if (item->stats.food <= 0)	1749	if (item->stats.food <= 0)
1785	{	1750	{
1786	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1751	op->contr->play_sound (sound_find ("wand_poof"));
1787	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));
1788		1753
1789	return;	1754	return;
1790	}	1755	}
1791	}	1756	}
1792	else if (item->type == ROD || item->type == HORN)	1757	else if (item->type == ROD || item->type == HORN)
1793	{	1758	{
1794	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))
1795	{	1760	{
1796	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1761	op->contr->play_sound (sound_find ("wand_poof"));
1797		1762
1798	if (item->type == ROD)	1763	if (item->type == ROD)
1799	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));
1800	else	1765	else
1801	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));
…		…
1814	object *tmp;	1779	object *tmp;
1815		1780
1816	if (item->arch)	1781	if (item->arch)
1817	{	1782	{
1818	CLEAR_FLAG (item, FLAG_ANIMATE);	1783	CLEAR_FLAG (item, FLAG_ANIMATE);
1819	item->face = item->arch->clone.face;	1784	item->face = item->arch->face;
1820	item->set_speed (0);	1785	item->set_speed (0);
1821	}	1786	}
1822		1787
1823	if ((tmp = item->in_player ()))	1788	if ((tmp = item->in_player ()))
1824	esrv_update_item (UPD_ANIM, tmp, item);	1789	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1829	}	1794	}
1830	}	1795	}
1831		1796
1832	/* Received a fire command for the player - go and do it.	1797	/* Received a fire command for the player - go and do it.
1833	*/	1798	*/
1834	void	1799	bool
1835	fire (object *op, int dir)	1800	fire (object *op, int dir)
1836	{	1801	{
1837	int spellcost = 0;	1802	int spellcost = 0;
1838		1803
1839	/* check for loss of invisiblity/hide */	1804	/* check for loss of invisiblity/hide */
…		…
1843	player *pl = op->contr;	1808	player *pl = op->contr;
1844		1809
1845	if (pl->golem)	1810	if (pl->golem)
1846	{	1811	{
1847	control_golem (op->contr->golem, dir);	1812	control_golem (op->contr->golem, dir);
1848	return;	1813	return false;
1849	}	1814	}
1850		1815
1851	object *ob = pl->ranged_ob;	1816	object *ob = pl->ranged_ob;
1852		1817
1853	if (!ob)	1818	if (!ob)
1854	return;	1819	return false;
		1820
		1821	if (!op->change_weapon (ob))
		1822	return false;
		1823
		1824	if (op->speed_left > 0.f)
		1825	--op->speed_left;
		1826	else
		1827	return false;
1855		1828
1856	switch (ob->type)	1829	switch (ob->type)
1857	{	1830	{
1858	case BOW:	1831	case BOW:
1859	player_fire_bow (op, dir);	1832	player_fire_bow (op, dir);
…		…
1866	case BUILDER:	1839	case BUILDER:
1867	apply_map_builder (op, dir);	1840	apply_map_builder (op, dir);
1868	break;	1841	break;
1869		1842
1870	case SKILL:	1843	case SKILL:
1871	case SKILL_TOOL:
1872	do_skill (op, op, ob, dir, 0);	1844	do_skill (op, op, ob, dir, 0);
1873	break;	1845	break;
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		2148	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2180	/* If the player hasn't hit something this tick, and does
2181	* so, give them speed boost based on weapon speed. Doing
2182	* it here is better than process_players2, which basically
2183	* incurred a 1 tick offset.
2184	*/
2185	if (!op->contr->has_hit)
2186	{	2149	{
2187	op->speed_left += op->speed / op->contr->weapon_sp;	2150	--op->contr->weapon_sp_left;
2188
2189	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2190	}
2191		2151
2192	skill_attack (mon, op, 0, 0, 0);	2152	skill_attack (mon, op, 0, 0, 0);
2193
2194	/* If attacking another player, that player gets automatic
2195	* hitback, and doesn't loose luck either.
2196	* Disable hitback on the battleground or if the target is
2197	* the wiz.
2198	*/
2199	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2200	{
2201	short luck = mon->stats.luck;
2202
2203	mon->contr->has_hit = 1;
2204	skill_attack (op, mon, 0, 0, 0);
2205	mon->stats.luck = luck;
2206	}
2207		2153
2208	if (action_makes_visible (op))	2154	if (action_makes_visible (op))
2209	make_visible (op);	2155	make_visible (op);
2210	}
2211	} /* if player should attack something */
2212	}
2213		2156
2214	int	2157	return true;
		2158	}
		2159	}
		2160
		2161	return false;
		2162	}
		2163
		2164	bool
2215	move_player (object *op, int dir)	2165	move_player (object *op, int dir)
2216	{	2166	{
2217	int pick;	2167	int pick;
2218		2168
2219	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2169	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
…		…
2233	op->facing = dir;	2183	op->facing = dir;
2234		2184
2235	if (op->hide)	2185	if (op->hide)
2236	do_hidden_move (op);	2186	do_hidden_move (op);
2237		2187
		2188	bool retval;
		2189
2238	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2190	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2239	/*nop */ ;	2191	retval = RESULT_INT (0);
2240	else if (op->contr->fire_on)	2192	else if (op->contr->fire_on)
2241	fire (op, dir);	2193	retval = fire (op, dir);
2242	else	2194	else
2243	{	2195	{
2244	move_player_attack (op, dir);	2196	retval = move_player_attack (op, dir);
2245	pick = check_pick (op);	2197	pick = check_pick (op);
2246	}	2198	}
2247		2199
2248	/* 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
2249	* server can handle repeat firing.	2201	* server can handle repeat firing.
…		…
2256	/* Update how the player looks. Use the facing, so direction may	2208	/* Update how the player looks. Use the facing, so direction may
2257	* get reset to zero. This allows for full animation capabilities	2209	* get reset to zero. This allows for full animation capabilities
2258	* for players.	2210	* for players.
2259	*/	2211	*/
2260	animate_object (op, op->facing);	2212	animate_object (op, op->facing);
2261	return 0;	2213
		2214	return retval;
2262	}	2215	}
2263		2216
2264	/* 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
2265	* new client/server stuff.	2218	* new client/server stuff.
2266	* 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
2267	* the new speed values for commands.	2220	* the new speed values for commands.
2268	*	2221	*
2269	* 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.
2270	*/	2225	*/
2271	int	2226	bool
2272	handle_newcs_player (object *op)	2227	handle_newcs_player (object *op)
2273	{	2228	{
2274	if (QUERY_FLAG (op, FLAG_SCARED))	2229	if (QUERY_FLAG (op, FLAG_SCARED))
2275	{	2230	{
2276	flee_player (op);	2231	if (op->speed_left > 0.f)
2277	/* If player is still scared, that is his action for this tick */
2278	if (QUERY_FLAG (op, FLAG_SCARED))
2279	{	2232	{
2280	op->speed_left--;	2233	--op->speed_left;
		2234	flee_player (op);
		2235
2281	return 0;	2236	return true;
2282	}	2237	}
		2238	else
		2239	return false;
2283	}	2240	}
2284		2241
2285	/* 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
2286	* the players time has been increased when doericserver has been	2243	* the players time has been increased when doericserver has been
2287	* called, so we recheck it here.	2244	* called, so we recheck it here.
2288	*/	2245	*/
2289	if (op->contr->ns->handle_command ())	2246	if (op->contr->ns->handle_command ())
2290	return 1;	2247	return true;
2291		2248
2292	if (op->speed_left > 0)
2293	{
2294	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2249	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2295	{
2296	/* All move commands take 1 tick, at least for now */
2297	op->speed_left--;
2298
2299	/* Instead of all the stuff below, let move_player take care
2300	* of it. Also, some of the skill stuff is only put in
2301	* there, as well as the confusion stuff.
2302	*/
2303	move_player (op, op->direction);	2250	return move_player (op, op->direction);
2304		2251
2305	return op->speed_left > 0;
2306	}
2307	}
2308
2309	return 0;	2252	return false;
2310	}	2253	}
2311		2254
2312	int	2255	int
2313	save_life (object *op)	2256	save_life (object *op)
2314	{	2257	{
…		…
2316	return 0;	2259	return 0;
2317		2260
2318	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2261	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2319	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2262	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2320	{	2263	{
2321	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2264	op->play_sound (sound_find ("ob_evaporate"));
2322	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));
2323		2266
2324	if (op->contr)	2267	if (op->contr)
2325	esrv_del_item (op->contr, tmp->count);	2268	esrv_del_item (op->contr, tmp->count);
2326		2269
…		…
2346	/* 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
2347	* 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
2348	* 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
2349	* from.	2292	* from.
2350	*/	2293	*/
2351	void	2294	static void
2352	remove_unpaid_objects (object *op, object *env)	2295	drop_unpaid_items (object *op, object *env)
2353	{	2296	{
2354	while (op)	2297	while (op)
2355	{	2298	{
2356	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' */
2357		2300
…		…
2361	esrv_del_item (env->contr, op->count);	2304	esrv_del_item (env->contr, op->count);
2362		2305
2363	op->insert_at (env);	2306	op->insert_at (env);
2364	}	2307	}
2365	else if (op->inv)	2308	else if (op->inv)
2366	remove_unpaid_objects (op->inv, env);	2309	drop_unpaid_items (op->inv, env);
2367		2310
2368	op = next;	2311	op = next;
2369	}	2312	}
		2313	}
		2314
		2315	void
		2316	object::drop_unpaid_items ()
		2317	{
		2318	if (!flag [FLAG_REMOVED])
		2319	::drop_unpaid_items (inv, this);
2370	}	2320	}
2371		2321
2372	/*	2322	/*
2373	* Returns pointer a static string containing gravestone text	2323	* Returns pointer a static string containing gravestone text
2374	* Moved from apply.c to player.c - player.c is what	2324	* Moved from apply.c to player.c - player.c is what
…		…
2469	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2419	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2470	else	2420	else
2471	{	2421	{
2472	gen_grace = op->stats.maxgrace;	2422	gen_grace = op->stats.maxgrace;
2473	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2423	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2474	}
2475
2476	/* Regenerate Spell Points */
2477	if (!op->contr->golem && --op->last_sp < 0)
2478	{
2479	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2480	if (op->stats.sp < op->stats.maxsp)
2481	{
2482	op->stats.sp++;
2483	/* dms do not consume food */
2484	if (!QUERY_FLAG (op, FLAG_WIZ))
2485	{
2486	op->stats.food--;
2487	if (op->contr->digestion < 0)
2488	op->stats.food += op->contr->digestion;
2489	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2490	op->stats.food = last_food;
2491	}
2492	}
2493
2494	if (max_sp > 1)
2495	{
2496	over_sp = (gen_sp + 10) / rate_sp;
2497	if (over_sp > 0)
2498	{
2499	if (op->stats.sp < op->stats.maxsp)
2500	{
2501	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2502
2503	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2504	op->stats.sp--;
2505
2506	if (op->stats.sp > op->stats.maxsp)
2507	op->stats.sp = op->stats.maxsp;
2508	}
2509	op->last_sp = 0;
2510	}
2511	else
2512	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2513	}
2514	else
2515	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2516	}	2424	}
2517		2425
2518	/* Regenerate Grace */	2426	/* Regenerate Grace */
2519	/* 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. */
2520	if (--op->last_grace < 0)	2428	if (--op->last_grace < 0)
…		…
2541	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);
2542	}	2450	}
2543	/* wearing stuff doesn't detract from grace generation. */	2451	/* wearing stuff doesn't detract from grace generation. */
2544	}	2452	}
2545		2453
		2454	if (op->stats.food > 0)
		2455	{
2546	/* Regenerate Hit Points */	2456	/* Regenerate Spell Points */
2547	if (--op->last_heal < 0)	2457	if (!op->contr->golem && --op->last_sp < 0)
2548	{
2549	if (op->stats.hp < op->stats.maxhp)
2550	{	2458	{
2551	op->stats.hp++;	2459	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2552	/* dms do not consume food */	2460
2553	if (!QUERY_FLAG (op, FLAG_WIZ))	2461	if (op->stats.sp < op->stats.maxsp)
2554	{	2462	{
		2463	op->stats.sp++;
		2464
		2465	/* dms do not consume food */
		2466	if (!QUERY_FLAG (op, FLAG_WIZ))
		2467	{
2555	op->stats.food--;	2468	op->stats.food--;
		2469
2556	if (op->contr->digestion < 0)	2470	if (op->contr->digestion < 0)
2557	op->stats.food += op->contr->digestion;	2471	op->stats.food += op->contr->digestion;
2558	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))
2559	op->stats.food = last_food;	2473	op->stats.food = last_food;
		2474	}
2560	}	2475	}
2561	}
2562		2476
2563	if (max_hp > 1)	2477	if (max_sp > 1)
2564	{
2565	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2566	if (over_hp > 0)
2567	{	2478	{
2568	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
2569	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);
2570	}	2497	}
2571	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)
2572	{	2506	{
2573	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	}
2574	}	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);
2575	}	2532	}
2576	else	2533	else
2577	{
2578	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);
2579	}	2535	}
2580	}	2536	}
2581		2537
2582	/* Digestion */	2538	/* Digestion */
2583	if (--op->last_eat < 0)	2539	if (--op->last_eat < 0)
2584	{	2540	{
2585	#ifdef COZY_SERVER	2541	int bonus = max (0, op->contr->digestion),
2586	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2542	penalty = max (0, -op->contr->digestion);
2587	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2588	#else
2589	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2590	#endif
2591		2543
2592	if (op->contr->gen_hp > 0)
2593	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);
2594	else
2595	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2596		2545
2597	/* dms do not consume food */	2546	/* dms do not consume food */
2598	if (!QUERY_FLAG (op, FLAG_WIZ))	2547	if (!QUERY_FLAG (op, FLAG_WIZ))
2599	op->stats.food--;	2548	op->stats.food--;
2600	}	2549	}
…		…
2627	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.");
2628	manual_apply (op, flesh, 0);	2577	manual_apply (op, flesh, 0);
2629	}	2578	}
2630	}	2579	}
2631		2580
2632	while (op->stats.food < 0 && op->stats.hp >= 0)	2581	if (op->stats.food < 0)
2633	op->stats.food++, op->stats.hp--;	2582	{
		2583	op->stats.hp += op->stats.food;
		2584	op->stats.food = 0;
		2585	}
2634		2586
2635	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2587	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2636	kill_player (op);	2588	kill_player (op);
2637	}	2589	}
2638	}	2590	}
…		…
2643	* file.	2595	* file.
2644	*/	2596	*/
2645	void	2597	void
2646	kill_player (object *op)	2598	kill_player (object *op)
2647	{	2599	{
		2600	int x, y;
2648	char buf[MAX_BUF];	2601	char buf[MAX_BUF];
2649	int x, y;
2650
2651	//int i;
2652	maptile *map; /* this is for resurrection */	2602	maptile *map; /* this is for resurrection */
2653
2654	/* int z;
2655	int num_stats_lose;
2656	int lost_a_stat;
2657	int lose_this_stat;
2658	int this_stat; */
2659	int will_kill_again;	2603	int will_kill_again;
2660	archetype *at;	2604	archetype *at;
2661	object *tmp;	2605	object *tmp;
2662		2606
2663	if (save_life (op))	2607	if (save_life (op))
2664	return;	2608	return;
2665
2666		2609
2667	/* 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
2668	* 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.
2669	* Look at op_on_battleground() for more info --AndreasV	2612	* Look at op_on_battleground() for more info --AndreasV
2670	*/	2613	*/
…		…
2686	{	2629	{
2687	tmp->destroy ();	2630	tmp->destroy ();
2688	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2631	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2689	}	2632	}
2690		2633
2691	cure_disease (op, 0); /* remove any disease */	2634	cure_disease (op, 0, 0); /* remove any disease */
2692	op->stats.hp = op->stats.maxhp;	2635	op->stats.hp = op->stats.maxhp;
2693	if (op->stats.food <= 0)	2636	if (op->stats.food <= 0)
2694	op->stats.food = 999;	2637	op->stats.food = 999;
2695		2638
2696	/* create a bodypart-trophy to make the winner happy */	2639	/* create a bodypart-trophy to make the winner happy */
2697	if (object *tmp = arch_to_object (archetype::find ("finger")))	2640	if (object *tmp = arch_to_object (archetype::find ("finger")))
2698	{	2641	{
2699	sprintf (buf, "%s's finger", &op->name);	2642	tmp->name = format ("%s's finger" , &op->name);
2700	tmp->name = buf;	2643	tmp->name_pl = format ("%s's fingers", &op->name);
2701	sprintf (buf, " This finger has been cut off %s\n"	2644	tmp->msg = format (
2702	" 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",
2703	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2646	&op->name, op->contr->title, (int) (op->level), op->contr->killer
2704	tmp->msg = buf;	2647	);
2705	tmp->value = 0, tmp->type = 0;	2648	tmp->value = 0, tmp->type = 0;
2706	tmp->materialname = "organics";	2649	tmp->materialname = "organics";
2707	tmp->insert_at (op, tmp);	2650	tmp->insert_at (op, tmp);
2708	}	2651	}
2709		2652
…		…
2716	INVOKE_PLAYER (DEATH, op->contr);	2659	INVOKE_PLAYER (DEATH, op->contr);
2717		2660
2718	command_kill_pets (op, 0);	2661	command_kill_pets (op, 0);
2719		2662
2720	if (op->stats.food < 0)	2663	if (op->stats.food < 0)
2721	{
2722	sprintf (buf, "%s starved to death.", &op->name);
2723	strcpy (op->contr->killer, "starvation");	2664	strcpy (op->contr->killer, "starvation");
2724	}
2725	else
2726	sprintf (buf, "%s died.", &op->name);
2727		2665
2728	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2666	op->contr->play_sound (sound_find ("player_dies"));
2729		2667
2730	/* save the map location for corpse, gravestone */	2668	/* save the map location for corpse, gravestone */
2731	x = op->x;	2669	x = op->x;
2732	y = op->y;	2670	y = op->y;
2733	map = op->map;	2671	map = op->map;
…		…
2896	{	2834	{
2897	tmp->destroy ();	2835	tmp->destroy ();
2898	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2836	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2899	}	2837	}
2900		2838
2901	cure_disease (op, 0); /* remove any disease */	2839	cure_disease (op, 0, 0); /* remove any disease */
2902		2840
2903	/*add_exp(op, (op->stats.exp * -0.20)); */	2841	/*add_exp(op, (op->stats.exp * -0.20)); */
2904	apply_death_exp_penalty (op);	2842	apply_death_exp_penalty (op);
2905	if (op->stats.food < 100)	2843	if (op->stats.food < 100)
2906	op->stats.food = 900;	2844	op->stats.food = 900;
…		…
2910		2848
2911	/*	2849	/*
2912	* 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
2913	* and put them back in the map.	2851	* and put them back in the map.
2914	*/	2852	*/
2915	remove_unpaid_objects (op->inv, op);	2853	op->drop_unpaid_items ();
2916		2854
2917	/****************************************/	2855	/****************************************/
2918	/* */	2856	/* */
2919	/* Move player to his current respawn- */	2857	/* Move player to his current respawn- */
2920	/* position (usually last savebed) */	2858	/* position (usually last savebed) */
…		…
2940	object *force;	2878	object *force;
2941	int at;	2879	int at;
2942		2880
2943	force = get_archetype (FORCE_NAME);	2881	force = get_archetype (FORCE_NAME);
2944	/* 50 ticks should be enough time for the spell to abate */	2882	/* 50 ticks should be enough time for the spell to abate */
2945	force->speed = 0.1;	2883	force->speed = 0.1f;
2946	force->speed_left = -5.0;	2884	force->speed_left = -5.f;
2947	SET_FLAG (force, FLAG_APPLIED);	2885	SET_FLAG (force, FLAG_APPLIED);
2948	for (at = 0; at < NROFATTACKS; at++)	2886	for (at = 0; at < NROFATTACKS; at++)
2949	if (will_kill_again & (1 << at))	2887	if (will_kill_again & (1 << at))
2950	force->resist[at] = 100;	2888	force->resist[at] = 100;
2951		2889
…		…
3060	void	2998	void
3061	make_visible (object *op)	2999	make_visible (object *op)
3062	{	3000	{
3063	op->hide = 0;	3001	op->hide = 0;
3064	op->invisible = 0;	3002	op->invisible = 0;
		3003
3065	if (op->type == PLAYER)	3004	if (op->type == PLAYER)
3066	{	3005	{
3067	op->contr->tmp_invis = 0;	3006	op->contr->tmp_invis = 0;
3068	op->contr->invis_race = 0;	3007	op->contr->invis_race = 0;
3069	}	3008	}
…		…
3072	}	3011	}
3073		3012
3074	int	3013	int
3075	is_true_undead (object *op)	3014	is_true_undead (object *op)
3076	{	3015	{
3077	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3016	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3078	return 1;	3017	return 1;
3079		3018
3080	return 0;	3019	return 0;
3081	}	3020	}
3082		3021
3083	/* look at the surrounding terrain to determine	3022	/* look at the surrounding terrain to determine
3084	* the hideability of this object. Positive levels	3023	* the hideability of this object. Positive levels
3085	* indicate greater hideability.	3024	* indicate greater hideability.
3086	*/	3025	*/
3087
3088	int	3026	int
3089	hideability (object *ob)	3027	hideability (object *ob)
3090	{	3028	{
3091	int i, level = 0, mflag;	3029	int i, level = 0, mflag;
3092	sint16 x, y;	3030	sint16 x, y;
…		…
3126	/* For Hidden creatures - a chance of becoming 'unhidden'	3064	/* For Hidden creatures - a chance of becoming 'unhidden'
3127	* every time they move - as we subtract off 'invisibility'	3065	* every time they move - as we subtract off 'invisibility'
3128	* AND, for players, if they move into a ridiculously unhideable	3066	* AND, for players, if they move into a ridiculously unhideable
3129	* spot (surrounded by clear terrain in broad daylight). -b.t.	3067	* spot (surrounded by clear terrain in broad daylight). -b.t.
3130	*/	3068	*/
3131
3132	void	3069	void
3133	do_hidden_move (object *op)	3070	do_hidden_move (object *op)
3134	{	3071	{
3135	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3072	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3136	object *skop;	3073	object *skop;
…		…
3218	* object op. This function works fine for monsters,	3155	* object op. This function works fine for monsters,
3219	* 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
3220	* a pile (say a coin under a table would return "viewable"	3157	* a pile (say a coin under a table would return "viewable"
3221	* by this routine). Another question, should we be	3158	* by this routine). Another question, should we be
3222	* concerned with the direction the player is looking	3159	* concerned with the direction the player is looking
3223	* in? Realistically, most of use cant see stuff behind	3160	* in? Realistically, most of us can't see stuff behind
3224	* our backs...on the other hand, does the "facing" direction	3161	* our backs...on the other hand, does the "facing" direction
3225	* imply the way your head, or body is facing? Its possible	3162	* imply the way your head, or body is facing? It's possible
3226	* 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.
3227	* -b.t.	3164	* -b.t.
3228	* This function is now map tiling safe.	3165	* This function is now map tiling safe.
3229	*/	3166	*/
3230
3231	int	3167	int
3232	player_can_view (object *pl, object *op)	3168	player_can_view (object *pl, object *op)
3233	{	3169	{
3234	rv_vector rv;	3170	rv_vector rv;
3235	int dx, dy;	3171	int dx, dy;
…		…
3247		3183
3248	get_rangevector (pl, op, &rv, 0x1);	3184	get_rangevector (pl, op, &rv, 0x1);
3249		3185
3250	/* starting with the 'head' part, lets loop	3186	/* starting with the 'head' part, lets loop
3251	* through the object and find if it has any	3187	* through the object and find if it has any
3252	* part that is in the los array but isnt on	3188	* part that is in the los array but isn't on
3253	* a blocked los square.	3189	* a blocked los square.
3254	* we use the archetype to figure out offsets.	3190	* we use the archetype to figure out offsets.
3255	*/	3191	*/
3256	while (op)	3192	while (op)
3257	{	3193	{
3258	dx = rv.distance_x + op->arch->clone.x;	3194	dx = rv.distance_x + op->arch->x;
3259	dy = rv.distance_y + op->arch->clone.y;	3195	dy = rv.distance_y + op->arch->y;
3260		3196
3261	/* only the viewable area the player sees is updated by LOS	3197	/* only the viewable area the player sees is updated by LOS
3262	* 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
3263	* for any meaningful values.	3199	* for any meaningful values.
3264	*/	3200	*/
3265	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3201	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3266	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3202	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3267	!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)])
3268	return 1;	3204	return 1;
		3205
3269	op = op->more;	3206	op = op->more;
3270	}	3207	}
		3208
3271	return 0;	3209	return 0;
3272	}	3210	}
3273		3211
3274	/* routine for both players and monsters. We call this when	3212	/* routine for both players and monsters. We call this when
3275	* there is a possibility for our action distrubing our hiding	3213	* there is a possibility for our action distrubing our hiding
…		…
3278	* return 0.	3216	* return 0.
3279	*/	3217	*/
3280	int	3218	int
3281	action_makes_visible (object *op)	3219	action_makes_visible (object *op)
3282	{	3220	{
3283
3284	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3221	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3285	{	3222	{
3286	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3223	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3287	return 0;	3224	return 0;
3288		3225
…		…
3294	{	3231	{
3295	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");
3296	return 1;	3233	return 1;
3297	}	3234	}
3298	}	3235	}
		3236
3299	return 0;	3237	return 0;
3300	}	3238	}
3301		3239
3302	/* op_on_battleground - checks if the given object op (usually	3240	/* op_on_battleground - checks if the given object op (usually
3303	* a player) is standing on a valid battleground-tile,	3241	* a player) is standing on a valid battleground-tile,
…		…
3308	* 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
3309	*/	3247	*/
3310	int	3248	int
3311	op_on_battleground (object *op, int *x, int *y)	3249	op_on_battleground (object *op, int *x, int *y)
3312	{	3250	{
3313	object *tmp;
3314
3315	/* A battleground-tile needs the following attributes to be valid:	3251	/* A battleground-tile needs the following attributes to be valid:
3316	* 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),
3317	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3253	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3318	* and the exit-coordinates sp/hp must both be > 0.	3254	* and the exit-coordinates sp/hp must both be > 0.
3319	* => The intention here is to prevent abuse of the battleground-	3255	* => The intention here is to prevent abuse of the battleground-
3320	* feature (like pickable or hidden battleground tiles). */	3256	* feature (like pickable or hidden battleground tiles). */
3321	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3257	for (object *tmp = op->below; tmp; tmp = tmp->below)
3322	{	3258	{
3323	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3259	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3324	{	3260	{
3325	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3261	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3326	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))
3327	{	3265	{
3328	/*before we assign the exit, check if this is a teambattle */	3266	/* before we assign the exit, check if this is a teambattle */
3329	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))
3330	{	3268	{
3331	object *invtmp;
3332
3333	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3269	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3334	{	3270	{
3335	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3271	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3336	{	3272	{
3337	if (x != NULL && y != NULL)	3273	if (x && y)
3338	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3274	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3275
3339	return 1;	3276	return 1;
3340	}	3277	}
3341	}	3278	}
3342	}	3279	}
		3280
3343	if (x != NULL && y != NULL)	3281	if (x && y)
3344	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3282	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3283
3345	return 1;	3284	return 1;
3346	}	3285	}
3347	}	3286	}
3348	}	3287	}
		3288
3349	/* If we got here, did not find a battleground */	3289	/* If we got here, did not find a battleground */
3350	return 0;	3290	return 0;
3351	}	3291	}
3352		3292
3353	/*	3293	/*
…		…
3369	char buf[MAX_BUF]; /* tmp. string buffer */	3309	char buf[MAX_BUF]; /* tmp. string buffer */
3370	int i = 0, j = 0;	3310	int i = 0, j = 0;
3371		3311
3372	/* get the appropriate treasurelist */	3312	/* get the appropriate treasurelist */
3373	if (atnr == ATNR_FIRE)	3313	if (atnr == ATNR_FIRE)
3374	trlist = treasurelist::find ("dragon_ability_fire");	3314	trlist = treasurelist::find (shstr_dragon_ability_fire);
3375	else if (atnr == ATNR_COLD)	3315	else if (atnr == ATNR_COLD)
3376	trlist = treasurelist::find ("dragon_ability_cold");	3316	trlist = treasurelist::find (shstr_dragon_ability_cold);
3377	else if (atnr == ATNR_ELECTRICITY)	3317	else if (atnr == ATNR_ELECTRICITY)
3378	trlist = treasurelist::find ("dragon_ability_elec");	3318	trlist = treasurelist::find (shstr_dragon_ability_elec);
3379	else if (atnr == ATNR_POISON)	3319	else if (atnr == ATNR_POISON)
3380	trlist = treasurelist::find ("dragon_ability_poison");	3320	trlist = treasurelist::find (shstr_dragon_ability_poison);
3381		3321
3382	if (trlist == NULL || who->type != PLAYER)	3322	if (trlist == NULL || who->type != PLAYER)
3383	return;	3323	return;
3384		3324
3385	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++);
…		…
3389	/* 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]); */
3390	return;	3330	return;
3391	}	3331	}
3392		3332
3393	/* everything seems okay - now bring on the gift: */	3333	/* everything seems okay - now bring on the gift: */
3394	item = &(tr->item->clone);	3334	item = tr->item;
3395		3335
3396	if (item->type == SPELL)	3336	if (item->type == SPELL)
3397	{	3337	{
3398	if (check_spell_known (who, item->name))	3338	if (check_spell_known (who, item->name))
3399	return;	3339	return;
…		…
3458	{	3398	{
3459	/* forces in the treasurelist can alter the player's stats */	3399	/* forces in the treasurelist can alter the player's stats */
3460	object *skin;	3400	object *skin;
3461		3401
3462	/* first get the dragon skin force */	3402	/* first get the dragon skin force */
3463	shstr_cmp dragon_skin_force ("dragon_skin_force");
3464	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)
3465	;	3404	;
3466		3405
3467	if (!skin)	3406	if (!skin)
3468	return;	3407	return;
3469		3408
…		…
3545	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))
3546	return 0;	3485	return 0;
3547		3486
3548	return 100 - blocked_los [x][y];	3487	return 100 - blocked_los [x][y];
3549	}	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