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

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.18 by root, Mon Dec 11 21:32:17 2006 UTC vs.
Revision 1.33 by root, Sat Dec 30 10:16:11 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
29		27
30	extern weathermap_t **weathermap;	28	#include <dirent.h>
31		29
32	/* Handles misc. input request - things like hash table, malloc, maps,	30	/* Handles misc. input request - things like hash table, malloc, maps,
33	* who, etc.	31	* who, etc.
34	*/	32	*/
35		33
		34	//TODO
		35	#if 0
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[31];
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)
46	{
47		45
		46	for (maps_container::iterator i = maps.begin (); i != maps.end (); ++i)
		47	{
		48	maptile *m = i->second;
		49
48	if (search && strstr (m->path, search) == NULL)	50	if (search && !strstr (m->path, search))
49	continue; /* Skip unwanted maps */	51	continue; /* Skip unwanted maps */
		52
50	/* Print out the last 18 characters of the map name... */	53	/* Print out the last 30 characters of the map name... */
51	if (strlen (m->path) <= 18)
52	strcpy (map_path, m->path);
53	else
54	strcpy (map_path, m->path + strlen (m->path) - 18);	54	strcpy (map_path, m->path + max (0, (int)strlen (m->path) - 30));
		55
55	sprintf (buf, "%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d",	56	sprintf (buf, "%-30.30s %2d %2d %1d %4d %2d %02d:%02d:%02d",
56	map_path, m->players, players_on_map (m, FALSE),	57	map_path, m->players, players_on_map (m, FALSE),
57	m->in_memory, m->timeout, m->difficulty,	58	m->in_memory, m->timeout, m->difficulty,
58	(MAP_WHEN_RESET (m) % 86400) / 3600, (MAP_WHEN_RESET (m) % 3600) / 60, MAP_WHEN_RESET (m) % 60);	59	(m->reset_time % 86400) / 3600, (m->reset_time % 3600) / 60, m->reset_time % 60);
59	new_draw_info (NDI_UNIQUE, 0, op, buf);	60	new_draw_info (NDI_UNIQUE, 0, op, buf);
60	}	61	}
61	}	62	}
		63
		64	int
		65	command_style_map_info (object op, char params)
		66	{
		67	extern maptile *styles;
		68	maptile *mp;
		69	int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
		70	object *tmp;
		71
		72	for (mp = styles; mp != NULL; mp = mp->next)
		73	{
		74	maps_used++;
		75	mapmem += mp->width * mp->height * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile);
		76	for (x = 0; x < mp->width; x++)
		77	{
		78	for (y = 0; y < mp->height; y++)
		79	{
		80	for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
		81	objects_used++;
		82	}
		83	}
		84	}
		85	new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
		86	new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
		87	new_draw_info_format (NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
		88	new_draw_info_format (NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
		89	new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects: %d", objects_used * sizeof (object));
		90	return 0;
		91	}
		92	#endif
62		93
63	/* This command dumps the body information for object *op.	94	/* This command dumps the body information for object *op.
64	* it doesn't care what the params are.	95	* it doesn't care what the params are.
65	* This is mostly meant as a debug command.	96	* This is mostly meant as a debug command.
66	*/	97	*/
…		…
149	maptile *m = op->map;	180	maptile *m = op->map;
150		181
151	if (!m)	182	if (!m)
152	return;	183	return;
153		184
154	new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map (m));	185	new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", &m->name, &m->path, get_name_of_region_for_map (m));
155		186
156	if (QUERY_FLAG (op, FLAG_WIZ))	187	if (QUERY_FLAG (op, FLAG_WIZ))
157	{	188	{
158	new_draw_info_format (NDI_UNIQUE, 0, op,	189	new_draw_info_format (NDI_UNIQUE, 0, op,
159	"players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",	190	"players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
160	m->players, m->difficulty, MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m), MAP_TIMEOUT (m));	191	m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
161		192
162	}	193	}
163	if (m->msg)	194	if (m->msg)
164	new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);	195	new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
165	}	196	}
…		…
192	*/	223	*/
193	for (reg = first_region; reg != NULL; reg = reg->next)	224	for (reg = first_region; reg != NULL; reg = reg->next)
194	{	225	{
195	reg->counter = 0;	226	reg->counter = 0;
196	}	227	}
197	for (pl = first_player; pl != NULL; pl = pl->next)	228	for_all_players (pl)
198	if (pl->ob->map != NULL)	229	if (pl->ob->map != NULL)
199	get_region_by_map (pl->ob->map)->counter++;	230	get_region_by_map (pl->ob->map)->counter++;
200		231
201	/* we only want to print out by places with a 'longname' field... */	232	/* we only want to print out by places with a 'longname' field... */
202	for (reg = first_region; reg != NULL; reg = reg->next)	233	for (reg = first_region; reg != NULL; reg = reg->next)
…		…
226	} chars_names;	257	} chars_names;
227		258
228	int	259	int
229	command_afk (object op, char params)	260	command_afk (object op, char params)
230	{	261	{
231	if QUERY_FLAG	262	if ((op->contr->ns->afk = !op->contr->ns->afk))
232	(op, FLAG_AFK)
233	{
234	CLEAR_FLAG (op, FLAG_AFK);
235	new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");	263	new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
236	}
237	else	264	else
238	{
239	SET_FLAG (op, FLAG_AFK);
240	new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");	265	new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
241	}	266
242	return 1;	267	return 1;
243	}	268	}
244		269
245	int	270	int
246	command_mapinfo (object op, char params)	271	command_mapinfo (object op, char params)
…		…
255	current_region_info (op);	280	current_region_info (op);
256	return 1;	281	return 1;
257	}	282	}
258		283
259	int	284	int
260	command_maps (object op, char params)
261	{
262	map_info (op, params);
263	return 1;
264	}
265
266	int
267	command_time (object op, char params)	285	command_time (object op, char params)
268	{	286	{
269	print_tod (op);	287	print_tod (op);
270	return 1;	288	return 1;
271	}	289	}
272		290
273	int	291	int
274	command_weather (object op, char params)	292	command_weather (object op, char params)
275	{	293	{
		294	#if 0
276	int wx, wy, temp, sky;	295	int wx, wy, temp, sky;
277	char buf[MAX_BUF];	296	char buf[MAX_BUF];
278		297
279	if (settings.dynamiclevel < 1)	298	if (settings.dynamiclevel < 1)
280	return 1;	299	return 1;
…		…
396	break;	415	break;
397	case SKY_BLIZZARD:	416	case SKY_BLIZZARD:
398	new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!");	417	new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!");
399	break;	418	break;
400	}	419	}
		420	#endif
401	return 1;	421	return 1;
402	}	422	}
403		423
404	int	424	int
405	command_archs (object op, char params)	425	command_archs (object op, char params)
…		…
463	dump_friendly_objects ();	483	dump_friendly_objects ();
464	return 0;	484	return 0;
465	}	485	}
466		486
467	int	487	int
468	command_dumpmap (object op, char params)
469	{
470	if (op)
471	dump_map (op->map);
472	return 0;
473	}
474
475	int
476	command_dumpallmaps (object op, char params)
477	{
478	dump_all_maps ();
479	return 0;
480	}
481
482	int
483	command_printlos (object op, char params)	488	command_printlos (object op, char params)
484	{	489	{
485	if (op)	490	if (op)
486	print_los (op);	491	print_los (op);
487	return 0;	492	return 0;
…		…
492	command_version (object op, char params)	497	command_version (object op, char params)
493	{	498	{
494	version (op);	499	version (op);
495	return 0;	500	return 0;
496	}	501	}
497
498		502
499	#ifndef BUG_LOG	503	#ifndef BUG_LOG
500	# define BUG_LOG "bug_log"	504	# define BUG_LOG "bug_log"
501	#endif	505	#endif
502	void	506	void
…		…
610		614
611	int	615	int
612	command_fix_me (object op, char params)	616	command_fix_me (object op, char params)
613	{	617	{
614	sum_weight (op);	618	sum_weight (op);
615	fix_player (op);	619	op->update_stats ();
616	return 1;	620	return 1;
617	}	621	}
618		622
619	int	623	int
620	command_players (object op, char paramss)	624	command_players (object op, char paramss)
…		…
627	t = buf + strlen (buf);	631	t = buf + strlen (buf);
628	if ((Dir = opendir (buf)) != NULL)	632	if ((Dir = opendir (buf)) != NULL)
629	{	633	{
630	const struct dirent *Entry;	634	const struct dirent *Entry;
631		635
632	while ((Entry = readdir (Dir)) != NULL)	636	while ((Entry = readdir (Dir)))
633	{	637	{
634	/* skip '.' , '..' */	638	/* skip '.' , '..' */
635	if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') \|\|	639	if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') \|\|
636	(Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))	640	(Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
637	{	641	{
…		…
785	for (obl = first_friendly_object; obl != NULL; obl = next)	789	for (obl = first_friendly_object; obl != NULL; obl = next)
786	{	790	{
787	object *ob = obl->ob;	791	object *ob = obl->ob;
788		792
789	next = obl->next;	793	next = obl->next;
790	if (get_owner (ob) == op)	794	if (ob->owner == op)
791	{	795	{
792	if (target == 0)	796	if (target == 0)
793	{	797	{
794	if (counter == 0)	798	if (counter == 0)
795	new_draw_info (NDI_UNIQUE, 0, op, "Pets:");	799	new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
…		…
902	char filename[MAX_BUF], line[80];	906	char filename[MAX_BUF], line[80];
903	int namelen, linelen = 0;	907	int namelen, linelen = 0;
904		908
905	switch (what)	909	switch (what)
906	{	910	{
907	case 1:	911	case 1:
908	sprintf (filename, "%s/wizhelp", settings.datadir);	912	sprintf (filename, "%s/wizhelp", settings.datadir);
909	new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");	913	new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
910	break;	914	break;
911	case 3:	915	case 3:
912	sprintf (filename, "%s/mischelp", settings.datadir);	916	sprintf (filename, "%s/mischelp", settings.datadir);
913	new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");	917	new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
914	break;	918	break;
915	default:	919	default:
916	sprintf (filename, "%s/help", settings.datadir);	920	sprintf (filename, "%s/help", settings.datadir);
917	new_draw_info (NDI_UNIQUE, 0, op, " Commands:");	921	new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
918	break;	922	break;
919	}	923	}
		924
920	if (!(dirp = opendir (filename)))	925	if (!(dirp = opendir (filename)))
921	return;	926	return;
922		927
923	line[0] = '\0';	928	line[0] = '\0';
924	for (de = readdir (dirp); de; de = readdir (dirp))	929	while (de = readdir (dirp))
925	{	930	{
926	namelen = NAMLEN (de);	931	namelen = strlen (de->d_name);
927	if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 \|\| de->d_name[1] == '.'))	932	if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 \|\| de->d_name[1] == '.'))
928	continue;	933	continue;
929	linelen += namelen + 1;	934	linelen += namelen + 1;
930	if (linelen > 42)	935	if (linelen > 42)
931	{	936	{
…		…
1146	}	1151	}
1147		1152
1148	int	1153	int
1149	command_real_quit (object op, char params)	1154	command_real_quit (object op, char params)
1150	{	1155	{
1151	send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");	1156	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1152		1157
1153	op->contr->state = ST_CONFIRM_QUIT;	1158	op->contr->ns->state = ST_CONFIRM_QUIT;
1154	return 1;	1159	return 1;
1155	}	1160	}
1156		1161
1157	/*	1162	/*
1158	* don't allow people to exit explore mode. It otherwise becomes	1163	* don't allow people to exit explore mode. It otherwise becomes
…		…
1182	}	1187	}
1183		1188
1184	int	1189	int
1185	command_sound (object op, char params)	1190	command_sound (object op, char params)
1186	{	1191	{
1187	if (op->contr->socket.sound)	1192	if (op->contr->ns->sound)
1188	{	1193	{
1189	op->contr->socket.sound = 0;	1194	op->contr->ns->sound = 0;
1190	new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");	1195	new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1191	}	1196	}
1192	else	1197	else
1193	{	1198	{
1194	op->contr->socket.sound = 1;	1199	op->contr->ns->sound = 1;
1195	new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");	1200	new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1196	}	1201	}
1197	return 1;
1198	}
1199		1202
1200	/* Perhaps these should be in player.c, but that file is
1201	* already a bit big.
1202	*/
1203
1204	void
1205	receive_player_name (object *op, char k)
1206	{
1207
1208	if (!check_name (op->contr, op->contr->write_buf + 1))
1209	{
1210	get_name (op);
1211	return;
1212	}
1213	op->name = op->contr->write_buf + 1;
1214	op->name_pl = op->contr->write_buf + 1;
1215	new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1216	op->contr->name_changed = 1;
1217	get_password (op);
1218	}
1219
1220	void
1221	receive_player_password (object *op, char k)
1222	{
1223
1224	unsigned int pwd_len = strlen (op->contr->write_buf);
1225
1226	if (pwd_len <= 1 \|\| pwd_len > 17)
1227	{
1228	get_name (op);
1229	return;
1230	}
1231	new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1232
1233	if (checkbanned (op->name, op->contr->socket.host))
1234	{
1235	LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1236	new_draw_info (NDI_UNIQUE \| NDI_RED, 0, op, "You are not allowed to play.");
1237	get_name (op);
1238	return;
1239	}
1240
1241	if (op->contr->state == ST_CONFIRM_PASSWORD)
1242	{
1243	if (!check_password (op->contr->write_buf + 1, op->contr->password))
1244	{
1245	new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1246	get_name (op);
1247	return;
1248	}
1249	clear_win_info (op);
1250	display_motd (op);
1251	new_draw_info (NDI_UNIQUE, 0, op, " ");
1252	new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1253	new_draw_info (NDI_UNIQUE, 0, op, " ");
1254	Roll_Again (op);
1255	op->contr->state = ST_ROLL_STAT;
1256	return;
1257	}
1258	strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1259	op->contr->state = ST_ROLL_STAT;
1260	check_login (op);
1261	return;	1203	return 1;
1262	}	1204	}
1263
1264		1205
1265	int	1206	int
1266	explore_mode (void)	1207	explore_mode (void)
1267	{	1208	{
1268	player *pl;	1209	player *pl;
…		…
1273	if (pl->explore)	1214	if (pl->explore)
1274	return 1;	1215	return 1;
1275	}	1216	}
1276	return 0;	1217	return 0;
1277	}	1218	}
1278
1279		1219
1280	int	1220	int
1281	command_title (object op, char params)	1221	command_title (object op, char params)
1282	{	1222	{
1283	char buf[MAX_BUF];	1223	char buf[MAX_BUF];
…		…
1324	}	1264	}
1325		1265
1326	int	1266	int
1327	command_save (object op, char params)	1267	command_save (object op, char params)
1328	{	1268	{
1329	// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1330	// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1331	// } else
1332	if (!op->stats.exp)	1269	if (!op->stats.exp)
1333	{
1334	new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");	1270	new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
		1271	else
1335	}	1272	{
1336	else	1273	op->contr->save ();
1337	{
1338	if (save_player (op, 1))
1339	new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");	1274	new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1340	else
1341	new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1342	}	1275	}
1343	return 1;
1344	}
1345		1276
		1277	return 1;
		1278	}
1346		1279
1347	int	1280	int
1348	command_peaceful (object op, char params)	1281	command_peaceful (object op, char params)
1349	{	1282	{
1350	new_draw_info (NDI_UNIQUE, 0, op,	1283	new_draw_info (NDI_UNIQUE, 0, op,
…		…
1359	new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");	1292	new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1360	*/	1293	*/
1361	return 1;	1294	return 1;
1362	}	1295	}
1363		1296
1364
1365
1366	int	1297	int
1367	command_wimpy (object op, char params)	1298	command_wimpy (object op, char params)
1368	{	1299	{
1369	int i;	1300	int i;
1370	char buf[MAX_BUF];	1301	char buf[MAX_BUF];
…		…
1379	new_draw_info (NDI_UNIQUE, 0, op, buf);	1310	new_draw_info (NDI_UNIQUE, 0, op, buf);
1380	op->run_away = i;	1311	op->run_away = i;
1381	return 1;	1312	return 1;
1382	}	1313	}
1383		1314
1384
1385	int	1315	int
1386	command_brace (object op, char params)	1316	command_brace (object op, char params)
1387	{	1317	{
1388	if (!params)	1318	if (!params)
1389	op->contr->braced = !op->contr->braced;	1319	op->contr->braced = !op->contr->braced;
…		…
1393	if (op->contr->braced)	1323	if (op->contr->braced)
1394	new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");	1324	new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1395	else	1325	else
1396	new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");	1326	new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1397		1327
1398	fix_player (op);	1328	op->update_stats ();
1399	return 0;
1400	}
1401
1402	int
1403	command_style_map_info (object op, char params)
1404	{
1405	extern maptile *styles;
1406	maptile *mp;
1407	int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
1408	object *tmp;
1409
1410	for (mp = styles; mp != NULL; mp = mp->next)
1411	{
1412	maps_used++;
1413	mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile);
1414	for (x = 0; x < MAP_WIDTH (mp); x++)
1415	{
1416	for (y = 0; y < MAP_HEIGHT (mp); y++)
1417	{
1418	for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above)
1419	objects_used++;
1420	}
1421	}
1422	}
1423	new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
1424	new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
1425	new_draw_info_format (NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
1426	new_draw_info_format (NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
1427	new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects: %d", objects_used * sizeof (object));
1428	return 0;	1329	return 0;
1429	}	1330	}
1430		1331
1431	int	1332	int
1432	command_kill_pets (object op, char params)	1333	command_kill_pets (object op, char params)
…		…
1446	for (obl = first_friendly_object; obl != NULL; obl = next)	1347	for (obl = first_friendly_object; obl != NULL; obl = next)
1447	{	1348	{
1448	object *ob = obl->ob;	1349	object *ob = obl->ob;
1449		1350
1450	next = obl->next;	1351	next = obl->next;
1451	if (get_owner (ob) == op)	1352	if (ob->owner == op)
1452	if (++counter == target \|\| (target == 0 && !strcasecmp (ob->name, params)))	1353	if (++counter == target \|\| (target == 0 && !strcasecmp (ob->name, params)))
1453	{	1354	{
1454	if (!QUERY_FLAG (ob, FLAG_REMOVED))
1455	remove_ob (ob);
1456	remove_friendly_object (ob);
1457	free_object (ob);	1355	ob->destroy ();
1458	removecount++;	1356	removecount++;
1459	}	1357	}
1460	}	1358	}
1461	if (removecount != 0)	1359	if (removecount != 0)
1462	new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);	1360	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.18 by root, Mon Dec 11 21:32:17 2006 UTC vs. Revision 1.33 by root, Sat Dec 30 10:16:11 2006 UTC

Diff Legend

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.18 by root, Mon Dec 11 21:32:17 2006 UTC vs.
Revision 1.33 by root, Sat Dec 30 10:16:11 2006 UTC