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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.224 by root, Thu Jan 1 16:05:13 2009 UTC vs.
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* 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 Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	#include <global.h>	27	#include <global.h>
25	#include <sproto.h>	28	#include <sproto.h>
26	#include <sounds.h>	29	#include <sounds.h>
27	#include <living.h>	30	#include <living.h>
32	#include <algorithm>	35	#include <algorithm>
33	#include <functional>	36	#include <functional>
34		37
35	playervec players;	38	playervec players;
36		39
37	void
38	display_motd (const object *op)
39	{
40	char buf[MAX_BUF];
41	char motd[HUGE_BUF];
42	FILE *fp;
43	int comp;
44	int size;
45
46	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48	return;
49
50	motd[0] = '\0';
51	size = 0;
52
53	while (fgets (buf, MAX_BUF, fp))
54	{
55	if (*buf == '#')
56	continue;
57
58	strncat (motd + size, buf, HUGE_BUF - size);
59	size += strlen (buf);
60	}
61
62	draw_ext_info (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63	close_and_delete (fp, comp);
64	}
65
66	void
67	send_rules (const object *op)
68	{
69	char buf[MAX_BUF];
70	char rules[HUGE_BUF];
71	FILE *fp;
72	int comp;
73	int size;
74
75	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77	return;
78
79	rules[0] = '\0';
80	size = 0;
81
82	while (fgets (buf, MAX_BUF, fp))
83	{
84	if (*buf == '#')
85	continue;
86
87	if (size + strlen (buf) >= HUGE_BUF)
88	{
89	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90	break;
91	}
92
93	strncat (rules + size, buf, HUGE_BUF - size);
94	size += strlen (buf);
95	}
96
97	draw_ext_info (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98	close_and_delete (fp, comp);
99	}
100
101	void
102	send_news (const object *op)
103	{
104	char buf[MAX_BUF];
105	char news[HUGE_BUF];
106	char subject[MAX_BUF];
107	FILE *fp;
108	int comp;
109	int size;
110
111	sprintf (buf, "%s/%s", settings.confdir, settings.news);
112	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113	return;
114
115	news[0] = '\0';
116	subject[0] = '\0';
117	size = 0;
118
119	while (fgets (buf, MAX_BUF, fp))
120	{
121	if (*buf == '#')
122	continue;
123
124	if (*buf == '%')
125	{ /* send one news */
126	if (size > 0)
127	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
128	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129	"INFORMATION: %s\n%s", (char *)"%s\n%s",
130	subject, news); /send previously read news /
131
132	strcpy (subject, buf + 1);
133	strip_endline (subject);
134	size = 0;
135	news[0] = '\0';
136	}
137	else
138	{
139	if (size + strlen (buf) >= HUGE_BUF)
140	{
141	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
142	break;
143	}
144	strncat (news + size, buf, HUGE_BUF - size);
145	size += strlen (buf);
146	}
147	}
148
149	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
150	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
151	close_and_delete (fp, comp);
152	}
153
154	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
155	static void	41	static void
156	set_first_map (object *op)	42	set_first_map (object *op)
157	{	43	{
158	op->contr->maplevel = first_map_path;	44	op->contr->maplevel = first_map_path;
…		…
252	esrv_send_inventory (ob, ob);	138	esrv_send_inventory (ob, ob);
253	esrv_add_spells (this, 0);	139	esrv_add_spells (this, 0);
254		140
255	activate ();	141	activate ();
256		142
257	send_rules (ob);
258	send_news (ob);
259	display_motd (ob);
260
261	INVOKE_PLAYER (CONNECT, this);	143	INVOKE_PLAYER (CONNECT, this);
262	INVOKE_PLAYER (LOGIN, this);	144	INVOKE_PLAYER (LOGIN, this);
263	}	145	}
264		146
265	void	147	void
…		…
281	ns->reset_stats ();	163	ns->reset_stats ();
282	ns->pl = 0;	164	ns->pl = 0;
283	ns = 0;	165	ns = 0;
284	}	166	}
285		167
286	observe = ob;	168	// this is important for the player scheduler to get the correct refcount
		169	// when ns = 0
		170	observe = viewpoint = ob;
287		171
288	deactivate ();	172	deactivate ();
289	}	173	}
		174
		175	//-GPL
290		176
291	// the need for this function can be explained	177	// the need for this function can be explained
292	// by load_object not returning the object	178	// by load_object not returning the object
293	void	179	void
294	player::set_object (object *op)	180	player::set_object (object *op)
295	{	181	{
296	ob = observe = op;	182	ob = observe = viewpoint = op;
297	ob->contr = this; /* this aren't yet in archetype */	183	ob->contr = this; /* this aren't yet in archetype */
298		184
299	ob->speed = 1.0f;	185	ob->speed = 1.0f;
300	ob->speed_left = 0.5f;	186	ob->speed_left = 0.5f;
301		187
…		…
330	}	216	}
331		217
332	void	218	void
333	player::set_observe (object *op)	219	player::set_observe (object *op)
334	{	220	{
335	observe = op ? op : ob;	221	observe = viewpoint = op ? op : ob;
336	do_los = 1;	222	do_los = 1;
337	}	223	}
		224
		225	void
		226	player::set_viewpoint (object *op)
		227	{
		228	viewpoint = op ? op : (object *)observe;
		229	do_los = 1;
		230	}
		231
		232	//+GPL
338		233
339	player::player ()	234	player::player ()
340	{	235	{
341	/* There are some elements we want initialised to non zero value -	236	/* There are some elements we want initialised to non zero value -
342	* we deal with that below this point.	237	* we deal with that below this point.
…		…
369	{	264	{
370	ob->destroy_inv (false);	265	ob->destroy_inv (false);
371	ob->destroy ();	266	ob->destroy ();
372	}	267	}
373		268
374	ob = observe = 0;	269	ob = observe = viewpoint = 0;
375	}	270	}
376		271
377	player::~player ()	272	player::~player ()
378	{	273	{
379	/* Clear item stack */	274	/* Clear item stack */
380	free (stack_items);	275	free (stack_items);
		276	}
		277
		278	/*
		279	* get_player_archetype() return next player archetype from archetype
		280	* list. Not very efficient routine, but used only creating new players.
		281	* Note: there MUST be at least one player archetype!
		282	*/
		283	static archetype *
		284	get_player_archetype (archetype *at)
		285	{
		286	// archetypes could have been reloaded
		287	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		288
		289	if (!nat)
		290	return at;
		291
		292	archvec::iterator i = archetypes.find (nat);
		293
		294	for (;;)
		295	{
		296	if (++i == archetypes.end ())
		297	i = archetypes.begin ();
		298	else if (*i == at)
		299	cleanup ("not a single player archetype found");
		300
		301	if ((*i)->type == PLAYER)
		302	return *i;
		303	}
381	}	304	}
382		305
383	/* Tries to add player on the connection passed in ns.	306	/* Tries to add player on the connection passed in ns.
384	* All we can really get in this is some settings like host and display	307	* All we can really get in this is some settings like host and display
385	* mode.	308	* mode.
…		…
396	pl->ob->run_away = 25; /* Then we panick... */	319	pl->ob->run_away = 25; /* Then we panick... */
397		320
398	set_first_map (pl->ob);	321	set_first_map (pl->ob);
399		322
400	return pl;	323	return pl;
401	}
402
403	/*
404	* get_player_archetype() return next player archetype from archetype
405	* list. Not very efficient routine, but used only creating new players.
406	* Note: there MUST be at least one player archetype!
407	*/
408	archetype *
409	get_player_archetype (archetype *at)
410	{
411	// archetypes could have been reloaded
412	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414	if (!nat)
415	return at;
416
417	archvec::iterator i = archetypes.find (nat);
418
419	for (;;)
420	{
421	if (++i == archetypes.end ())
422	i = archetypes.begin ();
423	else if (*i == at)
424	cleanup ("not a single player archetype found");
425
426	if ((*i)->type == PLAYER)
427	return *i;
428	}
429	}	324	}
430		325
431	object *	326	object *
432	get_nearest_player (object *mon)	327	get_nearest_player (object *mon)
433	{	328	{
…		…
673	op->destroy ();	568	op->destroy ();
674	continue;	569	continue;
675	}	570	}
676	}	571	}
677		572
678	/* This really needs to be better - we should really give	573	/* Here we remove duplicated skills (as duplicated spell objects have
679	* a substitute spellbook. The problem is that we don't really	574	* _very_ confusing effects for players), which could for instance be
680	* have a good idea what to replace it with (need something like	575	* generated by bad treasurelists. - elmex
681	* a first level treasurelist for each skill.)
682	* remove duplicate skills also
683	*/	576	*/
684	if (op->type == SPELLBOOK \|\| op->type == SKILL)	577	if (op->type == SKILL)
685	{	578	{
686	object *tmp;
687
688	for (tmp = op->below; tmp; tmp = tmp->below)	579	for (object *tmp = op->below; tmp; tmp = tmp->below)
689	if (tmp->type == op->type && tmp->name == op->name)	580	if (tmp->type == op->type && tmp->name == op->name)
690	break;
691
692	if (tmp)
693	{	581	{
694	op->destroy ();	582	op->destroy ();
		583	LOG (llevError,
695	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	584	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
696	continue;	585	break;
697	}	586	}
698		587
699	if (op->nrof > 1)	588	if (op->nrof > 1)
700	op->nrof = 1;	589	op->nrof = 1;
701	}	590	}
702		591
…		…
855	player::chargen_race_done ()	744	player::chargen_race_done ()
856	{	745	{
857	/* this must before then initial items are given */	746	/* this must before then initial items are given */
858	esrv_new_player (ob->contr);	747	esrv_new_player (ob->contr);
859		748
860	treasurelist *tl = treasurelist::find ("starting_wealth");	749	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
861	if (tl)	750	if (tl)
862	create_treasure (tl, ob, 0, 0, 0);	751	create_treasure (tl, ob, 0, 0, 0);
863		752
864	INVOKE_PLAYER (BIRTH, ob->contr);	753	INVOKE_PLAYER (BIRTH, ob->contr);
865	INVOKE_PLAYER (LOGIN, ob->contr);	754	INVOKE_PLAYER (LOGIN, ob->contr);
…		…
918	ob->stats.hp = ob->stats.maxhp;	807	ob->stats.hp = ob->stats.maxhp;
919	ob->stats.sp = ob->stats.maxsp;	808	ob->stats.sp = ob->stats.maxsp;
920	ob->stats.grace = 0;	809	ob->stats.grace = 0;
921	}	810	}
922		811
923	void	812	static void
924	flee_player (object *op)	813	flee_player (object *op)
925	{	814	{
926	int dir, diff;	815	int dir, diff;
927	rv_vector rv;	816	rv_vector rv;
928		817
…		…
1014	if (op->contr->mode & PU_DEBUG)	903	if (op->contr->mode & PU_DEBUG)
1015	{	904	{
1016	/* some debugging code to figure out item information */	905	/* some debugging code to figure out item information */
1017	const char *str = tmp->name	906	const char *str = tmp->name
1018	? format ("item name: %s item type: %d weight/value: %d",	907	? format ("item name: %s item type: %d weight/value: %d",
1019	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))	908	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
1020	: format ("item name: %s item type: %d weight/value: %d",	909	: format ("item name: %s item type: %d weight/value: %d",
1021	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	910	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1022		911
1023	new_draw_info (NDI_UNIQUE, 0, op, str);	912	new_draw_info (NDI_UNIQUE, 0, op, str);
1024	}	913	}
1025		914
1026	if (op->contr->mode & PU_INHIBIT)	915	if (op->contr->mode & PU_INHIBIT)
…		…
1257	fprintf (stderr, "%s", tmp->name);	1146	fprintf (stderr, "%s", tmp->name);
1258	}	1147	}
1259	else	1148	else
1260	fprintf (stderr, "%s", tmp->arch->archname);	1149	fprintf (stderr, "%s", tmp->arch->archname);
1261	fprintf (stderr, ",%d] = ", tmp->type);	1150	fprintf (stderr, ",%d] = ", tmp->type);
1262	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1151	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1263	#endif	1152	#endif
1264	CHK_PICK_PICKUP;	1153	CHK_PICK_PICKUP;
1265	continue;	1154	continue;
1266	}	1155	}
1267	} /* the new pickup model */	1156	} /* the new pickup model */
1268	}	1157	}
1269		1158
1270	return !stop;	1159	return !stop;
1271	}	1160	}
1272		1161
		1162	/* routine for both players and monsters. We call this when
		1163	* there is a possibility for our action distrubing our hiding
		1164	* place or invisiblity spell. Artefact invisiblity causes
		1165	* "noise" instead. If we arent invisible to begin with, we
		1166	* return 0.
		1167	*/
		1168	static int
		1169	action_makes_visible (object *op)
		1170	{
		1171	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		1172	{
		1173	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		1174	{
		1175	// artefact invisibility is permanent, but we still make noise
		1176	// this is important for game-balance.
		1177	if (op->contr)
		1178	op->make_noise ();
		1179
		1180	return 0;
		1181	}
		1182
		1183	if (op->contr && op->contr->tmp_invis == 0)
		1184	return 0;
		1185
		1186	/* If monsters, they should become visible */
		1187	if (op->flag [FLAG_HIDDEN] \|\| !op->contr \|\| (op->contr && op->contr->tmp_invis))
		1188	{
		1189	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1190	return 1;
		1191	}
		1192	}
		1193
		1194	return 0;
		1195	}
		1196
1273	/*	1197	/*
1274	* Find an arrow in the inventory and after that	1198	* Find an arrow in the inventory and after that
1275	* in the right type container (quiver). Pointer to the	1199	* in the right type container (quiver). Pointer to the
1276	* found object is returned.	1200	* found object is returned.
1277	*/	1201	*/
1278	object *	1202	static object *
1279	find_arrow (object op, const char type)	1203	find_arrow (object op, const char type)
1280	{	1204	{
1281	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1205	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1282	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1206	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1283	return splay (tmp);	1207	return splay (tmp);
…		…
1297	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1221	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1298	* against the target. A full test is not performed, simply a basic test	1222	* against the target. A full test is not performed, simply a basic test
1299	* of resistances. The archer is making a quick guess at what he sees down	1223	* of resistances. The archer is making a quick guess at what he sees down
1300	* the hall. Failing that it does it's best to pick the highest plus arrow.	1224	* the hall. Failing that it does it's best to pick the highest plus arrow.
1301	*/	1225	*/
1302	object *	1226	static object *
1303	find_better_arrow (object op, object target, shstr_cmp type, int *better)	1227	find_better_arrow (object op, object target, shstr_cmp type, int *better)
1304	{	1228	{
1305	object tmp = NULL, arrow, *ntmp;	1229	object tmp = NULL, arrow, *ntmp;
1306	int attacknum, attacktype, betterby = 0, i;	1230	int attacknum, attacktype, betterby = 0, i;
1307		1231
…		…
1322	}	1246	}
1323	}	1247	}
1324	else if (arrow->type == ARROW && arrow->race == type)	1248	else if (arrow->type == ARROW && arrow->race == type)
1325	{	1249	{
1326	/* allways prefer assasination/slaying */	1250	/* allways prefer assasination/slaying */
1327	if (target->race && arrow->slaying && arrow->slaying.contains (target->race))	1251	if (target->race && arrow->slaying.contains (target->race))
1328	{	1252	{
1329	if (arrow->attacktype & AT_DEATH)	1253	if (arrow->attacktype & AT_DEATH)
1330	{	1254	{
1331	*better = 100;	1255	*better = 100;
1332	return arrow;	1256	return arrow;
…		…
1376	* find_better_arrow to find a decent arrow to use.	1300	* find_better_arrow to find a decent arrow to use.
1377	* op = the shooter	1301	* op = the shooter
1378	* type = bow->race	1302	* type = bow->race
1379	* dir = fire direction	1303	* dir = fire direction
1380	*/	1304	*/
1381	object *	1305	static object *
1382	pick_arrow_target (object *op, shstr_cmp type, int dir)	1306	pick_arrow_target (object *op, shstr_cmp type, int dir)
1383	{	1307	{
1384	object *tmp = NULL;	1308	object *tmp = NULL;
1385	maptile *m;	1309	maptile *m;
1386	int i, mflags, found, number;	1310	int i, mflags, found, number;
…		…
1473	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1397	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1474	return 0;	1398	return 0;
1475	}	1399	}
1476		1400
1477	// optimisation: move object to top so we will find it quickly again	1401	// optimisation: move object to top so we will find it quickly again
1478	if (bow->below)	1402	splay (bow);
1479	{
1480	bow->remove ();
1481	op->insert (bow);
1482	}
1483	}	1403	}
1484		1404
1485	if (!bow->race \|\| !bow->skill)	1405	if (!bow->race \|\| !bow->skill)
1486	{	1406	{
1487	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1407	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1533	arrow->direction = dir;	1453	arrow->direction = dir;
1534		1454
1535	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1455	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1536	arrow->stats.hp = arrow->stats.dam;	1456	arrow->stats.hp = arrow->stats.dam;
1537	arrow->stats.grace = arrow->attacktype;	1457	arrow->stats.grace = arrow->attacktype;
1538		1458	arrow->custom_name = arrow->slaying;
1539	if (arrow->slaying)
1540	arrow->spellarg = strdup (arrow->slaying);
1541		1459
1542	#if 0	1460	#if 0
1543	if (player *pl = op->contr)	1461	if (player *pl = op->contr)
1544	{	1462	{
1545	float speed = pl->weapon_sp;	1463	float speed = pl->weapon_sp;
…		…
1607	* but monsters can't. Putting that code here	1525	* but monsters can't. Putting that code here
1608	* makes the fire_bow code much cleaner.	1526	* makes the fire_bow code much cleaner.
1609	* this function should only be called if 'op' is a player,	1527	* this function should only be called if 'op' is a player,
1610	* hence the function name.	1528	* hence the function name.
1611	*/	1529	*/
1612	int	1530	static int
1613	player_fire_bow (object *op, int dir)	1531	player_fire_bow (object *op, int dir)
1614	{	1532	{
1615	int ret;	1533	int ret;
1616		1534
1617	if (op->contr->bowtype == bow_bestarrow)	1535	if (op->contr->bowtype == bow_bestarrow)
…		…
1645	}	1563	}
1646		1564
1647	/* Fires a misc (wand/rod/horn) object in 'dir'.	1565	/* Fires a misc (wand/rod/horn) object in 'dir'.
1648	* Broken apart from 'fire' to keep it more readable.	1566	* Broken apart from 'fire' to keep it more readable.
1649	*/	1567	*/
1650	void	1568	static void
1651	fire_misc_object (object *op, int dir)	1569	fire_misc_object (object *op, int dir)
1652	{	1570	{
1653	object *item = op->contr->ranged_ob;	1571	object *item = op->contr->ranged_ob;
1654		1572
1655	if (!item)	1573	if (!item)
…		…
1677	return;	1595	return;
1678	}	1596	}
1679	}	1597	}
1680	else if (item->type == ROD \|\| item->type == HORN)	1598	else if (item->type == ROD \|\| item->type == HORN)
1681	{	1599	{
1682	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1600	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1683		1601
1684	// using the maximum of the rods charge allows at least one spell cast	1602	// using the maximum of the rods charge allows at least one spell cast
1685	// for a rod or horn, this fixes some broken rods.	1603	// for a rod or horn, this fixes some broken rods.
1686	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1604	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1687	{	1605	{
1688	op->contr->play_sound (sound_find ("wand_poof"));	1606	op->contr->play_sound (sound_find ("wand_poof"));
1689		1607
1690	if (item->type == ROD)	1608	if (item->type == ROD)
1691	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1609	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1759	case BOW:	1677	case BOW:
1760	player_fire_bow (op, dir);	1678	player_fire_bow (op, dir);
1761	break;	1679	break;
1762		1680
1763	case SPELL:	1681	case SPELL:
1764	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1682	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1765	break;	1683	break;
1766		1684
1767	case BUILDER:	1685	case BUILDER:
1768	apply_map_builder (op, dir);	1686	apply_map_builder (op, dir);
1769	break;	1687	break;
…		…
1778	}	1696	}
1779		1697
1780	return true;	1698	return true;
1781	}	1699	}
1782		1700
1783	/* find_key	1701	static object *
1784	* We try to find a key for the door as passed. If we find a key
1785	* and successfully use it, we return the key, otherwise NULL
1786	* This function merges both normal and locked door, since the logic
1787	* for both is the same - just the specific key is different.
1788	* pl is the player,
1789	* inv is the objects inventory to searched
1790	* door is the door we are trying to match against.
1791	* This function can be called recursively to search containers.
1792	*/
1793	object *
1794	find_key (object pl, object container, object *door)	1702	find_key_ (object pl, object container, object *door)
1795	{	1703	{
1796	object tmp, key;	1704	object tmp, key;
1797		1705
1798	/* Should not happen, but sanity checking is never bad */	1706	/* Should not happen, but sanity checking is never bad */
1799	if (!container->inv)	1707	if (!container->inv)
…		…
1802	/* First, lets try to find a key in the top level inventory */	1710	/* First, lets try to find a key in the top level inventory */
1803	for (tmp = container->inv; tmp; tmp = tmp->below)	1711	for (tmp = container->inv; tmp; tmp = tmp->below)
1804	{	1712	{
1805	if (door->type == DOOR && tmp->type == KEY)	1713	if (door->type == DOOR && tmp->type == KEY)
1806	break;	1714	break;
		1715
1807	/* For sanity, we should really check door type, but other stuff	1716	/* For sanity, we should really check door type, but other stuff
1808	* (like containers) can be locked with special keys	1717	* (like containers) can be locked with special keys
1809	*/	1718	*/
1810	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1719	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1811	break;	1720	break;
…		…
1817	* a key, return	1726	* a key, return
1818	*/	1727	*/
1819	if (!tmp)	1728	if (!tmp)
1820	{	1729	{
1821	for (tmp = container->inv; tmp; tmp = tmp->below)	1730	for (tmp = container->inv; tmp; tmp = tmp->below)
1822	{
1823	/* No reason to search empty containers */	1731	/* No reason to search empty containers */
1824	if (tmp->type == CONTAINER && tmp->inv)	1732	if (tmp->type == CONTAINER && tmp->inv)
1825	{
1826	if ((key = find_key (pl, tmp, door)))	1733	if ((key = find_key_ (pl, tmp, door)))
1827	return key;	1734	return key;
1828	}
1829	}
1830		1735
1831	if (!tmp)	1736	if (!tmp)
1832	return NULL;	1737	return 0;
1833	}	1738	}
1834		1739
1835	/* We get down here if we have found a key. Now if its in a container,	1740	/* We get down here if we have found a key. Now if its in a container,
1836	* see if we actually want to use it	1741	* see if we actually want to use it
1837	*/	1742	*/
1838	if (pl != container)	1743	if (pl != container)
1839	{	1744	{
1840	/* Only let players use keys in containers */	1745	/* Only let players use keys in containers */
1841	if (!pl->contr)	1746	if (!pl->contr)
1842	return NULL;	1747	return 0;
		1748
1843	/* cases where this fails:	1749	/* cases where this fails:
1844	* If we only search the player inventory, return now since we	1750	* If we only search the player inventory, return now since we
1845	* are not in the players inventory.	1751	* are not in the players inventory.
1846	* If the container is not active, return now since only active	1752	* If the container is not active, return now since only active
1847	* containers can be used.	1753	* containers can be used.
…		…
1851	* inv must have been an container and must have been active.	1757	* inv must have been an container and must have been active.
1852	*	1758	*
1853	* Change the color so that the message doesn't disappear with	1759	* Change the color so that the message doesn't disappear with
1854	* all the others.	1760	* all the others.
1855	*/	1761	*/
1856	if (pl->contr->usekeys == key_inventory \|\|	1762	if (pl->contr->usekeys == key_inventory
1857	!QUERY_FLAG (container, FLAG_APPLIED) \|\|	1763	\|\| !QUERY_FLAG (container, FLAG_APPLIED)
1858	(pl->contr->usekeys == keyrings && container->race != shstr_keys))	1764	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1859	{	1765	{
1860	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1766	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1861	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1767	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1862	return NULL;	1768	return NULL;
1863	}	1769	}
1864	}	1770	}
1865		1771
1866	return tmp;	1772	return tmp;
		1773	}
		1774
		1775	/* find_key
		1776	* We try to find a key for the door as passed. If we find a key
		1777	* and successfully use it, we return the key, otherwise NULL
		1778	* This function merges both normal and locked door, since the logic
		1779	* for both is the same - just the specific key is different.
		1780	* pl is the player,
		1781	* inv is the objects inventory to searched
		1782	* door is the door we are trying to match against.
		1783	* This function can be called recursively to search containers.
		1784	*/
		1785	object *
		1786	find_key (object pl, object container, object *door)
		1787	{
		1788	if (door->slaying && is_match_expr (door->slaying))
		1789	{
		1790	// for match expressions, we try to find the key by applying the match
		1791	// to the op itself, which is supposed to find the "key", instead
		1792	// of searching through containers ourselves.
		1793
		1794	return match_one (door->slaying, container, door, pl, pl);
		1795	}
		1796	else
		1797	return find_key_ (pl, container, door);
1867	}	1798	}
1868		1799
1869	/* moved door processing out of move_player_attack.	1800	/* moved door processing out of move_player_attack.
1870	* returns 1 if player has opened the door with a key	1801	* returns 1 if player has opened the door with a key
1871	* such that the caller should not do anything more,	1802	* such that the caller should not do anything more,
…		…
1921	* going to try and move (not fire weapons).	1852	* going to try and move (not fire weapons).
1922	*/	1853	*/
1923	bool	1854	bool
1924	move_player_attack (object *op, int dir)	1855	move_player_attack (object *op, int dir)
1925	{	1856	{
		1857	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1858	{
		1859	--op->speed_left;
		1860	return true;
		1861	}
		1862
1926	int on_battleground;	1863	int on_battleground;
1927		1864
1928	sint16 nx = freearr_x[dir] + op->x;	1865	sint16 nx = freearr_x[dir] + op->x;
1929	sint16 ny = freearr_y[dir] + op->y;	1866	sint16 ny = freearr_y[dir] + op->y;
1930		1867
1931	on_battleground = op_on_battleground (op, 0, 0);	1868	on_battleground = op_on_battleground (op, 0, 0);
1932		1869
1933	if (out_of_map (op->map, nx, ny))	1870	if (out_of_map (op->map, nx, ny))
1934	return false;	1871	return false;
1935
1936	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1937	{
1938	--op->speed_left;
1939	return true;
1940	}
1941		1872
1942	/* If braced, or can't move to the square, and it is not out of the	1873	/* If braced, or can't move to the square, and it is not out of the
1943	* map, attack it. Note order of if statement is important - don't	1874	* map, attack it. Note order of if statement is important - don't
1944	* want to be calling move_ob if braced, because move_ob will move the	1875	* want to be calling move_ob if braced, because move_ob will move the
1945	* player. This is a pretty nasty hack, because if we could	1876	* player. This is a pretty nasty hack, because if we could
…		…
2087	}	2018	}
2088		2019
2089	bool	2020	bool
2090	move_player (object *op, int dir)	2021	move_player (object *op, int dir)
2091	{	2022	{
2092	int pick;
2093
2094	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2023	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)
2095	return 0;	2024	return 0;
2096		2025
2097	/* Sanity check: make sure dir is valid */	2026	/* Sanity check: make sure dir is valid */
2098	if ((dir < 0) \|\| (dir >= 9))	2027	if ((dir < 0) \|\| (dir >= 9))
…		…
2109		2038
2110	if (op->flag [FLAG_HIDDEN])	2039	if (op->flag [FLAG_HIDDEN])
2111	do_hidden_move (op);	2040	do_hidden_move (op);
2112		2041
2113	bool retval;	2042	bool retval;
		2043	int pick = 0;
2114		2044
2115	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2045	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2116	retval = RESULT_INT (0);	2046	retval = RESULT_INT (0);
2117	else if (op->contr->fire_on)	2047	else if (op->contr->fire_on)
2118	retval = fire (op, dir);	2048	retval = fire (op, dir);
…		…
2175	return move_player (op, op->direction);	2105	return move_player (op, op->direction);
2176		2106
2177	return false;	2107	return false;
2178	}	2108	}
2179		2109
2180	int	2110	static int
2181	save_life (object *op)	2111	save_life (object *op)
2182	{	2112	{
2183	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2113	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2184	return 0;	2114	return 0;
2185		2115
…		…
2232	void	2162	void
2233	object::drop_unpaid_items ()	2163	object::drop_unpaid_items ()
2234	{	2164	{
2235	if (!flag [FLAG_REMOVED])	2165	if (!flag [FLAG_REMOVED])
2236	::drop_unpaid_items (inv, this);	2166	::drop_unpaid_items (inv, this);
2237	}
2238
2239	/*
2240	* Returns pointer a static string containing gravestone text
2241	* Moved from apply.c to player.c - player.c is what
2242	* actually uses this function. player.c may not be quite the
2243	* best, a misc file for object actions is probably better,
2244	* but there isn't one in the server directory.
2245	*/
2246	const char *
2247	gravestone_text (object *op)
2248	{
2249	static dynbuf_text buf;
2250
2251	buf << "---- R.I.P. ----\n\n"
2252	<< op->name;
2253
2254	if (op->type == PLAYER)
2255	buf << " the " << op->contr->title;
2256
2257	buf << "\n\n";
2258
2259	buf << "who was level ";
2260	buf << (sint32)op->level << "\n\n" // OO breakdown
2261	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2262
2263	if (op->type == PLAYER)
2264	buf << "by " << op->contr->killer_name () << ".\n\n";
2265
2266	{
2267	static char buf2[128];
2268	time_t now = time (NULL);
2269	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2270	buf << buf2;
2271	}
2272
2273	return buf;
2274	}	2167	}
2275		2168
2276	void	2169	void
2277	do_some_living (object *op)	2170	do_some_living (object *op)
2278	{	2171	{
…		…
2522	*/	2415	*/
2523	void	2416	void
2524	kill_player (object *op)	2417	kill_player (object *op)
2525	{	2418	{
2526	int x, y;	2419	int x, y;
2527	char buf[MAX_BUF];
2528	maptile map; / this is for resurrection */	2420	maptile map; / this is for resurrection */
2529	int will_kill_again;	2421	int will_kill_again;
2530	archetype *at;	2422	archetype *at;
2531	object *tmp;	2423	object *tmp;
2532		2424
2533	if (save_life (op))	2425	if (save_life (op))
2534	return;	2426	return;
2535		2427
		2428	dynbuf_text deathtab;
		2429
2536	/* restore player */	2430	/* restore player */
2537	at = archetype::find ("poisoning");	2431	at = archetype::find (shstr_poisoning);
2538	if (object *tmp = present_arch_in_ob (at, op))	2432	if (object *tmp = present_arch_in_ob (at, op))
2539	{	2433	{
2540	tmp->destroy ();	2434	tmp->destroy ();
2541	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2435	deathtab << "Your body feels cleansed...\r";
2542	}	2436	}
2543		2437
2544	at = archetype::find ("confusion");	2438	at = archetype::find (shstr_confusion);
2545	if (object *tmp = present_arch_in_ob (at, op))	2439	if (object *tmp = present_arch_in_ob (at, op))
2546	{	2440	{
2547	tmp->destroy ();	2441	tmp->destroy ();
2548	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2442	deathtab << "Your mind feels clearer...\r";
2549	}	2443	}
2550		2444
2551	cure_disease (op, 0, 0); /* remove any disease */	2445	cure_disease (op, 0, 0); /* remove any disease */
2552		2446
2553	max_it (op->stats.hp , op->stats.maxhp);	2447	max_it (op->stats.hp , op->stats.maxhp);
…		…
2573	* in cities ONLY!!! It is very important that this doesn't get abused.	2467	* in cities ONLY!!! It is very important that this doesn't get abused.
2574	* Look at op_on_battleground() for more info --AndreasV	2468	* Look at op_on_battleground() for more info --AndreasV
2575	*/	2469	*/
2576	if (op_on_battleground (op, &x, &y))	2470	if (op_on_battleground (op, &x, &y))
2577	{	2471	{
2578	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");	2472	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2579	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");
2580		2473
2581	/* create a bodypart-trophy to make the winner happy */	2474	/* create a bodypart-trophy to make the winner happy */
2582	if (object *tmp = arch_to_object (archetype::find ("finger")))	2475	if (object *tmp = arch_to_object (archetype::find (shstr_finger)))
2583	{	2476	{
2584	tmp->name = format ("%s's finger" , &op->name);	2477	tmp->name = format ("%s's finger" , &op->name);
2585	tmp->name_pl = format ("%s's fingers", &op->name);	2478	tmp->name_pl = format ("%s's fingers", &op->name);
2586	tmp->msg = format (	2479	tmp->msg = format (
2587	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2480	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
…		…
2595	}	2488	}
2596		2489
2597	/* teleport defeated player to new destination */	2490	/* teleport defeated player to new destination */
2598	transfer_ob (op, x, y, 0, NULL);	2491	transfer_ob (op, x, y, 0, NULL);
2599	op->contr->braced = 0;	2492	op->contr->braced = 0;
		2493
		2494	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2600	return;	2495	return;
2601	}	2496	}
		2497
		2498	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2499	deathtab << "T<YOU HAVE DIED>\n\n";
2602		2500
2603	INVOKE_PLAYER (DEATH, op->contr);	2501	INVOKE_PLAYER (DEATH, op->contr);
2604		2502
2605	command_kill_pets (op, 0);	2503	command_kill_pets (op, 0);
2606		2504
…		…
2657	lost_a_stat = 1;	2555	lost_a_stat = 1;
2658	}	2556	}
2659	else	2557	else
2660	{	2558	{
2661	/* deplete a stat */	2559	/* deplete a stat */
2662	archetype *deparch = archetype::find ("depletion");	2560	archetype *deparch = archetype::find (shstr_depletion);
2663	object *dep;	2561	object *dep;
2664		2562
2665	dep = present_arch_in_ob (deparch, op);	2563	dep = present_arch_in_ob (deparch, op);
2666	if (!dep)	2564	if (!dep)
2667	{	2565	{
…		…
2728	/* determine_god() seems to not work sometimes... why is this?	2626	/* determine_god() seems to not work sometimes... why is this?
2729	Should I be using something else? GD */	2627	Should I be using something else? GD */
2730	shstr_tmp god = determine_god (op);	2628	shstr_tmp god = determine_god (op);
2731		2629
2732	if (god != shstr_none)	2630	if (god != shstr_none)
2733	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", &god);	2631	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2734	else	2632	else
2735	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2633	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2736	}	2634	}
2737	#else	2635	#else
2738	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");	2636	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2739	#endif	2637	#endif
2740		2638
2741	/* Put a gravestone up where the character 'almost' died. List the	2639	/* Put a gravestone up where the character 'almost' died. List the
2742	* exp loss on the stone.	2640	* exp loss on the stone.
2743	*/	2641	*/
2744	tmp = arch_to_object (archetype::find ("gravestone"));	2642	tmp = arch_to_object (archetype::find (shstr_gravestone));
2745	tmp->name = format ("%s's gravestone", &op->name);	2643	tmp->name = format ("%s's gravestone", &op->name);
2746	tmp->name_pl = format ("%s's gravestones", &op->name);	2644	tmp->name_pl = format ("%s's gravestones", &op->name);
2747	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2645	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2748	&op->name, op->contr->title, op->contr->killer_name ());	2646	&op->name, op->contr->title, op->contr->killer_name ());
2749	tmp->x = op->x, tmp->y = op->y;	2647	tmp->x = op->x, tmp->y = op->y;
…		…
2801		2699
2802	insert_ob_in_ob (force, op);	2700	insert_ob_in_ob (force, op);
2803	op->update_stats ();	2701	op->update_stats ();
2804	}	2702	}
2805		2703
2806	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2704	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2807	}	2705	}
2808		2706
2809	void	2707	static void
2810	loot_object (object *op)	2708	loot_object (object *op)
2811	{ /* Grab and destroy some treasure */	2709	{ /* Grab and destroy some treasure */
2812	object tmp, tmp2, *next;	2710	object tmp, tmp2, *next;
2813		2711
2814	op->close_container (); /* close open sack first */	2712	op->close_container (); /* close open sack first */
…		…
2949	level = ob->map->darklevel () - 2;	2847	level = ob->map->darklevel () - 2;
2950		2848
2951	/* this also picks up whether the object is glowing.	2849	/* this also picks up whether the object is glowing.
2952	* If you carry a light on a non-dark map, its not	2850	* If you carry a light on a non-dark map, its not
2953	* as bad as carrying a light on a pitch dark map */	2851	* as bad as carrying a light on a pitch dark map */
2954	if (has_carried_lights (ob))	2852	if (ob->has_carried_lights ())
2955	level = -(10 + (2 * ob->map->darklevel ()));	2853	level = -(10 + (2 * ob->map->darklevel ()));
2956		2854
2957	/* scan through all nearby squares for terrain to hide in */	2855	/* scan through all nearby squares for terrain to hide in */
2958	for (i = 0, x = ob->x, y = ob->y;	2856	for (i = 0, x = ob->x, y = ob->y;
2959	i <= SIZEOFFREE1;	2857	i <= SIZEOFFREE1;
…		…
3116	}	3014	}
3117		3015
3118	return 0;	3016	return 0;
3119	}	3017	}
3120		3018
3121	/* routine for both players and monsters. We call this when
3122	* there is a possibility for our action distrubing our hiding
3123	* place or invisiblity spell. Artefact invisiblity causes
3124	* "noise" instead. If we arent invisible to begin with, we
3125	* return 0.
3126	*/
3127	int
3128	action_makes_visible (object *op)
3129	{
3130	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3131	{
3132	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3133	{
3134	// artefact invisibility is permanent, but we still make noise
3135	// this is important for game-balance.
3136	if (op->contr)
3137	op->make_noise ();
3138
3139	return 0;
3140	}
3141
3142	if (op->contr && op->contr->tmp_invis == 0)
3143	return 0;
3144
3145	/* If monsters, they should become visible */
3146	if (op->flag [FLAG_HIDDEN] \|\| !op->contr \|\| (op->contr && op->contr->tmp_invis))
3147	{
3148	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3149	return 1;
3150	}
3151	}
3152
3153	return 0;
3154	}
3155
3156	/* op_on_battleground - checks if the given object op (usually	3019	/* op_on_battleground - checks if the given object op (usually
3157	* a player) is standing on a valid battleground-tile,	3020	* a player) is standing on a valid battleground-tile,
3158	* function returns TRUE/FALSE. If true x, y returns the battleground	3021	* function returns TRUE/FALSE. If true x, y returns the battleground
3159	* -exit-coord. (and if x, y not NULL)	3022	* -exit-coord. (and if x, y not NULL)
3160	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set	3023	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
…		…
3380		3243
3381	if (pl->ranged_ob == ob)	3244	if (pl->ranged_ob == ob)
3382	pl->ranged_ob = 0;	3245	pl->ranged_ob = 0;
3383	}	3246	}
3384		3247
		3248	//-GPL
		3249
3385	sint8	3250	sint8
3386	player::darkness_at (maptile *map, int x, int y) const	3251	player::darkness_at (maptile *map, int x, int y) const
3387	{	3252	{
3388	if (!ns)	3253	if (!ns)
3389	return LOS_BLOCKED;	3254	return LOS_BLOCKED;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.224 by root, Thu Jan 1 16:05:13 2009 UTC vs. Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.224 by root, Thu Jan 1 16:05:13 2009 UTC vs.
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC