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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.90 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC

…		…
116		116
117	news[0] = '\0';	117	news[0] = '\0';
118	subject[0] = '\0';	118	subject[0] = '\0';
119	size = 0;	119	size = 0;
120		120
121	while (fgets (buf, MAX_BUF, fp) != NULL)	121	while (fgets (buf, MAX_BUF, fp))
122	{	122	{
123	if (*buf == '#')	123	if (*buf == '#')
124	continue;	124	continue;
125		125
126	if (*buf == '%')	126	if (*buf == '%')
127	{ /* send one news */	127	{ /* send one news */
128	if (size > 0)	128	if (size > 0)
129	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /send previously read news /	129	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char )"%s\n%s", subject, news); /send previously read news */
130		130
131	strcpy (subject, buf + 1);	131	strcpy (subject, buf + 1);
132	strip_endline (subject);	132	strip_endline (subject);
133	size = 0;	133	size = 0;
134	news[0] = '\0';	134	news[0] = '\0';
…		…
144	size += strlen (buf);	144	size += strlen (buf);
145	}	145	}
146	}	146	}
147		147
148	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,	148	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
149	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	149	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150	close_and_delete (fp, comp);	150	close_and_delete (fp, comp);
151	}	151	}
152		152
153	/* This loads the first map an puts the player on it. */	153	/* This loads the first map an puts the player on it. */
154	static void	154	static void
…		…
180		180
181	players.insert (this);	181	players.insert (this);
182	ob->remove ();	182	ob->remove ();
183	ob->map = 0;	183	ob->map = 0;
184	ob->activate_recursive ();	184	ob->activate_recursive ();
		185	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		186	add_friendly_object (ob);
185	enter_map ();	187	enter_map ();
186	}	188	}
187		189
188	void	190	void
189	player::deactivate ()	191	player::deactivate ()
190	{	192	{
191	if (!active)	193	if (!active)
192	return;	194	return;
193		195
194	terminate_all_pets (ob);	196	terminate_all_pets (ob);
		197	remove_friendly_object (ob);
195	ob->deactivate_recursive ();	198	ob->deactivate_recursive ();
		199
		200	if (ob->map)
		201	maplevel = ob->map->path;
		202
196	ob->remove ();	203	ob->remove ();
197	ob->map = 0;	204	ob->map = 0;
		205	party = 0;
		206
		207	// for weird reasons, this is often "ob", keeping a circular reference
		208	ranges [range_skill] = 0;
198		209
199	players.erase (this);	210	players.erase (this);
200	}	211	}
201		212
202	// connect the player with a specific client	213	// connect the player with a specific client
…		…
205	player::connect (client *ns)	216	player::connect (client *ns)
206	{	217	{
207	this->ns = ns;	218	this->ns = ns;
208	ns->pl = this;	219	ns->pl = this;
209		220
		221	run_on = 0;
		222	fire_on = 0;
		223	ob->close_container (); //TODO: client-specific
		224
210	ns->update_look = 0;	225	ns->update_look = 0;
211	ns->look_position = 0;	226	ns->look_position = 0;
212		227
213	clear_los (ob);	228	clear_los (ob);
		229
		230	ns->reset_stats ();
214		231
215	/* make sure he's a player -- needed because of class change. */	232	/* make sure he's a player -- needed because of class change. */
216	ob->type = PLAYER; // we are paranoid	233	ob->type = PLAYER; // we are paranoid
217	ob->race = ob->arch->clone.race;	234	ob->race = ob->arch->clone.race;
218		235
…		…
223	link_player_skills (ob);	240	link_player_skills (ob);
224		241
225	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	242	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
226		243
227	assign (title, ob->arch->clone.name);	244	assign (title, ob->arch->clone.name);
228
229	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
230	* from the class, and not race. I don't see any way to get the class information
231	* to then update this. I don't think this will actually break anything - anyone
232	* that can use armour should be able to use a shield. What this may 'break'
233	* are features new characters get, eg, if someone starts up with a Q, they
234	* should be able to use a shield. However, old Q's won't get that advantage.
235	*/
236	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
237	SET_FLAG (ob, FLAG_USE_SHIELD);
238		245
239	/* if it's a dragon player, set the correct title here */	246	/* if it's a dragon player, set the correct title here */
240	if (is_dragon_pl (ob))	247	if (is_dragon_pl (ob))
241	{	248	{
242	object tmp, abil = 0, *skin = 0;	249	object tmp, abil = 0, *skin = 0;
…		…
252	skin = tmp;	259	skin = tmp;
253		260
254	set_dragon_name (ob, abil, skin);	261	set_dragon_name (ob, abil, skin);
255	}	262	}
256		263
257	CLEAR_FLAG (ob, FLAG_FRIENDLY);
258	add_friendly_object (ob);
259
260	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
261
262	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	264	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
263		265
264	esrv_new_player (this, ob->weight + ob->carrying);	266	esrv_new_player (this, ob->weight + ob->carrying);
265		267
266	ob->update_stats ();	268	ob->update_stats ();
…		…
287	if (active)	289	if (active)
288	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	290	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
289		291
290	INVOKE_PLAYER (DISCONNECT, this);	292	INVOKE_PLAYER (DISCONNECT, this);
291		293
		294	ns->reset_stats ();
292	ns->pl = 0;	295	ns->pl = 0;
293	this->ns = 0;	296	ns = 0;
294	}	297	}
		298
		299	if (ob)
		300	ob->close_container (); //TODO: client-specific
295		301
296	deactivate ();	302	deactivate ();
297	}	303	}
298		304
299	// the need for this function can be explained	305	// the need for this function can be explained
300	// by load_object not returning the object	306	// by load_object not returning the object
301	void	307	void
302	player::set_object (object *op)	308	player::set_object (object *op)
303	{	309	{
304	ob = op;	310	ob = op;
305	ob->contr = this; /* this aren't yet in archetype */	311	ob->contr = this; /* this aren't yet in archetype */
306		312
307	ob->speed_left = 0.5;	313	ob->speed_left = 0.5;
308	ob->speed = 1.0;	314	ob->speed = 1.0;
309	ob->direction = 5; /* So player faces south */	315	ob->direction = 5; /* So player faces south */
310	ob->stats.wc = 2;
311	ob->run_away = 25; /* Then we panick... */
312
313	ob->roll_stats ();
314	}	316	}
315		317
316	player::player ()	318	player::player ()
317	{	319	{
318	/* There are some elements we want initialised to non zero value -	320	/* There are some elements we want initialised to non zero value -
319	* we deal with that below this point.	321	* we deal with that below this point.
320	*/	322	*/
321	outputs_sync = 16; /* Every 2 seconds */	323	outputs_sync = 4;
322	outputs_count = 8; /* Keeps present behaviour */	324	outputs_count = 4;
323	unapply = unapply_nochoice;	325	unapply = unapply_nochoice;
324		326
325	savebed_map = first_map_path; /* Init. respawn position */	327	savebed_map = first_map_path; /* Init. respawn position */
326		328
327	gen_sp_armour = 10;	329	gen_sp_armour = 10;
328	last_speed = -1;
329	shoottype = range_none;	330	shoottype = range_none;
330	bowtype = bow_normal;	331	bowtype = bow_normal;
331	petmode = pet_normal;	332	petmode = pet_normal;
332	listening = 10;	333	listening = 10;
333	usekeys = containers;	334	usekeys = containers;
334	last_weapon_sp = -1;
335	peaceful = 1; /* default peaceful */	335	peaceful = 1; /* default peaceful */
336	do_los = 1;	336	do_los = 1;
337
338	/* we need to clear these to -1 and not zero - otherwise,
339	* if a player quits and starts a new character, we wont
340	* send new values to the client, as things like exp start
341	* at zero.
342	*/
343	for (int i = 0; i < NUM_SKILLS; i++)
344	last_skill_exp[i] = -1;
345
346	for (int i = 0; i < NROFATTACKS; i++)
347	last_resist[i] = -1;
348
349	last_stats.exp = -1;
350	last_weight = (uint32) - 1;
351	}	337	}
352		338
353	void	339	void
354	player::do_destroy ()	340	player::do_destroy ()
355	{	341	{
…		…
378	player::create ()	364	player::create ()
379	{	365	{
380	player *pl = new player;	366	player *pl = new player;
381		367
382	pl->set_object (arch_to_object (get_player_archetype (0)));	368	pl->set_object (arch_to_object (get_player_archetype (0)));
		369
		370	pl->ob->roll_stats ();
		371	pl->ob->stats.wc = 2;
		372	pl->ob->run_away = 25; /* Then we panick... */
		373
383	set_first_map (pl->ob);	374	set_first_map (pl->ob);
384		375
385	return pl;	376	return pl;
386	}	377	}
387		378
…		…
419	object *op = NULL;	410	object *op = NULL;
420	objectlink *ol;	411	objectlink *ol;
421	unsigned lastdist;	412	unsigned lastdist;
422	rv_vector rv;	413	rv_vector rv;
423		414
424	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	415	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
425	{	416	{
426	/* We should not find free objects on this friendly list, but it	417	/* We should not find free objects on this friendly list, but it
427	* does periodically happen. Given that, lets deal with it.	418	* does periodically happen. Given that, lets deal with it.
428	* While unlikely, it is possible the next object on the friendly	419	* While unlikely, it is possible the next object on the friendly
429	* list is also free, so encapsulate this in a while loop.	420	* list is also free, so encapsulate this in a while loop.
…		…
433	object *tmp = ol->ob;	424	object *tmp = ol->ob;
434		425
435	/* Can't do much more other than log the fact, because the object	426	/* Can't do much more other than log the fact, because the object
436	* itself will have been cleared.	427	* itself will have been cleared.
437	*/	428	*/
438	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	429	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		430	tmp->debug_desc ());
439	ol = ol->next;	431	ol = ol->next;
440	remove_friendly_object (tmp);	432	remove_friendly_object (tmp);
441	if (!ol)	433	if (!ol)
442	return op;	434	return op;
443	}	435	}
…		…
532	x = mon->x;	524	x = mon->x;
533	y = mon->y;	525	y = mon->y;
534	m = mon->map;	526	m = mon->map;
535	dir = rv.direction;	527	dir = rv.direction;
536	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	528	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
537	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	529	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		530
538	/* If we can't solve it within the search distance, return now. */	531	/* If we can't solve it within the search distance, return now. */
539	if (diff > max)	532	if (diff > max)
540	return 0;	533	return 0;
		534
541	while (diff > 1 && max > 0)	535	while (diff > 1 && max > 0)
542	{	536	{
543	lastx = x;	537	lastx = x;
544	lasty = y;	538	lasty = y;
545	lastmap = m;	539	lastmap = m;
…		…
627	max--;	621	max--;
628	lastdir = dir;	622	lastdir = dir;
629	if (!firstdir)	623	if (!firstdir)
630	firstdir = dir;	624	firstdir = dir;
631	}	625	}
		626
632	if (diff <= 1)	627	if (diff <= 1)
633	{	628	{
634	/* Recalculate diff (distance) because we may not have actually	629	/* Recalculate diff (distance) because we may not have actually
635	* headed toward player for entire distance.	630	* headed toward player for entire distance.
636	*/	631	*/
637	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	632	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
638	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	633	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
639	}	634	}
		635
640	if (diff > max)	636	if (diff > max)
641	return 0;	637	return 0;
642	}	638	}
		639
643	/* If we reached the max, didn't find a direction in time */	640	/* If we reached the max, didn't find a direction in time */
644	if (!max)	641	if (!max)
645	return 0;	642	return 0;
646		643
647	return firstdir;	644	return firstdir;
…		…
761	roll_stat (void)	758	roll_stat (void)
762	{	759	{
763	int a[4], i, j, k;	760	int a[4], i, j, k;
764		761
765	for (i = 0; i < 4; i++)	762	for (i = 0; i < 4; i++)
766	a[i] = (int) RANDOM () % 6 + 1;	763	a[i] = (int) rndm (6) + 1;
767		764
768	for (i = 0, j = 0, k = 7; i < 4; i++)	765	for (i = 0, j = 0, k = 7; i < 4; i++)
769	if (a[i] < k)	766	if (a[i] < k)
770	k = a[i], j = i;	767	k = a[i], j = i;
771		768
…		…
871	* appropriate action with it (change race, or other things).	868	* appropriate action with it (change race, or other things).
872	* The function name is for historical reasons - now we have	869	* The function name is for historical reasons - now we have
873	* separate race and class; this actually changes the RACE,	870	* separate race and class; this actually changes the RACE,
874	* not the class.	871	* not the class.
875	*/	872	*/
876	int	873	void
877	key_change_class (object *op, char key)	874	player::chargen_race_done ()
878	{	875	{
879	int tmp_loop;
880
881	if (key == 'd' \|\| key == 'D')
882	{
883	char buf[MAX_BUF];
884
885	/* this must before then initial items are given */	876	/* this must before then initial items are given */
886	esrv_new_player (op->contr, op->weight + op->carrying);	877	esrv_new_player (ob->contr, ob->weight + ob->carrying);
887		878
888	treasurelist *tl = find_treasurelist ("starting_wealth");	879	treasurelist *tl = treasurelist::find ("starting_wealth");
889	if (tl)	880	if (tl)
890	create_treasure (tl, op, 0, 0, 0);	881	create_treasure (tl, ob, 0, 0, 0);
891		882
892	INVOKE_PLAYER (BIRTH, op->contr);	883	INVOKE_PLAYER (BIRTH, ob->contr);
893	INVOKE_PLAYER (LOGIN, op->contr);	884	INVOKE_PLAYER (LOGIN, ob->contr);
894		885
895	op->contr->ns->state = ST_PLAYING;	886	ob->contr->ns->state = ST_PLAYING;
896		887
897	if (op->msg)	888	if (ob->msg)
898	op->msg = NULL;	889	ob->msg = 0;
899		890
900	/* We create this now because some of the unique maps will need it	891	/* We create this now because some of the unique maps will need it
901	* to save here.	892	* to save here.
902	*/	893	*/
		894	{
		895	char buf[MAX_BUF];
903	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	896	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
904	make_path_to_file (buf);	897	make_path_to_file (buf);
		898	}
905		899
906	#ifdef AUTOSAVE
907	op->contr->last_save_tick = pticks;
908	#endif
909	start_info (op);	900	start_info (ob);
910	CLEAR_FLAG (op, FLAG_WIZ);	901	CLEAR_FLAG (ob, FLAG_WIZ);
911	give_initial_items (op, op->randomitems);	902	give_initial_items (ob, ob->randomitems);
912	link_player_skills (op);	903	link_player_skills (ob);
913	esrv_send_inventory (op, op);	904	esrv_send_inventory (ob, ob);
914	op->update_stats ();	905	ob->update_stats ();
915		906
916	/* This moves the player to a different start map, if there	907	/* This moves the player to a different start map, if there
917	* is one for this race	908	* is one for this race
918	*/	909	*/
919	if (*first_map_ext_path)	910	if (*first_map_ext_path)
920	{	911	{
921	object *tmp;	912	object *tmp;
922	char mapname[MAX_BUF];	913	char mapname[MAX_BUF];
923		914
924	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
925	tmp = object::create ();	916	tmp = object::create ();
926	EXIT_PATH (tmp) = mapname;	917	EXIT_PATH (tmp) = mapname;
927	EXIT_X (tmp) = op->x;	918	EXIT_X (tmp) = ob->x;
928	EXIT_Y (tmp) = op->y;	919	EXIT_Y (tmp) = ob->y;
929	op->enter_exit (tmp); /* we don't really care if it succeeded;	920	ob->enter_exit (tmp); /* we don't really care if it succeeded;
930	* if the map isn't there, then stay on the	921	* if the map isn't there, then stay on the
931	* default initial map */	922	* default initial map */
932	tmp->destroy ();	923	tmp->destroy ();
933	}	924	}
934	else	925	else
935	LOG (llevDebug, "first_map_ext_path not set\n");	926	LOG (llevDebug, "first_map_ext_path not set\n");
		927	}
936		928
937	return 0;	929	void
938	}	930	player::chargen_race_next ()
939		931	{
940	/* Following actually changes the race - this is the default command	932	/* Following actually changes the race - this is the default command
941	* if we don't match with one of the options above.	933	* if we don't match with one of the options above.
942	*/	934	*/
943		935
944	tmp_loop = 0;	936	do
945	while (!tmp_loop)
946	{	937	{
947	shstr name = op->name;	938	shstr name = ob->name;
948	int x = op->x, y = op->y;	939	int x = ob->x, y = ob->y;
949		940
950	op->remove_statbonus ();	941	ob->remove_statbonus ();
951	op->remove ();	942	ob->remove ();
952	op->arch = get_player_archetype (op->arch);	943	ob->arch = get_player_archetype (ob->arch);
953	op->arch->clone.copy_to (op);	944	ob->arch->clone.copy_to (ob);
954	op->instantiate ();	945	ob->instantiate ();
955	op->stats = op->contr->orig_stats;	946	ob->stats = ob->contr->orig_stats;
956	op->name = op->name_pl = name;	947	ob->name = ob->name_pl = name;
957	op->x = x;	948	ob->x = x;
958	op->y = y;	949	ob->y = y;
959	SET_ANIMATION (op, 2); /* So player faces south */	950	SET_ANIMATION (ob, 2); /* So player faces south */
960	insert_ob_in_map (op, op->map, op, 0);	951	insert_ob_in_map (ob, ob->map, ob, 0);
961	assign (op->contr->title, op->arch->clone.name);	952	assign (ob->contr->title, ob->arch->clone.name);
962	op->add_statbonus ();	953	ob->add_statbonus ();
963	tmp_loop = allowed_class (op);
964	}	954	}
		955	while (!allowed_class (ob));
965		956
966	update_object (op, UP_OBJ_FACE);	957	update_object (ob, UP_OBJ_FACE);
967	esrv_update_item (UPD_FACE, op, op);	958	esrv_update_item (UPD_FACE, ob, ob);
968	op->update_stats ();	959	ob->update_stats ();
969	op->stats.hp = op->stats.maxhp;	960	ob->stats.hp = ob->stats.maxhp;
970	op->stats.sp = op->stats.maxsp;	961	ob->stats.sp = ob->stats.maxsp;
971	op->stats.grace = 0;	962	ob->stats.grace = 0;
972
973	if (op->msg)
974	new_draw_info (NDI_BLUE, 0, op, op->msg);
975
976	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
977	return 0;
978	}	963	}
979		964
980	void	965	void
981	flee_player (object *op)	966	flee_player (object *op)
982	{	967	{
…		…
1039	int	1024	int
1040	check_pick (object *op)	1025	check_pick (object *op)
1041	{	1026	{
1042	object tmp, next;	1027	object tmp, next;
1043	int stop = 0;	1028	int stop = 0;
1044	int j, k, wvratio;	1029	int wvratio;
1045	char putstring[128], tmpstr[16];	1030	char putstring[128];
1046		1031
1047	/* if you're flying, you cna't pick up anything */	1032	/* if you're flying, you cna't pick up anything */
1048	if (op->move_type & MOVE_FLYING)	1033	if (op->move_type & MOVE_FLYING)
1049	return 1;	1034	return 1;
1050		1035
…		…
1387	* found object is returned.	1372	* found object is returned.
1388	*/	1373	*/
1389	object *	1374	object *
1390	find_arrow (object op, const char type)	1375	find_arrow (object op, const char type)
1391	{	1376	{
1392	object *tmp = NULL;	1377	object *tmp = 0;
1393		1378
1394	for (op = op->inv; op; op = op->below)	1379	for (op = op->inv; op; op = op->below)
1395	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1380	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1396	tmp = find_arrow (op, type);	1381	tmp = find_arrow (op, type);
1397	else if (op->type == ARROW && op->race == type)	1382	else if (op->type == ARROW && op->race == type)
1398	return op;	1383	return op;
		1384
1399	return tmp;	1385	return tmp;
1400	}	1386	}
1401		1387
1402	/*	1388	/*
1403	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1389	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1404	* against the target. A full test is not performed, simply a basic test	1390	* against the target. A full test is not performed, simply a basic test
1405	* of resistances. The archer is making a quick guess at what he sees down	1391	* of resistances. The archer is making a quick guess at what he sees down
1406	* the hall. Failing that it does it's best to pick the highest plus arrow.	1392	* the hall. Failing that it does it's best to pick the highest plus arrow.
1407	*/	1393	*/
1408
1409	object *	1394	object *
1410	find_better_arrow (object op, object target, const char type, int better)	1395	find_better_arrow (object op, object target, const char type, int better)
1411	{	1396	{
1412	object tmp = NULL, arrow, *ntmp;	1397	object tmp = NULL, arrow, *ntmp;
1413	int attacknum, attacktype, betterby = 0, i;	1398	int attacknum, attacktype, betterby = 0, i;
…		…
1605	if (op->type == PLAYER)	1590	if (op->type == PLAYER)
1606	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1591	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1607	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1592	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1608	else	1593	else
1609	CLEAR_FLAG (op, FLAG_READY_BOW);	1594	CLEAR_FLAG (op, FLAG_READY_BOW);
		1595
1610	return 0;	1596	return 0;
1611	}	1597	}
1612	}	1598	}
1613		1599
1614	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1600	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1645	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1631	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1646	op->update_stats ();	1632	op->update_stats ();
1647	}	1633	}
1648		1634
1649	SET_ANIMATION (arrow, arrow->direction);	1635	SET_ANIMATION (arrow, arrow->direction);
		1636
1650	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1637	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1651	arrow->stats.hp = arrow->stats.dam;	1638	arrow->stats.hp = arrow->stats.dam;
1652	arrow->stats.grace = arrow->attacktype;	1639	arrow->stats.grace = arrow->attacktype;
		1640
1653	if (arrow->slaying != NULL)	1641	if (arrow->slaying)
1654	arrow->spellarg = strdup (arrow->slaying);	1642	arrow->spellarg = strdup (arrow->slaying);
1655		1643
1656	/* Note that this was different for monsters - they got their level	1644	arrow->stats.dam += op->stats.dam + arrow->magic;
1657	* added to the damage. I think the strength bonus is more proper.
1658	*/
1659
1660	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1661		1645
1662	/* update the speed */	1646	/* update the speed */
1663	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1647	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1664	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1648	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1665		1649
1666	arrow->set_speed (max (arrow->speed, 1.0));	1650	arrow->set_speed (max (arrow->speed, 1.0));
1667	arrow->speed_left = 0;	1651	arrow->speed_left = 0;
1668		1652
		1653	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1654
1669	if (op->type == PLAYER)	1655	if (op->type == PLAYER)
1670	{	1656	{
1671	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1672	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1673	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1674
1675	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1657	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1658	arrow->stats.wc -= dex_bonus[op->stats.Dex];
		1659
		1660	if (!arrow->slaying)
		1661	arrow->slaying = op->slaying;
1676	}	1662	}
1677	else	1663	else
1678	{	1664	{
1679	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1680	arrow->level = op->level;	1665	arrow->level = op->level;
1681	}	1666	arrow->stats.wc -= bow->magic;
1682		1667
1683	if (arrow->attacktype == AT_PHYSICAL)	1668	if (!arrow->slaying)
		1669	arrow->slaying = bow->slaying;
		1670	}
		1671
		1672	arrow->stats.wc -= arrow->level;
		1673
1684	arrow->attacktype \|= bow->attacktype;	1674	arrow->attacktype \|= bow->attacktype;
1685
1686	if (bow->slaying)
1687	arrow->slaying = bow->slaying;
1688		1675
1689	arrow->move_type = MOVE_FLY_LOW;	1676	arrow->move_type = MOVE_FLY_LOW;
1690	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1677	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1691		1678
1692	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1679	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
…		…
1845	case range_misc:	1832	case range_misc:
1846	fire_misc_object (op, dir);	1833	fire_misc_object (op, dir);
1847	return;	1834	return;
1848		1835
1849	case range_golem: /* Control summoned monsters from scrolls */	1836	case range_golem: /* Control summoned monsters from scrolls */
1850	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1851	{
1852	op->contr->ranges[range_golem] = 0;
1853	op->contr->shoottype = range_none;
1854	}
1855	else
1856	control_golem (op->contr->ranges[range_golem], dir);	1837	control_golem (op->contr->ranges[range_golem], dir);
1857	return;	1838	return;
1858		1839
1859	case range_skill:	1840	case range_skill:
1860	if (!op->chosen_skill)	1841	if (!op->chosen_skill)
1861	{	1842	{
1862	if (op->type == PLAYER)	1843	if (op->type == PLAYER)
1863	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");	1844	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
		1845
1864	return;	1846	return;
1865	}	1847	}
		1848
1866	(void) do_skill (op, op, op->chosen_skill, dir, NULL);	1849	do_skill (op, op, op->chosen_skill, dir, NULL);
1867	return;	1850	return;
1868	case range_builder:	1851	case range_builder:
1869	apply_map_builder (op, dir);	1852	apply_map_builder (op, dir);
1870	return;	1853	return;
1871	default:	1854	default:
1872	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");	1855	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1873	return;	1856	return;
1874	}	1857	}
1875	}	1858	}
1876
1877
1878		1859
1879	/* find_key	1860	/* find_key
1880	* We try to find a key for the door as passed. If we find a key	1861	* We try to find a key for the door as passed. If we find a key
1881	* and successfully use it, we return the key, otherwise NULL	1862	* and successfully use it, we return the key, otherwise NULL
1882	* This function merges both normal and locked door, since the logic	1863	* This function merges both normal and locked door, since the logic
…		…
1884	* pl is the player,	1865	* pl is the player,
1885	* inv is the objects inventory to searched	1866	* inv is the objects inventory to searched
1886	* door is the door we are trying to match against.	1867	* door is the door we are trying to match against.
1887	* This function can be called recursively to search containers.	1868	* This function can be called recursively to search containers.
1888	*/	1869	*/
1889
1890	object *	1870	object *
1891	find_key (object pl, object container, object *door)	1871	find_key (object pl, object container, object *door)
1892	{	1872	{
1893	object tmp, key;	1873	object tmp, key;
1894		1874
1895	/* Should not happen, but sanity checking is never bad */	1875	/* Should not happen, but sanity checking is never bad */
1896	if (container->inv == NULL)	1876	if (!container->inv)
1897	return NULL;	1877	return 0;
1898		1878
1899	/* First, lets try to find a key in the top level inventory */	1879	/* First, lets try to find a key in the top level inventory */
1900	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1880	for (tmp = container->inv; tmp; tmp = tmp->below)
1901	{	1881	{
1902	if (door->type == DOOR && tmp->type == KEY)	1882	if (door->type == DOOR && tmp->type == KEY)
1903	break;	1883	break;
1904	/* For sanity, we should really check door type, but other stuff	1884	/* For sanity, we should really check door type, but other stuff
1905	* (like containers) can be locked with special keys	1885	* (like containers) can be locked with special keys
1906	*/	1886	*/
1907	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1887	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1908	break;	1888	break;
1909	}	1889	}
		1890
1910	/* No key found - lets search inventories now */	1891	/* No key found - lets search inventories now */
1911	/* If we find and use a key in an inventory, return at that time.	1892	/* If we find and use a key in an inventory, return at that time.
1912	* otherwise, if we search all the inventories and still don't find	1893	* otherwise, if we search all the inventories and still don't find
1913	* a key, return	1894	* a key, return
1914	*/	1895	*/
1915	if (!tmp)	1896	if (!tmp)
1916	{	1897	{
1917	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1898	for (tmp = container->inv; tmp; tmp = tmp->below)
1918	{	1899	{
1919	/* No reason to search empty containers */	1900	/* No reason to search empty containers */
1920	if (tmp->type == CONTAINER && tmp->inv)	1901	if (tmp->type == CONTAINER && tmp->inv)
1921	{	1902	{
1922	if ((key = find_key (pl, tmp, door)) != NULL)	1903	if ((key = find_key (pl, tmp, door)))
1923	return key;	1904	return key;
1924	}	1905	}
1925	}	1906	}
		1907
1926	if (!tmp)	1908	if (!tmp)
1927	return NULL;	1909	return NULL;
1928	}	1910	}
		1911
1929	/* We get down here if we have found a key. Now if its in a container,	1912	/* We get down here if we have found a key. Now if its in a container,
1930	* see if we actually want to use it	1913	* see if we actually want to use it
1931	*/	1914	*/
1932	if (pl != container)	1915	if (pl != container)
1933	{	1916	{
…		…
1954	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1937	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1955	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1938	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1956	return NULL;	1939	return NULL;
1957	}	1940	}
1958	}	1941	}
		1942
1959	return tmp;	1943	return tmp;
1960	}	1944	}
1961		1945
1962	/* moved door processing out of move_player_attack.	1946	/* moved door processing out of move_player_attack.
1963	* returns 1 if player has opened the door with a key	1947	* returns 1 if player has opened the door with a key
…		…
1981	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1965	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1982	if (action_makes_visible (op))	1966	if (action_makes_visible (op))
1983	make_visible (op);	1967	make_visible (op);
1984	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1968	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1985	spring_trap (door->inv, op);	1969	spring_trap (door->inv, op);
		1970
1986	if (door->type == DOOR)	1971	if (door->type == DOOR)
1987	{
1988	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1972	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1989	}
1990	else if (door->type == LOCKED_DOOR)	1973	else if (door->type == LOCKED_DOOR)
1991	{	1974	{
1992	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1975	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1993	remove_door2 (door); /* remove door without violence ;-) */	1976	remove_door2 (door); /* remove door without violence ;-) */
1994	}	1977	}
		1978
1995	/* Do this after we print the message */	1979	/* Do this after we print the message */
1996	decrease_ob (key); /* Use up one of the keys */	1980	decrease_ob (key); /* Use up one of the keys */
1997	/* Need to update the weight the container the key was in */	1981	/* Need to update the weight the container the key was in */
1998	if (container != op)	1982	if (container != op)
1999	esrv_update_item (UPD_WEIGHT, op, container);	1983	esrv_update_item (UPD_WEIGHT, op, container);
		1984
2000	return 1; /* Nothing more to do below */	1985	return 1; /* Nothing more to do below */
2001	}	1986	}
2002	else if (door->type == LOCKED_DOOR)	1987	else if (door->type == LOCKED_DOOR)
2003	{	1988	{
2004	/* Might as well return now - no other way to open this */	1989	/* Might as well return now - no other way to open this */
2005	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);	1990	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);
2006	return 1;	1991	return 1;
2007	}	1992	}
		1993
2008	return 0;	1994	return 0;
2009	}	1995	}
2010		1996
2011	/* This function is just part of a breakup from move_player.	1997	/* This function is just part of a breakup from move_player.
2012	* It should keep the code cleaner.	1998	* It should keep the code cleaner.
…		…
2218	return 0;	2204	return 0;
2219	}	2205	}
2220		2206
2221	/* peterm: added following line */	2207	/* peterm: added following line */
2222	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2208	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2223	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2209	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2224		2210
2225	op->facing = dir;	2211	op->facing = dir;
2226		2212
2227	if (op->hide)	2213	if (op->hide)
2228	do_hidden_move (op);	2214	do_hidden_move (op);
…		…
2261	* Returns true if there are more actions we can do.	2247	* Returns true if there are more actions we can do.
2262	*/	2248	*/
2263	int	2249	int
2264	handle_newcs_player (object *op)	2250	handle_newcs_player (object *op)
2265	{	2251	{
2266	if (op->contr->hidden)
2267	{
2268	op->invisible = 1000;
2269	/* the socket code flashes the player visible/invisible
2270	* depending on the value of invisible, so we need to
2271	* alternate it here for it to work correctly.
2272	*/
2273	if (pticks & 2)
2274	op->invisible--;
2275	}
2276	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2277	{
2278	op->invisible--;
2279	if (!op->invisible)
2280	{
2281	make_visible (op);
2282	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2283	}
2284	}
2285
2286	if (QUERY_FLAG (op, FLAG_SCARED))	2252	if (QUERY_FLAG (op, FLAG_SCARED))
2287	{	2253	{
2288	flee_player (op);	2254	flee_player (op);
2289	/* If player is still scared, that is his action for this tick */	2255	/* If player is still scared, that is his action for this tick */
2290	if (QUERY_FLAG (op, FLAG_SCARED))	2256	if (QUERY_FLAG (op, FLAG_SCARED))
2291	{	2257	{
2292	op->speed_left--;	2258	op->speed_left--;
2293	return 0;	2259	return 0;
2294	}	2260	}
2295	}	2261	}
2296
2297	/* I've been seeing crashes where the golem has been destroyed, but
2298	* the player object still points to the defunct golem. The code that
2299	* destroys the golem looks correct, and it doesn't always happen, so
2300	* put this in a a workaround to clean up the golem pointer.
2301	*/
2302	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2303	op->contr->ranges[range_golem] = 0;
2304		2262
2305	/* call this here - we also will call this in do_ericserver, but	2263	/* call this here - we also will call this in do_ericserver, but
2306	* the players time has been increased when doericserver has been	2264	* the players time has been increased when doericserver has been
2307	* called, so we recheck it here.	2265	* called, so we recheck it here.
2308	*/	2266	*/
…		…
2369	* from.	2327	* from.
2370	*/	2328	*/
2371	void	2329	void
2372	remove_unpaid_objects (object op, object env)	2330	remove_unpaid_objects (object op, object env)
2373	{	2331	{
2374	object *next;
2375
2376	while (op)	2332	while (op)
2377	{	2333	{
2378	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2334	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2379		2335
2380	if (QUERY_FLAG (op, FLAG_UNPAID))	2336	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2446	int rate_grace = 2000;	2402	int rate_grace = 2000;
2447	const int max_hp = 1;	2403	const int max_hp = 1;
2448	const int max_sp = 1;	2404	const int max_sp = 1;
2449	const int max_grace = 1;	2405	const int max_grace = 1;
2450		2406
2451	if (op->contr->outputs_sync)	2407	if (op->contr->hidden)
		2408	{
		2409	op->invisible = 1000;
		2410	/* the socket code flashes the player visible/invisible
		2411	* depending on the value of invisible, so we need to
		2412	* alternate it here for it to work correctly.
		2413	*/
		2414	if (pticks & 2)
		2415	op->invisible--;
2452	{	2416	}
2453	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2417	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2454	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2418	{
2455	flush_output_element (op, &op->contr->outputs[i]);	2419	if (!op->invisible--)
		2420	{
		2421	make_visible (op);
		2422	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2423	}
2456	}	2424	}
2457		2425
2458	if (op->contr->ns->state == ST_PLAYING)	2426	if (op->contr->ns->state == ST_PLAYING)
2459	{	2427	{
2460	/* these next three if clauses make it possible to SLOW DOWN	2428	/* these next three if clauses make it possible to SLOW DOWN
…		…
2482	gen_grace = op->stats.maxgrace;	2450	gen_grace = op->stats.maxgrace;
2483	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2451	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2484	}	2452	}
2485		2453
2486	/* Regenerate Spell Points */	2454	/* Regenerate Spell Points */
2487	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2455	if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2488	{	2456	{
2489	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2457	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2490	if (op->stats.sp < op->stats.maxsp)	2458	if (op->stats.sp < op->stats.maxsp)
2491	{	2459	{
2492	op->stats.sp++;	2460	op->stats.sp++;
…		…
2710	tmp->name = buf;	2678	tmp->name = buf;
2711	sprintf (buf, " This finger has been cut off %s\n"	2679	sprintf (buf, " This finger has been cut off %s\n"
2712	" the %s, when he was defeated at\n level %d by %s.\n",	2680	" the %s, when he was defeated at\n level %d by %s.\n",
2713	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2681	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2714	tmp->msg = buf;	2682	tmp->msg = buf;
2715	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2683	tmp->value = 0, tmp->type = 0;
2716	tmp->materialname = NULL;	2684	tmp->materialname = "organics";
2717	tmp->insert_at (op, tmp);	2685	tmp->insert_at (op, tmp);
2718	}	2686	}
2719		2687
2720	/* teleport defeated player to new destination */	2688	/* teleport defeated player to new destination */
2721	transfer_ob (op, x, y, 0, NULL);	2689	transfer_ob (op, x, y, 0, NULL);
…		…
2917	op->stats.hp = op->stats.maxhp;	2885	op->stats.hp = op->stats.maxhp;
2918	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2886	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2919	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2887	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2920		2888
2921	/*	2889	/*
2922	* Check to see if the player is in a shop. IF so, then check to see if
2923	* the player has any unpaid items. If so, remove them and put them back	2890	* Check to see if the player has any unpaid items. If so, remove them
2924	* in the map.	2891	* and put them back in the map.
2925	*/	2892	*/
2926
2927	if (is_in_shop (op))
2928	remove_unpaid_objects (op->inv, op);	2893	remove_unpaid_objects (op->inv, op);
2929		2894
2930	/****************************************/	2895	/****************************************/
2931	/* */	2896	/* */
2932	/* Move player to his current respawn- */	2897	/* Move player to his current respawn- */
2933	/* position (usually last savebed) */	2898	/* position (usually last savebed) */
…		…
2973	void	2938	void
2974	loot_object (object *op)	2939	loot_object (object *op)
2975	{ /* Grab and destroy some treasure */	2940	{ /* Grab and destroy some treasure */
2976	object tmp, tmp2, *next;	2941	object tmp, tmp2, *next;
2977		2942
2978	if (op->container)	2943	op->close_container (); /* close open sack first */
2979	esrv_apply_container (op, op->container); /* close open sack first */
2980		2944
2981	for (tmp = op->inv; tmp; tmp = next)	2945	for (tmp = op->inv; tmp; tmp = next)
2982	{	2946	{
2983	next = tmp->below;	2947	next = tmp->below;
2984		2948
2985	if (tmp->invisible)	2949	if (tmp->invisible)
2986	continue;	2950	continue;
2987		2951
2988	tmp->remove ();	2952	tmp->remove ();
2989	tmp->x = op->x, tmp->y = op->y;	2953	tmp->x = op->x, tmp->y = op->y;
		2954
2990	if (tmp->type == CONTAINER)	2955	if (tmp->type == CONTAINER)
2991	{ /* empty container to ground */	2956	loot_object (tmp); /* empty container to ground */
2992	loot_object (tmp);	2957
2993	}
2994	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(RANDOM () % 3)))	2958	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))
2995	{	2959	{
2996	if (tmp->nrof > 1)	2960	if (tmp->nrof > 1)
2997	{	2961	{
2998	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2962	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2999	tmp2->destroy ();	2963	tmp2->destroy ();
…		…
3010	/*	2974	/*
3011	* fix_weight(): Check recursively the weight of all players, and fix	2975	* fix_weight(): Check recursively the weight of all players, and fix
3012	* what needs to be fixed. Refresh windows and fix speed if anything	2976	* what needs to be fixed. Refresh windows and fix speed if anything
3013	* was changed.	2977	* was changed.
3014	*/	2978	*/
3015
3016	void	2979	void
3017	fix_weight (void)	2980	fix_weight (void)
3018	{	2981	{
3019	for_all_players (pl)	2982	for_all_players (pl)
3020	{	2983	{
…		…
3080	if (op->type == PLAYER)	3043	if (op->type == PLAYER)
3081	{	3044	{
3082	op->contr->tmp_invis = 0;	3045	op->contr->tmp_invis = 0;
3083	op->contr->invis_race = 0;	3046	op->contr->invis_race = 0;
3084	}	3047	}
		3048
3085	update_object (op, UP_OBJ_FACE);	3049	update_object (op, UP_OBJ_CHANGE);
3086	}	3050	}
3087		3051
3088	int	3052	int
3089	is_true_undead (object *op)	3053	is_true_undead (object *op)
3090	{	3054	{
3091	object *tmp = NULL;
3092
3093	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3055	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3094	return 1;	3056	return 1;
3095		3057
3096	return 0;	3058	return 0;
3097	}	3059	}
…		…
3385	char buf[MAX_BUF]; /* tmp. string buffer */	3347	char buf[MAX_BUF]; /* tmp. string buffer */
3386	int i = 0, j = 0;	3348	int i = 0, j = 0;
3387		3349
3388	/* get the appropriate treasurelist */	3350	/* get the appropriate treasurelist */
3389	if (atnr == ATNR_FIRE)	3351	if (atnr == ATNR_FIRE)
3390	trlist = find_treasurelist ("dragon_ability_fire");	3352	trlist = treasurelist::find ("dragon_ability_fire");
3391	else if (atnr == ATNR_COLD)	3353	else if (atnr == ATNR_COLD)
3392	trlist = find_treasurelist ("dragon_ability_cold");	3354	trlist = treasurelist::find ("dragon_ability_cold");
3393	else if (atnr == ATNR_ELECTRICITY)	3355	else if (atnr == ATNR_ELECTRICITY)
3394	trlist = find_treasurelist ("dragon_ability_elec");	3356	trlist = treasurelist::find ("dragon_ability_elec");
3395	else if (atnr == ATNR_POISON)	3357	else if (atnr == ATNR_POISON)
3396	trlist = find_treasurelist ("dragon_ability_poison");	3358	trlist = treasurelist::find ("dragon_ability_poison");
3397		3359
3398	if (trlist == NULL \|\| who->type != PLAYER)	3360	if (trlist == NULL \|\| who->type != PLAYER)
3399	return;	3361	return;
3400		3362
3401	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3363	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3533	* not readied.	3495	* not readied.
3534	*/	3496	*/
3535	void	3497	void
3536	player_unready_range_ob (player pl, object ob)	3498	player_unready_range_ob (player pl, object ob)
3537	{	3499	{
3538	rangetype i;
3539
3540	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3500	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3541	{
3542	if (pl->ranges[i] == ob)	3501	if (pl->ranges[i] == ob)
3543	{	3502	{
3544	pl->ranges[i] = NULL;	3503	pl->ranges[i] = 0;
3545	if (pl->shoottype == i)	3504	if (pl->shoottype == i)
3546	{
3547	pl->shoottype = range_none;	3505	pl->shoottype = range_none;
3548	}
3549	}	3506	}
3550	}
3551	}	3507	}
		3508
		3509	sint8
		3510	player::visibility_at (maptile *map, int x, int y) const
		3511	{
		3512	if (!ns)
		3513	return 0;
		3514
		3515	int dx, dy;
		3516	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3517	return 0;
		3518
		3519	x += dx - ns->current_x + ns->mapx / 2;
		3520	y += dy - ns->current_y + ns->mapy / 2;
		3521
		3522	if (!IN_RANGE_EXC (x, 0, ns->mapx) \|\| !IN_RANGE_EXC (y, 0, ns->mapy))
		3523	return 0;
		3524
		3525	return 100 - blocked_los [x][y];
		3526	}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.90 by root, Sun Jan 7 21:54:59 2007 UTC vs. Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.90 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC