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

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.13 by root, Mon Oct 2 00:22:01 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_dumpallobjects (object op, char params)
468	{
469	dump_all_objects ();
470	return 0;
471	}
472
473	int
474	command_dumpfriendlyobjects (object op, char params)	461	command_dumpfriendlyobjects (object op, char params)
475	{	462	{
476	dump_friendly_objects ();	463	dump_friendly_objects ();
477	return 0;
478	}
479
480	int
481	command_dumpallarchetypes (object op, char params)
482	{
483	dump_all_archetypes ();
484	return 0;	464	return 0;
485	}	465	}
486		466
487	int	467	int
488	command_dumpmap (object op, char params)	468	command_dumpmap (object op, char params)
…		…
602	int	582	int
603	command_statistics (object pl, char params)	583	command_statistics (object pl, char params)
604	{	584	{
605	if (!pl->contr)	585	if (!pl->contr)
606	return 1;	586	return 1;
607	#ifndef WIN32
608	new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %lld", pl->stats.exp);
609	new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
610	#else
611	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);
612	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));
613	#endif
614	new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");	589	new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
615		590
616	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",
617	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);
618	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",
…		…
635		610
636	int	611	int
637	command_fix_me (object op, char params)	612	command_fix_me (object op, char params)
638	{	613	{
639	sum_weight (op);	614	sum_weight (op);
640	fix_player (op);	615	op->update_stats ();
641	return 1;	616	return 1;
642	}	617	}
643		618
644	int	619	int
645	command_players (object op, char paramss)	620	command_players (object op, char paramss)
…		…
652	t = buf + strlen (buf);	627	t = buf + strlen (buf);
653	if ((Dir = opendir (buf)) != NULL)	628	if ((Dir = opendir (buf)) != NULL)
654	{	629	{
655	const struct dirent *Entry;	630	const struct dirent *Entry;
656		631
657	while ((Entry = readdir (Dir)) != NULL)	632	while ((Entry = readdir (Dir)))
658	{	633	{
659	/* skip '.' , '..' */	634	/* skip '.' , '..' */
660	if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') \|\|	635	if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') \|\|
661	(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')))
662	{	637	{
…		…
810	for (obl = first_friendly_object; obl != NULL; obl = next)	785	for (obl = first_friendly_object; obl != NULL; obl = next)
811	{	786	{
812	object *ob = obl->ob;	787	object *ob = obl->ob;
813		788
814	next = obl->next;	789	next = obl->next;
815	if (get_owner (ob) == op)	790	if (ob->owner == op)
816	{	791	{
817	if (target == 0)	792	if (target == 0)
818	{	793	{
819	if (counter == 0)	794	if (counter == 0)
820	new_draw_info (NDI_UNIQUE, 0, op, "Pets:");	795	new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
…		…
927	char filename[MAX_BUF], line[80];	902	char filename[MAX_BUF], line[80];
928	int namelen, linelen = 0;	903	int namelen, linelen = 0;
929		904
930	switch (what)	905	switch (what)
931	{	906	{
932	case 1:	907	case 1:
933	sprintf (filename, "%s/wizhelp", settings.datadir);	908	sprintf (filename, "%s/wizhelp", settings.datadir);
934	new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");	909	new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
935	break;	910	break;
936	case 3:	911	case 3:
937	sprintf (filename, "%s/mischelp", settings.datadir);	912	sprintf (filename, "%s/mischelp", settings.datadir);
938	new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");	913	new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
939	break;	914	break;
940	default:	915	default:
941	sprintf (filename, "%s/help", settings.datadir);	916	sprintf (filename, "%s/help", settings.datadir);
942	new_draw_info (NDI_UNIQUE, 0, op, " Commands:");	917	new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
943	break;	918	break;
944	}	919	}
		920
945	if (!(dirp = opendir (filename)))	921	if (!(dirp = opendir (filename)))
946	return;	922	return;
947		923
948	line[0] = '\0';	924	line[0] = '\0';
949	for (de = readdir (dirp); de; de = readdir (dirp))	925	while (de = readdir (dirp))
950	{	926	{
951	namelen = NAMLEN (de);	927	namelen = strlen (de->d_name);
952	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] == '.'))
953	continue;	929	continue;
954	linelen += namelen + 1;	930	linelen += namelen + 1;
955	if (linelen > 42)	931	if (linelen > 42)
956	{	932	{
…		…
1171	}	1147	}
1172		1148
1173	int	1149	int
1174	command_real_quit (object op, char params)	1150	command_real_quit (object op, char params)
1175	{	1151	{
1176	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):");
1177		1153
1178	op->contr->state = ST_CONFIRM_QUIT;	1154	op->contr->ns->state = ST_CONFIRM_QUIT;
1179	return 1;	1155	return 1;
1180	}	1156	}
1181		1157
1182	/*	1158	/*
1183	* don't allow people to exit explore mode. It otherwise becomes	1159	* don't allow people to exit explore mode. It otherwise becomes
…		…
1207	}	1183	}
1208		1184
1209	int	1185	int
1210	command_sound (object op, char params)	1186	command_sound (object op, char params)
1211	{	1187	{
1212	if (op->contr->socket.sound)	1188	if (op->contr->ns->sound)
1213	{	1189	{
1214	op->contr->socket.sound = 0;	1190	op->contr->ns->sound = 0;
1215	new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");	1191	new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1216	}	1192	}
1217	else	1193	else
1218	{	1194	{
1219	op->contr->socket.sound = 1;	1195	op->contr->ns->sound = 1;
1220	new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");	1196	new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1221	}	1197	}
1222	return 1;
1223	}
1224		1198
1225	/* Perhaps these should be in player.c, but that file is
1226	* already a bit big.
1227	*/
1228
1229	void
1230	receive_player_name (object *op, char k)
1231	{
1232
1233	if (!check_name (op->contr, op->contr->write_buf + 1))
1234	{
1235	get_name (op);
1236	return;
1237	}
1238	op->name = op->contr->write_buf + 1;
1239	op->name_pl = op->contr->write_buf + 1;
1240	new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1241	op->contr->name_changed = 1;
1242	get_password (op);
1243	}
1244
1245	void
1246	receive_player_password (object *op, char k)
1247	{
1248
1249	unsigned int pwd_len = strlen (op->contr->write_buf);
1250
1251	if (pwd_len <= 1 \|\| pwd_len > 17)
1252	{
1253	get_name (op);
1254	return;
1255	}
1256	new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1257
1258	if (checkbanned (op->name, op->contr->socket.host))
1259	{
1260	LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1261	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, op, "You are not allowed to play.");
1262	get_name (op);
1263	return;
1264	}
1265
1266	if (op->contr->state == ST_CONFIRM_PASSWORD)
1267	{
1268	if (!check_password (op->contr->write_buf + 1, op->contr->password))
1269	{
1270	new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1271	get_name (op);
1272	return;
1273	}
1274	clear_win_info (op);
1275	display_motd (op);
1276	new_draw_info (NDI_UNIQUE, 0, op, " ");
1277	new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1278	new_draw_info (NDI_UNIQUE, 0, op, " ");
1279	Roll_Again (op);
1280	op->contr->state = ST_ROLL_STAT;
1281	return;
1282	}
1283	strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1284	op->contr->state = ST_ROLL_STAT;
1285	check_login (op);
1286	return;	1199	return 1;
1287	}	1200	}
1288
1289		1201
1290	int	1202	int
1291	explore_mode (void)	1203	explore_mode (void)
1292	{	1204	{
1293	player *pl;	1205	player *pl;
…		…
1298	if (pl->explore)	1210	if (pl->explore)
1299	return 1;	1211	return 1;
1300	}	1212	}
1301	return 0;	1213	return 0;
1302	}	1214	}
1303
1304		1215
1305	int	1216	int
1306	command_title (object op, char params)	1217	command_title (object op, char params)
1307	{	1218	{
1308	char buf[MAX_BUF];	1219	char buf[MAX_BUF];
…		…
1349	}	1260	}
1350		1261
1351	int	1262	int
1352	command_save (object op, char params)	1263	command_save (object op, char params)
1353	{	1264	{
1354	// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1355	// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1356	// } else
1357	if (!op->stats.exp)	1265	if (!op->stats.exp)
1358	{
1359	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
1360	}	1268	{
1361	else	1269	op->contr->save ();
1362	{
1363	if (save_player (op, 1))
1364	new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");	1270	new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1365	else
1366	new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1367	}	1271	}
1368	return 1;
1369	}
1370		1272
		1273	return 1;
		1274	}
1371		1275
1372	int	1276	int
1373	command_peaceful (object op, char params)	1277	command_peaceful (object op, char params)
1374	{	1278	{
1375	new_draw_info (NDI_UNIQUE, 0, op,	1279	new_draw_info (NDI_UNIQUE, 0, op,
…		…
1384	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.");
1385	*/	1289	*/
1386	return 1;	1290	return 1;
1387	}	1291	}
1388		1292
1389
1390
1391	int	1293	int
1392	command_wimpy (object op, char params)	1294	command_wimpy (object op, char params)
1393	{	1295	{
1394	int i;	1296	int i;
1395	char buf[MAX_BUF];	1297	char buf[MAX_BUF];
…		…
1404	new_draw_info (NDI_UNIQUE, 0, op, buf);	1306	new_draw_info (NDI_UNIQUE, 0, op, buf);
1405	op->run_away = i;	1307	op->run_away = i;
1406	return 1;	1308	return 1;
1407	}	1309	}
1408		1310
1409
1410	int	1311	int
1411	command_brace (object op, char params)	1312	command_brace (object op, char params)
1412	{	1313	{
1413	if (!params)	1314	if (!params)
1414	op->contr->braced = !op->contr->braced;	1315	op->contr->braced = !op->contr->braced;
…		…
1418	if (op->contr->braced)	1319	if (op->contr->braced)
1419	new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");	1320	new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1420	else	1321	else
1421	new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");	1322	new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1422		1323
1423	fix_player (op);	1324	op->update_stats ();
1424	return 0;	1325	return 0;
1425	}	1326	}
1426		1327
1427	int	1328	int
1428	command_style_map_info (object op, char params)	1329	command_style_map_info (object op, char params)
…		…
1433	object *tmp;	1334	object *tmp;
1434		1335
1435	for (mp = styles; mp != NULL; mp = mp->next)	1336	for (mp = styles; mp != NULL; mp = mp->next)
1436	{	1337	{
1437	maps_used++;	1338	maps_used++;
1438	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);
1439	for (x = 0; x < MAP_WIDTH (mp); x++)	1340	for (x = 0; x < MAP_WIDTH (mp); x++)
1440	{	1341	{
1441	for (y = 0; y < MAP_HEIGHT (mp); y++)	1342	for (y = 0; y < MAP_HEIGHT (mp); y++)
1442	{	1343	{
1443	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)
1444	objects_used++;	1345	objects_used++;
1445	}	1346	}
1446	}	1347	}
1447	}	1348	}
1448	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);
…		…
1471	for (obl = first_friendly_object; obl != NULL; obl = next)	1372	for (obl = first_friendly_object; obl != NULL; obl = next)
1472	{	1373	{
1473	object *ob = obl->ob;	1374	object *ob = obl->ob;
1474		1375
1475	next = obl->next;	1376	next = obl->next;
1476	if (get_owner (ob) == op)	1377	if (ob->owner == op)
1477	if (++counter == target \|\| (target == 0 && !strcasecmp (ob->name, params)))	1378	if (++counter == target \|\| (target == 0 && !strcasecmp (ob->name, params)))
1478	{	1379	{
1479	if (!QUERY_FLAG (ob, FLAG_REMOVED))
1480	remove_ob (ob);
1481	remove_friendly_object (ob);
1482	free_object (ob);	1380	ob->destroy ();
1483	removecount++;	1381	removecount++;
1484	}	1382	}
1485	}	1383	}
1486	if (removecount != 0)	1384	if (removecount != 0)
1487	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.13 by root, Mon Oct 2 00:22:01 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.13 by root, Mon Oct 2 00:22:01 2006 UTC vs.
Revision 1.27 by root, Fri Dec 22 16:34:00 2006 UTC