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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.44 by root, Sat Dec 16 03:21:08 2006 UTC vs.
Revision 1.52 by root, Thu Dec 21 23:37:06 2006 UTC

…		…
244	op->direction = 5; /* So player faces south */	244	op->direction = 5; /* So player faces south */
245	op->stats.wc = 2;	245	op->stats.wc = 2;
246	op->run_away = 25; /* Then we panick... */	246	op->run_away = 25; /* Then we panick... */
247		247
248	{	248	{
249	int oldmon = p->socket->monitor_spells; // what a hack	249	int oldmon = p->ns->monitor_spells; // what a hack
250	p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */	250	p->ns->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
251	roll_stats (op);	251	roll_stats (op);
252	p->socket->monitor_spells = oldmon;	252	p->ns->monitor_spells = oldmon;
253	}	253	}
254	p->state = ST_ROLL_STAT;	254	p->ns->state = ST_ROLL_STAT;
255	clear_los (op);	255	clear_los (op);
256		256
257	p->gen_sp_armour = 10;	257	p->gen_sp_armour = 10;
258	p->last_speed = -1;	258	p->last_speed = -1;
259	p->shoottype = range_none;	259	p->shoottype = range_none;
…		…
263	p->usekeys = containers;	263	p->usekeys = containers;
264	p->last_weapon_sp = -1;	264	p->last_weapon_sp = -1;
265	p->peaceful = 1; /* default peaceful */	265	p->peaceful = 1; /* default peaceful */
266	p->do_los = 1;	266	p->do_los = 1;
267	p->explore = 0;	267	p->explore = 0;
268	p->no_shout = 0; /* default can shout */
269		268
270	assign (p->title, op->arch->clone.name);	269	assign (p->title, op->arch->clone.name);
271	op->race = op->arch->clone.race;	270	op->race = op->arch->clone.race;
272		271
273	CLEAR_FLAG (op, FLAG_READY_SKILL);	272	CLEAR_FLAG (op, FLAG_READY_SKILL);
…		…
287	p->last_resist[i] = -1;	286	p->last_resist[i] = -1;
288		287
289	p->last_stats.exp = -1;	288	p->last_stats.exp = -1;
290	p->last_weight = (uint32) - 1;	289	p->last_weight = (uint32) - 1;
291		290
292	p->socket->update_look = 0;	291	p->ns->update_look = 0;
293	p->socket->look_position = 0;	292	p->ns->look_position = 0;
294		293
295	return p;	294	return p;
296	}	295	}
297		296
298	/* This loads the first map an puts the player on it. */	297	/* This loads the first map an puts the player on it. */
…		…
300	set_first_map (object *op)	299	set_first_map (object *op)
301	{	300	{
302	strcpy (op->contr->maplevel, first_map_path);	301	strcpy (op->contr->maplevel, first_map_path);
303	op->x = -1;	302	op->x = -1;
304	op->y = -1;	303	op->y = -1;
305	enter_exit (op, NULL);	304	enter_exit (op, 0);
306	}	305	}
307		306
308	/* Tries to add player on the connection passwd in ns.	307	/* Tries to add player on the connection passwd in ns.
309	* All we can really get in this is some settings like host and display	308	* All we can really get in this is some settings like host and display
310	* mode.	309	* mode.
…		…
313	int	312	int
314	add_player (client *ns)	313	add_player (client *ns)
315	{	314	{
316	player *p = new player;	315	player *p = new player;
317		316
318	p->socket = ns;	317	p->ns = ns;
319	ns->pl = p;	318	ns->pl = p;
320		319
321	p->next = first_player;	320	p->next = first_player;
322	first_player = p;	321	first_player = p;
323		322
…		…
328	CLEAR_FLAG (p->ob, FLAG_FRIENDLY);	327	CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
329	add_friendly_object (p->ob);	328	add_friendly_object (p->ob);
330	send_rules (p->ob);	329	send_rules (p->ob);
331	send_news (p->ob);	330	send_news (p->ob);
332	display_motd (p->ob);	331	display_motd (p->ob);
		332
333	get_name (p->ob);	333	get_name (p->ob);
334		334
335	return 0;	335	return 0;
336	}	336	}
337		337
…		…
349	{	349	{
350	if (at == NULL \|\| at->next == NULL)	350	if (at == NULL \|\| at->next == NULL)
351	at = first_archetype;	351	at = first_archetype;
352	else	352	else
353	at = at->next;	353	at = at->next;
		354
354	if (at->clone.type == PLAYER)	355	if (at->clone.type == PLAYER)
355	return at;	356	return at;
		357
356	if (at == start)	358	if (at == start)
357	{	359	{
358	LOG (llevError, "No Player archetypes\n");	360	LOG (llevError, "No Player archetypes\n");
359	exit (-1);	361	exit (-1);
360	}	362	}
361	}	363	}
362	}	364	}
363
364		365
365	object *	366	object *
366	get_nearest_player (object *mon)	367	get_nearest_player (object *mon)
367	{	368	{
368	object *op = NULL;	369	object *op = NULL;
…		…
697		698
698	void	699	void
699	get_name (object *op)	700	get_name (object *op)
700	{	701	{
701	op->contr->write_buf[0] = '\0';	702	op->contr->write_buf[0] = '\0';
702	op->contr->state = ST_GET_NAME;	703	op->contr->ns->state = ST_GET_NAME;
703	send_query (op->contr->socket, 0, "What is your name?\n:");	704	send_query (op->contr->ns, 0, "What is your name?\n:");
704	}	705	}
705		706
706	void	707	void
707	get_password (object *op)	708	get_password (object *op)
708	{	709	{
709	op->contr->write_buf[0] = '\0';	710	op->contr->write_buf[0] = '\0';
710	op->contr->state = ST_GET_PASSWORD;	711	op->contr->ns->state = ST_GET_PASSWORD;
711	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");	712	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is your password?\n:");
712	}	713	}
713		714
714	void	715	void
715	play_again (object *op)	716	play_again (object *op)
716	{	717	{
717	op->contr->state = ST_PLAY_AGAIN;	718	op->contr->ns->state = ST_PLAY_AGAIN;
718	op->chosen_skill = NULL;	719	op->chosen_skill = NULL;
719	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");	720	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
720	/* a bit of a hack, but there are various places early in th	721	/* a bit of a hack, but there are various places early in th
721	* player creation process that a user can quit (eg, roll	722	* player creation process that a user can quit (eg, roll
722	* stats) that isn't removing the player. Taking a quick	723	* stats) that isn't removing the player. Taking a quick
723	* look, there are many places that call play_again without	724	* look, there are many places that call play_again without
724	* removing the player - it probably makes more sense	725	* removing the player - it probably makes more sense
725	* to leave it to play_again to remove the object in all	726	* to leave it to play_again to remove the object in all
726	* cases.	727	* cases.
727	*/	728	*/
728	if (!QUERY_FLAG (op, FLAG_REMOVED))	729	if (!QUERY_FLAG (op, FLAG_REMOVED))
729	op->remove ();	730	op->remove ();
		731
730	/* Need to set this to null - otherwise, it could point to garbage,	732	/* Need to set this to null - otherwise, it could point to garbage,
731	* and draw() doesn't check to see if the player is removed, only if	733	* and draw() doesn't check to see if the player is removed, only if
732	* the map is null or not swapped out.	734	* the map is null or not swapped out.
733	*/	735	*/
734	op->map = NULL;	736	op->map = NULL;
…		…
772	void	774	void
773	confirm_password (object *op)	775	confirm_password (object *op)
774	{	776	{
775		777
776	op->contr->write_buf[0] = '\0';	778	op->contr->write_buf[0] = '\0';
777	op->contr->state = ST_CONFIRM_PASSWORD;	779	op->contr->ns->state = ST_CONFIRM_PASSWORD;
778	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");	780	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
779	}	781	}
780		782
781	void	783	void
782	get_party_password (object op, partylist party)	784	get_party_password (object op, partylist party)
783	{	785	{
…		…
785	{	787	{
786	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);	788	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
787	return;	789	return;
788	}	790	}
789	op->contr->write_buf[0] = '\0';	791	op->contr->write_buf[0] = '\0';
790	op->contr->state = ST_GET_PARTY_PASSWORD;	792	op->contr->ns->state = ST_GET_PARTY_PASSWORD;
791	op->contr->party_to_join = party;	793	op->contr->party_to_join = party;
792	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");	794	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
793	}	795	}
794		796
795		797
796	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	798	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
797	int	799	int
…		…
894		896
895	void	897	void
896	Roll_Again (object *op)	898	Roll_Again (object *op)
897	{	899	{
898	esrv_new_player (op->contr, 0);	900	esrv_new_player (op->contr, 0);
899	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,	901	send_query (op->contr->ns, CS_QUERY_SINGLECHAR,
900	"[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");	902	"[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
901	}	903	}
902		904
903	void	905	void
904	Swap_Stat (object *op, int Swap_Second)	906	Swap_Stat (object *op, int Swap_Second)
…		…
971	new_draw_info (NDI_UNIQUE, 0, op, buf);	973	new_draw_info (NDI_UNIQUE, 0, op, buf);
972	}	974	}
973	else	975	else
974	Swap_Stat (op, stat_trans[keynum]);	976	Swap_Stat (op, stat_trans[keynum]);
975		977
976	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");	978	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "");
977	return 1;	979	return 1;
978	}	980	}
979	switch (key)	981	switch (key)
980	{	982	{
981	case 'n':	983	case 'n':
…		…
995	enter_exit (op, NULL);	997	enter_exit (op, NULL);
996	#endif	998	#endif
997	SET_ANIMATION (op, 2); /* So player faces south */	999	SET_ANIMATION (op, 2); /* So player faces south */
998	/* Enter exit adds a player otherwise */	1000	/* Enter exit adds a player otherwise */
999	add_statbonus (op);	1001	add_statbonus (op);
1000	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,	1002	send_query (op->contr->ns, CS_QUERY_SINGLECHAR,
1001	"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");	1003	"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1002	op->contr->state = ST_CHANGE_CLASS;	1004	op->contr->ns->state = ST_CHANGE_CLASS;
1003	if (op->msg)	1005	if (op->msg)
1004	new_draw_info (NDI_BLUE, 0, op, op->msg);	1006	new_draw_info (NDI_BLUE, 0, op, op->msg);
1005	return 0;	1007	return 0;
1006	}	1008	}
1007	case 'y':	1009	case 'y':
1008	case 'Y':	1010	case 'Y':
1009	roll_stats (op);	1011	roll_stats (op);
1010	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");	1012	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "");
1011	return 1;	1013	return 1;
1012		1014
1013	case 'q':	1015	case 'q':
1014	case 'Q':	1016	case 'Q':
1015	play_again (op);	1017	play_again (op);
1016	return 1;	1018	return 1;
1017		1019
1018	default:	1020	default:
1019	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");	1021	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1020	return 0;	1022	return 0;
1021	}	1023	}
1022	return 0;	1024	return 0;
1023	}	1025	}
1024		1026
…		…
1052	create_treasure (tl, op, 0, 0, 0);	1054	create_treasure (tl, op, 0, 0, 0);
1053		1055
1054	INVOKE_PLAYER (BIRTH, op->contr);	1056	INVOKE_PLAYER (BIRTH, op->contr);
1055	INVOKE_PLAYER (LOGIN, op->contr);	1057	INVOKE_PLAYER (LOGIN, op->contr);
1056		1058
1057	op->contr->state = ST_PLAYING;	1059	op->contr->ns->state = ST_PLAYING;
1058		1060
1059	if (op->msg)	1061	if (op->msg)
1060	op->msg = NULL;	1062	op->msg = NULL;
1061		1063
1062	/* We create this now because some of the unique maps will need it	1064	/* We create this now because some of the unique maps will need it
…		…
1092	* if the map isn't there, then stay on the	1094	* if the map isn't there, then stay on the
1093	* default initial map */	1095	* default initial map */
1094	tmp->destroy ();	1096	tmp->destroy ();
1095	}	1097	}
1096	else	1098	else
1097	{
1098	LOG (llevDebug, "first_map_ext_path not set\n");	1099	LOG (llevDebug, "first_map_ext_path not set\n");
1099	}	1100
1100	return 0;	1101	return 0;
1101	}	1102	}
1102		1103
1103	/* Following actually changes the race - this is the default command	1104	/* Following actually changes the race - this is the default command
1104	* if we don't match with one of the options above.	1105	* if we don't match with one of the options above.
…		…
1134	op->stats.grace = 0;	1135	op->stats.grace = 0;
1135		1136
1136	if (op->msg)	1137	if (op->msg)
1137	new_draw_info (NDI_BLUE, 0, op, op->msg);	1138	new_draw_info (NDI_BLUE, 0, op, op->msg);
1138		1139
1139	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");	1140	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1140	return 0;	1141	return 0;
1141	}	1142	}
1142		1143
1143	int	1144	int
1144	key_confirm_quit (object *op, char key)	1145	key_confirm_quit (object *op, char key)
1145	{	1146	{
1146	char buf[MAX_BUF];	1147	char buf[MAX_BUF];
1147		1148
1148	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')	1149	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1149	{	1150	{
1150	op->contr->state = ST_PLAYING;	1151	op->contr->ns->state = ST_PLAYING;
1151	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");	1152	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1152	return 1;	1153	return 1;
1153	}	1154	}
1154		1155
1155	INVOKE_PLAYER (LOGOUT, op->contr);	1156	INVOKE_PLAYER (LOGOUT, op->contr);
…		…
1224	{	1225	{
1225	op->enemy = NULL;	1226	op->enemy = NULL;
1226	CLEAR_FLAG (op, FLAG_SCARED);	1227	CLEAR_FLAG (op, FLAG_SCARED);
1227	return;	1228	return;
1228	}	1229	}
		1230
1229	get_rangevector (op, op->enemy, &rv, 0);	1231	get_rangevector (op, op->enemy, &rv, 0);
1230		1232
1231	dir = absdir (4 + rv.direction);	1233	dir = absdir (4 + rv.direction);
1232	for (diff = 0; diff < 3; diff++)	1234	for (diff = 0; diff < 3; diff++)
1233	{	1235	{
1234	int m = 1 - (RANDOM () & 2);	1236	int m = 1 - (RANDOM () & 2);
1235		1237
1236	if (move_ob (op, absdir (dir + diff * m), op) \|\| (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	1238	if (move_ob (op, absdir (dir + diff * m), op) \|\| (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1237	{
1238	return;	1239	return;
1239	}
1240	}	1240	}
		1241
1241	/* Cornered, get rid of scared */	1242	/* Cornered, get rid of scared */
1242	CLEAR_FLAG (op, FLAG_SCARED);	1243	CLEAR_FLAG (op, FLAG_SCARED);
1243	op->enemy = NULL;	1244	op->enemy = NULL;
1244	}	1245	}
1245		1246
…		…
1801	if (!dir)	1802	if (!dir)
1802	{	1803	{
1803	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1804	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1804	return 0;	1805	return 0;
1805	}	1806	}
		1807
1806	if (op->type == PLAYER)	1808	if (op->type == PLAYER)
1807	bow = op->contr->ranges[range_bow];	1809	bow = op->contr->ranges[range_bow];
1808	else	1810	else
1809	{	1811	{
1810	for (bow = op->inv; bow; bow = bow->below)	1812	for (bow = op->inv; bow; bow = bow->below)
…		…
1818	{	1820	{
1819	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1821	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1820	return 0;	1822	return 0;
1821	}	1823	}
1822	}	1824	}
		1825
1823	if (!bow->race \|\| !bow->skill)	1826	if (!bow->race \|\| !bow->skill)
1824	{	1827	{
1825	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1828	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1826	return 0;	1829	return 0;
1827	}	1830	}
…		…
1829	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];	1832	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1830		1833
1831	/* penalize ROF for bestarrow */	1834	/* penalize ROF for bestarrow */
1832	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)	1835	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1833	bowspeed -= dex_bonus[op->stats.Dex] + 5;	1836	bowspeed -= dex_bonus[op->stats.Dex] + 5;
		1837
1834	if (bowspeed < 1)	1838	if (bowspeed < 1)
1835	bowspeed = 1;	1839	bowspeed = 1;
1836		1840
1837	if (arrow == NULL)	1841	if (arrow == NULL)
1838	{	1842	{
…		…
1844	else	1848	else
1845	CLEAR_FLAG (op, FLAG_READY_BOW);	1849	CLEAR_FLAG (op, FLAG_READY_BOW);
1846	return 0;	1850	return 0;
1847	}	1851	}
1848	}	1852	}
		1853
1849	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1854	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1850	if (mflags & P_OUT_OF_MAP)	1855	if (mflags & P_OUT_OF_MAP)
1851	{
1852	return 0;	1856	return 0;
1853	}	1857
1854	if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)	1858	if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1855	{	1859	{
1856	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	1860	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1857	return 0;	1861	return 0;
1858	}	1862	}
…		…
1864	return 0;	1868	return 0;
1865	}	1869	}
1866		1870
1867	left = arrow; /* these are arrows left to the player */	1871	left = arrow; /* these are arrows left to the player */
1868	arrow = get_split_ob (arrow, 1);	1872	arrow = get_split_ob (arrow, 1);
1869	if (arrow == NULL)	1873	if (!arrow)
1870	{	1874	{
1871	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1875	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1872	return 0;	1876	return 0;
1873	}	1877	}
		1878
1874	arrow->set_owner (op);	1879	arrow->set_owner (op);
1875	arrow->skill = bow->skill;	1880	arrow->skill = bow->skill;
1876		1881
1877	arrow->direction = dir;	1882	arrow->direction = dir;
1878	arrow->x = sx;	1883	arrow->x = sx;
…		…
1921	}	1926	}
1922		1927
1923	if (arrow->attacktype == AT_PHYSICAL)	1928	if (arrow->attacktype == AT_PHYSICAL)
1924	arrow->attacktype \|= bow->attacktype;	1929	arrow->attacktype \|= bow->attacktype;
1925		1930
1926	if (bow->slaying != NULL)	1931	if (bow->slaying)
1927	arrow->slaying = bow->slaying;	1932	arrow->slaying = bow->slaying;
1928		1933
1929	arrow->map = m;	1934	arrow->map = m;
1930	arrow->move_type = MOVE_FLY_LOW;	1935	arrow->move_type = MOVE_FLY_LOW;
1931	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1936	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
…		…
2047	CLEAR_FLAG (item, FLAG_ANIMATE);	2052	CLEAR_FLAG (item, FLAG_ANIMATE);
2048	item->face = item->arch->clone.face;	2053	item->face = item->arch->clone.face;
2049	item->speed = 0;	2054	item->speed = 0;
2050	update_ob_speed (item);	2055	update_ob_speed (item);
2051	}	2056	}
2052	if ((tmp = is_player_inv (item)))	2057	if ((tmp = item->in_player ()))
2053	esrv_update_item (UPD_ANIM, tmp, item);	2058	esrv_update_item (UPD_ANIM, tmp, item);
2054	}	2059	}
2055	}	2060	}
2056	else if (item->type == ROD \|\| item->type == HORN)	2061	else if (item->type == ROD \|\| item->type == HORN)
2057	{	2062	{
…		…
2207	* 0 otherwise	2212	* 0 otherwise
2208	*/	2213	*/
2209	static int	2214	static int
2210	player_attack_door (object op, object door)	2215	player_attack_door (object op, object door)
2211	{	2216	{
2212
2213	/* If its a door, try to find a use a key. If we do destroy the door,	2217	/* If its a door, try to find a use a key. If we do destroy the door,
2214	* might as well return immediately as there is nothing more to do -	2218	* might as well return immediately as there is nothing more to do -
2215	* otherwise, we fall through to the rest of the code.	2219	* otherwise, we fall through to the rest of the code.
2216	*/	2220	*/
2217	object *key = find_key (op, op, door);	2221	object *key = find_key (op, op, door);
…		…
2255	* It should keep the code cleaner.	2259	* It should keep the code cleaner.
2256	* When this is called, the players direction has been updated	2260	* When this is called, the players direction has been updated
2257	* (taking into account confusion.) The player is also actually	2261	* (taking into account confusion.) The player is also actually
2258	* going to try and move (not fire weapons).	2262	* going to try and move (not fire weapons).
2259	*/	2263	*/
2260
2261	void	2264	void
2262	move_player_attack (object *op, int dir)	2265	move_player_attack (object *op, int dir)
2263	{	2266	{
2264	object tmp, mon;	2267	object tmp, mon;
2265	sint16 nx, ny;	2268	sint16 nx, ny;
…		…
2267	maptile *m;	2270	maptile *m;
2268		2271
2269	nx = freearr_x[dir] + op->x;	2272	nx = freearr_x[dir] + op->x;
2270	ny = freearr_y[dir] + op->y;	2273	ny = freearr_y[dir] + op->y;
2271		2274
2272	on_battleground = op_on_battleground (op, NULL, NULL);	2275	on_battleground = op_on_battleground (op, 0, 0);
2273		2276
2274	/* If braced, or can't move to the square, and it is not out of the	2277	/* If braced, or can't move to the square, and it is not out of the
2275	* map, attack it. Note order of if statement is important - don't	2278	* map, attack it. Note order of if statement is important - don't
2276	* want to be calling move_ob if braced, because move_ob will move the	2279	* want to be calling move_ob if braced, because move_ob will move the
2277	* player. This is a pretty nasty hack, because if we could	2280	* player. This is a pretty nasty hack, because if we could
…		…
2289	return; /* Don't think this should happen */	2292	return; /* Don't think this should happen */
2290	}	2293	}
2291	else	2294	else
2292	m = op->map;	2295	m = op->map;
2293		2296
2294	if ((tmp = get_map_ob (m, nx, ny)) == NULL)	2297	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2295	{	2298	{
2296	/* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */	2299	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2297	return;	2300	return;
2298	}	2301	}
2299		2302
2300	mon = NULL;	2303	mon = 0;
2301	/* Go through all the objects, and find ones of interest. Only stop if	2304	/* Go through all the objects, and find ones of interest. Only stop if
2302	* we find a monster - that is something we know we want to attack.	2305	* we find a monster - that is something we know we want to attack.
2303	* if its a door or barrel (can roll) see if there may be monsters	2306	* if its a door or barrel (can roll) see if there may be monsters
2304	* on the space	2307	* on the space
2305	*/	2308	*/
2306	while (tmp != NULL)	2309	while (tmp)
2307	{	2310	{
2308	if (tmp == op)	2311	if (tmp == op)
2309	{	2312	{
2310	tmp = tmp->above;	2313	tmp = tmp->above;
2311	continue;	2314	continue;
…		…
2321	mon = tmp;	2324	mon = tmp;
2322		2325
2323	tmp = tmp->above;	2326	tmp = tmp->above;
2324	}	2327	}
2325		2328
2326	if (mon == NULL) /* This happens anytime the player tries to move */	2329	if (!mon) /* This happens anytime the player tries to move */
2327	return; /* into a wall */	2330	return; /* into a wall */
2328		2331
2329	if (mon->head != NULL)	2332	if (mon->head)
2330	mon = mon->head;	2333	mon = mon->head;
2331		2334
2332	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2335	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
2333	if (player_attack_door (op, mon))	2336	if (player_attack_door (op, mon))
2334	return;	2337	return;
…		…
2371	* attack them either.	2374	* attack them either.
2372	*/	2375	*/
2373	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2376	if ((mon->type == PLAYER \|\| mon->enemy != op) &&
2374	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2377	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2375	#ifdef PROHIBIT_PLAYERKILL	2378	#ifdef PROHIBIT_PLAYERKILL
2376	(op->contr->peaceful	2379	(op->contr->peaceful
2377	\|\| (mon->type == PLAYER	2380	\|\| (mon->type == PLAYER
2378	&& mon->contr->	2381	&& mon->contr->
2379	peaceful)) &&	2382	peaceful)) &&
2380	#else	2383	#else
2381	op->contr->peaceful &&	2384	op->contr->peaceful &&
2382	#endif	2385	#endif
2383	!on_battleground))	2386	!on_battleground))
2384	{	2387	{
2385	if (!op->contr->braced)	2388	if (!op->contr->braced)
2386	{	2389	{
2387	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2390	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2388	(void) push_ob (mon, dir, op);	2391	(void) push_ob (mon, dir, op);
2389	}	2392	}
2390	else	2393	else
2391	{
2392	new_draw_info (0, 0, op, "You withhold your attack");	2394	new_draw_info (0, 0, op, "You withhold your attack");
2393	}	2395
2394	if (op->contr->tmp_invis \|\| op->hide)	2396	if (op->contr->tmp_invis \|\| op->hide)
2395	make_visible (op);	2397	make_visible (op);
2396	}	2398	}
2397		2399
2398	/* If the object is a boulder or other rollable object, then	2400	/* If the object is a boulder or other rollable object, then
…		…
2426	op->speed_left += op->speed / op->contr->weapon_sp;	2428	op->speed_left += op->speed / op->contr->weapon_sp;
2427		2429
2428	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */	2430	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2429	}	2431	}
2430		2432
2431	skill_attack (mon, op, 0, NULL, NULL);	2433	skill_attack (mon, op, 0, 0, 0);
2432		2434
2433	/* If attacking another player, that player gets automatic	2435	/* If attacking another player, that player gets automatic
2434	* hitback, and doesn't loose luck either.	2436	* hitback, and doesn't loose luck either.
2435	* Disable hitback on the battleground or if the target is	2437	* Disable hitback on the battleground or if the target is
2436	* the wiz.	2438	* the wiz.
…		…
2438	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))	2440	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2439	{	2441	{
2440	short luck = mon->stats.luck;	2442	short luck = mon->stats.luck;
2441		2443
2442	mon->contr->has_hit = 1;	2444	mon->contr->has_hit = 1;
2443	skill_attack (op, mon, 0, NULL, NULL);	2445	skill_attack (op, mon, 0, 0, 0);
2444	mon->stats.luck = luck;	2446	mon->stats.luck = luck;
2445	}	2447	}
		2448
2446	if (action_makes_visible (op))	2449	if (action_makes_visible (op))
2447	make_visible (op);	2450	make_visible (op);
2448	}	2451	}
2449	} /* if player should attack something */	2452	} /* if player should attack something */
2450	}	2453	}
…		…
2485		2488
2486	/* Add special check for newcs players and fire on - this way, the	2489	/* Add special check for newcs players and fire on - this way, the
2487	* server can handle repeat firing.	2490	* server can handle repeat firing.
2488	*/	2491	*/
2489	if (op->contr->fire_on \|\| (op->contr->run_on && pick != 0))	2492	if (op->contr->fire_on \|\| (op->contr->run_on && pick != 0))
2490	{
2491	op->direction = dir;	2493	op->direction = dir;
2492	}
2493	else	2494	else
2494	{
2495	op->direction = 0;	2495	op->direction = 0;
2496	}	2496
2497	/* Update how the player looks. Use the facing, so direction may	2497	/* Update how the player looks. Use the facing, so direction may
2498	* get reset to zero. This allows for full animation capabilities	2498	* get reset to zero. This allows for full animation capabilities
2499	* for players.	2499	* for players.
2500	*/	2500	*/
2501	animate_object (op, op->facing);	2501	animate_object (op, op->facing);
…		…
2553		2553
2554	/* call this here - we also will call this in do_ericserver, but	2554	/* call this here - we also will call this in do_ericserver, but
2555	* the players time has been increased when doericserver has been	2555	* the players time has been increased when doericserver has been
2556	* called, so we recheck it here.	2556	* called, so we recheck it here.
2557	*/	2557	*/
2558	op->contr->socket->handle_command ();	2558	//TODO: better than handling 8 commands, use some more intelligent rate-limiting
		2559	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
		2560	;
		2561
2559	if (op->speed_left < 0)	2562	if (op->speed_left < 0)
2560	return 0;	2563	return 0;
2561		2564
2562	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2565	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2563	{	2566	{
…		…
2708	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2711	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2709	if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2712	if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2710	flush_output_element (op, &op->contr->outputs[i]);	2713	flush_output_element (op, &op->contr->outputs[i]);
2711	}	2714	}
2712		2715
2713	if (op->contr->state == ST_PLAYING)	2716	if (op->contr->ns->state == ST_PLAYING)
2714	{	2717	{
2715		2718
2716	/* these next three if clauses make it possible to SLOW DOWN	2719	/* these next three if clauses make it possible to SLOW DOWN
2717	hp/grace/spellpoint regeneration. */	2720	hp/grace/spellpoint regeneration. */
2718	if (op->contr->gen_hp >= 0)	2721	if (op->contr->gen_hp >= 0)
…		…
2860	if (!QUERY_FLAG (op, FLAG_WIZ))	2863	if (!QUERY_FLAG (op, FLAG_WIZ))
2861	op->stats.food--;	2864	op->stats.food--;
2862	}	2865	}
2863	}	2866	}
2864		2867
2865	if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)	2868	if (op->contr->ns->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)
2866	{	2869	{
2867	object tmp, flesh = NULL;	2870	object tmp, flesh = NULL;
2868		2871
2869	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2872	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
2870	{	2873	{
…		…
2892	} /* end if player is starving */	2895	} /* end if player is starving */
2893		2896
2894	while (op->stats.food < 0 && op->stats.hp > 0)	2897	while (op->stats.food < 0 && op->stats.hp > 0)
2895	op->stats.food++, op->stats.hp--;	2898	op->stats.food++, op->stats.hp--;
2896		2899
2897	if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 \|\| op->stats.food < 0))	2900	if (!op->contr->ns->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 \|\| op->stats.food < 0))
2898	kill_player (op);	2901	kill_player (op);
2899	}	2902	}
2900		2903
2901		2904
2902		2905
…		…
3222	* at his savebed location, and that can have long lasting	3225	* at his savebed location, and that can have long lasting
3223	* spell effects. So first see if there is a spell effect	3226	* spell effects. So first see if there is a spell effect
3224	* on the space that might harm the player.	3227	* on the space that might harm the player.
3225	*/	3228	*/
3226	will_kill_again = 0;	3229	will_kill_again = 0;
3227	for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above)	3230	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3228	if (tmp->type == SPELL_EFFECT)	3231	if (tmp->type == SPELL_EFFECT)
3229	will_kill_again \|= tmp->attacktype;	3232	will_kill_again \|= tmp->attacktype;
3230		3233
3231	if (will_kill_again)	3234	if (will_kill_again)
3232	{	3235	{
…		…
3329	}	3332	}
3330		3333
3331	for (tmp = op->inv; tmp != NULL; tmp = next)	3334	for (tmp = op->inv; tmp != NULL; tmp = next)
3332	{	3335	{
3333	next = tmp->below;	3336	next = tmp->below;
3334	if (tmp->type == EXPERIENCE \|\| tmp->invisible)	3337	if (tmp->invisible)
3335	continue;	3338	continue;
3336	tmp->remove ();	3339	tmp->remove ();
3337	tmp->x = op->x, tmp->y = op->y;	3340	tmp->x = op->x, tmp->y = op->y;
3338	if (tmp->type == CONTAINER)	3341	if (tmp->type == CONTAINER)
3339	{ /* empty container to ground */	3342	{ /* empty container to ground */
…		…
3381	fix_luck (void)	3384	fix_luck (void)
3382	{	3385	{
3383	player *pl;	3386	player *pl;
3384		3387
3385	for (pl = first_player; pl != NULL; pl = pl->next)	3388	for (pl = first_player; pl != NULL; pl = pl->next)
3386	if (!pl->ob->contr->state)	3389	if (!pl->ob->contr->ns->state)
3387	change_luck (pl->ob, 0);	3390	change_luck (pl->ob, 0);
3388	}	3391	}
3389		3392
3390		3393
3391	/* cast_dust() - handles op throwing objects of type 'DUST'.	3394	/* cast_dust() - handles op throwing objects of type 'DUST'.
…		…
3445	object *tmp = NULL;	3448	object *tmp = NULL;
3446		3449
3447	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3450	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3448	return 1;	3451	return 1;
3449		3452
3450	if (op->type == PLAYER)
3451	for (tmp = op->inv; tmp; tmp = tmp->below)
3452	if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3453	if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3454	return 1;
3455	return 0;	3453	return 0;
3456	}	3454	}
3457		3455
3458	/* look at the surrounding terrain to determine	3456	/* look at the surrounding terrain to determine
3459	* the hideability of this object. Positive levels	3457	* the hideability of this object. Positive levels
…		…
3574	if (mflags & P_OUT_OF_MAP)	3572	if (mflags & P_OUT_OF_MAP)
3575	continue;	3573	continue;
3576	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	3574	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3577	continue;	3575	continue;
3578		3576
3579	for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above)	3577	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3580	{	3578	{
3581	if ((player \|\|friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	3579	if ((player \|\|friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3582	return 1;	3580	return 1;
3583	else if (tmp->type == PLAYER)	3581	else if (tmp->type == PLAYER)
3584	{	3582	{
…		…
3638		3636
3639	/* only the viewable area the player sees is updated by LOS	3637	/* only the viewable area the player sees is updated by LOS
3640	* code, so we need to restrict ourselves to that range of values	3638	* code, so we need to restrict ourselves to that range of values
3641	* for any meaningful values.	3639	* for any meaningful values.
3642	*/	3640	*/
3643	if (FABS (dx) <= (pl->contr->socket->mapx / 2) &&	3641	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3644	FABS (dy) <= (pl->contr->socket->mapy / 2) &&	3642	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3645	!pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)])	3643	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3646	return 1;	3644	return 1;
3647	op = op->more;	3645	op = op->more;
3648	}	3646	}
3649	return 0;	3647	return 0;
3650	}	3648	}
…		…
3836	{	3834	{
3837	/* forces in the treasurelist can alter the player's stats */	3835	/* forces in the treasurelist can alter the player's stats */
3838	object *skin;	3836	object *skin;
3839		3837
3840	/* first get the dragon skin force */	3838	/* first get the dragon skin force */
		3839	shstr_cmp dragon_skin_force ("dragon_skin_force");
3841	for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below);	3840	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
		3841	;
		3842
3842	if (skin == NULL)	3843	if (!skin)
3843	return;	3844	return;
3844		3845
3845	/* adding new spellpath attunements */	3846	/* adding new spellpath attunements */
3846	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))	3847	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3847	{	3848	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.44 by root, Sat Dec 16 03:21:08 2006 UTC vs. Revision 1.52 by root, Thu Dec 21 23:37:06 2006 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.44 by root, Sat Dec 16 03:21:08 2006 UTC vs.
Revision 1.52 by root, Thu Dec 21 23:37:06 2006 UTC