[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.11 by root, Fri Sep 29 19:28:43 2006 UTC vs.
Revision 1.27 by root, Fri Dec 22 16:34:00 2006 UTC

…		…
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	#include <global.h>	24	#include <global.h>
25	#include <loader.h>	25	#include <loader.h>
26	#ifndef __CEXTRACT__
27	# include <sproto.h>	26	#include <sproto.h>
28	#endif	27
		28	#include <dirent.h>
29		29
30	extern weathermap_t **weathermap;	30	extern weathermap_t **weathermap;
31		31
32	/* Handles misc. input request - things like hash table, malloc, maps,	32	/* Handles misc. input request - things like hash table, malloc, maps,
33	* who, etc.	33	* who, etc.
…		…
36	void	36	void
37	map_info (object op, char search)	37	map_info (object op, char search)
38	{	38	{
39	maptile *m;	39	maptile *m;
40	char buf[MAX_BUF], map_path[MAX_BUF];	40	char buf[MAX_BUF], map_path[MAX_BUF];
41	long sec = seconds ();	41	long sec = time (0);
42		42
43	new_draw_info_format (NDI_UNIQUE, 0, op, "Current time is: %02ld:%02ld:%02ld.", (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);	43	new_draw_info_format (NDI_UNIQUE, 0, op, "Current time is: %02ld:%02ld:%02ld.", (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);
44	new_draw_info (NDI_UNIQUE, 0, op, "Path Pl PlM IM TO Dif Reset");	44	new_draw_info (NDI_UNIQUE, 0, op, "Path Pl PlM IM TO Dif Reset");
45	for (m = first_map; m != NULL; m = m->next)	45	for (m = first_map; m != NULL; m = m->next)
46	{	46	{
…		…
223	{	223	{
224	char namebuf[MAX_BUF];	224	char namebuf[MAX_BUF];
225	int login_order;	225	int login_order;
226	} chars_names;	226	} chars_names;
227		227
228	/local functon for qsort comparison/
229	static int
230	name_cmp (const chars_names * c1, const chars_names * c2)
231	{
232	return strcasecmp (c1->namebuf, c2->namebuf);
233	}
234
235	int	228	int
236	command_afk (object op, char params)	229	command_afk (object op, char params)
237	{	230	{
238	if QUERY_FLAG	231	if (QUERY_FLAG (op, FLAG_AFK))
239	(op, FLAG_AFK)
240	{	232	{
241	CLEAR_FLAG (op, FLAG_AFK);	233	CLEAR_FLAG (op, FLAG_AFK);
242	new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");	234	new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
243	}	235	}
244	else	236	else
245	{	237	{
246	SET_FLAG (op, FLAG_AFK);	238	SET_FLAG (op, FLAG_AFK);
247	new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");	239	new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
248	}	240	}
		241
249	return 1;	242	return 1;
250	}	243	}
251		244
252	int	245	int
253	command_mapinfo (object op, char params)	246	command_mapinfo (object op, char params)
…		…
453	int	446	int
454	command_dumpbelow (object op, char params)	447	command_dumpbelow (object op, char params)
455	{	448	{
456	if (op && op->below)	449	if (op && op->below)
457	{	450	{
458	dump_object (op->below);	451	char *dump = dump_object (op->below);
459	new_draw_info (NDI_UNIQUE, 0, op, errmsg);	452	new_draw_info (NDI_UNIQUE, 0, op, dump);
		453	free (dump);
460	/* Let's push that item on the dm's stack */	454	/* Let's push that item on the dm's stack */
461	dm_stack_push (op->contr, op->below->count);	455	dm_stack_push (op->contr, op->below->count);
462	}	456	}
463	return 0;	457	return 0;
464	}	458	}
465		459
466	int	460	int
467	command_wizpass (object op, char params)
468	{
469	int i;
470
471	if (!op)
472	return 0;
473
474	if (!params)
475	i = (QUERY_FLAG (op, FLAG_WIZPASS)) ? 0 : 1;
476	else
477	i = onoff_value (params);
478
479	if (i)
480	{
481	new_draw_info (NDI_UNIQUE, 0, op, "You will now walk through walls.\n");
482	SET_FLAG (op, FLAG_WIZPASS);
483	}
484	else
485	{
486	new_draw_info (NDI_UNIQUE, 0, op, "You will now be stopped by walls.\n");
487	CLEAR_FLAG (op, FLAG_WIZPASS);
488	}
489	return 0;
490	}
491
492	int
493	command_wizcast (object op, char params)
494	{
495	int i;
496
497	if (!op)
498	return 0;
499
500	if (!params)
501	i = (QUERY_FLAG (op, FLAG_WIZCAST)) ? 0 : 1;
502	else
503	i = onoff_value (params);
504
505	if (i)
506	{
507	new_draw_info (NDI_UNIQUE, 0, op, "You can now cast spells anywhere.");
508	SET_FLAG (op, FLAG_WIZCAST);
509	}
510	else
511	{
512	new_draw_info (NDI_UNIQUE, 0, op, "You now cannot cast spells in no-magic areas.");
513	CLEAR_FLAG (op, FLAG_WIZCAST);
514	}
515	return 0;
516	}
517
518	int
519	command_dumpallobjects (object op, char params)
520	{
521	dump_all_objects ();
522	return 0;
523	}
524
525	int
526	command_dumpfriendlyobjects (object op, char params)	461	command_dumpfriendlyobjects (object op, char params)
527	{	462	{
528	dump_friendly_objects ();	463	dump_friendly_objects ();
529	return 0;
530	}
531
532	int
533	command_dumpallarchetypes (object op, char params)
534	{
535	dump_all_archetypes ();
536	return 0;	464	return 0;
537	}	465	}
538		466
539	int	467	int
540	command_dumpmap (object op, char params)	468	command_dumpmap (object op, char params)
…		…
654	int	582	int
655	command_statistics (object pl, char params)	583	command_statistics (object pl, char params)
656	{	584	{
657	if (!pl->contr)	585	if (!pl->contr)
658	return 1;	586	return 1;
659	#ifndef WIN32
660	new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %lld", pl->stats.exp);
661	new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
662	#else
663	new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %I64d", pl->stats.exp);	587	new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %" PRId64, pl->stats.exp);
664	new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %I64d", level_exp (pl->level + 1, pl->expmul));	588	new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %" PRId64, level_exp (pl->level + 1, pl->expmul));
665	#endif
666	new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");	589	new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
667		590
668	new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",	591	new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
669	pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str);	592	pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str);
670	new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",	593	new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
…		…
687		610
688	int	611	int
689	command_fix_me (object op, char params)	612	command_fix_me (object op, char params)
690	{	613	{
691	sum_weight (op);	614	sum_weight (op);
692	fix_player (op);	615	op->update_stats ();
693	return 1;	616	return 1;
694	}	617	}
695		618
696	int	619	int
697	command_players (object op, char paramss)	620	command_players (object op, char paramss)
…		…
704	t = buf + strlen (buf);	627	t = buf + strlen (buf);
705	if ((Dir = opendir (buf)) != NULL)	628	if ((Dir = opendir (buf)) != NULL)
706	{	629	{
707	const struct dirent *Entry;	630	const struct dirent *Entry;
708		631
709	while ((Entry = readdir (Dir)) != NULL)	632	while ((Entry = readdir (Dir)))
710	{	633	{
711	/* skip '.' , '..' */	634	/* skip '.' , '..' */
712	if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') \|\|	635	if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') \|\|
713	(Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))	636	(Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
714	{	637	{
…		…
862	for (obl = first_friendly_object; obl != NULL; obl = next)	785	for (obl = first_friendly_object; obl != NULL; obl = next)
863	{	786	{
864	object *ob = obl->ob;	787	object *ob = obl->ob;
865		788
866	next = obl->next;	789	next = obl->next;
867	if (get_owner (ob) == op)	790	if (ob->owner == op)
868	{	791	{
869	if (target == 0)	792	if (target == 0)
870	{	793	{
871	if (counter == 0)	794	if (counter == 0)
872	new_draw_info (NDI_UNIQUE, 0, op, "Pets:");	795	new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
…		…
979	char filename[MAX_BUF], line[80];	902	char filename[MAX_BUF], line[80];
980	int namelen, linelen = 0;	903	int namelen, linelen = 0;
981		904
982	switch (what)	905	switch (what)
983	{	906	{
984	case 1:	907	case 1:
985	sprintf (filename, "%s/wizhelp", settings.datadir);	908	sprintf (filename, "%s/wizhelp", settings.datadir);
986	new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");	909	new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
987	break;	910	break;
988	case 3:	911	case 3:
989	sprintf (filename, "%s/mischelp", settings.datadir);	912	sprintf (filename, "%s/mischelp", settings.datadir);
990	new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");	913	new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
991	break;	914	break;
992	default:	915	default:
993	sprintf (filename, "%s/help", settings.datadir);	916	sprintf (filename, "%s/help", settings.datadir);
994	new_draw_info (NDI_UNIQUE, 0, op, " Commands:");	917	new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
995	break;	918	break;
996	}	919	}
		920
997	if (!(dirp = opendir (filename)))	921	if (!(dirp = opendir (filename)))
998	return;	922	return;
999		923
1000	line[0] = '\0';	924	line[0] = '\0';
1001	for (de = readdir (dirp); de; de = readdir (dirp))	925	while (de = readdir (dirp))
1002	{	926	{
1003	namelen = NAMLEN (de);	927	namelen = strlen (de->d_name);
1004	if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 \|\| de->d_name[1] == '.'))	928	if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 \|\| de->d_name[1] == '.'))
1005	continue;	929	continue;
1006	linelen += namelen + 1;	930	linelen += namelen + 1;
1007	if (linelen > 42)	931	if (linelen > 42)
1008	{	932	{
…		…
1223	}	1147	}
1224		1148
1225	int	1149	int
1226	command_real_quit (object op, char params)	1150	command_real_quit (object op, char params)
1227	{	1151	{
1228	send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");	1152	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1229		1153
1230	op->contr->state = ST_CONFIRM_QUIT;	1154	op->contr->ns->state = ST_CONFIRM_QUIT;
1231	return 1;	1155	return 1;
1232	}	1156	}
1233		1157
1234	/*	1158	/*
1235	* don't allow people to exit explore mode. It otherwise becomes	1159	* don't allow people to exit explore mode. It otherwise becomes
…		…
1259	}	1183	}
1260		1184
1261	int	1185	int
1262	command_sound (object op, char params)	1186	command_sound (object op, char params)
1263	{	1187	{
1264	if (op->contr->socket.sound)	1188	if (op->contr->ns->sound)
1265	{	1189	{
1266	op->contr->socket.sound = 0;	1190	op->contr->ns->sound = 0;
1267	new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");	1191	new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1268	}	1192	}
1269	else	1193	else
1270	{	1194	{
1271	op->contr->socket.sound = 1;	1195	op->contr->ns->sound = 1;
1272	new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");	1196	new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1273	}	1197	}
1274	return 1;
1275	}
1276		1198
1277	/* Perhaps these should be in player.c, but that file is
1278	* already a bit big.
1279	*/
1280
1281	void
1282	receive_player_name (object *op, char k)
1283	{
1284
1285	if (!check_name (op->contr, op->contr->write_buf + 1))
1286	{
1287	get_name (op);
1288	return;
1289	}
1290	op->name = op->contr->write_buf + 1;
1291	op->name_pl = op->contr->write_buf + 1;
1292	new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1293	op->contr->name_changed = 1;
1294	get_password (op);
1295	}
1296
1297	void
1298	receive_player_password (object *op, char k)
1299	{
1300
1301	unsigned int pwd_len = strlen (op->contr->write_buf);
1302
1303	if (pwd_len <= 1 \|\| pwd_len > 17)
1304	{
1305	get_name (op);
1306	return;
1307	}
1308	new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1309
1310	if (checkbanned (op->name, op->contr->socket.host))
1311	{
1312	LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1313	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, op, "You are not allowed to play.");
1314	get_name (op);
1315	return;
1316	}
1317
1318	if (op->contr->state == ST_CONFIRM_PASSWORD)
1319	{
1320	if (!check_password (op->contr->write_buf + 1, op->contr->password))
1321	{
1322	new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1323	get_name (op);
1324	return;
1325	}
1326	clear_win_info (op);
1327	display_motd (op);
1328	new_draw_info (NDI_UNIQUE, 0, op, " ");
1329	new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1330	new_draw_info (NDI_UNIQUE, 0, op, " ");
1331	Roll_Again (op);
1332	op->contr->state = ST_ROLL_STAT;
1333	return;
1334	}
1335	strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1336	op->contr->state = ST_ROLL_STAT;
1337	check_login (op);
1338	return;	1199	return 1;
1339	}	1200	}
1340
1341		1201
1342	int	1202	int
1343	explore_mode (void)	1203	explore_mode (void)
1344	{	1204	{
1345	player *pl;	1205	player *pl;
…		…
1350	if (pl->explore)	1210	if (pl->explore)
1351	return 1;	1211	return 1;
1352	}	1212	}
1353	return 0;	1213	return 0;
1354	}	1214	}
1355
1356		1215
1357	int	1216	int
1358	command_title (object op, char params)	1217	command_title (object op, char params)
1359	{	1218	{
1360	char buf[MAX_BUF];	1219	char buf[MAX_BUF];
…		…
1401	}	1260	}
1402		1261
1403	int	1262	int
1404	command_save (object op, char params)	1263	command_save (object op, char params)
1405	{	1264	{
1406	// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1407	// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1408	// } else
1409	if (!op->stats.exp)	1265	if (!op->stats.exp)
1410	{
1411	new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");	1266	new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
		1267	else
1412	}	1268	{
1413	else	1269	op->contr->save ();
1414	{
1415	if (save_player (op, 1))
1416	new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");	1270	new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1417	else
1418	new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1419	}	1271	}
1420	return 1;
1421	}
1422		1272
		1273	return 1;
		1274	}
1423		1275
1424	int	1276	int
1425	command_peaceful (object op, char params)	1277	command_peaceful (object op, char params)
1426	{	1278	{
1427	new_draw_info (NDI_UNIQUE, 0, op,	1279	new_draw_info (NDI_UNIQUE, 0, op,
…		…
1436	new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");	1288	new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1437	*/	1289	*/
1438	return 1;	1290	return 1;
1439	}	1291	}
1440		1292
1441
1442
1443	int	1293	int
1444	command_wimpy (object op, char params)	1294	command_wimpy (object op, char params)
1445	{	1295	{
1446	int i;	1296	int i;
1447	char buf[MAX_BUF];	1297	char buf[MAX_BUF];
…		…
1456	new_draw_info (NDI_UNIQUE, 0, op, buf);	1306	new_draw_info (NDI_UNIQUE, 0, op, buf);
1457	op->run_away = i;	1307	op->run_away = i;
1458	return 1;	1308	return 1;
1459	}	1309	}
1460		1310
1461
1462	int	1311	int
1463	command_brace (object op, char params)	1312	command_brace (object op, char params)
1464	{	1313	{
1465	if (!params)	1314	if (!params)
1466	op->contr->braced = !op->contr->braced;	1315	op->contr->braced = !op->contr->braced;
…		…
1470	if (op->contr->braced)	1319	if (op->contr->braced)
1471	new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");	1320	new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1472	else	1321	else
1473	new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");	1322	new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1474		1323
1475	fix_player (op);	1324	op->update_stats ();
1476	return 0;	1325	return 0;
1477	}	1326	}
1478		1327
1479	int	1328	int
1480	command_style_map_info (object op, char params)	1329	command_style_map_info (object op, char params)
…		…
1485	object *tmp;	1334	object *tmp;
1486		1335
1487	for (mp = styles; mp != NULL; mp = mp->next)	1336	for (mp = styles; mp != NULL; mp = mp->next)
1488	{	1337	{
1489	maps_used++;	1338	maps_used++;
1490	mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile);	1339	mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile);
1491	for (x = 0; x < MAP_WIDTH (mp); x++)	1340	for (x = 0; x < MAP_WIDTH (mp); x++)
1492	{	1341	{
1493	for (y = 0; y < MAP_HEIGHT (mp); y++)	1342	for (y = 0; y < MAP_HEIGHT (mp); y++)
1494	{	1343	{
1495	for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above)	1344	for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
1496	objects_used++;	1345	objects_used++;
1497	}	1346	}
1498	}	1347	}
1499	}	1348	}
1500	new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);	1349	new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
…		…
1523	for (obl = first_friendly_object; obl != NULL; obl = next)	1372	for (obl = first_friendly_object; obl != NULL; obl = next)
1524	{	1373	{
1525	object *ob = obl->ob;	1374	object *ob = obl->ob;
1526		1375
1527	next = obl->next;	1376	next = obl->next;
1528	if (get_owner (ob) == op)	1377	if (ob->owner == op)
1529	if (++counter == target \|\| (target == 0 && !strcasecmp (ob->name, params)))	1378	if (++counter == target \|\| (target == 0 && !strcasecmp (ob->name, params)))
1530	{	1379	{
1531	if (!QUERY_FLAG (ob, FLAG_REMOVED))
1532	remove_ob (ob);
1533	remove_friendly_object (ob);
1534	free_object (ob);	1380	ob->destroy ();
1535	removecount++;	1381	removecount++;
1536	}	1382	}
1537	}	1383	}
1538	if (removecount != 0)	1384	if (removecount != 0)
1539	new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);	1385	new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);

Diff Legend

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

Comparing deliantra/server/server/c_misc.C (file contents): Revision 1.11 by root, Fri Sep 29 19:28:43 2006 UTC vs. Revision 1.27 by root, Fri Dec 22 16:34:00 2006 UTC

Diff Legend

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.11 by root, Fri Sep 29 19:28:43 2006 UTC vs.
Revision 1.27 by root, Fri Dec 22 16:34:00 2006 UTC