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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.61 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.82 by elmex, Wed Jan 3 02:30:52 2007 UTC

…		…
158		158
159	/* This loads the first map an puts the player on it. */	159	/* This loads the first map an puts the player on it. */
160	static void	160	static void
161	set_first_map (object *op)	161	set_first_map (object *op)
162	{	162	{
163	strcpy (op->contr->maplevel, first_map_path);	163	op->contr->maplevel = first_map_path;
164	op->x = -1;	164	op->x = -1;
165	op->y = -1;	165	op->y = -1;
		166	}
		167
		168	void
		169	player::enter_map ()
		170	{
		171	object *tmp = object::create ();
		172
		173	EXIT_PATH (tmp) = maplevel;
		174	EXIT_X (tmp) = ob->x;
		175	EXIT_Y (tmp) = ob->y;
166	enter_exit (op, 0);	176	ob->enter_exit (tmp);
		177
		178	tmp->destroy ();
167	}	179	}
168		180
169	// connect the player with a specific client	181	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	182	// also changed, rationalises, and fixes some incorrect settings
171	void	183	void
…		…
191		203
192	ob->carrying = sum_weight (ob);	204	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	205	link_player_skills (ob);
194		206
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	207	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196	update_ob_speed (ob);
197		208
198	assign (title, ob->arch->clone.name);	209	assign (title, ob->arch->clone.name);
199		210
200	/* can_use_shield is a new flag. However, the can_use.. seems to largely come	211	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
201	* from the class, and not race. I don't see any way to get the class information	212	* from the class, and not race. I don't see any way to get the class information
…		…
229	add_friendly_object (ob);	240	add_friendly_object (ob);
230		241
231	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);	242	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232		243
233	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234	new_draw_info_format (NDI_UNIQUE \| NDI_ALL \| NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235		245
236	esrv_new_player (this, ob->weight + ob->carrying);	246	esrv_new_player (this, ob->weight + ob->carrying);
237		247
238	ob->update_stats ();	248	ob->update_stats ();
239	ns->floorbox_update ();	249	ns->floorbox_update ();
240		250
241	esrv_send_inventory (ob, ob);	251	esrv_send_inventory (ob, ob);
242	esrv_add_spells (this, 0);	252	esrv_add_spells (this, 0);
243		253
244	enter_exit (ob, 0);	254	ob->activate_recursive ();
		255	enter_map ();
245		256
246	send_rules (ob);	257	send_rules (ob);
247	send_news (ob);	258	send_news (ob);
248	display_motd (ob);	259	display_motd (ob);
		260
		261	INVOKE_PLAYER (CONNECT, this);
249	INVOKE_PLAYER (LOGIN, this);	262	INVOKE_PLAYER (LOGIN, this);
		263	}
		264
		265	void
		266	player::disconnect ()
		267	{
		268	if (ob)
		269	ob->deactivate_recursive ();
		270
		271	//TODO: don't be so harsh and destroy :)
		272	if (ns)
		273	{
		274	if (enable_save)
		275	{
		276	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		277	save (true);
		278	}
		279
		280	INVOKE_PLAYER (DISCONNECT, this);
		281
		282	client *ns = this->ns;
		283	ns->send_packet ("goodbye");
		284	ns->flush ();
		285	ns->pl = 0;
		286	this->ns = 0;
		287
		288	ns->destroy ();
		289	destroy ();
		290	}
250	}	291	}
251		292
252	// the need for this function can be explained	293	// the need for this function can be explained
253	// by load_object not returning the object	294	// by load_object not returning the object
254	void	295	void
…		…
261	ob->speed = 1.0;	302	ob->speed = 1.0;
262	ob->direction = 5; /* So player faces south */	303	ob->direction = 5; /* So player faces south */
263	ob->stats.wc = 2;	304	ob->stats.wc = 2;
264	ob->run_away = 25; /* Then we panick... */	305	ob->run_away = 25; /* Then we panick... */
265		306
266	set_first_map (ob);
267
268	ob->roll_stats ();	307	ob->roll_stats ();
269	}	308	}
270		309
271	player::player ()	310	player::player ()
272	{	311	{
273	/* There are some elements we want initialized to non zero value -	312	/* There are some elements we want initialised to non zero value -
274	* we deal with that below this point.	313	* we deal with that below this point.
275	*/	314	*/
276	outputs_sync = 16; /* Every 2 seconds */	315	outputs_sync = 16; /* Every 2 seconds */
277	outputs_count = 8; /* Keeps present behaviour */	316	outputs_count = 8; /* Keeps present behaviour */
278	unapply = unapply_nochoice;	317	unapply = unapply_nochoice;
279		318
280	assign (savebed_map, first_map_path); /* Init. respawn position */	319	savebed_map = first_map_path; /* Init. respawn position */
281		320
282	gen_sp_armour = 10;	321	gen_sp_armour = 10;
283	last_speed = -1;	322	last_speed = -1;
284	shoottype = range_none;	323	shoottype = range_none;
285	bowtype = bow_normal;	324	bowtype = bow_normal;
…		…
303		342
304	last_stats.exp = -1;	343	last_stats.exp = -1;
305	last_weight = (uint32) - 1;	344	last_weight = (uint32) - 1;
306	}	345	}
307		346
308	player::~player ()	347	void
		348	player::do_destroy ()
309	{	349	{
		350	disconnect ();
		351
		352	save (false);
		353	enable_save = false;
		354
		355	attachable::do_destroy ();
		356
310	terminate_all_pets (ob);	357	terminate_all_pets (ob);
311		358
312	if (first_player != this)	359	if (first_player != this)
313	{	360	{
314	player *prev = first_player;	361	player *prev = first_player;
…		…
327	else	374	else
328	first_player = next;	375	first_player = next;
329		376
330	if (ob)	377	if (ob)
331	{	378	{
332	ob->contr = 0;	379	ob->destroy_inv (false);
333	ob->destroy (1);	380	ob->destroy ();
334	}
335
336	if (ns)
337	{	381	}
338	ns->send_packet ("goodbye");	382	}
339	ns->flush ();
340	ns->pl = 0;
341	ns->destroy ();
342	}
343		383
		384	player::~player ()
		385	{
344	/* Clear item stack */	386	/* Clear item stack */
345	free (stack_items);	387	free (stack_items);
346	}	388	}
347		389
348	/* Tries to add player on the connection passed in ns.	390	/* Tries to add player on the connection passed in ns.
…		…
353	player::create ()	395	player::create ()
354	{	396	{
355	player *pl = new player;	397	player *pl = new player;
356		398
357	pl->set_object (arch_to_object (get_player_archetype (0)));	399	pl->set_object (arch_to_object (get_player_archetype (0)));
		400	set_first_map (pl->ob);
358		401
359	return pl;	402	return pl;
360	}	403	}
361		404
362	/*	405	/*
…		…
828		871
829	contr->orig_stats = stats;	872	contr->orig_stats = stats;
830	}	873	}
831	}	874	}
832		875
		876	static void
		877	start_info (object *op)
		878	{
		879	char buf[MAX_BUF];
		880
		881	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		882	new_draw_info (NDI_UNIQUE, 0, op, buf);
		883	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		884	//new_draw_info (NDI_UNIQUE, 0, op, " ");
		885	}
		886
833	/* This function takes the key that is passed, and does the	887	/* This function takes the key that is passed, and does the
834	* appropriate action with it (change race, or other things).	888	* appropriate action with it (change race, or other things).
835	* The function name is for historical reasons - now we have	889	* The function name is for historical reasons - now we have
836	* separate race and class; this actually changes the RACE,	890	* separate race and class; this actually changes the RACE,
837	* not the class.	891	* not the class.
…		…
882	if (*first_map_ext_path)	936	if (*first_map_ext_path)
883	{	937	{
884	object *tmp;	938	object *tmp;
885	char mapname[MAX_BUF];	939	char mapname[MAX_BUF];
886		940
887	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	941	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
888	tmp = object::create ();	942	tmp = object::create ();
889	EXIT_PATH (tmp) = mapname;	943	EXIT_PATH (tmp) = mapname;
890	EXIT_X (tmp) = op->x;	944	EXIT_X (tmp) = op->x;
891	EXIT_Y (tmp) = op->y;	945	EXIT_Y (tmp) = op->y;
892	enter_exit (op, tmp); /* we don't really care if it succeeded;	946	op->enter_exit (tmp); /* we don't really care if it succeeded;
893	* if the map isn't there, then stay on the	947	* if the map isn't there, then stay on the
894	* default initial map */	948	* default initial map */
895	tmp->destroy ();	949	tmp->destroy ();
896	}	950	}
897	else	951	else
…		…
951	}	1005	}
952		1006
953	INVOKE_PLAYER (LOGOUT, op->contr);	1007	INVOKE_PLAYER (LOGOUT, op->contr);
954	INVOKE_PLAYER (QUIT, op->contr);	1008	INVOKE_PLAYER (QUIT, op->contr);
955		1009
		1010	op->contr->enable_save = false;
		1011
956	terminate_all_pets (op);	1012	terminate_all_pets (op);
957	leave_map (op);	1013	op->remove ();
958	op->direction = 0;	1014	op->direction = 0;
959	new_draw_info_format (NDI_UNIQUE \| NDI_ALL, 5, NULL, "%s quits the game.", &op->name);	1015	new_draw_info_format (NDI_UNIQUE \| NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
960		1016
961	strcpy (op->contr->killer, "quit");	1017	strcpy (op->contr->killer, "quit");
962	check_score (op);	1018	check_score (op);
963	op->contr->party = 0;	1019	op->contr->party = 0;
964	op->contr->own_title[0] = '\0';	1020	op->contr->own_title[0] = '\0';
965		1021	op->contr->destroy ();
966	object_ptr ob = op;
967
968	delete ob->contr;
969
970	/* We need to hunt for any per player unique maps in memory and
971	* get rid of them. The trailing slash in the path is intentional,
972	* so that players named 'Ab' won't match against players 'Abe' pathname
973	*/
974	char buf[MAX_BUF];
975	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
976
977	for (maptile next, mp = first_map; mp; mp = next)
978	{
979	next = mp->next;
980
981	if (!strncmp (mp->path, buf, strlen (buf)))
982	delete_map (mp);
983	}
984
985	delete_character (ob->name, 1);
986		1022
987	return 1;	1023	return 1;
988	}	1024	}
989		1025
990	void	1026	void
…		…
1646	return 0;	1682	return 0;
1647	}	1683	}
1648		1684
1649	arrow->set_owner (op);	1685	arrow->set_owner (op);
1650	arrow->skill = bow->skill;	1686	arrow->skill = bow->skill;
1651
1652	arrow->direction = dir;	1687	arrow->direction = dir;
1653	arrow->x = sx;
1654	arrow->y = sy;
1655		1688
1656	if (op->type == PLAYER)	1689	if (op->type == PLAYER)
1657	{	1690	{
1658	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1691	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1659	op->update_stats ();	1692	op->update_stats ();
…		…
1674		1707
1675	/* update the speed */	1708	/* update the speed */
1676	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1709	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1677	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1710	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1678		1711
1679	if (arrow->speed < 1.0)	1712	arrow->set_speed (max (arrow->speed, 1.0));
1680	arrow->speed = 1.0;
1681	update_ob_speed (arrow);
1682	arrow->speed_left = 0;	1713	arrow->speed_left = 0;
1683		1714
1684	if (op->type == PLAYER)	1715	if (op->type == PLAYER)
1685	{	1716	{
1686	arrow->stats.wc = 20 - bow->magic - arrow->magic -	1717	arrow->stats.wc = 20 - bow->magic - arrow->magic -
…		…
1699	arrow->attacktype \|= bow->attacktype;	1730	arrow->attacktype \|= bow->attacktype;
1700		1731
1701	if (bow->slaying)	1732	if (bow->slaying)
1702	arrow->slaying = bow->slaying;	1733	arrow->slaying = bow->slaying;
1703		1734
1704	arrow->map = m;
1705	arrow->move_type = MOVE_FLY_LOW;	1735	arrow->move_type = MOVE_FLY_LOW;
1706	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1736	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1707		1737
1708	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1738	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1709	insert_ob_in_map (arrow, m, op, 0);	1739	m->insert (arrow, sx, sy, op);
1710		1740
1711	if (!arrow->destroyed ())	1741	if (!arrow->destroyed ())
1712	move_arrow (arrow);	1742	move_arrow (arrow);
1713		1743
1714	if (op->type == PLAYER)	1744	if (op->type == PLAYER)
…		…
1740	}	1770	}
1741	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1771	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1742	{	1772	{
1743	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1773	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1744	wcmod = -1;	1774	wcmod = -1;
		1775
1745	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1776	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1746	}	1777	}
1747	else if (op->contr->bowtype == bow_threewide)	1778	else if (op->contr->bowtype == bow_threewide)
1748	{	1779	{
1749	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1780	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1819		1850
1820	if (item->arch)	1851	if (item->arch)
1821	{	1852	{
1822	CLEAR_FLAG (item, FLAG_ANIMATE);	1853	CLEAR_FLAG (item, FLAG_ANIMATE);
1823	item->face = item->arch->clone.face;	1854	item->face = item->arch->clone.face;
1824	item->speed = 0;	1855	item->set_speed (0);
1825	update_ob_speed (item);
1826	}	1856	}
		1857
1827	if ((tmp = item->in_player ()))	1858	if ((tmp = item->in_player ()))
1828	esrv_update_item (UPD_ANIM, tmp, item);	1859	esrv_update_item (UPD_ANIM, tmp, item);
1829	}	1860	}
1830	}	1861	}
1831	else if (item->type == ROD \|\| item->type == HORN)	1862	else if (item->type == ROD \|\| item->type == HORN)
1832	{
1833	drain_rod_charge (item);	1863	drain_rod_charge (item);
1834	}
1835	}	1864	}
1836	}	1865	}
1837		1866
1838	/* Received a fire command for the player - go and do it.	1867	/* Received a fire command for the player - go and do it.
1839	*/	1868	*/
…		…
2323		2352
2324	/* call this here - we also will call this in do_ericserver, but	2353	/* call this here - we also will call this in do_ericserver, but
2325	* the players time has been increased when doericserver has been	2354	* the players time has been increased when doericserver has been
2326	* called, so we recheck it here.	2355	* called, so we recheck it here.
2327	*/	2356	*/
2328	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2357	op->contr->ns->handle_command ();
2329	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2330	;
2331		2358
2332	if (op->speed_left < 0)	2359	if (op->speed_left < 0)
2333	return 0;	2360	return 0;
2334		2361
2335	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2362	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
…		…
2395	{	2422	{
2396	object *next;	2423	object *next;
2397		2424
2398	while (op)	2425	while (op)
2399	{	2426	{
2400	next = op->below; /* Make sure we have a good value, in case	2427	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2401	* we remove object 'op'	2428
2402	*/
2403	if (QUERY_FLAG (op, FLAG_UNPAID))	2429	if (QUERY_FLAG (op, FLAG_UNPAID))
2404	{	2430	{
2405	op->remove ();
2406	op->x = env->x;
2407	op->y = env->y;
2408	if (env->type == PLAYER)	2431	if (env->type == PLAYER)
2409	esrv_del_item (env->contr, op->count);	2432	esrv_del_item (env->contr, op->count);
2410	insert_ob_in_map (op, env->map, NULL, 0);	2433
		2434	op->insert_at (env);
2411	}	2435	}
2412	else if (op->inv)	2436	else if (op->inv)
2413	remove_unpaid_objects (op->inv, env);	2437	remove_unpaid_objects (op->inv, env);
2414		2438
2415	op = next;	2439	op = next;
…		…
2708	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");	2732	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");
2709	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");	2733	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");
2710		2734
2711	/* restore player */	2735	/* restore player */
2712	at = archetype::find ("poisoning");	2736	at = archetype::find ("poisoning");
2713	tmp = present_arch_in_ob (at, op);	2737	if (object *tmp = present_arch_in_ob (at, op))
2714	if (tmp)
2715	{	2738	{
2716	tmp->destroy ();	2739	tmp->destroy ();
2717	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2740	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2718	}	2741	}
2719		2742
2720	at = archetype::find ("confusion");	2743	at = archetype::find ("confusion");
2721	tmp = present_arch_in_ob (at, op);	2744	if (object *tmp = present_arch_in_ob (at, op))
2722	if (tmp)
2723	{	2745	{
2724	tmp->destroy ();	2746	tmp->destroy ();
2725	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2747	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2726	}	2748	}
2727		2749
…		…
2729	op->stats.hp = op->stats.maxhp;	2751	op->stats.hp = op->stats.maxhp;
2730	if (op->stats.food <= 0)	2752	if (op->stats.food <= 0)
2731	op->stats.food = 999;	2753	op->stats.food = 999;
2732		2754
2733	/* create a bodypart-trophy to make the winner happy */	2755	/* create a bodypart-trophy to make the winner happy */
2734	tmp = arch_to_object (archetype::find ("finger"));	2756	if (object *tmp = arch_to_object (archetype::find ("finger")))
2735	if (tmp != NULL)
2736	{	2757	{
2737	sprintf (buf, "%s's finger", &op->name);	2758	sprintf (buf, "%s's finger", &op->name);
2738	tmp->name = buf;	2759	tmp->name = buf;
2739	sprintf (buf, " This finger has been cut off %s\n"	2760	sprintf (buf, " This finger has been cut off %s\n"
2740	" the %s, when he was defeated at\n level %d by %s.\n",	2761	" the %s, when he was defeated at\n level %d by %s.\n",
2741	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2762	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2742	tmp->msg = buf;	2763	tmp->msg = buf;
2743	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2764	tmp->value = 0, tmp->material = 0, tmp->type = 0;
2744	tmp->materialname = NULL;	2765	tmp->materialname = NULL;
2745	tmp->x = op->x, tmp->y = op->y;	2766	op->insert_at (tmp, op);
2746	insert_ob_in_map (tmp, op->map, op, 0);
2747	}	2767	}
2748		2768
2749	/* teleport defeated player to new destination */	2769	/* teleport defeated player to new destination */
2750	transfer_ob (op, x, y, 0, NULL);	2770	transfer_ob (op, x, y, 0, NULL);
2751	op->contr->braced = 0;	2771	op->contr->braced = 0;
…		…
2777	op->stats.hp = op->stats.maxhp;	2797	op->stats.hp = op->stats.maxhp;
2778	return;	2798	return;
2779	}	2799	}
2780	sprintf (buf, "%s died.", &op->name);	2800	sprintf (buf, "%s died.", &op->name);
2781	}	2801	}
		2802
2782	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2803	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2783		2804
2784	/* save the map location for corpse, gravestone */	2805	/* save the map location for corpse, gravestone */
2785	x = op->x;	2806	x = op->x;
2786	y = op->y;	2807	y = op->y;
2787	map = op->map;	2808	map = op->map;
2788
2789		2809
2790	/* NOT_PERMADEATH code. This basically brings the character back to	2810	/* NOT_PERMADEATH code. This basically brings the character back to
2791	* life if they are dead - it takes some exp and a random stat.	2811	* life if they are dead - it takes some exp and a random stat.
2792	* See the config.h file for a little more in depth detail about this.	2812	* See the config.h file for a little more in depth detail about this.
2793	*/	2813	*/
…		…
2810	num_stats_lose = 1;	2830	num_stats_lose = 1;
2811	else	2831	else
2812	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2832	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2813	}	2833	}
2814	else	2834	else
2815	{
2816	num_stats_lose = 1;	2835	num_stats_lose = 1;
2817	}	2836
2818	lost_a_stat = 0;	2837	lost_a_stat = 0;
2819		2838
2820	for (z = 0; z < num_stats_lose; z++)	2839	for (z = 0; z < num_stats_lose; z++)
2821	{	2840	{
2822	i = RANDOM () % NUM_STATS;	2841	i = RANDOM () % NUM_STATS;
…		…
3305	if (pl->type != PLAYER)	3324	if (pl->type != PLAYER)
3306	{	3325	{
3307	LOG (llevError, "player_can_view() called for non-player object\n");	3326	LOG (llevError, "player_can_view() called for non-player object\n");
3308	return -1;	3327	return -1;
3309	}	3328	}
		3329
3310	if (!pl \|\| !op)	3330	if (!pl \|\| !op)
3311	return 0;	3331	return 0;
3312		3332
3313	if (op->head)
3314	{
3315	op = op->head;	3333	op = op->head_ ();
3316	}	3334
3317	get_rangevector (pl, op, &rv, 0x1);	3335	get_rangevector (pl, op, &rv, 0x1);
3318		3336
3319	/* starting with the 'head' part, lets loop	3337	/* starting with the 'head' part, lets loop
3320	* through the object and find if it has any	3338	* through the object and find if it has any
3321	* part that is in the los array but isnt on	3339	* part that is in the los array but isnt on
…		…
3451	if (trlist == NULL \|\| who->type != PLAYER)	3469	if (trlist == NULL \|\| who->type != PLAYER)
3452	return;	3470	return;
3453		3471
3454	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3472	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3455		3473
3456	if (tr == NULL \|\| tr->item == NULL)	3474	if (!tr \|\| !tr->item)
3457	{	3475	{
3458	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3476	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3459	return;	3477	return;
3460	}	3478	}
3461		3479

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.61 by root, Sat Dec 23 13:56:25 2006 UTC vs. Revision 1.82 by elmex, Wed Jan 3 02:30:52 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.61 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.82 by elmex, Wed Jan 3 02:30:52 2007 UTC